@agoric/vat-data 0.5.3-mainnet1B-dev-b0c1f78.0 → 0.5.3-orchestration-dev-096c4e8.0

package/CHANGELOG.md

@@ -3,38 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-### [0.5.3-u13.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/vat-data@0.5.3-u12.0...@agoric/vat-data@0.5.3-u13.0) (2023-12-07)
-
-**Note:** Version bump only for package @agoric/vat-data
-
-
-
-
-
-### [0.5.3-u12.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/vat-data@0.5.3-u11wf.0...@agoric/vat-data@0.5.3-u12.0) (2023-11-10)
-
-**Note:** Version bump only for package @agoric/vat-data
-
-
-
-
-
-### [0.5.3-u11wf.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/vat-data@0.5.3-u11.0...@agoric/vat-data@0.5.3-u11wf.0) (2023-09-23)
-
-**Note:** Version bump only for package @agoric/vat-data
-
-
-
-
-
-### [0.5.3-u11.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/vat-data@0.5.2...@agoric/vat-data@0.5.3-u11.0) (2023-08-24)
-
-**Note:** Version bump only for package @agoric/vat-data
-
-
-
-
-
 ### [0.5.2](https://github.com/Agoric/agoric-sdk/compare/@agoric/vat-data@0.5.1...@agoric/vat-data@0.5.2) (2023-06-02)
 
 **Note:** Version bump only for package @agoric/vat-data

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vat-data",
-  "version": "0.5.3-mainnet1B-dev-b0c1f78.0+b0c1f78",
+  "version": "0.5.3-orchestration-dev-096c4e8.0+096c4e8",
   "description": "Safe access to VatData global",
   "type": "module",
   "repository": "https://github.com/Agoric/agoric-sdk",
@@ -19,14 +19,27 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-mainnet1B-dev-b0c1f78.0+b0c1f78",
-    "@agoric/internal": "0.4.0-mainnet1B-dev-b0c1f78.0+b0c1f78",
-    "@agoric/store": "0.9.3-mainnet1B-dev-b0c1f78.0+b0c1f78"
+    "@agoric/assert": "0.6.1-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/base-zone": "0.1.1-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/internal": "0.3.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/store": "0.9.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/swingset-liveslots": "0.10.3-orchestration-dev-096c4e8.0+096c4e8",
+    "@agoric/vow": "0.1.1-orchestration-dev-096c4e8.0+096c4e8"
   },
   "devDependencies": {
-    "@agoric/swingset-vat": "0.32.3-mainnet1B-dev-b0c1f78.0+b0c1f78",
-    "ava": "^5.2.0",
-    "tsd": "^0.28.1"
+    "@endo/far": "^1.0.4",
+    "@endo/init": "^1.0.4",
+    "@endo/ses-ava": "^1.1.2",
+    "ava": "^5.3.0",
+    "tsd": "^0.30.4"
+  },
+  "ava": {
+    "require": [
+      "@endo/init/debug.js"
+    ],
+    "files": [
+      "test/**/test-*.js"
+    ]
   },
   "publishConfig": {
     "access": "public"
@@ -34,5 +47,8 @@
   "engines": {
     "node": ">=14.15.0"
   },
-  "gitHead": "b0c1f788a06e8593426319de068acd64a390d349"
+  "typeCoverage": {
+    "atLeast": 98.78
+  },
+  "gitHead": "096c4e8fce80e9a509b0e1a30fda11736c4570e1"
 }

package/src/exo-utils.js

@@ -1,22 +1,28 @@
 // @jessie-check
-
+/* eslint-disable @typescript-eslint/prefer-ts-expect-error -- for casting from deprecated types that aren't worth fixing */
 import { initEmpty } from '@agoric/store';
 
 import { provide, VatData as globalVatData } from './vat-data-bindings.js';
 
+/** @typedef {import('@endo/patterns').MethodGuard} MethodGuard */
+/**
+ * @template {Record<PropertyKey, MethodGuard>} [T=Record<PropertyKey, MethodGuard>]
+ * @typedef {import('@endo/patterns').InterfaceGuard<T>} InterfaceGuard
+ */
 /** @template L,R @typedef {import('@endo/eventual-send').RemotableBrand<L, R>} RemotableBrand */
 /** @template T @typedef {import('@endo/far').ERef<T>} ERef */
-/** @typedef {import('./types.js').Baggage} Baggage */
-/** @template T @typedef {import('./types.js').DefineKindOptions<T>} DefineKindOptions */
-/** @template T @typedef {import('./types.js').KindFacet<T>} KindFacet */
-/** @template T @typedef {import('./types.js').KindFacets<T>} KindFacets */
-/** @typedef {import('./types.js').DurableKindHandle} DurableKindHandle */
+/** @typedef {import('@agoric/swingset-liveslots').Baggage} Baggage */
+/** @template T @typedef {import('@agoric/swingset-liveslots').DefineKindOptions<T>} DefineKindOptions */
+/** @template T @typedef {import('@agoric/swingset-liveslots').KindFacet<T>} KindFacet */
+/** @template T @typedef {import('@agoric/swingset-liveslots').KindFacets<T>} KindFacets */
+/** @typedef {import('@agoric/swingset-liveslots').DurableKindHandle} DurableKindHandle */
+/** @typedef {import('@agoric/swingset-liveslots').InterfaceGuardKit} InterfaceGuardKit */
 
 /**
  * Make a version of the argument function that takes a kind context but
  * ignores it.
  *
- * @type {<T extends Function>(fn: T) => import('./types.js').PlusContext<never, T>}
+ * @type {<T extends Function>(fn: T) => import('@agoric/swingset-liveslots').PlusContext<never, T>}
  */
 export const ignoreContext =
   fn =>
