Merge branch 'master' into markm-rank-strings-by-codepoint

endojs · May 11, 2024 · 44b1665 · 44b1665
2 parents 01394d3 + b02f0e2
commit 44b1665
Show file tree

Hide file tree

Showing 319 changed files with 474 additions and 104 deletions.
diff --git a/packages/base64/package.json b/packages/base64/package.json
@@ -70,7 +70,8 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/test-*.*",
+      "test/**/*.test.*"
     ],
     "timeout": "2m"
   },

diff --git a/packages/base64/test/test-main.js → packages/base64/test/main.test.js b/packages/base64/test/test-main.js → packages/base64/test/main.test.js
diff --git a/packages/bundle-source/package.json b/packages/bundle-source/package.json
@@ -67,7 +67,8 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/test-*.*",
+      "test/**/*.test.*"
     ]
   },
   "eslintConfig": {

diff --git a/...ndle-source/test/test-bigint-transform.js → ...ndle-source/test/bigint-transform.test.js b/...ndle-source/test/test-bigint-transform.js → ...ndle-source/test/bigint-transform.test.js
diff --git a/packages/bundle-source/test/test-circular.js → packages/bundle-source/test/circular.test.js b/packages/bundle-source/test/test-circular.js → packages/bundle-source/test/circular.test.js
diff --git a/packages/bundle-source/test/test-comment.js → packages/bundle-source/test/comment.test.js b/packages/bundle-source/test/test-comment.js → packages/bundle-source/test/comment.test.js
diff --git a/packages/bundle-source/test/test-explicit.js → packages/bundle-source/test/explicit.test.js b/packages/bundle-source/test/test-explicit.js → packages/bundle-source/test/explicit.test.js
diff --git a/...es/bundle-source/test/test-external-fs.js → ...es/bundle-source/test/external-fs.test.js b/...es/bundle-source/test/test-external-fs.js → ...es/bundle-source/test/external-fs.test.js
diff --git a/...ages/bundle-source/test/test-integrity.js → ...ages/bundle-source/test/integrity.test.js b/...ages/bundle-source/test/test-integrity.js → ...ages/bundle-source/test/integrity.test.js
diff --git a/...dle-source/test/test-sanity-unfiltered.js → ...dle-source/test/sanity-unfiltered.test.js b/...dle-source/test/test-sanity-unfiltered.js → ...dle-source/test/sanity-unfiltered.test.js
diff --git a/packages/bundle-source/test/test-sanity.js → packages/bundle-source/test/sanity.test.js b/packages/bundle-source/test/test-sanity.js → packages/bundle-source/test/sanity.test.js
diff --git a/...s/bundle-source/test/test-tool-command.js → ...s/bundle-source/test/tool-command.test.js b/...s/bundle-source/test/test-tool-command.js → ...s/bundle-source/test/tool-command.test.js
diff --git a/...s/bundle-source/test/test-tool-library.js → ...s/bundle-source/test/tool-library.test.js b/...s/bundle-source/test/test-tool-library.js → ...s/bundle-source/test/tool-library.test.js
diff --git a/packages/captp/package.json b/packages/captp/package.json
@@ -67,7 +67,8 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/test-*.*",
+      "test/**/*.test.*"
     ],
     "timeout": "2m"
   },

diff --git a/packages/captp/test/test-crosstalk.js → packages/captp/test/crosstalk.test.js b/packages/captp/test/test-crosstalk.js → packages/captp/test/crosstalk.test.js
diff --git a/packages/captp/test/test-disco.js → packages/captp/test/disco.test.js b/packages/captp/test/test-disco.js → packages/captp/test/disco.test.js
diff --git a/packages/captp/test/test-export-hook.js → packages/captp/test/export-hook.test.js b/packages/captp/test/test-export-hook.js → packages/captp/test/export-hook.test.js
diff --git a/packages/captp/test/test-finalizing-map.js → packages/captp/test/finalizing-map.test.js b/packages/captp/test/test-finalizing-map.js → packages/captp/test/finalizing-map.test.js
diff --git a/packages/captp/test/test-gc.js → packages/captp/test/gc.test.js b/packages/captp/test/test-gc.js → packages/captp/test/gc.test.js
diff --git a/packages/captp/test/test-loopback.js → packages/captp/test/loopback.test.js b/packages/captp/test/test-loopback.js → packages/captp/test/loopback.test.js
diff --git a/packages/captp/test/test-trap.js → packages/captp/test/trap.test.js b/packages/captp/test/test-trap.js → packages/captp/test/trap.test.js
diff --git a/packages/check-bundle/package.json b/packages/check-bundle/package.json
@@ -76,7 +76,8 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/test-*.*",
+      "test/**/*.test.*"
     ],
     "timeout": "2m"
   },

