chore(types): types-index internal

Agoric · Sep 27, 2024 · 21cc42c · 21cc42c
1 parent f32591c
commit 21cc42c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/packages/boot/test/bootstrapTests/ibcClientMock.js b/packages/boot/test/bootstrapTests/ibcClientMock.js
@@ -5,7 +5,8 @@ import { heapVowE as E } from '@agoric/vow/vat.js';
 
 /**
  * @import {Connection, PortAllocator} from '@agoric/network';
- * @import {FarRef, ERef} from '@agoric/vow';
+ * @import {FarRef} from '@agoric/internal';
+ * @import {ERef} from '@agoric/vow';
  */
 
 /**

diff --git a/packages/internal/src/index.js b/packages/internal/src/index.js
@@ -11,7 +11,7 @@ export * from './typeCheck.js';
 export * from './typeGuards.js';
 
 // eslint-disable-next-line import/export -- just types
-export * from './types.js';
+export * from './types-index.js';
 
 export { objectMap } from '@endo/common/object-map.js';
 export { objectMetaMap } from '@endo/common/object-meta-map.js';

diff --git a/packages/internal/src/types-index.d.ts b/packages/internal/src/types-index.d.ts
@@ -0,0 +1 @@
+export * from './types.js';
diff --git a/packages/internal/src/types.js → packages/internal/src/types-index.js b/packages/internal/src/types.js → packages/internal/src/types-index.js
diff --git a/packages/internal/src/types.d.ts → packages/internal/src/types.ts b/packages/internal/src/types.d.ts → packages/internal/src/types.ts
@@ -1,6 +1,7 @@
 /* eslint-disable max-classes-per-file */
 import type { ERef, RemotableBrand } from '@endo/eventual-send';
 import type { Primitive } from '@endo/pass-style';
+import type { Pattern } from '@endo/patterns';
 import type { Callable } from './utils.js';
 
 /**
@@ -11,7 +12,7 @@ export type TotalMap<K, V> = Omit<Map<K, V>, 'get'> & {
   /** Returns the element associated with the specified key in the TotalMap. */
   get: (key: K) => V;
 };
-export type TotalMapFrom<M extends Map> =
+export type TotalMapFrom<M extends Map<any, any>> =
   M extends Map<infer K, infer V> ? TotalMap<K, V> : never;
 
 export declare class Callback<I extends (...args: any[]) => any> {

diff --git a/packages/vow/src/index.js b/packages/vow/src/index.js
@@ -8,6 +8,3 @@ export { VowShape, toPassableCap } from './vow-utils.js';
 
 // eslint-disable-next-line import/export
 export * from './types-index.js';
-
-// XXX re-exporting the Remote type for back-compat
-export * from '@agoric/internal/src/types.js';
diff --git a/packages/vow/src/types-index.d.ts b/packages/vow/src/types-index.d.ts
@@ -1,2 +1,5 @@
 // Export all the types this package provides
 export * from './types.js';
+
+// XXX re-exporting the Remote type for back-compat
+export { Remote } from '@agoric/internal/src/types.js';