define Key, PureData using parameterized Passable (WIP)

package.json

@@ -11,8 +11,8 @@
   "devDependencies": {
     "@jessie.js/eslint-plugin": "^0.3.0",
     "@octokit/core": "^3.4.0",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@typescript-eslint/parser": "^6.6.0",
+    "@typescript-eslint/eslint-plugin": "^6.18.1",
+    "@typescript-eslint/parser": "^6.18.1",
     "ava": "^5.3.0",
     "eslint": "^8.46.0",
     "eslint-config-airbnb-base": "^15.0.0",
@@ -24,7 +24,7 @@
     "lerna-update-wizard": "^0.17.5",
     "type-coverage": "^2.26.3",
     "typedoc": "^0.25.7",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "scripts": {
     "clean": "lerna clean",

packages/base64/package.json

@@ -50,7 +50,7 @@
     "eslint-plugin-eslint-comments": "^3.1.2",
     "eslint-plugin-import": "^2.29.0",
     "prettier": "^3.0.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "files": [
     "LICENSE*",

packages/bundle-source/package.json

@@ -78,6 +78,6 @@
     ]
   },
   "typeCoverage": {
-    "atLeast": 67.65
+    "atLeast": 69.54
   }
 }

packages/captp/package.json

@@ -75,6 +75,6 @@
     ]
   },
   "typeCoverage": {
-    "atLeast": 86.52
+    "atLeast": 85.2
   }
 }

packages/captp/src/captp.js

@@ -326,8 +326,9 @@ export const makeCapTP = (
 
   const IS_REMOTE_PUMPKIN = harden({});
   /**
-   * @type {import('@endo/marshal').ConvertSlotToVal<import('./types.js').CapTPSlot>}
+   * @type {import('@endo/marshal').ConvertValToSlot<import('./types.js').CapTPSlot>}
    */
+  // @ts-expect-error intentional hack
   const assertValIsLocal = val => {
     const slot = valToSlot.get(val);
     if (slot && slot[1] === '-') {
@@ -499,6 +500,7 @@ export const makeCapTP = (
     }
 
     // If we imported this slot, mark it as one our peer exported.
+    // @ts-expect-error map lacks value type
     return slotToImported.get(recvSlot.add(slot));
   }
 

packages/check-bundle/package.json

@@ -55,7 +55,7 @@
     "eslint-plugin-eslint-comments": "^3.1.2",
     "eslint-plugin-import": "^2.29.0",
     "prettier": "^3.0.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "files": [
     "*.js",

packages/cjs-module-analyzer/package.json

@@ -40,7 +40,7 @@
     "eslint-plugin-eslint-comments": "^3.1.2",
     "eslint-plugin-import": "^2.29.0",
     "prettier": "^3.0.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "files": [
     "LICENSE*",

packages/cli/package.json

@@ -45,7 +45,7 @@
     "eslint-plugin-eslint-comments": "^3.1.2",
     "eslint-plugin-import": "^2.29.0",
     "prettier": "^3.0.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "files": [
     "LICENSE*",

packages/compartment-mapper/package.json

@@ -61,7 +61,7 @@
     "eslint-plugin-eslint-comments": "^3.1.2",
     "eslint-plugin-import": "^2.29.0",
     "prettier": "^3.0.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "files": [
     "LICENSE*",
@@ -97,6 +97,6 @@
     "timeout": "2m"
   },
   "typeCoverage": {
-    "atLeast": 85.78
+    "atLeast": 86.14
   }
 }

packages/daemon/package.json

@@ -60,7 +60,7 @@
     "eslint-plugin-eslint-comments": "^3.1.2",
     "eslint-plugin-import": "^2.29.0",
     "prettier": "^3.0.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "files": [
     "LICENSE*",

packages/env-options/package.json

@@ -43,7 +43,7 @@
     "eslint-plugin-eslint-comments": "^3.1.2",
     "eslint-plugin-import": "^2.29.0",
     "prettier": "^3.0.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "files": [
     "*.js",
@@ -83,6 +83,6 @@
     "timeout": "2m"
   },
   "typeCoverage": {
-    "atLeast": 72.22
+    "atLeast": 74.44
   }
 }

packages/eslint-plugin/package.json

@@ -17,10 +17,10 @@
     "lint-check": "exit 0"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "^6.6.0",
+    "@typescript-eslint/utils": "^6.18.1",
     "requireindex": "~1.1.0",
     "tsutils": "~3.21.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "devDependencies": {
     "eslint": "^8.46.0"