diff --git a/...es/check-bundle/test/test-check-bundle.js → ...es/check-bundle/test/check-bundle.test.js b/...es/check-bundle/test/test-check-bundle.js → ...es/check-bundle/test/check-bundle.test.js
diff --git a/packages/cjs-module-analyzer/package.json b/packages/cjs-module-analyzer/package.json
@@ -59,7 +59,8 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/test-*.*",
+      "test/**/*.test.*"
     ],
     "timeout": "2m"
   },

diff --git a/...analyzer/test/test-cjs-module-analyzer.js → ...analyzer/test/cjs-module-analyzer.test.js b/...analyzer/test/test-cjs-module-analyzer.js → ...analyzer/test/cjs-module-analyzer.test.js
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -74,7 +74,8 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/test-*.*",
+      "test/**/*.test.*"
     ],
     "timeout": "2m"
   },

diff --git a/packages/cli/src/commands/rename.js → packages/cli/src/commands/move.js b/packages/cli/src/commands/rename.js → packages/cli/src/commands/move.js
@@ -2,8 +2,9 @@
 import os from 'os';
 import { E } from '@endo/far';
 import { withEndoAgent } from '../context.js';
+import { parsePetNamePath } from '../pet-name.js';
 
-export const rename = async ({ fromName, toName, agentNames }) =>
+export const move = async ({ fromPath, toPath, agentNames }) =>
   withEndoAgent(agentNames, { os, process }, async ({ agent }) => {
-    await E(agent).rename(fromName, toName);
+    await E(agent).move(parsePetNamePath(fromPath), parsePetNamePath(toPath));
   });
diff --git a/packages/cli/src/endo.js b/packages/cli/src/endo.js
@@ -297,13 +297,14 @@ export const main = async rawArgs => {
     });
 
   program
-    .command('rename <from> <to>')
+    .command('move <from> <to>')
+    .alias('mv')
     .description('change the name for a value')
     .option(...commonOptions.as)
-    .action(async (fromName, toName, cmd) => {
+    .action(async (fromPath, toPath, cmd) => {
       const { as: agentNames } = cmd.opts();
-      const { rename } = await import('./commands/rename.js');
-      return rename({ fromName, toName, agentNames });
+      const { move } = await import('./commands/move.js');
+      return move({ fromPath, toPath, agentNames });
     });
 
   program

diff --git a/packages/cli/test/test-message-format.js → packages/cli/test/message-format.test.js b/packages/cli/test/test-message-format.js → packages/cli/test/message-format.test.js
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -69,7 +69,8 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/test-*.*",
+      "test/**/*.test.*"
     ],
     "timeout": "2m"
   }

diff --git a/.../common/test/test-apply-labeling-error.js → .../common/test/apply-labeling-error.test.js b/.../common/test/test-apply-labeling-error.js → .../common/test/apply-labeling-error.test.js
diff --git a/...s/common/test/test-from-unique-entries.js → ...s/common/test/from-unique-entries.test.js b/...s/common/test/test-from-unique-entries.js → ...s/common/test/from-unique-entries.test.js
diff --git a/packages/common/test/test-ident-checker.js → packages/common/test/ident-checker.test.js b/packages/common/test/test-ident-checker.js → packages/common/test/ident-checker.test.js
diff --git a/packages/common/test/test-list-difference.js → packages/common/test/list-difference.test.js b/packages/common/test/test-list-difference.js → packages/common/test/list-difference.test.js
diff --git a/...s/common/test/test-make-array-iterator.js → ...s/common/test/make-array-iterator.test.js b/...s/common/test/test-make-array-iterator.js → ...s/common/test/make-array-iterator.test.js
diff --git a/packages/common/test/test-object-map.js → packages/common/test/object-map.test.js b/packages/common/test/test-object-map.js → packages/common/test/object-map.test.js
diff --git a/...es/common/test/test-object-meta-assign.js → ...es/common/test/object-meta-assign.test.js b/...es/common/test/test-object-meta-assign.js → ...es/common/test/object-meta-assign.test.js
diff --git a/packages/common/test/test-object-meta-map.js → packages/common/test/object-meta-map.test.js b/packages/common/test/test-object-meta-map.js → packages/common/test/object-meta-map.test.js
diff --git a/packages/common/test/test-throw-labeled.js → packages/common/test/throw-labeled.test.js b/packages/common/test/test-throw-labeled.js → packages/common/test/throw-labeled.test.js
diff --git a/packages/compartment-mapper/package.json b/packages/compartment-mapper/package.json
@@ -93,7 +93,8 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/test-*.*",
+      "test/**/*.test.*"
     ],
     "timeout": "2m"
   },

