@agoric/notifier 0.6.3-dev-d15cb41.0 → 0.6.3-dev-e456308.0

package/exported.js

@@ -1,3 +1,2 @@
-// @jessie-check
-
-import './src/types-ambient.js';
+// Dummy file for .d.ts twin to declare ambients
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/notifier",
-  "version": "0.6.3-dev-d15cb41.0+d15cb41",
+  "version": "0.6.3-dev-e456308.0+e456308",
   "description": "Notifier allows services to update clients about state changes using a stream of promises",
   "type": "module",
   "main": "src/index.js",
@@ -9,7 +9,7 @@
   },
   "scripts": {
     "build": "exit 0",
-    "prepack": "echo \"export {}; \" | cat - src/types-ambient.js > src/types.js && tsc --build tsconfig.build.json",
+    "prepack": "tsc --build tsconfig.build.json",
     "postpack": "git clean -f '*.d.ts*' src/types.js",
     "test": "ava",
     "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
@@ -33,19 +33,19 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-d15cb41.0+d15cb41",
-    "@agoric/internal": "0.3.3-dev-d15cb41.0+d15cb41",
-    "@agoric/vat-data": "0.5.3-dev-d15cb41.0+d15cb41",
+    "@agoric/assert": "0.6.1-dev-e456308.0+e456308",
+    "@agoric/internal": "0.3.3-dev-e456308.0+e456308",
+    "@agoric/vat-data": "0.5.3-dev-e456308.0+e456308",
     "@endo/far": "^1.1.1",
     "@endo/marshal": "^1.4.1",
     "@endo/patterns": "^1.3.1",
     "@endo/promise-kit": "^1.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-d15cb41.0+d15cb41",
-    "@agoric/swing-store": "0.9.2-dev-d15cb41.0+d15cb41",
-    "@agoric/swingset-liveslots": "0.10.3-dev-d15cb41.0+d15cb41",
-    "@agoric/swingset-vat": "0.32.3-dev-d15cb41.0+d15cb41",
+    "@agoric/kmarshal": "0.1.1-dev-e456308.0+e456308",
+    "@agoric/swing-store": "0.9.2-dev-e456308.0+e456308",
+    "@agoric/swingset-liveslots": "0.10.3-dev-e456308.0+e456308",
+    "@agoric/swingset-vat": "0.32.3-dev-e456308.0+e456308",
     "@endo/init": "^1.1.1",
     "@endo/ses-ava": "^1.2.1",
     "ava": "^5.3.0",
@@ -78,5 +78,5 @@
   "typeCoverage": {
     "atLeast": 89.76
   },
-  "gitHead": "d15cb41b5dc7d3c47a1bc4c034ae74adfc7f838a"
+  "gitHead": "e4563081e57304520ee75f85aff490fcdb640c20"
 }

package/src/asyncIterableAdaptor.d.ts

@@ -1,3 +1,7 @@
+/**
+ * @import {ERef} from '@endo/far';
+ * @import {BaseNotifier, IterationObserver, LatestTopic} from '../src/types.js';
+ */
 /**
  * @deprecated Use `subscribeLatest` from `@agoric/notifier/subscribe.js` instead.
  *
@@ -30,11 +34,14 @@
  * @returns {ForkableAsyncIterable<T>}
  */
 export const makeAsyncIterableFromNotifier: <T_1>(topic: ERef<LatestTopic<T_1>>) => {
-    [Symbol.asyncIterator]: () => ForkableAsyncIterableIterator<T_1, T_1, undefined>;
+    [Symbol.asyncIterator]: () => import("../src/types.js").ForkableAsyncIterableIterator<T_1, T_1>;
 } & import("@endo/eventual-send").RemotableBrand<{}, {
-    [Symbol.asyncIterator]: () => ForkableAsyncIterableIterator<T_1, T_1, undefined>;
+    [Symbol.asyncIterator]: () => import("../src/types.js").ForkableAsyncIterableIterator<T_1, T_1>;
 }>;
 export function observeIterator<T_1>(asyncIteratorP: ERef<AsyncIterator<T_1, any, undefined>>, iterationObserver: Partial<IterationObserver<T_1>>): Promise<undefined>;
 export function observeIteration<T_1>(asyncIterableP: ERef<AsyncIterable<T_1>>, iterationObserver: Partial<IterationObserver<T_1>>): Promise<undefined>;
 export function observeNotifier<T_1>(notifierP: ERef<LatestTopic<T_1>>, iterationObserver: Partial<IterationObserver<T_1>>): Promise<undefined>;
+import type { LatestTopic } from '../src/types.js';
+import type { ERef } from '@endo/far';
+import type { IterationObserver } from '../src/types.js';
 //# sourceMappingURL=asyncIterableAdaptor.d.ts.map

