@modern-js/server-generator 3.6.1 → 3.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.js +92 -81
  2. package/package.json +10 -10
  3. package/src/index.ts +8 -6
package/dist/index.js CHANGED
@@ -33,9 +33,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
33
33
  ));
34
34
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
35
35
 
36
- // ../../../../node_modules/.pnpm/ejs@3.1.9/node_modules/ejs/lib/utils.js
36
+ // ../../../../node_modules/.pnpm/ejs@3.1.10/node_modules/ejs/lib/utils.js
37
37
  var require_utils = __commonJS({
38
- "../../../../node_modules/.pnpm/ejs@3.1.9/node_modules/ejs/lib/utils.js"(exports) {
38
+ "../../../../node_modules/.pnpm/ejs@3.1.10/node_modules/ejs/lib/utils.js"(exports) {
39
39
  "use strict";
40
40
  var regExpChars = /[|\\{}()[\]^$+*?.]/g;
41
41
  var hasOwnProperty6 = Object.prototype.hasOwnProperty;
@@ -155,12 +155,21 @@ function encode_char(c) {
155
155
  return {};
156
156
  };
157
157
  }();
158
+ exports.hasOwnOnlyObject = function(obj) {
159
+ var o = exports.createNullProtoObjWherePossible();
160
+ for (var p in obj) {
161
+ if (hasOwn(obj, p)) {
162
+ o[p] = obj[p];
163
+ }
164
+ }
165
+ return o;
166
+ };
158
167
  }
159
168
  });
160
169
 
