arcadible 0.1.45 → 0.1.46

package/bin/arc-build.js

@@ -104,20 +104,22 @@ const start = function (argv) {
         // the heading says what happened: built, built without deploy_dir
         // (a caveat, so yellow), or no build to run.
         if (artifact?.path) {
-          log.hs("Built.");
+          log.hs(phrase.buildSucceeded());
           print(artifact, { nl: true, toml: true });
           return;
         }
         if (artifact?.missing) {
-          log.result("Built.", [], { color: "yellow" });
-          log.nlpw(phrase.buildOutputMissing(relative(root, artifact.missing)));
+          log.result(phrase.buildSucceeded(), [], { color: "yellow" });
+          log.nlpw(
+            `⚠ ${phrase.buildOutputMissing(relative(root, artifact.missing))}`,
+          );
           return;
         }
-        log.hs("Nothing to do.");
+        log.hs(phrase.nothingToDo());
       }
     })
     .catch((ex) =>
-      abort("Build aborted.", ex, { data: { warnings }, json, sw }),
+      abort(phrase.aborted(COMMAND), ex, { data: { warnings }, json, sw }),
     );
 };
 
@@ -128,18 +130,8 @@ const main = function (argv) {
     yargs(args.normalize(hideBin(argv)))
       .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
-      .option("json", {
-        alias: "j",
-        default: conf.json,
-        describe: "Format output as JSON",
-        type: "boolean",
-      })
-      .option("quiet", {
-        alias: "q",
-        default: conf.quiet,
-        describe: "Output only errors",
-        type: "boolean",
-      })
+      .option("json", { ...args.JSON_OUTPUT, default: conf.json })
+      .option("quiet", { ...args.QUIET, default: conf.quiet })
       .option("cwd", args.CWD)
       .help("help")
       .alias("help", "h")

package/bin/arc-deploy.js

@@ -72,33 +72,13 @@ const handler = function ({ json, pb, quiet, sw, warnings }) {
   return {
     onAccountRefresh(refresh) {
       sw.start(json || quiet);
-      return refresh(true);
+      return refresh();
     },
     onDeployBegin() {
       if (!json && !quiet && pb) {
         pb.start();
       }
     },
-    onLogInfo({ code, level, message }) {
-      if (code) {
-        warnings.push(warning(code, message));
-      }
-      if (!json && !quiet) {
-        switch (level) {
-          case "warn":
-            sw.stop(true);
-            if (pb) {
-              pb.stop();
-            }
-            log.pw(`⚠ ${message}`);
-            sw.start(json || quiet);
-            if (pb) {
-              pb.start();
-            }
-          // no default
-        }
-      }
-    },
     onPredeployBegin() {
       sw.start(json || quiet);
     },
@@ -109,6 +89,20 @@ const handler = function ({ json, pb, quiet, sw, warnings }) {
         }
       }
     },
+    onWarning({ code, message }) {
+      warnings.push(warning(code, message));
+      if (!json && !quiet) {
+        sw.stop(true);
+        if (pb) {
+          pb.stop();
+        }
+        log.pw(`⚠ ${message}`);
+        sw.start(false);
+        if (pb) {
+          pb.start();
+        }
+      }
+    },
   };
 };
 
@@ -205,7 +199,7 @@ const waitAndReport = async function (
       git,
       studio,
     });