package/src/asyncIterableAdaptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"asyncIterableAdaptor.d.ts","sourceRoot":"","sources":["asyncIterableAdaptor.js"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH;;;;GAA6D;AAatD,gCAH8B,GAAC,+EAA3B,OAAO,CAAC,iBAAiB,CAAC,GAAC,CAAC,CAAC,GAC3B,OAAO,CAAC,SAAS,CAAC,CAyB9B;AAaM,iCAH8B,GAAC,+DAA3B,OAAO,CAAC,iBAAiB,CAAC,GAAC,CAAC,CAAC,GAC3B,OAAO,CAAC,SAAS,CAAC,CAK9B;AAaM,gCAH8B,GAAC,wDAA3B,OAAO,CAAC,iBAAiB,CAAC,GAAC,CAAC,CAAC,GAC3B,OAAO,CAAC,SAAS,CAAC,CAGkC"}
+{"version":3,"file":"asyncIterableAdaptor.d.ts","sourceRoot":"","sources":["asyncIterableAdaptor.js"],"names":[],"mappings":"AAKA;;;GAGG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH;;;;GAA6D;AAatD,gCAH8B,GAAC,iHACzB,OAAO,CAAC,SAAS,CAAC,CAyB9B;AAaM,iCAH8B,GAAC,iGACzB,OAAO,CAAC,SAAS,CAAC,CAK9B;AAaM,gCAH8B,GAAC,0FACzB,OAAO,CAAC,SAAS,CAAC,CAGkC;iCApGF,iBAAiB;0BADzD,WAAW;uCAC6B,iBAAiB"}

package/src/asyncIterableAdaptor.js

@@ -3,7 +3,10 @@
 import { E } from '@endo/far';
 import { subscribeLatest } from './subscribe.js';
 
-import './types-ambient.js';
+/**
+ * @import {ERef} from '@endo/far';
+ * @import {BaseNotifier, IterationObserver, LatestTopic} from '../src/types.js';
+ */
 
 /**
  * @deprecated Use `subscribeLatest` from `@agoric/notifier/subscribe.js` instead.

package/src/index.d.ts

@@ -1,6 +1,7 @@
 export { makePinnedHistoryTopic } from "./topic.js";
 export * from "./storesub.js";
 export * from "./stored-notifier.js";
+export * from "./types.js";
 export { makePublishKit, prepareDurablePublishKit, ForkableAsyncIterableIteratorShape, IterableEachTopicI, IterableLatestTopicI, SubscriberShape } from "./publish-kit.js";
 export { subscribeEach, subscribeLatest } from "./subscribe.js";
 export { makeNotifier, makeNotifierKit, makeNotifierFromAsyncIterable, makeNotifierFromSubscriber } from "./notifier.js";

package/src/index.js

@@ -1,5 +1,8 @@
 // @jessie-check
 
+// XXX ambient types runtime imports until https://github.com/Agoric/agoric-sdk/issues/6512
+import '@agoric/internal/exported.js';
+
 export {
   makePublishKit,
   prepareDurablePublishKit,
@@ -26,3 +29,6 @@ export {
 } from './asyncIterableAdaptor.js';
 export * from './storesub.js';
 export * from './stored-notifier.js';
+
+// eslint-disable-next-line import/export -- doesn't know types
+export * from './types.js';

package/src/notifier.d.ts

@@ -1,5 +1,9 @@
-export function makeNotifier<T>(sharableInternalsP: ERef<LatestTopic<T>>): Notifier<T>;
-export function makeNotifierFromSubscriber<T>(subscriber: ERef<Subscriber<T>>): Notifier<T>;
+export function makeNotifier<T>(sharableInternalsP: globalThis.ERef<LatestTopic<T>>): Notifier<T>;
+export function makeNotifierFromSubscriber<T>(subscriber: globalThis.ERef<Subscriber<T>>): Notifier<T>;
 export function makeNotifierKit<T>(...initialStateArr: [] | [T]): NotifierRecord<T>;
 export function makeNotifierFromAsyncIterable<T>(asyncIterableP: ERef<AsyncIterable<T>>): Notifier<T>;
+import type { LatestTopic } from './types.js';
+import type { Notifier } from './types.js';
+import type { Subscriber } from './types.js';
+import type { NotifierRecord } from './types.js';
 //# sourceMappingURL=notifier.d.ts.map

package/src/notifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notifier.d.ts","sourceRoot":"","sources":["notifier.js"],"names":[],"mappings":"AAcO,6BAFe,CAAC,6CAAV,QAAQ,CAAC,CAAC,CAAC,CAwBvB;AAOM,2CAFe,CAAC,oCAAV,QAAQ,CAAC,CAAC,CAAC,CAiBvB;AAoBM,gCAFqB,CAAC,sBADlB,EAAE,GAAG,CACY,CAAC,AADX,CAAC,GACN,cAAc,CAAC,CAAC,CAAC,CAsB7B;AAcM,8CAFe,CAAC,2CAAV,QAAQ,CAAC,CAAC,CAAC,CAuEvB"}
+{"version":3,"file":"notifier.d.ts","sourceRoot":"","sources":["notifier.js"],"names":[],"mappings":"AAiBO,6BAFe,CAAC,oEAwBtB;AAOM,2CAFe,CAAC,2DAiBtB;AAoBM,gCAFqB,CAAC,sBADlB,EAAE,GAAG,CACY,CAAC,AADX,CAAC,qBAuBlB;AAcM,8CAFe,CAAC,kBADZ,IAAI,CAAC,aAAa,CACP,CAAC,AADQ,CAAC,CAAC,eAwEhC;iCA/K6F,YAAY;8BAAZ,YAAY;gCAAZ,YAAY;oCAAZ,YAAY"}

package/src/notifier.js

@@ -3,10 +3,13 @@
 import { assert } from '@agoric/assert';
 import { E, Far } from '@endo/far';
 
-import './types-ambient.js';
 import { makePublishKit } from './publish-kit.js';
 import { subscribeLatest } from './subscribe.js';
 
+/**
+ * @import {LatestTopic, Notifier, NotifierRecord, PublishKit, Subscriber, UpdateRecord} from './types.js';
+ */
+
 /**
  * @template T
  * @param {ERef<LatestTopic<T>>} sharableInternalsP

package/src/publish-kit.d.ts

@@ -26,7 +26,7 @@ export const IterableLatestTopicI: import("@endo/patterns").InterfaceGuard<{
     [Symbol.asyncIterator]: import("@endo/patterns").MethodGuard;
 }>;
 export function makePublishKit<T>(): PublishKit<T>;
-export function prepareDurablePublishKit(baggage: MapStore<string, any>, kindName: string): (options?: {
+export function prepareDurablePublishKit(baggage: import("@agoric/swingset-liveslots").Baggage, kindName: string): (options?: {
     valueDurability?: "mandatory" | undefined;
 } | undefined) => import("@endo/exo").GuardedKit<{
     publisher: {
@@ -40,7 +40,11 @@ export function prepareDurablePublishKit(baggage: MapStore<string, any>, kindNam
     };
 }>;
 export const SubscriberShape: import("@endo/patterns").Matcher;
-export type DurablePublishKitEphemeralKey = Publisher<any>;
+export type DurablePublishKitEphemeralKey = {
+    publish: (nonFinalValue: any) => void;
+    finish: (completion: any) => void;
+    fail: (reason: any) => void;
+};
 export type DurablePublishKitEphemeralData = {
     /**
      * The current-result promise
@@ -57,4 +61,5 @@ export type DurablePublishKitEphemeralData = {
      */
     tailR: ((value: any) => void) | undefined;
 };