161
- // ../../../../node_modules/.pnpm/ejs@3.1.9/node_modules/ejs/package.json
170
+ // ../../../../node_modules/.pnpm/ejs@3.1.10/node_modules/ejs/package.json
162
171
  var require_package = __commonJS({
163
- "../../../../node_modules/.pnpm/ejs@3.1.9/node_modules/ejs/package.json"(exports, module2) {
172
+ "../../../../node_modules/.pnpm/ejs@3.1.10/node_modules/ejs/package.json"(exports, module2) {
164
173
  module2.exports = {
165
174
  name: "ejs",
166
175
  description: "Embedded JavaScript templates",
@@ -169,7 +178,7 @@ var require_package = __commonJS({
169
178
  "engine",
170
179
  "ejs"
171
180
  ],
172
- version: "3.1.9",
181
+ version: "3.1.10",
173
182
  author: "Matthew Eernisse <mde@fleegix.org> (http://fleegix.org)",
174
183
  license: "Apache-2.0",
175
184
  bin: {
@@ -200,15 +209,15 @@ var require_package = __commonJS({
200
209
  node: ">=0.10.0"
201
210
  },
202
211
  scripts: {
203
- test: "mocha -u tdd"
212
+ test: "npx jake test"
204
213
  }
205
214
  };
206
215
  }
207
216
  });
208
217
 
209
- // ../../../../node_modules/.pnpm/ejs@3.1.9/node_modules/ejs/lib/ejs.js
218
+ // ../../../../node_modules/.pnpm/ejs@3.1.10/node_modules/ejs/lib/ejs.js
210
219
  var require_ejs = __commonJS({
211
- "../../../../node_modules/.pnpm/ejs@3.1.9/node_modules/ejs/lib/ejs.js"(exports) {
220
+ "../../../../node_modules/.pnpm/ejs@3.1.10/node_modules/ejs/lib/ejs.js"(exports) {
212
221
  "use strict";
213
222
  var fs7 = require("fs");
214
223
  var path7 = require("path");
@@ -437,8 +446,8 @@ var require_ejs = __commonJS({
437
446
  exports.clearCache = function() {
438
447
  exports.cache.reset();
439
448
  };
440
- function Template(text, opts) {
441
- opts = opts || utils.createNullProtoObjWherePossible();
449
+ function Template(text, optsParam) {
450
+ var opts = utils.hasOwnOnlyObject(optsParam);
442
451
  var options = utils.createNullProtoObjWherePossible();
443
452
  this.templateText = text;
444
453
  this.mode = null;
@@ -6623,9 +6632,9 @@ var require_lib = __commonJS({
6623
6632
  }
6624
6633
  });
6625
6634
 
6626
- // ../../../../node_modules/.pnpm/@modern-js+utils@2.58.1/node_modules/@modern-js/utils/dist/compiled/chalk/index.js
6635
+ // ../../../../node_modules/.pnpm/@modern-js+utils@2.60.1/node_modules/@modern-js/utils/dist/compiled/chalk/index.js
6627
6636
  var require_chalk = __commonJS({
6628
- "../../../../node_modules/.pnpm/@modern-js+utils@2.58.1/node_modules/@modern-js/utils/dist/compiled/chalk/index.js"(exports, module2) {
6637
+ "../../../../node_modules/.pnpm/@modern-js+utils@2.60.1/node_modules/@modern-js/utils/dist/compiled/chalk/index.js"(exports, module2) {
6629
6638
  "use strict";
6630
6639
  (() => {
6631
6640
  var e = { 44: (e2, t2, n2) => {
@@ -52688,12 +52697,12 @@ __export(src_exports, {
52688
52697
  module.exports = __toCommonJS(src_exports);
52689
52698
  var import_path7 = __toESM(require("path"));
52690
52699
 
52691
- // ../../../../node_modules/.pnpm/@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
52700
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith@2.5.1/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
52692
52701
  var import_path = __toESM(require("path"));
52693
52702
  var import_utils = require("@modern-js/utils");
52694
52703
  var FS_RESOURCE = "_codesmith_core_fs_resource";
52695
52704
 
52696
- // ../../../../node_modules/.pnpm/@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith/dist/esm-node/utils/fsExists.js
52705
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith@2.5.1/node_modules/@modern-js/codesmith/dist/esm-node/utils/fsExists.js
52697
52706
  var import_utils2 = require("@modern-js/utils");
52698
52707
  async function fsExists(path7) {
52699
52708
  try {
@@ -52704,13 +52713,13 @@ async function fsExists(path7) {
52704
52713
  }
52705
52714
  }
52706
52715
 
52707
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/utils/renderString.js
52716
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.5.1_@modern-js+codesmith@2.5.1/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/utils/renderString.js
52708
52717
  var import_ejs = __toESM(require_ejs());
52709
52718
  function renderString(template, fullData) {
52710
52719
  return import_ejs.default.render(template, fullData) || "";
52711
52720
  }
52712
52721
 
52713
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/index.js
52722
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.5.1_@modern-js+codesmith@2.5.1/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/index.js
52714
52723
  var EjsAPI = class {
52715
52724
  async renderTemplate(templateResource, target, parameters = {}) {
52716
52725
  if (templateResource._type !== FS_RESOURCE) {
@@ -52732,7 +52741,7 @@ var EjsAPI = class {
52732
52741
  await Promise.all(
52733
52742
  // resourceKey is relate path. example: in `garr-master/package.json`, package.json is resourceKey
52734
52743
  Object.keys(resourceMap).map(async (resourceKey) => {
52735
- this.generatorCore.logger.debug(`[renderDir] resourceKey=${resourceKey}`);
52744
+ this.generatorCore.logger.debug(`💡 [EJS Render Template Dir]: resourceKey=${resourceKey}`);
52736
52745
  await this.renderTemplate(material.get(resourceKey), target(resourceKey), options === null || options === void 0 ? void 0 : options.parameters);
52737
52746
  })
52738
52747
  );
@@ -52742,7 +52751,7 @@ var EjsAPI = class {
52742
52751
  }
52743
52752
  };
52744
52753
 
52745
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-fs@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-fs/dist/esm-node/index.js
52754
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-fs@2.5.1_@modern-js+codesmith@2.5.1/node_modules/@modern-js/codesmith-api-fs/dist/esm-node/index.js
52746
52755
  var import_path2 = __toESM(require("path"));
52747
52756
  var import_utils4 = require("@modern-js/utils");
52748
52757
  var FsAPI = class {
@@ -52760,7 +52769,7 @@ var FsAPI = class {
52760
52769
  ...options
52761
52770
  });
52762
52771
  await Promise.all(Object.keys(resourceMap).map(async (resourceKey) => {
52763
- this.generatorCore.logger.debug(`[renderDir] resourceKey=${resourceKey}`);
52772
+ this.generatorCore.logger.debug(`💡 [FS Render Dir]: resourceKey=${resourceKey}`);
52764
52773
  await this.renderFile(material.get(resourceKey), target(resourceKey));
52765
52774
  }));
52766
52775
  }
@@ -52769,7 +52778,7 @@ var FsAPI = class {
52769
52778
  }
52770
52779
  };
52771
52780
 
52772
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-git/dist/esm-node/utils/index.js
52781
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.5.1_@modern-js+codesmith@2.5.1/node_modules/@modern-js/codesmith-api-git/dist/esm-node/utils/index.js
52773
52782
  var import_utils5 = require("@modern-js/utils");
52774
52783
  async function canUseGit() {
52775
52784
  try {
@@ -52844,7 +52853,7 @@ async function gitCommit(cwd, commitMessage) {
52844
52853
  });
52845
52854
  }
52846
52855
 
52847
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-git/dist/esm-node/index.js
52856
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.5.1_@modern-js+codesmith@2.5.1/node_modules/@modern-js/codesmith-api-git/dist/esm-node/index.js
52848
52857
  var GitAPI = class {
52849
52858
  async isInGitRepo(cwd = this.generatorCore.outputPath) {
52850
52859
  const canUse = await canUseGit();
@@ -52860,7 +52869,7 @@ var GitAPI = class {
52860
52869
  }
52861
52870
  const alreadyInit = await this.isInGitRepo(cwd);
52862
52871
  if (alreadyInit && !force) {
52863
- this.generatorCore.logger.debug("already in a git repo, skip init");
52872
+ this.generatorCore.logger.debug("❗️ [Git Init]: Already init, Skip");
52864
52873
  return;
52865
52874
  }
52866
52875
  try {
@@ -52871,7 +52880,7 @@ var GitAPI = class {
52871
52880
  };
52872
52881
  await initGitRepo(cwd, defaultBranch);
52873
52882
  } catch (e) {
52874
- this.generatorCore.logger.debug("[GitAPI.error]:", e);
52883
+ this.generatorCore.logger.debug("❗️ [Git Init Error]:", e);
52875
52884
  throw e;
52876
52885
  }
52877
52886
  }
@@ -52884,7 +52893,7 @@ var GitAPI = class {
52884
52893
  await gitAdd(cwd);
52885
52894
  await gitCommit(cwd, commitMessage);
52886
52895
  } catch (e) {
52887
- this.generatorCore.logger.debug("[GitAPI.error]:", e);
52896
+ this.generatorCore.logger.debug("❗️ [Git Add and Commit Error]:", e);
52888
52897
  throw e;
52889
52898
  }
52890
52899
  }
@@ -52894,7 +52903,7 @@ var GitAPI = class {
52894
52903
  }
52895
52904
  };
52896
52905
 
52897
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/utils/renderString.js
52906
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.5.1_@modern-js+codesmith@2.5.1/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/utils/renderString.js
52898
52907
  var import_handlebars = __toESM(require_lib());
52899
52908
  function renderString2(template, fullData, registers) {
52900
52909
  const helpers = {
@@ -52908,7 +52917,7 @@ function renderString2(template, fullData, registers) {
52908
52917
  return import_handlebars.default.compile(template)(fullData) || "";
52909
52918
  }
52910
52919
 
52911
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/index.js
52920
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.5.1_@modern-js+codesmith@2.5.1/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/index.js
52912
52921
  var HandlebarsAPI = class {
52913
52922
  async registerHelp(helpers) {
52914
52923
  this.registers.helpers = {
@@ -52942,7 +52951,7 @@ var HandlebarsAPI = class {
52942
52951
  await Promise.all(
52943
52952
  // resourceKey is relate path. example: in `garr-master/package.json`, package.json is resourceKey
52944
52953
  Object.keys(resourceMap).map(async (resourceKey) => {
52945
- this.generatorCore.logger.debug(`[renderDir] resourceKey=${resourceKey}`);
52954
+ this.generatorCore.logger.debug(`💡 [Handlebars Render Template Dir]: resourceKey=${resourceKey}`);
52946
52955
  await this.renderTemplate(material.get(resourceKey), target(resourceKey), options === null || options === void 0 ? void 0 : options.parameters);
52947
52956
  })
52948
52957
  );
@@ -52956,7 +52965,7 @@ var HandlebarsAPI = class {
52956
52965
  }
52957
52966
  };
52958
52967
 
52959
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.2/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/env.js
52968
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.5.1/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/env.js
52960
52969
  var import_utils8 = require("@modern-js/utils");
52961
52970
  async function canUseNvm() {
52962
52971
  try {
@@ -53006,7 +53015,7 @@ async function canUsePnpm() {
53006
53015
  }
53007
53016
  }
53008
53017
 
53009
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.2/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/install.js
53018
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.5.1/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/install.js
53010
53019
  var import_utils9 = require("@modern-js/utils");
53011
53020
  function execaWithStreamLog(command, args, options) {
53012
53021
  const promise = (0, import_utils9.execa)(command, args, {
@@ -53102,7 +53111,7 @@ async function pnpmInstall({ cwd, registryUrl, ignoreScripts, useNvm }) {
53102
53111
  throw new Error("please install pnpm first");
53103
53112
  }
53104
53113
 
53105
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.2/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/index.js
53114
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.5.1/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/index.js
53106
53115
  var NpmAPI = class {
53107
53116
  npmInstall({ cwd, registryUrl, ignoreScripts }) {
53108
53117
  return npmInstall({
@@ -62686,10 +62695,10 @@ var Schema = (
62686
62695
  }()
62687
62696
  );
62688
62697
 
62689
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
62698
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.5.1_@modern-js+codesmith@2.5.1_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
62690
62699
  var import_inquirer = __toESM(require_inquirer());
62691
62700
 
62692
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/transform.js
62701
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.5.1_@modern-js+codesmith@2.5.1_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/transform.js
62693
62702
  var import_lodash = require("@modern-js/utils/lodash");
62694
62703
  function validateSchema(schema) {
62695
62704
  const { type, properties } = schema;
@@ -62781,7 +62790,7 @@ function transformForm(schema, configValue = {}, validateMap, initValue) {
62781
62790
  return getQuestionFromSchema(schema, configValue, validateMap, initValue);
62782
62791
  }
62783
62792
 
62784
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
62793
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.5.1_@modern-js+codesmith@2.5.1_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
62785
62794
  var compileRule = (rule, scope) => {
62786
62795
  const state = Schema.compile(rule, {
62787
62796
  $self: {},
@@ -62885,7 +62894,7 @@ async function prompt(schema, configValue = {}, validateMap, initValue) {
62885
62894
  return answers;
62886
62895
  }
62887
62896
 
62888
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/inquirer.js
62897
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.5.1_@modern-js+codesmith@2.5.1_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/inquirer.js
62889
62898
  var CLIReader = class {
62890
62899
  getAnswers() {
62891
62900
  return this.answers;
@@ -62914,16 +62923,16 @@ var CLIReader = class {
62914
62923
  }
62915
62924
  };
62916
62925
 
62917
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
62926
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.5.1_@modern-js+codesmith@2.5.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
62918
62927
  var import_utils13 = require("@modern-js/utils");
62919
62928
  var import_lodash5 = require("@modern-js/utils/lodash");
62920
62929
  var import_comment_json = __toESM(require_src2());
62921
62930
  var import_inquirer2 = __toESM(require_inquirer2());
62922
62931
 
62923
- // ../../../../node_modules/.pnpm/@modern-js+plugin-i18n@2.58.0/node_modules/@modern-js/plugin-i18n/dist/esm-node/index.js
62932
+ // ../../../../node_modules/.pnpm/@modern-js+plugin-i18n@2.60.1/node_modules/@modern-js/plugin-i18n/dist/esm-node/index.js
62924
62933
  var import_lodash3 = require("@modern-js/utils/lodash");
62925
62934
 
62926
- // ../../../../node_modules/.pnpm/@modern-js+plugin-i18n@2.58.0/node_modules/@modern-js/plugin-i18n/dist/esm-node/utils/index.js
62935
+ // ../../../../node_modules/.pnpm/@modern-js+plugin-i18n@2.60.1/node_modules/@modern-js/plugin-i18n/dist/esm-node/utils/index.js
62927
62936
  var import_lodash2 = require("@modern-js/utils/lodash");
62928
62937
  function getObjKeyMap(obj, prefix = "") {
62929
62938
  const result = {};
@@ -62937,7 +62946,7 @@ function getObjKeyMap(obj, prefix = "") {
62937
62946
  return result;
62938
62947
  }
62939
62948
 
62940
- // ../../../../node_modules/.pnpm/@modern-js+plugin-i18n@2.58.0/node_modules/@modern-js/plugin-i18n/dist/esm-node/index.js
62949
+ // ../../../../node_modules/.pnpm/@modern-js+plugin-i18n@2.60.1/node_modules/@modern-js/plugin-i18n/dist/esm-node/index.js
62941
62950
  var I18n = class {
62942
62951
  format(msg, vars) {
62943
62952
  return msg.replace(/\{(\w+)\}/g, (_match, capture) => Object.prototype.hasOwnProperty.call(vars, capture) ? vars[capture] : capture);
@@ -62983,7 +62992,7 @@ var I18n = class {
62983
62992
  }
62984
62993
  };
62985
62994
 
62986
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/en.js
62995
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.5.1_@modern-js+codesmith@2.5.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/en.js
62987
62996
  var EN_LOCALE = {
62988
62997
  environment: {
62989
62998
  node_version: "please upgrade node to lts version",
@@ -63010,7 +63019,7 @@ var EN_LOCALE = {
63010
63019
  }
63011
63020
  };
63012
63021
 
63013
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/zh.js
63022
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.5.1_@modern-js+codesmith@2.5.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/zh.js
63014
63023
  var ZH_LOCALE = {
63015
63024
  environment: {
63016
63025
  node_version: "请升级 Node 版本至 LIS",
@@ -63037,14 +63046,14 @@ var ZH_LOCALE = {
63037
63046
  }
63038
63047
  };
63039
63048
 
63040
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/index.js
63049
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.5.1_@modern-js+codesmith@2.5.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/index.js
63041
63050
  var i18n = new I18n();
63042
63051
  var localeKeys = i18n.init("zh", {
63043
63052
  zh: ZH_LOCALE,
63044
63053
  en: EN_LOCALE
63045
63054
  });
63046
63055
 
63047
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/checkUseNvm.js
63056
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.5.1_@modern-js+codesmith@2.5.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/checkUseNvm.js
63048
63057
  var import_path4 = __toESM(require("path"));
63049
63058
  var import_utils12 = require("@modern-js/utils");
63050
63059
  var NODE_MAJOR_VERSION_MAP = {
@@ -63078,7 +63087,7 @@ async function checkUseNvm(cwd, logger2) {
63078
63087
  return false;
63079
63088
  }
63080
63089
  if (!await canUseNvm()) {
63081
- logger2.warn(`current node version is not expect, you should install ${expectNodeVersion}`);
63090
+ logger2.warn(`🟡 [Check nvm Error]: Current node version is not expect, you should install ${expectNodeVersion}`);
63082
63091
  return false;
63083
63092
  }
63084
63093
  try {
@@ -63092,7 +63101,7 @@ async function checkUseNvm(cwd, logger2) {
63092
63101
  }
63093
63102
  }
63094
63103
 
63095
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/transform.js
63104
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.5.1_@modern-js+codesmith@2.5.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/transform.js
63096
63105
  var import_lodash4 = require("@modern-js/utils/lodash");
63097
63106
  function transformInquirerSchema(questions, configValue = {}, validateMap = {}, initValue = {}) {
63098
63107
  for (const question of questions) {
@@ -63120,16 +63129,16 @@ function transformInquirerSchema(questions, configValue = {}, validateMap = {},
63120
63129
  return questions;
63121
63130
  }
63122
63131
 
63123
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
63132
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.5.1_@modern-js+codesmith@2.5.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
63124
63133
  var AppAPI = class {
63125
63134
  async checkEnvironment(nodeVersion) {
63126
- if (import_utils13.semver.lt(process.versions.node, nodeVersion || "12.22.12")) {
63127
- this.generatorCore.logger.warn(i18n.t(localeKeys.environment.node_version));
63135
+ if (import_utils13.semver.lt(process.versions.node, nodeVersion || "16.20.2")) {
63136
+ this.generatorCore.logger.warn(`🟡 ${i18n.t(localeKeys.environment.node_version)}`);
63128
63137
  return false;
63129
63138
  }
63130
63139
  if (!await canUseYarn() && !await canUsePnpm() && !await canUseNpm()) {
63131
- this.generatorCore.logger.debug("can't use yarn or pnpm or npm");
63132
- this.generatorCore.logger.warn(i18n.t(localeKeys.environment.yarn_pnpm_npm));
63140
+ this.generatorCore.logger.debug("🧐 [Check Environment] Can't use yarn or pnpm or npm");
63141
+ this.generatorCore.logger.warn(`🟡 ${i18n.t(localeKeys.environment.yarn_pnpm_npm)}`);
63133
63142
  return false;
63134
63143
  }
63135
63144
  return true;
@@ -63174,9 +63183,9 @@ var AppAPI = class {
63174
63183
  this.generatorCore.logger.info(i18n.t(localeKeys.install.success));
63175
63184
  } catch (e) {
63176
63185
  this.generatorCore.logger.warn(e);
63177
- this.generatorCore.logger.warn(i18n.t(localeKeys.install.failed, {
63186
+ this.generatorCore.logger.warn(`🟡 ${i18n.t(localeKeys.install.failed, {
63178
63187
  command: command || `${packageManager} install`
63179
- }));
63188
+ })}`);
63180
63189
  }
63181
63190
  }
63182
63191
  // custom install func
@@ -63194,8 +63203,8 @@ var AppAPI = class {
63194
63203
  await this.runInstall();
63195
63204
  }
63196
63205
  } catch (e) {
63197
- this.generatorCore.logger.debug("Dependencies install failed", e);
63198
- this.generatorCore.logger.warn(i18n.t(localeKeys.install.failed_no_command));
63206
+ this.generatorCore.logger.debug("❗️ [Run Install Failed]:", e);
63207
+ this.generatorCore.logger.warn(`🟡 ${i18n.t(localeKeys.install.failed_no_command)}`);
63199
63208
  }
63200
63209
  try {
63201
63210
  if (!isMonorepoSubProject && !customNoNeedGit && !inGitRepo) {
@@ -63203,14 +63212,14 @@ var AppAPI = class {
63203
63212
  this.generatorCore.logger.info(i18n.t(localeKeys.git.success));
63204
63213
  }
63205
63214
  } catch (e) {
63206
- this.generatorCore.logger.debug("Git repository create failed", e);
63207
- this.generatorCore.logger.warn(i18n.t(localeKeys.git.failed));
63215
+ this.generatorCore.logger.debug("❗️ [Git Add and Commit Failed]:", e);
63216
+ this.generatorCore.logger.warn(`🟡 ${i18n.t(localeKeys.git.failed)}`);
63208
63217
  }
63209
63218
  }
63210
63219
  async forgeTemplate(templatePattern, filter, rename, parameters, type = "handlebars") {
63211
63220
  try {
63212
63221
  var _this_generatorCore_logger_timing, _this_generatorCore_logger;
63213
- (_this_generatorCore_logger = this.generatorCore.logger) === null || _this_generatorCore_logger === void 0 ? void 0 : (_this_generatorCore_logger_timing = _this_generatorCore_logger.timing) === null || _this_generatorCore_logger_timing === void 0 ? void 0 : _this_generatorCore_logger_timing.call(_this_generatorCore_logger, "forgeTemplate");
63222
+ (_this_generatorCore_logger = this.generatorCore.logger) === null || _this_generatorCore_logger === void 0 ? void 0 : (_this_generatorCore_logger_timing = _this_generatorCore_logger.timing) === null || _this_generatorCore_logger_timing === void 0 ? void 0 : _this_generatorCore_logger_timing.call(_this_generatorCore_logger, "🕒 ForgeTemplate");
63214
63223
  const { material } = this.generatorContext.current;
63215
63224
  const resourceMap = await material.find(templatePattern, {
63216
63225
  nodir: true,
@@ -63219,7 +63228,7 @@ var AppAPI = class {
63219
63228
  if (resourceMap) {
63220
63229
  const api = type === "ejs" ? this.ejsAPI : this.handlebarsAPI;
63221
63230
  await Promise.all(Object.keys(resourceMap).filter((resourceKey) => filter ? filter(resourceKey) : true).map(async (resourceKey) => {
63222
- this.generatorCore.logger.debug(`[renderDir] resourceKey=${resourceKey}`);
63231
+ this.generatorCore.logger.debug(`💡 [Forge Template]: resourceKey=${resourceKey}`);
63223
63232
  const target = rename ? rename(resourceKey) : resourceKey.replace("templates/", "").replace(".handlebars", "").replace(".ejs", "");
63224
63233
  await api.renderTemplate(material.get(resourceKey), target, {
63225
63234
  ...this.generatorContext.data || {},
@@ -63228,18 +63237,18 @@ var AppAPI = class {
63228
63237
  }));
63229
63238
  }
63230
63239
  } catch (e) {
63231
- this.generatorCore.logger.debug("base forging failed:", e);
63232
- this.generatorCore.logger.warn(i18n.t(localeKeys.templated.failed));
63233
- throw new Error("base forging failed");
63240
+ this.generatorCore.logger.debug("❗️ [Forge Template Failed]:", e);
63241
+ this.generatorCore.logger.warn(`🟡 ${i18n.t(localeKeys.templated.failed)}`);
63242
+ throw new Error("Forge Template Failed");
63234
63243
  } finally {
63235
63244
  var _this_generatorCore_logger_timing1, _this_generatorCore_logger1;
63236
- (_this_generatorCore_logger1 = this.generatorCore.logger) === null || _this_generatorCore_logger1 === void 0 ? void 0 : (_this_generatorCore_logger_timing1 = _this_generatorCore_logger1.timing) === null || _this_generatorCore_logger_timing1 === void 0 ? void 0 : _this_generatorCore_logger_timing1.call(_this_generatorCore_logger1, "forgeTemplate", true);
63245
+ (_this_generatorCore_logger1 = this.generatorCore.logger) === null || _this_generatorCore_logger1 === void 0 ? void 0 : (_this_generatorCore_logger_timing1 = _this_generatorCore_logger1.timing) === null || _this_generatorCore_logger_timing1 === void 0 ? void 0 : _this_generatorCore_logger_timing1.call(_this_generatorCore_logger1, "🕒 ForgeTemplate", true);
63237
63246
  }
63238
63247
  }
63239
63248
  async renderTemplateByFileType(templatePattern, filter, rename, parameters) {
63240
63249
  try {
63241
63250
  var _this_generatorCore_logger_timing, _this_generatorCore_logger;
63242
- (_this_generatorCore_logger = this.generatorCore.logger) === null || _this_generatorCore_logger === void 0 ? void 0 : (_this_generatorCore_logger_timing = _this_generatorCore_logger.timing) === null || _this_generatorCore_logger_timing === void 0 ? void 0 : _this_generatorCore_logger_timing.call(_this_generatorCore_logger, "renderTemplateByFileType");
63251
+ (_this_generatorCore_logger = this.generatorCore.logger) === null || _this_generatorCore_logger === void 0 ? void 0 : (_this_generatorCore_logger_timing = _this_generatorCore_logger.timing) === null || _this_generatorCore_logger_timing === void 0 ? void 0 : _this_generatorCore_logger_timing.call(_this_generatorCore_logger, "🕒 RenderTemplateByFileType");
63243
63252
  const { material } = this.generatorContext.current;
63244
63253
  const resourceMap = await material.find(templatePattern, {
63245
63254
  nodir: true,
@@ -63247,7 +63256,7 @@ var AppAPI = class {
63247
63256
  });
63248
63257
  if (resourceMap) {
63249
63258
  await Promise.all(Object.keys(resourceMap).filter((resourceKey) => filter ? filter(resourceKey) : true).map(async (resourceKey) => {
63250
- this.generatorCore.logger.debug(`[renderDir] resourceKey=${resourceKey}`);
63259
+ this.generatorCore.logger.debug(`💡 [Forge Template by Type]: resourceKey=${resourceKey}`);
63251
63260
  if (resourceKey.includes(".handlebars")) {
63252
63261
  const target = rename ? rename(resourceKey) : resourceKey.replace("templates/", "").replace(".handlebars", "");
63253
63262
  await this.handlebarsAPI.renderTemplate(material.get(resourceKey), target, {
@@ -63267,12 +63276,12 @@ var AppAPI = class {
63267
63276
  }));
63268
63277
  }
63269
63278
  } catch (e) {
63270
- this.generatorCore.logger.debug("base forging failed:", e);
63271
- this.generatorCore.logger.warn(i18n.t(localeKeys.templated.failed));
63272
- throw new Error("base forging failed");
63279
+ this.generatorCore.logger.debug("❗️ [Forge Template by Type Failed]:", e);
63280
+ this.generatorCore.logger.warn(`🟡 ${i18n.t(localeKeys.templated.failed)}`);
63281
+ throw new Error("Forge Template by Type Failed");
63273
63282
  } finally {
63274
63283
  var _this_generatorCore_logger_timing1, _this_generatorCore_logger1;
63275
- (_this_generatorCore_logger1 = this.generatorCore.logger) === null || _this_generatorCore_logger1 === void 0 ? void 0 : (_this_generatorCore_logger_timing1 = _this_generatorCore_logger1.timing) === null || _this_generatorCore_logger_timing1 === void 0 ? void 0 : _this_generatorCore_logger_timing1.call(_this_generatorCore_logger1, "renderTemplateByFileType", true);
63284
+ (_this_generatorCore_logger1 = this.generatorCore.logger) === null || _this_generatorCore_logger1 === void 0 ? void 0 : (_this_generatorCore_logger_timing1 = _this_generatorCore_logger1.timing) === null || _this_generatorCore_logger_timing1 === void 0 ? void 0 : _this_generatorCore_logger_timing1.call(_this_generatorCore_logger1, "🕒 RenderTemplateByFileType", true);
63276
63285
  }
63277
63286
  }
63278
63287
  async updateWorkspace(folder, workspaceName = "monorepo.code-workspace") {
@@ -63298,8 +63307,8 @@ var AppAPI = class {
63298
63307
  try {
63299
63308
  await this.generatorCore.runSubGenerator(subGenerator, relativePwdPath, config);
63300
63309
  } catch (e) {
63301
- this.generatorCore.logger.warn(i18n.t(localeKeys.generator.failed));
63302
- this.generatorCore.logger.debug(i18n.t(localeKeys.generator.failed), e);
63310
+ this.generatorCore.logger.warn(`🟡 ${i18n.t(localeKeys.generator.failed)}`);
63311
+ this.generatorCore.logger.debug("❗️ [Runtime sub Generator Failed]:", subGenerator, e);
63303
63312
  throw new Error("run sub generator failed");
63304
63313
  }
63305
63314
  }
@@ -63352,11 +63361,11 @@ var AppAPI = class {
63352
63361
  }
63353
63362
  };
63354
63363
 
63355
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-json@2.4.2/node_modules/@modern-js/codesmith-api-json/dist/esm-node/index.js
63364
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-json@2.5.1/node_modules/@modern-js/codesmith-api-json/dist/esm-node/index.js
63356
63365
  var import_comment_json2 = __toESM(require_src2());
63357
63366
  var declarationUpdate = __toESM(require_dist());
63358
63367
 
63359
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-json@2.4.2/node_modules/@modern-js/codesmith-api-json/dist/esm-node/utils/index.js
63368
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-json@2.5.1/node_modules/@modern-js/codesmith-api-json/dist/esm-node/utils/index.js
63360
63369
  async function editJson(generatorCore, resource, getNewJsonValue) {
63361
63370
  const originJsonValue = await resource.value();
63362
63371
  const newJsonString = await getNewJsonValue(originJsonValue.content);
@@ -63369,7 +63378,7 @@ async function editJson(generatorCore, resource, getNewJsonValue) {
63369
63378
  return newJsonString;
63370
63379
  }
63371
63380
 
63372
- // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-json@2.4.2/node_modules/@modern-js/codesmith-api-json/dist/esm-node/index.js
63381
+ // ../../../../node_modules/.pnpm/@modern-js+codesmith-api-json@2.5.1/node_modules/@modern-js/codesmith-api-json/dist/esm-node/index.js
63373
63382
  var JsonAPI = class {
63374
63383
  async get(resource) {
63375
63384
  const originJsonValue = await resource.value();
@@ -63377,7 +63386,7 @@ var JsonAPI = class {
63377
63386
  const origin = import_comment_json2.default.parse(originJsonValue.content);
63378
63387
  return origin;
63379
63388
  } catch (e) {
63380
- this.generatorCore.logger.debug("[JSON API] parse json error:", e);
63389
+ this.generatorCore.logger.debug("❗️ [JSON Get Parse Error]:", e);
63381
63390
  throw new Error("resource content is not a legal json");
63382
63391
  }
63383
63392
  }
@@ -63390,7 +63399,7 @@ var JsonAPI = class {
63390
63399
  const jsonIntent = 2;
63391
63400
  return import_comment_json2.default.stringify(newObj, void 0, jsonIntent) + (endWithNewLine ? "\n" : "");
63392
63401
  } catch (e) {
63393
- this.generatorCore.logger.debug("[JSON API] parse json error:", e);
63402
+ this.generatorCore.logger.debug("❗️ [JSON Extend Parse Error]:", e);
63394
63403
  throw new Error("resource content is not a legal json");
63395
63404
  }
63396
63405
  });
@@ -63403,7 +63412,7 @@ var JsonAPI = class {
63403
63412
  const jsonIntent = 2;
63404
63413
  return Promise.resolve(import_comment_json2.default.stringify(jsonContent, void 0, jsonIntent) + (endWithNewLine ? "\n" : ""));
63405
63414
  } catch (e) {
63406
- this.generatorCore.logger.debug("[JSON API] parse json error:", e);
63415
+ this.generatorCore.logger.debug("❗️ [JSON Update Parse Error]:", e);
63407
63416
  throw new Error("resource content is not a legal json");
63408
63417
  }
63409
63418
  });
@@ -63884,8 +63893,8 @@ var handleTemplateFile = async (context, generator, appApi) => {
63884
63893
  if (import_utils18.fs.existsSync(serverDir) && !isEmptyServerDir(serverDir)) {
63885
63894
  const files = import_utils18.fs.readdirSync("server");
63886
63895
  if (files.length > 0) {
63887
- generator.logger.warn("'server' is already exist");
63888
- process.exit(1);
63896
+ generator.logger.warn(`🟡 The 'server' directory already exists.`);
63897
+ throw Error("The 'server' directory is already exist");
63889
63898
  }
63890
63899
  }
63891
63900
  const language = isTsProject(appDir) ? Language.TS : Language.JS;
@@ -63942,11 +63951,13 @@ var src_default = async (context, generator) => {
63942
63951
  if (!await appApi.checkEnvironment()) {
63943
63952
  process.exit(1);
63944
63953
  }
63945
- generator.logger.debug(`start run @modern-js/server-generator`);
63946
- generator.logger.debug(`context=${JSON.stringify(context)}`);
63947
- generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
63954
+ generator.logger.debug(`🚀 [Start Run Server Generator]`);
63955
+ generator.logger.debug(
63956
+ "💡 [Current Config]:",
63957
+ JSON.stringify(context.config)
63958
+ );
63948
63959
  await handleTemplateFile(context, generator, appApi);
63949
- generator.logger.debug(`forge @modern-js/server-generator succeed `);
63960
+ generator.logger.debug(`🌟 [End Run Server Generator]`);
63950
63961
  };
63951
63962
  /*! Bundled license information:
63952
63963
 
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "3.6.1",
18
+ "version": "3.6.2",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./src/index.ts",
21
21
  "main": "./dist/index.js",
@@ -24,21 +24,21 @@
24
24
  "/dist/index.js"
25
25
  ],
26
26
  "dependencies": {
27
- "@modern-js/utils": "2.60.1"
27
+ "@modern-js/utils": "2.60.2"
28
28
  },
29
29
  "devDependencies": {
30
- "@modern-js/codesmith": "2.4.2",
31
- "@modern-js/codesmith-api-app": "2.4.2",
32
- "@modern-js/codesmith-api-json": "2.4.2",
30
+ "@modern-js/codesmith": "2.5.1",
31
+ "@modern-js/codesmith-api-app": "2.5.1",
32
+ "@modern-js/codesmith-api-json": "2.5.1",
33
33
  "@types/jest": "^29",
34
34
  "@types/node": "^14",
35
35
  "jest": "^29",
36
36
  "typescript": "^5",
37
- "@modern-js/dependence-generator": "3.6.1",
38
- "@modern-js/generator-utils": "3.6.1",
39
- "@scripts/build": "2.60.1",
40
- "@modern-js/generator-common": "3.6.1",
41
- "@scripts/jest-config": "2.60.1"
37
+ "@modern-js/generator-common": "3.6.2",
38
+ "@scripts/build": "2.60.2",
39
+ "@modern-js/generator-utils": "3.6.2",
40
+ "@scripts/jest-config": "2.60.2",
41
+ "@modern-js/dependence-generator": "3.6.2"
42
42
  },
43
43
  "sideEffects": false,
44
44
  "publishConfig": {
package/src/index.ts CHANGED
@@ -43,8 +43,8 @@ const handleTemplateFile = async (
43
43
  if (fs.existsSync(serverDir) && !isEmptyServerDir(serverDir)) {
44
44
  const files = fs.readdirSync('server');
45
45
  if (files.length > 0) {
46
- generator.logger.warn("'server' is already exist");
47
- process.exit(1);
46
+ generator.logger.warn(`🟡 The 'server' directory already exists.`);
47
+ throw Error("The 'server' directory is already exist");
48
48
  }
49
49
  }
50
50
 
@@ -112,11 +112,13 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => {
112
112
  process.exit(1);
113
113
  }
114
114
 
115
- generator.logger.debug(`start run @modern-js/server-generator`);
116
- generator.logger.debug(`context=${JSON.stringify(context)}`);
117
- generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
115
+ generator.logger.debug(`🚀 [Start Run Server Generator]`);
116
+ generator.logger.debug(
117
+ '💡 [Current Config]:',
118
+ JSON.stringify(context.config),
119
+ );
118
120
 
119
121
  await handleTemplateFile(context, generator, appApi);
120
122
 
121
- generator.logger.debug(`forge @modern-js/server-generator succeed `);
123
+ generator.logger.debug(`🌟 [End Run Server Generator]`);
122
124
  };