refactor(swingset-runner): Convert RESM to NESM

Refs #527
Agoric · Aug 12, 2021 · 7d2a9bf · 7d2a9bf
1 parent c74b42d
commit 7d2a9bf
Show file tree

Hide file tree

Showing 37 changed files with 155 additions and 141 deletions.
diff --git a/packages/swingset-runner/autobench b/packages/swingset-runner/autobench
@@ -8,7 +8,7 @@ for (const suite of SUITES) {
   console.log(`Autobenching suite=${suite} ...`);
   const prep = `demo/${suite}/prepareContracts.js`;
   if (existsSync(prep)) {
-    spawnNodeSync(['-r', 'esm', prep]);
+    spawnNodeSync([prep]);
   }
   const benchstats = `benchstats-${suite}.json`;
   try {
@@ -35,11 +35,11 @@ for (const suite of SUITES) {
     }
   }
   spawnNodeSync([
-    '-r', 'esm', 'bin/runner', '--init',
+    'bin/runner', '--init',
     '--benchmark', brounds, '--statsfile', benchstats, ...configFlags,
     'run', `demo/${suite}`, '--quiet', '--prime',
   ]);
-  spawnNodeSync(['-r', 'esm', 'src/push-metrics.js', suite, benchstats]);
+  spawnNodeSync(['src/push-metrics.js', suite, benchstats]);
 }
 
 console.log(`Done!`);