+import type { PublishKit } from '../src/types.js';
 //# sourceMappingURL=publish-kit.d.ts.map

package/src/publish-kit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publish-kit.d.ts","sourceRoot":"","sources":["publish-kit.js"],"names":[],"mappings":"AAqBA;;;;GAIG;AAGH,gEAA6D;AAC7D;;;GAGG;;;;;AAMH;;;;GAOE;AAEF;;;GAMG;AAEH;;;GAMG;AA+CI,+BAFiB,CAAC,KAAZ,UAAU,CAAC,CAAC,CAAC,CA4FzB;AA6MM,mFAFI,MAAM;;;;;;;;;;;;GA2EhB;AAGD,+DAAyD;4CAlP3C,SAAS,KAAG;;;;;;cASZ,OAAO,KAAG,GAAG,SAAS;;;;WAEtB,OAAO,KAAG;;;;;WACV,CAAC,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC,GAAG,SAAS"}
+{"version":3,"file":"publish-kit.d.ts","sourceRoot":"","sources":["publish-kit.js"],"names":[],"mappings":"AAwBA;;;;GAIG;AAGH,gEAA6D;AAC7D;;;GAGG;;;;;AAMH;;;;GAOE;AAEF;;;GAMG;AAEH;;;GAMG;AA+CI,+BAFiB,CAAC,mBA4FxB;AA6MM,kDAHI,OAAO,4BAA4B,EAAE,OAAO,YAC5C,MAAM;;;;;;;;;;;;GA2EhB;AAGD,+DAAyD;;;;;;;;;;;cAzO3C,OAAO,KAAG,GAAG,SAAS;;;;WAEtB,OAAO,KAAG;;;;;WACV,CAAC,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC,GAAG,SAAS;;gCAnPsI,iBAAiB"}

package/src/publish-kit.js

@@ -5,7 +5,10 @@ import { E, Far } from '@endo/far';
 import { M, getInterfaceGuardPayload } from '@endo/patterns';
 import { makePromiseKit } from '@endo/promise-kit';
 
-import './types-ambient.js';
+/**
+ * @import {ERef} from '@endo/far';
+ * @import {DurablePublishKitState, DurablePublishKitValueDurability, LatestTopic, Notifier, NotifierRecord, PublicationRecord, Publisher, PublishKit, Subscriber, UpdateRecord} from '../src/types.js';
+ */
 
 const { Fail, quote: q } = assert;
 

package/src/stored-notifier.d.ts

@@ -1,3 +1,37 @@
-export function makeStoredNotifier<T>(notifier: ERef<Notifier<T>>, storageNode: ERef<StorageNode>, marshaller: ERef<Marshaller<unknown>>): StoredNotifier<T>;
+export function makeStoredNotifier<T>(notifier: ERef<Notifier<T>>, storageNode: ERef<StorageNode>, marshaller: ERef<{
+    /**
+     * @import {ERef} from '@endo/far';
+     * @import {BaseNotifier, Notifier} from './types.js';
+     * @import {Marshaller, StoredFacet, StorageNode, Unserializer} from '@agoric/internal/src/lib-chainStorage.js';
+     */
+    /**
+     * @template T
+     * @typedef {BaseNotifier<T> & Omit<StoredFacet, 'getStoreKey'>} StoredNotifier
+     */
+    /**
+     * Begin iterating the source, storing serialized iteration values.  If the
+     * storageNode's `setValue` operation rejects, no further writes to it will
+     * be attempted (but results will remain available from the subscriber).
+     *
+     * Returns a StoredNotifier that can be used by a client to directly follow
+     * the iteration themselves, or obtain information to subscribe to the stored
+     * data out-of-band.
+     *
+     * @template T
+     * @param {ERef<Notifier<T>>} notifier
+     * @param {ERef<StorageNode>} storageNode
+     * @param {ERef<Marshaller>} marshaller
+     * @returns {StoredNotifier<T>}
+     */
+    toCapData: import("../../../node_modules/@endo/marshal/src/marshal.js").ToCapData<unknown>;
+    fromCapData: import("../../../node_modules/@endo/marshal/src/marshal.js").FromCapData<unknown>;
+    serialize: import("../../../node_modules/@endo/marshal/src/marshal.js").ToCapData<unknown>;
+    unserialize: import("../../../node_modules/@endo/marshal/src/marshal.js").FromCapData<unknown>;
+}>): StoredNotifier<T>;
 export type StoredNotifier<T> = BaseNotifier<T> & Omit<StoredFacet, "getStoreKey">;
