arcadible 0.1.25 → 0.1.27

package/package.json

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

package/src/phrase.js

@@ -2,13 +2,8 @@
 
 // [import]
 
-const bytes = require("./util/bytes");
 const cfgproduct = require("./config/product");
 
-// [use]
-
-const formatBytes = bytes.formatBytes;
-
 // [declare]
 
 const TOOL = cfgproduct.tool;
@@ -130,7 +125,7 @@ const imageHeightMin = function (height) {
 // [function]
 
 const imageSizeMax = function (size) {
-  return `Image size must not exceed: ${formatBytes(size)}`;
+  return `Image size must not exceed: ${size}`;
 };
 
 // [function]
@@ -340,7 +335,7 @@ const videoInvalid = function () {
 // [function]
 
 const videoSizeMax = function (size) {
-  return `Video size must not exceed: ${formatBytes(size)}`;
+  return `Video size must not exceed: ${size}`;
 };
 
 // [function]

package/src/schema/game.js

@@ -199,7 +199,7 @@ const zBannerVideo = function (root) {
 
 const zBio = function () {
   const field = "bio";
-  return z.optional(zText(field, { max: 30 * 5, min: 1 }));
+  return z.optional(zText(field, { max: 30 * 6, min: 1 }));
 };
 
 // [function]

package/src/util/bytes.js

@@ -3,19 +3,20 @@
 // [import]
 
 const phrase = require("../phrase");
+const size = require("./size");
 
 // [function]
 
 const formatBytes = function (bytes) {
   switch (true) {
-    case bytes < 1024:
-      return phrase.sizeB(bytes);
-    case bytes < 1024 ** 2:
-      return phrase.sizeKb((bytes / 1024).toFixed(1));
-    case bytes < 1024 ** 3:
-      return phrase.sizeMb((bytes / 1024 / 1024).toFixed(1));
+    case bytes >= size.gb(1):
+      return phrase.sizeGb(size.toGb(bytes).toFixed(1));
+    case bytes >= size.mb(1):
+      return phrase.sizeMb(size.toMb(bytes).toFixed(1));
+    case bytes >= size.kb(1):
+      return phrase.sizeKb(size.toKb(bytes).toFixed(1));
     default:
-      return phrase.sizeGb((bytes / 1024 / 1024 / 1024).toFixed(1));
+      return phrase.sizeB(size.toB(bytes));
   }
 };
 

package/src/util/image.js

@@ -11,12 +11,14 @@ const imageSize = require("image-size").imageSize;
 
 // [import]
 
+const bytes = require("./bytes");
 const cfgimage = require("../config/image");
 const phrase = require("../phrase");
 
 // [use]
 
 const extname = path.extname;
+const formatBytes = bytes.formatBytes;
 const readFileSync = fs.readFileSync; // eslint-disable-line no-sync
 const statSync = fs.statSync; // eslint-disable-line no-sync
 
@@ -51,7 +53,7 @@ const checkSize = function (file, maxSize) {
 
 const checkPng = function (file, { aspect, maxSize, minHeight, minWidth }) {
   if (!checkSize(file, maxSize)) {
-    return [phrase.imageSizeMax(maxSize)];
+    return [phrase.imageSizeMax(formatBytes(maxSize))];
   }
   const buffer = readFileSync(file);
   const { height, width } = imageSize(buffer);
@@ -71,7 +73,7 @@ const checkPng = function (file, { aspect, maxSize, minHeight, minWidth }) {
 
 const checkSvg = function (file, { maxSize }) {
   if (!checkSize(file, maxSize)) {
-    return [phrase.imageSizeMax(maxSize)];
+    return [phrase.imageSizeMax(formatBytes(maxSize))];
   }
   return [];
 };

package/src/util/size.js

@@ -2,28 +2,52 @@
 
 // [function]
 
-const b = function (value) {
-  return value;
+const b = function (bytes) {
+  return bytes;
 };
 
 // [function]
 
-const kb = function (value) {
-  return b(value * 1024);
+const kb = function (bytes) {
+  return b(bytes * 1024);
 };
 
 // [function]
 
-const mb = function (value) {
-  return kb(value * 1024);
+const mb = function (bytes) {
+  return kb(bytes * 1024);
 };
 
 // [function]
 
-const gb = function (value) {
-  return mb(value * 1024);
+const gb = function (bytes) {
+  return mb(bytes * 1024);
+};
+
+// [function]
+
+const toB = function (bytes) {
+  return bytes;
+};
+
+// [function]
+
+const toKb = function (bytes) {
+  return toB(bytes / 1024);
+};
+
+// [function]
+
+const toMb = function (bytes) {
+  return toKb(bytes / 1024);
+};
+
+// [function]
+
+const toGb = function (bytes) {
+  return toMb(bytes / 1024);
 };
 
 // [export]
 
-module.exports = { b, gb, kb, mb };
+module.exports = { b, gb, kb, mb, toB, toGb, toKb, toMb };

package/src/util/video.js

@@ -11,12 +11,14 @@ const fs = require("fs-extra");
 
 // [import]
 
+const bytes = require("./bytes");
 const cfgvideo = require("../config/video");
 const phrase = require("../phrase");
 
 // [use]
 
 const extname = path.extname;
+const formatBytes = bytes.formatBytes;
 const readFileSync = fs.readFileSync; // eslint-disable-line no-sync
 const statSync = fs.statSync; // eslint-disable-line no-sync
 
@@ -92,7 +94,7 @@ const checkMp4 = function (
   { aspect, maxDuration, maxSize, minDuration, minHeight, minWidth },
 ) {
   if (!checkSize(file, maxSize)) {
-    return [phrase.videoSizeMax(maxSize)];
+    return [phrase.videoSizeMax(formatBytes(maxSize))];
   }
   let video = null;
   try {