arcadible 0.1.19 → 0.1.21

package/bin/arc-build.js

@@ -13,10 +13,11 @@ const yargs = require("yargs/yargs");
 // [import]
 
 const build = require("../src/cli/build");
+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 pkg = require("../package.json");
 const rc = require("../src/util/rc");
 const spinner = require("../src/util/spinner");
 const validate = require("../src/cli/validate");
@@ -30,15 +31,16 @@ const SpinnerWheel = spinner.SpinnerWheel;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "build";
+const COMMAND = "build";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [define]
 
 const conf = {
   json: false,
   quiet: false,
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
@@ -92,7 +94,7 @@ const start = function (argv) {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
+      .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
       .option("json", {
         alias: "j",
@@ -114,7 +116,7 @@ const main = function (argv) {
       })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),

package/bin/arc-default.js

@@ -8,11 +8,14 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
-const pkg = require("../package.json");
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
 
 // [declare]
 
-const CMD = "arc";
+const TITLE = cfgproduct.title;
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [function]
 
@@ -28,20 +31,22 @@ const parse = function (cli) {
 const main = function (argv) {
   return parse(
     yargs(hideBin(argv))
-      .scriptName(CMD)
+      .scriptName(TOOL)
       .usage("$0 <command> [options]")
-      .command("init", "Initialize a project")
-      .command("validate", "Validate project workspace")
-      .command("deploy", "Deploy to Arcadible")
+      .command("init", "Initialize project")
       .command("inspect", "Inspect project")
-      .command("count", "Show game counts")
+      .command("validate", "Validate project")
+      .command("build", "Build project")
+      .command("pack", "Package project")
+      .command("deploy", "Deploy project")
+      .command("open", "Open a game's store page")
       .command("play", "Play a game")
-      .command("login", "Log in to Arcadible")
-      .command("logout", "Log out of Arcadible")
-      .command("whoami", "Show Arcadible account")
+      .command("login", `Log in to ${TITLE}`)
+      .command("whoami", `Show ${TITLE} account`)
+      .command("logout", `Log out of ${TITLE}`)
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict(),
   );

package/bin/arc-deploy.js

@@ -13,12 +13,13 @@ const yargs = require("yargs/yargs");
 // [import]
 
 const build = require("../src/cli/build");
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
 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 predeploy = require("../src/cli/predeploy");
 const progress = require("../src/util/progress");
 const rc = require("../src/util/rc");
@@ -36,16 +37,17 @@ const SpinnerWheel = spinner.SpinnerWheel;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "deploy";
+const COMMAND = "deploy";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [define]
 
 const conf = {
-  git: false,
   json: false,
+  method: "direct",
   quiet: false,
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
@@ -97,7 +99,7 @@ const handler = function ({ json, pb, quiet, sw }) {
 // [function]
 
 const start = function (argv) {
-  const git = argv.git;
+  const git = argv.method === "git";
   const json = argv.json;
   const quiet = argv.quiet;
   const root = resolve(process.cwd(), argv.cwd);
@@ -110,61 +112,60 @@ const start = function (argv) {
         throw new Error(phrase.issuesFound(count));
       }
       sw.stop();
-      sw = new SpinnerWheel("Checking login... %s");
+      sw = new SpinnerWheel("Checking... %s");
       return whoami({ handler: handler({ json, pb, quiet, sw }) });
     })
     .then((current) => {
-      const session = current?.session;
-      if (!session) {
+      if (!current) {
         throw new Error(phrase.notLoggedIn());
       }
       sw.stop();
       sw = new SpinnerWheel("Preparing... %s");
       return Promise.all([
         // whoami
-        session,
+        current,
         // predeploy
         predeploy({
+          current,
           git,
           handler: handler({ json, pb, quiet, sw }),
           root,
-          session,
         }),
       ]);
     })
-    .then(([session]) => {
+    .then(([current]) => {
       sw.stop();
       sw = new SpinnerWheel("Building... %s");
       sw.start(git || json || quiet);
       return Promise.all([
         // whoami
-        session,
+        current,
         // build
         git ? null : build({ root }),
       ]);
     })
-    .then(([session, artifact]) => {
+    .then(([current, artifact]) => {
       sw.stop();
       sw = new SpinnerWheel("Packing... %s");
       sw.start(git || json || quiet);
       return Promise.all([
         // whoami
-        session,
+        current,
         // pack
         git ? null : pack({ input: artifact?.path, root }),
       ]);
     })
-    .then(([session, artifact]) => {
+    .then(([current, artifact]) => {
       sw.stop(true);
       if (!json && !quiet && !git) {
         pb = new ProgressBar(artifact.size);
       }
       return deploy({
         artifact,
+        current,
         git,
         handler: handler({ json, pb, quiet, sw }),
         root,
-        session,
       });
     })
     .then((version) => {
@@ -210,13 +211,16 @@ const start = function (argv) {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
-      .usage("$0 [options]")
-      .option("git", {
-        default: conf.git,
-        describe: "Deploy using Git workflow",
-        type: "boolean",
-      })
+      .scriptName(`${TOOL} ${COMMAND}`)
+      .usage("$0 [method] [options]")
+      .command("$0 [method]", false, (cli) =>
+        cli.positional("method", {
+          choices: ["direct", "git"],
+          default: conf.method,
+          describe: "Deploy method",
+          type: "string",
+        }),
+      )
       .option("json", {
         alias: "j",
         default: conf.json,
@@ -237,7 +241,7 @@ const main = function (argv) {
       })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),

package/bin/arc-init.js

@@ -14,10 +14,11 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
 const init = require("../src/cli/init");
 const log = require("../src/util/log");
 const output = require("../src/util/output");
-const pkg = require("../package.json");
 const rc = require("../src/util/rc");
 const spinner = require("../src/util/spinner");
 const template = require("../src/prompt/template");
@@ -34,8 +35,9 @@ const SpinnerWheel = spinner.SpinnerWheel;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "init";
+const COMMAND = "init";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [define]
 
@@ -44,7 +46,7 @@ const conf = {
   project: ".",
   quiet: false,
   yes: false,
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
@@ -73,14 +75,13 @@ const handler = function ({ json, quiet, sw }) {
 const start = function (argv) {
   const json = argv.json;
   const quiet = argv.quiet;
-  const root = resolve(process.cwd(), argv.cwd);
   const sw = new SpinnerWheel("Initializing... %s");
   return init({
     force: true,
     handler: handler({ json, quiet, sw }),
     patch: argv.patch,
     project: argv.project,
-    root,
+    root: resolve(process.cwd(), argv.cwd),
     template: argv.template,
   })
     .then((project) => {
@@ -139,7 +140,7 @@ const prompt = async function ({ yes, ...argv }) {
 const main = function (argv) {
   return prompt(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
+      .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [project] [options]")
       .command("$0 [project]", false, (cli) =>
         cli.positional("project", {
@@ -150,7 +151,10 @@ const main = function (argv) {
       )
       .option("template", {
         alias: "t",
-        describe: "Project template",
+        describe: [
+          "Project template",
+          "Public GitHub repository (format: user/repo).",
+        ].join("\n"),
         type: "string",
       })
       .option("yes", {
@@ -179,7 +183,7 @@ const main = function (argv) {
       })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),

package/bin/arc-inspect.js

@@ -12,30 +12,43 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
 const inspect = require("../src/cli/inspect");
 const log = require("../src/util/log");
 const output = require("../src/util/output");
-const pkg = require("../package.json");
 const rc = require("../src/util/rc");
+const spinner = require("../src/util/spinner");
 
 // [use]
 
 const findRc = rc.findRc;
 const print = output.print;
 const resolve = path.resolve;
+const SpinnerWheel = spinner.SpinnerWheel;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "inspect";
+const COMMAND = "inspect";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [define]
 
 const conf = {
-  game: "self",
   json: false,
-  selector: "",
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  selector: null,
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
+};
+
+// [function]
+
+const handler = function ({ json, sw }) {
+  return {
+    onInspectFetch() {
+      sw.start(json);
+    },
+  };
 };
 
 // [function]
@@ -43,19 +56,27 @@ const conf = {
 const start = function (argv) {
   const json = argv.json;
   const selector = argv.selector;
+  const sw = new SpinnerWheel("Loading... %s");
   return inspect({
-    game: argv.game,
+    game: null,
+    handler: handler({ json, sw }),
     root: resolve(process.cwd(), argv.cwd),
     selector,
   })
     .then((data) => {
-      print(data, { key: selector, toml: !json });
+      if (json) {
+        print(data);
+        return;
+      }
+      sw.stop(true);
+      print(data, { key: selector, toml: true });
     })
     .catch((ex) => {
       const message = ex.message;
       if (json) {
         print({ error: { message } });
       } else {
+        sw.stop(true);
         log.hd("Inspect aborted.");
         log.p(message);
       }
@@ -68,7 +89,7 @@ const start = function (argv) {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
+      .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [selector] [options]")
       .command("$0 [selector]", false, (cli) =>
         cli.positional("selector", {
@@ -77,12 +98,6 @@ const main = function (argv) {
           type: "string",
         }),
       )
-      .option("game", {
-        alias: "g",
-        default: conf.game,
-        describe: "Game handle or ID",
-        type: "string",
-      })
       .option("json", {
         alias: "j",
         default: conf.json,
@@ -97,7 +112,7 @@ const main = function (argv) {
       })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),

package/bin/arc-login.js

@@ -4,34 +4,38 @@
 // [import]
 
 const hideBin = require("yargs/helpers").hideBin;
-const open = require("open");
 const qrcode = require("qrcode-terminal");
 const yargs = require("yargs/yargs");
 
 // [import]
 
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
 const log = require("../src/util/log");
 const login = require("../src/cli/login");
-const pkg = require("../package.json");
+const phrase = require("../src/phrase");
 const rc = require("../src/util/rc");
+const shell = require("../src/util/shell");
 const spinner = require("../src/util/spinner");
 
 // [use]
 
 const findRc = rc.findRc;
+const launch = shell.launch;
 const SpinnerWheel = spinner.SpinnerWheel;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "login";
+const COMMAND = "login";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [define]
 
 const conf = {
   browser: true,
   qrcode: true,
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
@@ -77,7 +81,7 @@ const handler = function ({ browser, qrcode: qr, sw }) {
         if (browser) {
           log.nlp("Press Enter to open the URL.");
           onLoginEnter(() => {
-            open(link).catch(() => {});
+            launch(link);
           });
         }
       });
@@ -94,11 +98,15 @@ const start = function (argv) {
   return login({
     handler: handler({ browser: argv.browser, qrcode: argv.qrcode, sw }),
   })
-    .then(({ profile }) => {
+    .then((current) => {
+      const user = current?.user;
+      if (!user) {
+        throw new Error(phrase.notLoggedIn());
+      }
       sw.stop(true);
       process.stdin.pause();
       log.nlhs("Logged in.");
-      log.p(profile.display_name);
+      log.p(user.display_name);
     })
     .catch((ex) => {
       sw.stop(true);
@@ -114,7 +122,7 @@ const start = function (argv) {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
+      .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
       .option("browser", {
         default: conf.browser,
@@ -128,7 +136,7 @@ const main = function (argv) {
       })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),

package/bin/arc-logout.js

@@ -8,21 +8,37 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
 const log = require("../src/util/log");
 const logout = require("../src/cli/logout");
-const pkg = require("../package.json");
+const rc = require("../src/util/rc");
+
+// [use]
+
+const findRc = rc.findRc;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "logout";
+const COMMAND = "logout";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
+
+// [define]
+
+const conf = {
+  quiet: false,
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
+};
 
 // [function]
 
-const start = function () {
+const start = function (argv) {
   return logout()
     .then(() => {
-      log.hs("Logged out.");
+      if (!argv.quiet) {
+        log.hs("Logged out.");
+      }
     })
     .catch((ex) => {
       log.hd("Logout aborted.");
@@ -36,11 +52,17 @@ const start = function () {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
+      .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
+      .option("quiet", {
+        alias: "q",
+        default: conf.quiet,
+        describe: "Output only errors",
+        type: "boolean",
+      })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),