refactor(types): use types-ambient naming

Agoric · Sep 16, 2023 · 4c25986 · 4c25986
1 parent da94346
commit 4c25986
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 15 deletions.
diff --git a/packages/boot/index.js b/packages/boot/index.js
@@ -1,3 +1,3 @@
 // @ts-check
 // Ambient types
-import '@agoric/vats/src/core/types.js';
+import '@agoric/vats/src/core/types-ambient.js';
diff --git a/packages/deploy-script-support/test/unitTests/test-coreProposalBehavior.js b/packages/deploy-script-support/test/unitTests/test-coreProposalBehavior.js
@@ -2,7 +2,7 @@
 import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import { E } from '@endo/far';
-import '@agoric/vats/src/core/types.js';
+import '@agoric/vats/src/core/types-ambient.js';
 import {
   makeAgoricNamesAccess,
   runModuleBehaviors,

diff --git a/packages/inter-protocol/test/smartWallet/test-oracle-integration.js b/packages/inter-protocol/test/smartWallet/test-oracle-integration.js
@@ -1,4 +1,4 @@
-import '@agoric/vats/src/core/types.js';
+import '@agoric/vats/src/core/types-ambient.js';
 
 import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 

diff --git a/packages/inter-protocol/test/smartWallet/test-psm-integration.js b/packages/inter-protocol/test/smartWallet/test-psm-integration.js
@@ -1,7 +1,7 @@
 import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import { AmountMath, makeIssuerKit } from '@agoric/ertp';
-import '@agoric/vats/src/core/types.js';
+import '@agoric/vats/src/core/types-ambient.js';
 import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js';
 import { E } from '@endo/far';
 import { NonNullish } from '@agoric/assert';

diff --git a/packages/smart-wallet/test/supports.js b/packages/smart-wallet/test/supports.js
@@ -11,7 +11,7 @@ import {
   makeBoard,
 } from '@agoric/vats/src/core/basic-behaviors.js';
 import { setupClientManager } from '@agoric/vats/src/core/chain-behaviors.js';
-import '@agoric/vats/src/core/types.js';
+import '@agoric/vats/src/core/types-ambient.js';
 import { buildRootObject as boardRoot } from '@agoric/vats/src/vat-board.js';
 import { buildRootObject as mintsRoot } from '@agoric/vats/src/vat-mints.js';
 import { makeFakeBankKit } from '@agoric/vats/tools/bank-utils.js';

diff --git a/packages/smart-wallet/test/test-startWalletFactory.js b/packages/smart-wallet/test/test-startWalletFactory.js
@@ -6,7 +6,7 @@ import { E } from '@endo/far';
 import path from 'path';
 import { makeMockTestSpace } from './supports.js';
 
-import '@agoric/vats/src/core/types.js';
+import '@agoric/vats/src/core/types-ambient.js';
 
 /** @type {import('ava').TestFn<Awaited<ReturnType<typeof makeTestContext>>>} */
 const test = anyTest;

diff --git a/packages/smart-wallet/test/test-walletFactory.js b/packages/smart-wallet/test/test-walletFactory.js
@@ -11,7 +11,7 @@ import {
   topicPath,
 } from './supports.js';
 
-import '@agoric/vats/src/core/types.js';
+import '@agoric/vats/src/core/types-ambient.js';
 
 /** @type {import('ava').TestFn<Awaited<ReturnType<makeDefaultTestContext>>>} */
 const test = anyTest;

diff --git a/packages/vats/exported.js b/packages/vats/exported.js
@@ -1 +1 @@
-import './src/core/types.js';
+import './src/core/types-ambient.js';
diff --git a/packages/vats/index.js b/packages/vats/index.js
@@ -1,7 +1,7 @@
 // @ts-check
 // Ambient types
 import '@agoric/zoe/exported.js';
-import './src/core/types.js';
+import './src/core/types-ambient.js';
 
 // eslint-disable-next-line import/export -- no named exports
 export * from './src/types.js';

diff --git a/packages/vats/src/bridge.js b/packages/vats/src/bridge.js
@@ -3,7 +3,7 @@
 import { M } from '@agoric/store';
 import '@agoric/store/exported.js';
 import { E } from '@endo/far';
-import './core/types.js';
+import './core/types-ambient.js';
 
 const { Fail, details: X } = assert;
 

diff --git a/packages/vats/src/core/types.d.ts → packages/vats/src/core/types-ambient.d.ts b/packages/vats/src/core/types.d.ts → packages/vats/src/core/types-ambient.d.ts
@@ -341,7 +341,7 @@ type ChainBootstrapSpaceT = {
    */
   instancePrivateArgs: Map<Instance, unknown>;
   namesByAddress: import('../types.js').NameHub;
-  namesByAddressAdmin: import('../types').NamesByAddressAdmin;
+  namesByAddressAdmin: import('../types.js').NamesByAddressAdmin;
   pegasusConnections: import('@agoric/vats').NameHubKit;
   pegasusConnectionsAdmin: import('@agoric/vats').NameAdmin;
   priceAuthorityVat: Awaited<PriceAuthorityVat>;
@@ -370,7 +370,7 @@ type ChainBootstrapSpaceT = {
   /** Used only for testing. Should not appear in any production proposals. */
   testFirstAnchorKit: import('../vat-bank.js').AssetIssuerKit<'nat'>;
   walletBridgeManager: import('../types.js').ScopedBridgeManager | undefined;
-  walletFactoryStartResult: import('./startWalletFactory').WalletFactoryStartResult;
+  walletFactoryStartResult: import('./startWalletFactory.js').WalletFactoryStartResult;
   provisionPoolStartResult: unknown;
   vatStore: import('./utils.js').VatStore;
   zoe: ZoeService;
@@ -437,7 +437,7 @@ type RemoteIssuerKit = {
   brand: Brand;
 };
 type AgoricNamesVat = ERef<
-  ReturnType<typeof import('../vat-agoricNames').buildRootObject>
+  ReturnType<typeof import('../vat-agoricNames.js').buildRootObject>
 >;
 type BankVat = ERef<
   ReturnType<typeof import('../vat-bank.js').buildRootObject>

diff --git a/packages/vats/src/core/types.js → packages/vats/src/core/types-ambient.js b/packages/vats/src/core/types.js → packages/vats/src/core/types-ambient.js
diff --git a/packages/zoe/exported.js b/packages/zoe/exported.js
@@ -1,6 +1,6 @@
 // @jessie-check
 
-import './src/contractFacet/types.js';
+import './src/contractFacet/types-ambient.js';
 import './src/zoeService/types.js';
 import './src/contractSupport/types.js';
 import './src/contracts/exported.js';

diff --git a/packages/zoe/src/contractFacet/types.d.ts → .../zoe/src/contractFacet/types-ambient.d.ts b/packages/zoe/src/contractFacet/types.d.ts → .../zoe/src/contractFacet/types-ambient.d.ts
diff --git a/packages/zoe/src/contractFacet/types.js → ...es/zoe/src/contractFacet/types-ambient.js b/packages/zoe/src/contractFacet/types.js → ...es/zoe/src/contractFacet/types-ambient.js
diff --git a/packages/zoe/src/contractFacet/zcfMint.js b/packages/zoe/src/contractFacet/zcfMint.js
@@ -10,7 +10,7 @@ import { addToAllocation, subtractFromAllocation } from './allocationMath.js';
 import '../internal-types.js';
 import { ZcfMintI } from '../typeGuards.js';
 import './internal-types.js';
-import './types.js';
+import './types-ambient.js';
 
 const { Fail } = assert;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		import './src/core/types.js';
		import './src/core/types-ambient.js';