mushroom-cli 1.1.2 → 1.2.0-alpha.10

package/gen/gen-js-driver-tarball.js

@@ -1,119 +1,101 @@
-const fs = require("fs");
-const path = require("path");
-const targz = require("targz");
-const javascriptDriverGenerator = require("./gen-js-driver");
-const typescriptDriverGenerator = require("./gen-ts-driver");
-const package_json = require("./../package.json");
-
-function compressAsync(src, dest, folderName) {
-  return new Promise((resolve, reject) => {
-    const options = {
-      src: src,
-      dest: dest,
-    };
-    if (folderName) {
-      options.tar = {
-        map: (header) => {
-          if (header.name === ".") return header;
-          header.name = folderName + "/" + header.name;
-          return header;
-        },
-      };
-    }
-
-    targz.compress(options, function (err) {
-      if (err) {
-        reject(err);
-        return;
-      }
-      resolve();
-    });
-  });
-}
-
-async function genJavascriptDriverTarball(
-  args,
-  projectName,
-  project,
-  alias,
-  source,
-) {
-  const aliasProject = ((project.jsDriver || {}).alias || {})[alias];
-
-  let tarballName = aliasProject.tarballName
-    ? aliasProject.tarballName
-    : projectName;
-  tarballName = tarballName.toLowerCase().replace(/[^a-z-]/g, "-");
-
-  const dirPath = path.join(path.dirname(aliasProject.output), tarballName);
-
-  const versionGroup = package_json.version.match(/([^-]+)(-(\w+).*)?/);
-  const currentDistTag = versionGroup[3] ? versionGroup[3] : "latest";
-
-  const dependencies = [`"mushroomjs": "${currentDistTag}"`];
-  if (
-    Array.isArray(aliasProject.features) &&
-    aliasProject.features.includes("auth")
-  ) {
-    dependencies.push(`"mushroomjs-auth": "${currentDistTag}"`);
-  }
-  if (
-    Array.isArray(aliasProject.features) &&
-    aliasProject.features.includes("file")
-  ) {
-    dependencies.push(`"mushroomjs-file": "${currentDistTag}"`);
-  }
-
-  const packageContent = `{
-    "version": "1.0.${new Date().getTime()}",
-    "name": "${tarballName}",
-    "private": true,
-    "main": "${tarballName}.js",
-    "types": "${tarballName}.d.ts",
-    "dependencies": {
-        ${dependencies.join(",\n        ")}
-    }
-}`;
-
-  if (fs.existsSync(dirPath)) {
-    console.log("Clean up tarball folder");
-    fs.rmSync(dirPath, { recursive: true });
-  }
-
-  const tarballFileName = path.join(
-    path.dirname(aliasProject.output),
-    tarballName + ".tar.gz",
-  );
-
-  if (fs.existsSync(tarballFileName)) {
-    console.log("Clean up old tarball file");
-    fs.unlinkSync(tarballFileName);
-  }
-
-  console.log("Creating tarball folder");
-
-  fs.mkdirSync(dirPath, { recursive: true, mode: 493 }); // 493 = 755 in octa
-
-  console.log("Generating main file: " + tarballName + ".js");
-  let code = javascriptDriverGenerator.genJavascriptDriverString(
-    aliasProject,
-    source,
-  );
-  fs.writeFileSync(path.join(dirPath, tarballName + ".js"), code);
-
-  console.log("Generating types file: " + tarballName + ".d.ts");
-  code = typescriptDriverGenerator.genDtsString(aliasProject, source);
-  fs.writeFileSync(path.join(dirPath, tarballName + ".d.ts"), code);
-
-  console.log("Generating package file: package.json");
-  fs.writeFileSync(path.join(dirPath, "package.json"), packageContent);
-
-  console.log("Generating tarball file: " + tarballFileName);
-  await compressAsync(dirPath, tarballFileName, tarballName);
-
-  console.log("Generated tarball file");
-  fs.rmSync(dirPath, { recursive: true });
-  console.log("Cleaned up tarball folder");
-}
-
-module.exports = genJavascriptDriverTarball;
+const fs = require("fs");
+const path = require('path');
+var targz = require('targz');
+const javascriptDriverGenerator = require("./gen-js-driver");
+const typescriptDriverGenerator = require("./gen-ts-driver");
+const package = require("./../package.json");
+
+function compressAsync(src, dest, folderName) {
+    return new Promise((resolve, reject) => {
+        const options = {
+            src: src,
+            dest: dest
+        };
+        if (folderName) {
+            options.tar = {
+                map: (header) => {
+                    if (header.name === ".") return header;
+                    header.name = folderName + '/' + header.name;
+                    return header;
+                }
+            };
+        }
+
+        targz.compress(options, function(err){
+            if(err) {
+                reject(err);
+                return;
+            }
+            resolve();
+        });
+    });
+}
+
+async function genJavascriptDriverTarball(args, projectName, project, alias, source) {
+    const aliasProject = ((project.jsDriver || {}).alias || {})[alias];
+
+    let tarballName = aliasProject.tarballName ? aliasProject.tarballName : projectName;
+    tarballName = tarballName.toLowerCase().replace(/[^a-z-]/g, "-");
+
+    const dirPath = path.join(path.dirname(aliasProject.output), tarballName);
+
+    const versionGroup = package.version.match(/([^-]+)(-(\w+).*)?/);
+    const currentDistTag = versionGroup[3] ? versionGroup[3] : "latest";
+
+    const dependencies = [`"mushroomjs": "${currentDistTag}"`];
+    if (Array.isArray(aliasProject.features) && aliasProject.features.includes("auth")) {
+        dependencies.push(`"mushroomjs-auth": "${currentDistTag}"`);
+    }
+    if (Array.isArray(aliasProject.features) && aliasProject.features.includes("file")) {
+        dependencies.push(`"mushroomjs-file": "${currentDistTag}"`);
+    }
+    
+    const packageContent = `{
+    "version": "1.0.${new Date().getTime()}",
+    "name": "${tarballName}",
+    "private": true,
+    "main": "${tarballName}.js",
+    "types": "${tarballName}.d.ts",
+    "dependencies": {
+        ${dependencies.join(',\n        ')}
+    }
+}`;
+
+    if (fs.existsSync(dirPath)) {
+        console.log("Clean up tarball folder");
+        // fs.rmdirSync(dirPath, { recursive: true });
+        fs.rmSync(dirPath, { recursive: true });
+    }
+
+    const tarballFileName = path.join(path.dirname(aliasProject.output), tarballName + ".tar.gz");
+
+    if (fs.existsSync(tarballFileName)) {
+        console.log("Clean up old tarball file");
+        fs.unlinkSync(tarballFileName);
+    }
+
+    console.log("Creating tarball folder");
+
+    fs.mkdirSync(dirPath, { recursive: true, mode: 0755 });
+
+    console.log("Generating main file: " + tarballName + ".js");
+    let code = javascriptDriverGenerator.genJavascriptDriverString(aliasProject, source);
+    fs.writeFileSync(path.join(dirPath, tarballName + ".js"), code);
+    
+    console.log("Generating types file: " + tarballName + ".d.ts");
+    code = typescriptDriverGenerator.genDtsString(aliasProject, source);
+    fs.writeFileSync(path.join(dirPath, tarballName + ".d.ts"), code);
+
+    console.log("Generating package file: package.json");
+    fs.writeFileSync(path.join(dirPath, "package.json"), packageContent);
+   
+    console.log("Generating tarball file: " + tarballFileName);
+    await compressAsync(dirPath, tarballFileName, tarballName);
+
+    console.log("Generated tarball file");
+    // fs.rmdirSync(dirPath, { recursive: true });
+    fs.rmSync(dirPath, { recursive: true });
+    console.log("Cleaned up tarball folder");
+}
+
+module.exports = genJavascriptDriverTarball;

