arcadible 0.1.28 → 0.1.29

package/package.json

@@ -61,5 +61,5 @@
   "license": "Apache-2.0",
   "main": "./src/cli/index.js",
   "name": "arcadible",
-  "version": "0.1.28"
+  "version": "0.1.29"
 }

package/src/config/html.js

@@ -4,7 +4,7 @@
 
 module.exports = {
   allowed: {
-    a: ["href", "alt", "title"],
+    a: ["href", "title"],
     blockquote: [],
     em: [],
     h3: [],
@@ -16,5 +16,6 @@ module.exports = {
     p: [],
     strong: [],
     ul: [],
+    video: ["src", "alt", "title"],
   },
 };

package/src/config/image.js

@@ -4,5 +4,4 @@
 
 module.exports = {
   ".png": "image/png",
-  ".svg": "image/svg+xml",
 };

package/src/phrase.js

@@ -41,7 +41,7 @@ const docAttrInvalid = function (tag, attr, value) {
 // [function]
 
 const docAttrUnallowed = function (tag, attr) {
-  return `Attribute '${attr}' is not allowed on the '${tag}' tag.`;
+  return `Attribute '${attr}' is not permitted on the '${tag}' tag.`;
 };
 
 // [function]
@@ -52,6 +52,12 @@ const docSanitizeFailed = function () {
 
 // [function]
 
+const docTagUnallowed = function (tag) {
+  return `Tag '${tag}' is not permitted.`;
+};
+
+// [function]
+
 const docUnsupported = function () {
   return "Document has an unsupported file type.";
 };
@@ -382,6 +388,7 @@ module.exports = {
   docAttrInvalid,
   docAttrUnallowed,
   docSanitizeFailed,
+  docTagUnallowed,
   docUnsupported,
   gameExists,
   gameVersionExists,

package/src/schema/game.js

@@ -45,11 +45,16 @@ const videoCheck = check.video;
 // [declare]
 
 const HANDLE = cfgproduct.handle;
+
+// [declare]
+
+const GALLERY = `.${HANDLE}/gallery`;
 const MEDIA = `.${HANDLE}`;
 
 // [declare]
 
-const GALLERY = `${MEDIA}/gallery`;
+const MAX_SIZE_MP4 = size.mb(15);
+const MAX_SIZE_PNG = size.mb(2);
 
 // [function]
 
@@ -185,6 +190,33 @@ const zMp4 = function (field, root, opts) {
 
 // [function]
 
+const zPngMp4 = function (field, root, optsPng, optsMp4) {
+  const pngSchema = zPng(field, root, optsPng);
+  const mp4Schema = zMp4(field, root, optsMp4);
+  return z.string().superRefine((file, ctx) => {
+    let schema = null;
+    if (file?.endsWith(".png")) {
+      schema = pngSchema;
+    }
+    if (file?.endsWith(".mp4")) {
+      schema = mp4Schema;
+    }
+    if (!schema) {
+      ctx.addIssue({
+        code: "custom",
+        ...message(field, ["Must be a PNG or MP4 file."]),
+      });
+      return;
+    }
+    const result = schema.safeParse(file);
+    if (!result.success) {
+      result.error.issues.forEach((issue) => ctx.addIssue(issue));
+    }
+  });
+};
+
+// [function]
+
 const zVimeo = function () {
   return z
     .string()
@@ -224,7 +256,7 @@ const zBanner = function (root) {
   return z.optional(
     zPng(field, root, {
       aspect: "2:1",
-      maxSize: size.mb(2),
+      maxSize: MAX_SIZE_PNG,
       minHeight: 512,
       minWidth: 1024,
     }),
@@ -238,7 +270,7 @@ const zBannerVideo = function (root) {
   return z.optional(
     zMp4(field, root, {
       aspect: "2:1",
-      maxSize: size.mb(15),
+      maxSize: MAX_SIZE_MP4,
       minHeight: 512,
       minWidth: 1024,
     }),
@@ -259,7 +291,7 @@ const zCover = function (root) {
   return z.optional(
     zPng(field, root, {
       aspect: "3:2",
-      maxSize: size.mb(2),
+      maxSize: MAX_SIZE_PNG,
       minHeight: 512,
       minWidth: 768,
     }),
@@ -273,7 +305,7 @@ const zCoverVideo = function (root) {
   return z.optional(
     zMp4(field, root, {
       aspect: "3:2",
-      maxSize: size.mb(15),
+      maxSize: MAX_SIZE_MP4,
       minHeight: 512,
       minWidth: 768,
     }),
@@ -308,44 +340,22 @@ const zGallery = function (root) {
   return z.optional(
     zSetBasefile(
       field,
-      zMedia(field, root).superRefine((file, ctx) => {
-        if (file.endsWith(".png")) {
-          const issues = imageCheck(root, file, {
-            maxSize: size.mb(2),
-            type: cfgimage[".png"],
-          });
-          if (issues.length) {
-            ctx.addIssue({
-              code: "custom",
-              ...message(field, [`Invalid PNG: ${file}`, ...issues]),
-            });
-          }
-        } else if (file.endsWith(".svg")) {
-          const issues = imageCheck(root, file, {
-            maxSize: size.mb(1),
-            type: cfgimage[".svg"],
-          });
-          if (issues.length) {
-            ctx.addIssue({
-              code: "custom",
-              ...message(field, [`Invalid SVG: ${file}`, ...issues]),
-            });
-          }
-        } else if (file.endsWith(".mp4")) {
-          const issues = videoCheck(root, file, {
-            maxDuration: 30,
-            maxSize: size.mb(15),
-            minDuration: 3,
-            type: cfgvideo[".mp4"],
-          });
-          if (issues.length) {
-            ctx.addIssue({
-              code: "custom",
-              ...message(field, [`Invalid MP4: ${file}`, ...issues]),
-            });
-          }
-        }
-      }),
+      zPngMp4(
+        field,
+        root,
+        // png
+        {
+          maxSize: MAX_SIZE_PNG,
+          minHeight: 512,
+          minWidth: 512,
+        },
+        // mp4
+        {
+          maxSize: MAX_SIZE_MP4,
+          minHeight: 512,
+          minWidth: 512,
+        },
+      ),
       { max: 8 * 3, min: 1 },
     ),
   );
@@ -379,7 +389,7 @@ const zIcon = function (root) {
   return z.optional(
     zPng(field, root, {
       aspect: "1:1",
-      maxSize: size.mb(2),
+      maxSize: MAX_SIZE_PNG,
       minHeight: 512,
       minWidth: 512,
     }),
@@ -393,7 +403,7 @@ const zIconVideo = function (root) {
   return z.optional(
     zMp4(field, root, {
       aspect: "1:1",
-      maxSize: size.mb(15),
+      maxSize: MAX_SIZE_MP4,
       minHeight: 512,
       minWidth: 512,
     }),
@@ -439,7 +449,7 @@ const zPoster = function (root) {
   return z.optional(
     zPng(field, root, {
       aspect: "2:3",
-      maxSize: size.mb(2),
+      maxSize: MAX_SIZE_PNG,
       minHeight: 768,
       minWidth: 512,
     }),
@@ -453,7 +463,7 @@ const zPosterVideo = function (root) {
   return z.optional(
     zMp4(field, root, {
       aspect: "2:3",
-      maxSize: size.mb(15),
+      maxSize: MAX_SIZE_MP4,
       minHeight: 768,
       minWidth: 512,
     }),
@@ -486,7 +496,7 @@ const zSplash = function (root) {
   return z.optional(
     zPng(field, root, {
       aspect: "16:9",
-      maxSize: size.mb(2),
+      maxSize: MAX_SIZE_PNG,
       minHeight: 576,
       minWidth: 1024,
     }),
@@ -500,7 +510,7 @@ const zSplashVideo = function (root) {
   return z.optional(
     zMp4(field, root, {
       aspect: "16:9",
-      maxSize: size.mb(15),
+      maxSize: MAX_SIZE_MP4,
       minHeight: 576,
       minWidth: 1024,
     }),

package/src/util/doc.js

@@ -36,10 +36,15 @@ const checkHtml = function (str, { allowed, hooks }) {
   if (!checkAllowed(str, allowed, hooks, issues)) {
     if (issues) {
       return issues.map((issue) => {
-        const { attrName, attrValue, isAllowed, nodeName } = issue;
-        return isAllowed
-          ? phrase.docAttrInvalid(nodeName, attrName, attrValue)
-          : phrase.docAttrUnallowed(nodeName, attrName);
+        const { attrName, attrValue, isAllowed, isValid, nodeName } = issue;
+        if (!isAllowed) {
+          return Object.hasOwn(allowed, nodeName)
+            ? phrase.docAttrUnallowed(nodeName, attrName)
+            : phrase.docTagUnallowed(nodeName);
+        }
+        return isValid
+          ? phrase.docSanitizeFailed()
+          : phrase.docAttrInvalid(nodeName, attrName, attrValue);
       });
     }
     return [phrase.docSanitizeFailed()];

package/src/util/image.js

@@ -71,19 +71,9 @@ const checkPng = function (file, { aspect, maxSize, minHeight, minWidth }) {
 
 // [function]
 
-const checkSvg = function (file, { maxSize }) {
-  if (!checkSize(file, maxSize)) {
-    return [phrase.imageSizeMax(formatBytes(maxSize))];
-  }
-  return [];
-};
-
-// [function]
-
 const check = function (file, { type, ...opts }) {
   const checks = {
     [cfgimage[".png"]]: checkPng,
-    [cfgimage[".svg"]]: checkSvg,
   };
   const checkImage = checks[type];
   return checkImage && cfgimage[extname(file)] === type