refactor(types): normalize types-ambient.js

Agoric · May 2, 2024 · 93c5381 · 93c5381
1 parent 9c8bc21
commit 93c5381
Show file tree

Hide file tree

Showing 28 changed files with 26 additions and 23 deletions.
diff --git a/packages/assert/exported.js b/packages/assert/exported.js
@@ -1 +1 @@
-import './src/types.js';
+import './src/types-ambient.js';
diff --git a/packages/assert/src/assert.js b/packages/assert/src/assert.js
@@ -18,7 +18,7 @@
 // is a record of a failed attempt to remove '.types'.
 // To satisfy CI, not only do we need to keep the file,
 // but we need to import it here as well.
-/// <reference path="./types.js" />
+/// <reference path="./types-ambient.js" />
 
 const { freeze } = Object;
 

diff --git a/packages/assert/src/types.js → packages/assert/src/types-ambient.js b/packages/assert/src/types.js → packages/assert/src/types-ambient.js
diff --git a/packages/base-zone/src/types.js b/packages/base-zone/src/types.js
@@ -1,6 +1,9 @@
 // eslint-disable-next-line no-unused-vars
 import { makeExo, defineExoClass, defineExoClassKit } from '@endo/exo';
 
+// Ensure this is a module.
+export {};
+
 /** @typedef {'exoClass' | 'exoClassKit' | 'exo' | 'store' | 'zone'} KeyCategories */
 /** @typedef {Record<KeyCategories, (label: string) => string[]>} KeyMakers */
 

diff --git a/packages/inter-protocol/exported.js b/packages/inter-protocol/exported.js
@@ -1,2 +1,2 @@
-import './src/psm/types.js';
-import './src/vaultFactory/types.js';
+import './src/psm/types-ambient.js';
+import './src/vaultFactory/types-ambient.js';
diff --git a/packages/inter-protocol/src/psm/types.js → ...s/inter-protocol/src/psm/types-ambient.js b/packages/inter-protocol/src/psm/types.js → ...s/inter-protocol/src/psm/types-ambient.js
diff --git a/packages/inter-protocol/src/vaultFactory/params.js b/packages/inter-protocol/src/vaultFactory/params.js
@@ -1,6 +1,6 @@
 // @jessie-check
 
