@agoric/deploy-script-support 0.10.4-other-dev-fbe72e7.0.fbe72e7 → 0.10.4-other-dev-d15096d.0.d15096d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/deploy-script-support",
-  "version": "0.10.4-other-dev-fbe72e7.0.fbe72e7",
+  "version": "0.10.4-other-dev-d15096d.0.d15096d",
   "description": "Helpers and other support for writing deploy scripts",
   "type": "module",
   "main": "src/helpers.js",
@@ -34,14 +34,14 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/ertp": "0.16.3-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/import-manager": "0.3.12-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/internal": "0.3.3-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/notifier": "0.6.3-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/pola-io": "0.1.1-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/store": "0.9.3-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/time": "0.3.3-other-dev-fbe72e7.0.fbe72e7",
-    "@agoric/zoe": "0.26.3-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/ertp": "0.16.3-other-dev-d15096d.0.d15096d",
+    "@agoric/import-manager": "0.3.12-other-dev-d15096d.0.d15096d",
+    "@agoric/internal": "0.3.3-other-dev-d15096d.0.d15096d",
+    "@agoric/notifier": "0.6.3-other-dev-d15096d.0.d15096d",
+    "@agoric/pola-io": "0.1.1-other-dev-d15096d.0.d15096d",
+    "@agoric/store": "0.9.3-other-dev-d15096d.0.d15096d",
+    "@agoric/time": "0.3.3-other-dev-d15096d.0.d15096d",
+    "@agoric/zoe": "0.26.3-other-dev-d15096d.0.d15096d",
     "@endo/base64": "^1.0.12",
     "@endo/bundle-source": "^4.1.2",
     "@endo/errors": "^1.2.13",
@@ -52,7 +52,7 @@
     "@endo/zip": "^1.0.11"
   },
   "devDependencies": {
-    "@agoric/vats": "0.15.2-other-dev-fbe72e7.0.fbe72e7",
+    "@agoric/vats": "0.15.2-other-dev-d15096d.0.d15096d",
     "@endo/init": "^1.1.12",
     "ava": "^5.3.0",
     "import-meta-resolve": "^4.1.0"
@@ -73,7 +73,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 83.26
+    "atLeast": 83.14
   },
-  "gitHead": "fbe72e72107f9997f788674e668c660d92ec4492"
+  "gitHead": "d15096dc4ff8b96e9b6cd11954c20d3a9efbb393"
 }

package/src/cachedBundleSpec.js

@@ -1,13 +1,19 @@
 import { Fail } from '@endo/errors';
 