+import type { Notifier } from './types.js';
+import type { ERef } from '@endo/far';
+import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
+import type { BaseNotifier } from './types.js';
+import type { StoredFacet } from '@agoric/internal/src/lib-chainStorage.js';
 //# sourceMappingURL=stored-notifier.d.ts.map

package/src/stored-notifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stored-notifier.d.ts","sourceRoot":"","sources":["stored-notifier.js"],"names":[],"mappings":"AA2BO,mCAFqB,CAAC,uGAAhB,cAAc,CAAC,CAAC,CAAC,CAiC7B;2BAjDyB,CAAC,IAAd,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC"}
+{"version":3,"file":"stored-notifier.d.ts","sourceRoot":"","sources":["stored-notifier.js"],"names":[],"mappings":"AAiCO,mCAFqB,CAAC;IAxB7B;;;;OAIG;IAEH;;;OAGG;IAEH;;;;;;;;;;;;;;OAcG;;;;;KADU,cAAc,CAAC,CAAC,CAAC,CAiC7B;2BAjDyB,CAAC;8BANc,YAAY;0BAD9B,WAAW;iCAEmC,0CAA0C;kCADtE,YAAY;iCACgB,0CAA0C"}

package/src/stored-notifier.js

@@ -5,6 +5,12 @@ import { makeSerializeToStorage } from '@agoric/internal/src/lib-chainStorage.js
 import { E, Far } from '@endo/far';
 import { observeNotifier } from './asyncIterableAdaptor.js';
 
