arcadible 0.1.20 → 0.1.22

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,7 +31,7 @@ const parse = function (cli) {
 const main = function (argv) {
   return parse(
     yargs(hideBin(argv))
-      .scriptName(CMD)
+      .scriptName(TOOL)
       .usage("$0 <command> [options]")
       .command("init", "Initialize project")
       .command("inspect", "Inspect project")
@@ -38,12 +41,12 @@ const main = function (argv) {
       .command("deploy", "Deploy project")
       .command("open", "Open a game's store page")
       .command("play", "Play a game")
-      .command("login", "Log in to Arcadible")
-      .command("whoami", "Show Arcadible account")
-      .command("logout", "Log out of Arcadible")
+      .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,8 +37,9 @@ const SpinnerWheel = spinner.SpinnerWheel;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "deploy";
+const COMMAND = "deploy";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [define]
 
@@ -45,7 +47,7 @@ const conf = {
   json: false,
   method: "direct",
   quiet: false,
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
@@ -114,57 +116,56 @@ const start = function (argv) {
       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,7 +211,7 @@ const start = function (argv) {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
+      .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [method] [options]")
       .command("$0 [method]", false, (cli) =>
         cli.positional("method", {
@@ -240,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]
@@ -138,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", {
@@ -149,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", {
@@ -178,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,10 +12,11 @@ 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");
 
@@ -28,15 +29,16 @@ 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 = {
   json: false,
   selector: null,
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
@@ -87,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", {
@@ -110,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

@@ -9,9 +9,11 @@ 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");
@@ -24,15 +26,16 @@ 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]
@@ -95,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);
@@ -115,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,
@@ -129,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,9 +8,10 @@ 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]
@@ -19,14 +20,15 @@ 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(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
@@ -50,7 +52,7 @@ const start = function (argv) {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
+      .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
       .option("quiet", {
         alias: "q",
@@ -60,7 +62,7 @@ const main = function (argv) {
       })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),

package/bin/arc-open.js

@@ -12,11 +12,12 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
 const cfguri = require("../src/config/uri");
 const log = require("../src/util/log");
 const open = require("../src/cli/open");
 const phrase = require("../src/phrase");
-const pkg = require("../package.json");
 const rc = require("../src/util/rc");
 const shell = require("../src/util/shell");
 
@@ -28,15 +29,16 @@ const resolve = path.resolve;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "open";
+const COMMAND = "open";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [define]
 
 const conf = {
   browser: false,
   game: "self",
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
@@ -51,10 +53,13 @@ const start = function (argv) {
       if (!page) {
         throw new Error(phrase.noGameId());
       }
+      if (argv.browser) {
+        launch(`${cfguri.HOST_HTTP_WWW}${page}`);
+        return;
+      }
       launch(
-        argv.browser
-          ? `${cfguri.HOST_HTTP_WWW}${page}`
-          : `${cfguri.HOST_APP_STORE}${page}`,
+        `${cfguri.HOST_APP_STORE}${page}`,
+        `${cfguri.HOST_HTTP_WWW}${page}`,
       );
     })
     .catch((ex) => {
@@ -69,7 +74,7 @@ const start = function (argv) {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
+      .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [game] [options]")
       .command("$0 [game]", false, (cli) =>
         cli.positional("game", {
@@ -91,7 +96,7 @@ const main = function (argv) {
       })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),

package/bin/arc-pack.js

@@ -12,12 +12,12 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
-const cfgworkflow = require("../src/config/workflow");
+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 pack = require("../src/cli/pack");
 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");
@@ -31,17 +31,18 @@ const SpinnerWheel = spinner.SpinnerWheel;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "pack";
+const COMMAND = "pack";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [define]
 
 const conf = {
-  input: cfgworkflow.deploy_dir,
+  input: null,
   json: false,
-  output: ".arc/package/game.zip",
+  output: null,
   quiet: false,
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
@@ -95,7 +96,7 @@ const start = function (argv) {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
+      .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
       .option("input", {
         alias: "i",
@@ -129,7 +130,7 @@ const main = function (argv) {
       })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),

package/bin/arc-play.js

@@ -12,10 +12,11 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const cfgpackage = require("../src/config/package");
+const cfgproduct = require("../src/config/product");
 const cfguri = require("../src/config/uri");
 const log = require("../src/util/log");
 const phrase = require("../src/phrase");
-const pkg = require("../package.json");
 const play = require("../src/cli/play");
 const rc = require("../src/util/rc");
 const shell = require("../src/util/shell");
@@ -30,8 +31,9 @@ const SpinnerWheel = spinner.SpinnerWheel;
 
 // [declare]
 
-const CMD = "arc";
-const SUBCMD = "play";
+const COMMAND = "play";
+const TOOL = cfgproduct.tool;
+const VERSION = cfgpackage.version;
 
 // [define]
 
@@ -40,7 +42,7 @@ const conf = {
   game: "self",
   quiet: false,
   release: "production",
-  ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
 };
 
 // [function]
@@ -70,9 +72,11 @@ const start = function (argv) {
         throw new Error(phrase.noGameId());
       }
       sw.stop(true);
-      launch(
-        argv.browser ? url : `${cfguri.HOST_APP_PLAY}/${orientation}/${url}`,
-      );
+      if (argv.browser) {
+        launch(url);
+        return;
+      }
+      launch(`${cfguri.HOST_APP_PLAY}/${orientation}/${url}`, url);
     })
     .catch((ex) => {
       sw.stop(true);
@@ -87,7 +91,7 @@ const start = function (argv) {
 const main = function (argv) {
   return start(
     yargs(hideBin(argv))
-      .scriptName(`${CMD} ${SUBCMD}`)
+      .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [game] [options]")
       .command("$0 [game]", false, (cli) =>
         cli.positional("game", {
@@ -121,7 +125,7 @@ const main = function (argv) {
       })
       .help("help")
       .alias("help", "h")
-      .version(pkg.version)
+      .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),