chore(agoric-cli): maxNodeModuleJsDepth=0 and disable ambient types

packages/agoric-cli/package.json

@@ -20,7 +20,7 @@
     "integration-test": "ava --config .ava-integration-test.config.js",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc --maxNodeModuleJsDepth 4 -p jsconfig.json",
+    "lint:types": "tsc --maxNodeModuleJsDepth 0 -p jsconfig.json",
     "lint:eslint": "eslint ."
   },
   "devDependencies": {

packages/agoric-cli/src/commands/psm.js

@@ -162,8 +162,12 @@ export const makePsmCommand = async logger => {
       const opts = this.opts();
       console.warn('running with options', opts);
       const instance = await lookupPsmInstance(opts.pair);
-      // @ts-expect-error RpcRemote types not real instances
-      const spendAction = makePSMSpendAction(instance, agoricNames.brand, opts);
+      const spendAction = makePSMSpendAction(
+        instance,
+        // @ts-expect-error xxx RpcRemote
+        agoricNames.brand,
+        opts,
+      );
       outputAction(spendAction);
     });
 
@@ -182,7 +186,6 @@ export const makePsmCommand = async logger => {
         id: Number(opts.offerId),
         invitationSpec: {
           source: 'purse',
-          // @ts-expect-error rpc
           instance: economicCommittee,
           description: 'Voter0', // XXX it may not always be
         },
@@ -212,7 +215,6 @@ export const makePsmCommand = async logger => {
         id: Number(opts.offerId),
         invitationSpec: {
           source: 'purse',
-          // @ts-expect-error rpc
           instance: psmCharter,
           description: 'PSM charter member invitation',
         },
@@ -317,6 +319,7 @@ export const makePsmCommand = async logger => {
       const psmInstance = lookupPsmInstance(opts.pair);
 
       /** @type {import('../types.js').Brand} */
+      // @ts-expect-error xxx RpcRemote
       const istBrand = agoricNames.brand.IST;
       const scaledAmount = harden({
         brand: istBrand,

packages/agoric-cli/src/lib/format.js

@@ -59,7 +59,7 @@ export const asPercent = ratio => {
 };
 
 /**
- * @param {Amount[]} balances
+ * @param {Array<import('../types').Amount>} balances
  * @param {AssetDescriptor[]} assets
  */
 export const simplePurseBalances = (balances, assets) => {

packages/agoric-cli/src/lib/psm.js

@@ -4,11 +4,6 @@ import { COSMOS_UNIT, makeAmountFormatter } from './format.js';
 // eslint-disable-next-line no-unused-vars -- typeof below
 import { makeAgoricNames } from './rpc.js';
 
-// Ambient types. Needed only for dev but this does a runtime import.
-// eslint-disable-next-line import/no-extraneous-dependencies
-import '@agoric/swingset-vat/src/types-ambient.js';
-import '@agoric/zoe/src/zoeService/types.js';
-
 /** @typedef {import('@agoric/smart-wallet/src/offers').OfferSpec} OfferSpec */
 /** @typedef {import('@agoric/smart-wallet/src/offers').OfferStatus} OfferStatus */
 /** @typedef {import('@agoric/smart-wallet/src/smartWallet').BridgeAction} BridgeAction */
@@ -34,7 +29,6 @@ export const simpleOffers = (state, agoricNames) => {
       payouts,
     } = o;
     const entry = Object.entries(agoricNames.instance).find(
-      // @ts-expect-error xxx RpcRemote
       ([_name, candidate]) => candidate === instance,
     );
     const instanceName = entry ? entry[0] : '???';
@@ -54,11 +48,11 @@ export const simpleOffers = (state, agoricNames) => {
 };
 
 /**
- * @param {Record<string, Brand>} brands
+ * @param {Record<string, import('../types').Brand>} brands
  * @param {({ wantMinted: number | undefined, giveMinted: number | undefined })} opts
  * @param {number} [fee=0]
  * @param {string} [anchor]
- * @returns {Proposal}
+ * @returns {import('../types').Proposal}
  */
 export const makePSMProposal = (brands, opts, fee = 0, anchor = 'AUSD') => {
   const giving = opts.giveMinted ? 'minted' : 'anchor';
@@ -84,8 +78,8 @@ export const makePSMProposal = (brands, opts, fee = 0, anchor = 'AUSD') => {
 };
 
 /**
- * @param {Instance} instance
- * @param {Record<string, Brand>} brands
+ * @param {import('../types').Instance} instance
+ * @param {Record<string, import('../types').Brand>} brands
  * @param {{ offerId: number, feePct?: number } &
  *         ({ wantMinted: number | undefined, giveMinted: number | undefined })} opts
  * @returns {BridgeAction}

packages/agoric-cli/src/lib/rpc.js

@@ -117,7 +117,7 @@ export const makeVStorage = powers => {
  * - if a part being serialized has a boardId property, it passes through as a slot value whereas the normal marshaller would treat it as a copyRecord
  *
  * @param {(slot: string, iface: string) => any} slotToVal
- * @returns {Marshaller}
+ * @returns {import('@endo/marshal').Marshal<string>}
  */
 export const boardSlottingMarshaller = (slotToVal = (s, _i) => s) => ({
   /** @param {{body: string, slots: string[]}} capData */

packages/agoric-cli/src/lib/wallet.js

@@ -1,4 +1,5 @@
 // @ts-check
+/* eslint-disable @typescript-eslint/prefer-ts-expect-error -- https://github.com/Agoric/agoric-sdk/issues/4620 */
 import { boardSlottingMarshaller, storageHelper } from './rpc.js';
 
 /**
@@ -16,7 +17,7 @@ export const getWalletState = async (addr, ctx, { vstorage }) => {
 
   /** @type {Map<number, import('./psm').OfferSpec>} */
   const offers = new Map();
-  /** @type {Map<Brand, Amount>} */
+  /** @type {Map<import('../types').Brand, import('../types').Amount>} */
   const balances = new Map();
   /** @type {import('./format').AssetDescriptor[]} */
   const brands = [];
@@ -37,17 +38,18 @@ export const getWalletState = async (addr, ctx, { vstorage }) => {
       case 'balance': {
         const { currentAmount } = update;
         if (!balances.has(currentAmount.brand)) {
+          // @ts-ignore https://github.com/agoric/agoric-sdk/issues/4560
           balances.set(currentAmount.brand, currentAmount);
         }
         break;
       }
       case 'brand': {
-        // @ts-expect-error cast for unserialization hack
+        // @ts-ignore https://github.com/agoric/agoric-sdk/issues/4560
         brands.push(update.descriptor);
         break;
       }
       default:
-        // @ts-expect-error
+        // @ts-ignore https://github.com/agoric/agoric-sdk/issues/4560
         throw Error(`unsupported update ${update.updated}`);
     }
   });

packages/agoric-cli/src/types.d.ts

@@ -0,0 +1,6 @@
+// This package has maxNodeModuleJsDepth=0 to prevent ambient imports.
+// A consequence is that types that are only provided ambiently have to be defined.
+
+export { Amount, Brand, Proposal } from '@agoric/ertp/src/types-module';
+
+export type Instance = unknown;