@modern-js/generator-utils 3.0.0-beta.3 → 3.0.0-beta.5

package/CHANGELOG.md

@@ -1,5 +1,70 @@
 # @modern-js/generator-utils
 
+## 3.0.0-beta.5
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- Updated dependencies [7879e8f711]
+- Updated dependencies [6aca875011]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [7b7d12cf8f]
+- Updated dependencies [7efeed4]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06257]
+- Updated dependencies [bbe4c4ab64]
+- Updated dependencies [e4558a0bc4]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.6
+  - @modern-js/plugin-i18n@2.0.0-beta.6
+  - @modern-js/generator-common@3.0.0-beta.5
+
+## 3.0.0-beta.4
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- Updated dependencies [7879e8f]
+- Updated dependencies [6aca875]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [7b7d12c]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.4
+  - @modern-js/plugin-i18n@2.0.0-beta.4
+  - @modern-js/generator-common@3.0.0-beta.4
+
 ## 3.0.0-beta.3
 
 ### Major Changes

package/dist/js/modern/index.js

@@ -1,148 +1,220 @@
-import path from 'path';
-import { fs, ora, execa, getMonorepoPackages, canUseNpm, canUsePnpm, canUseYarn } from '@modern-js/utils';
-import { SolutionToolsMap } from '@modern-js/generator-common';
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import path from "path";
+import {
+  fs,
+  ora,
+  execa,
+  getMonorepoPackages,
+  canUseNpm,
+  canUsePnpm,
+  canUseYarn
+} from "@modern-js/utils";
+import { SolutionToolsMap } from "@modern-js/generator-common";
 import { stripAnsi } from "./utils/strip-ansi";
 import { i18n, localeKeys } from "./locale";
 import { getAvailableVersion } from "./utils/package";
+import { fileExist } from "./utils/fs-exist";
 export * from "./utils";