diff --git a/...es/compartment-mapper/test/test-assets.js → ...es/compartment-mapper/test/assets.test.js b/...es/compartment-mapper/test/test-assets.js → ...es/compartment-mapper/test/assets.test.js
diff --git a/...es/compartment-mapper/test/test-bundle.js → ...es/compartment-mapper/test/bundle.test.js b/...es/compartment-mapper/test/test-bundle.js → ...es/compartment-mapper/test/bundle.test.js
diff --git a/...ompartment-mapper/test/test-cjs-compat.js → ...ompartment-mapper/test/cjs-compat.test.js b/...ompartment-mapper/test/test-cjs-compat.js → ...ompartment-mapper/test/cjs-compat.test.js
diff --git a/.../compartment-mapper/test/test-cthuloop.js → .../compartment-mapper/test/cthuloop.test.js b/.../compartment-mapper/test/test-cthuloop.js → .../compartment-mapper/test/cthuloop.test.js
diff --git a/...compartment-mapper/test/test-cycle-cjs.js → ...compartment-mapper/test/cycle-cjs.test.js b/...compartment-mapper/test/test-cycle-cjs.js → ...compartment-mapper/test/cycle-cjs.test.js
diff --git a/...compartment-mapper/test/test-cycle-mjs.js → ...compartment-mapper/test/cycle-mjs.test.js b/...compartment-mapper/test/test-cycle-mjs.js → ...compartment-mapper/test/cycle-mjs.test.js
diff --git a/...rtment-mapper/test/test-error-handling.js → ...rtment-mapper/test/error-handling.test.js b/...rtment-mapper/test/test-error-handling.js → ...rtment-mapper/test/error-handling.test.js
diff --git a/...compartment-mapper/test/test-exit-hook.js → ...compartment-mapper/test/exit-hook.test.js b/...compartment-mapper/test/test-exit-hook.js → ...compartment-mapper/test/exit-hook.test.js
diff --git a/...compartment-mapper/test/test-extension.js → ...compartment-mapper/test/extension.test.js b/...compartment-mapper/test/test-extension.js → ...compartment-mapper/test/extension.test.js
diff --git a/...artment-mapper/test/test-infer-exports.js → ...artment-mapper/test/infer-exports.test.js b/...artment-mapper/test/test-infer-exports.js → ...artment-mapper/test/infer-exports.test.js
diff --git a/...compartment-mapper/test/test-integrity.js → ...compartment-mapper/test/integrity.test.js b/...compartment-mapper/test/test-integrity.js → ...compartment-mapper/test/integrity.test.js
diff --git a/...ages/compartment-mapper/test/test-join.js → ...ages/compartment-mapper/test/join.test.js b/...ages/compartment-mapper/test/test-join.js → ...ages/compartment-mapper/test/join.test.js
diff --git a/...ages/compartment-mapper/test/test-main.js → ...ages/compartment-mapper/test/main.test.js b/...ages/compartment-mapper/test/test-main.js → ...ages/compartment-mapper/test/main.test.js
diff --git a/...artment-mapper/test/test-missing-entry.js → ...artment-mapper/test/missing-entry.test.js b/...artment-mapper/test/test-missing-entry.js → ...artment-mapper/test/missing-entry.test.js
diff --git a/...ompartment-mapper/test/test-nested-pkg.js → ...ompartment-mapper/test/nested-pkg.test.js b/...ompartment-mapper/test/test-nested-pkg.js → ...ompartment-mapper/test/nested-pkg.test.js
diff --git a/.../compartment-mapper/test/test-optional.js → .../compartment-mapper/test/optional.test.js b/.../compartment-mapper/test/test-optional.js → .../compartment-mapper/test/optional.test.js
diff --git a/...ges/compartment-mapper/test/test-order.js → ...ges/compartment-mapper/test/order.test.js b/...ges/compartment-mapper/test/test-order.js → ...ges/compartment-mapper/test/order.test.js
diff --git a/...artment-mapper/test/test-policy-format.js → ...artment-mapper/test/policy-format.test.js b/...artment-mapper/test/test-policy-format.js → ...artment-mapper/test/policy-format.test.js
diff --git a/...es/compartment-mapper/test/test-policy.js → ...es/compartment-mapper/test/policy.test.js b/...es/compartment-mapper/test/test-policy.js → ...es/compartment-mapper/test/policy.test.js
diff --git a/.../compartment-mapper/test/test-relative.js → .../compartment-mapper/test/relative.test.js b/.../compartment-mapper/test/test-relative.js → .../compartment-mapper/test/relative.test.js
diff --git a/...ompartment-mapper/test/test-relativize.js → ...ompartment-mapper/test/relativize.test.js b/...ompartment-mapper/test/test-relativize.js → ...ompartment-mapper/test/relativize.test.js
diff --git a/...s/compartment-mapper/test/test-resolve.js → ...s/compartment-mapper/test/resolve.test.js b/...s/compartment-mapper/test/test-resolve.js → ...s/compartment-mapper/test/resolve.test.js
diff --git a/.../compartment-mapper/test/test-retained.js → .../compartment-mapper/test/retained.test.js b/.../compartment-mapper/test/test-retained.js → .../compartment-mapper/test/retained.test.js
diff --git a/.../test/snapshots/test-error-handling.js.md → .../test/snapshots/error-handling.test.js.md b/.../test/snapshots/test-error-handling.js.md → .../test/snapshots/error-handling.test.js.md
@@ -1,6 +1,6 @@
-# Snapshot report for `test/test-error-handling.js`
+# Snapshot report for `test/error-handling.test.js`
 
