agoric 0.21.2-dev-c39febd.0.c39febd → 0.21.2-dev-ef8eb1c.0.ef8eb1c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agoric",
-  "version": "0.21.2-dev-c39febd.0.c39febd",
+  "version": "0.21.2-dev-ef8eb1c.0.ef8eb1c",
   "description": "Manage the Agoric Javascript smart contract platform",
   "type": "module",
   "main": "src/main.js",
@@ -30,27 +30,27 @@
     "lint:eslint": "node ../../scripts/eslint-repo.mjs ."
   },
   "devDependencies": {
-    "@agoric/cosmic-swingset": "0.41.4-dev-c39febd.0.c39febd",
-    "@agoric/deploy-script-support": "0.10.4-dev-c39febd.0.c39febd",
+    "@agoric/cosmic-swingset": "0.41.4-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/deploy-script-support": "0.10.4-dev-ef8eb1c.0.ef8eb1c",
     "ava": "^8.0.1",
     "c8": "^10.1.2"
   },
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-c39febd.0.c39febd",
-    "@agoric/cache": "0.3.3-dev-c39febd.0.c39febd",
-    "@agoric/casting": "0.4.3-dev-c39febd.0.c39febd",
-    "@agoric/client-utils": "0.1.1-dev-c39febd.0.c39febd",
-    "@agoric/cosmic-proto": "0.4.1-dev-c39febd.0.c39febd",
-    "@agoric/ertp": "0.16.3-dev-c39febd.0.c39febd",
-    "@agoric/governance": "0.10.4-dev-c39febd.0.c39febd",
-    "@agoric/internal": "0.3.3-dev-c39febd.0.c39febd",
-    "@agoric/network": "0.1.1-dev-c39febd.0.c39febd",
-    "@agoric/smart-wallet": "0.5.4-dev-c39febd.0.c39febd",
-    "@agoric/store": "0.9.3-dev-c39febd.0.c39febd",
-    "@agoric/swingset-vat": "0.32.3-dev-c39febd.0.c39febd",
-    "@agoric/vats": "0.15.2-dev-c39febd.0.c39febd",
-    "@agoric/zoe": "0.26.3-dev-c39febd.0.c39febd",
-    "@agoric/zone": "0.2.3-dev-c39febd.0.c39febd",
+    "@agoric/access-token": "0.4.22-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/cache": "0.3.3-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/casting": "0.4.3-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/client-utils": "0.1.1-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/cosmic-proto": "0.4.1-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/ertp": "0.16.3-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/governance": "0.10.4-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/internal": "0.3.3-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/network": "0.1.1-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/smart-wallet": "0.5.4-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/store": "0.9.3-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/swingset-vat": "0.32.3-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/vats": "0.15.2-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/zoe": "0.26.3-dev-ef8eb1c.0.ef8eb1c",
+    "@agoric/zone": "0.2.3-dev-ef8eb1c.0.ef8eb1c",
     "@cosmjs/crypto": "^0.36.0",
     "@cosmjs/encoding": "^0.36.0",
     "@cosmjs/math": "^0.36.0",
@@ -70,7 +70,6 @@
     "@endo/promise-kit": "^1.2.1",
     "@endo/zip": "^1.1.0",
     "@iarna/toml": "^2.2.3",
-    "chalk": "^5.2.0",
     "commander": "^12.1.0",
     "deterministic-json": "^1.0.5",
     "inquirer": "^8.2.2",
@@ -101,5 +100,5 @@
   "engines": {
     "node": "^22.11"
   },
-  "gitHead": "c39febd2e730d4b3e5b8885b9fc74d8bdd3e4334"
+  "gitHead": "ef8eb1c17454c5d3166f72e16f57fdb2b7614637"
 }

package/src/anylogger-agoric.js

@@ -21,7 +21,7 @@ import {
   getEnvironmentOptionsList,
 } from '@endo/env-options';
 import anylogger from '@agoric/internal/vendor/anylogger.js';
-import chalk from 'chalk';
+import { styleText } from 'node:util';
 
 const DEBUG_LIST = getEnvironmentOptionsList('DEBUG');
 
@@ -61,7 +61,7 @@ anylogger.ext = (l, ...rest) => {
           console[level].bind(console)) ||
         fallbackSink;
       logger[level] = (...args) =>