packages/eventual-send/package.json

@@ -70,6 +70,6 @@
     "timeout": "2m"
   },
   "typeCoverage": {
-    "atLeast": 77.79
+    "atLeast": 77.81
   }
 }

packages/exo/package.json

@@ -49,7 +49,7 @@
     "eslint-plugin-eslint-comments": "^3.1.2",
     "eslint-plugin-import": "^2.29.0",
     "prettier": "^3.0.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "files": [
     "*.js",
@@ -73,6 +73,6 @@
     "timeout": "2m"
   },
   "typeCoverage": {
-    "atLeast": 91.45
+    "atLeast": 97.05
   }
 }

packages/far/test/test-marshal-far-obj.js

@@ -66,6 +66,7 @@ const testRecord = ({
     }),
   );
 
+/** @type {import('@endo/pass-style').PassStyled<'remotable'>} */
 const goodRemotableProto = testRecord();
 
 // @ts-ignore We're testing bad things anyway
@@ -129,6 +130,7 @@ test('passStyleOf validation of remotables', t => {
   t.throws(() => passStyleOf(badRemotableProto3), NON_METHOD);
   t.throws(() => passStyleOf(badRemotableProto4), NON_METHOD);
 
+  // @ts-expect-error UNTIL https://github.com/microsoft/TypeScript/issues/38385
   t.is(passStyleOf(sub(goodRemotableProto)), 'remotable');
 
   t.throws(() => passStyleOf(sub(badRemotableProto1)), EXPECTED_PASS_STYLE);

packages/lp32/package.json

@@ -64,7 +64,7 @@
     "eslint-plugin-eslint-comments": "^3.1.2",
     "eslint-plugin-import": "^2.29.0",
     "prettier": "^3.0.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "files": [
     "LICENSE*",

packages/marshal/package.json

@@ -77,6 +77,6 @@
     "timeout": "2m"
   },
   "typeCoverage": {
-    "atLeast": 89.31
+    "atLeast": 86.69
   }
 }

packages/marshal/src/deeplyFulfilled.js

