agoric 0.21.2-other-dev-fbe72e7.0.fbe72e7 → 0.21.2-other-dev-d15096d.0.d15096d

package/src/commands/oracle.js

@@ -23,7 +23,15 @@ import {
   sendHint,
 } from '../lib/wallet.js';
 
-/** @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js'; */
+/**
+ * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ * @import {createCommand} from 'commander';
+ * @import {execFileSync} from 'child_process';
+ * @import {Writable} from 'stream';
+ * @import {Logger} from 'anylogger';
+ * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
+ * @import {TimestampRecord} from '@agoric/time';
+ */
 
 // XXX support other decimal places
 const COSMOS_UNIT = 1_000_000n;
@@ -34,15 +42,15 @@ const scaleDecimals = num => BigInt(Math.round(num * Number(COSMOS_UNIT)));
  * Prints JSON output to stdout and diagnostic info (like logs) to stderr
  *
  * @param {{
- *   createCommand: typeof import('commander').createCommand,
+ *   createCommand: typeof createCommand,
  *   env: Partial<Record<string, string>>,
- *   execFileSync: typeof import('child_process').execFileSync,
+ *   execFileSync: typeof execFileSync,
  *   now: () => number,
  *   setTimeout: typeof setTimeout,
- *   stderr: Pick<import('stream').Writable,'write'>,
- *   stdout: Pick<import('stream').Writable,'write'>,
+ *   stderr: Pick<Writable,'write'>,
+ *   stdout: Pick<Writable,'write'>,
  * }} process