-export { ora, fs, semver, execa, readTsConfigByFile, getPackageManager, canUseNpm, canUsePnpm, canUseYarn, isReact18 } from '@modern-js/utils';
-export { i18n } from "./locale";
-export async function getPackageVersion(packageName, registry) {
-  const spinner = ora({
-    text: 'Load Generator...',
-    spinner: 'runner'
-  }).start();
-  if (await canUsePnpm()) {
-    const args = ['info', packageName, 'version'];
-    if (registry) {
-      args.push(`--registry=${registry}`);
+import {
+  ora as ora2,
+  fs as fs2,
+  semver,
+  execa as execa2,
+  readTsConfigByFile,
+  getPackageManager,
+  canUseNpm as canUseNpm2,
+  canUsePnpm as canUsePnpm2,
+  canUseYarn as canUseYarn2,
+  isReact18
+} from "@modern-js/utils";
+import { i18n as i18n2 } from "./locale";
+function getPackageVersion(packageName, registry) {
+  return __async(this, null, function* () {
+    const spinner = ora({
+      text: "Load Generator...",
+      spinner: "runner"
+    }).start();
+    if (yield canUsePnpm()) {
+      const args = ["info", packageName, "version"];
+      if (registry) {
+        args.push(`--registry=${registry}`);
+      }
+      const result = yield execa("pnpm", args);
+      spinner.stop();
+      return stripAnsi(result.stdout);
     }
-    const result = await execa('pnpm', args);
-    spinner.stop();
-    return stripAnsi(result.stdout);
-  }
-  if (await canUseYarn()) {
-    const args = ['info', packageName, 'version', '--silent'];
-    if (registry) {
-      args.push(`--registry=${registry}`);
+    if (yield canUseYarn()) {
+      const args = ["info", packageName, "version", "--silent"];
+      if (registry) {
+        args.push(`--registry=${registry}`);
+      }
+      const result = yield execa("yarn", args);
+      spinner.stop();
+      return stripAnsi(result.stdout);
     }
-    const result = await execa('yarn', args);
-    spinner.stop();
-    return stripAnsi(result.stdout);
-  }
-  if (await canUseNpm()) {
-    const args = ['view', packageName, 'version'];
-    if (registry) {
-      args.push(`--registry=${registry}`);
+    if (yield canUseNpm()) {
+      const args = ["view", packageName, "version"];
+      if (registry) {
+        args.push(`--registry=${registry}`);
+      }
+      const result = yield execa("npm", args);
+      spinner.stop();
+      return stripAnsi(result.stdout);
     }
-    const result = await execa('npm', args);
     spinner.stop();
-    return stripAnsi(result.stdout);
-  }
-  spinner.stop();
-  throw new Error('not found npm, please install npm before');
+    throw new Error("not found npm, please install npm before");
+  });
 }
-export async function getModernVersion(solution, registry, distTag = 'latest') {
-  const dep = SolutionToolsMap[solution];
-  const modernVersion = await getPackageVersion(`${dep}@${distTag}`, registry);
-  return modernVersion;
+function getModernVersion(solution, registry, distTag = "latest") {
+  return __async(this, null, function* () {
+    const dep = SolutionToolsMap[solution];
+    const modernVersion = yield getPackageVersion(`${dep}@${distTag}`, registry);
+    return modernVersion;
+  });
 }
-export async function getModernPluginVersion(solution, packageName, options = {
-  distTag: 'latest'
-}) {
-  const {
-    cwd = process.cwd(),
-    registry,
-    distTag
-  } = options;
-  const getLatetPluginVersion = async tag => {
-    const version = await getPackageVersion(`${packageName}@${tag || distTag || 'latest'}`, registry);
-    return version;
-  };
-  if (!packageName.startsWith('@modern-js') || packageName.includes('electron') || packageName.includes('codesmith') || packageName.includes('easy-form') || packageName.startsWith('@modern-js-reduck')) {
-    return getLatetPluginVersion('latest');
-  }
-  // get project solution version
-  const pkgPath = path.join(require.resolve(SolutionToolsMap[solution], {
-    paths: [cwd]
-  }), '../../../../', 'package.json');
-  if (fs.existsSync(pkgPath)) {
-    const pkgInfo = fs.readJSONSync(pkgPath);
-    const modernVersion = pkgInfo.version;
-    if (typeof modernVersion !== 'string') {
-      return getLatetPluginVersion();
+function getModernPluginVersion(_0, _1) {
+  return __async(this, arguments, function* (solution, packageName, options = {
+    distTag: "latest"
+  }) {
+    const { cwd = process.cwd(), registry, distTag } = options;
+    const getLatetPluginVersion = (tag) => __async(this, null, function* () {
+      const version = yield getPackageVersion(
+        `${packageName}@${tag || distTag || "latest"}`,
+        registry
+      );
+      return version;
+    });
+    if (!packageName.startsWith("@modern-js") || packageName.includes("electron") || packageName.includes("codesmith") || packageName.includes("easy-form") || packageName.startsWith("@modern-js-reduck")) {
+      return getLatetPluginVersion("latest");
     }
-    return getAvailableVersion(packageName, modernVersion, registry);
-  }
-  return getLatetPluginVersion();
+    const pkgPath = path.join(
+      require.resolve(SolutionToolsMap[solution], { paths: [cwd] }),
+      "../../../../",
+      "package.json"
+    );
+    if (fs.existsSync(pkgPath)) {
+      const pkgInfo = fs.readJSONSync(pkgPath);
+      const modernVersion = pkgInfo.version;
+      if (typeof modernVersion !== "string") {
+        return getLatetPluginVersion();
+      }
+      return getAvailableVersion(packageName, modernVersion, registry);
+    }
+    return getLatetPluginVersion();
+  });
 }
-export function getPackageManagerText(packageManager) {
-  return packageManager === 'yarn' ? 'yarn' : `${packageManager} run`;
+function getPackageManagerText(packageManager) {
+  return packageManager === "yarn" ? "yarn" : `${packageManager} run`;
 }
-export function isTsProject(appDir) {
-  return fs.existsSync(path.join(appDir, 'tsconfig.json'));
+function isTsProject(appDir) {
+  return fs.existsSync(path.join(appDir, "tsconfig.json"));
 }
-export async function getPackageObj(context) {
-  const pkgStr = (await context.materials.default.get(`package.json`).value()).content;
-  return JSON.parse(pkgStr);
+function getPackageObj(context) {
+  return __async(this, null, function* () {
+    const pkgStr = (yield context.materials.default.get(`package.json`).value()).content;
+    return JSON.parse(pkgStr);
+  });
 }
-export function getAllPackages(appDir) {
+function getAllPackages(appDir) {
   const packages = getMonorepoPackages(appDir);
-  return packages.map(pkg => pkg.name);
+  return packages.map((pkg) => pkg.name);
 }
-export function validatePackageName(value, packages, options) {
-  const {
-    isMonorepoSubProject
-  } = options;
+function validatePackageName(value, packages, options) {
+  const { isMonorepoSubProject } = options;
   if (isMonorepoSubProject && packages.includes(value)) {
     return {
       success: false,
-      error: i18n.t(localeKeys.packageName.exit, {
-        value
-      })
+      error: i18n.t(localeKeys.packageName.exit, { value })
     };
   }
-  return {
-    success: true
-  };
+  return { success: true };
 }
-export function validatePackagePath(value, projectDir, options) {
-  const {
-    isMwa,
-    isPublic,
-    isTest
-  } = options || {};
-  let dir = 'apps';
+function validatePackagePath(value, projectDir, options) {
+  const { isMwa, isPublic, isTest } = options || {};
+  let dir = "apps";
   if (isMwa && isTest) {
-    dir = 'examples';
+    dir = "examples";
   } else {
-    dir = isPublic ? 'packages' : 'features';
+    dir = isPublic ? "packages" : "features";
   }
-  const packageDir = path.resolve(projectDir || '', dir, value);
+  const packageDir = path.resolve(projectDir || "", dir, value);
   if (fs.existsSync(packageDir)) {
     return {
       success: false,
-      error: i18n.t(localeKeys.packagePath.exit, {
-        value
-      })
+      error: i18n.t(localeKeys.packagePath.exit, { value })
     };
   }
-  return {
-    success: true
-  };
+  return { success: true };
 }
-export function getModuleProjectPath(packagePath, isMonorepoSubProject, isPublic, isLocalPackages) {
+function getModuleProjectPath(packagePath, isMonorepoSubProject, isPublic, isLocalPackages) {
   if (isLocalPackages && packagePath) {
     return `${packagePath}/`;
   }
   if (isMonorepoSubProject && packagePath) {
-    return `${isPublic ? 'packages' : 'features'}/${packagePath}/`;
+    return `${isPublic ? "packages" : "features"}/${packagePath}/`;
   }
-  return '';
+  return "";
 }
-export function getMWAProjectPath(packagePath, isMonorepoSubProject, isTest = false) {
+function getMWAProjectPath(packagePath, isMonorepoSubProject, isTest = false) {
   if (isMonorepoSubProject && packagePath) {
-    return `${isTest ? 'examples' : 'apps'}/${packagePath}/`;
+    return `${isTest ? "examples" : "apps"}/${packagePath}/`;
   }
-  return '';
-}
+  return "";
+}
+function getModernConfigFile(appDir) {
+  return __async(this, null, function* () {
+    let exist = yield fileExist(path.join(appDir, "modern.config.ts"));
+    if (exist) {
+      return "modern.config.ts";
+    }
+    exist = yield fileExist(path.join(appDir, "modern.config.js"));
+    if (exist) {
+      return "modern.config.js";
+    }
+    return isTsProject(appDir) ? "modern.config.ts" : "modern.config.js";
+  });
+}
+export {
+  canUseNpm2 as canUseNpm,
+  canUsePnpm2 as canUsePnpm,
+  canUseYarn2 as canUseYarn,
+  execa2 as execa,
+  fs2 as fs,
+  getAllPackages,
+  getMWAProjectPath,
+  getModernConfigFile,
+  getModernPluginVersion,
+  getModernVersion,
+  getModuleProjectPath,
+  getPackageManager,
+  getPackageManagerText,
+  getPackageObj,
+  getPackageVersion,
+  i18n2 as i18n,
+  isReact18,
+  isTsProject,
+  ora2 as ora,
+  readTsConfigByFile,
+  semver,
+  validatePackageName,
+  validatePackagePath
+};

package/dist/js/modern/locale/en.js

@@ -1,8 +1,7 @@
-export const EN_LOCALE = {
-  packageName: {
-    exit: 'package name `{value}` is already exists'
-  },
-  packagePath: {
-    exit: 'package path {value} is already exists'
-  }
-};
+const EN_LOCALE = {
+  packageName: { exit: "package name `{value}` is already exists" },
+  packagePath: { exit: "package path {value} is already exists" }
+};
+export {
+  EN_LOCALE
+};

package/dist/js/modern/locale/index.js

@@ -1,9 +1,9 @@
-import { I18n } from '@modern-js/plugin-i18n';
+import { I18n } from "@modern-js/plugin-i18n";
 import { ZH_LOCALE } from "./zh";
 import { EN_LOCALE } from "./en";
 const i18n = new I18n();
-const localeKeys = i18n.init('zh', {
-  zh: ZH_LOCALE,
-  en: EN_LOCALE
-});
-export { i18n, localeKeys };
+const localeKeys = i18n.init("zh", { zh: ZH_LOCALE, en: EN_LOCALE });
+export {
+  i18n,
+  localeKeys
+};

package/dist/js/modern/locale/zh.js

@@ -1,8 +1,7 @@
-export const ZH_LOCALE = {
-  packageName: {
-    exit: '项目名称 {value} 已存在'
-  },
-  packagePath: {
-    exit: '目录 {value} 已存在'
-  }
-};
+const ZH_LOCALE = {
+  packageName: { exit: "项目名称 {value} 已存在" },
+  packagePath: { exit: "目录 {value} 已存在" }
+};
+export {
+  ZH_LOCALE
+};

package/dist/js/modern/utils/fs-exist.js

@@ -0,0 +1,37 @@
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { fs } from "@modern-js/utils";
+function fileExist(filePath) {
+  return __async(this, null, function* () {
+    try {
+      const stat = yield fs.stat(filePath);
+      if (stat.isFile()) {
+        return true;
+      }
+      return false;
+    } catch (e) {
+      return false;
+    }
+  });
+}
+export {
+  fileExist
+};

package/dist/js/modern/utils/index.js

@@ -1,2 +1,2 @@
 export * from "./strip-ansi";
-export * from "./package";
+export * from "./package";

package/dist/js/modern/utils/package.js

@@ -1,36 +1,52 @@
-import { canUseNpm, execa, logger, semver, stripAnsi } from '@modern-js/utils';
-
-// 判断包是否存在
-export async function isPackageExist(packageName, registry) {
-  if (await canUseNpm()) {
-    const args = ['view', packageName, 'version'];
-    if (registry) {
-      args.push(`--registry=${registry}`);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { canUseNpm, execa, logger, semver, stripAnsi } from "@modern-js/utils";
+function isPackageExist(packageName, registry) {
+  return __async(this, null, function* () {
+    if (yield canUseNpm()) {
+      const args = ["view", packageName, "version"];
+      if (registry) {
+        args.push(`--registry=${registry}`);
+      }
+      const result = yield execa("npm", args);
+      return stripAnsi(result.stdout);
     }
-    const result = await execa('npm', args);
-    return stripAnsi(result.stdout);
-  }
-  throw new Error('not found npm, please install npm before');
+    throw new Error("not found npm, please install npm before");
+  });
 }
-
-// 判断包是否已经废弃
-export async function isPackageDeprecated(packageName, registry) {
-  if (await canUseNpm()) {
-    const args = ['view', packageName, 'deprecated'];
-    if (registry) {
-      args.push(`--registry=${registry}`);
+function isPackageDeprecated(packageName, registry) {
+  return __async(this, null, function* () {
+    if (yield canUseNpm()) {
+      const args = ["view", packageName, "deprecated"];
+      if (registry) {
+        args.push(`--registry=${registry}`);
+      }
+      const result = yield execa("npm", args);
+      return stripAnsi(result.stdout);
     }
-    const result = await execa('npm', args);
-    return stripAnsi(result.stdout);
-  }
-  throw new Error('not found npm, please install npm before');
-}
-
-// 降低包小版本号
-export function semverDecrease(version) {
-  const versionObj = semver.parse(version, {
-    loose: true
+    throw new Error("not found npm, please install npm before");
   });
+}
+function semverDecrease(version) {
+  const versionObj = semver.parse(version, { loose: true });
   if (!versionObj) {
     throw new Error(`Version ${version} is not valid semver`);
   }
@@ -44,31 +60,33 @@ export function semverDecrease(version) {
   }
   return result;
 }
-
-/**
- * 插件存在 hotfix 版本，从 tools 版本号向上找当前插件版本号
- * tools 存在 hotfix 版本，从 tools 版本号向下找当前插件版本号
- * 限制只在当前小版本号范围内寻找
- */
-export async function getAvailableVersion(packageName, currentVersion, registry) {
-  let times = 5;
-  let version = currentVersion;
-  while (times) {
-    if (!(await isPackageExist(`${packageName}@${version}`, registry)) || (await isPackageDeprecated(`${packageName}@${version}`, registry))) {
-      version = semver.inc(version, 'patch');
-      times--;
-      continue;
+function getAvailableVersion(packageName, currentVersion, registry) {
+  return __async(this, null, function* () {
+    let times = 5;
+    let version = currentVersion;
+    while (times) {
+      if (!(yield isPackageExist(`${packageName}@${version}`, registry)) || (yield isPackageDeprecated(`${packageName}@${version}`, registry))) {
+        version = semver.inc(version, "patch");
+        times--;
+        continue;
+      }
+      return version;
     }
-    return version;
-  }
-  times = 5;
-  while (times) {
-    version = semverDecrease(version);
-    if (!(await isPackageExist(`${packageName}@${version}`, registry)) || (await isPackageDeprecated(`${packageName}@${version}`, registry))) {
-      times--;
-      continue;
+    times = 5;
+    while (times) {
+      version = semverDecrease(version);
+      if (!(yield isPackageExist(`${packageName}@${version}`, registry)) || (yield isPackageDeprecated(`${packageName}@${version}`, registry))) {
+        times--;
+        continue;
+      }
+      return version;
     }
-    return version;
-  }
-  return currentVersion;
-}
+    return currentVersion;
+  });
+}
+export {
+  getAvailableVersion,
+  isPackageDeprecated,
+  isPackageExist,
+  semverDecrease
+};

package/dist/js/modern/utils/strip-ansi.js

@@ -1,12 +1,16 @@
-function ansiRegex({
-  onlyFirst = false
-} = {}) {
-  const pattern = ['[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)', '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))'].join('|');
-  return new RegExp(pattern, onlyFirst ? undefined : 'g');
+function ansiRegex({ onlyFirst = false } = {}) {
+  const pattern = [
+    "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
+    "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"
+  ].join("|");
+  return new RegExp(pattern, onlyFirst ? void 0 : "g");
 }
-export function stripAnsi(string) {
-  if (typeof string !== 'string') {
+function stripAnsi(string) {
+  if (typeof string !== "string") {
     throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
   }
-  return string.replace(ansiRegex(), '');
-}
+  return string.replace(ansiRegex(), "");
+}
+export {
+  stripAnsi
+};