diff --git a/packages/swingset-runner/bin/kerneldump b/packages/swingset-runner/bin/kerneldump
diff --git a/packages/swingset-runner/bin/kerneldump b/packages/swingset-runner/bin/kerneldump
@@ -0,0 +1 @@
+../src/kerneldump-entrypoint.js
diff --git a/packages/swingset-runner/bin/runner b/packages/swingset-runner/bin/runner
diff --git a/packages/swingset-runner/bin/runner b/packages/swingset-runner/bin/runner
@@ -0,0 +1 @@
+../src/runner-entrypoint.js
diff --git a/packages/swingset-runner/bin/runner-debug b/packages/swingset-runner/bin/runner-debug
diff --git a/packages/swingset-runner/bin/runner-debug b/packages/swingset-runner/bin/runner-debug
@@ -0,0 +1 @@
+../src/runner-debug-entrypoint.js
diff --git a/packages/swingset-runner/bin/slogulator b/packages/swingset-runner/bin/slogulator
diff --git a/packages/swingset-runner/bin/slogulator b/packages/swingset-runner/bin/slogulator
@@ -0,0 +1 @@
+../src/slogulator-entrypoint.js
diff --git a/packages/swingset-runner/demo/encouragementBotComms/vat-comms.js b/packages/swingset-runner/demo/encouragementBotComms/vat-comms.js
@@ -1,4 +1,4 @@
-import buildCommsDispatch from '@agoric/swingset-vat/src/vats/comms';
+import buildCommsDispatch from '@agoric/swingset-vat/src/vats/comms/index.js';
 
 export default function setup(syscall, _state, _helpers, _vatPowers) {
   return buildCommsDispatch(syscall);

diff --git a/packages/swingset-runner/demo/encouragementBotComms/vat-vattp.js b/packages/swingset-runner/demo/encouragementBotComms/vat-vattp.js
@@ -1 +1 @@
-export { buildRootObject } from '@agoric/swingset-vat/src/vats/vat-tp';
+export { buildRootObject } from '@agoric/swingset-vat/src/vats/vat-tp.js';
diff --git a/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js b/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js
@@ -3,7 +3,7 @@ import { E } from '@agoric/eventual-send';
 import { Far } from '@agoric/marshal';
 
 /* eslint-disable-next-line import/no-unresolved, import/extensions */
-import exchangeBundle from './bundle-simpleExchange';
+import exchangeBundle from './bundle-simpleExchange.js';
 
 export function buildRootObject(_vatPowers, vatParameters) {
   let alice;

diff --git a/packages/swingset-runner/demo/exchangeBenchmark/exchanger.js b/packages/swingset-runner/demo/exchangeBenchmark/exchanger.js
@@ -2,10 +2,10 @@
 
 import { E } from '@agoric/eventual-send';
 import { Far } from '@agoric/marshal';
-import { showPurseBalance, setupPurses } from './helpers';
-import { makePrintLog } from './printLog';
+import { showPurseBalance, setupPurses } from './helpers.js';
+import { makePrintLog } from './printLog.js';
 
-import '@agoric/zoe/exported';
+import '@agoric/zoe/exported.js';
 
 const log = makePrintLog();
 

diff --git a/packages/swingset-runner/demo/exchangeBenchmark/helpers.js b/packages/swingset-runner/demo/exchangeBenchmark/helpers.js
@@ -1,7 +1,7 @@
 import { E } from '@agoric/eventual-send';
 import { AmountMath } from '@agoric/ertp';
 
-import '@agoric/zoe/exported';
+import '@agoric/zoe/exported.js';
 
 export async function showPurseBalance(purseP, name, log) {
   try {

diff --git a/packages/swingset-runner/demo/exchangeBenchmark/prepareContracts.js b/packages/swingset-runner/demo/exchangeBenchmark/prepareContracts.js
@@ -1,23 +1,26 @@
-/* global require __dirname */
 // TODO Remove babel-standalone preinitialization
 // https://github.com/endojs/endo/issues/768
 import '@agoric/babel-standalone';
 import '@agoric/install-ses';
 import bundleSource from '@agoric/bundle-source';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
 
 import fs from 'fs';
 
 const CONTRACT_FILES = ['simpleExchange'];
 
 const generateBundlesP = Promise.all(
   CONTRACT_FILES.map(async contract => {
-    const contractPath = require.resolve(
-      `@agoric/zoe/src/contracts/${contract}`,
-    );
+    const contractPath = new URL(
+      await importMetaResolve(
+        `@agoric/zoe/src/contracts/${contract}`,
+        import.meta.url,
+      ),
+    ).pathname;
     const bundle = await bundleSource(contractPath);
     const obj = { bundle, contract };
     fs.writeFileSync(
-      `${__dirname}/bundle-${contract}.js`,
+      new URL(`bundle-${contract}.js`, import.meta.url).pathname,
       `export default ${JSON.stringify(obj)};`,
     );
   }),

diff --git a/packages/swingset-runner/demo/swapBenchmark/bootstrap.js b/packages/swingset-runner/demo/swapBenchmark/bootstrap.js
@@ -1,10 +1,10 @@
 import { makeIssuerKit, AmountMath } from '@agoric/ertp';
 import { E } from '@agoric/eventual-send';
 import { Far } from '@agoric/marshal';
-import { makePrintLog } from './printLog';
+import { makePrintLog } from './printLog.js';
 
 /* eslint-disable-next-line import/no-unresolved, import/extensions */
-import atomicSwapBundle from './bundle-atomicSwap';
+import atomicSwapBundle from './bundle-atomicSwap.js';
 
 const log = makePrintLog();
 

diff --git a/packages/swingset-runner/demo/swapBenchmark/exchanger.js b/packages/swingset-runner/demo/swapBenchmark/exchanger.js
@@ -2,10 +2,10 @@
 
 import { E } from '@agoric/eventual-send';
 import { Far } from '@agoric/marshal';
-import { showPurseBalance, setupPurses } from './helpers';
-import { makePrintLog } from './printLog';
+import { showPurseBalance, setupPurses } from './helpers.js';
+import { makePrintLog } from './printLog.js';
 
-import '@agoric/zoe/exported';
+import '@agoric/zoe/exported.js';
 
 const log = makePrintLog();
 

diff --git a/packages/swingset-runner/demo/swapBenchmark/helpers.js b/packages/swingset-runner/demo/swapBenchmark/helpers.js
@@ -1,7 +1,7 @@
 import { E } from '@agoric/eventual-send';
 import { AmountMath } from '@agoric/ertp';
 
-import '@agoric/zoe/exported';
+import '@agoric/zoe/exported.js';
 
 export async function showPurseBalance(purseP, name, log) {
   try {

diff --git a/packages/swingset-runner/demo/swapBenchmark/prepareContracts.js b/packages/swingset-runner/demo/swapBenchmark/prepareContracts.js
@@ -1,23 +1,26 @@
-/* global require __dirname */
 // TODO Remove babel-standalone preinitialization
 // https://github.com/endojs/endo/issues/768
 import '@agoric/babel-standalone';
 import '@agoric/install-ses';
 import bundleSource from '@agoric/bundle-source';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
 
 import fs from 'fs';
 
 const CONTRACT_FILES = ['atomicSwap'];
 
 const generateBundlesP = Promise.all(
   CONTRACT_FILES.map(async contract => {
-    const contractPath = require.resolve(
-      `@agoric/zoe/src/contracts/${contract}`,
-    );
+    const contractPath = new URL(
+      await importMetaResolve(
+        `@agoric/zoe/src/contracts/${contract}`,
+        import.meta.url,
+      ),
+    ).pathname;
     const bundle = await bundleSource(contractPath);
     const obj = { bundle, contract };
     fs.writeFileSync(
-      `${__dirname}/bundle-${contract}.js`,
+      new URL(`bundle-${contract}.js`, import.meta.url).pathname,
       `export default ${JSON.stringify(obj)};`,
     );
   }),

diff --git a/packages/swingset-runner/demo/vatStore2/bootstrap.js b/packages/swingset-runner/demo/vatStore2/bootstrap.js
@@ -1,7 +1,7 @@
 import { E } from '@agoric/eventual-send';
 import { Far } from '@agoric/marshal';
 import { assert, details as X } from '@agoric/assert';
-import { makeXorShift128 } from './xorshift128';
+import { makeXorShift128 } from './xorshift128.js';
 
 const p = console.log;
 

diff --git a/packages/swingset-runner/demo/zoeTests/bootstrap.js b/packages/swingset-runner/demo/zoeTests/bootstrap.js
@@ -1,20 +1,20 @@
 import { E } from '@agoric/eventual-send';
 import { Far } from '@agoric/marshal';
 import { makeIssuerKit, AmountMath } from '@agoric/ertp';
-import buildManualTimer from './manualTimer';
+import buildManualTimer from './manualTimer.js';
 
-import { makePrintLog } from './printLog';
+import { makePrintLog } from './printLog.js';
 
 /* eslint-disable import/no-unresolved, import/extensions */
-import automaticRefundBundle from './bundle-automaticRefund';
-import coveredCallBundle from './bundle-coveredCall';
-import secondPriceAuctionBundle from './bundle-secondPriceAuction';
-import atomicSwapBundle from './bundle-atomicSwap';
-import simpleExchangeBundle from './bundle-simpleExchange';
-import autoswapBundle from './bundle-autoswap';
-import sellItemsBundle from './bundle-sellItems';
-import mintAndSellNFTBundle from './bundle-mintAndSellNFT';
-import otcDeskBundle from './bundle-otcDesk';
+import automaticRefundBundle from './bundle-automaticRefund.js';
+import coveredCallBundle from './bundle-coveredCall.js';
+import secondPriceAuctionBundle from './bundle-secondPriceAuction.js';
+import atomicSwapBundle from './bundle-atomicSwap.js';
+import simpleExchangeBundle from './bundle-simpleExchange.js';
+import autoswapBundle from './bundle-autoswap.js';
+import sellItemsBundle from './bundle-sellItems.js';
+import mintAndSellNFTBundle from './bundle-mintAndSellNFT.js';
+import otcDeskBundle from './bundle-otcDesk.js';
 /* eslint-enable import/no-unresolved, import/extensions */
 
 const setupBasicMints = () => {

diff --git a/packages/swingset-runner/demo/zoeTests/prepareContracts.js b/packages/swingset-runner/demo/zoeTests/prepareContracts.js
@@ -1,9 +1,9 @@
-/* global require __dirname */
 // TODO Remove babel-standalone preinitialization
 // https://github.com/endojs/endo/issues/768
 import '@agoric/babel-standalone';
 import '@agoric/install-ses';
 import bundleSource from '@agoric/bundle-source';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
 
 import fs from 'fs';
 
@@ -32,11 +32,16 @@ const generateBundlesP = Promise.all(
     } else {
       ({ bundleName, contractPath } = settings);
     }
-    const source = require.resolve(`@agoric/zoe/src/contracts/${contractPath}`);
+    const source = new URL(
+      await importMetaResolve(
+        `@agoric/zoe/src/contracts/${contractPath}`,
+        import.meta.url,
+      ),
+    ).pathname;
     const bundle = await bundleSource(source);
     const obj = { bundle, bundleName };
     fs.writeFileSync(
-      `${__dirname}/bundle-${bundleName}.js`,
+      new URL(`bundle-${bundleName}.js`, import.meta.url).pathname,
       `export default ${JSON.stringify(obj)};`,
     );
   }),

diff --git a/packages/swingset-runner/demo/zoeTests/vat-alice.js b/packages/swingset-runner/demo/zoeTests/vat-alice.js
@@ -2,9 +2,9 @@ import { E } from '@agoric/eventual-send';
 import { AmountMath } from '@agoric/ertp';
 import { assert, details as X } from '@agoric/assert';
 import { Far } from '@agoric/marshal';
-import { showPurseBalance, setupIssuers } from './helpers';
+import { showPurseBalance, setupIssuers } from './helpers.js';
 
-import { makePrintLog } from './printLog';
+import { makePrintLog } from './printLog.js';
 
 const build = async (log, zoe, issuers, payments, installations, timer) => {
   const { moola, simoleans, bucks, purses } = await setupIssuers(zoe, issuers);

diff --git a/packages/swingset-runner/demo/zoeTests/vat-bob.js b/packages/swingset-runner/demo/zoeTests/vat-bob.js
@@ -3,9 +3,9 @@ import { assert, details as X } from '@agoric/assert';
 import { sameStructure } from '@agoric/same-structure';
 import { AmountMath } from '@agoric/ertp';
 import { Far } from '@agoric/marshal';
-import { showPurseBalance, setupIssuers } from './helpers';
+import { showPurseBalance, setupIssuers } from './helpers.js';
 
-import { makePrintLog } from './printLog';
+import { makePrintLog } from './printLog.js';
 
 const build = async (log, zoe, issuers, payments, installations, timer) => {
   const { moola, simoleans, bucks, purses } = await setupIssuers(zoe, issuers);

diff --git a/packages/swingset-runner/demo/zoeTests/vat-carol.js b/packages/swingset-runner/demo/zoeTests/vat-carol.js
@@ -2,9 +2,9 @@ import { E } from '@agoric/eventual-send';
 import { assert, details as X } from '@agoric/assert';
 import { sameStructure } from '@agoric/same-structure';
 import { Far } from '@agoric/marshal';
-import { showPurseBalance, setupIssuers } from './helpers';
+import { showPurseBalance, setupIssuers } from './helpers.js';
 
-import { makePrintLog } from './printLog';
+import { makePrintLog } from './printLog.js';
 
 const build = async (log, zoe, issuers, payments, installations) => {
   const { moola, simoleans, purses } = await setupIssuers(zoe, issuers);

diff --git a/packages/swingset-runner/demo/zoeTests/vat-dave.js b/packages/swingset-runner/demo/zoeTests/vat-dave.js
@@ -3,9 +3,9 @@ import { assert, details as X } from '@agoric/assert';
 import { sameStructure } from '@agoric/same-structure';
 import { AmountMath } from '@agoric/ertp';
 import { Far } from '@agoric/marshal';
-import { showPurseBalance, setupIssuers } from './helpers';
+import { showPurseBalance, setupIssuers } from './helpers.js';
 
-import { makePrintLog } from './printLog';
+import { makePrintLog } from './printLog.js';
 
 const build = async (log, zoe, issuers, payments, installations, timer) => {
   const { moola, simoleans, bucks, purses } = await setupIssuers(zoe, issuers);

diff --git a/packages/swingset-runner/package.json b/packages/swingset-runner/package.json
@@ -3,10 +3,8 @@
   "version": "0.13.11",
   "private": true,
   "description": "Application to launch SwingSet instances for development and testing",
-  "parsers": {
-    "js": "mjs"
-  },
-  "main": "src/main.js",
+  "type": "module",
+  "main": "./src/main.js",
   "repository": "https://github.com/Agoric/agoric-sdk",
   "author": "Agoric",
   "license": "Apache-2.0",
@@ -41,7 +39,7 @@
   },
   "devDependencies": {
     "ava": "^3.12.1",
-    "esm": "agoric-labs/esm#Agoric-built"
+    "import-meta-resolve": "^1.1.1"
   },
   "eslintConfig": {
     "extends": [
@@ -62,9 +60,6 @@
     "files": [
       "test/**/test-*.js"
     ],
-    "require": [
-      "esm"
-    ],
     "timeout": "2m"
   }
 }
diff --git a/packages/swingset-runner/src/auditstore.js b/packages/swingset-runner/src/auditstore.js
@@ -1,6 +1,6 @@
 import { assert, details as X } from '@agoric/assert';
-import { parseReachableAndVatSlot } from '@agoric/swingset-vat/src/kernel/state/reachable';
-import { parseVatSlot } from '@agoric/swingset-vat/src/parseVatSlots';
+import { parseReachableAndVatSlot } from '@agoric/swingset-vat/src/kernel/state/reachable.js';
+import { parseVatSlot } from '@agoric/swingset-vat/src/parseVatSlots.js';
 
 /* eslint-disable no-use-before-define */
 export function auditRefCounts(store, doDump, printPrefix) {