fix: update @agoric/store types and imports

Agoric · Oct 9, 2020 · 9e3493a · 9e3493a
1 parent 20667ce
commit 9e3493a
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 233 deletions.
diff --git a/packages/SwingSet/src/vats/network/internal-types.js b/packages/SwingSet/src/vats/network/internal-types.js
@@ -1,8 +1,3 @@
-/**
- * @template K,V
- * @typedef {import('@agoric/store').Store<K,V>} Store
- */
-
 /**
  * @template T
  * @typedef {import('@agoric/promise-kit').PromiseRecord<T>} PromiseRecord

diff --git a/packages/SwingSet/src/vats/network/network.js b/packages/SwingSet/src/vats/network/network.js
@@ -5,6 +5,7 @@ import { E } from '@agoric/eventual-send';
 import { makePromiseKit } from '@agoric/promise-kit';
 import { toBytes } from './bytes';
 
+import '@agoric/store/exported';
 import './types';
 import './internal-types';
 

diff --git a/packages/SwingSet/src/vats/network/router.js b/packages/SwingSet/src/vats/network/router.js
@@ -4,6 +4,7 @@ import { E as defaultE } from '@agoric/eventual-send';
 import makeStore from '@agoric/store';
 import { makeNetworkProtocol, ENDPOINT_SEPARATOR } from './network';
 
+import '@agoric/store/exported';
 import './types';
 import './internal-types';
 

diff --git a/packages/SwingSet/src/vats/plugin-manager.js b/packages/SwingSet/src/vats/plugin-manager.js
@@ -5,6 +5,8 @@ import { makeCapTP } from '@agoric/captp';
 import { makePromiseKit } from '@agoric/promise-kit';
 import { E, HandledPromise } from '@agoric/eventual-send';
 
+import '@agoric/store/exported';
+
 /**
  * @template T
  * @typedef {T | PromiseLike<T>} ERef
@@ -70,7 +72,7 @@ export function makePluginManager(pluginDevice, { D, ...vatPowers }) {
    */
 
   /**
-   * @type {import('@agoric/store').Store<number, AbortDispatch>}
+   * @type {Store<number, AbortDispatch>}
    */
   const modConnection = makeStore('moduleIndex');
 

diff --git a/packages/SwingSet/test/test-external-store.js b/packages/SwingSet/test/test-external-store.js
diff --git a/packages/cosmic-swingset/lib/ag-solo/vats/bridge.js b/packages/cosmic-swingset/lib/ag-solo/vats/bridge.js
@@ -1,6 +1,7 @@
 // @ts-check
 
 import makeStore from '@agoric/store';
