arcadible 0.1.11 → 0.1.13

package/bin/arc-build.js

@@ -0,0 +1,124 @@
+#!/usr/bin/env node
+"use strict";
+
+// [import]
+
+const path = require("node:path");
+
+// [import]
+
+const hideBin = require("yargs/helpers").hideBin;
+const yargs = require("yargs/yargs");
+
+// [import]
+
+const build = require("../src/cli/build");
+const log = require("../src/util/log");
+const output = require("../src/util/output");
+const phrase = require("../src/phrase");
+const pkg = require("../package.json");
+const rc = require("../src/util/rc");
+const validate = require("../src/cli/validate");
+
+// [use]
+
+const findRc = rc.findRc;
+const print = output.print;
+const resolve = path.resolve;
+
+// [declare]
+
+const CMD = "arc";
+const SUBCMD = "build";
+
+// [define]
+
+const conf = {
+  json: false,
+  quiet: false,
+  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+};
+
+// [function]
+
+const start = function (argv) {
+  const json = argv.json;
+  const quiet = argv.quiet;
+  const root = resolve(process.cwd(), argv.cwd);
+  return validate({ root })
+    .then((issues) => {
+      const count = issues.length;
+      if (count) {
+        throw new Error(phrase.issuesFound(count));
+      }
+      return build({ root });
+    })
+    .then((artifact) => {
+      if (json) {
+        print({ artifact });
+        return;
+      }
+      if (!quiet) {
+        log.hs("Done.");
+        if (artifact) {
+          print(artifact, { toml: true });
+          return;
+        }
+        log.p("Nothing to do.");
+      }
+    })
+    .catch((ex) => {
+      const message = ex.message;
+      if (json) {
+        print({ error: { message } });
+      } else {
+        log.hd("Build aborted.");
+        log.p(message);
+      }
+      process.exit(1);
+    });
+};
+
+// [function]
+
+const main = function (argv) {
+  return start(
+    yargs(hideBin(argv))
+      .scriptName(`${CMD} ${SUBCMD}`)
+      .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("cwd", {
+        alias: "C",
+        default: ".",
+        describe: "Set the working directory",
+        type: "string",
+      })
+      .help("help")
+      .alias("help", "h")
+      .version(pkg.version)
+      .alias("version", "v")
+      .strict()
+      .parse(),
+  );
+};
+
+// [main]
+
+if (require.main === module) {
+  main(process.argv);
+}
+
+// [export]
+
+module.exports = { main };

package/bin/arc-deploy.js

@@ -12,9 +12,12 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const build = require("../src/cli/build");
 const deploy = require("../src/cli/deploy");
 const log = require("../src/util/log");
 const output = require("../src/util/output");
+const pack = require("../src/cli/pack");
+const phrase = require("../src/phrase");
 const pkg = require("../package.json");
 const rc = require("../src/util/rc");
 const validate = require("../src/cli/validate");
