mushroom-cli 1.2.0-alpha.8 → 1.2.0-alpha.9

package/gen/gen-api-docs.js

@@ -1,6 +1,8 @@
 const fs = require("fs");
 const open = require("open");
 const common = require("../common.js");
+const minify = require("minify");
+const path = require("path");
 
 function reserveWhitelist(obj, whitelist) {
     if (obj === null && typeof obj !== "object") return null;
@@ -98,7 +100,7 @@ function flattenFields(fields, dict, prefix) {
 
 function removeDisallowedFields(fields, dict) {
     const allowFields = Object.keys(dict);
-    if (allowFields.length) return;
+    if (!allowFields.length) return;
     reserveWhitelist(fields, allowFields);
     for (let m in fields) {
         const config = fields[m];
@@ -176,12 +178,49 @@ function filterEntityFields(entity) {
     removeDisallowedFields(entity.fields, whitelist);
 }
 
-function writeDocs(filePath, strTemplate, strData) {
-    const placeholder = "undefined/*INJECT-HERE*/";
+async function writeDocs(filePath, strTemplate, strData) {
+    //const placeholder = "/*INJECT-JAVASCRIPT-HERE*/";
+    /*const idx = strTemplate.indexOf(placeholder);
+    fs.writeFileSync(filePath, strTemplate.substr(0, idx)); 
+    fs.appendFileSync(filePath, "window.docs = ");
+    fs.appendFileSync(filePath, strData);
+    fs.appendFileSync(filePath, ";\n");
+    fs.appendFileSync(filePath, await minify(path.join(__dirname, "../docs/docs.v2.js"), {
+        js: {
+            compress: true
+        }
+    }));
+    fs.appendFileSync(filePath, strTemplate.substr(idx + placeholder.length));*/
+
+    const placeholder = '<script id="INJECT-JAVASCRIPT-HERE"></script>';
     const idx = strTemplate.indexOf(placeholder);
     fs.writeFileSync(filePath, strTemplate.substr(0, idx)); 
+    fs.appendFileSync(filePath, "<script>window.docs = ");
     fs.appendFileSync(filePath, strData);
+    fs.appendFileSync(filePath, ";\n");
+    fs.appendFileSync(filePath, fs.readFileSync(path.join(__dirname, "../docs/docs.v2.js")));
+    fs.appendFileSync(filePath, "</script>");
     fs.appendFileSync(filePath, strTemplate.substr(idx + placeholder.length));
+
+    fs.writeFileSync(filePath, await minify(filePath, {
+        "html": {
+            "removeComments": true,
+            "removeCommentsFromCDATA": true,
+            "removeCDATASectionsFromCDATA": true,
+            "collapseWhitespace": true,
+            "collapseBooleanAttributes": true,
+            "removeAttributeQuotes": true,
+            "removeRedundantAttributes": true,
+            "useShortDoctype": true,
+            "removeEmptyAttributes": true,
+            "removeEmptyElements": false,
+            "removeOptionalTags": true,
+            "removeScriptTypeAttributes": false,
+            "removeStyleLinkTypeAttributes": true,
+            "minifyJS": true,
+            "minifyCSS": true
+        }
+    }));
 }
 
 async function genDocs(args, projectName, project, alias, source) {
@@ -230,7 +269,7 @@ async function genDocs(args, projectName, project, alias, source) {
     if (args[3] === "tmp") {
         const htmlFilePath = aliasProject.output + "_tmp.html";
         console.log(`Writing to ${htmlFilePath}`);
-        writeDocs(htmlFilePath, html, data);
+        await writeDocs(htmlFilePath, html, data);
 
         console.log("Opening file " + htmlFilePath);
         try {
@@ -252,7 +291,7 @@ async function genDocs(args, projectName, project, alias, source) {
     common.ensureFolder(aliasProject.output);
 
     console.log(`Writing to ${aliasProject.output}`);
-    writeDocs(aliasProject.output, html, data);
+    await writeDocs(aliasProject.output, html, data);
     console.log(`Generated API docs for ${projectName}@${alias} to ${aliasProject.output}`)
 }
 

package/mr.js

@@ -49,10 +49,6 @@ async function run(args) {
             case "update":
                 await update(args);
                 break;
-            case "":
-            case undefined:
-                console.log(`Mushroom CLI`);
-                break;
             case "help":
             case "man":
                 help(args.slice(1).join());
@@ -63,7 +59,7 @@ async function run(args) {
         }
     }
     catch (e) {
-        console.error(debugMode ? e : e.message);
+        console.error(debugMode ? e : "ERROR: " + e.message);
     }
     finally {
         console.log("Processed in", new Date().getTime() - startTime, "ms.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mushroom-cli",
-  "version": "1.2.0-alpha.8",
+  "version": "1.2.0-alpha.9",
   "description": "Mushroom CLI",
   "main": "mr.js",
   "scripts": {
@@ -16,10 +16,11 @@
   },
   "author": "suco2007",
   "license": "ISC",
-  "dependencies-comments": "node-fetch: 2.x; open: 8.x",
+  "dependencies-comments": "node-fetch: 2.x; open: 8.x; minify: 7.x",
   "dependencies": {
     "jsdom": "^22.1.0",
     "json5": "^2.2.3",
+    "minify": "7.2.2",
     "node-fetch": "^2.6.11",
     "open": "^8.4.2",
     "readline-sync": "^1.4.10",