@zwa73/dev-utils 1.0.5 → 1.0.13

package/dist/Command/Init.js

@@ -45,7 +45,7 @@ async function copyData() {
 }
 /**安装npm包 */
 async function installPackage() {
-    const install = async (name) => await utils_1.UtilFunc.exec(`npm i ${name}`);
+    const install = async (name) => await utils_1.UtilFunc.exec(`npm i --registry ${RouteInterface_1.MIRROR_SOURCE} ${name}`);
     const packageList = ['@zwa73/utils'];
     for (const name of packageList) {
         utils_1.SLogger.info(`正在安装 ${name}`);
@@ -59,11 +59,9 @@ const CmdInit = (program) => program
     .action(async (opt) => {
     (0, RouteInterface_1.checkProject)();
     utils_1.SLogger.info(`开始初始化设置当前目录 ${RouteInterface_1.PROJECT_PATH}`);
-    await (0, RouteInterface_1.withMirrorSource)(async () => {
-        await Promise.all([
-            copyData(),
-            installPackage(),
-        ]);
-    });
+    await Promise.all([
+        copyData(),
+        installPackage(),
+    ]);
 });
 exports.CmdInit = CmdInit;

package/dist/Command/Release.js

@@ -54,18 +54,20 @@ const CmdRelease = (program) => program
     .action(async (opt) => {
     (0, RouteInterface_1.checkProject)();
     utils_1.SLogger.info(`开始发布项目`);
-    (0, RouteInterface_1.withOfficialSource)(async () => {
-        try {
-            const newVersion = await updateVersion(opt.version);
-            utils_1.SLogger.info(`新版本号: ${newVersion}`);
-            utils_1.SLogger.info("正在发布...");
-            const cmd = `npm publish --access ${opt.access}`;
-            await utils_1.UtilFunc.exec(cmd);
-            utils_1.SLogger.info("发布完成");
-        }
-        catch (error) {
-            utils_1.SLogger.error(error);
-        }
-    });
+    try {
+        const newVersion = await updateVersion(opt.version);
+        utils_1.SLogger.info(`新版本号: ${newVersion}`);
+        utils_1.SLogger.info("正在发布...");
+        const cmd = `npm publish --registry ${RouteInterface_1.OFFICIAL_SOURCE} --access ${opt.access}`;
+        const { stderr, stdout } = await utils_1.UtilFunc.exec(cmd);
+        if (stderr)
+            utils_1.SLogger.error(stderr);
+        else
+            utils_1.SLogger.info(stdout);
+        utils_1.SLogger.info("发布完成");
+    }
+    catch (error) {
+        utils_1.SLogger.error(error);
+    }
 });
 exports.CmdRelease = CmdRelease;

package/dist/Command/RouteInterface.js

@@ -61,11 +61,9 @@ async function withMirrorSource(func) {
     const OriginSource = out.stdout.trim(); //?
     utils_1.SLogger.info(`正在修改npm源为 镜像源: ${exports.MIRROR_SOURCE}`);
     await utils_1.UtilFunc.exec(`npm config set registry ${exports.MIRROR_SOURCE}`);
-    utils_1.SLogger.info(`成功修改npm源为 镜像源: ${exports.MIRROR_SOURCE}`);
     await func();
     utils_1.SLogger.info(`正在修改npm源为 原始源: ${OriginSource}`);
     await utils_1.UtilFunc.exec(`npm config set registry ${OriginSource}`);
-    utils_1.SLogger.info(`成功修改npm源为 原始源: ${OriginSource}`);
 }
 exports.withMirrorSource = withMirrorSource;
 /**在官方源内镜像操作 */
@@ -74,11 +72,9 @@ async function withOfficialSource(func) {
     const OriginSource = out.stdout.trim(); //?
     utils_1.SLogger.info(`正在修改npm源为 官方源: ${exports.OFFICIAL_SOURCE}`);
     await utils_1.UtilFunc.exec(`npm config set registry ${exports.OFFICIAL_SOURCE}`);
-    utils_1.SLogger.info(`成功修改npm源为 官方源: ${exports.OFFICIAL_SOURCE}`);
     await func();
     utils_1.SLogger.info(`正在修改npm源为 原始源: ${OriginSource}`);
     await utils_1.UtilFunc.exec(`npm config set registry ${OriginSource}`);
-    utils_1.SLogger.info(`成功修改npm源为 原始源: ${OriginSource}`);
 }
 exports.withOfficialSource = withOfficialSource;
 /**检查目录是否为项目 */

package/package.json

@@ -1,11 +1,11 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.5",
+	"version": "1.0.13",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {
 		"test": "call npm run compile && jest",
-		"release": "call npm run compile && call node release.js && call npm publish --access public",
+		"release": "powershell scripts/release",
 		"compile": "powershell scripts/compile",
 		"watch": "powershell scripts/watch"
 	},

package/scripts/compile.ps1

@@ -1,5 +1,5 @@
-Write-Output 开始删除原dist
-Remove-Item -Recurse -Force dist
-Write-Output 开始编译
-tsc -p tsconfig.compile.json
+Write-Output 开始删除原dist
+Remove-Item -Recurse -Force dist
+Write-Output 开始编译
+tsc -p tsconfig.compile.json
 tsc-alias -p tsconfig.compile.json

package/scripts/release.ps1

@@ -0,0 +1,4 @@
+Write-Output 开始编译
+npm run compile
+Write-Output 开始发布
+node bin/cli release

package/scripts/watch.ps1

@@ -1,10 +1,10 @@
-# 定义一个函数来运行脚本
-function New-Script {
-    param($command)
-    # 在后台运行命令
-    Start-Process -NoNewWindow -FilePath "powershell" -ArgumentList "-Command", $command
-}
-
-# 开始运行脚本
-New-Script "tsc -w -p tsconfig.compile.json"
+# 定义一个函数来运行脚本
+function New-Script {
+    param($command)
+    # 在后台运行命令
+    Start-Process -NoNewWindow -FilePath "powershell" -ArgumentList "-Command", $command
+}
+
+# 开始运行脚本
+New-Script "tsc -w -p tsconfig.compile.json"
 New-Script "tsc-alias -w -p tsconfig.compile.json"

package/src/Command/Init.ts

@@ -1,7 +1,7 @@
 import * as path from 'path';
-import { AnyFunc, SLogger, UtilFP, UtilFT, UtilFunc } from '@zwa73/utils';
+import { SLogger, UtilFT, UtilFunc } from '@zwa73/utils';
 import * as fs from 'fs';
-import { DATA_PATH, MIRROR_SOURCE, PROJECT_PATH, checkProject, withMirrorSource } from './RouteInterface';
+import { DATA_PATH, MIRROR_SOURCE, PROJECT_PATH, checkProject } from './RouteInterface';
 import { Command } from 'commander';
 
 
@@ -25,7 +25,7 @@ async function copyData() {
 /**安装npm包 */
 async function installPackage() {
     const install = async (name:string)=>
-        await UtilFunc.exec(`npm i ${name}`);
+        await UtilFunc.exec(`npm i --registry ${MIRROR_SOURCE} ${name}`);
     const packageList = ['@zwa73/utils'];
     for(const name of packageList){
         SLogger.info(`正在安装 ${name}`);
@@ -40,10 +40,8 @@ export const CmdInit = (program:Command)=>program
     .action(async (opt) => {
         checkProject();
         SLogger.info(`开始初始化设置当前目录 ${PROJECT_PATH}`);
-        await withMirrorSource(async ()=>{
-            await Promise.all([
-                copyData(),
-                installPackage(),
-            ]);
-        });
+        await Promise.all([
+            copyData(),
+            installPackage(),
+        ]);
     });

package/src/Command/Release.ts

@@ -2,7 +2,7 @@ import { Command } from "commander";
 import fs from "fs";
 import path from "path";
 import { SLogger, UtilFT, UtilFunc, throwError } from "@zwa73/utils";
-import { PROJECT_PATH, checkProject, withOfficialSource } from "./RouteInterface";
+import { OFFICIAL_SOURCE, PROJECT_PATH, checkProject, withOfficialSource } from "./RouteInterface";
 
 /**解析版本号为number数组 */
 function parseVersion(version: string){
@@ -50,16 +50,16 @@ export const CmdRelease = (program: Command) =>program
     .action(async (opt) => {
         checkProject();
         SLogger.info(`开始发布项目`);
-        withOfficialSource(async ()=>{
-            try {
-                const newVersion = await updateVersion(opt.version);
-                SLogger.info(`新版本号: ${newVersion}`);
-                SLogger.info("正在发布...");
-                const cmd = `npm publish --access ${opt.access}`;
-                await UtilFunc.exec(cmd);
-                SLogger.info("发布完成");
-            } catch (error) {
-                SLogger.error(error);
-            }
-        })
+        try {
+            const newVersion = await updateVersion(opt.version);
+            SLogger.info(`新版本号: ${newVersion}`);
+            SLogger.info("正在发布...");
+            const cmd = `npm publish --registry ${OFFICIAL_SOURCE} --access ${opt.access}`;
+            const {stderr,stdout} = await UtilFunc.exec(cmd);
+            if(stderr) SLogger.error(stderr);
+            else SLogger.info(stdout);
+            SLogger.info("发布完成");
+        } catch (error) {
+            SLogger.error(error);
+        }
     });

package/src/Command/RouteInterface.ts

@@ -1,4 +1,4 @@
-import { SLogger, UtilFT, UtilFunc, throwError } from "@zwa73/utils";
+import { SLogger, UtilFT, UtilFunc, sleep, throwError } from "@zwa73/utils";
 import { Command, OptionValues } from "commander";
 import * as path from 'path';
 
@@ -40,11 +40,9 @@ export async function withMirrorSource(func:(()=>any)){
     const OriginSource = out.stdout.trim()//?
     SLogger.info(`正在修改npm源为 镜像源: ${MIRROR_SOURCE}`);
     await UtilFunc.exec(`npm config set registry ${MIRROR_SOURCE}`);
-    SLogger.info(`成功修改npm源为 镜像源: ${MIRROR_SOURCE}`);
     await func();
     SLogger.info(`正在修改npm源为 原始源: ${OriginSource}`);
     await UtilFunc.exec(`npm config set registry ${OriginSource}`);
-    SLogger.info(`成功修改npm源为 原始源: ${OriginSource}`);
 }
 
 /**在官方源内镜像操作 */
@@ -53,11 +51,9 @@ export async function withOfficialSource(func:(()=>any)){
     const OriginSource = out.stdout.trim()//?
     SLogger.info(`正在修改npm源为 官方源: ${OFFICIAL_SOURCE}`);
     await UtilFunc.exec(`npm config set registry ${OFFICIAL_SOURCE}`);
-    SLogger.info(`成功修改npm源为 官方源: ${OFFICIAL_SOURCE}`);
     await func();
     SLogger.info(`正在修改npm源为 原始源: ${OriginSource}`);
     await UtilFunc.exec(`npm config set registry ${OriginSource}`);
-    SLogger.info(`成功修改npm源为 原始源: ${OriginSource}`);
 }
 
 /**检查目录是否为项目 */

package/release.bat

@@ -1,2 +0,0 @@
-call npm run release
-pause

package/release.js

@@ -1,16 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-// 读取并更新包配置文件中的版本号
-function updateVersion() {
-  const packagePath = path.join(__dirname, 'package.json');
-  const packageData = JSON.parse(fs.readFileSync(packagePath));
-  const version = packageData.version.split('.');
-  version[2] = parseInt(version[2]) + 1;
-  packageData.version = version.join('.');
-  fs.writeFileSync(packagePath, JSON.stringify(packageData, null, 2));
-  return packageData.version;
-}
-
-
-updateVersion();