@agoric/store 0.9.3-u16.0 → 0.9.3-u17.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/store",
-  "version": "0.9.3-u16.0",
+  "version": "0.9.3-u17.1",
   "description": "Wrapper for JavaScript map",
   "type": "module",
   "main": "src/index.js",
@@ -30,14 +30,15 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@endo/exo": "^1.5.0",
-    "@endo/marshal": "^1.5.0",
-    "@endo/pass-style": "^1.4.0",
-    "@endo/patterns": "^1.4.0"
+    "@endo/errors": "^1.2.5",
+    "@endo/exo": "^1.5.3",
+    "@endo/marshal": "^1.5.3",
+    "@endo/pass-style": "^1.4.3",
+    "@endo/patterns": "^1.4.3"
   },
   "devDependencies": {
-    "@endo/init": "^1.1.2",
-    "@endo/ses-ava": "^1.2.2",
+    "@endo/init": "^1.1.4",
+    "@endo/ses-ava": "^1.2.5",
     "ava": "^5.3.0"
   },
   "files": [
@@ -58,7 +59,7 @@
     "timeout": "2m"
   },
   "typeCoverage": {
-    "atLeast": 89.45
+    "atLeast": 89.53
   },
-  "gitHead": "bbdf652c3f413381cb352a8a360db1063974fafd"
+  "gitHead": "5259430561693bfcf58516c3ea54123895859708"
 }

package/src/index.js

@@ -1,3 +1,8 @@
+/**
+ * @import {MustMatch} from '@agoric/internal';
+ */
+import { mustMatch as typelessMustMatch } from '@endo/patterns';
+
 export { makeScalarWeakSetStore } from './stores/scalarWeakSetStore.js';
 export { makeScalarSetStore } from './stores/scalarSetStore.js';
 export { makeScalarWeakMapStore } from './stores/scalarWeakMapStore.js';
@@ -51,11 +56,15 @@ export {
   isPattern,
   assertPattern,
   matches,
-  mustMatch,
   isCopySet,
   isCopyMap,
 } from '@endo/patterns';
 
+// XXX @agoric/store should not depend on @agoric/internal
+// TODO move to Endo
+/** @type {MustMatch} */
+export const mustMatch = typelessMustMatch;
+
 export {
   initEmpty,
   defineExoClass,

package/src/legacy/legacyMap.js

@@ -1,7 +1,7 @@
 /** @import {LegacyMap, LegacyWeakMap} from '../types.js'; */
 
 // TODO, once migrated to endo, import from @endo/errors instead
-const { Fail, quote: q } = assert;
+import { Fail, q } from '@endo/errors';
 
 /**
  * This module and its fraternal sibling legacyWeakMap exist only to ease a

package/src/legacy/legacyWeakMap.js

@@ -1,7 +1,7 @@
 /** @import {LegacyWeakMap} from '../types.js'; */
 
 // TODO, once migrated to endo, import from @endo/errors instead
-const { Fail, quote: q } = assert;
+import { Fail, q } from '@endo/errors';
 
 /**
  * See doccomment in the closely related `legacyMap.js` module.

package/src/stores/scalarMapStore.js

@@ -1,3 +1,4 @@
+import { q } from '@endo/errors';
 import {
   Far,
   assertPassable,
@@ -16,13 +17,11 @@ import { makeWeakMapStoreMethods } from './scalarWeakMapStore.js';
 import { makeCurrentKeysKit } from './store-utils.js';
 
 /**
- * @import {Passable} from '@endo/pass-style');
- * @import {Key, Pattern} from '@endo/patterns');
+ * @import {Passable} from '@endo/pass-style';
+ * @import {Key, Pattern} from '@endo/patterns';
  * @import {MapStore, MapStoreMethods, StoreOptions} from '../types.js';
  */
 
-const { quote: q } = assert;
-
 /**
  * @template {Key} K
  * @template {Passable} V

package/src/stores/scalarSetStore.js

@@ -1,3 +1,4 @@
+import { q } from '@endo/errors';
 import { Far, filterIterable } from '@endo/pass-style';
 import { compareRank } from '@endo/marshal';
 import {
@@ -11,12 +12,10 @@ import { makeWeakSetStoreMethods } from './scalarWeakSetStore.js';
 import { makeCurrentKeysKit } from './store-utils.js';
 
 /**
- * @import {Key, Pattern} from '@endo/patterns');
+ * @import {Key, Pattern} from '@endo/patterns';
  * @import {SetStore, SetStoreMethods, StoreOptions} from '../types.js';
  */
 
-const { quote: q } = assert;
-
 /**
  * @template {Key} K
  * @param {Set<K>} jsset

package/src/stores/scalarWeakMapStore.js

@@ -1,3 +1,4 @@
+import { q, Fail } from '@endo/errors';
 import { Far, assertPassable, passStyleOf } from '@endo/pass-style';
 import {
   getCopyMapEntries,
@@ -12,8 +13,6 @@ import {
  * @import {WeakMapStore, StoreOptions} from '../types.js';
  */
 
-const { quote: q, Fail } = assert;
-
 /**
  * @template {Key} K
  * @template {Passable} V

package/src/stores/scalarWeakSetStore.js

@@ -1,3 +1,4 @@
+import { q, Fail } from '@endo/errors';
 import { Far, passStyleOf } from '@endo/pass-style';
 import {
   getCopySetKeys,
@@ -6,8 +7,6 @@ import {
   isCopySet,
 } from '@endo/patterns';
 
-const { quote: q, Fail } = assert;
-
 /**
  * @import {Key} from '@endo/patterns';
  * @import {StoreOptions, WeakSetStore, WeakSetStoreMethods} from '@agoric/store';

package/src/stores/store-utils.js

@@ -1,3 +1,4 @@
+import { Fail, q } from '@endo/errors';
 import { Far } from '@endo/marshal';
 import { M, matches } from '@endo/patterns';
 
@@ -8,8 +9,6 @@ import { M, matches } from '@endo/patterns';
  * @import {Key} from '@endo/patterns';
  */
 
-const { Fail, quote: q } = assert;
-
 // TODO: Undate `@endo/patterns` to export the original, and delete the
 // reimplementation here.
 /**