-    abort("Wait timed out.", new ArcError(cfgcode.WAIT_TIMED_OUT, reason), {
+    abort(phrase.waitTimedOut(), new ArcError(cfgcode.WAIT_TIMED_OUT, reason), {
       data,
       json,
       sw,
@@ -214,7 +208,7 @@ const waitAndReport = async function (
   }
   if (release.status === "failed") {
     const reason = phrase.releaseFailed(release, studio);
-    abort("Release failed.", new Error(reason), {
+    abort(phrase.releaseFailedHeading(), new Error(reason), {
       code: release.reason ?? cfgcode.INTERNAL,
       data,
       json,
@@ -408,7 +402,7 @@ const start = function (argv) {
       return null;
     })
     .catch((ex) =>
-      abort("Deploy aborted.", ex, { data: { warnings }, json, pb, sw }),
+      abort(phrase.aborted(COMMAND), ex, { data: { warnings }, json, pb, sw }),
     );
 };
 
@@ -427,18 +421,8 @@ const main = function (argv) {
           type: "string",
         }),
       )
-      .option("json", {
-        alias: "j",
-        default: conf.json,
-        describe: "Format output as JSON",
-        type: "boolean",
-      })
-      .option("quiet", {
-        alias: "q",
-        default: conf.quiet,
-        describe: "Output only errors",
-        type: "boolean",
-      })
+      .option("json", { ...args.JSON_OUTPUT, default: conf.json })
+      .option("quiet", { ...args.QUIET, default: conf.quiet })
       .option("wait", {
         alias: "w",
         default: conf.wait,

package/bin/arc-init.js

@@ -82,13 +82,13 @@ const start = function (argv) {
         print({ project });
       } else if (!quiet) {
         sw.stop(true);
-        log.hs("Initialized.");
+        log.hs(phrase.initialized());
         print(project, { nl: true, toml: true });
       }
       // degit sometimes hangs, so exit once stdout is written.
       process.stdout.write("", () => process.exit(0));
     })
-    .catch((ex) => abort("Init aborted.", ex, { json, sw }));
+    .catch((ex) => abort(phrase.aborted(COMMAND), ex, { json, sw }));
 };
 
 // [function]
@@ -110,7 +110,7 @@ const prompt = async function ({ yes, ...argv }) {
   if (!opts.template) {
     // without a terminal, the prompt would read end-of-input and exit.
     if (!process.stdin.isTTY) {
-      throw new ArcError(cfgcode.TEMPLATE_MISSING, phrase.noTemplate());
+      throw new ArcError(cfgcode.TEMPLATE_MISSING, phrase.templateMissing());
     }
     opts.template = await select(cfgtemplate);
   }
@@ -126,7 +126,7 @@ const inquire = function (argv) {
       if (ex?.name === "ExitPromptError") {
         process.exit(130);
       }
-      abort("Init aborted.", ex, { json: argv.json });
+      abort(phrase.aborted(COMMAND), ex, { json: argv.json });
     });
 };
 
@@ -159,18 +159,8 @@ const main = function (argv) {
         describe: "Accept prompt defaults",
         type: "boolean",
       })
-      .option("json", {
-        alias: "j",
-        default: conf.json,
-        describe: "Format output as JSON",
-        type: "boolean",
-      })
-      .option("quiet", {
-        alias: "q",
-        default: conf.quiet,
-        describe: "Output only errors",
-        type: "boolean",
-      })
+      .option("json", { ...args.JSON_OUTPUT, default: conf.json })
+      .option("quiet", { ...args.QUIET, default: conf.quiet })
       .option("cwd", args.CWD)
       .help("help")
       .alias("help", "h")

package/bin/arc-inspect.js

@@ -17,6 +17,7 @@ const cfgpackage = require("../src/config/package");
 const cfgproduct = require("../src/config/product");
 const inspect = require("../src/cli/inspect");
 const output = require("../src/util/output");
+const phrase = require("../src/phrase");
 const rc = require("../src/util/rc");
 
 // [use]
@@ -56,7 +57,7 @@ const start = function (argv) {
       }
       print(data, { key: selector, toml: true });
     })
-    .catch((ex) => abort("Inspect aborted.", ex, { json }));
+    .catch((ex) => abort(phrase.aborted(COMMAND), ex, { json }));
 };
 
 // [function]
@@ -73,12 +74,7 @@ const main = function (argv) {
           type: "string",
         }),
       )
-      .option("json", {
-        alias: "j",
-        default: conf.json,
-        describe: "Format output as JSON",
-        type: "boolean",
-      })
+      .option("json", { ...args.JSON_OUTPUT, default: conf.json })
       .option("cwd", args.CWD)
       .help("help")
       .alias("help", "h")

package/bin/arc-login.js

