@agoric/swingset-liveslots 0.10.3-dev-d6fae11.0.d6fae11 → 0.10.3-dev-7b17bb6.0.7b17bb6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-liveslots",
-  "version": "0.10.3-dev-d6fae11.0.d6fae11",
+  "version": "0.10.3-dev-7b17bb6.0.7b17bb6",
   "description": "SwingSet ocap support layer",
   "type": "module",
   "main": "src/index.js",
@@ -19,8 +19,8 @@
     "postpack": "git clean -f ':!src/types-index.d.ts' '*.d.ts*' '*.tsbuildinfo'"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-d6fae11.0.d6fae11",
-    "@agoric/store": "0.9.3-dev-d6fae11.0.d6fae11",
+    "@agoric/internal": "0.3.3-dev-7b17bb6.0.7b17bb6",
+    "@agoric/store": "0.9.3-dev-7b17bb6.0.7b17bb6",
     "@endo/env-options": "^1.1.11",
     "@endo/errors": "^1.2.13",
     "@endo/eventual-send": "^1.3.4",
@@ -34,7 +34,7 @@
     "@endo/promise-kit": "^1.1.13"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-d6fae11.0.d6fae11",
+    "@agoric/kmarshal": "0.1.1-dev-7b17bb6.0.7b17bb6",
     "ava": "^5.3.0"
   },
   "files": [
@@ -68,5 +68,5 @@
   "typeCoverage": {
     "atLeast": 75.22
   },
-  "gitHead": "d6fae11a6db28b1122089468183eccd4d47b83c9"
+  "gitHead": "7b17bb64b1ba5357d073027fb7457c7378d744b7"
 }

package/src/capdata.d.ts

@@ -1,5 +1,6 @@
 /**
  * @import {assertCapData} from '@agoric/internal/src/marshal/cap-data.js';
+ * @import {SwingSetCapData} from './types.js';
  */
 /**
  * Assert function to ensure that something expected to be a capdata object
@@ -10,7 +11,8 @@
  * @param {any} specimen  The object to be tested
  * @throws {Error} if, upon inspection, the parameter does not satisfy the above
  *   criteria.
- * @returns {asserts specimen is import('./types.js').SwingSetCapData}
+ * @returns {asserts specimen is SwingSetCapData}
  */
-export function insistCapData(specimen: any): asserts specimen is import("./types.js").SwingSetCapData;
+export function insistCapData(specimen: any): asserts specimen is SwingSetCapData;
+import type { SwingSetCapData } from './types.js';
 //# sourceMappingURL=capdata.d.ts.map

package/src/capdata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"capdata.d.ts","sourceRoot":"","sources":["capdata.js"],"names":[],"mappings":"AAEA;;GAEG;AAEH;;;;;;;;;;GAUG;AACH,wCALW,GAAG,GAGD,QAAQ,QAAQ,IAAI,OAAO,YAAY,EAAE,eAAe,CAWpE"}
+{"version":3,"file":"capdata.d.ts","sourceRoot":"","sources":["capdata.js"],"names":[],"mappings":"AAEA;;;GAGG;AAEH;;;;;;;;;;GAUG;AACH,wCALW,GAAG,GAGD,QAAQ,QAAQ,IAAI,eAAe,CAW/C;qCAvBiC,YAAY"}

package/src/capdata.js

