arcadible 0.1.12 → 0.1.14

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,11 +12,16 @@ 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 progress = require("../src/util/progress");
 const rc = require("../src/util/rc");
+const spinner = require("../src/util/spinner");
 const validate = require("../src/cli/validate");
 const whoami = require("../src/cli/whoami");
 
@@ -24,7 +29,9 @@ const whoami = require("../src/cli/whoami");
 
 const findRc = rc.findRc;
 const print = output.print;
+const ProgressBar = progress.ProgressBar;
 const resolve = path.resolve;
+const SpinnerWheel = spinner.SpinnerWheel;
 
 // [declare]
 
@@ -42,30 +49,36 @@ const conf = {
 
 // [function]
 
-const handler = function ({ json, quiet }) {
+const handler = function ({ json, pb, quiet }) {
   return {
-    onBegin() {
+    onAccountRefresh(refresh) {
+      return refresh(true);
+    },
+    onDeployBegin() {
       if (!json && !quiet) {
-        log.p("Deploying...");
+        log.p("Submitting...");
+        if (pb) {
+          pb.start();
+        }
       }
     },
-    onInfo({ level, message }) {
-      if (json || quiet) {
-        return;
-      }
-      switch (level) {
-        case "warn":
-          log.pw(`⚠ ${message}`);
-          return;
-        default:
-          log.p(`· ${message}`);
+    onLogInfo({ level, message }) {
+      if (!json && !quiet) {
+        switch (level) {
+          case "warn":
+            log.pw(`⚠ ${message}`);
+            return;
+          default:
+            log.p(`· ${message}`);
+        }
       }
     },
-    onRefresh(refresh) {
-      if (!json) {
-        log.p("Authenticating...");
+    onUploadProgress(step) {
+      if (!json && !quiet) {
+        if (pb) {
+          pb.increment(step);
+        }
       }
-      return refresh(true);
     },
   };
 };
@@ -73,37 +86,86 @@ 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 }) })
+  let pb = null;
+  let sw = new SpinnerWheel("Checking login... %s");
+  sw.start(git || json || quiet);
+  return whoami({ handler: handler({ json, pb, 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 });
+      sw.stop();
+      sw = new SpinnerWheel("Validating... %s");
+      sw.start(git || json || quiet);
+      return Promise.all([
+        // whoami
+        current.session,
+        // validate
+        validate({ root }),
+      ]);
     })
-    .then((issues) => {
+    .then(([session, issues]) => {
       const count = issues.length;
       if (count) {
-        throw new Error(
-          `${count} ${count === 1 ? "issue" : "issues"} found. Run \`arc validate\` for details.`,
-        );
+        throw new Error(phrase.issuesFound(count));
+      }
+      sw.stop();
+      sw = new SpinnerWheel("Building... %s");
+      sw.start(git || json || quiet);
+      return Promise.all([
+        // whoami
+        session,
+        // build
+        git ? null : build({ root }),
+      ]);
+    })
+    .then(([session, artifact]) => {
+      sw.stop();
+      sw = new SpinnerWheel("Packing... %s");
+      sw.start(git || json || quiet);
+      return Promise.all([
+        // whoami
+        session,
+        // pack
+        git ? null : pack({ input: artifact?.path, root }),
+      ]);
+    })
+    .then(([session, artifact]) => {
+      sw.stop(true);
+      if (!json && !quiet && !git) {
+        pb = new ProgressBar(artifact.size);
       }
-      return deploy({
-        git: argv.git,
-        handler: handler({ json, quiet }),
-        root,
-      });
+      return git
+        ? deploy({ handler: handler({ json, pb, quiet }), root })
+        : deploy({
+            artifact,
+            handler: handler({ json, pb, quiet }),
+            root,
+            session,
+          });
     })
-    .then((data) => {
+    .then((version) => {
       if (json) {
-        print({ version: data });
+        print({ version });
         return;
       }
       if (!quiet) {
-        log.p(`✓ Build v${data.to} submitted for release.`);
-        log.hs("Deployed.");
+        if (pb) {
+          sw.stop();
+          pb.stop();
+        } else {
+          sw.stop(true);
+        }
+        log.hs("Done.");
+        if (version) {
+          log.p(`Build v${version.to} submitted.`);
+          return;
+        }
+        log.p("Nothing to do.");
       }
     })
     .catch((ex) => {
@@ -111,6 +173,12 @@ const start = function (argv) {
       if (json) {
         print({ error: { message } });
       } else {
+        if (pb) {
+          sw.stop();
+          pb.stop();
+        } else {
+          sw.stop(true);
+        }
         log.hd("Deploy aborted.");
         log.p(message);
       }

package/bin/arc-init.js

@@ -14,7 +14,6 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
-const cfgurl = require("../src/config/url");
 const init = require("../src/cli/init");
 const log = require("../src/util/log");
 const output = require("../src/util/output");
@@ -28,7 +27,6 @@ const findRc = rc.findRc;
 const join = path.join;
 const pathExists = fs.pathExists;
 const print = output.print;
-const relative = path.relative;
 const resolve = path.resolve;
 const select = prompts.select;
 
@@ -51,12 +49,22 @@ const conf = {
 
 const handler = function ({ json, quiet }) {
   return {
-    onBegin() {
+    onInitBegin() {
       if (!json && !quiet) {
-        log.p("Initializing project...");
+        log.p("Initializing...");
+      }
+    },
+    onLogInfo({ level, message }) {
+      if (!json && !quiet) {
+        switch (level) {
+          case "warn":
+            log.pw(`⚠ ${message}`);
+            return;
+          default:
+            log.p(`· ${message}`);
+        }
       }
     },
-    onInfo() {},
   };
 };
 
@@ -67,33 +75,20 @@ const start = function (argv) {
   const quiet = argv.quiet;
   const root = resolve(process.cwd(), argv.cwd);
   return init({
-    force: false,
+    force: true,
     handler: handler({ json, quiet }),
     patch: argv.patch,
     project: argv.project,
     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.h("Next steps:");
-        log.p(
-          [
-            data.path === root ? null : `cd ${dir}`,
-            "arc login",
-            "arc deploy (or: arc deploy --git)",
-          ]
-            .filter(Boolean)
-            .map((step, i) => `${i + 1}. ${step}`),
-        );
+        log.hs("Done.");
       }
       // degit sometimes hangs
       process.exit(0);

package/bin/arc-login.js

@@ -5,6 +5,7 @@
 
 const hideBin = require("yargs/helpers").hideBin;
 const open = require("open");
+const qrcode = require("qrcode-terminal");
 const yargs = require("yargs/yargs");
 
 // [import]
@@ -27,12 +28,13 @@ const SUBCMD = "login";
 
 const conf = {
   browser: true,
+  qrcode: true,
   ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
 
-const onEnter = function (fn) {
+const onLoginEnter = function (fn) {
   const stdin = process.stdin;
   if (!stdin.isTTY) {
     return;
@@ -58,38 +60,43 @@ const onEnter = function (fn) {
 
 // [function]
 
-const handler = function ({ browser }) {
+const handler = function ({ browser, qrcode: qr }) {
   return {
-    onCreated({ code, url }) {
-      log.p(url);
-      log.h(code.toUpperCase());
-      if (browser) {
-        log.p("");
-        log.p("Press Enter to open the URL.");
-        onEnter(() => {
-          open(url).catch(() => {});
-        });
-      }
+    onLoginCreated({ code: dac, id, url }) {
+      const link = `${url}/${id}`;
+      qrcode.generate(link, { small: true }, (code) => {
+        if (qr) {
+          log.p(code);
+        }
+        log.nlp(url);
+        log.h(dac.toUpperCase());
+        if (browser) {
+          log.nlp("Press Enter to open the URL.");
+          onLoginEnter(() => {
+            open(link).catch(() => {});
+          });
+        }
+      });
     },
-    onPoll() {},
+    onLoginPoll() {},
   };
 };
 
 // [function]
 
 const start = function (argv) {
-  const browser = argv.browser;
-  log.pnl("Starting login...");
-  return login({ handler: handler({ browser }) })
+  log.p("Logging in...");
+  return login({
+    handler: handler({ browser: argv.browser, qrcode: argv.qrcode }),
+  })
     .then(({ profile }) => {
       process.stdin.pause();
-      log.p("");
-      log.p("Logged in as:");
-      log.hs(profile.display_name);
+      log.nlhs("Logged in.");
+      log.p(profile.display_name);
     })
     .catch((ex) => {
       process.stdin.pause();
-      log.hd("Login aborted.");
+      log.nlhd("Login aborted.");
       log.p(ex.message);
       process.exit(1);
     });
@@ -104,8 +111,12 @@ const main = function (argv) {
       .usage("$0 [options]")
       .option("browser", {
         default: conf.browser,
-        describe:
-          "Open a web browser automatically (disable with --no-browser)",
+        describe: "Open a web browser on Enter (disable with --no-browser)",
+        type: "boolean",
+      })
+      .option("qrcode", {
+        default: conf.qrcode,
+        describe: "Display a qrcode (disable with --no-qrcode)",
         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,
@@ -49,19 +51,22 @@ const start = function (argv) {
     .then((issues) => {
       const count = issues.length;
       if (count) {
-        throw new Error(
-          `${count} ${count === 1 ? "issue" : "issues"} found. Run \`arc validate\` for details.`,
-        );
+        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) => {
@@ -83,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

@@ -35,9 +35,9 @@ const conf = {
 
 const handler = function ({ json }) {
   return {
-    onRefresh(refresh) {
+    onAccountRefresh(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",
@@ -14,6 +15,8 @@
     "@inquirer/prompts": "^8.5.2",
     "adm-zip": "^0.5.16",
     "chalk": "^4.1.2",
+    "cli-progress": "^3.12.0",
+    "cli-spinner": "^0.2.10",
     "degit": "^2.8.6",
     "dompurify": "^3.3.1",
     "dot-prop": "^6.0.1",
@@ -25,6 +28,7 @@
     "mp4box": "^2.3.0",
     "open": "^8.4.2",
     "pretty-toml": "^1.0.0",
+    "qrcode-terminal": "^0.12.0",
     "rc": "^1.2.8",
     "semver": "^7.7.3",
     "yargs": "^17.7.2",
@@ -35,6 +39,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 +56,5 @@
   "license": "Apache-2.0",
   "main": "./src/cli/index.js",
   "name": "arcadible",
-  "version": "0.1.12"
+  "version": "0.1.14"
 }

package/src/account.js

@@ -62,7 +62,7 @@ const refresh = function ({ session, ...account }) {
 
 // [function]
 
-const get = function ({ onRefresh }) {
+const get = function (onRefresh) {
   return readFile(file, "utf8")
     .then(JSON.parse)
     .catch((ex) => {
@@ -76,7 +76,9 @@ const get = function ({ onRefresh }) {
         return null;
       }
       return expired(account.session)
-        ? onRefresh((renew) => (renew ? refresh(account) : null))
+        ? (onRefresh &&
+            onRefresh((renew) => (renew ? refresh(account) : null))) ||
+            null
         : account;
     });
 };