@@ -80,7 +80,7 @@ const handler = function ({ browser, qrcode: qr, shown, sw }) {
       sw.stop(true);
       shown.link = true;
       const link = `${url}/${secret}`;
-      log.p("Logging in...");
+      log.p(phrase.loggingIn());
       qrcode.generate(link, { small: true }, (code) => {
         if (qr) {
           log.p(code);
@@ -89,7 +89,7 @@ const handler = function ({ browser, qrcode: qr, shown, sw }) {
         log.h(dac.toUpperCase());
         // a key press can only be read from a terminal.
         if (browser && process.stdin.isTTY) {
-          log.nlp("Press Enter to open the URL.");
+          log.nlp(phrase.pressEnterToOpen());
           onLoginEnter(() => {
             launch(link);
           });
@@ -116,15 +116,15 @@ const start = function (argv) {
     .then((current) => {
       const user = current?.user;
       if (!user) {
-        throw new ArcError(cfgcode.NOT_LOGGED_IN, phrase.notLoggedIn());
+        throw new ArcError(cfgcode.LOGIN_FAILED, phrase.loginFailed());
       }
       sw.stop(true);
       process.stdin.pause();
-      log.result("Logged in.", [user.display_name], { nl: true });
+      log.result(phrase.loggedIn(), [user.display_name], { nl: true });
     })
     .catch((ex) => {
       process.stdin.pause();
-      abort("Login aborted.", ex, { nl: shown.link, sw });
+      abort(phrase.aborted(COMMAND), ex, { nl: shown.link, sw });
     });
 };
 

package/bin/arc-logout.js

@@ -14,6 +14,7 @@ const cfgproduct = require("../src/config/product");
 const log = require("../src/util/log");
 const logout = require("../src/cli/logout");
 const output = require("../src/util/output");
+const phrase = require("../src/phrase");
 const rc = require("../src/util/rc");
 
 // [use]
@@ -40,10 +41,10 @@ const start = function (argv) {
   return logout()
     .then(() => {
       if (!argv.quiet) {
-        log.hs("Logged out.");
+        log.hs(phrase.loggedOut());
       }
     })
-    .catch((ex) => abort("Logout aborted.", ex));
+    .catch((ex) => abort(phrase.aborted(COMMAND), ex));
 };
 
 // [function]
@@ -53,12 +54,7 @@ const main = function (argv) {
     yargs(args.normalize(hideBin(argv)))
       .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
-      .option("quiet", {
-        alias: "q",
-        default: conf.quiet,
-        describe: "Output only errors",
-        type: "boolean",
-      })
+      .option("quiet", { ...args.QUIET, default: conf.quiet })
       .help("help")
       .alias("help", "h")
       .version(VERSION)

package/bin/arc-open.js

@@ -18,7 +18,6 @@ const cfgpackage = require("../src/config/package");
 const cfgproduct = require("../src/config/product");
 const cfguri = require("../src/config/uri");
 const error = require("../src/util/error");
-const log = require("../src/util/log");
 const open = require("../src/cli/open");
 const output = require("../src/util/output");
 const phrase = require("../src/phrase");
@@ -31,6 +30,7 @@ const abort = output.abort;
 const ArcError = error.ArcError;
 const findRc = rc.findRc;
 const launch = shell.launch;
+const launched = output.launched;
 const resolve = path.resolve;
 
 // [declare]
@@ -55,26 +55,17 @@ const start = function (argv) {
     root: resolve(process.cwd(), argv.cwd),
   })
     .then((data) => {
-      const page = data?.page;
-      if (!page) {
-        throw new ArcError(cfgcode.GAME_ID_MISSING, phrase.noGameId());
+      if (!data) {
+        throw new ArcError(cfgcode.GAME_ID_MISSING, phrase.gameIdMissing());
       }
-      const url = `${cfguri.HOST_HTTP_WWW}${page}`;
+      const { page, url } = data;
       const opening = argv.browser
         ? launch(url)
         : launch(`${cfguri.HOST_APP_STORE}${page}`, url);
       return Promise.all([opening, url]);
     })
-    .then(([where, url]) => {
-      if (where) {
-        log.result(phrase.opened(where), [url]);
-      } else {
-        log.result(phrase.unableToOpen(), [url, phrase.openToContinue()], {
-          color: "yellow",
-        });
-      }
-    })
-    .catch((ex) => abort("Open aborted.", ex));
+    .then(([where, url]) => launched(where, url))
+    .catch((ex) => abort(phrase.aborted(COMMAND), ex));
 };
 
 // [function]
@@ -91,11 +82,7 @@ const main = function (argv) {
           type: "string",
         }),
       )
-      .option("browser", {
-        default: conf.browser,
-        describe: "Open in a web browser",
-        type: "boolean",
-      })
+      .option("browser", { ...args.BROWSER, default: conf.browser })
       .option("cwd", args.CWD)
       .help("help")
       .alias("help", "h")

package/bin/arc-pack.js

@@ -97,12 +97,12 @@ const start = function (argv) {
       }
       if (!quiet) {
         sw.stop(true);
-        log.hs("Packed.");
+        log.hs(phrase.packed());
         print(artifact, { nl: true, toml: true });
       }
     })
     .catch((ex) =>
-      abort("Pack aborted.", ex, { data: { warnings }, json, sw }),
+      abort(phrase.aborted(COMMAND), ex, { data: { warnings }, json, sw }),
     );
 };
 
@@ -125,18 +125,8 @@ const main = function (argv) {
         describe: "Set the output file",
         type: "string",
       })