+/**
+ * @import {ERef} from '@endo/far';
+ * @import {BaseNotifier, Notifier} from './types.js';
+ * @import {Marshaller, StoredFacet, StorageNode, Unserializer} from '@agoric/internal/src/lib-chainStorage.js';
+ */
+
 /**
  * @template T
  * @typedef {BaseNotifier<T> & Omit<StoredFacet, 'getStoreKey'>} StoredNotifier

package/src/storesub.d.ts

@@ -11,11 +11,29 @@ export function makeStoredSubscription<T>(subscription: Subscription<T>, storage
     serialize: import("../../../node_modules/@endo/marshal/src/marshal.js").ToCapData<unknown>;
     unserialize: import("../../../node_modules/@endo/marshal/src/marshal.js").FromCapData<unknown>;
 }> | undefined): StoredSubscription<T>;
-export function makeStoredPublisherKit<T = unknown>(storageNode?: ERef<StorageNode> | undefined, marshaller?: ERef<Marshaller<unknown>> | undefined, childPath?: string | undefined): StoredPublisherKit<T>;
-export function makeStoredPublishKit<T = unknown>(storageNode: ERef<StorageNode>, marshaller: ERef<Marshaller<unknown>>): StoredPublishKit<T>;
+export function makeStoredPublisherKit<T = unknown>(storageNode?: ERef<StorageNode> | undefined, marshaller?: ERef<{
+    toCapData: import("../../../node_modules/@endo/marshal/src/marshal.js").ToCapData<unknown>;
+    fromCapData: import("../../../node_modules/@endo/marshal/src/marshal.js").FromCapData<unknown>;
+    serialize: import("../../../node_modules/@endo/marshal/src/marshal.js").ToCapData<unknown>;
+    unserialize: import("../../../node_modules/@endo/marshal/src/marshal.js").FromCapData<unknown>;
+}> | undefined, childPath?: string | undefined): StoredPublisherKit<T>;
+export function makeStoredPublishKit<T = unknown>(storageNode: ERef<StorageNode>, marshaller: ERef<{
+    toCapData: import("../../../node_modules/@endo/marshal/src/marshal.js").ToCapData<unknown>;
+    fromCapData: import("../../../node_modules/@endo/marshal/src/marshal.js").FromCapData<unknown>;
+    serialize: import("../../../node_modules/@endo/marshal/src/marshal.js").ToCapData<unknown>;
+    unserialize: import("../../../node_modules/@endo/marshal/src/marshal.js").FromCapData<unknown>;
+}>): StoredPublishKit<T>;
 export type StoredPublisherKit<T> = {
     subscriber: StoredSubscription<T>;
     publisher: IterationObserver<T>;
 };
+import type { Subscriber } from '../src/types.js';
+import type { StorageNode } from '@agoric/internal/src/lib-chainStorage.js';
+import type { ERef } from '@endo/far';
 import { makeMarshal } from '@endo/marshal';
+import type { StoredSubscriber } from '../src/types.js';
+import type { Subscription } from '../src/types.js';
+import type { StoredSubscription } from '../src/types.js';
+import type { StoredPublishKit } from '../src/types.js';
+import type { IterationObserver } from '../src/types.js';
 //# sourceMappingURL=storesub.d.ts.map

package/src/storesub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storesub.d.ts","sourceRoot":"","sources":["storesub.js"],"names":[],"mappings":"AAiBO,yCAFQ,CAAC,cADL,UAAU,CACN,CAAC,AADO,CAAC,gBACb,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,iBAcxB;AAiBM,qCAFuB,CAAC,cAHpB,UAAU,CAGS,CAAC,AAHR,CAAC;;;;;KAGX,gBAAgB,CAAC,CAAC,CAAC,CA6B/B;AAkBM,uCAFyB,CAAC,gBAHtB,YAAY,CAGS,CAAC,AAHR,CAAC;;;;;iBAGb,kBAAkB,CAAC,CAAC,CAAC,CAqEjC;AAoBM,uCAFyB,CAAC,8IAApB,kBAAkB,CAAC,CAAC,CAAC,CAoBjC;AAgBM,qCAFuB,CAAC,oFAAlB,gBAAgB,CAAC,CAAC,CAAC,CAU/B;+BAtD+B,CAAC;gBADnB,kBAAkB,CACA,CAAC,AADC,CAAC;eACrB,iBAAiB,CAAC,CAAC,CAAC;;4BArKN,eAAe"}
+{"version":3,"file":"storesub.d.ts","sourceRoot":"","sources":["storesub.js"],"names":[],"mappings":"AAuBO,yCAFQ,CAAC,2CAAL,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,iBAcxB;AAiBM,qCAFuB,CAAC;;;;;yBA6B9B;AAkBM,uCAFyB,CAAC;;;;;uCAqEhC;AAoBM,uCAFyB,CAAC;;;;;iDAApB,kBAAkB,CAAC,CAAC,CAAC,CAoBjC;AAgBM,qCAFuB,CAAC;;;;;yBAU9B;+BAtD+B,CAAC;;;;gCAjKoL,iBAAiB;iCAC9K,0CAA0C;0BAF3E,WAAW;4BATN,eAAe;sCAU0K,iBAAiB;kCAAjB,iBAAiB;wCAAjB,iBAAiB;sCAAjB,iBAAiB;uCAAjB,iBAAiB"}

package/src/storesub.js

@@ -7,6 +7,12 @@ import { makePublishKit } from './publish-kit.js';
 import { makeSubscriptionKit } from './subscriber.js';
 import { subscribeEach } from './subscribe.js';
 
+/**
+ * @import {ERef} from '@endo/far';
+ * @import {IterationObserver, LatestTopic, Notifier, NotifierRecord, PublicationRecord, Publisher, PublishKit, StoredPublishKit, StoredSubscription, StoredSubscriber, Subscriber, Subscription, UpdateRecord} from '../src/types.js';
+ * @import {Marshaller, StorageNode, Unserializer} from '@agoric/internal/src/lib-chainStorage.js';
+ */
+
 /**
  * NB: does not yet survive upgrade https://github.com/Agoric/agoric-sdk/issues/6893
  *
@@ -97,7 +103,7 @@ export const makeStoredSubscription = (
     serializeBodyFormat: 'smallcaps',
   }),
 ) => {
-  /** @type {Unserializer} */
+  /** @type {import('@agoric/internal/src/lib-chainStorage.js').Unserializer} */
   const unserializer = Far('unserializer', {
     fromCapData: data => E(marshaller).fromCapData(data),
     unserialize: data => E(marshaller).fromCapData(data),

package/src/subscribe.d.ts

@@ -16,13 +16,17 @@ export function subscribe<T>(itP: ERef<AsyncIterableIterator<T>>): {
     }>;
 }>;
 export function subscribeEach<T>(topic: ERef<EachTopic<T>>): {
-    [Symbol.asyncIterator]: () => ForkableAsyncIterableIterator<T, T, undefined>;
+    [Symbol.asyncIterator]: () => ForkableAsyncIterableIterator<T, T>;
 } & import("@endo/eventual-send").RemotableBrand<{}, {
-    [Symbol.asyncIterator]: () => ForkableAsyncIterableIterator<T, T, undefined>;
+    [Symbol.asyncIterator]: () => ForkableAsyncIterableIterator<T, T>;
 }>;
 export function subscribeLatest<T>(topic: ERef<LatestTopic<T>>): {
-    [Symbol.asyncIterator]: () => ForkableAsyncIterableIterator<T, T, undefined>;
+    [Symbol.asyncIterator]: () => ForkableAsyncIterableIterator<T, T>;
 } & import("@endo/eventual-send").RemotableBrand<{}, {
-    [Symbol.asyncIterator]: () => ForkableAsyncIterableIterator<T, T, undefined>;
+    [Symbol.asyncIterator]: () => ForkableAsyncIterableIterator<T, T>;
 }>;
+import type { ERef } from '@endo/far';
+import type { EachTopic } from '../src/types.js';
+import type { ForkableAsyncIterableIterator } from '../src/types.js';
+import type { LatestTopic } from '../src/types.js';
 //# sourceMappingURL=subscribe.d.ts.map

package/src/subscribe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["subscribe.js"],"names":[],"mappings":"AAkEO,0BAF+B,CAAC;;;;;;;;;;;;;;;;GAYnC;AAuEG,8BAFmB,CAAC;;;;GAU1B;AAsGM,gCAFqB,CAAC;;;;GAO5B"}
+{"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["subscribe.js"],"names":[],"mappings":"AAqEO,0BAF+B,CAAC;;;;;;;;;;;;;;;;GAYnC;AAuEG,8BAFmB,CAAC;;;;GAU1B;AAsGM,gCAFqB,CAAC;;;;GAO5B;0BApQsB,WAAW;+BAC6N,iBAAiB;mDAAjB,iBAAiB;iCAAjB,iBAAiB"}

package/src/subscribe.js

@@ -2,7 +2,10 @@ import { E, Far } from '@endo/far';
 import { isObject } from '@endo/marshal';
 import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
 
-import './types-ambient.js';
+/**
+ * @import {ERef} from '@endo/far';
+ * @import {IterationObserver, LatestTopic, Notifier, NotifierRecord, PublicationRecord, Publisher, PublishKit, StoredPublishKit, StoredSubscription, StoredSubscriber, Subscriber, Subscription, UpdateRecord, EachTopic, ForkableAsyncIterableIterator} from '../src/types.js';
+ */
 
 const { details: X, Fail } = assert;
 const sink = () => {};
@@ -50,7 +53,7 @@ const reconnectAsNeeded = async (getter, seed = []) => {
             X`Attempting to recover from disconnection: ${disconnection}`,
           );
         } catch (_err) {
-          // eslint-disable-next-line no-empty
+          // noop
         }
       }
       throw err;

