@agoric/vat-data 0.5.3-other-dev-3eb1a1d.0 → 0.5.3-other-dev-d15096d.0.d15096d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/vat-data",
-  "version": "0.5.3-other-dev-3eb1a1d.0+3eb1a1d",
+  "version": "0.5.3-other-dev-d15096d.0.d15096d",
   "description": "Safe access to VatData global",
   "type": "module",
   "repository": "https://github.com/Agoric/agoric-sdk",
@@ -10,27 +10,27 @@
     "test": "ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint": "run-s --continue-on-error lint:*",
-    "lint:eslint": "eslint .",
-    "lint:types": "tsc"
+    "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
+    "lint:eslint": "yarn run -T eslint .",
+    "lint:types": "yarn run -T tsc"
   },
   "keywords": [],
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/store": "0.9.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/swingset-liveslots": "0.10.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@endo/errors": "^1.2.8",
-    "@endo/exo": "^1.5.7",
-    "@endo/patterns": "^1.4.7"
+    "@agoric/base-zone": "0.1.1-other-dev-d15096d.0.d15096d",
+    "@agoric/store": "0.9.3-other-dev-d15096d.0.d15096d",
+    "@agoric/swingset-liveslots": "0.10.3-other-dev-d15096d.0.d15096d",
+    "@endo/errors": "^1.2.13",
+    "@endo/exo": "^1.5.12",
+    "@endo/patterns": "^1.7.0"
   },
   "devDependencies": {
-    "@endo/far": "^1.1.9",
-    "@endo/init": "^1.1.7",
-    "@endo/ses-ava": "^1.2.8",
+    "@endo/far": "^1.1.14",
+    "@endo/init": "^1.1.12",
+    "@endo/ses-ava": "^1.3.2",
     "ava": "^5.3.0",
-    "tsd": "^0.31.1"
+    "tsd": "^0.33.0"
   },
   "ava": {
     "require": [
@@ -44,10 +44,10 @@
     "access": "public"
   },
   "engines": {
-    "node": "^18.12 || ^20.9"
+    "node": "^20.9 || ^22.11"
   },
   "typeCoverage": {
     "atLeast": 99.33
   },
-  "gitHead": "3eb1a1d2d75b2b4a94807cd3bf759bc9fc531f05"
+  "gitHead": "d15096dc4ff8b96e9b6cd11954c20d3a9efbb393"
 }

package/src/exo-utils.js

@@ -8,6 +8,12 @@ import { provide, VatData as globalVatData } from './vat-data-bindings.js';
  * @import {InterfaceGuard} from '@endo/patterns';
  * @import {RemotableObject} from '@endo/pass-style';
  * @import {Baggage, DefineKindOptions, DurableKindHandle, InterfaceGuardKit} from '@agoric/swingset-liveslots';
+ * @import {PlusContext} from '@agoric/swingset-liveslots';
+ * @import {VatData} from '@agoric/swingset-liveslots';
+ * @import {PrepareKind} from '@agoric/swingset-liveslots';
+ * @import {PrepareKindMulti} from '@agoric/swingset-liveslots';
+ * @import {Guarded} from '@endo/exo';
+ * @import {GuardedKit} from '@endo/exo';
  */
 
 // Some feedback if the init function is async
@@ -25,7 +31,7 @@ import { provide, VatData as globalVatData } from './vat-data-bindings.js';
  *
  * @type {<T extends (...args: any) => any>(
  *   fn: T,
- * ) => import('@agoric/swingset-liveslots').PlusContext<never, T>}
+ * ) => PlusContext<never, T>}
  */
 export const ignoreContext =
   fn =>