package/gen/gen-js-driver.js

@@ -1,154 +1,133 @@
-const fs = require("fs");
-const common = require("../common.js");
-const typescriptDriverGenerator = require("./gen-ts-driver");
-
-function isAllowCache(actions, defaultValue) {
-  let result = defaultValue;
-  for (let i = 0; i < actions.length; i++) {
-    const action = actions[i];
-
-    if (
-      !action ||
-      !action.cache ||
-      !action.cache.client ||
-      !action.cache.client.policy ||
-      action.cache.client.policy === "unset"
-    )
-      continue;
-
-    if (action.cache.client.policy === "disabled") return false;
-
-    if (
-      action.cache.client.policy === "allow" ||
-      action.cache.client.policy === "required"
-    )
-      result = true;
-  }
-  return result;
-}
-
-function genJavascriptDriverString(aliasProject, source) {
-  if (!aliasProject) {
-    return "";
-  }
-
-  const entities = common.getEntities(source, aliasProject.allowRoles);
-
-  let extensionsImportLines = [];
-  let extensionsExportLines = [];
-  let extensionsCodeLines = [];
-
-  if (Array.isArray(aliasProject.features)) {
-    if (aliasProject.features.includes("auth")) {
-      extensionsImportLines.push(
-        '//import * as AuthExtension from "mushroomjs-auth";',
-      );
-      extensionsImportLines.push(
-        'var AuthExtension = require("mushroomjs-auth");',
-      );
-      extensionsExportLines.push("Auth: AuthExtension");
-      extensionsCodeLines.push(
-        "AuthExtension.useAuth(AuthExtension.AuthLocalStorage, mushroom_1.default);",
-      );
-    }
-    if (aliasProject.features.includes("file")) {
-      extensionsImportLines.push(
-        '//import * as FileExtension from "mushroomjs-file";',
-      );
-      extensionsImportLines.push(
-        'var FileExtension = require("mushroomjs-file");',
-      );
-      extensionsExportLines.push("File: FileExtension");
-      extensionsCodeLines.push("FileExtension.useFile(mushroom_1.default);");
-    }
-  }
-
-  let code = `//import mushroom, {defineAsyncResource} from "mushroomjs";
-Object.defineProperty(exports, "__esModule", { value: true });
-var mushroom_1 = require("mushroomjs");
-var mushroom = mushroom_1.default;
-var defineAsyncResource = mushroom_1.defineAsyncResource;
-
-//export * from "mushroomjs";
-for (var m in mushroom_1) exports[m] = mushroom_1[m];
-
-${extensionsImportLines.join("\n")}
-//export const extensions = {
-var extensions = {
-    ${extensionsExportLines.join(",\n    ")}
-};
-exports.extensions = extensions;
-
-"use strict";
-
-`;
-  for (let entityName in entities) {
-    if (!entities.hasOwnProperty(entityName)) continue;
-
-    const entity = entities[entityName];
-
-    const actions = {};
-    for (const actionName in entity.actions) {
-      if (!entity.actions.hasOwnProperty(actionName)) continue;
-
-      actions[actionName] = {
-        clientCache:
-          (actionName === "findById" || actionName === "findMany") &&
-          isAllowCache(entity.actions[actionName], true)
-            ? true
-            : undefined,
-        includeTotal:
-          actionName === "findMany" &&
-          entity.actions[actionName].some((a) => a.includeTotal)
-            ? true
-            : undefined,
-      };
-    }
-
-    const views = {};
-    for (const viewName in entity.views) {
-      if (!entity.views.hasOwnProperty(viewName)) continue;
-
-      views[viewName] = {};
-    }
-    code += `defineAsyncResource({name:${JSON.stringify(entityName)},actions:${JSON.stringify(actions)},views:${JSON.stringify(views)}});
-`;
-  }
-  code += `
-mushroom.$using(${JSON.stringify(common.getRootUrl(source))});
-
-${extensionsCodeLines.join("\n")}
-
-//export default mushroom;
-exports.default = mushroom;`;
-
-  return code;
-}
-
-function genJavascriptDriver(args, projectName, project, alias, source) {
-  const aliasProject = ((project.jsDriver || {}).alias || {})[alias];
-
-  if (!aliasProject) {
-    throw new Error(
-      `Not found gen js-driver configuration. Please run 'npx mushroom-cli config gen ${projectName} js-driver OUTPUT_FILE.js${alias === "default" ? "" : " alias " + alias}' first`,
-    );
-  }
-
-  let code = genJavascriptDriverString(aliasProject, source);
-
-  common.ensureFolder(aliasProject.output);
-
-  fs.writeFileSync(aliasProject.output, code);
-  console.log(`Generated ${aliasProject.output}`);
-
-  code = typescriptDriverGenerator.genDtsString(aliasProject, source);
-  const dtsFilePath = aliasProject.output.replace(/\.js$/i, ".d.ts");
-  fs.writeFileSync(dtsFilePath, code);
-  console.log(`Generated ${dtsFilePath}`);
-  console.log(`Generated Javascript driver for ${projectName}@${alias}`);
-}
-
-module.exports = {
-  genJavascriptDriver,
-  genJavascriptDriverString,
-};
+const fs = require("fs");
+const common = require("../common.js");
+const typescriptDriverGenerator = require("./gen-ts-driver");
+
+function isAllowCache(actions, defaultValue) {
+    let result = defaultValue;
+    for (let i = 0; i < actions.length; i++) {
+        const action = actions[i];
+
+        if (!action ||
+            !action.cache ||
+            !action.cache.client ||
+            !action.cache.client.policy ||
+            action.cache.client.policy === "unset")
+            continue;
+
+        if (action.cache.client.policy === "disabled")
+            return false;
+
+        if (action.cache.client.policy === "allow" || action.cache.client.policy === "required")
+            result = true;
+    }
+    return result;
+}
+
+function genJavascriptDriverString(aliasProject, source) {
+    if (!aliasProject) {
+        return "";
+    }
+
+    const entities = common.getEntities(source, aliasProject.allowRoles);
+
+    let extensionsImportLines = [];
+    let extensionsExportLines = [];
+    let extensionsCodeLines = [];
+
+    if (Array.isArray(aliasProject.features)) {
+        if (aliasProject.features.includes("auth")) {
+            extensionsImportLines.push('//import * as AuthExtension from "mushroomjs-auth";');
+            extensionsImportLines.push('var AuthExtension = require("mushroomjs-auth");');
+            extensionsExportLines.push('Auth: AuthExtension');
+            extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage, mushroom_1.default);");
+        }
+        if (aliasProject.features.includes("file")) {
+            extensionsImportLines.push('//import * as FileExtension from "mushroomjs-file";');
+            extensionsImportLines.push('var FileExtension = require("mushroomjs-file");');
+            extensionsExportLines.push('File: FileExtension');
+            extensionsCodeLines.push("FileExtension.useFile(mushroom_1.default);");
+        }
+    }
+
+    let code = `//import mushroom, {defineAsyncResource} from "mushroomjs";
+Object.defineProperty(exports, "__esModule", { value: true });
+var mushroom_1 = require("mushroomjs");
+var mushroom = mushroom_1.default;
+var defineAsyncResource = mushroom_1.defineAsyncResource;
+
+//export * from "mushroomjs";
+for (var m in mushroom_1) exports[m] = mushroom_1[m];
+
+${extensionsImportLines.join("\n")}
+//export const extensions = {
+var extensions = {
+    ${extensionsExportLines.join(",\n    ")}
+};
+exports.extensions = extensions;
+
+"use strict";
+
+`;
+    for (let entityName in entities) {
+        if (!entities.hasOwnProperty(entityName))
+            continue;
+
+        const entity = entities[entityName];
+
+        const actions = {};
+        for (const actionName in entity.actions) {
+            if (!entity.actions.hasOwnProperty(actionName))
+                continue;
+
+            actions[actionName] = {
+                clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined,
+                includeTotal: actionName === "findMany" && entity.actions[actionName].some(a => a.includeTotal) ? true: undefined
+            };
+        }
+
+        const views = {};
+        for (const viewName in entity.views) {
+            if (!entity.views.hasOwnProperty(viewName))
+                continue;
+
+            views[viewName] = {};
+        }
+        code += `defineAsyncResource({name:${JSON.stringify(entityName)},actions:${JSON.stringify(actions)},views:${JSON.stringify(views)}});
+`;
+    }
+    code += `
+mushroom.$using(${JSON.stringify(common.getRootUrl(source))});
+
+${extensionsCodeLines.join('\n')}
+
+//export default mushroom;
+exports.default = mushroom;`;
+
+    return code;
+}
+
+function genJavascriptDriver(args, projectName, project, alias, source) {
+    const aliasProject = ((project.jsDriver || {}).alias || {})[alias];
+
+    if (!aliasProject) {
+        throw new Error(`Not found gen js-driver configuration. Please run 'npx mushroom-cli config gen ${projectName} js-driver OUTPUT_FILE.js${alias === "default" ? "" : " alias " + alias}' first`);
+    }
+
+    let code = genJavascriptDriverString(aliasProject, source);
+
+    common.ensureFolder(aliasProject.output);
+
+    fs.writeFileSync(aliasProject.output, code);
+    console.log(`Generated ${aliasProject.output}`);
+
+    code = typescriptDriverGenerator.genDtsString(aliasProject, source);
+    const dtsFilePath = aliasProject.output.replace(/\.js$/i, ".d.ts");
+    fs.writeFileSync(dtsFilePath, code);
+    console.log(`Generated ${dtsFilePath}`);
+    console.log(`Generated Javascript driver for ${projectName}@${alias}`);
+}
+
+module.exports = {
+    genJavascriptDriver,
+    genJavascriptDriverString
+};