- * @param {import('anylogger').Logger} [logger]
+ * @param {Logger} [logger]
  */
 export const makeOracleCommand = (
   { env, execFileSync, setTimeout, stderr, stdout },
@@ -132,7 +140,7 @@ export const makeOracleCommand = (
       const { lookupPriceAggregatorInstance } = await rpcTools();
       const instance = lookupPriceAggregatorInstance(opts.pair);
 
-      /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+      /** @type {OfferSpec} */
       const offer = {
         id: opts.offerId,
         invitationSpec: {
@@ -326,7 +334,7 @@ export const makeOracleCommand = (
           );
 
           const latestRoundP =
-            /** @type {Promise<{roundId: number, startedAt: import('@agoric/time').TimestampRecord, startedBy: string}>} */ (
+            /** @type {Promise<{roundId: number, startedAt: TimestampRecord, startedBy: string}>} */ (
               readLatestHead(
                 `published.priceFeed.${pair[0]}-${pair[1]}_price_feed.latestRound`,
               )

package/src/commands/perf.js

@@ -19,13 +19,17 @@ import {
   normalizeAddressWithOptions,
 } from '../lib/chain.js';
 
+/**
+ * @import {Logger} from 'anylogger';
+ */
+
 // tight for perf testing but less than this tends to hang.
 const SLEEP_SECONDS = 0.1;
 
 const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 /**
- * @param {import('anylogger').Logger} logger
+ * @param {Logger} logger
  */
 export const makePerfCommand = logger => {
   const perf = new Command('perf')

package/src/commands/psm.js

@@ -12,6 +12,11 @@ import { Command } from 'commander';
 import { asPercent } from '../lib/format.js';
 import { outputExecuteOfferAction } from '../lib/wallet.js';
 
+/**
+ * @import {Logger} from 'anylogger';
+ * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
+ */
+
 const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 // Adapted from https://gist.github.com/dckc/8b5b2f16395cb4d7f2ff340e0bc6b610#file-psm-tool
@@ -36,7 +41,7 @@ function collectValues(val, memo) {
 }
 
 /**
- * @param {import('anylogger').Logger} logger
+ * @param {Logger} logger
  */
 export const makePsmCommand = logger => {
   const psm = new Command('psm').description('PSM commands').usage(
@@ -205,7 +210,7 @@ export const makePsmCommand = logger => {
       const { lookupPsmInstance } = await rpcTools();
       const psmInstance = lookupPsmInstance(opts.pair);
 
-      /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+      /** @type {OfferSpec} */
       const offer = {
         id: opts.offerId,
         invitationSpec: {
@@ -260,7 +265,7 @@ export const makePsmCommand = logger => {
         brand: istBrand,
         value: BigInt(opts.limit * 1_000_000),
       });
-      /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+      /** @type {OfferSpec} */
       const offer = {
         id: opts.offerId,
         invitationSpec: {

package/src/commands/reserve.js

@@ -10,10 +10,15 @@ import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
 import { Command } from 'commander';
 import { outputActionAndHint } from '../lib/wallet.js';
 
+/**
+ * @import {Logger} from 'anylogger';
+ * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
+ */
+
 const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 /**
- * @param {import('anylogger').Logger} _logger
+ * @param {Logger} _logger
  * @param {*} io
  */
 export const makeReserveCommand = (_logger, io = {}) => {
@@ -78,7 +83,7 @@ export const makeReserveCommand = (_logger, io = {}) => {
 
       const feesToBurn = { brand: agoricNames.brand.IST, value: opts.value };
 
-      /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+      /** @type {OfferSpec} */
       const offer = {
         id: opts.offerId,
         invitationSpec: {

package/src/commands/test-upgrade.js

@@ -7,17 +7,24 @@ import { normalizeAddressWithOptions } from '../lib/chain.js';
 import { bigintReplacer } from '../lib/format.js';
 import { sendAction } from '../lib/wallet.js';
 
+/**
+ * @import {Writable} from 'stream';
+ * @import {createCommand} from 'commander';
+ * @import {execFileSync} from 'child_process';
+ * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
+ */
+
 /**
  * Make commands for testing.
  *
  * @param {{
  *   env: Partial<Record<string, string>>,
- *   stdout: Pick<import('stream').Writable,'write'>,
- *   stderr: Pick<import('stream').Writable,'write'>,
+ *   stdout: Pick<Writable,'write'>,
+ *   stderr: Pick<Writable,'write'>,
  *   now: () => number,
  *   createCommand: // Note: includes access to process.stdout, .stderr, .exit
- *     typeof import('commander').createCommand,
- *   execFileSync: typeof import('child_process').execFileSync,
+ *     typeof createCommand,
+ *   execFileSync: typeof execFileSync,
  *   setTimeout: typeof setTimeout,
  * }} process
  * @param {{ fetch: typeof window.fetch }} net
@@ -75,7 +82,7 @@ export const makeTestCommand = (
       const { home, keyringBackend: backend } = testCmd.opts();
 
       const io = { ...networkConfig, execFileSync, delay, stdout };
-      /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+      /** @type {OfferSpec} */
       const offer = {
         id: opts.offerId,
         invitationSpec: {

package/src/commands/vaults.js

@@ -14,10 +14,14 @@ import { Command } from 'commander';
 import { normalizeAddressWithOptions } from '../lib/chain.js';
 import { getCurrent, outputExecuteOfferAction } from '../lib/wallet.js';
 
+/**
+ * @import {Logger} from 'anylogger';
+ */
+
 const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 /**
- * @param {import('anylogger').Logger} logger
+ * @param {Logger} logger
  */
 export const makeVaultsCommand = logger => {
   const vaults = new Command('vaults')

package/src/commands/wallet.js

@@ -30,17 +30,21 @@ import {
 } from '../lib/format.js';
 import { coalesceWalletState, getCurrent } from '../lib/wallet.js';
 
+/**
+ * @import {Command} from 'commander';
+ */
+
 const networkConfig = await fetchEnvNetworkConfig({ env: process.env, fetch });
 
 const SLEEP_SECONDS = 3;
 
 /**
- * @param {import('commander').Command['command']} command
- * @returns {Promise<import('commander').Command>}
+ * @param {Command['command']} command
+ * @returns {Promise<Command>}
  */
 export const makeWalletCommand = async command => {
   /**
-   * @param {import('commander').Command} baseCmd
+   * @param {Command} baseCmd
    */
   const withSharedTxOptions = baseCmd =>
     baseCmd

package/src/follow.js

@@ -16,6 +16,10 @@ import {
 } from '@agoric/casting';
 import { makeLeaderOptions } from './lib/casting.js';
 
+/**
+ * @import {FollowerOptions} from '@agoric/casting';
+ */
+
 const makeCapDataToQclass = () => {
   const valToSlot = new WeakMap();
   const slotToVal = new Map();
@@ -57,7 +61,7 @@ export default async function followerMain(progname, rawArgs, powers, opts) {
     jitter,
   } = opts;
 
-  /** @type {import('@agoric/casting').FollowerOptions} */
+  /** @type {FollowerOptions} */
   const followerOptions = {
     proof,
   };

package/src/lib/casting.js

@@ -2,10 +2,14 @@
 
 import { delay, exponentialBackoff, randomBackoff } from '@agoric/casting';
 
+/**
+ * @import {LeaderOptions} from '@agoric/casting';
+ */
+
 // TODO: https://aws.amazon.com/blogs/architecture/exponential-backoff-and-jitter/
 /**
  * @param {{log: (...args: any) => void, sleep: number, jitter: number }} config
- * @returns {import('@agoric/casting').LeaderOptions}
+ * @returns {LeaderOptions}
  */
 export const makeLeaderOptions = ({ log, sleep, jitter }) => {
   return {

package/src/lib/chain.js

@@ -7,6 +7,7 @@ import { makeAgoricQueryClient } from '@agoric/client-utils';
 /**
  * @import {MinimalNetworkConfig} from '@agoric/client-utils';
  * @import {Params, ParamsSDKType} from '@agoric/cosmic-proto/agoric/swingset/swingset.js';
+ * @import {Writable} from 'stream';
  */
 
 const agdBinary = 'agd';
@@ -79,8 +80,8 @@ const makeGasOpts = limit => {
  *   dryRun?: boolean,
  *   verbose?: boolean,
  *   keyring?: {home?: string, backend: string}
- *   stdout?: Pick<import('stream').Writable, 'write'>
- *   execFileSync?: typeof import('child_process').execFileSync
+ *   stdout?: Pick<Writable, 'write'>
+ *   execFileSync?: typeof execFileSyncAmbient
  * }} opts
  */
 export const execSwingsetTransaction = (swingsetArgs, opts) => {
@@ -145,7 +146,7 @@ harden(fetchSwingsetParams);
 
 /**
  * @param {MinimalNetworkConfig & {
- *   execFileSync: typeof import('child_process').execFileSync,
+ *   execFileSync: typeof execFileSyncAmbient,
  *   delay: (ms: number) => Promise<void>,
  *   period?: number,
  *   retryMessage?: string,
@@ -184,7 +185,7 @@ export const pollBlocks = opts => async lookup => {
 /**
  * @param {string} txhash
  * @param {MinimalNetworkConfig & {
- *   execFileSync: typeof import('child_process').execFileSync,
+ *   execFileSync: typeof execFileSyncAmbient,
  *   delay: (ms: number) => Promise<void>,
  *   period?: number,
  * }} opts

package/src/lib/format.js

@@ -4,6 +4,9 @@ import { makeBoardRemote } from '@agoric/vats/tools/board-utils.js';
 /**
  * @import {Amount, Brand} from '@agoric/ertp'
  * @import {AgoricNamesRemotes, BoardRemote, VBankAssetDetail} from '@agoric/vats/tools/board-utils.js';
+ * @import {CurrentWalletRecord} from '@agoric/smart-wallet/src/smartWallet.js';
+ * @import {CoalescedWalletState} from '@agoric/smart-wallet/src/utils.js';
+ * @import {makeWalletStateCoalescer} from '@agoric/smart-wallet/src/utils.js';
  */
 
 // TODO Move to packages/internal.
@@ -87,7 +90,7 @@ export const asBoardRemote = x => {
 /**
  * Summarize the balances array as user-facing informative tuples
  *
- * @param {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord['purses']} purses
+ * @param {CurrentWalletRecord['purses']} purses
  * @param {VBankAssetDetail[]} assets
  */
 export const purseBalanceTuples = (purses, assets) => {
@@ -115,7 +118,7 @@ export const fmtRecordOfLines = record => {
 /**
  * Summarize the offerStatuses of the state as user-facing informative tuples
  *
- * @param {import('@agoric/smart-wallet/src/utils.js').CoalescedWalletState} state
+ * @param {CoalescedWalletState} state
  * @param {AgoricNamesRemotes} agoricNames
  */
 export const offerStatusTuples = (state, agoricNames) => {
@@ -171,8 +174,8 @@ export const offerStatusTuples = (state, agoricNames) => {
 };
 
 /**
- * @param {import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord} current
- * @param {ReturnType<import('@agoric/smart-wallet/src/utils.js').makeWalletStateCoalescer>['state']} coalesced
+ * @param {CurrentWalletRecord} current
+ * @param {ReturnType<typeof makeWalletStateCoalescer>['state']} coalesced
  * @param {AgoricNamesRemotes} agoricNames
  */
 export const summarize = (current, coalesced, agoricNames) => {

package/src/lib/wallet.js

@@ -11,6 +11,13 @@ import { execSwingsetTransaction, pollTx } from './chain.js';
  * @import {CurrentWalletRecord} from '@agoric/smart-wallet/src/smartWallet.js';
  * @import {AgoricNamesRemotes} from '@agoric/vats/tools/board-utils.js';
  * @import {MinimalNetworkConfig, VstorageKit} from '@agoric/client-utils';
+ * @import {UpdateRecord} from '@agoric/smart-wallet/src/smartWallet.js';
+ * @import {BridgeAction} from '@agoric/smart-wallet/src/smartWallet.js';
+ * @import {Writable} from 'stream';
+ * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
+ * @import {Follower} from '@agoric/casting';
+ * @import {ValueFollowerElement} from '@agoric/casting';
+ * @import {execFileSync} from 'child_process';
  */
 
 const marshaller = boardSlottingMarshaller();
@@ -26,15 +33,14 @@ const emptyCurrentRecord = {
 /**
  * @param {string} addr
  * @param {Pick<VstorageKit, 'readPublished'>} io
- * @returns {Promise<import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord>}
+ * @returns {Promise<CurrentWalletRecord>}
  */
 export const getCurrent = async (addr, { readPublished }) => {
   // Partial because older writes may not have had all properties
   // NB: assumes changes are only additions
-  let current =
-    /** @type {Partial<import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord> | undefined} */ (
-      await readPublished(`wallet.${addr}.current`)
-    );
+  let current = /** @type {Partial<CurrentWalletRecord> | undefined} */ (
+    await readPublished(`wallet.${addr}.current`)
+  );
   if (current === undefined) {
     throw Error(`undefined current node for ${addr}`);
   }
@@ -61,15 +67,15 @@ export const getCurrent = async (addr, { readPublished }) => {
 /**
  * @param {string} addr
  * @param {Pick<VstorageKit, 'readPublished'>} io
- * @returns {Promise<import('@agoric/smart-wallet/src/smartWallet.js').UpdateRecord>}
+ * @returns {Promise<UpdateRecord>}
  */
 export const getLastUpdate = (addr, { readPublished }) => {
   return readPublished(`wallet.${addr}`);
 };
 
 /**
- * @param {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} bridgeAction
- * @param {Pick<import('stream').Writable,'write'>} [stdout]
+ * @param {BridgeAction} bridgeAction
+ * @param {Pick<Writable,'write'>} [stdout]
  */
 export const outputAction = (bridgeAction, stdout = process.stdout) => {
   const capData = marshaller.toCapData(harden(bridgeAction));
@@ -81,10 +87,10 @@ export const sendHint =
   'Now use `agoric wallet send ...` to sign and broadcast the offer.\n';
 
 /**
- * @param {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} bridgeAction
+ * @param {BridgeAction} bridgeAction
  * @param {{
- *   stdout: Pick<import('stream').Writable,'write'>,
- *   stderr: Pick<import('stream').Writable,'write'>,
+ *   stdout: Pick<Writable,'write'>,
+ *   stderr: Pick<Writable,'write'>,
  * }} io
  */
 export const outputActionAndHint = (bridgeAction, { stdout, stderr }) => {
@@ -93,16 +99,16 @@ export const outputActionAndHint = (bridgeAction, { stdout, stderr }) => {
 };
 
 /**
- * @param {import('@agoric/smart-wallet/src/offers.js').OfferSpec} offer
- * @param {Pick<import('stream').Writable,'write'>} [stdout]
- * @param {Pick<import('stream').Writable,'write'>} [stderr]
+ * @param {OfferSpec} offer
+ * @param {Pick<Writable,'write'>} [stdout]
+ * @param {Pick<Writable,'write'>} [stderr]
  */
 export const outputExecuteOfferAction = (
   offer,
   stdout = process.stdout,
   stderr = process.stderr,
 ) => {
-  /** @type {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} */
+  /** @type {BridgeAction} */
   const spendAction = {
     method: 'executeOffer',
     offer,
@@ -113,7 +119,7 @@ export const outputExecuteOfferAction = (
 
 /**
  * @deprecated use `.current` node for current state
- * @param {import('@agoric/casting').Follower<import('@agoric/casting').ValueFollowerElement<import('@agoric/smart-wallet/src/smartWallet.js').UpdateRecord>>} follower
+ * @param {Follower<ValueFollowerElement<UpdateRecord>>} follower
  * @param {Brand<'set'>} [invitationBrand]
  */
 export const coalesceWalletState = async (follower, invitationBrand) => {
@@ -143,14 +149,14 @@ export const coalesceWalletState = async (follower, invitationBrand) => {
  * Sign and broadcast a wallet-action.
  *
  * @throws { Error & { code: number } } if transaction fails
- * @param {import('@agoric/smart-wallet/src/smartWallet.js').BridgeAction} bridgeAction
+ * @param {BridgeAction} bridgeAction
  * @param {MinimalNetworkConfig & {
  *   from: string,
  *   fees?: string,
  *   verbose?: boolean,
  *   keyring?: {home?: string, backend: string},
- *   stdout?: Pick<import('stream').Writable, 'write'>,
- *   execFileSync: typeof import('child_process').execFileSync,
+ *   stdout?: Pick<Writable, 'write'>,
+ *   execFileSync: typeof execFileSync,
  *   delay: (ms: number) => Promise<void>,
  *   dryRun?: boolean,
  * }} opts

package/src/main-publish.js

@@ -9,6 +9,10 @@ import { parseLocatedJson } from './json.js';
 
 import { makeBundlePublisher, makeCosmosBundlePublisher } from './publish.js';
 
+/**
+ * @import {CosmosConnectionSpec} from './publish.js';
+ */
+
 const publishMain = async (progname, rawArgs, powers, opts) => {
   const { fs } = powers;
 
@@ -23,7 +27,7 @@ const publishMain = async (progname, rawArgs, powers, opts) => {
     );
   }
 
-  /** @type {import('./publish.js').CosmosConnectionSpec} */
+  /** @type {CosmosConnectionSpec} */
   const connectionSpec = {
     type: 'chain-cosmos-sdk',
     rpcAddresses: [rpcAddress],

package/src/publish.js

@@ -15,7 +15,17 @@ import { defaultRegistryTypes } from '@cosmjs/stargate';
 import { stringToPath } from '@cosmjs/crypto';
 import { Decimal } from '@cosmjs/math';
 import { fromBech32 } from '@cosmjs/encoding';
-import { MsgInstallBundle } from '@agoric/cosmic-proto/swingset/msgs.js';
+import { CodecHelper } from '@agoric/cosmic-proto';
+import { MsgInstallBundle as MsgInstallBundleType } from '@agoric/cosmic-proto/swingset/msgs.js';
+
+/**
+ * @import {resolve} from 'path';
+ * @import {promises} from 'fs';
+ * @import {SigningStargateClient} from '@cosmjs/stargate';
+ * @import {EncodeObject} from '@cosmjs/proto-signing';
+ */
+
+const MsgInstallBundle = CodecHelper(MsgInstallBundleType);
 
 // https://github.com/Agoric/agoric-sdk/blob/master/golang/cosmos/daemon/main.go
 const Agoric = {
@@ -226,9 +236,9 @@ const urlForRpcAddress = address => {
 
 /**
  * @param {object} args
- * @param {typeof import('path').resolve} args.pathResolve
- * @param {typeof import('fs').promises.readFile} args.readFile
- * @param {typeof import('@cosmjs/stargate').SigningStargateClient.connectWithSigner} args.connectWithSigner
+ * @param {typeof resolve} args.pathResolve
+ * @param {typeof promises.readFile} args.readFile
+ * @param {typeof SigningStargateClient.connectWithSigner} args.connectWithSigner
  * @param {() => number} args.random - a random number in the interval [0, 1)
  */
 export const makeCosmosBundlePublisher = ({
@@ -269,7 +279,7 @@ export const makeCosmosBundlePublisher = ({
       submitter: fromBech32(from.address).data,
     };
 
-    /** @type {Array<import('@cosmjs/proto-signing').EncodeObject>} */
+    /** @type {Array<EncodeObject>} */
     const encodeObjects = [
       {
         typeUrl: Agoric.proto.swingset.InstallBundle.typeUrl,

package/src/scripts.js

@@ -6,6 +6,12 @@ import { E } from '@endo/captp';
 import { createRequire } from 'module';
 import path from 'path';
 
+/**
+ * @import {ModuleFormat} from '@endo/bundle-source';
+ * @import {BundleOptions} from '@endo/bundle-source';
+ * @import {BundleSourceResult} from '@endo/bundle-source';
+ */
+
 const require = createRequire(import.meta.url);
 
 const PATH_SEP_RE = new RegExp(`${path.sep.replace(/\\/g, '\\\\')}`, 'g');
@@ -135,10 +141,10 @@ export { bootPlugin } from ${JSON.stringify(absPath)};
       const allEndowments = harden({
         home: bootP,
         /**
-         * @template {import('@endo/bundle-source').ModuleFormat} ModuleFormat
+         * @template {ModuleFormat} ModuleFormat
          * @param {string} file
-         * @param {import('@endo/bundle-source').BundleOptions<ModuleFormat>} options
-         * @returns {Promise<import('@endo/bundle-source').BundleSourceResult<ModuleFormat>>}
+         * @param {BundleOptions<ModuleFormat>} options
+         * @returns {Promise<BundleSourceResult<ModuleFormat>>}
          */
         bundleSource: (file, options = {}) =>
           bundleSource(pathResolve(file), {

package/src/sdk-package-names.js

@@ -24,6 +24,7 @@ export default [
   "@agoric/deploy-script-support",
   "@agoric/ertp",
   "@agoric/eslint-config",
+  "@agoric/eslint-plugin",
   "@agoric/fast-usdc",
   "@agoric/governance",
   "@agoric/import-manager",

package/src/start.js

@@ -276,7 +276,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       await rmVerbose(serverDir);
     }
 
-    /** @type {(args: string[], spawnOpts?: Parameters<typeof pspawn>[2], dockerArgs?: string[]) => ReturnType<pspawn>} */
+    /** @type {(args: string[], spawnOpts?: Parameters<typeof pspawn>[2], dockerArgs?: string[]) => ReturnType<typeof pspawn>} */
     let chainSpawn;
     if (!popts.dockerTag) {
       chainSpawn = (args, spawnOpts) =>
@@ -482,7 +482,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       await rmVerbose(serverDir);
     }
 
-    /** @type {(args: string[], spawnOpts?: Parameters<typeof pspawn>[2], dockerArgs?: string[]) => ReturnType<pspawn>} */
+    /** @type {(args: string[], spawnOpts?: Parameters<typeof pspawn>[2], dockerArgs?: string[]) => ReturnType<typeof pspawn>} */
     let soloSpawn;
     if (!popts.dockerTag) {
       soloSpawn = (args, spawnOpts) => pspawn(agSolo, args, spawnOpts);

package/tools/getting-started.js

@@ -11,6 +11,11 @@ import { spawn } from 'child_process';
 
 import { makePspawn } from '../src/helpers.js';
 
+/**
+ * @import {ExecutionContext} from 'ava';
+ * @import {ChildProcess} from 'child_process';
+ */
+
 const RETRY_BLOCKHEIGHT_SECONDS = 3;
 const SOCKET_TIMEOUT_SECONDS = 2;
 
@@ -66,7 +71,7 @@ const getLatestBlockHeight = url =>
  * Test the "getting started" workflow. Note that this function may be imported
  * by external repositories.
  *
- * @param {import('ava').ExecutionContext} t
+ * @param {ExecutionContext} t
  * @param {{ init?: string[], install?: string[] }} [options]
  */
 export const gettingStartedWorkflowTest = async (t, options = {}) => {
@@ -110,7 +115,7 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => {
 
   /**
    * @param {string[]} args
-   * @returns {{childProcess?: import('child_process').ChildProcess} & Promise<void>}
+   * @returns {{childProcess?: ChildProcess} & Promise<void>}
    */
   function yarn(...args) {
     const ps = pspawnStdout('yarn', args, {
@@ -118,7 +123,7 @@ export const gettingStartedWorkflowTest = async (t, options = {}) => {
       env: { ...process.env },
       detached: true,
     });
-    /** @type {{childProcess?: import('child_process').ChildProcess} & Promise<void>} */
+    /** @type {{childProcess?: ChildProcess} & Promise<void>} */
     const p = new Promise((resolve, reject) => {
       ps.then(code => {
         if (code !== 0) {