-      .option("json", {
-        alias: "j",
-        default: conf.json,
-        describe: "Format output as JSON",
-        type: "boolean",
-      })
-      .option("quiet", {
-        alias: "q",
-        default: conf.quiet,
-        describe: "Output only errors",
-        type: "boolean",
-      })
+      .option("json", { ...args.JSON_OUTPUT, default: conf.json })
+      .option("quiet", { ...args.QUIET, default: conf.quiet })
       .option("cwd", args.CWD)
       .help("help")
       .alias("help", "h")

package/bin/arc-play.js

@@ -32,6 +32,7 @@ const abort = output.abort;
 const ArcError = error.ArcError;
 const findRc = rc.findRc;
 const launch = shell.launch;
+const launched = output.launched;
 const resolve = path.resolve;
 const SpinnerWheel = spinner.SpinnerWheel;
 
@@ -74,7 +75,7 @@ const start = function (argv) {
       const orientation = data?.orientation;
       const url = data?.url;
       if (!orientation || !url) {
-        throw new ArcError(cfgcode.GAME_ID_MISSING, phrase.noGameId());
+        throw new ArcError(cfgcode.GAME_ID_MISSING, phrase.gameIdMissing());
       }
       sw.stop(true);
       if (data.fallback && !argv.quiet) {
@@ -87,16 +88,10 @@ const start = function (argv) {
     })
     .then(([where, url]) => {
       if (!argv.quiet) {
-        if (where) {
-          log.result(phrase.opened(where), [url]);
-        } else {
-          log.result(phrase.unableToOpen(), [url, phrase.openToContinue()], {
-            color: "yellow",
-          });
-        }
+        launched(where, url);
       }
     })
-    .catch((ex) => abort("Play aborted.", ex, { sw }));
+    .catch((ex) => abort(phrase.aborted(COMMAND), ex, { sw }));
 };
 
 // [function]
@@ -122,17 +117,8 @@ const main = function (argv) {
         describe: "Release channel or version",
         type: "string",
       })
-      .option("browser", {
-        default: conf.browser,
-        describe: "Open in a web browser",
-        type: "boolean",
-      })
-      .option("quiet", {
-        alias: "q",
-        default: conf.quiet,
-        describe: "Output only errors",
-        type: "boolean",
-      })
+      .option("browser", { ...args.BROWSER, default: conf.browser })
+      .option("quiet", { ...args.QUIET, default: conf.quiet })
       .option("cwd", args.CWD)
       .help("help")
       .alias("help", "h")

package/bin/arc-validate.js

@@ -17,6 +17,7 @@ const cfgpackage = require("../src/config/package");
 const cfgproduct = require("../src/config/product");
 const log = require("../src/util/log");
 const output = require("../src/util/output");
+const phrase = require("../src/phrase");
 const rc = require("../src/util/rc");
 const schema = require("../src/util/schema");
 const validate = require("../src/cli/validate");
@@ -57,26 +58,26 @@ const start = function (argv) {
         const [probs, refs] = dereference(issues);
         const probcount = probs.length;
         if (probcount) {
-          log.hdo(`${probcount} ${probcount === 1 ? "issue" : "issues"}:`);
+          log.hdo(phrase.listed(probcount, "issue"));
           log.p(probs.map((prob) => `✗ ${prob}`));
         }
         const warncount = argv.quiet ? 0 : warnings.length;
         if (warncount) {
-          log.hwo(`${warncount} ${warncount === 1 ? "warning" : "warnings"}:`);
+          log.hwo(phrase.listed(warncount, "warning"));
           log.p(warnings.map((each) => `⚠ ${schemaPrint(each)}`));
         }
         const refcount = refs.length;
         if (refcount) {
-          log.h(`${refcount} ${refcount === 1 ? "reference" : "references"}:`);
+          log.h(phrase.listed(refcount, "reference"));
           log.p(refs);
         }
         if (!count && !argv.quiet) {
-          log.hs("No issues found.");
+          log.hs(phrase.noIssuesFound());
         }
       }
       process.exit(count ? 1 : 0);
     })
-    .catch((ex) => abort("Validate aborted.", ex, { json }));
+    .catch((ex) => abort(phrase.aborted(COMMAND), ex, { json }));
 };
 
 // [function]