@@ -34,7 +40,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 */
+/** @param {VatData} VatData */
 export const makeExoUtils = VatData => {
   const {
     defineKind,
@@ -56,7 +62,7 @@ export const makeExoUtils = VatData => {
 
   /**
    * @deprecated Use prepareExoClass instead
-   * @type {import('@agoric/swingset-liveslots').PrepareKind}
+   * @type {PrepareKind}
    */
   const prepareKind = (
     baggage,
@@ -75,7 +81,7 @@ export const makeExoUtils = VatData => {
 
   /**
    * @deprecated Use prepareExoClassKit instead
-   * @type {import('@agoric/swingset-liveslots').PrepareKindMulti}
+   * @type {PrepareKindMulti}
    */
   const prepareKindMulti = (
     baggage,
@@ -107,7 +113,7 @@ export const makeExoUtils = VatData => {
    *   self: T;
    *   state: StateResult<I>;
    * }>} [options]
-   * @returns {(...args: Parameters<I>) => import('@endo/exo').Guarded<T>}
+   * @returns {(...args: Parameters<I>) => Guarded<T>}
    */
   const defineVirtualExoClass = (tag, interfaceGuard, init, methods, options) =>
     // @ts-expect-error cast
@@ -126,14 +132,14 @@ export const makeExoUtils = VatData => {
    * @param {I} init
    * @param {T &
    *   ThisType<{
-   *     facets: import('@endo/exo').GuardedKit<T>;
+   *     facets: GuardedKit<T>;
    *     state: StateResult<I>;
    *   }>} facets
    * @param {DefineKindOptions<{
    *   facets: T;
    *   state: StateResult<I>;
    * }>} [options]
-   * @returns {(...args: Parameters<I>) => import('@endo/exo').GuardedKit<T>}
+   * @returns {(...args: Parameters<I>) => GuardedKit<T>}
    */
   const defineVirtualExoClassKit = (
     tag,
@@ -165,7 +171,7 @@ export const makeExoUtils = VatData => {
    *   self: T;
    *   state: StateResult<I>;
    * }>} [options]
-   * @returns {(...args: Parameters<I>) => import('@endo/exo').Guarded<T>}
+   * @returns {(...args: Parameters<I>) => Guarded<T>}
    */
   const defineDurableExoClass = (
     kindHandle,
@@ -190,14 +196,14 @@ export const makeExoUtils = VatData => {
    * @param {I} init
    * @param {T &
    *   ThisType<{
-   *     facets: import('@endo/exo').GuardedKit<T>;
+   *     facets: GuardedKit<T>;
    *     state: StateResult<I>;
    *   }>} facets
    * @param {DefineKindOptions<{
    *   facets: T;
    *   state: StateResult<I>;
    * }>} [options]
-   * @returns {(...args: Parameters<I>) => import('@endo/exo').GuardedKit<T>}
+   * @returns {(...args: Parameters<I>) => GuardedKit<T>}
    */
   const defineDurableExoClassKit = (
     kindHandle,
@@ -230,7 +236,7 @@ export const makeExoUtils = VatData => {
    *   self: T;
    *   state: StateResult<I>;
    * }>} [options]
-   * @returns {(...args: Parameters<I>) => import('@endo/exo').Guarded<T>}
+   * @returns {(...args: Parameters<I>) => Guarded<T>}
    */
   const prepareExoClass = (
     baggage,
@@ -258,14 +264,14 @@ export const makeExoUtils = VatData => {
    * @param {I} init
    * @param {T &
    *   ThisType<{
-   *     facets: import('@endo/exo').GuardedKit<T>;
+   *     facets: GuardedKit<T>;
    *     state: StateResult<I>;
    *   }>} facets
    * @param {DefineKindOptions<{
    *   facets: T;
    *   state: StateResult<I>;
    * }>} [options]
-   * @returns {(...args: Parameters<I>) => import('@endo/exo').GuardedKit<T>}
+   * @returns {(...args: Parameters<I>) => GuardedKit<T>}
    */
   const prepareExoClassKit = (
     baggage,
@@ -294,7 +300,7 @@ export const makeExoUtils = VatData => {
    *     self: RemotableObject & M;
    *   }>} methods
    * @param {DefineKindOptions<{ self: M }>} [options]
-   * @returns {import('@endo/exo').Guarded<M>}
+   * @returns {Guarded<M>}
    */
   const prepareExo = (
     baggage,
@@ -323,7 +329,7 @@ export const makeExoUtils = VatData => {
    * @param {string} kindName
    * @param {M} methods
    * @param {DefineKindOptions<{ self: M }>} [options]
-   * @returns {import('@endo/exo').Guarded<M>}
+   * @returns {Guarded<M>}
    */
   const prepareSingleton = (baggage, kindName, methods, options = undefined) =>
     prepareExo(baggage, kindName, undefined, methods, options);

package/src/index.js

@@ -1,5 +1,10 @@
 // @jessie-check
 
+/**
+ * @import {DefineKindOptions} from '@agoric/swingset-liveslots';
+ * @import {MapStore} from '@agoric/swingset-liveslots';
+ */
+
 /// <reference types="ses" />
 export {
   M,
@@ -44,9 +49,7 @@ export {
 
 // TODO re-export these
 /**
- * @template T @typedef
- *   {import('@agoric/swingset-liveslots').DefineKindOptions<T>}
- *   DefineKindOptions
+ * @template T @typedef {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

package/test/amplify-virtual-class-kits.test.js

@@ -8,6 +8,10 @@ import {
   defineVirtualExoClassKit,
 } from '../src/exo-utils.js';
 
+/**
+ * @import {Amplify} from '@endo/exo';
+ */
+
 const UpCounterI = M.interface('UpCounter', {
   incr: M.call().optional(M.gte(0)).returns(M.number()),
 });
@@ -43,7 +47,7 @@ test('test amplify defineVirtualExoClass fails', t => {
 });
 
 test('test amplify defineVirtualExoClassKit', t => {
-  /** @type {import('@endo/exo').Amplify} */
+  /** @type {Amplify} */
   let amp;
   const makeCounterKit = defineVirtualExoClassKit(
     'Counter',

package/test/is-instance-virtual-class-kits.test.js

@@ -9,6 +9,10 @@ import {
   defineVirtualExoClassKit,
 } from '../src/exo-utils.js';
 
+/**
+ * @import {IsInstance} from '@endo/exo';
+ */
+
 const UpCounterI = M.interface('UpCounter', {
   incr: M.call().optional(M.gte(0)).returns(M.number()),
 });
@@ -18,7 +22,7 @@ const DownCounterI = M.interface('DownCounter', {
 });
 
 test('test isInstance defineVirtualExoClass', t => {
-  /** @type {import('@endo/exo').IsInstance} */
+  /** @type {IsInstance} */
   let isInstance;
   const makeUpCounter = defineVirtualExoClass(
     'UpCounter',
@@ -59,7 +63,7 @@ test('test isInstance defineVirtualExoClass', t => {
 });
 
 test('test isInstance defineVirtualExoClassKit', t => {
-  /** @type {import('@endo/exo').IsInstance} */
+  /** @type {IsInstance} */
   let isInstance;
   const makeCounterKit = defineVirtualExoClassKit(
     'Counter',