@@ -25,6 +31,7 @@ export const ignoreContext =
 harden(ignoreContext);
 
 // TODO: Find a good home for this function used by @agoric/vat-data and testing code
+/** @param {import('@agoric/swingset-liveslots').VatData} VatData */
 export const makeExoUtils = VatData => {
   const {
     defineKind,
@@ -35,6 +42,7 @@ export const makeExoUtils = VatData => {
   } = VatData;
 
   /**
+   * @deprecated Use Exos/ExoClasses instead of Kinds
    * @param {Baggage} baggage
    * @param {string} kindName
    * @returns {DurableKindHandle}
@@ -45,7 +53,7 @@ export const makeExoUtils = VatData => {
 
   /**
    * @deprecated Use prepareExoClass instead
-   * @type {import('./types.js').PrepareKind}
+   * @type {import('@agoric/swingset-liveslots').PrepareKind}
    */
   const prepareKind = (
     baggage,
@@ -64,7 +72,7 @@ export const makeExoUtils = VatData => {
 
   /**
    * @deprecated Use prepareExoClassKit instead
-   * @type {import('./types.js').PrepareKindMulti}
+   * @type {import('@agoric/swingset-liveslots').PrepareKindMulti}
    */
   const prepareKindMulti = (
     baggage,
@@ -81,18 +89,25 @@ export const makeExoUtils = VatData => {
     );
   harden(prepareKindMulti);
 
-  // TODO interfaceGuard type https://github.com/Agoric/agoric-sdk/issues/6206
   /**
    * @template {(...args: any) => any} I init state function
    * @template T behavior
    * @param {string} tag
-   * @param {any} interfaceGuard
+   * @param {InterfaceGuard | undefined} interfaceGuard
    * @param {I} init
-   * @param {T & ThisType<{ self: T, state: ReturnType<I> }>} methods
-   * @param {DefineKindOptions<{ self: T, state: ReturnType<I> }>} [options]
-   * @returns {(...args: Parameters<I>) => (T & RemotableBrand<{}, T>)}
+   * @param {T & ThisType<{
+   *   self: T,
+   *   state: ReturnType<I>
+   * }>} methods
+   * @param {DefineKindOptions<{
+   *   self: T,
+   *   state: ReturnType<I>
+   * }>} [options]
+   * @returns {(...args: Parameters<I>) => import('@endo/exo/src/exo-makers.js').Guarded<T>}
    */
   const defineVirtualExoClass = (tag, interfaceGuard, init, methods, options) =>
+    // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
+    // @ts-ignore cast
     defineKind(tag, init, methods, {
       ...options,
       thisfulMethods: true,
@@ -100,16 +115,21 @@ export const makeExoUtils = VatData => {
     });
   harden(defineVirtualExoClass);
 
-  // TODO interfaceGuard type https://github.com/Agoric/agoric-sdk/issues/6206
   /**
    * @template {(...args: any) => any} I init state function
-   * @template {Record<string, Record<string | symbol, CallableFunction>>} T facets
+   * @template {Record<string, Record<PropertyKey, CallableFunction>>} T facets
    * @param {string} tag
-   * @param {any} interfaceGuardKit
+   * @param {InterfaceGuardKit | undefined} interfaceGuardKit
    * @param {I} init
-   * @param {T & ThisType<{ facets: T, state: ReturnType<I> }> } facets
-   * @param {DefineKindOptions<{ facets: T, state: ReturnType<I> }>} [options]
-   * @returns {(...args: Parameters<I>) => (T & RemotableBrand<{}, T>)}
+   * @param {T & ThisType<{
+   *   facets: import('@endo/exo/src/exo-makers.js').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>}
    */
   const defineVirtualExoClassKit = (
     tag,
@@ -118,23 +138,29 @@ export const makeExoUtils = VatData => {
     facets,
     options,
   ) =>
+    // @ts-ignore cast
     defineKindMulti(tag, init, facets, {
       ...options,
       thisfulMethods: true,
-      interfaceGuard: interfaceGuardKit,
+      interfaceGuardKit,
     });
   harden(defineVirtualExoClassKit);
 
-  // TODO interfaceGuard type https://github.com/Agoric/agoric-sdk/issues/6206
   /**
    * @template {(...args: any) => any} I init state function
-   * @template {Record<string | symbol, CallableFunction>} T methods
+   * @template {Record<PropertyKey, CallableFunction>} T methods
    * @param {DurableKindHandle} kindHandle
-   * @param {any} interfaceGuard
+   * @param {InterfaceGuard | undefined} interfaceGuard
    * @param {I} init
-   * @param {T & ThisType<{ self: T, state: ReturnType<I> }>} methods
-   * @param {DefineKindOptions<{ self: T, state: ReturnType<I> }>} [options]
-   * @returns {(...args: Parameters<I>) => (T & RemotableBrand<{}, T>)}
+   * @param {T & ThisType<{
+   *   self: T,
+   *   state: ReturnType<I>
+   * }>} methods
+   * @param {DefineKindOptions<{
+   *   self: T,
+   *   state: ReturnType<I>
+   * }>} [options]
+   * @returns {(...args: Parameters<I>) => import('@endo/exo/src/exo-makers.js').Guarded<T>}
    */
   const defineDurableExoClass = (
     kindHandle,
@@ -143,6 +169,7 @@ export const makeExoUtils = VatData => {
     methods,
     options,
   ) =>
+    // @ts-ignore cast
     defineDurableKind(kindHandle, init, methods, {
       ...options,
       thisfulMethods: true,
@@ -150,16 +177,21 @@ export const makeExoUtils = VatData => {
     });
   harden(defineDurableExoClass);
 
-  // TODO interfaceGuard type https://github.com/Agoric/agoric-sdk/issues/6206
   /**
    * @template {(...args: any) => any} I init state function
-   * @template {Record<string, Record<string | symbol, CallableFunction>>} T facets
+   * @template {Record<string, Record<PropertyKey, CallableFunction>>} T facets
    * @param {DurableKindHandle} kindHandle
-   * @param {any} interfaceGuardKit
+   * @param {InterfaceGuardKit | undefined} interfaceGuardKit
    * @param {I} init
-   * @param {T & ThisType<{ facets: T, state: ReturnType<I>}> } facets
-   * @param {DefineKindOptions<{ facets: T, state: ReturnType<I>}>} [options]
-   * @returns {(...args: Parameters<I>) => (T & RemotableBrand<{}, T>)}
+   * @param {T & ThisType<{
+   *   facets: import('@endo/exo/src/exo-makers.js').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>}
    */
   const defineDurableExoClassKit = (
     kindHandle,
@@ -168,24 +200,30 @@ export const makeExoUtils = VatData => {
     facets,
     options,
   ) =>
+    // @ts-ignore cast
     defineDurableKindMulti(kindHandle, init, facets, {
       ...options,
       thisfulMethods: true,
-      interfaceGuard: interfaceGuardKit,
+      interfaceGuardKit,
     });
   harden(defineDurableExoClassKit);
 
-  // TODO interfaceGuard type https://github.com/Agoric/agoric-sdk/issues/6206
   /**
    * @template {(...args: any) => any} I init state function
-   * @template {Record<string | symbol, CallableFunction>} T methods
+   * @template {Record<PropertyKey, CallableFunction>} T methods
    * @param {Baggage} baggage
    * @param {string} kindName
-   * @param {any} interfaceGuard
+   * @param {InterfaceGuard | undefined} interfaceGuard
    * @param {I} init
-   * @param {T & ThisType<{ self: T, state: ReturnType<I> }>} methods
-   * @param {DefineKindOptions<{ self: T, state: ReturnType<I> }>} [options]
-   * @returns {(...args: Parameters<I>) => (T & RemotableBrand<{}, T>)}
+   * @param {T & ThisType<{
+   *   self: T,
+   *   state: ReturnType<I>
+   * }>} methods
+   * @param {DefineKindOptions<{
+   *   self: T,
+   *   state: ReturnType<I>
+   * }>} [options]
+   * @returns {(...args: Parameters<I>) => import('@endo/exo/src/exo-makers.js').Guarded<T>}
    */
   const prepareExoClass = (
     baggage,
@@ -204,17 +242,22 @@ export const makeExoUtils = VatData => {
     );
   harden(prepareExoClass);
 
-  // TODO interfaceGuard type https://github.com/Agoric/agoric-sdk/issues/6206
   /**
    * @template {(...args: any) => any} I init state function
-   * @template {Record<string, Record<string | symbol, CallableFunction>>} T facets
+   * @template {Record<string, Record<PropertyKey, CallableFunction>>} T facets
    * @param {Baggage} baggage
    * @param {string} kindName
-   * @param {any} interfaceGuardKit
+   * @param {InterfaceGuardKit | undefined} interfaceGuardKit
    * @param {I} init
-   * @param {T & ThisType<{ facets: T, state: ReturnType<I> }> } facets
-   * @param {DefineKindOptions<{ facets: T, state: ReturnType<I> }>} [options]
-   * @returns {(...args: Parameters<I>) => (T & RemotableBrand<{}, T>)}
+   * @param {T & ThisType<{
+   *   facets: import('@endo/exo/src/exo-makers.js').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>}
    */
   const prepareExoClassKit = (
     baggage,
@@ -233,15 +276,14 @@ export const makeExoUtils = VatData => {
     );
   harden(prepareExoClassKit);
 
-  // TODO interfaceGuard type https://github.com/Agoric/agoric-sdk/issues/6206
   /**
-   * @template {Record<string | symbol, CallableFunction>} M methods
+   * @template {Record<PropertyKey, CallableFunction>} M methods
    * @param {Baggage} baggage
    * @param {string} kindName
-   * @param {any} interfaceGuard
+   * @param {InterfaceGuard | undefined} interfaceGuard
    * @param {M} methods
    * @param {DefineKindOptions<{ self: M }>} [options]
-   * @returns {M & RemotableBrand<{}, M>}
+   * @returns {import('@endo/exo/src/exo-makers.js').Guarded<M>}
    */
   const prepareExo = (
     baggage,
@@ -264,13 +306,13 @@ export const makeExoUtils = VatData => {
   harden(prepareExo);
 
   /**
-   * @template {Record<string | symbol, CallableFunction>} M methods
+   * @template {Record<PropertyKey, CallableFunction>} M methods
    * @deprecated Use prepareExo instead.
    * @param {Baggage} baggage
    * @param {string} kindName
    * @param {M} methods
    * @param {DefineKindOptions<{ self: M }>} [options]
-   * @returns {M & RemotableBrand<{}, M>}
+   * @returns {import('@endo/exo/src/exo-makers.js').Guarded<M>}
    */
   const prepareSingleton = (baggage, kindName, methods, options = undefined) =>
     prepareExo(baggage, kindName, undefined, methods, options);
@@ -284,8 +326,8 @@ export const makeExoUtils = VatData => {
     prepareExoClass,
     prepareExoClassKit,
     prepareExo,
-    prepareSingleton,
 
+    prepareSingleton,
     provideKindHandle,
     prepareKind,
     prepareKindMulti,

package/src/index.js

@@ -42,9 +42,12 @@ export {
   prepareSingleton,
 } from './exo-utils.js';
 
-/** @typedef {import('./types.js').Baggage} Baggage */
-/** @typedef {import('./types.js').DurableKindHandle} DurableKindHandle */
-/** @template T @typedef {import('./types.js').DefineKindOptions<T>} DefineKindOptions */
+/** @typedef {import('@agoric/swingset-liveslots').DurableKindHandle} DurableKindHandle */
+/** @template T @typedef {import('@agoric/swingset-liveslots').DefineKindOptions<T>} DefineKindOptions */
+
+// Copy this type because aliasing it by `import('@agoric/swingset-liveslots').Baggage`
+// causes this error in typedoc: Expected a symbol for node with kind Identifier
+/** @typedef {MapStore<string, any>} Baggage */
 
 // //////////////////////////// deprecated /////////////////////////////////////
 

package/src/index.test-d.ts

@@ -1,18 +1,23 @@
-/* eslint-disable no-use-before-define, import/no-extraneous-dependencies */
+/* eslint-disable no-use-before-define */
 import { expectType } from 'tsd';
+import type {
+  KindFacets,
+  DurableKindHandle,
+  KindFacet,
+  FunctionsPlusContext,
+} from '@agoric/swingset-liveslots';
+import { VirtualObjectManager } from '@agoric/swingset-liveslots/src/virtualObjectManager.js';
 import {
   defineKind,
   defineKindMulti,
   makeKindHandle,
   defineDurableKind,
   partialAssign,
+  watchPromise,
 } from '.';
-import {
-  KindFacets,
-  DurableKindHandle,
-  KindFacet,
-  FunctionsPlusContext,
-} from './types.js';
+
+// for use in assignments below
+const anyVal = null as any;
 
 /*
 export const makePaymentMaker = (allegedName: string, brand: unknown) => {
@@ -154,7 +159,32 @@ const someBehavior: FunctionsPlusContext<SomeContext, SomeFacet> = {
     return b > context.state.a;
   },
 };
-const someFacet: KindFacet<typeof someBehavior> = null as any;
+const someFacet: KindFacet<typeof someBehavior> = anyVal;
 // @ts-expect-error
 someFacet.gt();
 expectType<boolean>(someFacet.gt(1));
+
+const vom: VirtualObjectManager = anyVal;
+// @ts-expect-error
+vom.missingMethod;
+// @ts-expect-error Expected 0-4 arguments but got 5
+vom.defineDurableKind(anyVal, anyVal, anyVal, anyVal, 'extra');
+
+const p: Promise<bigint> = anyVal;
+watchPromise(
+  p,
+  {
+    onFulfilled(value, extra1, extra2) {
+      expectType<bigint>(value);
+      expectType<string>(extra1);
+      // @ts-expect-error str
+      expectType<number>(extra2);
+    },
+    onRejected(reason, extra1) {
+      expectType<unknown>(reason);
+      expectType<string>(extra1);
+    },
+  },
+  'extraString',
+  'alsoString',
+);

package/src/vat-data-bindings.js

@@ -3,7 +3,7 @@
 import { Fail } from '@agoric/assert';
 import { provideLazy } from '@agoric/store';
 
-/** @type {import('./types').VatData} */
+/** @type {import('@agoric/swingset-liveslots').VatData} */
 let VatDataGlobal;
 if ('VatData' in globalThis) {
   globalThis.VatData || Fail`VatData defined in global as null or undefined`;
@@ -12,20 +12,20 @@ if ('VatData' in globalThis) {
   // XXX this module has been known to get imported (transitively) in cases that
   // never use it so we make a version that will satisfy module resolution but
   // fail at runtime.
-  const unvailable = () => Fail`VatData unavailable`;
+  const unavailable = () => Fail`VatData unavailable`;
   VatDataGlobal = {
-    defineKind: unvailable,
-    defineKindMulti: unvailable,
-    defineDurableKind: unvailable,
-    defineDurableKindMulti: unvailable,
-    makeKindHandle: unvailable,
-    providePromiseWatcher: unvailable,
-    watchPromise: unvailable,
-    makeScalarBigMapStore: unvailable,
-    makeScalarBigWeakMapStore: unvailable,
-    makeScalarBigSetStore: unvailable,
-    makeScalarBigWeakSetStore: unvailable,
-    canBeDurable: unvailable,
+    defineKind: unavailable,
+    defineKindMulti: unavailable,
+    defineDurableKind: unavailable,
+    defineDurableKindMulti: unavailable,
+    makeKindHandle: unavailable,
+    providePromiseWatcher: unavailable,
+    watchPromise: unavailable,
+    makeScalarBigMapStore: unavailable,
+    makeScalarBigWeakMapStore: unavailable,
+    makeScalarBigSetStore: unavailable,
+    makeScalarBigWeakSetStore: unavailable,
+    canBeDurable: unavailable,
   };
 }
 
@@ -62,7 +62,7 @@ export const {
  *
  *     const makeFoo = pickFacet(makeFooBase, 'self');
  *
- * @type {import('./types').PickFacet}
+ * @type {import('@agoric/swingset-liveslots').PickFacet}
  */
 export const pickFacet =
   (maker, facetName) =>
@@ -107,8 +107,8 @@ harden(partialAssign);
  *   intended to eventually be durable has not yet been made durable.  A store
  *   marked as fakeDurable will appear to operate normally but any attempt to
  *   upgrade its containing vat will fail with an error.
- * @property {import('./types').Pattern} [keyShape]
- * @property {import('./types').Pattern} [valueShape]
+ * @property {import('@agoric/swingset-liveslots').Pattern} [keyShape]
+ * @property {import('@agoric/swingset-liveslots').Pattern} [valueShape]
  */
 /**
  * Unlike `provideLazy`, `provide` should be called at most once
@@ -138,12 +138,12 @@ harden(partialAssign);
 
 export const provide =
   // XXX cast because provideLazy is `any` due to broken type import
-  /** @type {<K, V>(baggage: import('./types.js').Baggage, key: K, makeValue: (key: K) => V) => V} */ (
+  /** @type {<K, V>(baggage: import('@agoric/swingset-liveslots').Baggage, key: K, makeValue: (key: K) => V) => V} */ (
     provideLazy
   );
 
 // TODO: Find a good home for this function used by @agoric/vat-data and testing code
-/** @param {import('@agoric/vat-data/src/types').VatData} VatData */
+/** @param {import('@agoric/swingset-liveslots').VatData} VatData */
 export const makeStoreUtils = VatData => {
   const {
     // eslint-disable-next-line no-shadow -- these literally do shadow the globals
@@ -157,7 +157,7 @@ export const makeStoreUtils = VatData => {
   } = VatData;
 
   /**
-   * @param {import('./types').Baggage} baggage
+   * @param {import('@agoric/swingset-liveslots').Baggage} baggage
    * @param {string} name
    * @param {Omit<StoreOptions, 'durable'>} options
    */
@@ -168,7 +168,7 @@ export const makeStoreUtils = VatData => {
   harden(provideDurableMapStore);
 
   /**
-   * @param {import('./types').Baggage} baggage
+   * @param {import('@agoric/swingset-liveslots').Baggage} baggage
    * @param {string} name
    * @param {Omit<StoreOptions, 'durable'>} options
    */
@@ -179,7 +179,7 @@ export const makeStoreUtils = VatData => {
   harden(provideDurableWeakMapStore);
 
   /**
-   * @param {import('./types').Baggage} baggage
+   * @param {import('@agoric/swingset-liveslots').Baggage} baggage
    * @param {string} name
    * @param {Omit<StoreOptions, 'durable'>} options
    */
@@ -190,7 +190,7 @@ export const makeStoreUtils = VatData => {
   harden(provideDurableSetStore);
 
   /**
-   * @param {import('./types').Baggage} baggage
+   * @param {import('@agoric/swingset-liveslots').Baggage} baggage
    * @param {string} name
    * @param {Omit<StoreOptions, 'durable'>} options
    */

package/test/prepare-test-env-ava.js

@@ -0,0 +1,7 @@
+import './prepare-test-env.js';
+
+import { wrapTest } from '@endo/ses-ava';
+import rawTest from 'ava';
+
+/** @type {typeof rawTest} */
+export const test = wrapTest(rawTest);

package/test/prepare-test-env.js

@@ -0,0 +1 @@
+import '@agoric/swingset-liveslots/tools/prepare-test-env.js';

package/test/{absent.test.js → test-absent.js}

@@ -1,9 +1,13 @@
-import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import test from 'ava';
+
 /* global globalThis */
+// @ts-expect-error VatData not optional
 delete globalThis.VatData;
 
 /** @see present.test.js */
 test('methods available that throw', async t => {
   const { defineKind } = await import('../src/index.js');
-  t.throws(defineKind, { message: /VatData unavailable/ });
+  t.throws(() => defineKind('someTag', () => {}, {}), {
+    message: /VatData unavailable/,
+  });
 });

package/test/test-durable-classes.js

@@ -1,6 +1,8 @@
 // Modeled on test-heap-classes.js
 
-import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { test } from './prepare-test-env-ava.js';
+
+// eslint-disable-next-line import/order
 import { M } from '@agoric/store';
 import {
   makeKindHandle,
@@ -31,7 +33,7 @@ test('test defineDurableExoClass', t => {
   const makeUpCounter = defineDurableExoClass(
     upCounterKind,
     UpCounterI,
-    /** @param {number} x */
+    /** @param {number} [x] */
     (x = 0) => ({ x }),
     {
       incr(y = 1) {
@@ -67,7 +69,7 @@ test('test defineDurableExoClassKit', t => {
   const makeCounterKit = defineDurableExoClassKit(
     counterKindHandle,
     { up: UpCounterI, down: DownCounterI },
-    /** @param {number} x */
+    /** @param {number} [x] */
     (x = 0) => ({ x }),
     {
       up: {
@@ -122,7 +124,7 @@ test('finish option', t => {
     UpCounterI,
     /**
      * @param {string} name
-     * @param {number} x
+     * @param {number} [x]
      */
     (name, x = 0) => ({ name, x }),
     {

package/test/test-prepare.js

@@ -1,6 +1,8 @@
 // Modeled on test-heap-classes.js
 
-import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { test } from './prepare-test-env-ava.js';
+
+// eslint-disable-next-line import/order
 import { M } from '@agoric/store';
 import {
   prepareExoClass,
@@ -30,7 +32,7 @@ test('test prepareExoClass', t => {
     baggage,
     'UpCounter',
     UpCounterI,
-    /** @param {number} x */
+    /** @param {number} [x] */
     (x = 0) => ({ x }),
     {
       incr(y = 1) {
@@ -64,7 +66,7 @@ test('test prepareExoClassKit', t => {
     baggage,
     'Counter',
     { up: UpCounterI, down: DownCounterI },
-    /** @param {number} x */
+    /** @param {number} [x] */
     (x = 0) => ({ x }),
     {
       up: {

package/test/test-present.js

@@ -0,0 +1,12 @@
+import test from 'ava';
+
+const mockDefineKind = /** @type {any} */ (harden({}));
+
+/* global globalThis */
+// @ts-expect-error missing fields
+globalThis.VatData ||= { defineKind: mockDefineKind };
+
+test('methods available', async t => {
+  const { defineKind } = await import('../src/index.js');
+  t.is(defineKind, mockDefineKind);
+});

package/test/test-scalar-only-keys.js

@@ -1,14 +1,14 @@
 // From https://github.com/Agoric/agoric-sdk/pull/6903#discussion_r1098067133
 
-import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { test } from './prepare-test-env-ava.js';
 
+// eslint-disable-next-line import/order
 import { M, makeScalarMapStore } from '@agoric/store';
-
 import { makeScalarBigMapStore } from '../src/vat-data-bindings.js';
 
 test('scalar maps should reject non-scalar keys', t => {
   const bigMap = makeScalarMapStore('dummy', { keyShape: M.key() });
-  t.throws(() => bigMap.init(harden({ label: 'not a scalar' })), {
+  t.throws(() => bigMap.init(harden({ label: 'not a scalar' }), 'val'), {
     message:
       /A "copyRecord" cannot be a scalar key: \{"label":"not a scalar"\}/,
   });

package/test/test-virtual-classes.js

@@ -1,6 +1,8 @@
 // Modeled on test-heap-classes.js
 
-import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
+import { test } from './prepare-test-env-ava.js';
+
+// eslint-disable-next-line import/order
 import { M } from '@agoric/store';
 import {
   defineVirtualExoClass,
@@ -25,7 +27,7 @@ test('test defineVirtualExoClass', t => {
   const makeUpCounter = defineVirtualExoClass(
     'UpCounter',
     UpCounterI,
-    /** @param {number} x */
+    /** @param {number} [x] */
     (x = 0) => ({ x }),
     {
       incr(y = 1) {
@@ -56,7 +58,7 @@ test('test defineVirtualExoClassKit', t => {
   const makeCounterKit = defineVirtualExoClassKit(
     'Counter',
     { up: UpCounterI, down: DownCounterI },
-    /** @param {number} x */
+    /** @param {number} [x] */
     (x = 0) => ({ x }),
     {
       up: {

package/test/test-vow.js

@@ -0,0 +1,44 @@
+// @ts-check
+import test from 'ava';
+import { E, Far } from '@endo/far';
+
+import { V, makeVowKit } from '../vow.js';
+
+test('heap messages', async t => {
+  const greeter = Far('Greeter', {
+    hello: /** @param {string} name */ name => `Hello, ${name}!`,
+  });
+
+  /** @type {ReturnType<typeof makeVowKit<typeof greeter>>} */
+  const { vow, resolver } = makeVowKit();
+  const retP = V(vow).hello('World');
+  resolver.resolve(greeter);
+
+  // Happy path: WE(vow)[method](...args) calls the method.
+  t.is(await retP, 'Hello, World!');
+
+  // Sad path: E(vow)[method](...args) rejects.
+  await t.throwsAsync(
+    // @ts-expect-error hello is not accessible via basicE
+    () => E(vow).hello('World'),
+    {
+      message: /target has no method "hello"/,
+    },
+  );
+
+  // Happy path: await WE.when unwraps the vow.
+  t.is(await V.when(vow), greeter);
+
+  t.is(
+    await V.when(vow, res => {
+      t.is(res, greeter);
+      return 'done';
+    }),
+    'done',
+  );
+
+  // Sad path: await by itself gives the raw vow.
+  const w = await vow;
+  t.not(w, greeter);
+  t.truthy(w.payload);
+});

package/tsconfig.json

@@ -1,8 +1,10 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "strict": true,
-    "noImplicitAny": false, // for compat with peer packages using ambient types
+    // XXX to resolve the swingset-liveslots types
+    "maxNodeModuleJsDepth": 1,
+    // "strict": true, // disabled for compat with >0 module depth
+    // "noImplicitAny": false, // for compat with peer packages using ambient types
   },
   "include": [
     "src/**/*.js",

package/typedoc.json

@@ -0,0 +1,8 @@
+{
+    "extends": [
+        "../../typedoc.base.json"
+    ],
+    "entryPoints": [
+        "src/index.js",
+    ]
+}

package/vow.js

@@ -0,0 +1,50 @@
+/* global globalThis */
+// @ts-check
+import { makeE, prepareVowTools as rawPrepareVowTools } from '@agoric/vow';
+import { makeHeapZone } from '@agoric/base-zone/heap.js';
+import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
+
+/** @type {any} */
+const vatData = globalThis.VatData;
+
+/**
+ * Manually-extracted watchPromise so we don't accidentally get the 'unavailable'
+ * version.  If it is `undefined`, `@agoric/vow` will shim it.
+ * @type {undefined | ((
+ *   p: Promise<any>,
+ *   watcher: import('@agoric/vow/src/watch-promise.js').PromiseWatcher,
+ *   ...args: unknown[]
+ * ) => void)}
+ */
+const watchPromise = vatData && vatData.watchPromise;
+
+/**
+ * Return truthy if a rejection reason should result in a retry.
+ * @param {any} reason
+ * @returns {boolean}
+ */
+const isRetryableReason = reason => isUpgradeDisconnection(reason);
+
+export const defaultPowers = harden({
+  isRetryableReason,
+  watchPromise,
+});
+
+/**
+ * @type {typeof rawPrepareVowTools}
+ */
+export const prepareVowTools = (zone, powers = {}) =>
+  rawPrepareVowTools(zone, { ...defaultPowers, ...powers });
+
+export const { watch, when, makeVowKit } = prepareVowTools(makeHeapZone());
+
+/**
+ * An vow-shortening E.  CAVEAT: This produces long-lived ephemeral
+ * promises that encapsulate the shortening behaviour, and so provides no way
+ * for `watch` to durably shorten.  Use the standard `import('@endo/far').E` if
+ * you need to `watch` its resulting promises.
+ */
+export const V = makeE(globalThis.HandledPromise, {
+  unwrap: when,
+  additional: { when },
+});

package/src/types.d.ts

@@ -1,203 +0,0 @@
-/**
- * @file Types for vat-data
- *
- * Facet is a single object with methods.
- * Behavior is a description when defining a kind of what facets it will have.
- * For the non-multi defineKind, there is just one facet so it doesn't have a key.
- */
-import type {
-  InterfaceGuard,
-  MapStore,
-  Pattern,
-  SetStore,
-  StoreOptions,
-  WeakMapStore,
-  WeakSetStore,
-} from '@agoric/store';
-
-export type { Pattern };
-
-export type Baggage = MapStore<string, unknown>;
-
-type Tail<T extends any[]> = T extends [head: any, ...rest: infer Rest]
-  ? Rest
-  : [];
-
-type MinusContext<
-  F extends (context, ...rest: any[]) => any,
-  P extends any[] = Parameters<F>, // P: are the parameters of F
-  R = ReturnType<F>, // R: the return type of F
-> = (...args: Tail<P>) => R;
-
-export type KindFacet<O> = { [K in keyof O]: MinusContext<O[K]> };
-
-export type KindFacets<B> = {
-  [FacetKey in keyof B]: KindFacet<B[FacetKey]>;
-};
-
-export type KindContext<S, F> = { state: S; self: KindFacet<F> };
-export type MultiKindContext<S, B> = { state: S; facets: KindFacets<B> };
-
-export type PlusContext<C, M> = (c: C, ...args: Parameters<M>) => ReturnType<M>;
-export type FunctionsPlusContext<C, O> = {
-  [K in keyof O]: PlusContext<C, O[K]>;
-};
-
-declare class DurableKindHandleClass {
-  private descriptionTag: string;
-}
-export type DurableKindHandle = DurableKindHandleClass;
-
-/**
- * Grab bag of options that can be provided to `defineDurableKind` and its
- * siblings. Not all options are meaningful in all contexts. See the
- * doc-comments on each option.
- */
-export type DefineKindOptions<C> = {
-  /**
-   * If provided, the `finish` function will be called after the instance is
-   * made and internally registered, but before it is returned. The finish
-   * function is to do any post-intantiation initialization that should be
-   * done before exposing the object to its clients.
-   */
-  finish?: (context: C) => void;
-
-  /**
-   * Meaningful to `makeScalarBigMapStore` and its siblings. These maker
-   * fuctions will make either virtual or durable stores, depending on
-   * this flag. Defaults to off, making virtual but not durable collections.
-   *
-   * Generally, durable collections are provided with `provideDurableMapStore`
-   * and its sibling, which use this flag internally. If you do not make
-   * durable collections by other means, you can consider this as
-   * intended for internal use only.
-   */
-  durable?: boolean;
-
-  /**
-   * If provided, it describes the shape of all state records of instances
-   * of this kind.
-   */
-  stateShape?: { [name: string]: Pattern };
-
-  /**
-   * Intended for internal use only.
-   * Should the raw methods receive their `context` argument as their first
-   * argument or as their `this` binding? For `defineDurableKind` and its
-   * siblings (including `prepareSingleton`), this defaults to off, meaning that
-   * their behavior methods receive `context` as their first argument.
-   * `prepareExoClass` and its siblings (including `prepareExo`) use
-   * this flag internally to indicate that their methods receive `context`
-   * as their `this` binding.
-   */
-  thisfulMethods?: boolean;
-
-  /**
-   * Intended for internal use only.
-   * If an `interfaceGuard` is provided, then the raw methods passed alongside
-   * it are wrapped by a function that first checks that this method's guard
-   * pattern is satisfied before calling the raw method.
-   *
-   * In `defineDurableKind` and its siblings, this defaults to off.
-   * `prepareExoClass` use this internally to protect their raw class methods
-   * using the provided interface.
-   */
-  interfaceGuard?: InterfaceGuard<unknown>;
-};
-
-export type VatData = {
-  // virtual kinds
-  /** @deprecated Use defineVirtualExoClass instead */
-  defineKind: <P, S, F>(
-    tag: string,
-    init: (...args: P) => S,
-    facet: F,
-    options?: DefineKindOptions<KindContext<S, F>>,
-  ) => (...args: P) => KindFacet<F>;
-
-  /** @deprecated Use defineVirtualExoClassKit instead */
-  defineKindMulti: <P, S, B>(
-    tag: string,
-    init: (...args: P) => S,
-    behavior: B,
-    options?: DefineKindOptions<MultiKindContext<S, B>>,
-  ) => (...args: P) => KindFacets<B>;
-
-  // durable kinds
-  makeKindHandle: (descriptionTag: string) => DurableKindHandle;
-
-  /** @deprecated Use defineDurableExoClass instead */
-  defineDurableKind: <P, S, F>(
-    kindHandle: DurableKindHandle,
-    init: (...args: P) => S,
-    facet: F,
-    options?: DefineKindOptions<KindContext<S, F>>,
-  ) => (...args: P) => KindFacet<F>;
-
-  /** @deprecated Use defineDurableExoClassKit instead */
-  defineDurableKindMulti: <P, S, B>(
-    kindHandle: DurableKindHandle,
-    init: (...args: P) => S,
-    behavior: B,
-    options?: DefineKindOptions<MultiKindContext<S, B>>,
-  ) => (...args: P) => KindFacets<B>;
-
-  providePromiseWatcher: unknown;
-  watchPromise: unknown;
-
-  makeScalarBigMapStore: <K, V>(
-    label: string,
-    options?: StoreOptions,
-  ) => MapStore<K, V>;
-  makeScalarBigWeakMapStore: <K, V>(
-    label: string,
-    options?: StoreOptions,
-  ) => WeakMapStore<K, V>;
-
-  makeScalarBigSetStore: <K>(
-    label: string,
-    options?: StoreOptions,
-  ) => SetStore<K>;
-  makeScalarBigWeakSetStore: <K>(
-    label: string,
-    options?: StoreOptions,
-  ) => WeakSetStore<K>;
-  canBeDurable: (specimen: unknown) => boolean;
-};
-
-// The JSDoc is repeated here and at the function definition so it appears
-// in IDEs where it's used, regardless of type resolution.
-export interface PickFacet {
-  /**
-   * When making a multi-facet kind, it's common to pick one facet to
-   * expose. E.g.,
-   *
-   *     const makeFoo = (a, b, c, d) => makeFooBase(a, b, c, d).self;
-   *
-   * This helper reduces the duplication:
-   *
-   *     const makeFoo = pickFacet(makeFooBase, 'self');
-   */
-  <M extends (...args: any[]) => any, F extends keyof ReturnType<M>>(
-    maker: M,
-    facetName: F,
-  ): (...args: Parameters<M>) => ReturnType<M>[F];
-}
-
-/** @deprecated Use prepareExoClass instead */
-export type PrepareKind = <P, S, F>(
-  baggage: Baggage,
-  tag: string,
-  init: (...args: P) => S,
-  facet: F,
-  options?: DefineKindOptions<KindContext<S, F>>,
-) => (...args: P) => KindFacet<F>;
-
-/** @deprecated Use prepareExoClassKit instead */
-export type PrepareKindMulti = <P, S, B>(
-  baggage: Baggage,
-  tag: string,
-  init: (...args: P) => S,
-  behavior: B,
-  options?: DefineKindOptions<MultiKindContext<S, B>>,
-) => (...args: P) => KindFacets<B>;

package/test/present.test.js

@@ -1,7 +0,0 @@
-import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-
-test('methods available', async t => {
-  const { defineKind } = await import('../src/index.js');
-  defineKind('test', () => {}, {});
-  t.pass();
-});