@@ -86,18 +87,8 @@ const main = function (argv) {
     yargs(args.normalize(hideBin(argv)))
       .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
-      .option("json", {
-        alias: "j",
-        default: conf.json,
-        describe: "Format output as JSON",
-        type: "boolean",
-      })
-      .option("quiet", {
-        alias: "q",
-        default: conf.quiet,
-        describe: "Output only errors",
-        type: "boolean",
-      })
+      .option("json", { ...args.JSON_OUTPUT, default: conf.json })
+      .option("quiet", { ...args.QUIET, default: conf.quiet })
       .option("cwd", args.CWD)
       .help("help")
       .alias("help", "h")

package/bin/arc-whoami.js

@@ -14,6 +14,7 @@ const cfgpackage = require("../src/config/package");
 const cfgproduct = require("../src/config/product");
 const log = require("../src/util/log");
 const output = require("../src/util/output");
+const phrase = require("../src/phrase");
 const rc = require("../src/util/rc");
 const spinner = require("../src/util/spinner");
 const whoami = require("../src/cli/whoami");
@@ -44,7 +45,7 @@ const handler = function ({ json, sw }) {
   return {
     onAccountRefresh(refresh) {
       sw.start(json);
-      return refresh(true);
+      return refresh();
     },
   };
 };
@@ -62,7 +63,7 @@ const start = function (argv) {
           print({ user: null });
         } else {
           sw.stop(true);
-          log.p("Not logged in.");
+          log.p(phrase.noAccount());
         }
         return;
       }
@@ -85,7 +86,7 @@ const start = function (argv) {
         }
         return;
       }
-      abort("Whoami aborted.", ex, { json, sw });
+      abort(phrase.aborted(COMMAND), ex, { json, sw });
     });
 };
 
@@ -96,12 +97,7 @@ const main = function (argv) {
     yargs(args.normalize(hideBin(argv)))
       .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
-      .option("json", {
-        alias: "j",
-        default: conf.json,
-        describe: "Format output as JSON",
-        type: "boolean",
-      })
+      .option("json", { ...args.JSON_OUTPUT, default: conf.json })
       .help("help")
       .alias("help", "h")
       .version(VERSION)

package/bin/arc.js

@@ -10,6 +10,7 @@ const fs = require("fs-extra");
 const cfgpackage = require("../src/config/package");
 const cfgproduct = require("../src/config/product");
 const log = require("../src/util/log");
+const phrase = require("../src/phrase");
 
 // [use]
 
@@ -50,8 +51,8 @@ const main = function (argv, load) {
   const args = normalize(dispatch(argv));
   pathExists(args[1], (err, exists) => {
     if (err || !exists) {
-      log.hd("Command aborted.");
-      log.pd(`Unable to find: ${args[1]}`);
+      log.hd(phrase.aborted("command"));
+      log.pd(phrase.unableToFind(args[1]));
       process.exit(1);
     }
     const command = load(args[1]);
@@ -64,3 +65,7 @@ const main = function (argv, load) {
 if (require.main === module) {
   main(process.argv, require);
 }
+
+// [export]
+
+module.exports = { main };

package/package.json

@@ -75,5 +75,5 @@
   "scripts": {
     "test": "node --test \"test/**/*.test.js\""
   },
-  "version": "0.1.45"
+  "version": "0.1.46"
 }

package/src/account.js

@@ -112,11 +112,11 @@ const getSaved = function (onRefresh) {
       if (!session) {
         return null;
       }
-      return expired(session)
-        ? (onRefresh &&
-            onRefresh((renew) => (renew ? refresh(current) : null))) ||
-            null
-        : current;
+      if (!expired(session)) {
+        return current;
+      }
+      // the handler starts its spinner, then refreshes.
+      return onRefresh ? onRefresh(() => refresh(current)) : null;
     });
 };
 

package/src/action/build/tool.js

@@ -12,6 +12,7 @@ const fs = require("fs-extra");
 // [import]
 
 const cfgcode = require("../../config/code");
+const commands = require("../../util/command");
 const error = require("../../util/error");
 const given = require("../../parser/given");
 const phrase = require("../../phrase");
@@ -19,6 +20,7 @@ const phrase = require("../../phrase");
 // [use]
 
 const ArcError = error.ArcError;
+const buildCommand = commands.buildCommand;
 const exec = cp.exec;
 const pathExists = fs.pathExists;
 const resolvePath = path.resolve;
@@ -61,21 +63,12 @@ const build = function (command, { cwdPath, outputPath }) {
 
 const main = function (conf) {
   const root = conf.root;
-  return given(conf).then(({ workflow }) => {
-    const command = workflow.build;
-    return build(
-      Array.isArray(command)
-        ? command
-            .map((cmd) => cmd.trim())
-            .filter(Boolean)
-            .join(" && ")
-        : command.trim(),
-      {
-        cwdPath: root,
-        outputPath: resolvePath(root, workflow.deploy_dir),
-      },
-    );
-  });
+  return given(conf).then(({ workflow }) =>
+    build(buildCommand(workflow.build), {
+      cwdPath: root,
+      outputPath: resolvePath(root, workflow.deploy_dir),
+    }),
+  );
 };
 
 // [export]