package/src/subscriber.d.ts

@@ -1,9 +1,12 @@
+/**
+ * @import {EachTopic, IterationObserver, LatestTopic, Notifier, NotifierRecord, SubscriptionRecord, Publisher, PublishKit, StoredPublishKit, StoredSubscription, StoredSubscriber, Subscriber, Subscription, UpdateRecord} from '../src/types.js';
+ */
 /**
  * @template T
  * @param {ERef<EachTopic<T>>} topic
  * @returns {Subscription<T>}
  */
-export function makeSubscription<T>(topic: ERef<EachTopic<T>>): Subscription<T>;
+export function makeSubscription<T>(topic: globalThis.ERef<EachTopic<T>>): Subscription<T>;
 /**
  * @deprecated Producers should use
  * ```js
@@ -23,4 +26,7 @@ export function makeSubscription<T>(topic: ERef<EachTopic<T>>): Subscription<T>;
  * @returns {SubscriptionRecord<T>}
  */
 export function makeSubscriptionKit<T>(): SubscriptionRecord<T>;
+import type { EachTopic } from '../src/types.js';
+import type { Subscription } from '../src/types.js';
+import type { SubscriptionRecord } from '../src/types.js';
 //# sourceMappingURL=subscriber.d.ts.map

package/src/subscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscriber.d.ts","sourceRoot":"","sources":["subscriber.js"],"names":[],"mappings":"AAYA;;;;GAIG;AACH,iCAF0B,CAAC,8BAAd,YAAY,CAAC,CAAC,CAAC,CAkB3B;AAID;;;;;;;;;;;;;;;;;GAiBG;AACH,oCAFgC,CAAC,KAApB,kBAAkB,CAAC,CAAC,CAAC,CAmBjC"}
+{"version":3,"file":"subscriber.d.ts","sourceRoot":"","sources":["subscriber.js"],"names":[],"mappings":"AAUA;;GAEG;AAEH;;;;GAIG;AACH,iCAF0B,CAAC,yDAkB1B;AAID;;;;;;;;;;;;;;;;;GAiBG;AACH,oCAFgC,CAAC,2BAmBhC;+BA/DgO,iBAAiB;kCAAjB,iBAAiB;wCAAjB,iBAAiB"}

package/src/subscriber.js

@@ -8,7 +8,9 @@ import { makePublishKit } from './publish-kit.js';
 
 import { makePinnedHistoryTopic } from './topic.js';
 
-import './types-ambient.js';
+/**
+ * @import {EachTopic, IterationObserver, LatestTopic, Notifier, NotifierRecord, SubscriptionRecord, Publisher, PublishKit, StoredPublishKit, StoredSubscription, StoredSubscriber, Subscriber, Subscription, UpdateRecord} from '../src/types.js';
+ */
 
 /**
  * @template T

package/src/topic.d.ts

@@ -1,2 +1,4 @@
 export function makePinnedHistoryTopic<T>(topic: EachTopic<T> & LatestTopic<T>): EachTopic<T> & LatestTopic<T>;
+import type { EachTopic } from '../src/types.js';
+import type { LatestTopic } from '../src/types.js';
 //# sourceMappingURL=topic.d.ts.map

package/src/topic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"topic.d.ts","sourceRoot":"","sources":["topic.js"],"names":[],"mappings":"AAcO,uCAFiC,CAAC,SAF9B,SAAS,CAEoB,CAAC,AAFnB,CAAC,GAAG,WAAW,CAEG,CAAC,AAFF,CAAC,GAE3B,SAAS,CAAkB,CAAC,AAAjB,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAoBzC"}
+{"version":3,"file":"topic.d.ts","sourceRoot":"","sources":["topic.js"],"names":[],"mappings":"AAiBO,uCAFiC,CAAC,uEAoBxC;+BA9BwC,iBAAiB;iCAAjB,iBAAiB"}

package/src/topic.js

@@ -1,7 +1,10 @@
 // @jessie-check
 
 import { Far } from '@endo/far';
-import './types-ambient.js';
+
+/**
+ * @import {EachTopic, LatestTopic} from '../src/types.js';
+ */
 
 /**
  * @deprecated A pinned-history topic preserves all of its published values in

package/src/types.d.ts

@@ -19,7 +19,6 @@ export type ForkableAsyncIterable<T, TReturn = any, TNext = undefined> = {
     [Symbol.asyncIterator]: () => ForkableAsyncIterator<T, TReturn, TNext>;
 };
 /**
- * <T>
  * A valid sequence of calls to the methods of an `IterationObserver`
  * represents an iteration. A valid sequence consists of any number of calls
  * to `updateState` with the successive non-final values, followed by a
@@ -113,16 +112,10 @@ export type Publisher<T> = {
     fail: (reason: any) => void;
 };
 export type PublishObserver<T> = Partial<Publisher<T>>;
-/**
- * <T>
- */
 export type PublishKit<T> = {
     publisher: Publisher<T>;
     subscriber: Subscriber<T>;
 };