+/**
+ * @import {promises} from 'fs';
+ * @import {resolve} from 'path';
+ * @import {BundleSourceResult} from '@endo/bundle-source';
+ */
+
 /**
  * @param {string} cacheDir
- * @param {{ now: typeof Date.now, fs: import('fs').promises, pathResolve: typeof import('path').resolve }} param1
+ * @param {{ now: typeof Date.now, fs: promises, pathResolve: typeof resolve }} param1
  */
 export const makeCacheAndGetBundleSpec =
   (cacheDir, { now, fs, pathResolve }) =>
   /**
-   * @param {Promise<import('@endo/bundle-source').BundleSourceResult<'endoZipBase64'>>} bundleP
+   * @param {Promise<BundleSourceResult<'endoZipBase64'>>} bundleP
    */
   async bundleP => {
     const bundle = await bundleP;

package/src/coreProposalBehavior.js

@@ -3,6 +3,8 @@ const t = 'makeCoreProposalBehavior';
 
 /**
  * @import {Installation} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {E} from '@endo/far';
+ * @import {ManifestBundleRef} from './externalTypes.js';
  */
 
 /**
@@ -13,7 +15,6 @@ const t = 'makeCoreProposalBehavior';
  */
 
 /**
- * @import {ManifestBundleRef} from './externalTypes.js'
  * @typedef {[methodName: string, ...args: unknown[]]} FlatMethargs
  * @typedef {Record<string, Record<string, unknown>>} Manifest
  */
@@ -44,9 +45,9 @@ export const permits = {
  * @param {ManifestBundleRef} inputs.manifestBundleRef
  * @param {FlatMethargs} inputs.getManifestCall
  * @param {Manifest} [inputs.customManifest]
- * @param {typeof import('@endo/far').E} inputs.E
+ * @param {typeof E} inputs.E
  * @param {(...args: unknown[]) => void} [inputs.log]
- * @param {(ref: import('./externalTypes.js').ManifestBundleRef) => Promise<import('@agoric/zoe/src/zoeService/utils.js').Installation<unknown>>} [inputs.customRestoreRef]
+ * @param {(ref: ManifestBundleRef) => Promise<Installation<unknown>>} [inputs.customRestoreRef]
  * @returns {(vatPowers: unknown) => Promise<unknown>}
  */
 export const makeCoreProposalBehavior = ({
@@ -83,7 +84,7 @@ export const makeCoreProposalBehavior = ({
   };
 
   const makeRestoreRef = (vatAdminSvc, zoe) => {
-    /** @type {(ref: import('./externalTypes.js').ManifestBundleRef) => Promise<Installation<unknown>>} */
+    /** @type {(ref: ManifestBundleRef) => Promise<Installation<unknown>>} */
     const defaultRestoreRef = async bundleRef => {
       // extract-proposal.js creates these records, and bundleName is
       // the optional name under which the bundle was installed into
@@ -193,7 +194,7 @@ export const makeCoreProposalBehavior = ({
 /**
  * @param {object} inputs
  * @param {Array<{ ref: ManifestBundleRef, call: FlatMethargs, customManifest?: Manifest }>} inputs.metadataRecords
- * @param {typeof import('@endo/far').E} inputs.E
+ * @param {typeof E} inputs.E
  */
 export const makeEnactCoreProposalsFromBundleRef = ({ metadataRecords, E }) => {
   /**

package/src/externalTypes.js

@@ -1,3 +1,4 @@
+/* eslint-disable @agoric/group-jsdoc-imports */
 // @ts-check
 export {};
 
@@ -70,7 +71,7 @@ export {};
  * }} CommonHome
  */
 
-// TODO wallet as import('@agoric/wallet-backend/src/types').WalletAdmin once it's a module
+// TODO wallet as import('@agoric/wallet-backend/src/types.js').WalletAdmin once it's a module
 /**
  * @typedef {CommonHome & {
  * agoricNames: ERef<NameHub>,

package/src/extract-proposal.js

@@ -11,6 +11,11 @@ import {
   makeEnactCoreProposalsFromBundleRef,
 } from './coreProposalBehavior.js';
 
+/**
+ * @import {CoreEvalBuilder} from './externalTypes.js';
+ * @import {PublishBundleRef} from './externalTypes.js';
+ */
+
 /**
  * @typedef {string | {module: string, entrypoint?: string, args?: Array<unknown>}} ConfigProposal
  */
@@ -155,7 +160,7 @@ export const extractCoreProposalBundles = async (
           const thisProposalSequence = getSequenceForProposal(key);
           const initPath = findModule(dirname, module);
           const initDir = path.dirname(initPath);
-          /** @type {Record<string, import('./externalTypes.js').CoreEvalBuilder>} */
+          /** @type {Record<string, CoreEvalBuilder>} */
           const ns = await import(initPath);
           const install = (srcSpec, bundlePath) => {
             const absoluteSrc = findModule(initDir, srcSpec);
@@ -181,7 +186,7 @@ export const extractCoreProposalBundles = async (
             );
             return bundleHandle;
           };
-          /** @type {import('./externalTypes.js').PublishBundleRef} */
+          /** @type {PublishBundleRef} */
           const publishRef = async handleP => {
             const handle = await handleP;
             bundleHandleToAbsolutePaths.has(handle) ||

package/src/getBundlerMaker.js

@@ -13,7 +13,7 @@
 import { E } from '@endo/far';
 import url from 'url';
 
-/** @typedef {ReturnType<import('./endo-pieces-contract.js')['start']>['publicFacet']} BundleMaker */
+/** @typedef {ReturnType<typeof import('./endo-pieces-contract.js').start>['publicFacet']} BundleMaker */
 /** @typedef {ReturnType<BundleMaker['makeBundler']>} Bundler */
 
 export const makeGetBundlerMaker =

package/src/helpers.js

@@ -1,6 +1,6 @@
 // @ts-check
 
-/// <reference path="../../zoe/exported.js" />
+/// <reference types="@agoric/zoe/exported.js" />
 
 import { E } from '@endo/far';
 import bundleSource from '@endo/bundle-source';
@@ -19,6 +19,13 @@ import { assertOfferResult } from './assertOfferResult.js';
 import { installInPieces } from './installInPieces.js';
 import { makeWriteCoreEval } from './writeCoreEvalParts.js';
 
+/**
+ * @import {CommonHome} from './externalTypes.js';
+ * @import {AgSoloHome} from './externalTypes.js';
+ * @import {DeployScriptEndownments} from './externalTypes.js';
+ * @import {WriteCoreEval} from './writeCoreEvalParts.js';
+ */
+
 export * from '@agoric/internal/src/node/createBundles.js';
 export { parseScriptArgs } from './parseCoreEvalArgs.js';
 
@@ -54,8 +61,8 @@ const makeLazyObject = sourceObject => {
 };
 
 /**
- * @param {Promise<import('./externalTypes.js').CommonHome | import('./externalTypes.js').AgSoloHome>} homePromise
- * @param {import('./externalTypes.js').DeployScriptEndownments} endowments
+ * @param {Promise<CommonHome | AgSoloHome>} homePromise
+ * @param {DeployScriptEndownments} endowments
  */
 export const makeHelpers = async (homePromise, endowments) => {
   // Endowments provided via `agoric run` or `agoric deploy`.
@@ -146,7 +153,7 @@ export const makeHelpers = async (homePromise, endowments) => {
     get getBundlerMaker() {
       return makeGetBundlerMaker(homePromise, { bundleSource, lookup });
     },
-    /** @returns {import('./writeCoreEvalParts.js').WriteCoreEval} */
+    /** @returns {WriteCoreEval} */
     get writeCoreEval() {
       return makeWriteCoreEval(homePromise, endowments, {
         getBundleSpec: deps.cacheAndGetBundleSpec,

package/src/install.js

@@ -3,13 +3,16 @@ import './externalTypes.js';
 
 import { E } from '@endo/far';
 
-/** @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js' */
+/**
+ * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js'
+ * @import {InstallationManager} from './startInstance.js';
+ */
 
 // XXX board is Board but specifying that leads to type errors with imports which aren't worth fixing right now
 /**
  * @param {typeof import('@endo/bundle-source')['default']} bundleSource
  * @param {ERef<ZoeService>} zoe
- * @param {ERef<import('./startInstance.js').InstallationManager>} installationManager
+ * @param {ERef<InstallationManager>} installationManager
  * @param {ERef<any>} board
  * @param {(bundle: any) => any} [publishBundle]
  * @param {(path: string) => string} [pathResolve]

package/src/parseCoreEvalArgs.js

@@ -2,7 +2,7 @@
  * To customize proposals for multiple environments, we pass the "variant"
  * identifier in scriptArgs. The variant must match a knownVariant.
  *
- * @param {import('./externalTypes.js').DeployScriptEndownments} endowments
+ * @param {DeployScriptEndownments} endowments
  * @param {string} name a name to use in error messages or Usage suggestions.
  * @param {string[]} knownVariants
  */
@@ -12,6 +12,10 @@ export const parseScriptArgs = async (endowments, name, knownVariants) => {
   const variantOrConfig =
     scriptArgs && scriptArgs.length > 0 ? scriptArgs : undefined;
 
+  /**
+   * @import {DeployScriptEndownments} from './externalTypes.js';
+   */
+
   console.log(`${name}`, variantOrConfig);
 
   const Usage = `agoric run ${name}.js ${[...knownVariants, '<json-config>'].join(' | ')}`;

package/src/saveIssuer.js

@@ -4,12 +4,13 @@ import { E } from '@endo/far';
 /**
  * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
  * @import {Amount, Brand, Issuer, Payment} from '@agoric/ertp';
+ * @import {IssuerManager} from './startInstance.js';
  */
 
 /**
  * @param {ERef<any>} walletAdmin - an internal type of the
  * wallet, not defined here
- * @param {ERef<import('./startInstance.js').IssuerManager>} issuerManager
+ * @param {ERef<IssuerManager>} issuerManager
  */
 export const makeSaveIssuer = (walletAdmin, issuerManager) => {
   /**

package/src/writeCoreEvalParts.js

@@ -13,6 +13,8 @@ import {
 /**
  * @import {BundleSource, BundleSourceResult} from '@endo/bundle-source';
  * @import {AgSoloHome, CanonicalHome, CommonHome, CoreEvalBuilder, CoreEvalDescriptor, ManifestBundleRef} from './externalTypes.js';
+ * @import {BundleMaker} from './getBundlerMaker.js';
+ * @import {Bundler} from './getBundlerMaker.js';
  */
 
 /**
@@ -40,8 +42,8 @@ import {
  *   pathResolve: (path: string) => string,
  * }} endowments
  * @param {{
- *   getBundlerMaker: () => Promise<import('./getBundlerMaker.js').BundleMaker>,
- *   getBundleSpec: (bundle: Promise<BundleSourceResult<'endoZipBase64'>>, getBundle: () => import('./getBundlerMaker.js').Bundler, opts?: any) => Promise<ManifestBundleRef>,
+ *   getBundlerMaker: () => Promise<BundleMaker>,
+ *   getBundleSpec: (bundle: Promise<BundleSourceResult<'endoZipBase64'>>, getBundle: () => Bundler, opts?: any) => Promise<ManifestBundleRef>,
  *   log?: typeof console.log,
  *   writeFile?: typeof fs.promises.writeFile
  * }} io
@@ -60,7 +62,7 @@ export const makeWriteCoreEval = (
   const { bundleSource, pathResolve } = endowments;
 
   let bundlerCache;
-  /** @returns {import('./getBundlerMaker.js').Bundler} */
+  /** @returns {Bundler} */
   const getBundler = () => {
     if (!bundlerCache) {
       bundlerCache = E(getBundlerMaker()).makeBundler({