chore(deps): patch endo/exo to export *

tgrecojs · Apr 2, 2024 · 83db366 · 83db366
1 parent 22fbdc5
commit 83db366
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 18 deletions.
diff --git a/packages/internal/src/callback.js b/packages/internal/src/callback.js
@@ -16,8 +16,8 @@ const ownKeys =
   );
 
 /**
- * @template {import('@endo/exo/src/exo-makers.js').Methods} T
- * @typedef {(...args: Parameters<ReturnType<prepareAttenuator>>) => import('@endo/exo/src/exo-makers.js').Farable<T>} MakeAttenuator
+ * @template {import('@endo/exo').Methods} T
+ * @typedef {(...args: Parameters<ReturnType<prepareAttenuator>>) => import('@endo/exo').Farable<T>} MakeAttenuator
  */
 
 /**

diff --git a/packages/swingset-liveslots/src/virtualObjectManager.js b/packages/swingset-liveslots/src/virtualObjectManager.js
@@ -23,8 +23,7 @@ import {
 /**
  * @import {DurableKindHandle} from '@agoric/swingset-liveslots'
  * @import {DefineKindOptions} from '@agoric/swingset-liveslots'
- * @import {ClassContextProvider} from '@endo/exo/src/exo-tools.js'
- * @import {KitContextProvider} from '@endo/exo/src/exo-tools.js'
+ * @import {ClassContextProvider, KitContextProvider} from '@endo/exo/tools.js'
  */
 
 const {

diff --git a/packages/vat-data/src/exo-utils.js b/packages/vat-data/src/exo-utils.js
@@ -94,7 +94,7 @@ export const makeExoUtils = VatData => {
    *   self: T,
    *   state: ReturnType<I>
    * }>} [options]
-   * @returns {(...args: Parameters<I>) => import('@endo/exo/src/exo-makers.js').Guarded<T>}
+   * @returns {(...args: Parameters<I>) => import('@endo/exo').Guarded<T>}
    */
   const defineVirtualExoClass = (tag, interfaceGuard, init, methods, options) =>
     // @ts-expect-error cast
