@agoric/cache 0.3.3-other-dev-3eb1a1d.0 → 0.3.3-other-dev-d15096d.0.d15096d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cache",
-  "version": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
+  "version": "0.3.3-other-dev-d15096d.0.d15096d",
   "description": "Agoric's simple cache interface",
   "type": "module",
   "main": "src/main.js",
@@ -8,34 +8,34 @@
   "scripts": {
     "build": "exit 0",
     "test": "ava",
-    "test:c8": "c8 --all $C8_OPTIONS ava",
+    "test:c8": "c8 --all ${C8_OPTIONS:-} ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc",
-    "lint:eslint": "eslint --ext .js,.ts ."
+    "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
+    "lint:types": "yarn run -T tsc",
+    "lint:eslint": "yarn run -T eslint ."
   },
   "keywords": [],
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/internal": "0.3.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/notifier": "0.6.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/store": "0.9.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@agoric/vat-data": "0.5.3-other-dev-3eb1a1d.0+3eb1a1d",
-    "@endo/far": "^1.1.9",
-    "@endo/marshal": "^1.6.2"
+    "@agoric/internal": "0.3.3-other-dev-d15096d.0.d15096d",
+    "@agoric/notifier": "0.6.3-other-dev-d15096d.0.d15096d",
+    "@agoric/store": "0.9.3-other-dev-d15096d.0.d15096d",
+    "@agoric/vat-data": "0.5.3-other-dev-d15096d.0.d15096d",
+    "@endo/far": "^1.1.14",
+    "@endo/marshal": "^1.8.0"
   },
   "devDependencies": {
-    "@agoric/zoe": "0.26.3-other-dev-3eb1a1d.0+3eb1a1d",
+    "@agoric/zoe": "0.26.3-other-dev-d15096d.0.d15096d",
     "ava": "^5.3.0",
-    "c8": "^10.1.2"
+    "c8": "^10.1.3"
   },
   "publishConfig": {
     "access": "public"
   },
   "engines": {
-    "node": "^18.12 || ^20.9"
+    "node": "^20.9 || ^22.11"
   },
   "ava": {
     "files": [
@@ -49,5 +49,5 @@
   "typeCoverage": {
     "atLeast": 94.13
   },
-  "gitHead": "3eb1a1d2d75b2b4a94807cd3bf759bc9fc531f05"
+  "gitHead": "d15096dc4ff8b96e9b6cd11954c20d3a9efbb393"
 }

package/src/cache.js

@@ -6,6 +6,8 @@ import { makeScalarStoreCoordinator } from './store.js';
 
 /**
  * @import {Passable, RemotableObject} from '@endo/pass-style';
+ * @import {Key, Pattern} from '@endo/patterns';
+ * @import {Coordinator} from './types.js';
  */
 
 /**
@@ -16,7 +18,7 @@ import { makeScalarStoreCoordinator } from './store.js';
  */
 
 /**
- * @param {ERef<import('./types.js').Coordinator>} [coordinator]
+ * @param {ERef<Coordinator>} [coordinator]
  */
 export const makeCache = (coordinator = makeScalarStoreCoordinator()) => {
   /**

package/src/main.js

@@ -1,5 +1,5 @@
 // @jessie-check
-/// <reference types="@agoric/internal/exported" />
+/// <reference types="@agoric/internal/exported.js" />
 
 // eslint-disable-next-line import/export
 export * from './types.js';

package/src/state.js

@@ -1,5 +1,9 @@
 // @jessie-check
 
+/**
+ * @import {State} from './state.js';
+ */
+
 /**
  * @typedef {object} State
  * @property {bigint} generation
@@ -30,7 +34,7 @@ export const makeState = (value, priorState = GROUND_STATE) =>
 /**
  * Wrap a state store to have a default value using the GROUND_STATE
  *
- * @param {MapStore<string, import('./state.js').State>} stateStore
+ * @param {MapStore<string, State>} stateStore
  */
 export const withGroundState = stateStore => ({
   ...stateStore,

package/src/store.js

@@ -4,7 +4,15 @@ import { matches, makeScalarMapStore } from '@agoric/store';
 import { makeScalarBigMapStore } from '@agoric/vat-data';
 import { untilTrue } from '@agoric/internal';
 import { withGroundState, makeState } from './state.js';
-/** @import {Passable} from '@endo/pass-style' */
+
+/**
+ * @import {ERemote} from '@agoric/internal'
+ * @import {EMarshaller} from '@agoric/internal/src/marshal/wrap-marshaller.js';
+ * @import {Passable, RemotableObject} from '@endo/pass-style';
+ * @import {Key, Pattern} from '@endo/patterns';
+ * @import {State} from './state.js';
+ * @import {Coordinator} from './types.js';
+ */
 
 /**
  * @param {(obj: Passable) => Passable} [sanitize]
@@ -41,9 +49,9 @@ const makeKeyToString = (sanitize = obj => obj) => {
  * @param {(obj: Passable) => Passable} sanitize Process keys and values with
  * this function before storing them
  * @param {{
- * get(key: string): import('./state.js').State;
- * set(key: string, value: import('./state.js').State): void;
- * init(key: string, value: import('./state.js').State): void;
+ * get(key: string): State;
+ * set(key: string, value: State): void;
+ * init(key: string, value: State): void;
  * }} stateStore
  * @returns {Promise<Passable>} the value of the updated state
  */
@@ -57,8 +65,8 @@ const applyCacheTransaction = async (
   /**
    * Retrieve a potential updated state from the transaction.
    *
-   * @param {import('./state.js').State} basisState
-   * @returns {Promise<import('./state.js').State | null>} the updated state, or null if no longer applicable
+   * @param {State} basisState
+   * @returns {Promise<State | null>} the updated state, or null if no longer applicable
    */
   const getUpdatedState = async basisState => {
     const { value } = basisState;
@@ -107,8 +115,8 @@ const applyCacheTransaction = async (
 };
 
 /**
- * @param {MapStore<string, import('./state.js').State>} stateStore
- * @param {ERef<Marshaller>} marshaller
+ * @param {MapStore<string, State>} stateStore
+ * @param {ERemote<EMarshaller>} marshaller
  * @returns {Promise<string>}
  */
 const stringifyStateStore = async (stateStore, marshaller) => {
@@ -126,7 +134,7 @@ const stringifyStateStore = async (stateStore, marshaller) => {
  * Make a cache coordinator backed by a MapStore.  This coordinator doesn't
  * currently enforce any cache eviction, but that would be a useful feature.
  *
- * @param {MapStore<string, import('./state.js').State>} [stateStore]
+ * @param {MapStore<string, State>} [stateStore]
  * @param {(obj: Passable) => Passable} [sanitize] Process keys and values with
  * this function before storing them. Defaults to deeplyFulfilled.
  */
@@ -138,7 +146,7 @@ export const makeScalarStoreCoordinator = (
 
   const defaultStateStore = withGroundState(stateStore);
 
-  /** @type {import('./types.js').Coordinator} */
+  /** @type {Coordinator} */
   const coord = Far('store cache coordinator', {
     getRecentValue: async key => {
       const keyStr = await serializePassable(key);
@@ -171,9 +179,9 @@ export const makeScalarStoreCoordinator = (
 /**
  * Don't write any marshalled value that's older than what's already pushed
  *
- * @param {MapStore<string, import('./state.js').State>} stateStore
- * @param {ERef<Marshaller>} marshaller
- * @param {ERef<StorageNode>} storageNode
+ * @param {MapStore<string, State>} stateStore
+ * @param {ERemote<EMarshaller>} marshaller
+ * @param {ERemote<StorageNode>} storageNode
  * @returns {<T>(storedValue: T) => Promise<T>}
  */
 const makeLastWinsUpdater = (stateStore, marshaller, storageNode) => {
@@ -201,8 +209,8 @@ const makeLastWinsUpdater = (stateStore, marshaller, storageNode) => {
  * Make a cache coordinator backed by a MapStore.  This coordinator doesn't
  * currently enforce any cache eviction, but that would be a useful feature.
  *
- * @param {ERef<StorageNode>} storageNode
- * @param {ERef<Marshaller>} marshaller
+ * @param {ERemote<StorageNode>} storageNode
+ * @param {ERemote<EMarshaller>} marshaller
  */
 export const makeChainStorageCoordinator = (storageNode, marshaller) => {
   const stateStore = makeScalarBigMapStore('stateKey');
@@ -218,7 +226,7 @@ export const makeChainStorageCoordinator = (storageNode, marshaller) => {
     storageNode,
   );
 
-  /** @type {import('./types.js').Coordinator} */
+  /** @type {Coordinator} */
   const coord = Far('store cache coordinator', {
     getRecentValue: async key => {
       const keyStr = await serializePassable(key);

package/src/types.js

@@ -10,6 +10,7 @@ export {};
 /**
  * @import { ERef } from '@endo/far'
  * @import {Passable} from '@endo/pass-style'
+ * @import {Key, Pattern} from '@endo/patterns';
  */
 
 /**