-        doLog(chalk.bold.blue(`${prefix}:`), ...args);
+        doLog(styleText(['bold', 'blue'], `${prefix}:`), ...args);
     } else {
       // Disable printing.
       logger[level] = () => {};

package/src/cosmos.js

@@ -1,4 +1,3 @@
-import chalk from 'chalk';
 import path from 'node:path';
 import { makePspawn, getSDKBinaries } from './helpers.js';
 
@@ -20,7 +19,7 @@ export default async function cosmosMain(_progname, rawArgs, powers, opts) {
     pspawnEnv.DEBUG = 'agoric:none';
   }
 
-  const pspawn = makePspawn({ env: pspawnEnv, log, spawn, chalk });
+  const pspawn = makePspawn({ env: pspawnEnv, log, spawn });
 
   function helper(args, hopts = undefined) {
     if (!opts.dockerTag) {

package/src/helpers.js

@@ -1,5 +1,7 @@
 // @ts-check
 
+import { styleText } from 'node:util';
+
 /** @import { ChildProcess } from 'child_process' */
 
 // Backwards compatibility
@@ -27,14 +29,12 @@ export const getSDKBinaries = ({
  *
  * @param {object} param0
  * @param {Record<string, string | undefined>} [param0.env] the default environment
- * @param {*} [param0.chalk] a colorizer
  * @param {Console} [param0.log] a console object
  * @param {(cmd: string, cargs: Array<string>, opts: any) => ChildProcess}param0.spawn the spawn function
  */
 export const makePspawn = ({
   env: defaultEnv = process.env,
   log = console,
-  chalk,
   spawn,
 }) =>
   /**
@@ -57,14 +57,7 @@ export const makePspawn = ({
     cargs,
     { stdio = 'inherit', env = defaultEnv, ...rest } = {},
   ) {
-    const color = (method, ...args) => {
-      if (chalk && chalk[method]) {
-        return chalk[method](...args);
-      }
-      return args.join(' ');
-    };
-
-    log.warn(color('blueBright', cmd, ...cargs));
+    log.warn(styleText('blueBright', [cmd, ...cargs].join(' ')));
     const cp = spawn(cmd, cargs, { stdio, env, ...rest });
     const pr = new Promise((resolve, _reject) => {
       cp.on('exit', resolve);
@@ -84,7 +77,7 @@ export const makePspawn = ({
             reason = e;
           }
         }
-        log.error(color('yellow', `cannot execute ${cmd}:`), reason);
+        log.error(styleText('yellow', `cannot execute ${cmd}:`), reason);
         resolve(-1);
       });
     });

package/src/init.js

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import { styleText } from 'node:util';
 import { makePspawn } from './helpers.js';
 
 // Use either an absolute template URL, or find it relative to DAPP_URL_BASE.
@@ -27,7 +27,7 @@ export default async function initMain(_progname, rawArgs, priv, opts) {
   // Run the Git commands.
   log.info(`initializing ${DIR} from ${dappURL}`);
 
-  const pspawn = makePspawn({ log, chalk, spawn });
+  const pspawn = makePspawn({ log, spawn });
 
   let dappBranch = [];
   if (opts.dappBranch) {
@@ -80,6 +80,6 @@ export default async function initMain(_progname, rawArgs, priv, opts) {
     },
   );
 
-  log.info(chalk.bold.yellow(`Done initializing ${DIR}`));
+  log.info(styleText(['bold', 'yellow'], `Done initializing ${DIR}`));
   return 0;
 }

package/src/install.js

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import chalk from 'chalk';
+import { styleText } from 'node:util';
 import { execFileSync } from 'node:child_process';
 import { makePspawn } from './helpers.js';
 import DEFAULT_SDK_PACKAGE_NAMES from './sdk-package-names.js';
@@ -26,7 +26,7 @@ export default async function installMain(_progname, rawArgs, powers, opts) {
     process.env.CXXFLAGS = '-std=c++14';
   }
 
-  const pspawn = makePspawn({ log, spawn, chalk });
+  const pspawn = makePspawn({ log, spawn });
 
   const rimraf = file => pspawn('rm', ['-rf', file]);
 
@@ -240,7 +240,7 @@ export default async function installMain(_progname, rawArgs, powers, opts) {
 
     const removeNodeModulesSymlinks = async subdir => {
       const nm = `${subdir}/node_modules`;
-      log(chalk.bold.green(`removing ${nm} link`));
+      log(styleText(['bold', 'green'], `removing ${nm} link`));
       await fs.unlink(nm).catch(_ => {});
 
       // Remove all the package links.
@@ -267,7 +267,7 @@ export default async function installMain(_progname, rawArgs, powers, opts) {
   await yarnInstallEachWorktree('updates');
 
   if (sdkWorktree || !opts.sdk) {
-    log.info(chalk.bold.green('Done installing without SDK links'));
+    log.info(styleText(['bold', 'green'], 'Done installing without SDK links'));
     return 0;
   }
 
@@ -313,6 +313,6 @@ export default async function installMain(_progname, rawArgs, powers, opts) {
     }
   }
 
-  log.info(chalk.bold.green('Done installing with SDK links'));
+  log.info(styleText(['bold', 'green'], 'Done installing with SDK links'));
   return 0;
 }

package/src/start.js

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import { styleText } from 'node:util';
 import { createHash } from 'node:crypto';
 import path from 'node:path';
 import { createRequire } from 'node:module';
@@ -75,7 +75,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     pspawnEnv.DEBUG = 'agoric:info,SwingSet:vat,SwingSet:ls';
   }
 
-  const pspawn = makePspawn({ env: pspawnEnv, spawn, log, chalk });
+  const pspawn = makePspawn({ env: pspawnEnv, spawn, log });
 
   // Turn on some debugging options.
   const nodeDebugEnv = { ...pspawnEnv };
@@ -161,7 +161,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
   };
 
   const rmVerbose = async filePath => {
-    log(chalk.green(`removing ${filePath}`));
+    log(styleText('green', `removing ${filePath}`));
     // rm is available on all the unix-likes, so use it for speed.
     await pspawn('rm', ['-rf', filePath]);
   };
@@ -205,7 +205,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     const fakeGCI = 'sim-chain';
     const serverExists = await exists(serverDir);
     if (!serverExists) {
-      log(chalk.yellow(`initializing ${profileName}`));
+      log(styleText('yellow', `initializing ${profileName}`));
       await pspawn(
         agSolo,
         ['init', profileName, '--egresses=fake', `--webport=${HOST_PORT}`],
@@ -216,7 +216,9 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     }
 
     if (fakeDelay >= 0) {
-      log(chalk.yellow(`setting sim chain with ${fakeDelay} second delay`));
+      log(
+        styleText('yellow', `setting sim chain with ${fakeDelay} second delay`),
+      );
       await pspawn(
         agSolo,
         ['set-fake-chain', `--delay=${fakeDelay}`, fakeGCI],