arcadible 0.1.2 → 0.1.4

package/bin/arc-deploy.js

@@ -33,8 +33,8 @@ const SUBCMD = "deploy";
 // [define]
 
 const conf = {
+  git: false,
   json: false,
-  production: false,
   quiet: false,
   ...findRc(CMD, SUBCMD, process.argv, ["--cwd", "-C"]),
 };
@@ -67,7 +67,6 @@ const handler = function ({ json, quiet }) {
 
 const start = function (argv) {
   const json = argv.json;
-  const pre = !argv.production;
   const quiet = argv.quiet;
   const root = resolve(process.cwd(), argv.cwd);
   return validate({ root })
@@ -77,10 +76,8 @@ const start = function (argv) {
         throw new Error("Validate failed. Run `arc validate` for details.");
       }
       return deploy({
-        direct: false,
+        git: argv.git,
         handler: handler({ json, quiet }),
-        pre,
-        preId: "rc",
         root,
       });
     })
@@ -90,7 +87,7 @@ const start = function (argv) {
         return;
       }
       if (!quiet) {
-        log.p(`✓ ${pre ? "Prerelease" : "Release"} v${data.to} submitted.`);
+        log.p(`✓ Build v${data.to} submitted for release.`);
         log.hs("Deployed.");
       }
     })
