arcadible 0.1.10 → 0.1.12

package/bin/arc-deploy.js

@@ -18,6 +18,7 @@ const output = require("../src/util/output");
 const pkg = require("../package.json");
 const rc = require("../src/util/rc");
 const validate = require("../src/cli/validate");
+const whoami = require("../src/cli/whoami");
 
 // [use]
 
@@ -45,7 +46,7 @@ const handler = function ({ json, quiet }) {
   return {
     onBegin() {
       if (!json && !quiet) {
-        log.p("Deploying project...");
+        log.p("Deploying...");
       }
     },
     onInfo({ level, message }) {
@@ -57,9 +58,15 @@ const handler = function ({ json, quiet }) {
           log.pw(`⚠ ${message}`);
           return;
         default:
-          log.p(`• ${message}`);
+          log.p(`· ${message}`);
       }
     },
+    onRefresh(refresh) {
+      if (!json) {
+        log.p("Authenticating...");
+      }
+      return refresh(true);
+    },
   };
 };
 
@@ -69,11 +76,19 @@ const start = function (argv) {
   const json = argv.json;
   const quiet = argv.quiet;
   const root = resolve(process.cwd(), argv.cwd);
-  return validate({ root })
+  return whoami({ handler: handler({ json, quiet }) })
+    .then((current) => {
+      if (!current || !current.profile) {
+        throw new Error("Not logged in. Run `arc login` to log in.");
+      }
+      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(
+          `${count} ${count === 1 ? "issue" : "issues"} found. Run \`arc validate\` for details.`,
+        );
       }
       return deploy({
         git: argv.git,

package/bin/arc-init.js

@@ -153,7 +153,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

@@ -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

@@ -47,9 +47,11 @@ 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(
+          `${count} ${count === 1 ? "issue" : "issues"} found. Run \`arc validate\` for details.`,
+        );
       }
       return pack({ output: argv.output, root });
     })

package/package.json

@@ -11,7 +11,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 +24,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",
@@ -51,5 +51,5 @@
   "license": "Apache-2.0",
   "main": "./src/cli/index.js",
   "name": "arcadible",
-  "version": "0.1.10"
+  "version": "0.1.12"
 }

package/src/action/init/tool.js

@@ -52,7 +52,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("Directory already exists (overwrite with `--force`).");
     }
     return scaffold(template, dest, handler);
   });

package/src/action/login/flow.js

@@ -16,6 +16,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: "Login request expired.",
+};
+
 // [function]
 
 const postFlow = function ({ expiresAt, token, type }) {
@@ -56,9 +66,9 @@ const pollFlow = function ({ id, token }, onPoll) {
       case "completed":
         return data;
       case "failed":
-        throw new Error("Login flow failed.");
+        throw new Error("Login request failed.");
       default:
-        throw new Error("Login flow expired.");
+        throw new Error("Login request expired.");
     }
   });
 };
@@ -80,13 +90,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/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;
@@ -301,15 +302,16 @@ const zIconVideo = function (root) {
 const zId = function () {
   const field = "id";
   return z
-    .uuid(
+    .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."]),
     );
 };
 
@@ -403,10 +405,19 @@ const zTrailer = function () {
 const zVersion = function () {
   const field = "version";
   return z
-    .string()
+    .string(
+      message(field, [
+        "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` to check the configured value.",
+        "Must exist when no build step is defined.",
+        "Run `arc inspect workflow` for details.",
       ]),
     );
 };

package/src/util/delay.js

@@ -4,6 +4,17 @@
 
 const time = require("./time");
 
+// [declare]
+
+const POLL = {
+  delay: time.s(1),
+  factor: 1,
+  interval: time.m(1),
+  maxDelay: time.s(1),
+  timeout: Infinity,
+  timeoutError: "Polling timed out.",
+};
+
 // [function]
 
 const backoff = function (elapsed, delay, factor, interval, maxDelay) {
@@ -30,13 +41,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 +51,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/toml.js

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