@zwa73/dev-utils 1.0.84 → 1.0.85

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.
@@ -46,12 +46,15 @@ const CmdGenTemplate = (program) => program
46
46
  .requiredOption("-d, --projectDescription <description>", "项目描述")
47
47
  .requiredOption("-a, --authorName <name>", "作者名")
48
48
  .action(async (templateName, opt) => {
49
- const templatePath = pathe_1.default.join(RouteInterface_1.ROOT_PATH, 'template', templateName);
49
+ const templatePath = pathe_1.default.join(RouteInterface_1.TEMPLATE_PATH, templateName);
50
50
  if (!await utils_1.UtilFT.pathExists(templatePath))
51
51
  utils_1.SLogger.error(`模板 ${templateName} 不存在`);
52
52
  const projectPath = pathe_1.default.join(process.cwd(), opt.projectName);
53
- await copyData(pathe_1.default.join(RouteInterface_1.ROOT_PATH, 'template', templateName), projectPath);
53
+ await utils_1.UtilFT.ensurePathExists(projectPath, { dir: true });
54
+ await copyData(templatePath, projectPath);
54
55
  await installPackage(projectPath, ['@zwa73/utils'], ['@types/node']);
56
+ if (await utils_1.UtilFT.pathExists(pathe_1.default.join(projectPath, "gitignore")))
57
+ await fs_1.default.promises.rename(pathe_1.default.join(projectPath, "gitignore"), pathe_1.default.join(projectPath, ".gitignore"));
55
58
  switch (templateName) {
56
59
  case 'base': break;
57
60
  case 'electron': break;
@@ -32,7 +32,7 @@ function checkVersion(oldVersion, newVersion) {
32
32
  }
33
33
  /**更新版本号 */
34
34
  async function updateVersion(newVersion) {
35
- const packagePath = pathe_1.default.join(RouteInterface_1.PROJECT_PATH, "package.json");
35
+ const packagePath = pathe_1.default.join(RouteInterface_1.PROCESS_PATH, "package.json");
36
36
  const packageData = await (0, utils_1.memoize)(utils_1.UtilFT.loadJSONFile)(packagePath);
37
37
  if (newVersion) {
38
38
  checkVersion(packageData.version, newVersion);
@@ -48,7 +48,7 @@ async function updateVersion(newVersion) {
48
48
  }
49
49
  /**获取包名 */
50
50
  async function getPackName() {
51
- const packagePath = pathe_1.default.join(RouteInterface_1.PROJECT_PATH, "package.json");
51
+ const packagePath = pathe_1.default.join(RouteInterface_1.PROCESS_PATH, "package.json");
52
52
  const packageData = await (0, utils_1.memoize)(utils_1.UtilFT.loadJSONFile)(packagePath);
53
53
  return packageData.name
54
54
  .replace(/\//g, '-')
@@ -8,6 +8,8 @@ export declare const ROOT_PATH: string;
8
8
  export declare const DATA_PATH: string;
9
9
  /**template文件夹路径 */
10
10
  export declare const TEMPLATE_PATH: string;
11
+ /**当前路径 */
12
+ export declare const PROCESS_PATH: string;
11
13
  /** 检测非浮点的整数类型 */
12
14
  export declare function parseInteger(value: string): number;
13
15
  /** 检测任意数字类型 */
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.TEMPLATE_PATH = exports.DATA_PATH = exports.ROOT_PATH = exports.OFFICIAL_SOURCE = exports.MIRROR_SOURCE = void 0;
6
+ exports.PROCESS_PATH = exports.TEMPLATE_PATH = exports.DATA_PATH = exports.ROOT_PATH = exports.OFFICIAL_SOURCE = exports.MIRROR_SOURCE = void 0;
7
7
  exports.parseInteger = parseInteger;
8
8
  exports.parseNumber = parseNumber;
9
9
  exports.parseBoolean = parseBoolean;
@@ -22,6 +22,8 @@ exports.ROOT_PATH = pathe_1.default.join(__dirname, '..', '..', '..');
22
22
  exports.DATA_PATH = pathe_1.default.join(exports.ROOT_PATH, 'data');
23
23
  /**template文件夹路径 */
24
24
  exports.TEMPLATE_PATH = pathe_1.default.join(exports.DATA_PATH, 'template');
25
+ /**当前路径 */
26
+ exports.PROCESS_PATH = process.cwd();
25
27
  /** 检测非浮点的整数类型 */
26
28
  function parseInteger(value) {
27
29
  const num = Number(value);
@@ -62,7 +64,7 @@ async function withOfficialSource(func) {
62
64
  }
63
65
  /**检查目录是否为项目 */
64
66
  async function checkProject() {
65
- const filePath = pathe_1.default.join(process.cwd(), "package.json");
67
+ const filePath = pathe_1.default.join(exports.PROCESS_PATH, "package.json");
66
68
  if (!(await utils_1.UtilFT.pathExists(filePath)))
67
- (0, utils_1.throwError)(`当前目录: ${process.cwd()} 不是npm项目目录, 请先使用 npm init`);
69
+ (0, utils_1.throwError)(`当前目录: ${exports.PROCESS_PATH} 不是npm项目目录, 请先使用 npm init`);
68
70
  }
@@ -1,5 +1,5 @@
1
1
  import path from 'pathe';
2
- import { MIRROR_SOURCE, ROOT_PATH } from "./RouteInterface.js";
2
+ import { MIRROR_SOURCE, TEMPLATE_PATH } from "./RouteInterface.js";
3
3
  import { SLogger, UtilFT, UtilFunc } from "@zwa73/utils";
4
4
  import fs from 'fs';
5
5
  /**复制基础文件 */
@@ -40,12 +40,15 @@ export const CmdGenTemplate = (program) => program
40
40
  .requiredOption("-d, --projectDescription <description>", "项目描述")
41
41
  .requiredOption("-a, --authorName <name>", "作者名")
42
42
  .action(async (templateName, opt) => {
43
- const templatePath = path.join(ROOT_PATH, 'template', templateName);
43
+ const templatePath = path.join(TEMPLATE_PATH, templateName);
44
44
  if (!await UtilFT.pathExists(templatePath))
45
45
  SLogger.error(`模板 ${templateName} 不存在`);
46
46
  const projectPath = path.join(process.cwd(), opt.projectName);
47
- await copyData(path.join(ROOT_PATH, 'template', templateName), projectPath);
47
+ await UtilFT.ensurePathExists(projectPath, { dir: true });
48
+ await copyData(templatePath, projectPath);
48
49
  await installPackage(projectPath, ['@zwa73/utils'], ['@types/node']);
50
+ if (await UtilFT.pathExists(path.join(projectPath, "gitignore")))
51
+ await fs.promises.rename(path.join(projectPath, "gitignore"), path.join(projectPath, ".gitignore"));
49
52
  switch (templateName) {
50
53
  case 'base': break;
51
54
  case 'electron': break;
@@ -1,6 +1,6 @@
1
1
  import path from 'pathe';
2
2
  import { memoize, SLogger, throwError, UtilFT, UtilFunc } from '@zwa73/utils';
3
- import { checkProject, OFFICIAL_SOURCE, PROJECT_PATH } from './RouteInterface.js';
3
+ import { checkProject, OFFICIAL_SOURCE, PROCESS_PATH } from './RouteInterface.js';
4
4
  import fs from 'fs';
5
5
  /**解析版本号为number数组 */
6
6
  function parseVersion(version) {
@@ -26,7 +26,7 @@ function checkVersion(oldVersion, newVersion) {
26
26
  }
27
27
  /**更新版本号 */
28
28
  async function updateVersion(newVersion) {
29
- const packagePath = path.join(PROJECT_PATH, "package.json");
29
+ const packagePath = path.join(PROCESS_PATH, "package.json");
30
30
  const packageData = await memoize(UtilFT.loadJSONFile)(packagePath);
31
31
  if (newVersion) {
32
32
  checkVersion(packageData.version, newVersion);
@@ -42,7 +42,7 @@ async function updateVersion(newVersion) {
42
42
  }
43
43
  /**获取包名 */
44
44
  async function getPackName() {
45
- const packagePath = path.join(PROJECT_PATH, "package.json");
45
+ const packagePath = path.join(PROCESS_PATH, "package.json");
46
46
  const packageData = await memoize(UtilFT.loadJSONFile)(packagePath);
47
47
  return packageData.name
48
48
  .replace(/\//g, '-')
@@ -8,6 +8,8 @@ export declare const ROOT_PATH: string;
8
8
  export declare const DATA_PATH: string;
9
9
  /**template文件夹路径 */
10
10
  export declare const TEMPLATE_PATH: string;
11
+ /**当前路径 */
12
+ export declare const PROCESS_PATH: string;
11
13
  /** 检测非浮点的整数类型 */
12
14
  export declare function parseInteger(value: string): number;
13
15
  /** 检测任意数字类型 */
@@ -10,6 +10,8 @@ export const ROOT_PATH = path.join(`${process.platform === 'win32' ? '' : '/'}${
10
10
  export const DATA_PATH = path.join(ROOT_PATH, 'data');
11
11
  /**template文件夹路径 */
12
12
  export const TEMPLATE_PATH = path.join(DATA_PATH, 'template');
13
+ /**当前路径 */
14
+ export const PROCESS_PATH = process.cwd();
13
15
  /** 检测非浮点的整数类型 */
14
16
  export function parseInteger(value) {
15
17
  const num = Number(value);
@@ -50,7 +52,7 @@ export async function withOfficialSource(func) {
50
52
  }
51
53
  /**检查目录是否为项目 */
52
54
  export async function checkProject() {
53
- const filePath = path.join(process.cwd(), "package.json");
55
+ const filePath = path.join(PROCESS_PATH, "package.json");
54
56
  if (!(await UtilFT.pathExists(filePath)))
55
- throwError(`当前目录: ${process.cwd()} 不是npm项目目录, 请先使用 npm init`);
57
+ throwError(`当前目录: ${PROCESS_PATH} 不是npm项目目录, 请先使用 npm init`);
56
58
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zwa73/dev-utils",
3
- "version": "1.0.84",
3
+ "version": "1.0.85",
4
4
  "description": "编译与调试工具",
5
5
  "exports": {
6
6
  ".": {