@@ -2,6 +2,7 @@ import { Fail } from '@endo/errors';
 
 /**
  * @import {assertCapData} from '@agoric/internal/src/marshal/cap-data.js';
+ * @import {SwingSetCapData} from './types.js';
  */
 
 /**
@@ -13,7 +14,7 @@ import { Fail } from '@endo/errors';
  * @param {any} specimen  The object to be tested
  * @throws {Error} if, upon inspection, the parameter does not satisfy the above
  *   criteria.
- * @returns {asserts specimen is import('./types.js').SwingSetCapData}
+ * @returns {asserts specimen is SwingSetCapData}
  */
 export function insistCapData(specimen) {
   typeof specimen.body === 'string' ||

package/src/collectionManager.d.ts

@@ -1,6 +1,6 @@
 /**
  * @param {*} syscall
- * @param {import('./virtualReferences.js').VirtualReferenceManager} vrm
+ * @param {VirtualReferenceManager} vrm
  * @param {() => number} allocateExportID
  * @param {() => number} allocateCollectionID
  * @param {(val: any) => string | undefined} convertValToSlot
@@ -10,7 +10,7 @@
  * @param {FromCapData<string>} unserialize
  * @param {(capDatas: any) => void} assertAcceptableSyscallCapdataSize
  */
-export function makeCollectionManager(syscall: any, vrm: import("./virtualReferences.js").VirtualReferenceManager, allocateExportID: () => number, allocateCollectionID: () => number, convertValToSlot: (val: any) => string | undefined, convertSlotToVal: any, registerValue: any, serialize: ToCapData<string>, unserialize: FromCapData<string>, assertAcceptableSyscallCapdataSize: (capDatas: any) => void): {
+export function makeCollectionManager(syscall: any, vrm: VirtualReferenceManager, allocateExportID: () => number, allocateCollectionID: () => number, convertValToSlot: (val: any) => string | undefined, convertSlotToVal: any, registerValue: any, serialize: ToCapData<string>, unserialize: FromCapData<string>, assertAcceptableSyscallCapdataSize: (capDatas: any) => void): {
     initializeStoreKindInfo: () => void;
     makeScalarBigMapStore: <K, V>(label?: string, options?: StoreOptions) => MapStore<K, V>;
     makeScalarBigWeakMapStore: <K, V>(label?: string, options?: StoreOptions) => WeakMapStore<K, V>;
@@ -41,6 +41,7 @@ export type SchemaCacheValue = {
     label: string;
     schemataCapData: object;
 };
+import type { VirtualReferenceManager } from './virtualReferences.js';
 import type { ToCapData } from '@endo/marshal';
 import type { FromCapData } from '@endo/marshal';
 import type { Pattern } from '@endo/patterns';

package/src/collectionManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collectionManager.d.ts","sourceRoot":"","sources":["collectionManager.js"],"names":[],"mappings":"AAoHA;;;;;;;;;;;GAWG;AACH,+CAXW,GAAC,OACD,OAAO,wBAAwB,EAAE,uBAAuB,oBACxD,MAAM,MAAM,wBACZ,MAAM,MAAM,oBACZ,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,GAAG,SAAS,oBAChC,GAAC,iBACD,GAAC,aACD,UAAU,MAAM,CAAC,eACjB,YAAY,MAAM,CAAC,sCACnB,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI;;4BAs+BnB,CAAC,EAAC,CAAC,UACL,MAAM,YACN,YAAY,KACV,QAAQ,CAAC,CAAC,EAAC,CAAC,CAAC;gCASb,CAAC,EAAC,CAAC,UACL,MAAM,YACN,YAAY,KACV,YAAY,CAAC,CAAC,EAAC,CAAC,CAAC;4BASjB,CAAC,UACH,MAAM,YACN,YAAY,KACV,QAAQ,CAAC,CAAC,CAAC;gCASX,CAAC,UACH,MAAM,YACN,YAAY,KACV,YAAY,CAAC,CAAC,CAAC;;;;;;;;;;;;;;;;;;EAsB7B;AA7lCD,6CAIG;;cAIW,OAAO;gBACP,OAAO;WACP,MAAM;qBACN,MAAM;;+BAnDqB,eAAe;iCAAf,eAAe;6BAC9B,gBAAgB"}
+{"version":3,"file":"collectionManager.d.ts","sourceRoot":"","sources":["collectionManager.js"],"names":[],"mappings":"AAsHA;;;;;;;;;;;GAWG;AACH,+CAXW,GAAC,OACD,uBAAuB,oBACvB,MAAM,MAAM,wBACZ,MAAM,MAAM,oBACZ,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,GAAG,SAAS,oBAChC,GAAC,iBACD,GAAC,aACD,UAAU,MAAM,CAAC,eACjB,YAAY,MAAM,CAAC,sCACnB,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI;;4BAs+BnB,CAAC,EAAC,CAAC,UACL,MAAM,YACN,YAAY,KACV,QAAQ,CAAC,CAAC,EAAC,CAAC,CAAC;gCASb,CAAC,EAAC,CAAC,UACL,MAAM,YACN,YAAY,KACV,YAAY,CAAC,CAAC,EAAC,CAAC,CAAC;4BASjB,CAAC,UACH,MAAM,YACN,YAAY,KACV,QAAQ,CAAC,CAAC,CAAC;gCASX,CAAC,UACH,MAAM,YACN,YAAY,KACV,YAAY,CAAC,CAAC,CAAC;;;;;;;;;;;;;;;;;;EAsB7B;AA7lCD,6CAIG;;cAIW,OAAO;gBACP,OAAO;WACP,MAAM;qBACN,MAAM;;6CAnDsB,wBAAwB;+BAFzB,eAAe;iCAAf,eAAe;6BAC9B,gBAAgB"}

package/src/collectionManager.js

@@ -28,6 +28,8 @@ import { makeCache } from './cache.js';
 /**
  * @import {ToCapData, FromCapData} from '@endo/marshal';
  * @import {Pattern} from '@endo/patterns';
+ * @import {VirtualReferenceManager} from './virtualReferences.js';
+ * @import {Cache} from './cache.js';
  */
 
 // XXX TODO: The following key length limit was put in place due to limitations
@@ -116,7 +118,7 @@ function makeSchemaCache(syscall, unserialize) {
 
 /**
  * @param {*} syscall
- * @param {import('./virtualReferences.js').VirtualReferenceManager} vrm
+ * @param {VirtualReferenceManager} vrm
  * @param {() => number} allocateExportID
  * @param {() => number} allocateCollectionID
  * @param {(val: any) => string | undefined} convertValToSlot
@@ -140,7 +142,7 @@ export function makeCollectionManager(
 ) {
   const storeKindIDToName = new Map();
 
-  /** @type { import('./cache.js').Cache<SchemaCacheValue>} */
+  /** @type { Cache<SchemaCacheValue>} */
   const schemaCache = makeSchemaCache(syscall, unserialize);
 
   const storeKindInfo = {

package/src/liveslots.d.ts

@@ -5,7 +5,7 @@
  * @param {*} syscall  Kernel syscall interface that the vat will have access to
  * @param {*} forVatID  Vat ID label, for use in debug diagostics
  * @param {*} vatPowers
- * @param {import('./types.js').LiveSlotsOptions} liveSlotsOptions
+ * @param {LiveSlotsOptions} liveSlotsOptions
  * @param {*} gcTools { WeakRef, FinalizationRegistry, waitUntilQuiescent }
  * @param {LimitedConsole} [liveSlotsConsole]
  * @param {*} [buildVatNamespace]
@@ -34,9 +34,10 @@
  * (using, once again, the kernel syscall interface). D(x).foo(args) will
  * perform an immediate syscall.callNow on the device node.
  */
-export function makeLiveSlots(syscall: any, forVatID: any | undefined, vatPowers: any | undefined, liveSlotsOptions: import("./types.js").LiveSlotsOptions, gcTools: any, liveSlotsConsole?: LimitedConsole, buildVatNamespace?: any): any;
+export function makeLiveSlots(syscall: any, forVatID: any | undefined, vatPowers: any | undefined, liveSlotsOptions: LiveSlotsOptions, gcTools: any, liveSlotsConsole?: LimitedConsole, buildVatNamespace?: any): any;
 export function makeMarshaller(syscall: any, gcTools: any, vatID?: string): {
     m: any;
 };
+import type { LiveSlotsOptions } from './types.js';
 import type { LimitedConsole } from '@agoric/internal/src/js-utils.js';
 //# sourceMappingURL=liveslots.d.ts.map

package/src/liveslots.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"liveslots.d.ts","sourceRoot":"","sources":["liveslots.js"],"names":[],"mappings":"AAm9CA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,uCAhCW,GAAC,YACD,GAAC,yBACD,GAAC,gCACD,OAAO,YAAY,EAAE,gBAAgB,WACrC,GAAC,qBACD,cAAc,sBACd,GAAC,GAEC,GAAC,CAgDb;AAGD;;EAIC;oCAtgDiC,kCAAkC"}
+{"version":3,"file":"liveslots.d.ts","sourceRoot":"","sources":["liveslots.js"],"names":[],"mappings":"AAw9CA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,uCAhCW,GAAC,YACD,GAAC,yBACD,GAAC,gCACD,gBAAgB,WAChB,GAAC,qBACD,cAAc,sBACd,GAAC,GAEC,GAAC,CAgDb;AAGD;;EAIC;sCAzgDkC,YAAY;oCADd,kCAAkC"}

package/src/liveslots.js

@@ -14,7 +14,12 @@ import { makeCollectionManager } from './collectionManager.js';
 import { makeWatchedPromiseManager } from './watchedPromises.js';
 import { makeBOYDKit } from './boyd-gc.js';
 
-/** @import {LimitedConsole} from '@agoric/internal/src/js-utils.js'; */
+/**
+ * @import {LimitedConsole} from '@agoric/internal/src/js-utils.js';
+ * @import {LiveSlotsOptions} from './types.js';
+ * @import {VatDeliveryObject} from './types.js';
+ * @import {SwingSetCapData} from './types.js';
+ */
 
 const SYSCALL_CAPDATA_BODY_SIZE_LIMIT = 10_000_000;
 const SYSCALL_CAPDATA_SLOTS_LENGTH_LIMIT = 10_000;
@@ -31,7 +36,7 @@ const SYSCALL_CAPDATA_SLOTS_LENGTH_LIMIT = 10_000;
  * @param {*} syscall  Kernel syscall interface that the vat will have access to
  * @param {*} forVatID  Vat ID label, for use in debug diagnostics
  * @param {*} vatPowers
- * @param {import('./types.js').LiveSlotsOptions} liveSlotsOptions
+ * @param {LiveSlotsOptions} liveSlotsOptions
  * @param {*} gcTools { WeakRef, FinalizationRegistry, waitUntilQuiescent, gcAndFinalize,
  *                      meterControl }
  * @param {LimitedConsole} console
@@ -1320,8 +1325,8 @@ function build(
   }
 
   /**
-   * @param {import('./types.js').VatDeliveryObject} delivery
-   * @returns {undefined | ReturnType<startVat>}
+   * @param {VatDeliveryObject} delivery
+   * @returns {undefined | ReturnType<typeof startVat>}
    */
   function dispatchToUserspace(delivery) {
     let result;
@@ -1384,7 +1389,7 @@ function build(
   });
 
   /**
-   * @param { import('./types.js').SwingSetCapData } _disconnectObjectCapData
+   * @param { SwingSetCapData } _disconnectObjectCapData
    * @returns {Promise<void>}
    */
   async function stopVat(_disconnectObjectCapData) {
@@ -1446,7 +1451,7 @@ function build(
    * terminate the vat). Userspace should not be able to cause the delivery
    * to fail: only a bug in liveslots should trigger a failure.
    *
-   * @param {import('./types.js').VatDeliveryObject} delivery
+   * @param {VatDeliveryObject} delivery
    * @returns {Promise<void>}
    */
   async function dispatch(delivery) {
@@ -1496,7 +1501,7 @@ function build(
  * @param {*} syscall  Kernel syscall interface that the vat will have access to
  * @param {*} forVatID  Vat ID label, for use in debug diagostics
  * @param {*} vatPowers
- * @param {import('./types.js').LiveSlotsOptions} liveSlotsOptions
+ * @param {LiveSlotsOptions} liveSlotsOptions
  * @param {*} gcTools { WeakRef, FinalizationRegistry, waitUntilQuiescent }
  * @param {LimitedConsole} [liveSlotsConsole]
  * @param {*} [buildVatNamespace]

package/src/message.d.ts

@@ -1,9 +1,13 @@
 /**
  * @import {VatDeliveryResult} from './types.js';
+ * @import {SwingSetCapData} from './types.js';
+ * @import {VatDeliveryObject} from './types.js';
+ * @import {VatSyscallObject} from './types.js';
+ * @import {VatSyscallResult} from './types.js';
  */
 /**
  * @typedef {{
- * methargs: import('./types.js').SwingSetCapData, // of [method, args]
+ * methargs: SwingSetCapData, // of [method, args]
  * result: string | undefined | null,
  * }} Message
  */
@@ -23,9 +27,9 @@
 export function insistMessage(message: any): asserts message is Message;
 /**
  * @param {unknown} vdo
- * @returns {asserts vdo is import('./types.js').VatDeliveryObject}
+ * @returns {asserts vdo is VatDeliveryObject}
  */
-export function insistVatDeliveryObject(vdo: unknown): asserts vdo is import("./types.js").VatDeliveryObject;
+export function insistVatDeliveryObject(vdo: unknown): asserts vdo is VatDeliveryObject;
 /**
  * @param {unknown} vdr
  * @returns {asserts vdr is VatDeliveryResult}
@@ -33,17 +37,21 @@ export function insistVatDeliveryObject(vdo: unknown): asserts vdo is import("./
 export function insistVatDeliveryResult(vdr: unknown): asserts vdr is VatDeliveryResult;
 /**
  * @param {unknown} vso
- * @returns {asserts vso is import('./types.js').VatSyscallObject}
+ * @returns {asserts vso is VatSyscallObject}
  */
-export function insistVatSyscallObject(vso: unknown): asserts vso is import("./types.js").VatSyscallObject;
+export function insistVatSyscallObject(vso: unknown): asserts vso is VatSyscallObject;
 /**
  * @param {unknown} vsr
- * @returns {asserts vsr is import('./types.js').VatSyscallResult}
+ * @returns {asserts vsr is VatSyscallResult}
  */
-export function insistVatSyscallResult(vsr: unknown): asserts vsr is import("./types.js").VatSyscallResult;
+export function insistVatSyscallResult(vsr: unknown): asserts vsr is VatSyscallResult;
 export type Message = {
-    methargs: import("./types.js").SwingSetCapData;
+    methargs: SwingSetCapData;
     result: string | undefined | null;
 };
+import type { VatDeliveryObject } from './types.js';
 import type { VatDeliveryResult } from './types.js';
+import type { VatSyscallObject } from './types.js';
+import type { VatSyscallResult } from './types.js';
+import type { SwingSetCapData } from './types.js';
 //# sourceMappingURL=message.d.ts.map

package/src/message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["message.js"],"names":[],"mappings":"AAGA;;GAEG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;;;GAYG;AAEH,uCARW,GAAG,GAKD,QAAQ,OAAO,IAAI,OAAO,CAStC;AAED;;;GAGG;AAEH,6CAJW,OAAO,GACL,QAAQ,GAAG,IAAI,OAAO,YAAY,EAAE,iBAAiB,CAwDjE;AAED;;;GAGG;AAEH,6CAJW,OAAO,GACL,QAAQ,GAAG,IAAI,iBAAiB,CAkB5C;AAED;;;GAGG;AAEH,4CAJW,OAAO,GACL,QAAQ,GAAG,IAAI,OAAO,YAAY,EAAE,gBAAgB,CA4EhE;AAED;;;GAGG;AAEH,4CAJW,OAAO,GACL,QAAQ,GAAG,IAAI,OAAO,YAAY,EAAE,gBAAgB,CAkBhE;sBAlNY;IACV,QAAQ,EAAE,OAAO,YAAY,EAAE,eAAe,CAAC;IAC/C,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CACjC;uCAPgC,YAAY"}
+{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["message.js"],"names":[],"mappings":"AAGA;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;;;GAYG;AAEH,uCARW,GAAG,GAKD,QAAQ,OAAO,IAAI,OAAO,CAStC;AAED;;;GAGG;AAEH,6CAJW,OAAO,GACL,QAAQ,GAAG,IAAI,iBAAiB,CAwD5C;AAED;;;GAGG;AAEH,6CAJW,OAAO,GACL,QAAQ,GAAG,IAAI,iBAAiB,CAkB5C;AAED;;;GAGG;AAEH,4CAJW,OAAO,GACL,QAAQ,GAAG,IAAI,gBAAgB,CA4E3C;AAED;;;GAGG;AAEH,4CAJW,OAAO,GACL,QAAQ,GAAG,IAAI,gBAAgB,CAkB3C;sBAlNY;IACV,QAAQ,EAAE,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CACjC;uCATgC,YAAY;uCAFZ,YAAY;sCAGb,YAAY;sCACZ,YAAY;qCAHb,YAAY"}

package/src/message.js

@@ -3,11 +3,15 @@ import { insistCapData } from './capdata.js';
 
 /**
  * @import {VatDeliveryResult} from './types.js';
+ * @import {SwingSetCapData} from './types.js';
+ * @import {VatDeliveryObject} from './types.js';
+ * @import {VatSyscallObject} from './types.js';
+ * @import {VatSyscallResult} from './types.js';
  */
 
 /**
  * @typedef {{
- * methargs: import('./types.js').SwingSetCapData, // of [method, args]
+ * methargs: SwingSetCapData, // of [method, args]
  * result: string | undefined | null,
  * }} Message
  */
@@ -36,7 +40,7 @@ export function insistMessage(message) {
 
 /**
  * @param {unknown} vdo
- * @returns {asserts vdo is import('./types.js').VatDeliveryObject}
+ * @returns {asserts vdo is VatDeliveryObject}
  */
 
 export function insistVatDeliveryObject(vdo) {
@@ -118,7 +122,7 @@ export function insistVatDeliveryResult(vdr) {
 
 /**
  * @param {unknown} vso
- * @returns {asserts vso is import('./types.js').VatSyscallObject}
+ * @returns {asserts vso is VatSyscallObject}
  */
 
 export function insistVatSyscallObject(vso) {
@@ -198,7 +202,7 @@ export function insistVatSyscallObject(vso) {
 
 /**
  * @param {unknown} vsr
- * @returns {asserts vsr is import('./types.js').VatSyscallResult}
+ * @returns {asserts vsr is VatSyscallResult}
  */
 
 export function insistVatSyscallResult(vsr) {

package/src/types.d.ts

@@ -36,7 +36,7 @@ export type LiveSlotsOptions = {
      */
     allowStateShapeChanges?: boolean | undefined;
 };
-export type SwingSetCapData = import("@endo/marshal").CapData<string>;
+export type SwingSetCapData = CapData<string>;
 export type Message = {
     methargs: SwingSetCapData;
     result: string | undefined | null;
@@ -78,4 +78,5 @@ export type PromiseWatcher<V, A extends any[] = unknown[]> = {
     onFulfilled?: (value: V, ...args: A) => void;
     onRejected?: (reason: unknown, ...args: A) => void;
 };
+import type { CapData } from '@endo/marshal';
 //# sourceMappingURL=types.d.ts.map

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"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"}

package/src/types.js

@@ -1,6 +1,10 @@
 // Ensure this is a module.
 export {};
 
+/**
+ * @import {CapData} from '@endo/marshal';
+ */
+
 /**
  * @callback makeLiveSlots
  */
@@ -29,7 +33,7 @@ export {};
  *   relates to *arbitrary* changes (per #10200, a non-true value still permits
  *   backwards-compatible addition of new optional fields)
  *
- * @typedef {import('@endo/marshal').CapData<string>} SwingSetCapData
+ * @typedef {CapData<string>} SwingSetCapData
  *
  * @typedef {{
  *                methargs: SwingSetCapData, // of [method, args]

package/src/virtualObjectManager.d.ts

@@ -1,4 +1,4 @@
-export function makeVirtualObjectManager(syscall: any, vrm: import("./virtualReferences.js").VirtualReferenceManager, allocateExportID: () => number, getSlotForVal: (val: object) => string | undefined, requiredValForSlot: (slot: string) => object, registerValue: any, serialize: ToCapData<string>, unserialize: FromCapData<string>, assertAcceptableSyscallCapdataSize: any, liveSlotsOptions?: import("./types.js").LiveSlotsOptions, { WeakMap, WeakSet }?: {
+export function makeVirtualObjectManager(syscall: any, vrm: VirtualReferenceManager, allocateExportID: () => number, getSlotForVal: (val: object) => string | undefined, requiredValForSlot: (slot: string) => object, registerValue: any, serialize: ToCapData<string>, unserialize: FromCapData<string>, assertAcceptableSyscallCapdataSize: any, liveSlotsOptions?: LiveSlotsOptions, { WeakMap, WeakSet }?: {
     WeakMap: typeof globalThis.WeakMap;
     WeakSet: typeof globalThis.WeakSet;
 }): {
@@ -37,8 +37,10 @@ export function makeVirtualObjectManager(syscall: any, vrm: import("./virtualRef
     canBeDurable: (specimen: any) => boolean;
 };
 export type VirtualObjectManager = ReturnType<typeof makeVirtualObjectManager>;
+import type { VirtualReferenceManager } from './virtualReferences.js';
 import type { ToCapData } from '@endo/marshal';
 import type { FromCapData } from '@endo/marshal';
+import type { LiveSlotsOptions } from './types.js';
 import type { DefineKindOptions } from '@agoric/swingset-liveslots';
 import type { DurableKindHandle } from '@agoric/swingset-liveslots';
 //# sourceMappingURL=virtualObjectManager.d.ts.map

package/src/virtualObjectManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"virtualObjectManager.d.ts","sourceRoot":"","sources":["virtualObjectManager.js"],"names":[],"mappings":"AAiWO,kDApDI,GAAC,OACD,OAAO,wBAAwB,EAAE,uBAAuB,oBAExD,MAAM,MAAM,iBAEZ,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,sBAGnC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,iBACxB,GAAC,aAED,UAAU,MAAM,CAAC,eACjB,YAAY,MAAM,CAAC,sCACnB,GAAC,qBAED,OAAO,YAAY,EAAE,gBAAgB,yBACrC;IAAE,OAAO,EAAE,yBAAc,CAAC;IAAC,OAAO,EAAE,yBAAc,CAAA;CAAE;;iEA3KtB,GAAG,kHA+C5C,GA5CG;sEAIe,GAAE,0HAEb,GAAG;0FAK4C,GAAG,kHACU,GAAG;+FAKhC,GAAG,0HACgB,GAAG;0BA6lC/C,MAAM,KACJ,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqI/B;mCAEa,UAAU,CAAC,OAAO,wBAAwB,CAAC;+BAt3ChB,eAAe;iCAAf,eAAe;uCAFpB,4BAA4B;uCAD5B,4BAA4B"}
+{"version":3,"file":"virtualObjectManager.d.ts","sourceRoot":"","sources":["virtualObjectManager.js"],"names":[],"mappings":"AAqWO,kDApDI,GAAC,OACD,uBAAuB,oBAEvB,MAAM,MAAM,iBAEZ,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,sBAGnC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,iBACxB,GAAC,aAED,UAAU,MAAM,CAAC,eACjB,YAAY,MAAM,CAAC,sCACnB,GAAC,qBAED,gBAAgB,yBAChB;IAAE,OAAO,EAAE,yBAAc,CAAC;IAAC,OAAO,EAAE,yBAAc,CAAA;CAAE;;iEA9KS,GAAG,kHAEnE,GAAG;sEAG+B,GAAG,0HAGE,GAAG;0FAK/C,GAAE,kHACqC,GAAG;+FAIU,GAAG,0HAEvD,GAAG;0BAimCO,MAAM,KACJ,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqI/B;mCAEa,UAAU,CAAC,OAAO,wBAAwB,CAAC;6CAv3Cf,wBAAwB;+BAHzB,eAAe;iCAAf,eAAe;sCAIrB,YAAY;uCANX,4BAA4B;uCAD5B,4BAA4B"}

package/src/virtualObjectManager.js

@@ -23,6 +23,10 @@ import {
  * @import {ToCapData, FromCapData} from '@endo/marshal';
  * @import {Pattern} from '@endo/patterns';
  * @import {SwingSetCapData} from './types.js';
+ * @import {VirtualReferenceManager} from './virtualReferences.js';
+ * @import {LiveSlotsOptions} from './types.js';
+ * @import {Cache} from './cache.js';
+ * @import {VatData} from './vatDataTypes.js';
  */
 
 const {
@@ -300,7 +304,7 @@ const insistCompatibleShapeCapData = (
  * Create a new virtual object manager.  There is one of these for each vat.
  *
  * @param {*} syscall  Vat's syscall object, used to access the vatstore operations.
- * @param {import('./virtualReferences.js').VirtualReferenceManager} vrm  Virtual reference manager, to handle reference counting and GC
+ * @param {VirtualReferenceManager} vrm  Virtual reference manager, to handle reference counting and GC
  *   of virtual references.
  * @param {() => number} allocateExportID  Function to allocate the next object
  *   export ID for the enclosing vat.
@@ -314,7 +318,7 @@ const insistCompatibleShapeCapData = (
  * @param {FromCapData<string>} unserialize  Unserializer for this vat
  * @param {*} assertAcceptableSyscallCapdataSize  Function to check for oversized
  *   syscall params
- * @param {import('./types.js').LiveSlotsOptions} [liveSlotsOptions]
+ * @param {LiveSlotsOptions} [liveSlotsOptions]
  * @param {{ WeakMap: typeof WeakMap, WeakSet: typeof WeakSet }} [powers]
  * Specifying the underlying WeakMap/WeakSet objects to wrap with
  * VirtualObjectAwareWeakMap/Set.  By default, capture the ones currently
@@ -877,7 +881,7 @@ export const makeVirtualObjectManager = (
     // (capdata) contents of the virtual-object state record.
     // dataCache[baseRef] -> { capdatas, valueMap }
     // valueCD=capdatas[prop], value=valueMap.get(prop)
-    /** @type { import('./cache.js').Cache<{ capdatas: any, valueMap: Map<string, any> }>} */
+    /** @type { Cache<{ capdatas: any, valueMap: Map<string, any> }>} */
     const dataCache = makeDataCache(syscall);
     allCaches.push(dataCache);
 
@@ -1248,7 +1252,7 @@ export const makeVirtualObjectManager = (
     return id;
   };
 
-  /** @type {import('./vatDataTypes.js').VatData['defineKind']} */
+  /** @type {VatData['defineKind']} */
   const defineKind = (tag, init, behavior, options) => {
     const kindID = `${allocateExportID()}`;
     saveVirtualKindDescriptor(kindID, { kindID, tag });
@@ -1264,7 +1268,7 @@ export const makeVirtualObjectManager = (
     );
   };
 
-  /** @type {import('./vatDataTypes.js').VatData['defineKindMulti']} */
+  /** @type {VatData['defineKindMulti']} */
   const defineKindMulti = (tag, init, behavior, options) => {
     const kindID = `${allocateExportID()}`;
     saveVirtualKindDescriptor(kindID, { kindID, tag });
@@ -1304,7 +1308,7 @@ export const makeVirtualObjectManager = (
     return kindHandle;
   };
 
-  /** @type {import('./vatDataTypes.js').VatData['defineDurableKind']} */
+  /** @type {VatData['defineDurableKind']} */
   const defineDurableKind = (kindHandle, init, behavior, options) => {
     kindHandleToID.has(kindHandle) || Fail`unknown handle ${kindHandle}`;
     const kindID = kindHandleToID.get(kindHandle);
@@ -1327,7 +1331,7 @@ export const makeVirtualObjectManager = (
     return maker;
   };
 
-  /** @type {import('./vatDataTypes.js').VatData['defineDurableKindMulti']} */
+  /** @type {VatData['defineDurableKindMulti']} */
   const defineDurableKindMulti = (kindHandle, init, behavior, options) => {
     kindHandleToID.has(kindHandle) || Fail`unknown handle ${kindHandle}`;
     const kindID = kindHandleToID.get(kindHandle);

package/src/watchedPromises.d.ts

@@ -1,31 +1,45 @@
+/**
+ * @import {PromiseWatcher} from './types.js';
+ * @import {VirtualReferenceManager} from './virtualReferences.js';
+ * @import {VirtualObjectManager} from './virtualObjectManager.js';
+ * @import {ConvertValToSlot} from '@endo/marshal';
+ * @import {ConvertSlotToVal} from '@endo/marshal';
+ * @import {DurableKindHandle} from './vatDataTypes.js';
+ */
 /**
  * @template V
  * @template {any[]} [A=unknown[]]
- * @typedef {[watcher: import('./types.js').PromiseWatcher<V, A>, ...args: A]} PromiseWatcherTuple
+ * @typedef {[watcher: PromiseWatcher<V, A>, ...args: A]} PromiseWatcherTuple
  */
 /**
  * @param {object} options
  * @param {*} options.syscall
- * @param {import('./virtualReferences.js').VirtualReferenceManager} options.vrm
- * @param {import('./virtualObjectManager.js').VirtualObjectManager} options.vom
+ * @param {VirtualReferenceManager} options.vrm
+ * @param {VirtualObjectManager} options.vom
  * @param {*} options.collectionManager
- * @param {import('@endo/marshal').ConvertValToSlot<any>} options.convertValToSlot
- * @param {import('@endo/marshal').ConvertSlotToVal<any>} options.convertSlotToVal
+ * @param {ConvertValToSlot<any>} options.convertValToSlot
+ * @param {ConvertSlotToVal<any>} options.convertSlotToVal
  * @param {(vref: any) => boolean} options.maybeExportPromise
  */
 export function makeWatchedPromiseManager({ syscall, vrm, vom, collectionManager, convertValToSlot, convertSlotToVal, maybeExportPromise, }: {
     syscall: any;
-    vrm: import("./virtualReferences.js").VirtualReferenceManager;
-    vom: import("./virtualObjectManager.js").VirtualObjectManager;
+    vrm: VirtualReferenceManager;
+    vom: VirtualObjectManager;
     collectionManager: any;
-    convertValToSlot: import("@endo/marshal").ConvertValToSlot<any>;
-    convertSlotToVal: import("@endo/marshal").ConvertSlotToVal<any>;
+    convertValToSlot: ConvertValToSlot<any>;
+    convertSlotToVal: ConvertSlotToVal<any>;
     maybeExportPromise: (vref: any) => boolean;
 }): {
     preparePromiseWatcherTables: () => void;
     loadWatchedPromiseTable: (revivePromise: (vref: any) => Promise<any>) => void;
-    providePromiseWatcher: <V, A extends any[]>(kindHandle: import("./vatDataTypes.js").DurableKindHandle, fulfillHandler?: (value: V, ...args: A) => void, rejectHandler?: (reason: any, ...args: A) => void) => import("./types.js").PromiseWatcher<V, A>;
-    watchPromise: <P extends Promise<any>, A extends any[]>(p: P, watcher: import("./types.js").PromiseWatcher<Awaited<P>, A>, ...args: A) => void;
+    providePromiseWatcher: <V, A extends any[]>(kindHandle: DurableKindHandle, fulfillHandler?: (value: V, ...args: A) => void, rejectHandler?: (reason: any, ...args: A) => void) => PromiseWatcher<V, A>;
+    watchPromise: <P extends Promise<any>, A extends any[]>(p: P, watcher: PromiseWatcher<Awaited<P>, A>, ...args: A) => void;
 };
-export type PromiseWatcherTuple<V, A extends any[] = unknown[]> = [watcher: import("./types.js").PromiseWatcher<V, A>, ...args: A];
+export type PromiseWatcherTuple<V, A extends any[] = unknown[]> = [watcher: PromiseWatcher<V, A>, ...args: A];
+import type { VirtualReferenceManager } from './virtualReferences.js';
+import type { VirtualObjectManager } from './virtualObjectManager.js';
+import type { ConvertValToSlot } from '@endo/marshal';
+import type { ConvertSlotToVal } from '@endo/marshal';
+import type { DurableKindHandle } from './vatDataTypes.js';
+import type { PromiseWatcher } from './types.js';
 //# sourceMappingURL=watchedPromises.d.ts.map

package/src/watchedPromises.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watchedPromises.d.ts","sourceRoot":"","sources":["watchedPromises.js"],"names":[],"mappings":"AASA;;;;GAIG;AAEH;;;;;;;;;GASG;AACH,6IARG;IAAmB,OAAO,EAAlB,GAAC;IACiE,GAAG,EAArE,OAAO,wBAAwB,EAAE,uBAAuB;IACU,GAAG,EAArE,OAAO,2BAA2B,EAAE,oBAAoB;IAC7C,iBAAiB,EAA5B,GAAC;IACsD,gBAAgB,EAAvE,OAAO,eAAe,EAAE,gBAAgB,CAAC,GAAG,CAAC;IACU,gBAAgB,EAAvE,OAAO,eAAe,EAAE,gBAAgB,CAAC,GAAG,CAAC;IACb,kBAAkB,EAAlD,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO;CAChC;;6CA+GY,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,KACzB,IAAI;4BAiBJ,CAAC,EACO,CAAC,SAAR,GAAG,EAAG,cACT,OAAO,mBAAmB,EAAE,iBAAiB,mBAC7C,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,IAAI,kBAC9B,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,IAAI,KAC/B,OAAO,YAAY,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;mBAmC3C,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,GAAG,EAAE,KAAK,CAAC,WAAW,OAAO,YAAY,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,KAAK,IAAI;EAoE3I;gCA3PY,CAAC,EACQ,CAAC,SAAT,GAAG,EAAG,gBACP,CAAC,OAAO,EAAE,OAAO,YAAY,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC"}
+{"version":3,"file":"watchedPromises.d.ts","sourceRoot":"","sources":["watchedPromises.js"],"names":[],"mappings":"AASA;;;;;;;GAOG;AAEH;;;;GAIG;AAEH;;;;;;;;;GASG;AACH,6IARG;IAAmB,OAAO,EAAlB,GAAC;IACgC,GAAG,EAApC,uBAAuB;IACO,GAAG,EAAjC,oBAAoB;IACT,iBAAiB,EAA5B,GAAC;IAC8B,gBAAgB,EAA/C,iBAAiB,GAAG,CAAC;IACU,gBAAgB,EAA/C,iBAAiB,GAAG,CAAC;IACW,kBAAkB,EAAlD,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO;CAChC;;6CA+GY,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,KACzB,IAAI;4BAiBJ,CAAC,EACO,CAAC,SAAR,GAAG,EAAG,cACT,iBAAiB,mBACjB,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,IAAI,kBAC9B,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,IAAI,KAC/B,eAAe,CAAC,EAAE,CAAC,CAAC;mBAmCtB,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,GAAG,EAAE,KAAK,CAAC,WAAW,eAAe,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,KAAK,IAAI;EAoEtH;gCA3PY,CAAC,EACQ,CAAC,SAAT,GAAG,EAAG,gBACP,CAAC,OAAO,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;6CAVd,wBAAwB;0CAC3B,2BAA2B;sCAC/B,eAAe;sCACf,eAAe;uCACd,mBAAmB;oCALtB,YAAY"}

package/src/watchedPromises.js

@@ -7,20 +7,29 @@ import { E } from '@endo/eventual-send';
 import { initEmpty, M } from '@agoric/store';
 import { parseVatSlot } from './parseVatSlots.js';
 
+/**
+ * @import {PromiseWatcher} from './types.js';
+ * @import {VirtualReferenceManager} from './virtualReferences.js';
+ * @import {VirtualObjectManager} from './virtualObjectManager.js';
+ * @import {ConvertValToSlot} from '@endo/marshal';
+ * @import {ConvertSlotToVal} from '@endo/marshal';
+ * @import {DurableKindHandle} from './vatDataTypes.js';
+ */
+
 /**
  * @template V
  * @template {any[]} [A=unknown[]]
- * @typedef {[watcher: import('./types.js').PromiseWatcher<V, A>, ...args: A]} PromiseWatcherTuple
+ * @typedef {[watcher: PromiseWatcher<V, A>, ...args: A]} PromiseWatcherTuple
  */
 
 /**
  * @param {object} options
  * @param {*} options.syscall
- * @param {import('./virtualReferences.js').VirtualReferenceManager} options.vrm
- * @param {import('./virtualObjectManager.js').VirtualObjectManager} options.vom
+ * @param {VirtualReferenceManager} options.vrm
+ * @param {VirtualObjectManager} options.vom
  * @param {*} options.collectionManager
- * @param {import('@endo/marshal').ConvertValToSlot<any>} options.convertValToSlot
- * @param {import('@endo/marshal').ConvertSlotToVal<any>} options.convertSlotToVal
+ * @param {ConvertValToSlot<any>} options.convertValToSlot
+ * @param {ConvertSlotToVal<any>} options.convertSlotToVal
  * @param {(vref: any) => boolean} options.maybeExportPromise
  */
 export function makeWatchedPromiseManager({
@@ -54,7 +63,7 @@ export function makeWatchedPromiseManager({
   /**
    * defined promise watcher objects indexed by kindHandle
    *
-   * @type {MapStore<import('./vatDataTypes.js').DurableKindHandle, import('./types.js').PromiseWatcher<unknown>>}
+   * @type {MapStore<DurableKindHandle, PromiseWatcher<unknown>>}
    */
   let promiseWatcherByKindTable;
 
@@ -153,10 +162,10 @@ export function makeWatchedPromiseManager({
   /**
    * @template V
    * @template {any[]} A]
-   * @param {import('./vatDataTypes.js').DurableKindHandle} kindHandle
+   * @param {DurableKindHandle} kindHandle
    * @param {(value: V, ...args: A) => void} fulfillHandler
    * @param {(reason: any, ...args: A) => void} rejectHandler
-   * @returns {import('./types.js').PromiseWatcher<V, A>}
+   * @returns {PromiseWatcher<V, A>}
    */
   function providePromiseWatcher(
     kindHandle,
@@ -191,7 +200,7 @@ export function makeWatchedPromiseManager({
   }
 
   /**
-   * @type {<P extends Promise<any>, A extends any[]>(p: P, watcher: import('./types.js').PromiseWatcher<Awaited<P>, A>, ...args: A) => void}
+   * @type {<P extends Promise<any>, A extends any[]>(p: P, watcher: PromiseWatcher<Awaited<P>, A>, ...args: A) => void}
    */
   function watchPromise(p, watcher, ...args) {
     // The following wrapping defers setting up the promise watcher itself to a

package/test/dummyMeterControl.d.ts

@@ -1,2 +1,6 @@
-export function makeDummyMeterControl(): import("../src/types.js").MeterControl;
+/**
+ * @import {MeterControl} from '../src/types.js';
+ */
+export function makeDummyMeterControl(): MeterControl;
+import type { MeterControl } from '../src/types.js';
 //# sourceMappingURL=dummyMeterControl.d.ts.map

package/test/dummyMeterControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dummyMeterControl.d.ts","sourceRoot":"","sources":["dummyMeterControl.js"],"names":[],"mappings":"AAEA,gFAmDC"}
+{"version":3,"file":"dummyMeterControl.d.ts","sourceRoot":"","sources":["dummyMeterControl.js"],"names":[],"mappings":"AAEA;;GAEG;AAEH,sDAmDC;kCAtD8B,iBAAiB"}

package/test/dummyMeterControl.js

@@ -1,5 +1,9 @@
 import { assert } from '@endo/errors';
 
+/**
+ * @import {MeterControl} from '../src/types.js';
+ */
+
 export function makeDummyMeterControl() {
   let meteringDisabled = 0;
 
@@ -41,7 +45,7 @@ export function makeDummyMeterControl() {
     return harden(wrapped);
   }
 
-  /** @type { import('../src/types.js').MeterControl } */
+  /** @type { MeterControl } */
   const meterControl = {
     isMeteringDisabled,
     assertIsMetered,

package/test/liveslots-helpers.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @import {ExecutionContext} from 'ava';
+ */
 /**
  * @param {object} [options]
  * @param {boolean} [options.skipLogging]
@@ -28,7 +31,7 @@ export function makeDispatch(syscall: any, build: any, vatID?: string, liveSlots
     testHooks: any;
 }>;
 /**
- * @param {import('ava').ExecutionContext} t
+ * @param {ExecutionContext} t
  * @param {Function} buildRootObject
  * @param {string} vatName
  * @param {object} [options]
@@ -38,7 +41,7 @@ export function makeDispatch(syscall: any, build: any, vatID?: string, liveSlots
  * @param {boolean} [options.skipLogging]
  * @param {any} [options.vatParameters]
  */
-export function setupTestLiveslots(t: import("ava").ExecutionContext, buildRootObject: Function, vatName: string, options?: {
+export function setupTestLiveslots(t: ExecutionContext, buildRootObject: Function, vatName: string, options?: {
     forceGC?: boolean | undefined;
     kvStore?: Map<string, string> | undefined;
     nextPromiseImportNumber?: number | undefined;
@@ -46,7 +49,7 @@ export function setupTestLiveslots(t: import("ava").ExecutionContext, buildRootO
     vatParameters?: any;
 }): Promise<{
     v: {
-        t: import("ava").ExecutionContext<unknown>;
+        t: ExecutionContext;
         log: any[];
         fakestore: Map<any, any>;
         dumpFakestore: () => void;
@@ -61,4 +64,5 @@ export function setupTestLiveslots(t: import("ava").ExecutionContext, buildRootO
     testHooks: any;
 }>;
 export function findSyscallsByType(log: any, type: any): any;
+import type { ExecutionContext } from 'ava';
 //# sourceMappingURL=liveslots-helpers.d.ts.map

package/test/liveslots-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"liveslots-helpers.d.ts","sourceRoot":"","sources":["liveslots-helpers.js"],"names":[],"mappings":"AAgBA;;;;GAIG;AACH,uCAHG;IAA0B,WAAW;IACC,OAAO;CAAC;;;;;;;;;;;;;;;;EA2GhD;AAED;;;GA2BC;AAUD;;;;;;;;;;GAUG;AACH,sCAVW,OAAO,KAAK,EAAE,gBAAgB,sCAE9B,MAAM,YAEd;IAA0B,OAAO;IACK,OAAO;IACpB,uBAAuB;IACtB,WAAW;IACf,aAAa,GAA3B,GAAG;CAAyB;;;;;;;;;;;;;;;GA6GtC;AAED,6DAEC"}
+{"version":3,"file":"liveslots-helpers.d.ts","sourceRoot":"","sources":["liveslots-helpers.js"],"names":[],"mappings":"AAgBA;;GAEG;AAEH;;;;GAIG;AACH,uCAHG;IAA0B,WAAW;IACC,OAAO;CAAC;;;;;;;;;;;;;;;;EA2GhD;AAED;;;GA2BC;AAUD;;;;;;;;;;GAUG;AACH,sCAVW,gBAAgB,sCAEhB,MAAM,YAEd;IAA0B,OAAO;IACK,OAAO;IACpB,uBAAuB;IACtB,WAAW;IACf,aAAa,GAA3B,GAAG;CAAyB;;;;;;;;;;;;;;;GA6GtC;AAED,6DAEC;sCAlRkC,KAAK"}

package/test/liveslots-helpers.js

@@ -14,6 +14,10 @@ import {
   makeBringOutYourDead,
 } from './util.js';
 
+/**
+ * @import {ExecutionContext} from 'ava';
+ */
+
 /**
  * @param {object} [options]
  * @param {boolean} [options.skipLogging]
@@ -164,7 +168,7 @@ function makeRPMaker(nextNumber = 1) {
 }
 
 /**
- * @param {import('ava').ExecutionContext} t
+ * @param {ExecutionContext} t
  * @param {Function} buildRootObject
  * @param {string} vatName
  * @param {object} [options]

package/test/virtual-objects/state-shape.test.js

@@ -11,7 +11,10 @@ import { makeStartVat, makeMessage } from '../util.js';
 import { makeMockGC } from '../mock-gc.js';
 import { makeFakeVirtualStuff } from '../../tools/fakeVirtualSupport.js';
 
-/** @import {VatOneResolution} from '../../src/types.js'; */
+/**
+ * @import {VatOneResolution} from '../../src/types.js';
+ * @import {Pattern} from '@endo/patterns';
+ */
 /** @import {VatData} from '../../src/vatDataTypes.js'; */
 
 let lastPnum = 100;
@@ -63,7 +66,7 @@ const holderMethods = {
  * @template {VatData.defineKind | VatData.defineDurableKind} D
  * @param {D} defineKind
  * @param {Parameters<D>[0]} kindIdentifier
- * @param {import('@endo/patterns').Pattern} stateShape
+ * @param {Pattern} stateShape
  */
 const defineHolder = (defineKind, kindIdentifier, stateShape) =>
   defineKind(kindIdentifier, initHolder, holderMethods, { stateShape });

package/tools/fakeVirtualSupport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fakeVirtualSupport.d.ts","sourceRoot":"","sources":["fakeVirtualSupport.js"],"names":[],"mappings":"AAyCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuQC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAcC;AAED;;;4IA5HwB,GAAI,gDAE1B,GAAC;;EAyIF;AAED;;;;;;;;;;GAUG;AACH,+CAPG;IAAyB,SAAS;IACR,oBAAoB;IACR,SAAS;IACV,OAAO;IACP,OAAO;IAClB,IAAI;CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qEAjFH,GAC9B,+IAKuB,GAAG;0EAQd,GAAG,uJAKV,GAAG;+HAeL,GAAG,+IAKiB,GAAG;oIAOA,GAC1B,uJAGG,GAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gJAvHkB,GAAI,gDAE1B,GAAC;;;EAqKF;AAED;;;;;;;;iEApG+B,GAC9B,+IAKuB,GAAG;sEAQd,GAAG,uJAKV,GAAG;2HAeL,GAAG,+IAKiB,GAAG;gIAOA,GAC1B,uJAGG,GAAE;;;;;;;;;;;;;;;;;;;EA0DL;AAED;;;;;;;;;;;;EAMC"}
+{"version":3,"file":"fakeVirtualSupport.d.ts","sourceRoot":"","sources":["fakeVirtualSupport.js"],"names":[],"mappings":"AAyCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuQC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAcC;AAED;;;4IAtHM,GAAC,gDACyB,GAAI;;EAoInC;AAED;;;;;;;;;;GAUG;AACH,+CAPG;IAAyB,SAAS;IACR,oBAAoB;IACR,SAAS;IACV,OAAO;IACP,OAAO;IAClB,IAAI;CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qEAjFH,GAC9B,+IAKuB,GAAG;0EAQd,GAAG,uJAKV,GAAG;+HAeL,GAAG,+IAKiB,GAAG;oIAOA,GAC1B,uJAGG,GAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gJAjHA,GAAC,gDACyB,GAAI;;;EAgKnC;AAED;;;;;;;;iEApG+B,GAC9B,+IAKuB,GAAG;sEAQd,GAAG,uJAKV,GAAG;2HAeL,GAAG,+IAKiB,GAAG;gIAOA,GAC1B,uJAGG,GAAE;;;;;;;;;;;;;;;;;;;EA0DL;AAED;;;;;;;;;;;;EAMC"}

package/tools/setup-vat-data.d.ts

@@ -1,9 +1,10 @@
 export function flushIncarnation(options?: Partial<ReincarnateOptions>): Omit<ReincarnateOptions, "fakeVomKit">;
 export function reincarnate(options?: Partial<ReincarnateOptions>): ReincarnateOptions;
 export type FakeVomKit = ReturnType<typeof makeFakeVirtualStuff>;
-export type ReincarnateOptions = import("@agoric/internal").Simplify<Omit<NonNullable<Parameters<typeof makeFakeVirtualStuff>[0]>, "WeakMap" | "WeakSet"> & {
+export type ReincarnateOptions = Simplify<Omit<NonNullable<Parameters<typeof makeFakeVirtualStuff>[0]>, "WeakMap" | "WeakSet"> & {
     fakeVomKit: FakeVomKit;
     fakeStore: Map<string, string>;
 }>;
 import { makeFakeVirtualStuff } from './fakeVirtualSupport.js';
+import type { Simplify } from '@agoric/internal';
 //# sourceMappingURL=setup-vat-data.d.ts.map

package/tools/setup-vat-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-vat-data.d.ts","sourceRoot":"","sources":["setup-vat-data.js"],"names":[],"mappings":"AA2DO,2CAHI,OAAO,CAAC,kBAAkB,CAAC,GACzB,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAelD;AAOM,sCAHI,OAAO,CAAC,kBAAkB,CAAC,GACzB,kBAAkB,CAiB9B;yBAjFa,UAAU,CAAC,OAAO,oBAAoB,CAAC;iCAmCxC,OAAO,kBAAkB,EAAE,QAAQ,CAC3C,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC,GACxF;IAAM,UAAU,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAC3D;qCA1CiC,yBAAyB"}
+{"version":3,"file":"setup-vat-data.d.ts","sourceRoot":"","sources":["setup-vat-data.js"],"names":[],"mappings":"AA+DO,2CAHI,OAAO,CAAC,kBAAkB,CAAC,GACzB,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAelD;AAOM,sCAHI,OAAO,CAAC,kBAAkB,CAAC,GACzB,kBAAkB,CAiB9B;yBAjFa,UAAU,CAAC,OAAO,oBAAoB,CAAC;iCAmCxC,SACR,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC,GACxF;IAAM,UAAU,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAC3D;qCA9CiC,yBAAyB;8BAGnC,kBAAkB"}

package/tools/setup-vat-data.js

@@ -9,6 +9,10 @@ import { passStyleOf } from '@endo/pass-style';
 import { PassStyleOfEndowmentSymbol } from '@endo/pass-style/endow.js';
 import { makeFakeVirtualStuff } from './fakeVirtualSupport.js';
 
+/**
+ * @import {Simplify} from '@agoric/internal';
+ */
+
 const { WeakMap, WeakSet } = globalThis;
 
 /** @typedef {ReturnType<typeof makeFakeVirtualStuff>} FakeVomKit */
@@ -46,7 +50,7 @@ globalThis.VatData = harden({
 globalThis[PassStyleOfEndowmentSymbol] = passStyleOf;
 
 /**
- * @typedef {import("@agoric/internal").Simplify<
+ * @typedef {Simplify<
  *   Omit<NonNullable<Parameters<typeof makeFakeVirtualStuff>[0]>, 'WeakMap' | 'WeakSet'> &
  *   { fakeVomKit: FakeVomKit; fakeStore: Map<string, string> }
  * >} ReincarnateOptions

package/tools/vo-test-harness.d.ts

@@ -1,5 +1,5 @@
 export function runVOTest(t: any, prepare: any, makeTestObject: any, testTestObject: any): Promise<void>;
-export function makeSpy(t: import("ava").ExecutionContext): {
+export function makeSpy(t: ExecutionContext): {
     fail: (msg: any) => void;
     falsy: (check: any, msg: any) => void;
     failureMessage: string;
@@ -30,4 +30,5 @@ export function makeSpy(t: import("ava").ExecutionContext): {
     true: import("ava").TrueAssertion;
     truthy: import("ava").TruthyAssertion;
 };
+import type { ExecutionContext } from 'ava';
 //# sourceMappingURL=vo-test-harness.d.ts.map

package/tools/vo-test-harness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vo-test-harness.d.ts","sourceRoot":"","sources":["vo-test-harness.js"],"names":[],"mappings":"AA8FA,yGAqEC;AAxJM,2BAFI,OAAO,KAAK,EAAE,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiBxC"}
+{"version":3,"file":"vo-test-harness.d.ts","sourceRoot":"","sources":["vo-test-harness.js"],"names":[],"mappings":"AAkGA,yGAqEC;AAxJM,2BAFI,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiB1B;sCA1BkC,KAAK"}

package/tools/vo-test-harness.js

@@ -1,13 +1,17 @@
 import { Far } from '@endo/marshal';
 import { setupTestLiveslots } from '../test/liveslots-helpers.js';
 
+/**
+ * @import {ExecutionContext} from 'ava';
+ */
+
 // This file contains a test harness for virtual objects. runVOTest()
 // is to to help verify that a VO can be garbage collected and then
 // reloaded from persistent storage while maintaining functionality.
 
 /**
  * A spy wrapping Ava's t for tests that are testing the harness itself.
- * @param {import('ava').ExecutionContext} t
+ * @param {ExecutionContext} t
  */
 export const makeSpy = t => {
   const tSpy = {