-/**
- * <T>
- */
 export type StoredPublishKit<T> = {
     publisher: Publisher<T>;
     subscriber: StoredSubscriber<T>;
@@ -159,9 +152,6 @@ export type DurablePublishKitState = {
      */
     value: any;
 };
-/**
- * <T>
- */
 export type UpdateRecord<T> = {
     /**
      * is whatever state the service wants to publish
@@ -180,7 +170,7 @@ export type UpdateRecord<T> = {
  */
 export type NotifierInternals<T> = BaseNotifier<T>;
 /**
- * <T> an object that can be used to get the current state or updates
+ * an object that can be used to get the current state or updates
  */
 export type Notifier<T> = NotifierInternals<T> & ForkableAsyncIterable<T, T> & SharableNotifier<T>;
 export type SharableNotifier<T> = {
@@ -197,7 +187,7 @@ export type SharableNotifier<T> = {
     getSharableNotifierInternals: () => Promise<NotifierInternals<T>>;
 };
 /**
- * <T> the produced notifier/updater pair
+ * the produced notifier/updater pair
  */
 export type NotifierRecord<T> = {
     /**
@@ -210,7 +200,6 @@ export type NotifierRecord<T> = {
     notifier: Notifier<T>;
 };
 /**
- * <T>
  * A form of AsyncIterable supporting distributed and multicast usage.
  */
 export type Subscription<T> = IterableEachTopic<T> & EachTopic<T> & SharableSubscription<T>;
@@ -227,69 +216,17 @@ export type SharableSubscription<T> = {
      */
     getSharableSubscriptionInternals: () => Promise<EachTopic<T>>;
 };
-/**
- * <T>
- */
 export type SubscriptionRecord<T> = {
     publication: IterationObserver<T>;
     subscription: Subscription<T>;
 };
-export type Marshaller<Slot = unknown> = import("@endo/marshal").Marshal<Slot>;
-export type Unserializer = Pick<Marshaller, "fromCapData">;
-/**
- * Defined by vstorageStoreKey in vstorage.go
- */
-export type VStorageKey = {
-    storeName: string;
-    storeSubkey: string;
-    dataPrefixBytes: string;
-    noDataValue?: string | undefined;
-};
-/**
- * This represents a node in an IAVL tree.
- *
- * The active implementation is x/vstorage, an Agoric extension of the Cosmos SDK.
- *
- * Vstorage is a hierarchical externally-reachable storage structure that
- * identifies children by restricted ASCII name and is associated with arbitrary
- * string-valued data for each node, defaulting to the empty string.
- */
-export type StorageNode = {
-    /**
-     * publishes some data (append to the node)
-     */
-    setValue: (data: string) => Promise<void>;
-    /**
-     * the chain storage path at which the node was constructed
-     */
-    getPath: () => string;
-    /**
-     * DEPRECATED use getPath
-     */
-    getStoreKey: () => Promise<VStorageKey>;
-    makeChildNode: (subPath: string, options?: {
-        sequence?: boolean;
-    }) => StorageNode;
-};
-export type StoredFacet = {
-    /**
-     * the chain storage path at which the node was constructed
-     */
-    getPath: () => Promise<string>;
-    /**
-     * DEPRECATED use getPath
-     */
-    getStoreKey: StorageNode["getStoreKey"];
-    /**
-     * get the unserializer for the stored data
-     */
-    getUnserializer: () => Unserializer;
-};
-export type StoredSubscription<T> = Subscription<T> & {
+export type StoredSubscription<T> = ForkableAsyncIterable<T, T, undefined> & EachTopic<T> & SharableSubscription<T> & {
     getStoreKey: () => Promise<VStorageKey & {
         subscription: Subscription<T>;
     }>;
     getUnserializer: () => Unserializer;
 };
-export type StoredSubscriber<T> = Subscriber<T> & StoredFacet;
+export type StoredSubscriber<T> = LatestTopic<T> & EachTopic<T> & StoredFacet;
+import type { Unserializer } from '@agoric/internal/src/lib-chainStorage.js';
+import type { StoredFacet } from '@agoric/internal/src/lib-chainStorage.js';
 //# sourceMappingURL=types.d.ts.map

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":";;;;kCAcmC,CAAC,EAAE,OAAO,QAAE,KAAK,gBADvC,aAAa,CACS,CAAC,AADR,EACU,OAAO,AADR,EACU,KAAK,AADR,CAAC,GAAG;IAC/C,IAAQ,IAAI,qBAAqB,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;CACjD;8BAQ2D,CAAC,EAAE,OAAO,QAAE,KAAK,gBAAnE;IAAE,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,qBAAqB,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;CAAE;0CAUxD,CAAC,EAAE,OAAO,QAAE,KAAK,gBAH/B;IACZ,CAAK,MAAM,CAAC,aAAa,CAAC,IAAI,6BAA6B,CAEjC,CAAC,AAFkC,EAEhC,OAAO,AAFkC,EAEhC,KAAK,AAFkC,CAAC,CAAC;IAC/E,IAAQ,IAAI,6BAA6B,CACf,CAAC,AADgB,EACd,OAAO,AADgB,EACd,KAAK,AADgB,CAAC,CAAA;CAAE,GAC9D,qBAAyB,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC;;;;kCASY,CAAC,EAAE,OAAO,QAAE,KAAK,gBAD7D;IACZ,CAAK,MAAM,CAAC,aAAa,CAAC,EAAE,MAAM,qBAAqB,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;CACvE;;;;;;;;;;;8BAeuB,CAAC;iBADd,CAAC,aAAa,EACD,CAAC,AADG,KAAK,IAAI;YAC1B,CAAC,UAAU,EAAE,CAAC,KAAK,IAAI;UACvB,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI;;;;;;;8BAcC,CAAC;UAH3B,cAAc,CAGY,CAAC,AAHX,CAAC;;;;;kBACjB,MAAM;UAEN,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;;sBAMwB,CAAC;;;;;;;oBAAtD,CAAC,YAAY,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;;;;;;;;;;8BASjB,CAAC,IAAzC,qBAAqB,CAAmB,CAAC,AAAlB,EAAiB,CAAC,AAAf,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;;;;;;;;;gCAWJ,CAAC,IAAvC,iBAAiB,CAAqB,CAAC,AAApB,EAAmB,CAAC,AAAjB,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;wBAYiB,CAAC;;;;;;;;;;;oBAAzD,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;;;;;;yBAahD,CAAC,IAAb,WAAW,CAAC,CAAC,CAAC;;;;;;uBAMa,CAAC,IAA5B,WAAW,CAAgB,CAAC,AAAf,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;;;;;;;;;;sBAiBf,CAAC;aADd,CAAC,aAAa,EACD,CAAC,AADG,KAAK,IAAI;YAC1B,CAAC,UAAU,EAAE,CAAC,KAAK,IAAI;UACvB,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI;;4BAKJ,CAAC,IAAnB,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;;;;uBAOT,CAAC;eADZ,SAAS,CACE,CAAC,AADD,CAAC;gBACZ,UAAU,CAAC,CAAC,CAAC;;;;;6BAOI,CAAC;eADlB,SAAS,CACQ,CAAC,AADP,CAAC;gBACZ,gBAAgB,CAAC,CAAC,CAAC;;;;;;;;;;;;;;;;;+CAMpB,WAAW,GAAG,eAAe,GAAG,SAAS;;qBAoBxC,gCAAgC;kBAEhC,MAAM;YAEN,MAAM,GAAG,UAAU,GAAG,QAAQ;;;;;;cAE9B,OAAO;;;;;WAKP,GAAG;;;;;yBAUH,CAAC;;;;WAAD,CAAC;;;;;;;;;;;;8BAOW,CAAC,IAAd,YAAY,CAAC,CAAC,CAAC;;;;qBASN,CAAC,IAFV,iBAAiB,CAER,CAAC,AAFS,CAAC,GAChC,qBAAyB,CACJ,CAAC,AADK,EACN,CAAC,AADQ,CAAC,GAC/B,gBAAoB,CAAC,CAAC,CAAC;6BAOsB,CAAC;;;;;;;;;;;kCAAjC,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;;;;;2BAe1B,CAAC;;;;aADV,iBAAiB,CACR,CAAC,AADS,CAAC;;;;cACpB,QAAQ,CAAC,CAAC,CAAC;;;;;;yBAQC,CAAC,IADd,iBAAiB,CACJ,CAAC,AADK,CAAC,GAAG,SAAS,CACnB,CAAC,AADoB,CAAC,GAC/C,oBAAwB,CAAC,CAAC,CAAC;iCAOU,CAAC;;;;;;;;;;;sCAAzB,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;;;;;+BAed,CAAC;iBADd,iBAAiB,CACJ,CAAC,AADK,CAAC;kBACpB,YAAY,CAAC,CAAC,CAAC;;uBAK0C,IAAI,cAApC,OAAO,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC;2BAC9D,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC;;;;;eAM/B,MAAM;iBACN,MAAM;qBACN,MAAM;;;;;;;;;;;;;;;;cAcN,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;;;;aAC/B,MAAM,MAAM;;;;iBACZ,MAAM,OAAO,CAAC,WAAW,CAAC;mBAC1B,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAC,KAAK,WAAW;;;;;;aAKhE,MAAM,OAAO,CAAC,MAAM,CAAC;;;;iBACrB,WAAW,CAAC,aAAa,CAAC;;;;qBAC1B,MAAM,YAAY;;+BAO2C,CAAC,IAD/D,YAAY,CACkD,CAAC,AADjD,CAAC,GAAG;IAC9B,WAAe,EAAE,MAAM,OAAO,CAAC,WAAW,GAAG;QAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAA;KAAE,CAAC,CAAC;IAChF,eAAmB,EAAE,MAAM,YAAY,CAAC;CACrC;6BAKoB,CAAC,IAAZ,UAAU,CAAC,CAAC,CAAC,GAAG,WAAW"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"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"}