fixes to get types building

packages/marshal/src/rankOrder.js

@@ -1,3 +1,4 @@
+// @ts-nocheck FIXME before merge
 import { getTag, passStyleOf, nameForPassableSymbol } from '@endo/pass-style';
 import {
   passStylePrefixes,

packages/marshal/src/types.js

@@ -172,8 +172,8 @@ export {};
  * ordering would also compare magnitudes, and so agree with the rank ordering
  * of all values other than `NaN`. An array sorted by rank would enable range
  * queries by magnitude.
- * @param {Passable} left
- * @param {Passable} right
+ * @param {import("@endo/pass-style").Passable} left
+ * @param {import("@endo/pass-style").Passable} right
  * @returns {RankComparison}
  */
 

packages/pass-style/src/makeTagged.js

@@ -8,7 +8,7 @@ const { Fail } = assert;
 
 /**
  * @template {string} T
- * @template {any} P
+ * @template {import('./types.js').Passable} P
  * @param {T} tag
  * @param {P} payload
  * @returns {import('./types.js').CopyTagged<T,P>}

packages/pass-style/src/typeGuards.js

@@ -17,8 +17,8 @@ const { Fail, quote: q } = assert;
  * Check whether the argument is a pass-by-copy array, AKA a "copyArray"
  * in @endo/marshal terms
  *
- * @param {unknown} arr
- * @returns {arr is CopyArray<unknown>}
+ * @param {any} arr
+ * @returns {arr is CopyArray<any>}
  */
 const isCopyArray = arr => passStyleOf(arr) === 'copyArray';
 harden(isCopyArray);
@@ -27,8 +27,8 @@ harden(isCopyArray);
  * Check whether the argument is a pass-by-copy record, AKA a
  * "copyRecord" in @endo/marshal terms
  *
- * @param {unknown} record
- * @returns {record is CopyRecord<unknown>}
+ * @param {any} record
+ * @returns {record is CopyRecord<any>}
  */
 const isRecord = record => passStyleOf(record) === 'copyRecord';
 harden(isRecord);
@@ -43,9 +43,9 @@ const isRemotable = remotable => passStyleOf(remotable) === 'remotable';
 harden(isRemotable);
 
 /**
- * @param {unknown} array
+ * @param {any} array
  * @param {string=} optNameOfArray
- * @returns {asserts array is CopyArray<unknown>}
+ * @returns {asserts array is CopyArray<any>}
  */
 const assertCopyArray = (array, optNameOfArray = 'Alleged array') => {
   const passStyle = passStyleOf(array);
@@ -57,9 +57,9 @@ const assertCopyArray = (array, optNameOfArray = 'Alleged array') => {
 harden(assertCopyArray);
 
 /**
- * @param {unknown} record
+ * @param {any} record
  * @param {string=} optNameOfRecord
- * @returns {asserts record is CopyRecord<unknown>}
+ * @returns {asserts record is CopyRecord<any>}
  */
 const assertRecord = (record, optNameOfRecord = 'Alleged record') => {
   const passStyle = passStyleOf(record);

packages/pass-style/tools/arb-passable.js

@@ -99,7 +99,12 @@ const { arbDag } = fc.letrec(tie => {
             ),
           }),
         )
-        .map(({ type, payload }) => makeTagged(type, payload)),
+        .map(({ type, payload }) =>
+          makeTagged(
+            type,
+            /** @type {import('../src/types.js').Passable} */ (payload),
+          ),
+        ),
     ),
   };
 });

packages/patterns/src/keys/checkKey.js

@@ -199,7 +199,7 @@ export const assertCopySet = s => {
 harden(assertCopySet);
 
 /**
- * @template K
+ * @template {Key} K
  * @param {CopySet<K>} s
  * @returns {K[]}
  */
@@ -210,7 +210,7 @@ export const getCopySetKeys = s => {
 harden(getCopySetKeys);
 
 /**
- * @template K
+ * @template {Key} K
  * @param {CopySet<K>} s
  * @param {(key: K, index: number) => boolean} fn
  * @returns {boolean}
@@ -220,7 +220,7 @@ export const everyCopySetKey = (s, fn) =>
 harden(everyCopySetKey);
 
 /**
- * @template K
+ * @template {Key} K
  * @param {Iterable<K>} elementIter
  * @returns {CopySet<K>}
  */
@@ -283,7 +283,7 @@ export const assertCopyBag = b => {
 harden(assertCopyBag);
 
 /**
- * @template K
+ * @template {Key} K
  * @param {CopyBag<K>} b
  * @returns {CopyBag<K>['payload']}
  */
@@ -294,7 +294,7 @@ export const getCopyBagEntries = b => {
 harden(getCopyBagEntries);
 
 /**
- * @template K
+ * @template {Key} K
  * @param {CopyBag<K>} b
  * @param {(entry: [K, bigint], index: number) => boolean} fn
  * @returns {boolean}
@@ -304,7 +304,7 @@ export const everyCopyBagEntry = (b, fn) =>
 harden(everyCopyBagEntry);
 
 /**
- * @template K
+ * @template {Key} K
  * @param {Iterable<[K,bigint]>} bagEntryIter
  * @returns {CopyBag<K>}
  */
@@ -316,7 +316,7 @@ export const makeCopyBag = bagEntryIter => {
 harden(makeCopyBag);
 
 /**
- * @template K
+ * @template {Key} K
  * @param {Iterable<K>} elementIter
  * @returns {CopyBag<K>}
  */

packages/patterns/src/keys/copyBag.js

@@ -123,7 +123,7 @@ export const coerceToBagEntries = bagEntriesList => {
 harden(coerceToBagEntries);
 
 /**
- * @template K
+ * @template {import('../types.js').Key} K
  * @param {Iterable<[K, bigint]>} bagEntryIter
  * @returns {CopyBag<K>}
  */

packages/patterns/src/keys/copySet.js

@@ -97,7 +97,7 @@ export const coerceToElements = elementsList => {
 harden(coerceToElements);
 
 /**
- * @template K
+ * @template {import('../types.js').Key} K
  * @param {Iterable<K>} elementIter
  * @returns {CopySet<K>}
  */

packages/patterns/src/keys/merge-bag-operators.js

@@ -29,7 +29,7 @@ const { quote: q, Fail } = assert;
  * to `fullOrder`. However, it optimizes for the case where these contiguous
  * runs that need to be resorted are either absent or small.
  *
- * @template T
+ * @template {import('../types').Passable} T
  * @param {[T,bigint][]} bagEntries
  * @param {RankCompare} rankCompare
  * @param {FullCompare} fullCompare
@@ -96,7 +96,7 @@ const bagWindowResort = (bagEntries, rankCompare, fullCompare) => {
  * For sets, these counts are always 0 or 1, but this representation
  * generalizes nicely for bags.
  *
- * @template T
+ * @template {import('../types').Passable} T
  * @param {[T,bigint][]} xbagEntries
  * @param {[T,bigint][]} ybagEntries
  * @returns {Iterable<[T,bigint,bigint]>}