@@ -46,7 +49,7 @@ const handler = function ({ json, quiet }) {
   return {
     onBegin() {
       if (!json && !quiet) {
-        log.p("Deploying project...");
+        log.pnl("Deploying...");
       }
     },
     onInfo({ level, message }) {
@@ -58,12 +61,12 @@ const handler = function ({ json, quiet }) {
           log.pw(`⚠ ${message}`);
           return;
         default:
-          log.p(`• ${message}`);
+          log.p(`· ${message}`);
       }
     },
     onRefresh(refresh) {
       if (!json) {
-        log.p("Checking login...");
+        // log.p("Checking login...");
       }
       return refresh(true);
     },
@@ -73,35 +76,66 @@ const handler = function ({ json, quiet }) {
 // [function]
 
 const start = function (argv) {
+  const git = argv.git;
   const json = argv.json;
   const quiet = argv.quiet;
   const root = resolve(process.cwd(), argv.cwd);
   return whoami({ handler: handler({ json, quiet }) })
     .then((current) => {
-      if (!current || !current.profile) {
-        throw new Error("Not logged in. Run `arc login` to log in.");
+      if (!current || !current.session) {
+        throw new Error(phrase.notLoggedIn());
       }
-      return validate({ root });
+      return Promise.all([
+        // whoami
+        current.session,
+        // validate
+        validate({ root }),
+      ]);
     })
-    .then((issues) => {
-      const valid = !issues.length;
-      if (!valid) {
-        throw new Error("Validate failed. Run `arc validate` for details.");
+    .then(([session, issues]) => {
+      const count = issues.length;
+      if (count) {
+        throw new Error(phrase.issuesFound(count));
       }
-      return deploy({
-        git: argv.git,
-        handler: handler({ json, quiet }),
-        root,
-      });
+      return Promise.all([
+        // whoami
+        session,
+        // build
+        git ? null : build({ root }),
+      ]);
     })
-    .then((data) => {
+    .then(([session, artifact]) =>
+      Promise.all([
+        // whoami
+        session,
+        // pack
+        git ? null : pack({ input: artifact?.path, root }),
+      ]),
+    )
+    .then(([session, artifact]) =>
+      deploy(
+        git
+          ? { handler: handler({ json, quiet }), root }
+          : {
+              artifact,
+              handler: handler({ json, quiet }),
+              root,
+              session,
+            },
+      ),
+    )
+    .then((version) => {
       if (json) {
-        print({ version: data });
+        print({ version });
         return;
       }
       if (!quiet) {
-        log.p(`✓ Build v${data.to} submitted for release.`);
-        log.hs("Deployed.");
+        log.hs("Done.");
+        if (version) {
+          log.p(`Build v${version.to} submitted.`);
+          return;
+        }
+        log.p("Nothing to do.");
       }
     })
     .catch((ex) => {

package/bin/arc-init.js

@@ -53,7 +53,7 @@ const handler = function ({ json, quiet }) {
   return {
     onBegin() {
       if (!json && !quiet) {
-        log.p("Initializing project...");
+        log.pnl("Initializing...");
       }
     },
     onInfo() {},
@@ -74,26 +74,25 @@ const start = function (argv) {
     root,
     template: argv.template,
   })
-    .then((data) => {
-      const dir = relative(root, data.path);
+    .then((project) => {
       if (json) {
-        print({ project: data });
+        print({ project });
         return;
       }
       if (!quiet) {
-        log.hsnl("Initialized.");
-        log.h("Getting started:");
-        log.pnl(cfgurl.GETTING_STARTED);
+        log.hsnl("Done.");
         log.h("Next steps:");
-        log.p(
+        log.pnl(
           [
-            data.path === root ? null : `cd ${dir}`,
+            project.path === root ? null : `cd ${relative(root, project.path)}`,
             "arc login",
             "arc deploy (or: arc deploy --git)",
           ]
             .filter(Boolean)
             .map((step, i) => `${i + 1}. ${step}`),
         );
+        log.h("Getting started:");
+        log.p(cfgurl.GETTING_STARTED);
       }
       // degit sometimes hangs
       process.exit(0);
@@ -153,7 +152,7 @@ const main = function (argv) {
       .option("yes", {
         alias: "y",
         default: conf.yes,
-        describe: "Accept all prompt defaults",
+        describe: "Accept prompt defaults",
         type: "boolean",
       })
       .option("json", {

package/bin/arc-login.js

@@ -79,13 +79,13 @@ const handler = function ({ browser }) {
 
 const start = function (argv) {
   const browser = argv.browser;
-  log.pnl("Starting login...");
+  log.pnl("Logging in...");
   return login({ handler: handler({ browser }) })
     .then(({ profile }) => {
       process.stdin.pause();
       log.p("");
-      log.p("Logged in as:");
-      log.hs(profile.display_name);
+      log.hs("Done.");
+      log.p(profile.display_name);
     })
     .catch((ex) => {
       process.stdin.pause();
@@ -105,7 +105,7 @@ const main = function (argv) {
       .option("browser", {
         default: conf.browser,
         describe:
-          "Open a web browser automatically (use --no-browser to disable)",
+          "Open a web browser automatically (disable with --no-browser)",
         type: "boolean",
       })
       .help("help")

package/bin/arc-pack.js

@@ -15,6 +15,7 @@ const yargs = require("yargs/yargs");
 const log = require("../src/util/log");
 const output = require("../src/util/output");
 const pack = require("../src/cli/pack");
+const phrase = require("../src/phrase");
 const pkg = require("../package.json");
 const rc = require("../src/util/rc");
 const validate = require("../src/cli/validate");
@@ -33,6 +34,7 @@ const SUBCMD = "pack";
 // [define]
 
 const conf = {
+  input: null,
   json: false,
   output: null,
   quiet: false,
@@ -47,19 +49,24 @@ const start = function (argv) {
   const root = resolve(process.cwd(), argv.cwd);
   return validate({ root })
     .then((issues) => {
-      const valid = !issues.length;
-      if (!valid) {
-        throw new Error("Validate failed. Run `arc validate` for details.");
+      const count = issues.length;
+      if (count) {
+        throw new Error(phrase.issuesFound(count));
       }
-      return pack({ output: argv.output, root });
+      return pack({ input: argv.input, output: argv.output, root });
     })
-    .then((data) => {
+    .then((artifact) => {
       if (json) {
-        print({ artifact: data });
+        print({ artifact });
         return;
       }
       if (!quiet) {
-        log.hs("Packed.");
+        log.hs("Done.");
+        if (artifact) {
+          print(artifact, { toml: true });
+          return;
+        }
+        log.p("Nothing to do.");
       }
     })
     .catch((ex) => {
@@ -81,10 +88,16 @@ const main = function (argv) {
     yargs(hideBin(argv))
       .scriptName(`${CMD} ${SUBCMD}`)
       .usage("$0 [options]")
+      .option("input", {
+        alias: "i",
+        default: conf.input,
+        describe: "Set the input directory",
+        type: "string",
+      })
       .option("output", {
         alias: "o",
         default: conf.output,
-        describe: "Set the output path",
+        describe: "Set the output file",
         type: "string",
       })
       .option("json", {

package/bin/arc-validate.js

@@ -51,7 +51,7 @@ const start = function (argv) {
         log.hd(`${count} ${count === 1 ? "issue" : "issues"} found.`);
         log.p(issues.map((error) => `✗ ${error}`));
       } else if (!quiet) {
-        log.hs("Validated.");
+        log.hs("No issues found.");
       }
       process.exit(count ? 1 : 0);
     })

package/bin/arc-whoami.js

@@ -37,7 +37,7 @@ const handler = function ({ json }) {
   return {
     onRefresh(refresh) {
       if (!json) {
-        log.p("Checking login...");
+        // log.p("Checking login...");
       }
       return refresh(true);
     },
@@ -62,8 +62,7 @@ const start = function (argv) {
       if (json) {
         print({ profile });
       } else {
-        log.p("Logged in as:");
-        log.hs(profile.display_name);
+        log.p(profile.display_name);
       }
     })
     .catch((ex) => {

package/package.json

@@ -1,6 +1,7 @@
 {
   "bin": {
     "arc": "bin/arc.js",
+    "arc-build": "bin/arc-build.js",
     "arc-deploy": "bin/arc-deploy.js",
     "arc-init": "bin/arc-init.js",
     "arc-inspect": "bin/arc-inspect.js",
@@ -11,7 +12,6 @@
     "arc-whoami": "bin/arc-whoami.js"
   },
   "dependencies": {
-    "@iarna/toml": "^2.2.5",
     "@inquirer/prompts": "^8.5.2",
     "adm-zip": "^0.5.16",
     "chalk": "^4.1.2",
@@ -25,6 +25,7 @@
     "marked": "^17.0.1",
     "mp4box": "^2.3.0",
     "open": "^8.4.2",
+    "pretty-toml": "^1.0.0",
     "rc": "^1.2.8",
     "semver": "^7.7.3",
     "yargs": "^17.7.2",
@@ -35,6 +36,7 @@
     "node": ">=24.11.1"
   },
   "exports": {
+    "./build": "./src/cli/build.js",
     "./deploy": "./src/cli/deploy.js",
     "./init": "./src/cli/init.js",
     "./inspect": "./src/cli/inspect.js",
@@ -51,5 +53,5 @@
   "license": "Apache-2.0",
   "main": "./src/cli/index.js",
   "name": "arcadible",
-  "version": "0.1.11"
+  "version": "0.1.13"
 }

package/src/action/build/tool.js

@@ -0,0 +1,70 @@
+"use strict";
+
+// [import]
+
+const cp = require("node:child_process");
+const path = require("node:path");
+
+// [import]
+
+const fs = require("fs-extra");
+
+// [import]
+
+const project = require("../../parser/project");
+
+// [use]
+
+const exec = cp.exec;
+const pathExists = fs.pathExists;
+const remove = fs.remove;
+const resolvePath = path.resolve;
+
+// [function]
+
+const execBuild = function (command, { cwdPath }) {
+  return new Promise((resolve, reject) => {
+    exec(command, { cwd: cwdPath }, (err) => {
+      if (err) {
+        reject(err);
+        return;
+      }
+      resolve();
+    });
+  });
+};
+
+// [function]
+
+const build = function (command, { cwdPath, outputPath }) {
+  return command
+    ? remove(outputPath)
+        .then(() => execBuild(command, { cwdPath }))
+        .then(() => pathExists(outputPath))
+        .then((exists) => (exists ? { path: outputPath } : null))
+    : Promise.resolve(null);
+};
+
+// [function]
+
+const main = function ({ root }) {
+  return project(root).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),
+      },
+    );
+  });
+};
+
+// [export]
+
+module.exports = main;

package/src/action/deploy/git.js

@@ -8,6 +8,10 @@ const cp = require("node:child_process");
 
 const semver = require("semver");
 
+// [import]
+
+const phrase = require("../../phrase");
+
 // [use]
 
 const execFile = cp.execFile;
@@ -26,13 +30,9 @@ const git = function (root, args, cb) {
 // [function]
 
 const ensureRepo = function (root, cb) {
-  const message = [
-    "Unable to find a Git repository.",
-    "Ensure you are in a Git repository, or create one before continuing.",
-  ];
   git(root, ["rev-parse", "--is-inside-work-tree"], (err) => {
     if (err) {
-      cb(new Error(message.join("\n"), { cause: err }));
+      cb(new Error(phrase.gitRepoMissing(), { cause: err }));
       return;
     }
     cb();
@@ -42,13 +42,9 @@ const ensureRepo = function (root, cb) {
 // [function]
 
 const ensureRemote = function (root, cb) {
-  const message = [
-    "Unable to access Git remote 'origin'.",
-    "Ensure the remote 'origin' exists and you have permission to access it.",
-  ];
   git(root, ["ls-remote", "origin"], (err) => {
     if (err) {
-      cb(new Error(message.join("\n"), { cause: err }));
+      cb(new Error(phrase.gitRemoteMissing(), { cause: err }));
       return;
     }
     cb();
@@ -58,14 +54,10 @@ const ensureRemote = function (root, cb) {
 // [function]
 
 const ensureClean = function (root, cb) {
-  const message = [
-    "Unable to continue with Git changes present.",
-    "Ensure all changes are staged, committed, or discarded before continuing.",
-  ];
   git(root, ["diff", "--quiet"], (err) => {
     if (err) {
       if (err.code === 1) {
-        cb(new Error(message.join("\n"), { cause: err }));
+        cb(new Error(phrase.gitChangesPresent(), { cause: err }));
         return;
       }
       cb(err);
@@ -88,10 +80,6 @@ const ensureClean = function (root, cb) {
 // [function]
 
 const createTag = function (root, version, cb) {
-  const message = [
-    "Unable to create Git tag.",
-    "Ensure the release tag does not already exist locally.",
-  ];
   git(
     root,
     [
@@ -105,7 +93,7 @@ const createTag = function (root, version, cb) {
     ],
     (err) => {
       if (err) {
-        cb(new Error(message.join("\n"), { cause: err }));
+        cb(new Error(phrase.gitTagCreateFailed(), { cause: err }));
         return;
       }
       cb();
@@ -116,13 +104,9 @@ const createTag = function (root, version, cb) {
 // [function]
 
 const pushTag = function (root, version, cb) {
-  const message = [
-    "Unable to push Git tag.",
-    "Ensure the release tag does not already exist on remote 'origin'.",
-  ];
   git(root, ["push", "origin", `${PREFIX}${version}`], (err) => {
     if (err) {
-      cb(new Error(message.join("\n"), { cause: err }));
+      cb(new Error(phrase.gitTagPushFailed(), { cause: err }));
       return;
     }
     cb();

package/src/action/init/manifest.js

@@ -11,6 +11,7 @@ const fs = require("fs-extra");
 
 // [import]
 
+const phrase = require("../../phrase");
 const TOML = require("../../util/toml");
 
 // [use]
@@ -31,9 +32,7 @@ const parseToml = function (buf) {
   try {
     return TOML.parse(buf);
   } catch (ex) {
-    throw new Error(`Unable to parse ${MANIFEST}: ${ex.message}`, {
-      cause: ex,
-    });
+    throw new Error(phrase.unableToParse(MANIFEST, ex.message), { cause: ex });
   }
 };
 

package/src/action/init/tool-patch.js

@@ -16,8 +16,8 @@ const resolve = path.resolve;
 
 // [function]
 
-const detectVersion = function (root) {
-  return env(root).then(({ game }) => game?.version ?? null);
+const detectVersion = function (dest) {
+  return env(dest).then(({ game }) => game?.version ?? null);
 };
 
 // [function]

package/src/action/init/tool.js

@@ -13,6 +13,7 @@ const fs = require("fs-extra");
 
 const env = require("../../parser/env");
 const manifest = require("./manifest");
+const phrase = require("../../phrase");
 
 // [use]
 
@@ -34,8 +35,8 @@ const removeLicense = function (dest) {
 
 // [function]
 
-const detectVersion = function (root) {
-  return env(root).then(({ game }) => game?.version ?? null);
+const detectVersion = function (dest) {
+  return env(dest).then(({ game }) => game?.version ?? null);
 };
 
 // [function]
@@ -52,7 +53,7 @@ const scaffold = function (src, dest, { onBegin, onInfo }) {
 const init = function (dest, { force, template }, handler) {
   return pathExists(dest).then((exists) => {
     if (exists && !force) {
-      throw new Error("Directory already exists. Use `--force` to overwrite.");
+      throw new Error(phrase.overwriteWithForce());
     }
     return scaffold(template, dest, handler);
   });

package/src/action/login/flow.js

@@ -9,6 +9,7 @@ const crypto = require("node:crypto");
 const api = require("../../api");
 const cfgurl = require("../../config/url");
 const delay = require("../../util/delay");
+const phrase = require("../../phrase");
 const time = require("../../util/time");
 
 // [use]
@@ -16,6 +17,16 @@ const time = require("../../util/time");
 const poll = delay.poll;
 const randomUUID = crypto.randomUUID;
 
+// [declare]
+
+const POLL = {
+  delay: time.s(3),
+  factor: 2,
+  interval: time.s(30),
+  maxDelay: time.s(15),
+  timeoutError: phrase.loginExpired(),
+};
+
 // [function]
 
 const postFlow = function ({ expiresAt, token, type }) {
@@ -56,9 +67,9 @@ const pollFlow = function ({ id, token }, onPoll) {
       case "completed":
         return data;
       case "failed":
-        throw new Error("Login flow failed.");
+        throw new Error(phrase.loginFailed());
       default:
-        throw new Error("Login flow expired.");
+        throw new Error(phrase.loginExpired());
     }
   });
 };
@@ -80,13 +91,7 @@ const main = function ({ onCreated, onPoll }) {
     return poll(
       (flow) => pollFlow(flow, onPoll),
       { id, token },
-      {
-        delay: time.s(3),
-        factor: 2,
-        interval: time.s(30),
-        maxDelay: time.s(15),
-        timeout,
-      },
+      { ...POLL, timeout },
     );
   });
 };

package/src/action/pack/tool.js

@@ -10,6 +10,7 @@ const fs = require("fs-extra");
 
 // [import]
 
+const phrase = require("../../phrase");
 const project = require("../../parser/project");
 const size = require("../../util/size");
 const Zip = require("../../util/zip");
@@ -36,11 +37,11 @@ const SIZE_TOTAL = size.mb(256);
 
 const verifyPartial = function (zip) {
   if (!zip.has(MAIN)) {
-    throw new Error(`Package is missing "${MAIN}".`);
+    throw new Error(phrase.packageFileMissing(MAIN));
   }
   if (zip.stat().size > SIZE_PARTIAL) {
     const max = SIZE_PARTIAL / 1024 / 1024;
-    throw new Error(`Package size (excluding store assets) exceeds ${max} MB.`);
+    throw new Error(phrase.packageTooLarge(false, max));
   }
   return zip;
 };
@@ -50,19 +51,19 @@ const verifyPartial = function (zip) {
 const verifyTotal = function (zip) {
   if (zip.stat().size > SIZE_TOTAL) {
     const max = SIZE_TOTAL / 1024 / 1024;
-    throw new Error(`Package size (including store assets) exceeds ${max} MB.`);
+    throw new Error(phrase.packageTooLarge(true, max));
   }
   return zip;
 };
 
 // [function]
 
-const pack = function (name, game, { deployPath, mediaPath, zipPath }) {
+const pack = function (name, game, { inputPath, mediaPath, outputPath }) {
   const zip = new Zip(name);
-  return pathExists(deployPath)
+  return pathExists(inputPath)
     .then((existsDeploy) => {
       if (existsDeploy) {
-        zip.addDir(deployPath);
+        zip.addDir(inputPath);
       }
       return zip;
     })
@@ -77,21 +78,21 @@ const pack = function (name, game, { deployPath, mediaPath, zipPath }) {
     })
     .then(verifyTotal)
     .then((file) => {
-      file.write(zipPath);
-      return { path: zipPath, ...file.stat() };
+      file.write(outputPath);
+      return { path: outputPath, ...file.stat() };
     });
 };
 
 // [function]
 
-const main = function ({ output, root }) {
+const main = function ({ input, output, root }) {
   return project(root).then(({ game, workflow }) => {
-    const name = game.handle || game.id;
-    const file = output || `${OUTPUT}/${name}-v${game.version}.zip`;
+    const name = game.handle ?? game.id;
+    const file = output ?? `${OUTPUT}/${name}-v${game.version}.zip`;
     return pack(parse(file).name, game, {
-      deployPath: resolve(root, workflow.deploy_dir),
+      inputPath: resolve(root, input ?? workflow.deploy_dir),
       mediaPath: resolve(root, MEDIA),
-      zipPath: resolve(root, file),
+      outputPath: resolve(root, file),
     });
   });
 };

package/src/api.js

@@ -34,6 +34,12 @@ const postFlow = function (form, options) {
   return request.post(endpoint("/flows"), form, options);
 };
 
+// [function]
+
+const postUpload = function (form, options) {
+  return request.post(endpoint("/uploads"), form, options);
+};
+
 // [export]
 
-module.exports = { authRefresh, getFlow, postFlow };
+module.exports = { authRefresh, getFlow, postFlow, postUpload };

package/src/artifact.js

@@ -0,0 +1 @@
+"use strict";

package/src/cli/build.js

@@ -0,0 +1,15 @@
+"use strict";
+
+// [import]
+
+const buildTool = require("../action/build/tool");
+
+// [function]
+
+const main = function (conf) {
+  return buildTool(conf);
+};
+
+// [export]
+
+module.exports = main;

package/src/cli/deploy.js

@@ -7,9 +7,10 @@ const deployToolGit = require("../action/deploy/tool-git");
 
 // [function]
 
-const main = function ({ git, handler, ...conf }) {
-  const tool = git ? deployToolGit : deployTool;
-  return tool(conf, handler);
+const main = function ({ artifact, handler, session, ...conf }) {
+  return artifact
+    ? deployTool(session, artifact, conf, handler)
+    : deployToolGit(conf, handler);
 };
 
 // [export]

package/src/cli/index.js

@@ -2,6 +2,7 @@
 
 // [import]
 
+const build = require("./build");
 const deploy = require("./deploy");
 const init = require("./init");
 const inspect = require("./inspect");
@@ -14,6 +15,7 @@ const whoami = require("./whoami");
 // [export]
 
 module.exports = {
+  build,
   deploy,
   init,
   inspect,

package/src/parser/env.js

@@ -11,6 +11,7 @@ const fs = require("fs-extra");
 // [import]
 
 const objs = require("../util/objs");
+const phrase = require("../phrase");
 
 // [use]
 
@@ -29,9 +30,7 @@ const parseJson = function (buf) {
   try {
     return JSON.parse(buf);
   } catch (ex) {
-    throw new Error(`Unable to parse ${PACKAGE}: ${ex.message}`, {
-      cause: ex,
-    });
+    throw new Error(phrase.unableToParse(PACKAGE, ex.message), { cause: ex });
   }
 };
 

package/src/parser/manifest.js

@@ -11,6 +11,7 @@ const fs = require("fs-extra");
 // [import]
 
 const objs = require("../util/objs");
+const phrase = require("../phrase");
 const TOML = require("../util/toml");
 
 // [use]
@@ -30,9 +31,7 @@ const parseToml = function (buf) {
   try {
     return TOML.parse(buf);
   } catch (ex) {
-    throw new Error(`Unable to parse ${MANIFEST}: ${ex.message}`, {
-      cause: ex,
-    });
+    throw new Error(phrase.unableToParse(MANIFEST, ex.message), { cause: ex });
   }
 };
 

package/src/parser/readme.js

@@ -13,6 +13,7 @@ const fs = require("fs-extra");
 const dom = require("../util/dom");
 const MD = require("../util/md");
 const objs = require("../util/objs");
+const phrase = require("../phrase");
 const strs = require("../util/strs");
 
 // [use]
@@ -123,9 +124,7 @@ const parseReadme = function (buf, file) {
   try {
     return extract(MD.parse(buf));
   } catch (ex) {
-    throw new Error(`Unable to parse ${file}: ${ex.message}`, {
-      cause: ex,
-    });
+    throw new Error(phrase.unableToParse(file, ex.message), { cause: ex });
   }
 };
 

package/src/phrase.js

@@ -0,0 +1,133 @@
+"use strict";
+
+// [function]
+
+const gitChangesPresent = function () {
+  return [
+    "Unable to continue with Git changes present.",
+    "Ensure all changes are staged, committed, or discarded before continuing.",
+  ].join("\n");
+};
+
+// [function]
+
+const gitRemoteMissing = function () {
+  return [
+    "Unable to access Git remote 'origin'.",
+    "Ensure the remote 'origin' exists and you have permission to access it.",
+  ].join("\n");
+};
+
+// [function]
+
+const gitRepoMissing = function () {
+  return [
+    "Unable to find a Git repository.",
+    "Ensure you are in a Git repository, or create one before continuing.",
+  ].join("\n");
+};
+
+// [function]
+
+const gitTagCreateFailed = function () {
+  return [
+    "Unable to create Git tag.",
+    "Ensure the version tag does not already exist locally.",
+  ].join("\n");
+};
+
+// [function]
+
+const gitTagPushFailed = function () {
+  return [
+    "Unable to push Git tag.",
+    "Ensure the version tag does not already exist on remote 'origin'.",
+  ].join("\n");
+};
+
+// [function]
+
+const issuesFound = function (count) {
+  return `${count} ${count === 1 ? "issue" : "issues"} found. Run \`arc validate\` for details.`;
+};
+
+// [function]
+
+const loginExpired = function () {
+  return "Login request expired.";
+};
+
+// [function]
+
+const loginFailed = function () {
+  return "Login request failed.";
+};
+
+// [function]
+
+const notLoggedIn = function () {
+  return "Not logged in. Run `arc login` to log in.";
+};
+
+// [function]
+
+const noVideoMetadata = function () {
+  return "No video metadata found.";
+};
+
+// [function]
+
+const noVideoTrack = function () {
+  return "No video track found.";
+};
+
+// [function]
+
+const overwriteWithForce = function () {
+  return "Directory already exists (overwrite with `--force`).";
+};
+
+// [function]
+
+const packageFileMissing = function (file) {
+  return `Package is missing "${file}".`;
+};
+
+// [function]
+
+const packageTooLarge = function (size, assets) {
+  return `Package size (${assets ? "including" : "excluding"} store assets) exceeds ${size} MB.`;
+};
+
+// [function]
+
+const timedOut = function () {
+  return "Timed out.";
+};
+
+// [function]
+
+const unableToParse = function (file, message) {
+  return `Unable to parse ${file}: ${message}`;
+};
+
+// [export]
+
+module.exports = {
+  gitChangesPresent,
+  gitRemoteMissing,
+  gitRepoMissing,
+  gitTagCreateFailed,
+  gitTagPushFailed,
+  issuesFound,
+  loginExpired,
+  loginFailed,
+  noVideoMetadata,
+  noVideoTrack,
+  notLoggedIn,
+  overwriteWithForce,
+  packageFileMissing,
+  packageTooLarge,
+  timedOut,
+  unableToParse,
+};

package/src/schema/game.js

@@ -22,6 +22,7 @@ const strs = require("../util/strs");
 
 // [use]
 
+const cleanSemver = semver.clean;
 const existsCheck = check.exists;
 const imageCheck = check.image;
 const indentLines = strs.indentLines;
@@ -303,14 +304,14 @@ const zId = function () {
   return z
     .string(
       message(field, [
-        "Must be a valid UUID.",
-        "Run `arc init` to generate a new game ID.",
+        "Must be defined.",
+        "Run `arc init` to generate a new ID.",
       ]),
     )
     .uuid(message(field, ["Must be a valid UUID."]))
     .refine(
       (value) => value === value.toLowerCase(),
-      message(field, ["Must use lowercase characters."]),
+      message(field, ["Must be lowercase."]),
     );
 };
 
@@ -406,13 +407,17 @@ const zVersion = function () {
   return z
     .string(
       message(field, [
-        "Must be valid semver.",
+        "Must be defined.",
         "A version is required unless one can be derived.",
       ]),
     )
     .refine(
       (value) => validSemver(value) !== null,
       message(field, ["Must be valid semver."]),
+    )
+    .refine(
+      (value) => cleanSemver(value) === value,
+      message(field, ["Must be normalized semver."]),
     );
 };
 

package/src/schema/workflow.js

@@ -54,7 +54,7 @@ const zDeployDir = function (root, { build }) {
   const field = "deploy_dir";
   return z
     .string()
-    .min(1)
+    .min(1, message(field, ["Must be defined."]))
     .refine(
       (file) => isRelativeCheck(root, file),
       message(field, ["Must be a relative path."]),
@@ -70,8 +70,8 @@ const zDeployDir = function (root, { build }) {
     .refine(
       (file) => build || existsCheck(root, file),
       message(field, [
-        "Must exist when there is no build step.",
-        "Run `arc inspect workflow.deploy_dir` for details.",
+        "Must exist when no build step is defined.",
+        "Run `arc inspect workflow` for details.",
       ]),
     );
 };

package/src/util/delay.js

@@ -2,8 +2,20 @@
 
 // [import]
 
+const phrase = require("../phrase");
 const time = require("./time");
 
+// [declare]
+
+const POLL = {
+  delay: time.s(1),
+  factor: 1,
+  interval: time.m(1),
+  maxDelay: time.s(1),
+  timeout: Infinity,
+  timeoutError: phrase.timedOut(),
+};
+
 // [function]
 
 const backoff = function (elapsed, delay, factor, interval, maxDelay) {
@@ -30,13 +42,7 @@ const wait = function (delay, next) {
 const poll = function (
   fn,
   value,
-  {
-    delay = time.s(1),
-    factor = 1,
-    interval = time.m(1),
-    maxDelay = delay,
-    timeout = Infinity,
-  } = {},
+  { delay, factor, interval, maxDelay, timeout, timeoutError } = POLL,
 ) {
   const started = Date.now();
   const next = function () {
@@ -46,7 +52,7 @@ const poll = function (
       }
       const elapsed = Date.now() - started;
       if (elapsed >= timeout) {
-        throw new Error("Operation timed out.");
+        throw new Error(timeoutError);
       }
       return wait(backoff(elapsed, delay, factor, interval, maxDelay), next);
     });

package/src/util/s3.js

@@ -0,0 +1 @@
+"use strict";

package/src/util/toml.js

@@ -2,7 +2,7 @@
 
 // [import]
 
-const TOML = require("@iarna/toml");
+const TOML = require("pretty-toml");
 
 // [use]
 

package/src/util/video.js

@@ -5,6 +5,10 @@
 const createFile = require("mp4box").createFile;
 const fs = require("fs-extra");
 
+// [import]
+
+const phrase = require("../phrase");
+
 // [use]
 
 const readFileSync = fs.readFileSync; // eslint-disable-line no-sync
@@ -47,7 +51,7 @@ const readMp4 = function (file) {
   mp4.onReady = function (info) {
     const track = info.tracks.find((t) => t.video);
     if (!track || !track.video) {
-      error = new Error("No video track found.");
+      error = new Error(phrase.noVideoTrack());
       return;
     }
     video = {
@@ -70,7 +74,7 @@ const readMp4 = function (file) {
     throw error;
   }
   if (!video) {
-    throw new Error("No video metadata found.");
+    throw new Error(phrase.noVideoMetadata());
   }
   return video;
 };