-The actual snapshot is saved in `test-error-handling.js.snap`.
+The actual snapshot is saved in `error-handling.test.js.snap`.
 
 Generated by [AVA](https://avajs.dev).
 

diff --git a/...est/snapshots/test-error-handling.js.snap → ...est/snapshots/error-handling.test.js.snap b/...est/snapshots/test-error-handling.js.snap → ...est/snapshots/error-handling.test.js.snap
diff --git a/...r/test/snapshots/test-infer-exports.js.md → ...r/test/snapshots/infer-exports.test.js.md b/...r/test/snapshots/test-infer-exports.js.md → ...r/test/snapshots/infer-exports.test.js.md
@@ -1,6 +1,6 @@
-# Snapshot report for `test/test-infer-exports.js`
+# Snapshot report for `test/infer-exports.test.js`
 
-The actual snapshot is saved in `test-infer-exports.js.snap`.
+The actual snapshot is saved in `infer-exports.test.js.snap`.
 
 Generated by [AVA](https://avajs.dev).
 

diff --git a/...test/snapshots/test-infer-exports.js.snap → ...test/snapshots/infer-exports.test.js.snap b/...test/snapshots/test-infer-exports.js.snap → ...test/snapshots/infer-exports.test.js.snap
diff --git a/...r/test/snapshots/test-policy-format.js.md → ...r/test/snapshots/policy-format.test.js.md b/...r/test/snapshots/test-policy-format.js.md → ...r/test/snapshots/policy-format.test.js.md
@@ -1,6 +1,6 @@
-# Snapshot report for `test/test-policy-format.js`
+# Snapshot report for `test/policy-format.test.js`
 
-The actual snapshot is saved in `test-policy-format.js.snap`.
+The actual snapshot is saved in `policy-format.test.js.snap`.
 
 Generated by [AVA](https://avajs.dev).
 

diff --git a/...test/snapshots/test-policy-format.js.snap → ...test/snapshots/policy-format.test.js.snap b/...test/snapshots/test-policy-format.js.snap → ...test/snapshots/policy-format.test.js.snap
diff --git a/...t-mapper/test/snapshots/test-policy.js.md → ...t-mapper/test/snapshots/policy.test.js.md b/...t-mapper/test/snapshots/test-policy.js.md → ...t-mapper/test/snapshots/policy.test.js.md
@@ -1,6 +1,6 @@
-# Snapshot report for `test/test-policy.js`
+# Snapshot report for `test/policy.test.js`
 
-The actual snapshot is saved in `test-policy.js.snap`.
+The actual snapshot is saved in `policy.test.js.snap`.
 
 Generated by [AVA](https://avajs.dev).
 

diff --git a/...mapper/test/snapshots/test-policy.js.snap → ...mapper/test/snapshots/policy.test.js.snap b/...mapper/test/snapshots/test-policy.js.snap → ...mapper/test/snapshots/policy.test.js.snap
diff --git a/...nt-mapper/test/test-source-url-rewrite.js → ...nt-mapper/test/source-url-rewrite.test.js b/...nt-mapper/test/test-source-url-rewrite.js → ...nt-mapper/test/source-url-rewrite.test.js
diff --git a/...compartment-mapper/test/test-stability.js → ...compartment-mapper/test/stability.test.js b/...compartment-mapper/test/test-stability.js → ...compartment-mapper/test/stability.test.js
diff --git a/...ges/compartment-mapper/test/test-stack.js → ...ges/compartment-mapper/test/stack.test.js b/...ges/compartment-mapper/test/test-stack.js → ...ges/compartment-mapper/test/stack.test.js
diff --git a/...mapper/test/test-strictly-inconsistent.js → ...mapper/test/strictly-inconsistent.test.js b/...mapper/test/test-strictly-inconsistent.js → ...mapper/test/strictly-inconsistent.test.js
diff --git a/...s/compartment-mapper/test/test-symlink.js → ...s/compartment-mapper/test/symlink.test.js b/...s/compartment-mapper/test/test-symlink.js → ...s/compartment-mapper/test/symlink.test.js
diff --git a/...compartment-mapper/test/test-transform.js → ...compartment-mapper/test/transform.test.js b/...compartment-mapper/test/test-transform.js → ...compartment-mapper/test/transform.test.js
diff --git a/packages/daemon/package.json b/packages/daemon/package.json
@@ -95,7 +95,8 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/test-*.*",
+      "test/**/*.test.*"
     ],
     "timeout": "2m"
   },

diff --git a/packages/daemon/src/directory.js b/packages/daemon/src/directory.js
@@ -174,22 +174,25 @@ export const makeDirectoryMaker = ({
       const { hub: fromHub, name: fromName } =
         await lookupTailNameHub(fromPath);
       const { hub: toHub, name: toName } = await lookupTailNameHub(toPath);
+
       if (fromHub === toHub) {
         // eslint-disable-next-line no-use-before-define
         if (fromHub === directory) {
           await petStore.rename(fromName, toName);
         } else {
-          await fromHub.move([fromName], [toName]);
+          await E(fromHub).move([fromName], [toName]);
         }
         return;
       }
-      const id = await fromHub.identify(fromName);
+
+      const id = await E(fromHub).identify(fromName);
       if (id === undefined) {
         throw new Error(`Unknown name: ${q(fromPath)}`);
       }
-      const removeP = fromHub.remove(fromName);
-      const addP = toHub.write([toName], id);
-      await Promise.all([addP, removeP]);
+      // First write to the "to" hub so that the original name is preserved on the
+      // "from" hub in case of failure.
+      await E(toHub).write([toName], id);
+      await E(fromHub).remove(fromName);
     };
 
     /** @type {EndoDirectory['copy']} */

diff --git a/packages/daemon/src/pet-store.js b/packages/daemon/src/pet-store.js
@@ -195,6 +195,7 @@ export const makePetStoreMaker = (filePowers, config) => {
       }
       assertValidId(formulaIdentifier, fromName);
 
+      // Updated persisted name mapping
       const fromPath = filePowers.joinPath(petNameDirectoryPath, fromName);
       const toPath = filePowers.joinPath(petNameDirectoryPath, toName);
       await filePowers.renamePath(fromPath, toPath);
@@ -206,6 +207,7 @@ export const makePetStoreMaker = (filePowers, config) => {
       }
 
       // Update the mapping for the pet name.
+      idsToPetNames.delete(formulaIdentifier, fromName);
       idsToPetNames.add(formulaIdentifier, toName);
 
       publishNameRemoval(formulaIdentifier, fromName);

diff --git a/packages/daemon/test/test-deferred-tasks.js → packages/daemon/test/deferred-tasks.test.js b/packages/daemon/test/test-deferred-tasks.js → packages/daemon/test/deferred-tasks.test.js