Merge branch 'master' into markm-byte-array-2

.github/workflows/ci.yml

@@ -70,7 +70,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x, 20.x, 21.x]
+        node-version: [18.x, 20.x, 22.x]
         platform: [ubuntu-latest]
         # windows-latest exhibited flakey tests that are not yet worth the
         # trouble to investigate, and blocked us from upgrading yarn from 1 to

package.json

@@ -7,7 +7,7 @@
   "engines": {
     "node": ">=16"
   },
-  "packageManager": "yarn@4.2.2",
+  "packageManager": "yarn@4.3.0",
   "devDependencies": {
     "@jessie.js/eslint-plugin": "^0.4.1",
     "@octokit/core": "^3.4.0",
@@ -25,7 +25,7 @@
     "type-coverage": "^2.26.3",
     "typedoc": "^0.25.13",
     "typedoc-plugin-markdown": "^3.17.1",
-    "typescript": "5.5.0-beta",
+    "typescript": "5.5.2",
     "typescript-eslint": "^7.3.1"
   },
   "scripts": {

packages/base64/package.json

@@ -51,7 +51,7 @@
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.29.1",
     "prettier": "^3.2.5",
-    "typescript": "5.5.0-beta"
+    "typescript": "5.5.2"
   },
   "files": [
     "LICENSE*",

packages/bundle-source/NEWS.md

@@ -1,4 +1,14 @@
 
+# Next version
+
+- Adds support for `--no-transforms` (`-T`) which generates bundles with
+  original sources.
+  A future version of `@endo/import-bundle` will be able to execute this
+  kind of bundle on XS and in Node.js, but will remain opt-in because
+  they cannot be made to run on the web without further work on module
+  virtualization in the platform without entraining a client-side
+  dependency on a JavaScript parser framework (namely Babel).
+
 # v3.2.1 (2024-03-20)
 
 - Fixes an install-time bug introduced in 3.2.0.

packages/bundle-source/package.json

@@ -43,7 +43,7 @@
     "ava": "^6.1.3",
     "c8": "^7.14.0",
     "eslint": "^8.57.0",
-    "typescript": "5.5.0-beta"
+    "typescript": "5.5.2"
   },
   "keywords": [],
   "files": [

packages/bundle-source/src/fs.js

@@ -116,10 +116,10 @@ export const makeFileWriter = (
  *   fs: Pick<import('fs'), 'existsSync'> &
  *     { promises: Pick<
  *         import('fs/promises'),
- *         'readFile' | 'stat' | 'writeFile' | 'mkdir' | 'rm'
+ *         'readFile' | 'stat' | 'writeFile' | 'mkdir' | 'rename' | 'rm'
  *       >,
  *     },
- *   path: Pick<import('path'), 'resolve' | 'relative' | 'normalize'>,
+ *   path: Pick<import('path'), 'dirname' | 'resolve' | 'relative' | 'normalize'>,
  *   os: Pick<import('os'), 'platform'>,
  * }} io
  * @param {number} [pid]

packages/bundle-source/src/main.js

@@ -3,7 +3,7 @@ import { parseArgs } from 'util';
 import { jsOpts, jsonOpts, makeNodeBundleCache } from '../cache.js';
 
 const USAGE =