@@ -112,14 +112,14 @@ export const makeExoUtils = VatData => {
    * @param {InterfaceGuardKit | undefined} interfaceGuardKit
    * @param {I} init
    * @param {T & ThisType<{
-   *   facets: import('@endo/exo/src/exo-makers.js').GuardedKit<T>,
+   *   facets: import('@endo/exo').GuardedKit<T>,
    *   state: ReturnType<I>
    * }> } facets
    * @param {DefineKindOptions<{
    *   facets: T,
    *   state: ReturnType<I>
    * }>} [options]
-   * @returns {(...args: Parameters<I>) => import('@endo/exo/src/exo-makers.js').GuardedKit<T>}
+   * @returns {(...args: Parameters<I>) => import('@endo/exo').GuardedKit<T>}
    */
   const defineVirtualExoClassKit = (
     tag,
@@ -150,7 +150,7 @@ export const makeExoUtils = VatData => {
    *   self: T,
    *   state: ReturnType<I>
    * }>} [options]
-   * @returns {(...args: Parameters<I>) => import('@endo/exo/src/exo-makers.js').Guarded<T>}
+   * @returns {(...args: Parameters<I>) => import('@endo/exo').Guarded<T>}
    */
   const defineDurableExoClass = (
     kindHandle,
@@ -174,14 +174,14 @@ export const makeExoUtils = VatData => {
    * @param {InterfaceGuardKit | undefined} interfaceGuardKit
    * @param {I} init
    * @param {T & ThisType<{
-   *   facets: import('@endo/exo/src/exo-makers.js').GuardedKit<T>,
+   *   facets: import('@endo/exo').GuardedKit<T>,
    *   state: ReturnType<I>
    * }> } facets
    * @param {DefineKindOptions<{
    *   facets: T,
    *   state: ReturnType<I>
    * }>} [options]
-   * @returns {(...args: Parameters<I>) => import('@endo/exo/src/exo-makers.js').GuardedKit<T>}
+   * @returns {(...args: Parameters<I>) => import('@endo/exo').GuardedKit<T>}
    */
   const defineDurableExoClassKit = (
     kindHandle,
@@ -213,7 +213,7 @@ export const makeExoUtils = VatData => {
    *   self: T,
    *   state: ReturnType<I>
    * }>} [options]
-   * @returns {(...args: Parameters<I>) => import('@endo/exo/src/exo-makers.js').Guarded<T>}
+   * @returns {(...args: Parameters<I>) => import('@endo/exo').Guarded<T>}
    */
   const prepareExoClass = (
     baggage,
@@ -240,14 +240,14 @@ export const makeExoUtils = VatData => {
    * @param {InterfaceGuardKit | undefined} interfaceGuardKit
    * @param {I} init
    * @param {T & ThisType<{
-   *   facets: import('@endo/exo/src/exo-makers.js').GuardedKit<T>,
+   *   facets: import('@endo/exo').GuardedKit<T>,
    *   state: ReturnType<I>
    * }> } facets
    * @param {DefineKindOptions<{
    *   facets: T,
    *   state: ReturnType<I>
    * }>} [options]
-   * @returns {(...args: Parameters<I>) => import('@endo/exo/src/exo-makers.js').GuardedKit<T>}
+   * @returns {(...args: Parameters<I>) => import('@endo/exo').GuardedKit<T>}
    */
   const prepareExoClassKit = (
     baggage,
@@ -273,7 +273,7 @@ export const makeExoUtils = VatData => {
    * @param {InterfaceGuard | undefined} interfaceGuard
    * @param {M} methods
    * @param {DefineKindOptions<{ self: M }>} [options]
-   * @returns {import('@endo/exo/src/exo-makers.js').Guarded<M>}
+   * @returns {import('@endo/exo').Guarded<M>}
    */
   const prepareExo = (
     baggage,
@@ -302,7 +302,7 @@ export const makeExoUtils = VatData => {
    * @param {string} kindName
    * @param {M} methods
    * @param {DefineKindOptions<{ self: M }>} [options]
-   * @returns {import('@endo/exo/src/exo-makers.js').Guarded<M>}
+   * @returns {import('@endo/exo').Guarded<M>}
    */
   const prepareSingleton = (baggage, kindName, methods, options = undefined) =>
     prepareExo(baggage, kindName, undefined, methods, options);

diff --git a/packages/vat-data/test/test-amplify-virtual-class-kits.js b/packages/vat-data/test/test-amplify-virtual-class-kits.js
@@ -43,7 +43,7 @@ test('test amplify defineVirtualExoClass fails', t => {
 });
 
 test('test amplify defineVirtualExoClassKit', t => {
-  /** @type {import('@endo/exo/src/exo-makers.js').Amplify} */
+  /** @type {import('@endo/exo').Amplify} */
   let amp;
   const makeCounterKit = defineVirtualExoClassKit(
     'Counter',

diff --git a/packages/vat-data/test/test-is-instance-virtual-class-kits.js b/packages/vat-data/test/test-is-instance-virtual-class-kits.js
@@ -18,7 +18,7 @@ const DownCounterI = M.interface('DownCounter', {
 });
 
 test('test isInstance defineVirtualExoClass', t => {
-  /** @type {import('@endo/exo/src/exo-makers.js').IsInstance} */
+  /** @type {import('@endo/exo').IsInstance} */
   let isInstance;
   const makeUpCounter = defineVirtualExoClass(
     'UpCounter',
@@ -59,7 +59,7 @@ test('test isInstance defineVirtualExoClass', t => {
 });
 
 test('test isInstance defineVirtualExoClassKit', t => {
-  /** @type {import('@endo/exo/src/exo-makers.js').IsInstance} */
+  /** @type {import('@endo/exo').IsInstance} */
   let isInstance;
   const makeCounterKit = defineVirtualExoClassKit(
     'Counter',

diff --git a/patches/@endo+exo+1.3.0.patch b/patches/@endo+exo+1.3.0.patch
@@ -0,0 +1,38 @@
+diff --git a/node_modules/@endo/exo/index.d.ts b/node_modules/@endo/exo/index.d.ts
+index bd4c7ed..463ae5e 100644
+--- a/node_modules/@endo/exo/index.d.ts
++++ b/node_modules/@endo/exo/index.d.ts
+@@ -1,3 +1,3 @@
+ export { GET_INTERFACE_GUARD } from "./src/get-interface.js";
+-export { initEmpty, defineExoClass, defineExoClassKit, makeExo } from "./src/exo-makers.js";
++export * from "./src/exo-makers.js";
+ //# sourceMappingURL=index.d.ts.map
+diff --git a/node_modules/@endo/exo/index.js b/node_modules/@endo/exo/index.js
+index 0936e29..3924dd4 100644
+--- a/node_modules/@endo/exo/index.js
++++ b/node_modules/@endo/exo/index.js
+@@ -1,8 +1,3 @@
+-export {
+-  initEmpty,
+-  defineExoClass,
+-  defineExoClassKit,
+-  makeExo,
+-} from './src/exo-makers.js';
++export * from './src/exo-makers.js';
+
+ export { GET_INTERFACE_GUARD } from './src/get-interface.js';
+diff --git a/node_modules/@endo/exo/tools.d.ts b/node_modules/@endo/exo/tools.d.ts
+index 0537b0b..be5d131 100644
+--- a/node_modules/@endo/exo/tools.d.ts
++++ b/node_modules/@endo/exo/tools.d.ts
+@@ -1,2 +1,2 @@
+-export { defendPrototype, defendPrototypeKit } from "./src/exo-tools.js";
++export * from "./src/exo-tools.js";
+ //# sourceMappingURL=tools.d.ts.map
+diff --git a/node_modules/@endo/exo/tools.js b/node_modules/@endo/exo/tools.js
+index e8db521..072ff15 100644
+--- a/node_modules/@endo/exo/tools.js
++++ b/node_modules/@endo/exo/tools.js
+@@ -1 +1 @@
+-export { defendPrototype, defendPrototypeKit } from './src/exo-tools.js';
++export * from './src/exo-tools.js';