-/// <reference path="./types.js" />
+/// <reference path="./types-ambient.js" />
 
 import {
   CONTRACT_ELECTORATE,

diff --git a/.../inter-protocol/src/vaultFactory/types.js → ...rotocol/src/vaultFactory/types-ambient.js b/.../inter-protocol/src/vaultFactory/types.js → ...rotocol/src/vaultFactory/types-ambient.js
diff --git a/packages/inter-protocol/test/psm/test-psm.js b/packages/inter-protocol/test/psm/test-psm.js
@@ -1,7 +1,7 @@
 import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import '@agoric/zoe/exported.js';
-import '../../src/vaultFactory/types.js';
+import '../../src/vaultFactory/types-ambient.js';
 
 import { AmountMath, makeIssuerKit } from '@agoric/ertp';
 import { split } from '@agoric/ertp/src/legacy-payment-helpers.js';

diff --git a/packages/inter-protocol/test/vaultFactory/driver.js b/packages/inter-protocol/test/vaultFactory/driver.js
@@ -25,7 +25,7 @@ import {
   startVaultFactory,
 } from '../../src/proposals/econ-behaviors.js';
 import { startEconomicCommittee } from '../../src/proposals/startEconCommittee.js';
-import '../../src/vaultFactory/types.js';
+import '../../src/vaultFactory/types-ambient.js';
 import {
   installPuppetGovernance,
   setupBootstrap,

diff --git a/packages/inter-protocol/test/vaultFactory/test-replacePriceAuthority.js b/packages/inter-protocol/test/vaultFactory/test-replacePriceAuthority.js
@@ -32,7 +32,7 @@ import {
   startVaultFactory,
 } from '../../src/proposals/econ-behaviors.js';
 
-import '../../src/vaultFactory/types.js';
+import '../../src/vaultFactory/types-ambient.js';
 import { defaultParamValues } from './vaultFactoryUtils.js';
 
 /** @import {VaultFactoryContract as VFC} from '../../src/vaultFactory/vaultFactory.js' */

diff --git a/packages/inter-protocol/test/vaultFactory/test-storage.js b/packages/inter-protocol/test/vaultFactory/test-storage.js
@@ -7,7 +7,7 @@ import { E } from '@endo/eventual-send';
 import { assertTopicPathData, subscriptionKey } from '../supports.js';
 import { makeDriverContext, makeManagerDriver } from './driver.js';
 
-import '../../src/vaultFactory/types.js';
+import '../../src/vaultFactory/types-ambient.js';
 
 /** @typedef {import('./driver.js').DriverContext & {}} Context */
 /** @type {import('ava').TestFn<Context>} */

diff --git a/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js b/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js
@@ -25,7 +25,7 @@ import { deeplyFulfilled } from '@endo/marshal';
 import { calculateCurrentDebt } from '../../src/interest-math.js';
 import { SECONDS_PER_YEAR } from '../../src/interest.js';
 import { startVaultFactory } from '../../src/proposals/econ-behaviors.js';
-import '../../src/vaultFactory/types.js';
+import '../../src/vaultFactory/types-ambient.js';
 import {
   metricsTracker,
   reserveInitialState,

diff --git a/packages/inter-protocol/test/vaultFactory/test-vaultLiquidation.js b/packages/inter-protocol/test/vaultFactory/test-vaultLiquidation.js
@@ -25,7 +25,7 @@ import {
   SECONDS_PER_WEEK as ONE_WEEK,
   startVaultFactory,
 } from '../../src/proposals/econ-behaviors.js';
-import '../../src/vaultFactory/types.js';
+import '../../src/vaultFactory/types-ambient.js';
 import {
   reserveInitialState,
   subscriptionTracker,

diff --git a/packages/inter-protocol/test/vaultFactory/vaultFactoryUtils.js b/packages/inter-protocol/test/vaultFactory/vaultFactoryUtils.js
@@ -14,7 +14,7 @@ import {
   setupReserve,
   startAuctioneer,
 } from '../../src/proposals/econ-behaviors.js';
-import '../../src/vaultFactory/types.js';
+import '../../src/vaultFactory/types-ambient.js';
 import {
   installPuppetGovernance,
   produceInstallations,

diff --git a/packages/wallet/api/exported.js b/packages/wallet/api/exported.js
@@ -1 +1 @@
-import './src/types.js';
+import './src/types-ambient.js';
diff --git a/packages/wallet/api/src/types.js → packages/wallet/api/src/types-ambient.js b/packages/wallet/api/src/types.js → packages/wallet/api/src/types-ambient.js
diff --git a/packages/wallet/api/test/test-getPursesNotifier.js b/packages/wallet/api/test/test-getPursesNotifier.js
@@ -11,7 +11,7 @@ import {
 } from '@agoric/vats/src/nameHub.js';
 import { makeWalletRoot } from '../src/lib-wallet.js';
 
-import '../src/types.js';
+import '../src/types-ambient.js';
 
 const mixinMyAddress = prepareMixinMyAddress(makeHeapZone());
 

diff --git a/packages/wallet/api/test/test-lib-wallet.js b/packages/wallet/api/test/test-lib-wallet.js
@@ -21,7 +21,7 @@ import { resolve as importMetaResolve } from 'import-meta-resolve';
 import { makeHeapZone } from '@agoric/zone';
 import { makeWalletRoot } from '../src/lib-wallet.js';
 
-import '../src/types.js';
+import '../src/types-ambient.js';
 
 const ZOE_INVITE_PURSE_PETNAME = 'Default Zoe invite purse';
 

diff --git a/packages/zoe/src/contracts/callSpread/calculateShares.js b/packages/zoe/src/contracts/callSpread/calculateShares.js
@@ -1,4 +1,4 @@
-/// <reference path="./types.js" />
+/// <reference path="./types-ambient.js" />
 
 import { AmountMath, isNatValue } from '@agoric/ertp';
 import { assert } from '@agoric/assert';

diff --git a/packages/zoe/src/contracts/callSpread/fundedCallSpread.js b/packages/zoe/src/contracts/callSpread/fundedCallSpread.js
@@ -1,4 +1,4 @@
-/// <reference path="./types.js" />
+/// <reference path="./types-ambient.js" />
 
 import { makePromiseKit } from '@endo/promise-kit';
 import { E } from '@endo/eventual-send';

diff --git a/packages/zoe/src/contracts/callSpread/payoffHandler.js b/packages/zoe/src/contracts/callSpread/payoffHandler.js
@@ -1,5 +1,5 @@
 /* eslint @typescript-eslint/no-floating-promises: "warn" */
-/// <reference path="./types.js" />
+/// <reference path="./types-ambient.js" />
 
 import { E } from '@endo/eventual-send';
 import { AmountMath } from '@agoric/ertp';

diff --git a/packages/zoe/src/contracts/callSpread/pricedCallSpread.js b/packages/zoe/src/contracts/callSpread/pricedCallSpread.js
@@ -1,5 +1,5 @@
 /* eslint @typescript-eslint/no-floating-promises: "warn" */
-/// <reference path="./types.js" />
+/// <reference path="./types-ambient.js" />
 
 import { makePromiseKit } from '@endo/promise-kit';
 import { E } from '@endo/eventual-send';

diff --git a/...ges/zoe/src/contracts/callSpread/types.js → ...src/contracts/callSpread/types-ambient.js b/...ges/zoe/src/contracts/callSpread/types.js → ...src/contracts/callSpread/types-ambient.js
diff --git a/packages/zoe/src/contracts/exported.js b/packages/zoe/src/contracts/exported.js
@@ -1,4 +1,4 @@
-/// <reference path="./types.js" />
+/// <reference path="./types-ambient.js" />
 // eslint-disable-next-line no-restricted-syntax
-import './loan/types.js';
-import './callSpread/types.js';
+import './loan/types-ambient.js';
+import './callSpread/types-ambient.js';
diff --git a/packages/zoe/src/contracts/loan/close.js b/packages/zoe/src/contracts/loan/close.js
@@ -1,4 +1,4 @@
-/// <reference path="./types.js" />
+/// <reference path="./types-ambient.js" />
 
 import { Fail } from '@agoric/assert';
 import { AmountMath } from '@agoric/ertp';

diff --git a/packages/zoe/src/contracts/loan/types.js → ...s/zoe/src/contracts/loan/types-ambient.js b/packages/zoe/src/contracts/loan/types.js → ...s/zoe/src/contracts/loan/types-ambient.js
diff --git a/packages/zoe/src/contracts/types.js → packages/zoe/src/contracts/types-ambient.js b/packages/zoe/src/contracts/types.js → packages/zoe/src/contracts/types-ambient.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		import './src/types.js';
		import './src/types-ambient.js';