-  'bundle-source [--cache-js | --cache-json] cache/ module1.js bundleName1 module2.js bundleName2 ...';
+  'bundle-source [-T,--no-transforms] [--cache-js | --cache-json] cache/ module1.js bundleName1 module2.js bundleName2 ...';
 
 const options = /** @type {const} */ ({
   'no-transforms': {

packages/captp/package.json

@@ -51,7 +51,7 @@
     "@endo/ses-ava": "^1.2.2",
     "ava": "^6.1.3",
     "c8": "^7.14.0",
-    "typescript": "5.5.0-beta"
+    "typescript": "5.5.2"
   },
   "dependencies": {
     "@endo/errors": "^1.2.2",

packages/check-bundle/package.json

@@ -57,7 +57,7 @@
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.29.1",
     "prettier": "^3.2.5",
-    "typescript": "5.5.0-beta"
+    "typescript": "5.5.2"
   },
   "files": [
     "*.js",

packages/cjs-module-analyzer/package.json

@@ -41,7 +41,7 @@
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.29.1",
     "prettier": "^3.2.5",
-    "typescript": "5.5.0-beta"
+    "typescript": "5.5.2"
   },
   "files": [
     "LICENSE*",

packages/cli/package.json

@@ -34,6 +34,7 @@
     "@endo/bundle-source": "^3.2.3",
     "@endo/compartment-mapper": "^1.1.5",
     "@endo/daemon": "^2.3.0",
+    "@endo/errors": "^1.2.2",
     "@endo/eventual-send": "^1.2.2",
     "@endo/exo": "^1.5.0",
     "@endo/far": "^1.1.2",
@@ -57,7 +58,7 @@
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.29.1",
     "prettier": "^3.2.5",
-    "typescript": "5.5.0-beta"
+    "typescript": "5.5.2"
   },
   "files": [
     "LICENSE*",

packages/cli/src/commands/run.js

@@ -1,4 +1,4 @@
-/* global process */
+/* global globalThis, process */
 import url from 'url';
 import os from 'os';
 import { E, Far } from '@endo/far';
@@ -10,7 +10,8 @@ import { withEndoAgent } from '../context.js';
 import { parsePetNamePath } from '../pet-name.js';
 
 const endowments = harden({
-  assert,
+  // See https://github.com/Agoric/agoric-sdk/issues/9515
+  assert: globalThis.assert,
   E,
   Far,
   makeExo,

packages/cli/src/pet-name.js

@@ -1,4 +1,4 @@
-const { quote: q } = assert;
+import { q } from '@endo/errors';
 
 /**
  * Splits a dot-delimited pet name path into an array of pet names.

packages/common/package.json

@@ -51,7 +51,7 @@
     "ava": "^6.1.3",
     "c8": "^7.14.0",
     "tsd": "^0.30.7",
-    "typescript": "5.5.0-beta"
+    "typescript": "5.5.2"
   },
   "files": [
     "*.js",

packages/compartment-mapper/package.json

@@ -70,7 +70,7 @@
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.29.1",
     "prettier": "^3.2.5",
-    "typescript": "5.5.0-beta"
+    "typescript": "5.5.2"
   },
   "files": [
     "LICENSE*",

packages/compartment-mapper/test/main.test.js

@@ -1,3 +1,5 @@
+/* global globalThis */
+
 import 'ses';
 import test from 'ava';
 import { loadLocation, importArchive, makeBundle } from '../index.js';
@@ -96,7 +98,8 @@ test('makeBundle / importArchive', async t => {
     TextEncoder,
     TextDecoder,
     URL,
-    assert,
+    // See https://github.com/Agoric/agoric-sdk/issues/9515
+    assert: globalThis.assert,
   });
   const evasiveArchiverBundle = archiverBundle
     .replace(/(?<!\.)\bimport\b(?![:"'])/g, 'IMPORT')

packages/daemon/package.json

@@ -76,7 +76,7 @@
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.29.1",
     "prettier": "^3.2.5",
-    "typescript": "5.5.0-beta"
+    "typescript": "5.5.2"
   },
   "files": [
     "LICENSE*",

packages/daemon/src/daemon-node-powers.js

@@ -4,6 +4,7 @@
 import { makePromiseKit } from '@endo/promise-kit';
 import { makePipe } from '@endo/stream';
 import { makeNodeReader, makeNodeWriter } from '@endo/stream-node';
+import { q } from '@endo/errors';
 import { makeNetstringCapTP } from './connection.js';
 import { makeReaderRef } from './reader-ref.js';
 import { makePetStoreMaker } from './pet-store.js';
@@ -14,8 +15,6 @@ import { makeSerialJobs } from './serial-jobs.js';
 /** @import { ERef, FarRef } from '@endo/eventual-send' */
 /** @import { Config, CryptoPowers, DaemonWorkerFacet, DaemonicPersistencePowers, DaemonicPowers, EndoReadable, FilePowers, Formula, NetworkPowers, SocketPowers, WorkerDaemonFacet } from './types.js' */
 
-const { quote: q } = assert;
-
 const textEncoder = new TextEncoder();
 
 /**

packages/daemon/src/daemon.js

@@ -7,7 +7,7 @@ import { makeExo } from '@endo/exo';
 import { E, Far } from '@endo/far';
 import { makeMarshal } from '@endo/marshal';
 import { makePromiseKit } from '@endo/promise-kit';
-import { q } from '@endo/errors';
+import { makeError, q, X } from '@endo/errors';
 import { makeRefReader } from './ref-reader.js';
 import { makeDirectoryMaker } from './directory.js';
 import { makeMailboxMaker } from './mail.js';
@@ -491,7 +491,7 @@ const makeDaemonCore = async (
   const mustGetIdForRef = ref => {
     const id = idForRef.get(ref);
     if (id === undefined) {
-      throw assert.error(assert.details`No corresponding formula for ${ref}`);
+      throw makeError(X`No corresponding formula for ${ref}`);
     }
     return id;
   };
@@ -501,11 +501,9 @@ const makeDaemonCore = async (
     const ref = refForId.get(id);
     if (ref === undefined) {
       if (formulaForId.get(id) !== undefined) {
-        throw assert.error(
-          assert.details`Formula has not produced a ref ${id}`,
-        );
+        throw makeError(X`Formula has not produced a ref ${id}`);
       }
-      throw assert.error(assert.details`Unknown identifier ${id}`);
+      throw makeError(X`Unknown identifier ${id}`);
     }
     return ref;
   };
@@ -1576,7 +1574,7 @@ const makeDaemonCore = async (
       const guestNodeNumber = url.hostname;
 
       if (!guestHandleNumber) {
-        throw assert.error('Handle locator must have an "id" parameter');
+        throw makeError('Handle locator must have an "id" parameter');
       }
 
       const guestHandleId = formatId({

packages/daemon/src/directory.js

@@ -2,13 +2,12 @@
 
 import { E } from '@endo/far';
 import { makeExo } from '@endo/exo';
+import { q } from '@endo/errors';
 import { makeIteratorRef } from './reader-ref.js';
 import { formatLocator, idFromLocator } from './locator.js';
 
 import { DirectoryInterface } from './interfaces.js';
 
-const { quote: q } = assert;
-
 /** @import { DaemonCore, MakeDirectoryNode, EndoDirectory, NameHub, LocatorNameChange, Context } from './types.js' */
 
 /**

packages/daemon/src/formula-identifier.js

@@ -3,7 +3,7 @@
 
 /** @import { IdRecord } from './types.js' */
 
-const { quote: q } = assert;
+import { makeError, q } from '@endo/errors';
 
 const numberPattern = /^[0-9a-f]{128}$/;
 const idPattern = /^(?<number>[0-9a-f]{128}):(?<node>[0-9a-f]{128})$/;
@@ -19,7 +19,7 @@ export const isValidNumber = allegedNumber =>
  */
 export const assertValidNumber = allegedNumber => {
   if (!isValidNumber(allegedNumber)) {
-    throw assert.error(`Invalid number ${q(allegedNumber)}`);
+    throw makeError(`Invalid number ${q(allegedNumber)}`);
   }
 };
 
@@ -45,11 +45,11 @@ export const assertValidId = (id, petName) => {
 export const parseId = id => {
   const match = idPattern.exec(id);
   if (match === null) {
-    throw assert.error(`Invalid formula identifier ${q(id)}`);
+    throw makeError(`Invalid formula identifier ${q(id)}`);
   }
   const { groups } = match;
   if (groups === undefined) {
-    throw assert.error(
+    throw makeError(
       `Programmer invariant failure: expected match groups, formula identifier was ${q(
         id,
       )}`,

packages/daemon/src/formula-type.js

@@ -1,6 +1,6 @@
 // @ts-check
 
-const { quote: q } = assert;
+import { q } from '@endo/errors';
 
 // Note: Alphabetically sorted
 const formulaTypes = new Set([

packages/daemon/src/host.js

@@ -6,6 +6,7 @@
 
 import { E } from '@endo/far';
 import { makeExo } from '@endo/exo';
+import { makeError, q } from '@endo/errors';
 import { makeIteratorRef } from './reader-ref.js';
 import { assertPetName, petNamePathFrom } from './pet-name.js';
 import { parseId, formatId } from './formula-identifier.js';
@@ -14,8 +15,6 @@ import { makeDeferredTasks } from './deferred-tasks.js';
 
 import { HostInterface } from './interfaces.js';
 
-const { quote: q } = assert;
-
 /** @param {string} name */
 const assertPowersName = name => {
   ['NONE', 'AGENT', 'ENDO'].includes(name) || assertPetName(name);
@@ -494,10 +493,10 @@ export const makeHostMaker = ({
 
       nodeNumber || assert.Fail`Invitation must have a hostname`;
       if (!remoteHandleNumber) {
-        throw assert.error(`Invitation must have a "from" parameter`);
+        throw makeError(`Invitation must have a "from" parameter`);
       }
       if (invitationNumber === null) {
-        throw assert.error(`Invitation must have an "id" parameter`);
+        throw makeError(`Invitation must have an "id" parameter`);
       }
 
       /** @type {PeerInfo} */

packages/daemon/src/locator.js

@@ -1,10 +1,9 @@
 // @ts-check
 
+import { makeError, q } from '@endo/errors';
 import { formatId, isValidNumber, parseId } from './formula-identifier.js';
 import { isValidFormulaType } from './formula-type.js';
 
-const { quote: q } = assert;
-
 /**
  * The endo locator format:
  * ```
@@ -28,7 +27,7 @@ const isValidLocatorType = allegedType =>
  */
 const assertValidLocatorType = allegedType => {
   if (!isValidLocatorType(allegedType)) {
-    throw assert.error(`Unrecognized locator type ${q(allegedType)}`);
+    throw makeError(`Unrecognized locator type ${q(allegedType)}`);
   }
 };
 
@@ -40,35 +39,35 @@ export const parseLocator = allegedLocator => {
   const errorPrefix = `Invalid locator ${q(allegedLocator)}:`;
 
   if (!URL.canParse(allegedLocator)) {
-    throw assert.error(`${errorPrefix} Invalid URL.`);
+    throw makeError(`${errorPrefix} Invalid URL.`);
   }
   const url = new URL(allegedLocator);
 
   if (!allegedLocator.startsWith('endo://')) {
-    throw assert.error(`${errorPrefix} Invalid protocol.`);
+    throw makeError(`${errorPrefix} Invalid protocol.`);
   }
 
   const node = url.host;
   if (!isValidNumber(node)) {
-    throw assert.error(`${errorPrefix} Invalid node identifier.`);
+    throw makeError(`${errorPrefix} Invalid node identifier.`);
   }
 
   if (
     url.searchParams.size !== 2 ||
     !url.searchParams.has('id') ||
     !url.searchParams.has('type')
   ) {
-    throw assert.error(`${errorPrefix} Invalid search params.`);
+    throw makeError(`${errorPrefix} Invalid search params.`);
   }
 
   const number = url.searchParams.get('id');
   if (number === null || !isValidNumber(number)) {
-    throw assert.error(`${errorPrefix} Invalid id.`);
+    throw makeError(`${errorPrefix} Invalid id.`);
   }
 
   const formulaType = url.searchParams.get('type');
   if (formulaType === null || !isValidLocatorType(formulaType)) {
-    throw assert.error(`${errorPrefix} Invalid type.`);
+    throw makeError(`${errorPrefix} Invalid type.`);
   }
 
   return { formulaType, node, number };