mushroom-cli 1.1.0-alpha.9 → 1.1.1

package/master-file/master-file.js

@@ -27,7 +27,7 @@ function transformEntityFieldNode(field) {
     if (!field.fields || typeof field.fields !== "object") 
         return;
     
-    for (var fieldName in field.fields) {
+    for (const fieldName in field.fields) {
         transformEntityFieldNode(field.fields[fieldName]);
     }
 }
@@ -41,14 +41,14 @@ function transformViewNode(view) {
 
 function mergeApiProject(totalProject, fragmentProject, options) {
     if (totalProject.name != null && fragmentProject.name != null && fragmentProject.name != totalProject.name)
-        throw new Error(`Unable merge project '${fragmentProject.name}' into '${totalProject.name}`);
+        throw new Error(`Unable merge project '${fragmentProject.name}' into '${totalProject.name}'`);
     if (totalProject.version != null && fragmentProject.version != null && fragmentProject.version != totalProject.version)
-        throw new Error(`Unable merge project '${fragmentProject.version}' into '${totalProject.version}`);
+        throw new Error(`Unable merge project '${fragmentProject.version}' into '${totalProject.version}'`);
 
     if (fragmentProject.environmentVariables != null) {
         totalProject.environmentVariables = totalProject.environmentVariables || {};
         
-        for (var name in fragmentProject.environmentVariables) {
+        for (const name in fragmentProject.environmentVariables) {
             if (name in totalProject.environmentVariables) {
                 switch (options.environmentVariable.duplicateNameHandling) {
                     case "override":
@@ -70,7 +70,7 @@ function mergeApiProject(totalProject, fragmentProject, options) {
 
         fragmentProject.entities.forEach(entity => {
 
-            var found = totalProject.entities.some((entityInTotal, i) => {
+            const found = totalProject.entities.some((entityInTotal, i) => {
                 if (entityInTotal.name !== entity.name){
                     return false;
                 }
@@ -89,12 +89,11 @@ function mergeApiProject(totalProject, fragmentProject, options) {
                 return;
 
             totalProject.entities.push(entity);
-            // console.log("add new entity: " + entity.name + "; totalProject.entities.length=" + totalProject.entities.length);
 
             if (!entity.fields || typeof entity.fields !== "object")
                 return;
 
-            for (var fieldName in entity.fields) {
+            for (const fieldName in entity.fields) {
                 transformEntityFieldNode(entity.fields[fieldName]);
             }
         });
@@ -103,7 +102,7 @@ function mergeApiProject(totalProject, fragmentProject, options) {
     if (fragmentProject.views != null) {
         totalProject.views = totalProject.views || {};
 
-        for (var viewName in fragmentProject.views)
+        for (const viewName in fragmentProject.views)
         {
             if (viewName in totalProject.views)
             {
@@ -131,7 +130,7 @@ function mergeApiProject(totalProject, fragmentProject, options) {
     }
 
 
-    for (var name in fragmentProject) {
+    for (const name in fragmentProject) {
         if (name === "environmentVariables" || name === "entities" || name === "views" || name === "$schema")
             continue;
 
@@ -176,7 +175,7 @@ function processMasterFile(basePath, master) {
     if (apiProject == null)
         return null;
 
-    apiProject["$schema"] = "http://schema.siten.vn/mushroom/project.json";
+    apiProject["$schema"] = "https://schema.siten.vn/mushroom/project.json";
 
     if (apiProject.entities == null)
         apiProject.entities = [];
@@ -205,7 +204,7 @@ function processMasterFile(basePath, master) {
                     action.defaultSortings = action.sorting.split(',').map(f => {
                         const c = f.charAt(0);
                         return {
-                            field: c === "+" || c === "-" ? f.substr(1) : f,
+                            field: c === "+" || c === "-" ? f.substring(1) : f,
                             type: c === "-" ? "Desc" : "Asc"
                         }
                     });
@@ -216,7 +215,7 @@ function processMasterFile(basePath, master) {
                     action.allowSortings = action.allowSorting.split(',').map(f => {
                         const c = f.charAt(0);
                         return {
-                            field: c === "+" || c === "-" ? f.substr(1) : f,
+                            field: c === "+" || c === "-" ? f.substring(1) : f,
                             type: c === "-" ? "Desc" : c === "+" ? "Asc" : "Both"
                         }
                     });

package/mr.js

@@ -3,14 +3,15 @@
 const init = require("./init.js");
 const config = require("./config.js");
 const gen = require("./gen.js");
+const update = require("./update.js");
 const help = require("./help.js");
 
-const package = require("./package.json");
+const pkg = require("./package.json");
 const checkUpdate = require("./check-update");
 
-const versionGroup = package.version.match(/([^-]+)(-(\w+).*)?/);
+const versionGroup = pkg.version.match(/([^-]+)(-(\w+).*)?/);
 const currentDistTag = versionGroup[3] ? versionGroup[3] : "latest";
-console.log("Mushroom CLI version " +  package.version);
+console.log("Mushroom CLI version " +  pkg.version);
 
 async function run(args) {
     let debugMode = false;
@@ -19,10 +20,8 @@ async function run(args) {
         args = args.filter(arg => arg !== "--debug");
     }
 
-    let noCheckUpdate = false;
     let checkUpdateTask;
     if (args.indexOf("--no-check-update") !== -1){
-        noCheckUpdate = true;
         args = args.filter(arg => arg !== "--no-check-update");
         checkUpdateTask = null;
     }
@@ -37,11 +36,14 @@ async function run(args) {
                 await init(args);
                 break;
             case "config":
-                await config(args);
+                config(args);
                 break;
             case "gen":
                 await gen(args);
                 break;
+            case "update":
+                await update(args);
+                break;
             case "":
             case undefined:
                 console.log(`Mushroom CLI`);
@@ -62,9 +64,9 @@ async function run(args) {
 
     if (checkUpdateTask !== null)
         try {
-            var data = await checkUpdateTask;
-            if (data["dist-tags"] && data["dist-tags"][currentDistTag] && data["dist-tags"][currentDistTag] !== package.version) {
-                console.warn(`YOUR mushroom-cli VERSION IS NOT LATEST (dist-tags: ${currentDistTag}). PLEASE RUN: npm i mushroom-cli@${data["dist-tags"][currentDistTag]}`);
+            const data = await checkUpdateTask;
+            if (data["dist-tags"] && data["dist-tags"][currentDistTag] && data["dist-tags"][currentDistTag] !== pkg.version) {
+                console.warn(`YOUR mushroom-cli VERSION IS NOT LATEST (dist-tags: ${currentDistTag}). PLEASE RUN: npm i mushroom-cli@${data["dist-tags"][currentDistTag]} OR yarn add mushroom-cli@^${data["dist-tags"][currentDistTag]}`);
             }
         }
         catch(e) {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "mushroom-cli",
-  "version": "1.1.0-alpha.9",
+  "version": "1.1.1",
   "description": "Mushroom CLI",
   "main": "mr.js",
   "scripts": {
-    "release": "npm publish --access public --tag alpha"
+    "release": "npm publish --access public"
   },
   "keywords": [
     "Mushroom",
@@ -17,10 +17,10 @@
   "author": "suco2007",
   "license": "ISC",
   "dependencies": {
-    "jsdom": "^16.2.2",
-    "json5": "^2.1.2",
-    "node-fetch": "^2.6.0",
-    "open": "^7.0.3",
+    "jsdom": "^24.1.1",
+    "json5": "^2.2.3",
+    "node-fetch": "^2.6.7",
+    "open": "^8.4.0",
     "readline-sync": "^1.4.10",
     "targz": "^1.0.1"
   }

package/sonarqube.yml

@@ -0,0 +1,18 @@
+pool:
+  name: SitenWindows
+
+steps:
+- task: SonarQubePrepare@6
+  inputs:
+    SonarQube: 'SonarQube-MushroomCLI'
+    scannerMode: 'CLI'
+    configMode: 'manual'
+    cliProjectKey: 'MushroomServer_mushroom-cli_AZBIWpTNDwLpW4gwuNzH'
+    cliProjectName: 'mushroom-cli'
+    cliSources: '.'
+
+- task: SonarQubeAnalyze@6
+
+- task: SonarQubePublish@6
+  inputs:
+    pollingTimeoutSec: '300'

package/update/tsCode.js

@@ -0,0 +1,85 @@
+const fs = require("fs");
+const fetch = require('node-fetch');
+
+async function updateTsCode(options) {
+    if (options.input || options.output) {
+        // legacy way
+        if (!options.output) {
+            console.error("Missing output file path");
+            return;
+        }
+        if (!options.input) {
+            console.error("Missing remote url");
+            return;
+        }
+        pullAsync(options.input, output);
+        console.log("Finish update ts-code");
+        return;
+    }
+    
+    // new way, using mushroom-config.json file
+    if (!fs.existsSync("mushroom-config.json")) {
+        console.error("Missing mushroom-config.json file");
+        return;
+    }
+    const configJson = fs.readFileSync("mushroom-config.json");
+    const config = JSON.parse(configJson);
+    if (!config.update) {
+        console.error("Missing 'update' in mushroom-config.json file");
+        return;
+    }
+    if (!config.update["ts-code"]) {
+        console.error("Missing 'update.ts-code' in mushroom-config.json file");
+        return;
+    }
+
+    const steps = config.update["ts-code"].steps;
+    if (!steps) {
+        console.error("Missing 'update.ts-code.steps' in mushroom-config.json file");
+        return;
+    }
+
+    for (let i = 0; i < steps.length; i++) {
+        const step = steps[i];
+        switch (step.action) {
+            case "pull":
+                await pullAsync(step.source, step.destination);
+                break;
+            case "replace-content":
+                replaceContent(step.source, step.search, step.replacement);
+                break;
+            case "replace-regex":
+                replaceContent(step.source, step.pattern, step.replacement);
+                break;
+            default:
+                console.warn(`Unsupported step action: ${step.action}`);
+                break;
+        }
+    }
+    console.log("Finish update ts-code");
+}
+
+async function pullAsync(input, output) {
+    console.log(`Fetch ${input}`);
+    const res = await fetch(input);
+    console.log(`Write to ${output}`);
+    fs.writeFileSync(output, await res.text());
+}
+
+function replaceContent(input, search, replacement) {
+    console.log(`Replace ${search} by ${replacement} in ${input} file`);
+    const content = fs.readFileSync(input).toString();
+    if (!content) return;
+    const output = content.replace(new RegExp(search.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), "g"), replacement);
+    fs.writeFileSync(input, output);
+}
+
+function replaceRegex(input, pattern, replacement) {
+    console.log(`Replace pattern ${pattern} by ${replacement} in ${input} file`);
+    const content = fs.readFileSync(input).toString();
+    if (!content) return;
+    const output = content.replace(new RegExp(pattern, "g"), replacement);
+    fs.writeFileSync(input, output);
+}
+
+module.exports = updateTsCode;

package/update.js

@@ -0,0 +1,24 @@
+const help = require("./help.js");
+const updateTsCode = require("./update/tsCode");
+
+async function update(args) {
+    let command = args[1];
+    
+    switch (command) {
+        case "ts-code":
+            await updateTsCode({
+                input: args[3],
+                output: args[2]
+            });
+            break;
+        case "help":
+        case "man":
+            help(args);
+            break;
+        default:
+            help(args, true);
+            break;
+    }
+}
+
+module.exports = update;