@@ -51,18 +51,22 @@ export const deeplyFulfilled = async val => {
   const passStyle = passStyleOf(val);
   switch (passStyle) {
     case 'copyRecord': {
+      // @ts-expect-error FIXME narrowed
       const names = ownKeys(val);
       const valPs = names.map(name => deeplyFulfilled(val[name]));
       return E.when(Promise.all(valPs), vals =>
         harden(fromEntries(vals.map((c, i) => [names[i], c]))),
       );
     }
     case 'copyArray': {
+      // @ts-expect-error FIXME narrowed
       const valPs = val.map(p => deeplyFulfilled(p));
       return E.when(Promise.all(valPs), vals => harden(vals));
     }
     case 'tagged': {
+      // @ts-expect-error FIXME narrowed
       const tag = getTag(val);
+      // @ts-expect-error FIXME narrowed
       return E.when(deeplyFulfilled(val.payload), payload =>
         makeTagged(tag, payload),
       );

packages/marshal/src/encodePassable.js

@@ -9,12 +9,12 @@ import {
   passableSymbolForName,
 } from '@endo/pass-style';
 
-/** @typedef {import('@endo/pass-style').PassStyle} PassStyle */
-/** @typedef {import('@endo/pass-style').Passable} Passable */
-/** @typedef {import('@endo/pass-style').RemotableObject} Remotable */
+/** @typedef {import('@endo/pass-style/src/types.js').PassStyle} PassStyle */
+/** @typedef {import('@endo/pass-style/src/types.js').Passable} Passable */
+/** @typedef {import('@endo/pass-style/src/types.js').RemotableObject} Remotable */
 /**
  * @template {Passable} [T=Passable]
- * @typedef {import('@endo/pass-style').CopyRecord<T>} CopyRecord
+ * @typedef {import('@endo/pass-style/src/types.js').CopyRecord<T>} CopyRecord
  */
 /** @typedef {import('./types.js').RankCover} RankCover */
 
@@ -27,7 +27,7 @@ const { ownKeys } = Reflect;
  * string-named own properties. `recordNames` returns those name *reverse*
  * sorted, because that's how records are compared, encoded, and sorted.
  *
- * @template T
+ * @template {Passable} T
  * @param {CopyRecord<T>} record
  * @returns {string[]}
  */
@@ -44,7 +44,7 @@ harden(recordNames);
  * Assuming that `record` is a CopyRecord and `names` is `recordNames(record)`,
  * return the corresponding array of property values.
  *
- * @template T
+ * @template {Passable} T
  * @param {CopyRecord<T>} record
  * @param {string[]} names
  * @returns {T[]}

packages/marshal/src/encodeToCapData.js

@@ -20,7 +20,7 @@ import {
 
 /** @typedef {import('@endo/pass-style').Passable} Passable */
 /** @typedef {import('./types.js').Encoding} Encoding */
-/** @typedef {import('@endo/pass-style').Remotable} Remotable */
+/** @typedef {import('@endo/pass-style').RemotableObject} RemotableObject */
 /** @typedef {import('./types.js').EncodingUnion} EncodingUnion */
 
 const { ownKeys } = Reflect;
@@ -62,7 +62,7 @@ const qclassMatches = (encoded, qclass) =>
 /**
  * @typedef {object} EncodeToCapDataOptions
  * @property {(
- *   remotable: Remotable,
+ *   remotable: RemotableObject,
  *   encodeRecur: (p: Passable) => Encoding
  * ) => Encoding} [encodeRemotableToCapData]
  * @property {(
@@ -117,7 +117,7 @@ export const makeEncodeToCapData = (encodeOptions = {}) => {
    * Readers must not care about this order anyway. We impose this requirement
    * mainly to reduce non-determinism exposed outside a vat.
    *
-   * @param {Passable} passable
+   * @param {any} passable
    * @returns {Encoding} except that `encodeToCapData` does not generally
    * `harden` this result before returning. Rather, `encodeToCapData` is not
    * directly exposed.
@@ -269,11 +269,11 @@ harden(makeEncodeToCapData);
  * @property {(
  *   encodedRemotable: Encoding,
  *   decodeRecur: (e: Encoding) => Passable
- * ) => (Promise|Remotable)} [decodeRemotableFromCapData]
+ * ) => (Promise|RemotableObject)} [decodeRemotableFromCapData]
  * @property {(
  *   encodedPromise: Encoding,
  *   decodeRecur: (e: Encoding) => Passable
- * ) => (Promise|Remotable)} [decodePromiseFromCapData]
+ * ) => (Promise|RemotableObject)} [decodePromiseFromCapData]
  * @property {(
  *   encodedError: Encoding,
  *   decodeRecur: (e: Encoding) => Passable

packages/marshal/src/encodeToSmallcaps.js

@@ -18,7 +18,7 @@ import {
 } from '@endo/pass-style';
 
 /** @typedef {import('@endo/pass-style').Passable} Passable */
-/** @typedef {import('@endo/pass-style').Remotable} Remotable */
+/** @typedef {import('@endo/pass-style').RemotableObject} RemotableObject */
 // @typedef {import('./types.js').SmallcapsEncoding} SmallcapsEncoding */
 // @typedef {import('./types.js').SmallcapsEncodingUnion} SmallcapsEncodingUnion */
 /** @typedef {any} SmallcapsEncoding */
@@ -89,7 +89,7 @@ const startsSpecial = encodedStr => {
 /**
  * @typedef {object} EncodeToSmallcapsOptions
  * @property {(
- *   remotable: Remotable,
+ *   remotable: RemotableObject,
  *   encodeRecur: (p: Passable) => SmallcapsEncoding
  * ) => SmallcapsEncoding} [encodeRemotableToSmallcaps]
  * @property {(
@@ -161,7 +161,7 @@ export const makeEncodeToSmallcaps = (encodeOptions = {}) => {
    * Readers must not care about this order anyway. We impose this requirement
    * mainly to reduce non-determinism exposed outside a vat.
    *
-   * @param {Passable} passable
+   * @param {any} passable
    * @returns {SmallcapsEncoding} except that `encodeToSmallcaps` does not generally
    * `harden` this result before returning. Rather, `encodeToSmallcaps` is not
    * directly exposed.
@@ -299,7 +299,7 @@ harden(makeEncodeToSmallcaps);
  * @property {(
  *   encodedRemotable: SmallcapsEncoding,
  *   decodeRecur: (e :SmallcapsEncoding) => Passable
- * ) => Remotable} [decodeRemotableFromSmallcaps]
+ * ) => RemotableObject} [decodeRemotableFromSmallcaps]
  * @property {(
  *   encodedPromise: SmallcapsEncoding,
  *   decodeRecur: (e :SmallcapsEncoding) => Passable