+import '@agoric/store/exported';
 
 /**
  * @template T
@@ -36,7 +37,7 @@ import makeStore from '@agoric/store';
 /* eslint-enable jsdoc/valid-types */
 export function makeBridgeManager(E, D, bridgeDevice) {
   /**
-   * @type {import('@agoric/store').Store<string, BridgeHandler>}
+   * @type {Store<string, BridgeHandler>}
    */
   const srcHandlers = makeStore('srcID');
 

diff --git a/packages/cosmic-swingset/lib/ag-solo/vats/ibc.js b/packages/cosmic-swingset/lib/ag-solo/vats/ibc.js
@@ -9,6 +9,7 @@ import makeStore from '@agoric/store';
 import { makePromiseKit } from '@agoric/promise-kit';
 import { generateSparseInts } from '@agoric/sparse-ints';
 
+import '@agoric/store/exported';
 import '@agoric/swingset-vat/src/vats/network/types';
 
 import { makeWithQueue } from './queue';
@@ -31,11 +32,6 @@ const FIXME_ALLOW_NAIVE_RELAYS = true;
  * @typedef {import('@agoric/promise-kit').PromiseRecord<U>} PromiseRecord
  */
 
-/**
- * @template K,V
- * @typedef {import('@agoric/store').Store<K, V>} Store
- */
-
 /**
  * @typedef {string} IBCPortID
  * @typedef {string} IBCChannelID

diff --git a/packages/store/exported.js b/packages/store/exported.js
@@ -0,0 +1 @@
+import './src/types';
diff --git a/packages/store/src/external/hydrate.js b/packages/store/src/external/hydrate.js
@@ -16,7 +16,7 @@ import { makeStore } from '../store';
  * the Closure interface that the rewriter targets.
  *
  * @template {Array<any>} A
- * @template {Instance} T
+ * @template {ExternalInstance} T
  * @param {MakeBackingStore} makeBackingStore
  * @returns {MakeHydrateExternalStore<A, T>}
  */

diff --git a/packages/store/src/external/memory.js b/packages/store/src/external/memory.js
@@ -9,7 +9,7 @@ import '../types';
  * garbage-collected in the usual way, but it will not page out any objects to
  * secondary storage.
  *
- * @template {(...args: any[]) => Instance} M
+ * @template {(...args: any[]) => ExternalInstance} M
  * @param {string} instanceName
  * @param {M} maker
  * @returns {ExternalStore<M>}

diff --git a/packages/store/src/types.js b/packages/store/src/types.js
@@ -1,5 +1,5 @@
 /**
- * @typedef {Record<string, Function>} Instance
+ * @typedef {Record<string, Function>} ExternalInstance
  */
 
 /**
@@ -42,7 +42,7 @@
 /**
  * An external store for a given constructor.
  *
- * @template {(...args: Array<any>) => Instance} C
+ * @template {(...args: Array<any>) => ExternalInstance} C
  * @typedef {Object} ExternalStore
  * @property {C} makeInstance
  * @property {MakeWeakStore<ReturnType<C>, any>} makeWeakStore
@@ -64,7 +64,7 @@
  * "representative" instance.
  *
  * @template {Array<any>} A
- * @template {Instance} T
+ * @template {ExternalInstance} T
  * @callback MakeHydrateExternalStore
  * @param {string} instanceKind
  * @param {(...args: A) => HydrateData} adaptArguments
@@ -73,11 +73,11 @@
  */
 
 /**
- * @typedef {Store<string, string> & { makeWeakStore: () => WeakStore<any, any> }}} InstanceStore
+ * @typedef {Store<string, string> & { makeWeakStore: () => WeakStore<any, any> }}} ExternalInstanceStore
  */
 
 /**
  * @typedef {Object} BackingStore
- * @property {(storeId: string, instanceKind: string) => InstanceStore} makeStore
- * @property {(storeId: string) => InstanceStore} findStore
+ * @property {(storeId: string, instanceKind: string) => ExternalInstanceStore} makeStore
+ * @property {(storeId: string) => ExternalInstanceStore} findStore
  */
diff --git a/packages/zoe/exported.js b/packages/zoe/exported.js
@@ -3,3 +3,4 @@ import './src/zoeService/types';
 import './src/contractSupport/types';
 import './src/types';
 import '@agoric/ertp/exported';
+import '@agoric/store/exported';
diff --git a/packages/zoe/src/internal-types.js b/packages/zoe/src/internal-types.js
@@ -3,16 +3,6 @@
  * @typedef {import('@agoric/promise-kit').ERef<T>} ERef
  */
 
-/**
- * @template K,V
- * @typedef {import('@agoric/store').Store<K, V>} Store
- */
-
-/**
- * @template K,V
- * @typedef {import('@agoric/weak-store').WeakStore<K, V>} WeakStore
- */
-
 /**
  * @template T
  * @typedef {import('@agoric/promise-kit').PromiseRecord<T>} PromiseRecord

diff --git a/packages/zoe/src/zoeService/zoe.js b/packages/zoe/src/zoeService/zoe.js
@@ -8,6 +8,7 @@ import { makePromiseKit } from '@agoric/promise-kit';
  * Zoe uses ERTP, the Electronic Rights Transfer Protocol
  */
 import '@agoric/ertp/exported';
+import '@agoric/store/exported';
 import { makeIssuerKit, MathKind } from '@agoric/ertp';
 
 import '../../exported';