@modern-js/ssg-generator 3.0.0-beta.1 → 3.0.0-beta.3

package/dist/index.js

@@ -44800,8 +44800,10 @@ check path: ${_utils.chalk.blue.underline(generator)} exist a package.json file
       };
     }
     async runGenerator(generator, config = {}) {
-      const spinner = (0, _utils.ora)("Loading...").start();
-      spinner.color = "yellow";
+      const spinner = (0, _utils.ora)({
+        text: "Load Generator...",
+        spinner: "runner"
+      }).start();
       const {
         materialKey,
         generatorPkg,
@@ -44820,8 +44822,10 @@ check path: ${_utils.chalk.blue.underline(generator)} exist a package.json file
       this.setCurrent(null);
     }
     async runSubGenerator(subGenerator, relativePwdPath = "", config) {
-      const spinner = (0, _utils.ora)("Loading...").start();
-      spinner.color = "yellow";
+      const spinner = (0, _utils.ora)({
+        text: "Load Generator...",
+        spinner: "runner"
+      }).start();
       const {
         materialKey,
         generatorPkg,
@@ -59150,6 +59154,66 @@ var require_node5 = __commonJSMin((exports) => {
   };
   exports.EjsAPI = EjsAPI;
 });
+var require_constant = __commonJSMin((exports) => {
+  "use strict";
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.imageExtNameList = void 0;
+  var imageExtNameList = [".jpg", ".jpeg", ".png", ".gif", ".bmp", ".ico", ".icon", ".mpt", ".psd", ".wmf"];
+  exports.imageExtNameList = imageExtNameList;
+});
+var require_node6 = __commonJSMin((exports) => {
+  "use strict";
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.FsAPI = void 0;
+  var _path = _interopRequireDefault(__require("path"));
+  var _codesmith = require_node3();
+  var _constant = require_constant();
+  function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : { default: obj };
+  }
+  function _defineProperty2(obj, key, value) {
+    if (key in obj) {
+      Object.defineProperty(obj, key, { value, enumerable: true, configurable: true, writable: true });
+    } else {
+      obj[key] = value;
+    }
+    return obj;
+  }
+  var FsAPI = class {
+    constructor(generatorCore) {
+      _defineProperty2(this, "generatorCore", void 0);
+      this.generatorCore = generatorCore;
+    }
+    async renderFile(resource, target) {
+      if (resource._type !== _codesmith.FS_RESOURCE) {
+        throw new Error("resource not match");
+      }
+      const resourceValue = await resource.value();
+      const resourceFileExt = _path.default.extname(resource.filePath);
+      if (_constant.imageExtNameList.includes(resourceFileExt)) {
+        await this.generatorCore.output.fs(target, resourceValue.content, {
+          encoding: "binary"
+        });
+      } else {
+        await this.generatorCore.output.fs(target, resourceValue.content, {
+          encoding: "utf-8"
+        });
+      }
+    }
+    async renderDir(material2, findGlob, target, options2) {
+      const resourceMap = await material2.find(findGlob, options2);
+      await Promise.all(Object.keys(resourceMap).map(async (resourceKey) => {
+        this.generatorCore.logger.debug(`[renderDir] resourceKey=${resourceKey}`);
+        await this.renderFile(material2.get(resourceKey), target(resourceKey));
+      }));
+    }
+  };
+  exports.FsAPI = FsAPI;
+});
 function _typeof(obj) {
   "@babel/helpers - typeof";
   return _typeof = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(obj2) {
@@ -80387,7 +80451,7 @@ var require_overRest = __commonJSMin((exports, module2) => {
   }
   module2.exports = overRest;
 });
-var require_constant = __commonJSMin((exports, module2) => {
+var require_constant2 = __commonJSMin((exports, module2) => {
   function constant(value) {
     return function() {
       return value;
@@ -80396,7 +80460,7 @@ var require_constant = __commonJSMin((exports, module2) => {
   module2.exports = constant;
 });
 var require_baseSetToString = __commonJSMin((exports, module2) => {
-  var constant = require_constant();
+  var constant = require_constant2();
   var defineProperty = require_defineProperty();
   var identity = require_identity2();
   var baseSetToString = !defineProperty ? identity : function(func, string) {
@@ -107879,9 +107943,6 @@ var require_inquirer2 = __commonJSMin((exports, module2) => {
     inquirer2.prompt.restoreDefaultPrompts();
   };
 });
-var require_lodash3 = __commonJSMin((exports, module2) => {
-  module2.exports = require_lodash();
-});
 function getObjKeyMap(obj) {
   var prefix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
   var result = {};
@@ -107896,7 +107957,7 @@ function getObjKeyMap(obj) {
 }
 var import_lodash3;
 var init_utils = __esmMin(() => {
-  import_lodash3 = __toESM2(require_lodash3());
+  import_lodash3 = __toESM2(require_lodash2());
 });
 var treeshaking_exports2 = {};
 __export2(treeshaking_exports2, {
@@ -107907,7 +107968,7 @@ var init_treeshaking2 = __esmMin(() => {
   init_classCallCheck();
   init_createClass();
   init_defineProperty();
-  import_lodash4 = __toESM2(require_lodash3());
+  import_lodash4 = __toESM2(require_lodash2());
   init_utils();
   I18n = /* @__PURE__ */ function() {
     function I18n3() {
@@ -108106,7 +108167,7 @@ var require_transform = __commonJSMin((exports) => {
     return questions;
   }
 });
-var require_node6 = __commonJSMin((exports) => {
+var require_node7 = __commonJSMin((exports) => {
   "use strict";
   Object.defineProperty(exports, "__esModule", {
     value: true
@@ -108119,6 +108180,7 @@ var require_node6 = __commonJSMin((exports) => {
   var _codesmithApiGit = require_node2();
   var _codesmithApiHandlebars = require_node4();
   var _codesmithApiEjs = require_node5();
+  var _codesmithApiFs = require_node6();
   var _codesmithFormily = (init_treeshaking(), __toCommonJS2(treeshaking_exports));
   var _inquirer = _interopRequireDefault(require_inquirer2());
   var _locale = require_locale();
@@ -108164,12 +108226,14 @@ var require_node6 = __commonJSMin((exports) => {
       _defineProperty2(this, "gitApi", void 0);
       _defineProperty2(this, "handlebarsAPI", void 0);
       _defineProperty2(this, "ejsAPI", void 0);
+      _defineProperty2(this, "fsAPI", void 0);
       this.generatorCore = generatorCore;
       this.generatorContext = generatorContext;
       this.npmApi = new _codesmithApiNpm.NpmAPI(generatorCore);
       this.gitApi = new _codesmithApiGit.GitAPI(generatorCore, generatorContext);
       this.handlebarsAPI = new _codesmithApiHandlebars.HandlebarsAPI(generatorCore);
       this.ejsAPI = new _codesmithApiEjs.EjsAPI(generatorCore);
+      this.fsAPI = new _codesmithApiFs.FsAPI(generatorCore);
     }
     async checkEnvironment(nodeVersion) {
       if (_utils.semver.lt(process.versions.node, nodeVersion || "12.22.12")) {
@@ -108267,6 +108331,36 @@ var require_node6 = __commonJSMin((exports) => {
         throw new Error("base forging failed");
       }
     }
+    async renderTemplateByFileType(templatePattern, filter, rename, parameters) {
+      try {
+        const {
+          material: material2
+        } = this.generatorContext.current;
+        const resourceMap = await material2.find(templatePattern, {
+          nodir: true,
+          dot: true
+        });
+        if (resourceMap) {
+          await Promise.all(Object.keys(resourceMap).filter((resourceKey) => filter ? filter(resourceKey) : true).map(async (resourceKey) => {
+            this.generatorCore.logger.debug(`[renderDir] resourceKey=${resourceKey}`);
+            if (resourceKey.includes(".handlebars")) {
+              const target = rename ? rename(resourceKey) : resourceKey.replace(`templates/`, "").replace(".handlebars", "");
+              await this.handlebarsAPI.renderTemplate(material2.get(resourceKey), target, _objectSpread(_objectSpread({}, this.generatorContext.data || {}), parameters || {}));
+            } else if (resourceKey.includes(".ejs")) {
+              const target = rename ? rename(resourceKey) : resourceKey.replace(`templates/`, "").replace(".ejs", "");
+              await this.ejsAPI.renderTemplate(material2.get(resourceKey), target, _objectSpread(_objectSpread({}, this.generatorContext.data || {}), parameters || {}));
+            } else {
+              const target = rename ? rename(resourceKey) : resourceKey.replace(`templates/`, "");
+              await this.fsAPI.renderFile(material2.get(resourceKey), target);
+            }
+          }));
+        }
+      } catch (e) {
+        this.generatorCore.logger.debug("base forging failed:", e);
+        this.generatorCore.logger.warn(_locale.i18n.t(_locale.localeKeys.templated.failed));
+        throw new Error("base forging failed");
+      }
+    }
     async updateWorkspace(folder, workspaceName = "monorepo.code-workspace") {
       const {
         filePath
@@ -109167,7 +109261,7 @@ var require_utils11 = __commonJSMin((exports) => {
     return newJsonString;
   }
 });
-var require_node7 = __commonJSMin((exports) => {
+var require_node8 = __commonJSMin((exports) => {
   "use strict";
   Object.defineProperty(exports, "__esModule", {
     value: true
@@ -109270,16 +109364,16 @@ var require_node7 = __commonJSMin((exports) => {
   };
   exports.JsonAPI = JsonAPI2;
 });
-var require_lodash4 = __commonJSMin((exports, module2) => {
+var require_lodash3 = __commonJSMin((exports, module2) => {
   module2.exports = require_lodash();
 });
-var import_codesmith_api_app = __toESM2(require_node6());
-var import_codesmith_api_json = __toESM2(require_node7());
+var import_codesmith_api_app = __toESM2(require_node7());
+var import_codesmith_api_json = __toESM2(require_node8());
 init_classCallCheck();
 init_createClass();
 init_defineProperty();
-var import_lodash6 = __toESM2(require_lodash4());
-var import_lodash5 = __toESM2(require_lodash4());
+var import_lodash6 = __toESM2(require_lodash3());
+var import_lodash5 = __toESM2(require_lodash3());
 function getObjKeyMap2(obj) {
   var prefix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
   var result = {};
@@ -109406,7 +109500,7 @@ var ZH_LOCALE = {
     element: {
       self: "\u521B\u5EFA\u5DE5\u7A0B\u5143\u7D20",
       entry: "\u65B0\u5EFA\u300C\u5E94\u7528\u5165\u53E3\u300D",
-      server: "\u65B0\u5EFA\u300CServer \u81EA\u5B9A\u4E49\u300D\u6E90\u7801\u76EE\u5F55"
+      server: "\u65B0\u5EFA\u300C\u81EA\u5B9A\u4E49 Web Server\u300D\u6E90\u7801\u76EE\u5F55"
     },
     refactor: {
       self: "\u81EA\u52A8\u91CD\u6784",
@@ -109494,7 +109588,7 @@ var EN_LOCALE = {
     element: {
       self: "Create project element",
       entry: 'New "entry"',
-      server: 'New "Server Custom" source code directory'
+      server: 'New "Custom Web Server" source code directory'
     },
     refactor: {
       self: "Automatic refactor",

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.3",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -20,18 +20,18 @@
   ],
   "devDependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/codesmith": "2.0.0",
-    "@modern-js/codesmith-api-app": "2.0.0",
-    "@modern-js/codesmith-api-json": "2.0.0",
+    "@modern-js/codesmith": "2.0.2",
+    "@modern-js/codesmith-api-app": "2.0.2",
+    "@modern-js/codesmith-api-json": "2.0.2",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@modern-js/dependence-generator": "3.0.0-beta.1",
-    "@modern-js/generator-common": "3.0.0-beta.1",
-    "@modern-js/generator-utils": "3.0.0-beta.1",
-    "@scripts/build": "2.0.0-beta.1",
-    "@scripts/jest-config": "2.0.0-beta.1"
+    "@modern-js/dependence-generator": "3.0.0-beta.3",
+    "@modern-js/generator-common": "3.0.0-beta.3",
+    "@modern-js/generator-utils": "3.0.0-beta.3",
+    "@scripts/build": "2.0.0-beta.3",
+    "@scripts/jest-config": "2.0.0-beta.3"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -46,8 +46,8 @@
   },
   "types": "./src/index.ts",
   "scripts": {
-    "new": "modern new",
-    "build": "modern build",
+    "new": "modern-lib new",
+    "build": "modern-lib build",
     "test": "jest --passWithNoTests"
   }
 }