arcadible 0.1.35 → 0.1.36

package/package.json

@@ -75,5 +75,5 @@
   "scripts": {
     "test": "node --test \"test/**/*.test.js\""
   },
-  "version": "0.1.35"
+  "version": "0.1.36"
 }

package/src/schema/workflow.js

@@ -33,6 +33,16 @@ const RESERVED = [`${HANDLE}.json`, MEDIA];
 
 // [function]
 
+// whether `build` runs anything: a command that isn't blank, as `arc build`
+// trims and drops blank ones (action/build/tool.js).
+const hasBuild = function (build) {
+  return [build]
+    .flat()
+    .some((cmd) => typeof cmd === "string" && cmd.trim() !== "");
+};
+
+// [function]
+
 const zBuild = function () {
   // const field = "build";
   return z.union([z.string(), z.array(z.string())]);
@@ -70,7 +80,7 @@ const zDeployDir = function (root, { build }) {
       ),
     )
     .refine(
-      (file) => build || existsCheck(root, file),
+      (file) => hasBuild(build) || existsCheck(root, file),
       message(
         field,
         [

package/src/util/argv.js

@@ -55,20 +55,29 @@ const cwd = function (args) {
 
 // [function]
 
+// whether `argv` passes --json, before the command parses its options.
+const json = function (argv) {
+  return parse(normalize(hideBin(argv)), {
+    alias: { json: ["j"] },
+    boolean: ["json"],
+  }).json;
+};
+
+// [function]
+
 // yargs' failure handler for a command with --json: an argument error is
 // one JSON document when --json was passed (OUTPUT.md), and yargs' own help
 // and message otherwise.
 const fail = function (argv) {
-  const json = parse(normalize(hideBin(argv)), {
-    alias: { json: ["j"] },
-    boolean: ["json"],
-  }).json;
+  const asJson = json(argv);
   return (message, ex, cli) => {
     if (ex) {
       throw ex;
     }
-    if (json) {
-      abort("", new ArcError(cfgcode.ARGUMENT_INVALID, message), { json });
+    if (asJson) {
+      abort("", new ArcError(cfgcode.ARGUMENT_INVALID, message), {
+        json: asJson,
+      });
     }
     cli.showHelp("error");
     console.error(`\n${message}`);
@@ -78,4 +87,4 @@ const fail = function (argv) {
 
 // [export]
 
-module.exports = { CWD, cwd, fail, normalize };
+module.exports = { CWD, cwd, fail, json, normalize };

package/src/util/rc.js

@@ -13,9 +13,15 @@ const ini = require("ini");
 // [import]
 
 const args = require("./argv");
+const cfgcode = require("../config/code");
+const error = require("./error");
+const output = require("./output");
+const phrase = require("../phrase");
 
 // [use]
 
+const abort = output.abort;
+const ArcError = error.ArcError;
 const cwd = args.cwd;
 const dirname = path.dirname;
 const existsSync = fs.existsSync; // eslint-disable-line no-sync
@@ -60,7 +66,6 @@ const files = function (cmd, argv) {
       ? []
       : [join("/etc", cmd, "config"), join("/etc", `${cmd}rc`)]),
     join(home, ".config", cmd, "config"),
-    join(home, ".config", cmd),
     join(home, `.${cmd}`, "config"),
     join(home, `.${cmd}rc`),
     nearest(cmd),
@@ -70,7 +75,8 @@ const files = function (cmd, argv) {
 
 // [function]
 
-// a file's sections, INI or JSON, or nothing when it can't be read.
+// a file's sections, INI or JSON, or nothing when it can't be read. JSON
+// that doesn't parse is `parse_failed`, naming the file.
 const read = function (file) {
   let str = null;
   try {
@@ -78,18 +84,37 @@ const read = function (file) {
   } catch (ex) {
     return {};
   }
-  return /^\s*\{/u.test(str) ? JSON.parse(str) : ini.parse(str);
+  if (!/^\s*\{/u.test(str)) {
+    return ini.parse(str);
+  }
+  try {
+    return JSON.parse(str);
+  } catch (ex) {
+    throw new ArcError(
+      cfgcode.PARSE_FAILED,
+      phrase.unableToParse(file, ex.message),
+      { cause: ex },
+    );
+  }
 };
 
 // [function]
 
 // a command's section of .<cmd>rc, merged from the files `rc` reads. Unlike
-// `rc`, environment variables and `--config` aren't read.
+// `rc`, environment variables and `--config` aren't read. Options are read as
+// the command loads, so a file that doesn't parse aborts the command here,
+// as `<Command> aborted.`.
 const findRc = function (cmd, subcmd, argv) {
-  return [...new Set(files(cmd, argv))].reduce(
-    (found, file) => ({ ...found, ...read(file)[subcmd] }),
-    {},
-  );
+  try {
+    return [...new Set(files(cmd, argv))].reduce(
+      (found, file) => ({ ...found, ...read(file)[subcmd] }),
+      {},
+    );
+  } catch (ex) {
+    return abort(`${subcmd[0].toUpperCase()}${subcmd.slice(1)} aborted.`, ex, {
+      json: args.json(argv),
+    });
+  }
 };
 
 // [export]