@modern-js/ssg-generator 2.4.3 → 2.4.5

package/dist/index.js

@@ -18878,7 +18878,7 @@ var require_lodash = __commonJSMin((exports, module2) => {
       }
       function baseFunctions(object, props) {
         return arrayFilter(props, function(key) {
-          return isFunction(object[key]);
+          return isFunction2(object[key]);
         });
       }
       function baseGet(object, path2) {
@@ -19041,7 +19041,7 @@ var require_lodash = __commonJSMin((exports, module2) => {
         if (!isObject5(value) || isMasked(value)) {
           return false;
         }
-        var pattern = isFunction(value) ? reIsNative : reIsHostCtor;
+        var pattern = isFunction2(value) ? reIsNative : reIsHostCtor;
         return pattern.test(toSource(value));
       }
       function baseIsRegExp(value) {
@@ -19163,7 +19163,7 @@ var require_lodash = __commonJSMin((exports, module2) => {
             newValue = objValue;
             if (isArguments(objValue)) {
               newValue = toPlainObject(objValue);
-            } else if (!isObject5(objValue) || isFunction(objValue)) {
+            } else if (!isObject5(objValue) || isFunction2(objValue)) {
               newValue = initCloneObject(srcValue);
             }
           } else {
@@ -20465,7 +20465,7 @@ var require_lodash = __commonJSMin((exports, module2) => {
       function isMasked(func) {
         return !!maskSrcKey && maskSrcKey in func;
       }
-      var isMaskable = coreJsData ? isFunction : stubFalse;
+      var isMaskable = coreJsData ? isFunction2 : stubFalse;
       function isPrototype(value) {
         var Ctor = value && value.constructor, proto = typeof Ctor == "function" && Ctor.prototype || objectProto;
         return value === proto;
@@ -21578,7 +21578,7 @@ var require_lodash = __commonJSMin((exports, module2) => {
       var isArray4 = Array2.isArray;
       var isArrayBuffer = nodeIsArrayBuffer ? baseUnary(nodeIsArrayBuffer) : baseIsArrayBuffer;
       function isArrayLike(value) {
-        return value != null && isLength(value.length) && !isFunction(value);
+        return value != null && isLength(value.length) && !isFunction2(value);
       }
       function isArrayLikeObject(value) {
         return isObjectLike(value) && isArrayLike(value);
@@ -21630,7 +21630,7 @@ var require_lodash = __commonJSMin((exports, module2) => {
       function isFinite2(value) {
         return typeof value == "number" && nativeIsFinite(value);
       }
-      function isFunction(value) {
+      function isFunction2(value) {
         if (!isObject5(value)) {
           return false;
         }
@@ -21953,7 +21953,7 @@ var require_lodash = __commonJSMin((exports, module2) => {
             index = length;
             value = defaultValue;
           }
-          object = isFunction(value) ? value.call(object) : value;
+          object = isFunction2(value) ? value.call(object) : value;
         }
         return object;
       }
@@ -21974,7 +21974,7 @@ var require_lodash = __commonJSMin((exports, module2) => {
           if (isArrLike) {
             accumulator = isArr4 ? new Ctor() : [];
           } else if (isObject5(object)) {
-            accumulator = isFunction(Ctor) ? baseCreate(getPrototype(object)) : {};
+            accumulator = isFunction2(Ctor) ? baseCreate(getPrototype(object)) : {};
           } else {
             accumulator = {};
           }
@@ -22391,7 +22391,7 @@ var require_lodash = __commonJSMin((exports, module2) => {
           object = this;
           methodNames = baseFunctions(source, keys(source));
         }
-        var chain2 = !(isObject5(options2) && "chain" in options2) || !!options2.chain, isFunc = isFunction(object);
+        var chain2 = !(isObject5(options2) && "chain" in options2) || !!options2.chain, isFunc = isFunction2(object);
         arrayEach(methodNames, function(methodName) {
           var func = source[methodName];
           object[methodName] = func;
@@ -22726,7 +22726,7 @@ var require_lodash = __commonJSMin((exports, module2) => {
       lodash.isEqualWith = isEqualWith;
       lodash.isError = isError;
       lodash.isFinite = isFinite2;
-      lodash.isFunction = isFunction;
+      lodash.isFunction = isFunction2;
       lodash.isInteger = isInteger;
       lodash.isLength = isLength;
       lodash.isMap = isMap2;
@@ -34920,10 +34920,10 @@ var require_type = __commonJSMin((exports) => {
     return Array.isArray(obj);
   }
   exports.isArray = isArray4;
-  function isFunction(func) {
+  function isFunction2(func) {
     return typeof func === "function";
   }
-  exports.isFunction = isFunction;
+  exports.isFunction = isFunction2;
   function isObject5(obj) {
     return obj !== null && typeof obj === "object";
   }
@@ -42490,10 +42490,10 @@ var require_util = __commonJSMin((exports) => {
     return objectToString(e) === "[object Error]" || e instanceof Error;
   }
   exports.isError = isError;
-  function isFunction(arg) {
+  function isFunction2(arg) {
     return typeof arg === "function";
   }
-  exports.isFunction = isFunction;
+  exports.isFunction = isFunction2;
   function isPrimitive(arg) {
     return arg === null || typeof arg === "boolean" || typeof arg === "number" || typeof arg === "string" || typeof arg === "symbol" || typeof arg === "undefined";
   }
@@ -43771,7 +43771,7 @@ var require_stringify = __commonJSMin((exports, module2) => {
   var {
     isArray: isArray4,
     isObject: isObject5,
-    isFunction,
+    isFunction: isFunction2,
     isNumber,
     isString: isString3
   } = require_util();
@@ -43898,10 +43898,10 @@ var require_stringify = __commonJSMin((exports, module2) => {
   };
   function stringify(key, holder, gap) {
     let value = holder[key];
-    if (isObject5(value) && isFunction(value.toJSON)) {
+    if (isObject5(value) && isFunction2(value.toJSON)) {
       value = value.toJSON(key);
     }
-    if (isFunction(replacer)) {
+    if (isFunction2(replacer)) {
       value = replacer.call(holder, key, value);
     }
     switch (typeof value) {
@@ -43936,7 +43936,7 @@ var require_stringify = __commonJSMin((exports, module2) => {
     if (!indent_) {
       return JSON.stringify(value, replacer_);
     }
-    if (!isFunction(replacer_) && !isArray4(replacer_)) {
+    if (!isFunction2(replacer_) && !isArray4(replacer_)) {
       replacer_ = null;
     }
     replacer = replacer_;
@@ -44059,13 +44059,20 @@ var require_install = __commonJSMin((exports) => {
     }));
     return promise;
   }
-  async function npmInstall(cwd, registryUrl) {
+  async function npmInstall({
+    cwd,
+    registryUrl,
+    ignoreScripts
+  }) {
     const canUse = await (0, _env.canUseNpm)();
     if (canUse) {
       const params = ["install"];
       if (registryUrl) {
         params.push(`--registry=${registryUrl}`);
       }
+      if (ignoreScripts) {
+        params.push("--ignore-scripts");
+      }
       return execaWithStreamLog("npm", params, {
         cwd,
         env: process.env
@@ -44073,13 +44080,20 @@ var require_install = __commonJSMin((exports) => {
     }
     throw new Error("please install npm first");
   }
-  async function yarnInstall(cwd, registryUrl) {
+  async function yarnInstall({
+    cwd,
+    registryUrl,
+    ignoreScripts
+  }) {
     const canUse = await (0, _env.canUseYarn)();
     if (canUse) {
       const params = ["install"];
       if (registryUrl) {
         params.push(`--registry=${registryUrl}`);
       }
+      if (ignoreScripts) {
+        params.push("--ignore-scripts");
+      }
       return execaWithStreamLog("yarn", params, {
         cwd,
         env: process.env
@@ -44087,13 +44101,20 @@ var require_install = __commonJSMin((exports) => {
     }
     throw new Error("please install yarn first");
   }
-  async function pnpmInstall(cwd, registryUrl) {
+  async function pnpmInstall({
+    cwd,
+    registryUrl,
+    ignoreScripts
+  }) {
     const canUse = await (0, _env.canUsePnpm)();
     if (canUse) {
       const params = ["install"];
       if (registryUrl) {
         params.push(`--registry=${registryUrl}`);
       }
+      if (ignoreScripts) {
+        params.push("--ignore-scripts");
+      }
       return execaWithStreamLog("pnpm", params, {
         cwd,
         env: process.env
@@ -44189,14 +44210,38 @@ var require_node = __commonJSMin((exports) => {
       _defineProperty2(this, "generatorCore", void 0);
       this.generatorCore = generatorCore;
     }
-    npmInstall(cwd = this.generatorCore.outputPath) {
-      return (0, _utils.npmInstall)(cwd);
+    npmInstall({
+      cwd,
+      registryUrl,
+      ignoreScripts
+    }) {
+      return (0, _utils.npmInstall)({
+        cwd: cwd || this.generatorCore.outputPath,
+        registryUrl,
+        ignoreScripts
+      });
     }
-    yarnInstall(cwd = this.generatorCore.outputPath) {
-      return (0, _utils.yarnInstall)(cwd);
+    yarnInstall({
+      cwd,
+      registryUrl,
+      ignoreScripts
+    }) {
+      return (0, _utils.yarnInstall)({
+        cwd: cwd || this.generatorCore.outputPath,
+        registryUrl,
+        ignoreScripts
+      });
     }
-    pnpmInstall(cwd = this.generatorCore.outputPath) {
-      return (0, _utils.pnpmInstall)(cwd);
+    pnpmInstall({
+      cwd,
+      registryUrl,
+      ignoreScripts
+    }) {
+      return (0, _utils.pnpmInstall)({
+        cwd: cwd || this.generatorCore.outputPath,
+        registryUrl,
+        ignoreScripts
+      });
     }
   };
   exports.NpmAPI = NpmAPI;
@@ -44982,11 +45027,11 @@ var require_utils3 = __commonJSMin((exports, module2) => {
   function isBlob(val) {
     return toString5.call(val) === "[object Blob]";
   }
-  function isFunction(val) {
+  function isFunction2(val) {
     return toString5.call(val) === "[object Function]";
   }
   function isStream(val) {
-    return isObject5(val) && isFunction(val.pipe);
+    return isObject5(val) && isFunction2(val.pipe);
   }
   function isURLSearchParams(val) {
     return typeof URLSearchParams !== "undefined" && val instanceof URLSearchParams;
@@ -45067,7 +45112,7 @@ var require_utils3 = __commonJSMin((exports, module2) => {
     isDate,
     isFile,
     isBlob,
-    isFunction,
+    isFunction: isFunction2,
     isStream,
     isURLSearchParams,
     isStandardBrowserEnv,
@@ -52783,15 +52828,15 @@ var require_utils5 = __commonJSMin((exports) => {
   }
   var toString5 = Object.prototype.toString;
   exports.toString = toString5;
-  var isFunction = function isFunction2(value) {
+  var isFunction2 = function isFunction3(value) {
     return typeof value === "function";
   };
-  if (isFunction(/x/)) {
-    exports.isFunction = isFunction = function(value) {
+  if (isFunction2(/x/)) {
+    exports.isFunction = isFunction2 = function(value) {
       return typeof value === "function" && toString5.call(value) === "[object Function]";
     };
   }
-  exports.isFunction = isFunction;
+  exports.isFunction = isFunction2;
   var isArray4 = Array.isArray || function(value) {
     return value && typeof value === "object" ? toString5.call(value) === "[object Array]" : false;
   };
@@ -60858,14 +60903,14 @@ var require_isFunction = __commonJSMin((exports, module2) => {
   var funcTag = "[object Function]";
   var genTag = "[object GeneratorFunction]";
   var proxyTag = "[object Proxy]";
-  function isFunction(value) {
+  function isFunction2(value) {
     if (!isObject5(value)) {
       return false;
     }
     var tag = baseGetTag(value);
     return tag == funcTag || tag == genTag || tag == asyncTag || tag == proxyTag;
   }
-  module2.exports = isFunction;
+  module2.exports = isFunction2;
 });
 var require_coreJsData = __commonJSMin((exports, module2) => {
   var root = require_root();
@@ -60902,7 +60947,7 @@ var require_toSource = __commonJSMin((exports, module2) => {
   module2.exports = toSource;
 });
 var require_baseIsNative = __commonJSMin((exports, module2) => {
-  var isFunction = require_isFunction();
+  var isFunction2 = require_isFunction();
   var isMasked = require_isMasked();
   var isObject5 = require_isObject();
   var toSource = require_toSource();
@@ -60917,7 +60962,7 @@ var require_baseIsNative = __commonJSMin((exports, module2) => {
     if (!isObject5(value) || isMasked(value)) {
       return false;
     }
-    var pattern = isFunction(value) ? reIsNative : reIsHostCtor;
+    var pattern = isFunction2(value) ? reIsNative : reIsHostCtor;
     return pattern.test(toSource(value));
   }
   module2.exports = baseIsNative;
@@ -61116,10 +61161,10 @@ var require_isLength = __commonJSMin((exports, module2) => {
   module2.exports = isLength;
 });
 var require_isArrayLike = __commonJSMin((exports, module2) => {
-  var isFunction = require_isFunction();
+  var isFunction2 = require_isFunction();
   var isLength = require_isLength();
   function isArrayLike(value) {
-    return value != null && isLength(value.length) && !isFunction(value);
+    return value != null && isLength(value.length) && !isFunction2(value);
   }
   module2.exports = isArrayLike;
 });
@@ -63032,10 +63077,10 @@ var require_isFunction2 = __commonJSMin((exports) => {
   "use strict";
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.isFunction = void 0;
-  function isFunction(value) {
+  function isFunction2(value) {
     return typeof value === "function";
   }
-  exports.isFunction = isFunction;
+  exports.isFunction = isFunction2;
 });
 var require_createErrorClass = __commonJSMin((exports) => {
   "use strict";
@@ -97264,7 +97309,7 @@ var require_baseMergeDeep = __commonJSMin((exports, module2) => {
   var isArray4 = require_isArray();
   var isArrayLikeObject = require_isArrayLikeObject();
   var isBuffer = require_isBuffer();
-  var isFunction = require_isFunction();
+  var isFunction2 = require_isFunction();
   var isObject5 = require_isObject();
   var isPlainObject = require_isPlainObject();
   var isTypedArray = require_isTypedArray();
@@ -97299,7 +97344,7 @@ var require_baseMergeDeep = __commonJSMin((exports, module2) => {
         newValue = objValue;
         if (isArguments(objValue)) {
           newValue = toPlainObject(objValue);
-        } else if (!isObject5(objValue) || isFunction(objValue)) {
+        } else if (!isObject5(objValue) || isFunction2(objValue)) {
           newValue = initCloneObject(srcValue);
         }
       } else {
@@ -111259,7 +111304,7 @@ function getQuestionFromSchema(schema) {
   }
   var questions = fields.map(function(field) {
     var _field = properties[field], type = _field.type, title = _field.title, defaultValue = _field["default"], items = _field["enum"], fieldValidate = _field["x-validate"], extra = _objectWithoutProperties(_field, _excluded2);
-    if (type === "void") {
+    if (type === "void" || type === "object") {
       return getQuestionFromSchema(properties[field], configValue, validateMap, initValue);
     }
     if (type !== "string" && type !== "number") {
@@ -111277,7 +111322,9 @@ function getQuestionFromSchema(schema) {
                   break;
                 }
                 _context.next = 3;
-                return validate(input, fieldValidate);
+                return validate(input, (0, import_lodash.isFunction)(fieldValidate) ? {
+                  validator: fieldValidate
+                } : fieldValidate);
               case 3:
                 _result = _context.sent;
                 if (!((_result$error = _result.error) !== null && _result$error !== void 0 && _result$error.length)) {
@@ -111700,10 +111747,12 @@ var init_inquirer = __esmMin(() => {
 });
 var treeshaking_exports2 = {};
 __export2(treeshaking_exports2, {
-  CLIReader: () => CLIReader
+  CLIReader: () => CLIReader,
+  validate: () => validate
 });
 var init_treeshaking2 = __esmMin(() => {
   init_inquirer();
+  init_esm4();
 });
 function getObjKeyMap(obj) {
   var prefix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
@@ -112387,7 +112436,7 @@ var require_node8 = __commonJSMin((exports) => {
       }
       return true;
     }
-    async runInstall(command) {
+    async runInstall(command, options2) {
       const {
         config: {
           packageManager,
@@ -112401,11 +112450,11 @@ var require_node8 = __commonJSMin((exports) => {
       if (command) {
         intallPromise = (0, _utils.execa)(command);
       } else if (packageManager === "pnpm") {
-        intallPromise = this.npmApi.pnpmInstall();
+        intallPromise = this.npmApi.pnpmInstall(options2 || {});
       } else if (packageManager === "yarn") {
-        intallPromise = this.npmApi.yarnInstall();
+        intallPromise = this.npmApi.yarnInstall(options2 || {});
       } else {
-        intallPromise = this.npmApi.npmInstall();
+        intallPromise = this.npmApi.npmInstall(options2 || {});
       }
       try {
         await intallPromise;
@@ -112498,6 +112547,21 @@ var require_node8 = __commonJSMin((exports) => {
         throw new Error("run sub generator failed");
       }
     }
+    mergeAnswers(answers, configValue) {
+      const inputData = (0, _lodash.merge)(answers, configValue);
+      this.generatorContext.config = (0, _lodash.merge)(this.generatorContext.config, inputData);
+      return inputData;
+    }
+    async getInputBySchemaFunc(schemaFunc, configValue = {}, validateMap = {}, initValue = {}) {
+      const reader = new _codesmithFormily.CLIReader({
+        schema: schemaFunc(configValue),
+        validateMap,
+        initValue
+      });
+      reader.setAnswers(configValue);
+      const answers = await reader.start();
+      return this.mergeAnswers(answers, configValue);
+    }
     async getInputBySchema(schema, configValue = {}, validateMap = {}, initValue = {}, type = "easy-form") {
       if (type === "easy-form") {
         const reader = new _easyFormCli.CliReader({
@@ -112508,9 +112572,7 @@ var require_node8 = __commonJSMin((exports) => {
         return new Promise((resolve, reject) => {
           reader.startQuestion({
             onComplete: (answers) => {
-              const inputData = (0, _lodash.merge)(answers, configValue);
-              this.generatorContext.config = (0, _lodash.merge)(this.generatorContext.config, inputData);
-              resolve(inputData);
+              resolve(this.mergeAnswers(answers, configValue));
             },
             onError: (error) => {
               reject(error);
@@ -112524,10 +112586,11 @@ var require_node8 = __commonJSMin((exports) => {
           initValue
         });
         reader.setAnswers(configValue);
-        return reader.start();
+        const answers = await reader.start();
+        return this.mergeAnswers(answers, configValue);
       } else {
-        const result = await _inquirer.default.prompt((0, _transform.transformInquirerSchema)(schema, configValue, validateMap, initValue));
-        return _objectSpread(_objectSpread({}, configValue), result);
+        const answers = await _inquirer.default.prompt((0, _transform.transformInquirerSchema)(schema, configValue, validateMap, initValue));
+        return this.mergeAnswers(answers, configValue);
       }
     }
   };
@@ -113855,7 +113918,7 @@ var src_default = async (context, generator) => {
   generator.logger.debug(`context=${JSON.stringify(context)}`);
   generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
   await handleTemplateFile(context, generator, appApi);
-  await appApi.runInstall();
+  await appApi.runInstall(void 0, { ignoreScripts: true });
   appApi.showSuccessInfo();
   generator.logger.debug(`forge @modern-js/ssg-generator succeed `);
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.3",
+  "version": "2.4.5",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -20,14 +20,14 @@
   ],
   "devDependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/codesmith": "1.6.1",
-    "@modern-js/codesmith-api-app": "1.6.1",
-    "@modern-js/codesmith-api-json": "1.6.1",
-    "@modern-js/dependence-generator": "2.4.3",
-    "@modern-js/generator-common": "2.4.3",
-    "@modern-js/generator-utils": "2.4.3",
-    "@scripts/build": "1.20.0",
-    "@scripts/jest-config": "1.20.0",
+    "@modern-js/codesmith": "1.6.3",
+    "@modern-js/codesmith-api-app": "1.6.3",
+    "@modern-js/codesmith-api-json": "1.6.3",
+    "@modern-js/dependence-generator": "2.4.5",
+    "@modern-js/generator-common": "2.4.5",
+    "@modern-js/generator-utils": "2.4.5",
+    "@scripts/build": "1.21.0",
+    "@scripts/jest-config": "1.21.0",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",