chore(types): @import

packages/network/src/network.js

@@ -8,6 +8,9 @@ import { Shape } from './shapes.js';
 
 import '@agoric/store/exported.js';
 /// <reference path="./types.js" />
+/**
+ * @import {VowTools} from '@agoric/vow';
+ */
 
 /**
  * Compatibility note: this must match what our peers use, so don't change it
@@ -58,7 +61,7 @@ export function getPrefixes(addr) {
 
 /**
  * @param {import('@agoric/base-zone').Zone} zone
- * @param {ReturnType<import('@agoric/vow').prepareVowTools>} powers
+ * @param {VowTools} powers
  */
 const prepareHalfConnection = (zone, { watch }) => {
   const makeHalfConnectionKit = zone.exoClassKit(
@@ -215,7 +218,7 @@ export const crossoverConnection = (
 /**
  * @param {import('@agoric/zone').Zone} zone
  * @param {(opts: ConnectionOpts) => Connection} makeConnection
- * @param {ReturnType<import('@agoric/vow').prepareVowTools>} powers
+ * @param {VowTools} powers
  */
 const prepareInboundAttempt = (zone, makeConnection, { watch }) => {
   const makeInboundAttemptKit = zone.exoClassKit(
@@ -380,7 +383,7 @@ const RevokeState = /** @type {const} */ ({
 
 /**
  * @param {import('@agoric/zone').Zone} zone
- * @param {ReturnType<import('@agoric/vow').prepareVowTools>} powers
+ * @param {VowTools} powers
  */
 const preparePort = (zone, powers) => {
   const makeIncapable = zone.exoClass('Incapable', undefined, () => ({}), {});
@@ -630,7 +633,7 @@ const preparePort = (zone, powers) => {
 
 /**
  * @param {import('@agoric/base-zone').Zone} zone
- * @param {ReturnType<import('@agoric/vow').prepareVowTools>} powers
+ * @param {VowTools} powers
  */
 const prepareBinder = (zone, powers) => {
   const makeConnection = prepareHalfConnection(zone, powers);
@@ -1149,7 +1152,7 @@ const prepareBinder = (zone, powers) => {
 
 /**
  * @param {import('@agoric/base-zone').Zone} zone
- * @param {ReturnType<import('@agoric/vow').prepareVowTools>} powers
+ * @param {VowTools} powers
  */
 export const prepareNetworkProtocol = (zone, powers) => {
   const makeBinderKit = prepareBinder(zone, powers);
@@ -1272,7 +1275,7 @@ export const prepareEchoConnectionKit = zone => {
  * Create a protocol handler that just connects to itself.
  *
  * @param {import('@agoric/base-zone').Zone} zone
- * @param {ReturnType<import('@agoric/vow').prepareVowTools>} powers
+ * @param {VowTools} powers
  */
 export function prepareLoopbackProtocolHandler(zone, { watch, allVows }) {
   const detached = zone.detached();

packages/network/src/router.js

@@ -8,6 +8,10 @@ import { Shape } from './shapes.js';
 import '@agoric/store/exported.js';
 /// <reference path="./types.js" />
 
+/**
+ * @import {VowTools} from '@agoric/vow';
+ */
+
 /**
  * @template T
  * @typedef {object} Router A delimited string router implementation
@@ -102,7 +106,7 @@ export const prepareRouter = zone => {
  * Create a router that behaves like a Protocol.
  *
  * @param {import('@agoric/base-zone').Zone} zone
- * @param {ReturnType<import('@agoric/vow').prepareVowTools>} powers
+ * @param {VowTools} powers
  * @param {typeof defaultE} [E] Eventual sender
  */
 export const prepareRouterProtocol = (zone, powers, E = defaultE) => {

packages/network/src/types.js

@@ -1,6 +1,6 @@
 // @ts-check
 
-/** @import {PromiseVow, Remote} from '@agoric/vow' */
+/** @import {PromiseVow, Remote} from '@agoric/vow'; */
 
 /**
  * @template {import('@endo/exo').Methods} M

packages/vow/src/watch.js

@@ -2,6 +2,11 @@
 import { getVowPayload, basicE } from './vow-utils.js';
 import { PromiseWatcherI, watchPromiseShim } from './watch-promise.js';
 
+/**
+ * @import {PromiseWatcher} from './watch-promise.js';
+ * @import {ERef, Vow, VowKit, VowResolver, Watcher} from './types.js';
+ */
+
 const { apply } = Reflect;
 
 /**
@@ -15,7 +20,7 @@ const makeWatchNextStep =
    * (usually durable) watcher object with the promise.
    *
    * @param {any} specimen
-   * @param {import('./watch-promise.js').PromiseWatcher} promiseWatcher
+   * @param {PromiseWatcher} promiseWatcher
    */
   (specimen, promiseWatcher) => {
     let promise;
@@ -29,9 +34,9 @@ const makeWatchNextStep =
   };
 
 /**
- * @param {import('./types.js').VowResolver | undefined} resolver
- * @param {import('./types.js').Watcher<unknown, unknown, unknown> | undefined} watcher
- * @param {keyof Required<import('./types.js').Watcher>} wcb
+ * @param {VowResolver | undefined} resolver
+ * @param {Watcher<unknown, unknown, unknown> | undefined} watcher
+ * @param {keyof Required<Watcher>} wcb
  * @param {unknown} value
  * @param {unknown} [watcherContext]
  */
@@ -68,8 +73,8 @@ const preparePromiseWatcher = (zone, isRetryableReason, watchNextStep) =>
      * @template [T=any]
      * @template [TResult1=T]
      * @template [TResult2=never]
-     * @param {import('./types.js').VowResolver<TResult1 | TResult2>} resolver
-     * @param {import('./types.js').Watcher<T, TResult1, TResult2>} [watcher]
+     * @param {VowResolver<TResult1 | TResult2>} resolver
+     * @param {Watcher<T, TResult1, TResult2>} [watcher]
      * @param {unknown} [watcherContext]
      */
     (resolver, watcher, watcherContext) => {
@@ -82,7 +87,7 @@ const preparePromiseWatcher = (zone, isRetryableReason, watchNextStep) =>
       return /** @type {Partial<typeof state>} */ (state);
     },
     {
-      /** @type {Required<import('./watch-promise.js').PromiseWatcher>['onFulfilled']} */
+      /** @type {Required<PromiseWatcher>['onFulfilled']} */
       onFulfilled(value) {
         const { watcher, watcherContext, resolver } = this.state;
         if (getVowPayload(value)) {
@@ -95,7 +100,7 @@ const preparePromiseWatcher = (zone, isRetryableReason, watchNextStep) =>
         this.state.resolver = undefined;
         settle(resolver, watcher, 'onFulfilled', value, watcherContext);
       },
-      /** @type {Required<import('./watch-promise.js').PromiseWatcher>['onRejected']} */
+      /** @type {Required<PromiseWatcher>['onRejected']} */
       onRejected(reason) {
         const { vow, watcher, watcherContext, resolver } = this.state;
         if (vow && isRetryableReason(reason)) {
@@ -111,7 +116,7 @@ const preparePromiseWatcher = (zone, isRetryableReason, watchNextStep) =>
 
 /**
  * @param {import('@agoric/base-zone').Zone} zone
- * @param {() => import('./types.js').VowKit<any>} makeVowKit
+ * @param {() => VowKit<any>} makeVowKit
  * @param {typeof watchPromiseShim} [watchPromise]
  * @param {(reason: any) => boolean} [isRetryableReason]
  */
@@ -133,12 +138,12 @@ export const prepareWatch = (
    * @template [TResult1=T]
    * @template [TResult2=T]
    * @template [C=unknown] watcher context
-   * @param {import('./types.js').ERef<T | import('./types.js').Vow<T>>} specimenP
-   * @param {import('./types.js').Watcher<T, TResult1, TResult2>} [watcher]
+   * @param {ERef<T | Vow<T>>} specimenP
+   * @param {Watcher<T, TResult1, TResult2>} [watcher]
    * @param {C} [watcherContext]
    */
   const watch = (specimenP, watcher, watcherContext) => {
-    /** @type {import('./types.js').VowKit<TResult1 | TResult2>} */
+    /** @type {VowKit<TResult1 | TResult2>} */
     const { resolver, vow } = makeVowKit();
 
     // Create a promise watcher to track vows, retrying upon rejection as