arcadible 0.1.6 → 0.1.7

package/package.json

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

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

@@ -2,7 +2,7 @@
 
 // [import]
 
-const execFile = require("node:child_process").execFile;
+const cp = require("node:child_process");
 
 // [import]
 
@@ -10,6 +10,7 @@ const semver = require("semver");
 
 // [use]
 
+const execFile = cp.execFile;
 const prereleaseSemver = semver.prerelease;
 
 // [declare]

package/src/config/workflow.js

@@ -4,7 +4,7 @@
 
 module.exports = {
   /* eslint-disable camelcase */
+  build: "",
   deploy_dir: ".arcadible-public",
-  skip_build: true,
   /* eslint-enable camelcase */
 };

package/src/parser/pkg.js

@@ -40,7 +40,7 @@ const parseJson = function (buf) {
 const extract = function (pkg) {
   /* eslint-disable camelcase */
   const game = { version: pkg.version };
-  const workflow = { skip_build: pkg.scripts?.build ? false : null };
+  const workflow = { build: pkg.scripts?.build ?? "" };
   /* eslint-enable camelcase */
   return deepCompact({ game, workflow });
 };

package/src/schema/game.js

@@ -42,8 +42,14 @@ const reference = function (field) {
 
 // [function]
 
-const message = function (field, msg) {
-  return { message: [msg, indentLines(reference(field))].join("\n") };
+const message = function (field, lines) {
+  const [first, ...rest] = [...lines, reference(field)];
+  return {
+    message:
+      [first, ...rest].length > 1
+        ? [first, indentLines(rest.join("\n"))].join("\n")
+        : first,
+  };
 };
 
 // [function]
@@ -55,7 +61,7 @@ const zText = function (field, { max, min }) {
     .max(max)
     .regex(
       /^[\p{L}0-9 .,!?'"():;-]+$/u,
-      message(field, "Contains invalid characters."),
+      message(field, ["Contains invalid characters."]),
     );
 };
 
@@ -67,17 +73,17 @@ const zMedia = function (field, root) {
     .min(1)
     .refine(
       (file) => isRelativeCheck(root, file),
-      message(field, "Must be a relative path."),
+      message(field, ["Must be a relative path."]),
     )
     .refine(
       (file) => isOutCheck(root, file),
-      message(field, "Must be within the project."),
+      message(field, ["Must be within the project."]),
     )
     .refine(
       (file) => isInCheck(root, file, MEDIA),
-      message(field, `Must be within ${MEDIA}.`),
+      message(field, [`Must be within ${MEDIA}.`]),
     )
-    .refine((file) => existsCheck(root, file), message(field, "Must exist."));
+    .refine((file) => existsCheck(root, file), message(field, ["Must exist."]));
 };
 
 // [function]
@@ -85,7 +91,7 @@ const zMedia = function (field, root) {
 const zPng = function (field, root, opts) {
   return zMedia(field, root).refine(
     (file) => imageCheck(root, file, { ...opts, type: "image/png" }),
-    message(field, "Invalid PNG."),
+    message(field, ["Invalid PNG."]),
   );
 };
 
@@ -94,7 +100,7 @@ const zPng = function (field, root, opts) {
 const zSvg = function (field, root, opts) {
   return zMedia(field, root).refine(
     (file) => imageCheck(root, file, { ...opts, type: "image/svg+xml" }),
-    message(field, "Invalid SVG."),
+    message(field, ["Invalid SVG."]),
   );
 };
 
@@ -108,7 +114,7 @@ const zMp4 = function (field, root, opts) {
         ...opts,
         type: "video/mp4",
       }),
-    message(field, "Invalid MP4."),
+    message(field, ["Invalid MP4."]),
   );
 };
 
@@ -218,7 +224,7 @@ const zDescription = function () {
             ALLOWED_ATTR: cfghtml.ALLOWED_ATTR,
             ALLOWED_TAGS: cfghtml.ALLOWED_TAGS,
           }),
-        message(field, "Contains invalid elements."),
+        message(field, ["Contains invalid elements."]),
       ),
   );
 };
@@ -256,7 +262,7 @@ const zHandle = function () {
       .string()
       .regex(
         /^[a-z0-9](?:(?![-]{2})[a-z0-9-]){1,22}[a-z0-9]$/u,
-        message(field, "Contains invalid characters."),
+        message(field, ["Contains invalid characters."]),
       ),
   );
 };
@@ -295,10 +301,10 @@ const zId = function () {
   const field = "id";
   return z
     .string()
-    .uuid(message(field, "Must be a valid UUID."))
+    .uuid(message(field, ["Must be a valid UUID."]))
     .refine(
       (value) => value === value.toLowerCase(),
-      message(field, "Must use lowercase characters."),
+      message(field, ["Must use lowercase characters."]),
     );
 };
 
@@ -382,7 +388,7 @@ const zTrailer = function () {
     .refine(
       (url) =>
         zVimeo().safeParse(url).success || zYouTube().safeParse(url).success,
-      message(field, "Must be a YouTube (or Vimeo) URL."),
+      message(field, ["Must be a YouTube (or Vimeo) URL."]),
     )
     .optional();
 };
@@ -395,7 +401,7 @@ const zVersion = function () {
     .string()
     .refine(
       (value) => validSemver(value) !== null,
-      message(field, "Must be a valid semver."),
+      message(field, ["Must be a valid semver."]),
     );
 };
 

package/src/schema/workflow.js

@@ -31,55 +31,58 @@ const reference = function (field) {
 
 // [function]
 
-const message = function (field, msg) {
-  return { message: [msg, indentLines(reference(field))].join("\n") };
+const message = function (field, lines) {
+  const [first, ...rest] = [...lines, reference(field)];
+  return {
+    message:
+      [first, ...rest].length > 1
+        ? [first, indentLines(rest.join("\n"))].join("\n")
+        : first,
+  };
 };
 
 // [function]
 
-const zMedia = function (field, root, { skipBuild }) {
+const zBuild = function () {
+  // const field = "build";
+  return z.string();
+};
+
+// [function]
+
+const zDeployDir = function (root, { build }) {
+  const field = "deploy_dir";
   return z
     .string()
     .min(1)
     .refine(
       (file) => isRelativeCheck(root, file),
-      message(field, "Must be a relative path."),
+      message(field, ["Must be a relative path."]),
     )
     .refine(
       (file) => isOutCheck(root, file),
-      message(field, "Must be within the project."),
+      message(field, ["Must be within the project."]),
     )
     .refine(
       (file) => isReservedCheck(root, file, MEDIA),
-      message(field, `Must not contain ${MEDIA}.`),
+      message(field, [`Must not contain ${MEDIA}.`]),
     )
     .refine(
-      (file) => !skipBuild || existsCheck(root, file),
-      message(field, "Must exist."),
+      (file) => build || existsCheck(root, file),
+      message(field, [
+        "Must exist if there is no build step.",
+        "Run `arc inspect workflow.deploy_dir` for its value.",
+      ]),
     );
 };
 
 // [function]
 
-const zDeployDir = function (root, { skip_build: skipBuild }) {
-  const field = "deploy_dir";
-  return zMedia(field, root, { skipBuild });
-};
-
-// [function]
-
-const zSkipBuild = function () {
-  // const field = "skip_build";
-  return z.boolean();
-};
-
-// [function]
-
 const main = function (value, { root }) {
   /* eslint-disable camelcase */
   return z.object({
+    build: zBuild(),
     deploy_dir: zDeployDir(root, value),
-    skip_build: zSkipBuild(),
   });
   /* eslint-enable camelcase */
 };