arcadible 0.1.3 → 0.1.4

package/package.json

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

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/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);
   }