diff --git a/packages/internal/package.json b/packages/internal/package.json index ff609e38e2f1..127867b3bf29 100755 --- a/packages/internal/package.json +++ b/packages/internal/package.json @@ -22,6 +22,7 @@ "dependencies": { "@agoric/assert": "^0.6.0", "@agoric/base-zone": "^0.1.0", + "@endo/common": "^1.0.2", "@endo/far": "^1.0.2", "@endo/init": "^1.0.2", "@endo/marshal": "^1.1.0", diff --git a/packages/internal/src/index.js b/packages/internal/src/index.js index c13a3a4b4562..ee98585a187e 100644 --- a/packages/internal/src/index.js +++ b/packages/internal/src/index.js @@ -7,3 +7,6 @@ export * from './debug.js'; export * from './utils.js'; export * from './method-tools.js'; export * from './typeGuards.js'; + +export { objectMap } from '@endo/common/object-map.js'; +export { fromUniqueEntries } from '@endo/common/from-unique-entries.js'; diff --git a/packages/store/src/stores/scalarWeakMapStore.js b/packages/store/src/stores/scalarWeakMapStore.js index 9bd3db548230..1062ac554b87 100644 --- a/packages/store/src/stores/scalarWeakMapStore.js +++ b/packages/store/src/stores/scalarWeakMapStore.js @@ -1,6 +1,10 @@ import { Far, assertPassable, passStyleOf } from '@endo/pass-style'; -import { getCopyMapEntries, mustMatch, assertPattern } from '@endo/patterns'; -import { isCopyMap } from './store-utils.js'; +import { + getCopyMapEntries, + mustMatch, + assertPattern, + isCopyMap, +} from '@endo/patterns'; const { quote: q, Fail } = assert; diff --git a/packages/store/src/stores/scalarWeakSetStore.js b/packages/store/src/stores/scalarWeakSetStore.js index 4a256ba9207b..68bcdfd594e4 100644 --- a/packages/store/src/stores/scalarWeakSetStore.js +++ b/packages/store/src/stores/scalarWeakSetStore.js @@ -1,6 +1,10 @@ import { Far, passStyleOf } from '@endo/pass-style'; -import { getCopySetKeys, mustMatch, assertPattern } from '@endo/patterns'; -import { isCopySet } from './store-utils.js'; +import { + getCopySetKeys, + mustMatch, + assertPattern, + isCopySet, +} from '@endo/patterns'; const { quote: q, Fail } = assert; diff --git a/packages/store/src/stores/store-utils.js b/packages/store/src/stores/store-utils.js index 7eb6c1058bf8..172d4e626560 100644 --- a/packages/store/src/stores/store-utils.js +++ b/packages/store/src/stores/store-utils.js @@ -1,5 +1,7 @@ import { Far } from '@endo/marshal'; +const { quote: q, Fail } = assert; + /** @typedef {import('@endo/marshal').RankCompare} RankCompare */ /**