@@ -113,10 +110,10 @@ const main = function (argv) {
     yargs(hideBin(argv))
       .scriptName(`${CMD} ${SUBCMD}`)
       .usage("$0 [options]")
-      .option("production", {
-        alias: "p",
-        default: conf.production,
-        describe: "Deploy to production.",
+      .option("git", {
+        alias: "g",
+        default: conf.git,
+        describe: "Deploy through Git.",
         type: "boolean",
       })
       .option("json", {

package/package.json

@@ -51,5 +51,5 @@
   "license": "Apache-2.0",
   "main": "./src/cli/index.js",
   "name": "arcadible",
-  "version": "0.1.2"
+  "version": "0.1.4"
 }

package/src/action/deploy-git/git.js

@@ -8,15 +8,9 @@ const execFile = require("node:child_process").execFile;
 
 const semver = require("semver");
 
-// [import]
-
-const strs = require("../../util/strs");
-
 // [use]
 
-const compareSemver = semver.compare;
-const trimWhitespace = strs.trimWhitespace;
-const validSemver = semver.valid;
+const prereleaseSemver = semver.prerelease;
 
 // [declare]
 
@@ -32,8 +26,8 @@ const git = function (root, args, cb) {
 
 const ensureRepo = function (root, cb) {
   const message = [
-    "Unable to find Git repository.",
-    "Run this command from a Git repository.",
+    "Unable to find a Git repository.",
+    "Navigate to a Git repository and try again.",
   ];
   git(root, ["rev-parse", "--is-inside-work-tree"], (err) => {
     if (err) {
@@ -65,7 +59,7 @@ const ensureRemote = function (root, cb) {
 const ensureClean = function (root, cb) {
   const message = [
     "Unable to continue with unstaged changes.",
-    "Stage, commit, or discard local changes before deploying.",
+    "Stage, commit, or discard your local changes before deploying.",
   ];
   git(root, ["diff", "--quiet"], (err) => {
     if (err) {
@@ -92,50 +86,7 @@ const ensureClean = function (root, cb) {
 
 // [function]
 
-const fetchTags = function (root, cb) {
-  const message = [
-    "Unable to synchronize Git release tags.",
-    "Run `arc deploy` again to retry with the latest release tags.",
-  ];
-  git(
-    root,
-    ["fetch", "origin", `refs/tags/${PREFIX}*:refs/tags/${PREFIX}*`],
-    (err) => {
-      if (err) {
-        cb(new Error(message.join("\n"), { cause: err }));
-        return;
-      }
-      cb();
-    },
-  );
-};
-
-// [function]
-
-const listTags = function (root, cb) {
-  fetchTags(root, (err) => {
-    if (err) {
-      cb(err);
-      return;
-    }
-    git(root, ["tag", "--list", `${PREFIX}*`], (err, stdOut) => {
-      if (err) {
-        cb(err);
-        return;
-      }
-      const versions = trimWhitespace(stdOut)
-        .split("\n")
-        .map((tag) => tag.slice(PREFIX.length))
-        .filter(validSemver)
-        .sort(compareSemver);
-      cb(null, versions.at(-1) || "0.0.0");
-    });
-  });
-};
-
-// [function]
-
-const createTag = function (root, version, pre, cb) {
+const createTag = function (root, version, cb) {
   const message = [
     "Unable to create Git tag.",
     "Verify the release tag does not already exist locally.",
@@ -147,7 +98,9 @@ const createTag = function (root, version, pre, cb) {
       "-a",
       `${PREFIX}${version}`,
       "-m",
-      pre ? `Prerelease v${version}` : `Release v${version}`,
+      prereleaseSemver(version) === null
+        ? `Release v${version}`
+        : `Prerelease v${version}`,
     ],
     (err) => {
       if (err) {
@@ -164,7 +117,7 @@ const createTag = function (root, version, pre, cb) {
 const pushTag = function (root, version, cb) {
   const message = [
     "Unable to push Git tag.",
-    "Run `arc deploy` again to retry with the latest release version.",
+    "Verify the release tag does not already exist on remote 'origin'.",
   ];
   git(root, ["push", "origin", `${PREFIX}${version}`], (err) => {
     if (err) {
@@ -177,8 +130,8 @@ const pushTag = function (root, version, cb) {
 
 // [function]
 
-const release = function (root, version, pre, cb) {
-  createTag(root, version, pre, (err) => {
+const release = function (root, version, cb) {
+  createTag(root, version, (err) => {
     if (err) {
       cb(err);
       return;
@@ -189,4 +142,4 @@ const release = function (root, version, pre, cb) {
 
 // [export]
 
-module.exports = { ensureClean, ensureRemote, ensureRepo, listTags, release };
+module.exports = { ensureClean, ensureRemote, ensureRepo, release };

package/src/action/deploy-git/tool.js

@@ -2,43 +2,31 @@
 
 // [import]
 
-const semver = require("semver");
-
-// [import]
-
 const git = require("./git");
+const project = require("../../parser/project");
 
 // [use]
 
 const ensureClean = git.ensureClean;
 const ensureRemote = git.ensureRemote;
 const ensureRepo = git.ensureRepo;
-const incSemver = semver.inc;
-const listTags = git.listTags;
 const release = git.release;
 
 // [function]
 
-const deployGit = function ({ pre, preId, root }, handler, cb) {
-  listTags(root, (err, from) => {
+const deployRelease = function (version, { root }, handler, cb) {
+  release(root, version, (err) => {
     if (err) {
       cb(err);
       return;
     }
-    const to = incSemver(from, pre ? "prerelease" : "patch", preId);
-    release(root, to, pre, (err) => {
-      if (err) {
-        cb(err);
-        return;
-      }
-      cb(null, { from, to });
-    });
+    cb(null, { to: version });
   });
 };
 
 // [function]
 
-const deploy = function ({ pre, preId, root }, { onInfo }, cb) {
+const deployEnsure = function ({ root }, { onInfo }, cb) {
   ensureRepo(root, (err) => {
     if (err) {
       cb(err);
@@ -55,32 +43,41 @@ const deploy = function ({ pre, preId, root }, { onInfo }, cb) {
           message: "Staged but uncommitted changes will not be deployed.",
         });
       }
-      ensureRemote(root, (err) => {
-        if (err) {
-          cb(err);
-          return;
-        }
-        deployGit({ pre, preId, root }, { onInfo }, cb);
-      });
+      ensureRemote(root, cb);
     });
   });
 };
 
 // [function]
 
-const main = function ({ pre, preId, root }, { onBegin, ...handler }) {
-  onBegin({ root });
-  return new Promise((resolve, reject) => {
-    deploy({ pre, preId, root }, handler, (err, data) => {
-      if (err) {
-        reject(err);
-        return;
-      }
-      resolve(data);
-    });
+const deploy = function (version, { root }, handler, cb) {
+  deployEnsure({ root }, handler, (err) => {
+    if (err) {
+      cb(err);
+      return;
+    }
+    deployRelease(version, { root }, handler, cb);
   });
 };
 
+// [function]
+
+const main = function ({ root }, { onBegin, ...handler }) {
+  onBegin({ root });
+  return project.parse(root).then(
+    ({ game }) =>
+      new Promise((resolve, reject) => {
+        deploy(game.version, { root }, handler, (err, data) => {
+          if (err) {
+            reject(err);
+            return;
+          }
+          resolve(data);
+        });
+      }),
+  );
+};
+
 // [export]
 
 module.exports = main;

package/src/cli/deploy.js

@@ -7,8 +7,8 @@ const deployTool = require("../action/deploy/tool");
 
 // [function]
 
-const main = function ({ direct, handler, ...conf }) {
-  const tool = direct ? deployTool : deployGitTool;
+const main = function ({ git, handler, ...conf }) {
+  const tool = git ? deployGitTool : deployTool;
   return tool(conf, handler);
 };
 

package/src/parser/media.js

@@ -14,11 +14,11 @@ const objs = require("../util/objs");
 
 // [use]
 
+const compactObjs = objs.compact;
 const extname = path.extname;
 const join = path.join;
 const pathExists = fs.pathExists;
 const pathParse = path.parse;
-const pruneEmpty = objs.pruneEmpty;
 const readdir = fs.promises.readdir;
 
 // [declare]
@@ -84,7 +84,7 @@ const parse = function (root) {
     Promise.resolve({})
       .then(art(root))
       .then(gallery(root))
-      .then(pruneEmpty)
+      .then(compactObjs)
       .then((game) => ({ game }))
       .then(resolve)
       .catch(reject);

package/src/parser/readme.js

@@ -17,9 +17,9 @@ const strs = require("../util/strs");
 
 // [use]
 
+const compactObjs = objs.compact;
 const join = path.join;
 const pathExists = fs.pathExists;
-const pruneEmpty = objs.pruneEmpty;
 const readFile = fs.readFile;
 const trimWhitespace = strs.trimWhitespace;
 
@@ -145,7 +145,7 @@ const parse = function (root) {
   return findReadme(root)
     .then((file) => (file ? readFile(join(root, file), "utf8") : null))
     .then((buf) => (buf === null ? null : parseReadme(buf)))
-    .then(pruneEmpty)
+    .then(compactObjs)
     .then((game) => ({ game: game || null }));
 };
 

package/src/user.js

@@ -11,6 +11,7 @@ const fs = require("fs-extra");
 // [import]
 
 const api = require("./api");
+const objs = require("./util/objs");
 const os = require("./util/os");
 
 // [use]
@@ -19,6 +20,7 @@ const configDir = os.configDir;
 const join = path.join;
 const mkdir = fs.promises.mkdir;
 const readFile = fs.promises.readFile;
+const sortObjs = objs.sort;
 const unlink = fs.promises.unlink;
 const writeFile = fs.promises.writeFile;
 
@@ -42,7 +44,9 @@ const expired = function (session) {
 
 const save = function (user) {
   return mkdir(dir, { recursive: true })
-    .then(() => writeFile(file, JSON.stringify(user, null, 2), "utf8"))
+    .then(() =>
+      writeFile(file, JSON.stringify(sortObjs(user), null, 2), "utf8"),
+    )
     .then(() => user);
 };
 

package/src/util/objs.js

@@ -6,19 +6,19 @@ const stringify = require("fast-json-stable-stringify");
 
 // [function]
 
-const pruneEmpty = function (value) {
+const compact = function (value) {
   /* eslint-disable no-undefined */
   if (value === null || value === undefined) {
     return undefined;
   }
   if (Array.isArray(value)) {
-    const cleaned = value.map(pruneEmpty).filter((v) => v !== undefined);
+    const cleaned = value.map(compact).filter((v) => v !== undefined);
     return cleaned.length ? cleaned : undefined;
   }
   if (typeof value === "object") {
     const cleaned = Object.fromEntries(
       Object.entries(value)
-        .map(([k, v]) => [k, pruneEmpty(v)])
+        .map(([k, v]) => [k, compact(v)])
         .filter(([, v]) => v !== undefined),
     );
     return Object.keys(cleaned).length ? cleaned : undefined;
@@ -35,4 +35,4 @@ const sort = function (value) {
 
 // [export]
 
-module.exports = { pruneEmpty, sort };
+module.exports = { compact, sort };

package/src/util/output.js

@@ -10,7 +10,7 @@ const objs = require("./objs");
 
 // [use]
 
-const sort = objs.sort;
+const sortObjs = objs.sort;
 
 // [function]
 
@@ -21,7 +21,7 @@ const write = function (data) {
 // [function]
 
 const printJson = function (data) {
-  write(JSON.stringify(sort(data), null, 2));
+  write(JSON.stringify(sortObjs(data), null, 2));
 };
 
 // [function]
@@ -33,7 +33,7 @@ const printToml = function (data, key = "value") {
     return;
   }
   try {
-    write(TOML.stringify(sort(data)));
+    write(TOML.stringify(sortObjs(data)));
   } catch (ex) {
     write(TOML.stringify({ [field]: data }));
   }

package/src/util/schema.js

@@ -11,7 +11,7 @@ const format = function (name, error) {
 // [function]
 
 const validator = function (name, schema) {
-  return function (value, conf) {
+  return (value, conf) => {
     const result = schema(value, conf).safeParse(value);
     if (!result.success) {
       return { issues: format(name, result.error) };

package/src/util/zip.js

@@ -9,10 +9,15 @@ const path = require("node:path");
 
 const AdmZip = require("adm-zip");
 
+// [import]
+
+const objs = require("./objs");
+
 // [use]
 
 const createHash = crypto.createHash;
 const join = path.join;
+const sortObjs = objs.sort;
 
 // [class]
 
@@ -35,7 +40,10 @@ const Main = class {
 
   addJson(name, value) {
     const entry = join(this.prefix, name);
-    const content = Buffer.from(JSON.stringify(value, null, 2), "utf8");
+    const content = Buffer.from(
+      JSON.stringify(sortObjs(value), null, 2),
+      "utf8",
+    );
     this.zip.addFile(entry, content);
   }