@zwa73/dev-utils 1.0.88 → 1.0.89

package/bin/cli

@@ -1,5 +1,5 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
-const {cliRoute} = require('../dist/cjs/index.js');
+const {cliRoute} = require('../dist/index.js');
 
 cliRoute();

package/data/template/base/package.json

@@ -3,12 +3,12 @@
     "version": "1.0.0",
     "description": "<%= projectDescription %>",
     "exports": {
-        ".": {
-            "require": "./dist/cjs/index.js",
-            "import": "./dist/mjs/index.js"
-        }
-    },
-	"types": "./dist/mjs/index.d.ts",
+		".": {
+			"require": "./dist/cjs/index.js",
+			"import": "./dist/mjs/index.mjs",
+			"types": "./dist/types/index.d.ts"
+		}
+	},
     "scripts": {
         "test": "jest",
         "expand-macro": "powershell scripts/expand-macro",

package/data/template/base/scripts/compile.ps1

@@ -1,8 +1,25 @@
-Write-Output 开始删除原dist
+npm run expand-macro
+Write-Output 开始删除原dist
 Remove-Item -Recurse -Force dist
 Write-Output 开始编译
-tsc -p tsconfig.cjs.json
-tsc-alias -p tsconfig.cjs.json
-tsc -p tsconfig.mjs.json
-tsc-alias -p tsconfig.mjs.json
-tsc-esm-fix --tsconfig "./tsconfig.mjs.json"
+
+$CurrentDir = Get-Location
+
+Start-Job -Name "JobCjs" -ScriptBlock {
+    Set-Location $using:CurrentDir
+    tsc -p tsconfig.cjs.json
+    tsc-alias -p tsconfig.cjs.json
+}
+Start-Job -Name "JobMjs" -ScriptBlock {
+    Set-Location $using:CurrentDir
+    tsc -p tsconfig.mjs.json
+    tsc-alias -p tsconfig.mjs.json
+    tsc-esm-fix --tsconfig "./tsconfig.mjs.json" --ext ".mjs"
+}
+Start-Job -Name "JobTypes" -ScriptBlock {
+    Set-Location $using:CurrentDir
+    tsc -p tsconfig.types.json
+    tsc-alias -p tsconfig.types.json
+}
+Wait-Job -State Running
+Get-Job | Receive-Job

package/data/template/base/tsconfig.cjs.json

@@ -1,7 +1,8 @@
 {
     "extends": "./tsconfig.compile.json",
     "compilerOptions": {
-        "module": "commonjs",
+        "module": "node16",
+        "moduleResolution": "node16",
         "outDir": "./dist/cjs",
         "target": "ES2022"
     }

package/data/template/base/tsconfig.json

@@ -2,16 +2,14 @@
   "compilerOptions": {
     "allowJs": true,
     "strict": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
     "target": "ES2022",
+    "module": "node16",
+    "moduleResolution": "node16",
     "esModuleInterop": true,
-    "outDir": "./dist",
-    "declaration": true,
-    "baseUrl": ".",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "skipLibCheck": true,
+    "baseUrl": ".",
     "paths": {
 			"@/src/*"           : ["./src/*"],
 			"@/*"               : ["./*"],

package/data/template/base/tsconfig.mjs.json

@@ -2,8 +2,8 @@
     "extends": "./tsconfig.compile.json",
     "compilerOptions": {
         "module": "ESNext",
+        "moduleResolution": "bundler",
         "outDir": "./dist/mjs",
-        "target": "ESNext",
-        "allowSyntheticDefaultImports": true
+        "target": "ESNext"
     }
 }

package/data/template/base/tsconfig.types.json

@@ -0,0 +1,8 @@
+{
+    "extends": "./tsconfig.compile.json",
+    "compilerOptions": {
+        "outDir": "./dist/types",
+        "declaration": true,
+        "emitDeclarationOnly": true
+    }
+}

package/data/template/cjs/gitignore

@@ -0,0 +1,3 @@
+**/node_modules/**
+**/test/**
+dist/**

package/data/template/cjs/package.json

@@ -0,0 +1,19 @@
+{
+    "name": "<%= projectName %>",
+    "version": "1.0.0",
+    "description": "<%= projectDescription %>",
+	"main": "dist/index.js",
+    "scripts": {
+        "test": "jest",
+        "expand-macro": "powershell scripts/expand-macro",
+        "release": "powershell scripts/release",
+        "compile": "powershell scripts/compile",
+        "watch": "powershell scripts/watch"
+    },
+    "author": "<%= authorName %>",
+    "license": "ISC",
+    "files": [
+        "data",
+        "dist"
+    ]
+}

package/data/template/cjs/scripts/compile.ps1

@@ -0,0 +1,6 @@
+npm run expand-macro
+Write-Output 开始删除原dist
+Remove-Item -Recurse -Force dist
+Write-Output 开始编译
+tsc -p tsconfig.compile.json
+tsc-alias -p tsconfig.compile.json

package/data/template/cjs/scripts/expand-macro.ps1

@@ -0,0 +1,2 @@
+Write-Output 开始展开宏
+npx zcli Expand-Macro

package/data/template/cjs/scripts/release.ps1

@@ -0,0 +1,4 @@
+Write-Output 开始编译
+npm run compile
+Write-Output 开始发布
+npx zcli release

package/data/template/cjs/scripts/watch.ps1

@@ -0,0 +1,10 @@
+# 定义一个函数来运行脚本
+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/data/template/cjs/src/macro.macro.ts

@@ -0,0 +1,6 @@
+import { UtilMacro } from '@zwa73/dev-utils';
+
+
+
+
+UtilMacro.exportComment('src/**/index.ts');

package/data/template/cjs/tsconfig.compile.json

@@ -0,0 +1,12 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "module": "node16",
+        "moduleResolution": "node16",
+        "outDir": "./dist",
+        "target": "ES2022",
+        "declaration": true
+    },
+    "include": ["./src/**/*.ts", "./src/**/*.js"],
+    "exclude": ["./node_modules/**/*","./src/**/*.macro.ts","./src/**/*.schema.ts"]
+}

package/data/template/cjs/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "allowJs": true,
+    "strict": true,
+    "target": "ES2022",
+    "module": "node16",
+    "moduleResolution": "node16",
+    "esModuleInterop": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "skipLibCheck": true,
+    "baseUrl": ".",
+    "paths": {
+			"@/src/*"           : ["./src/*"],
+			"@/*"               : ["./*"],
+			"@"                 : ["./src/index"]
+    }
+  },
+  "include": ["./src/**/*.ts", "./src/**/*.js","./jest/**/*.ts"],
+  "exclude": ["./node_modules/**/*"]
+}

package/data/template/electron/package.json

@@ -12,29 +12,29 @@
     "lint": "eslint --ext .ts,.tsx ."
   },
   "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/preset-react": "^7.24.7",
-    "@electron-forge/cli": "^7.4.0",
-    "@electron-forge/maker-deb": "^7.4.0",
-    "@electron-forge/maker-rpm": "^7.4.0",
-    "@electron-forge/maker-squirrel": "^7.4.0",
-    "@electron-forge/maker-zip": "^7.4.0",
-    "@electron-forge/plugin-auto-unpack-natives": "^7.4.0",
-    "@electron-forge/plugin-fuses": "^7.4.0",
-    "@electron-forge/plugin-webpack": "^7.4.0",
-    "@electron/fuses": "^1.8.0",
+    "@babel/core": "7.25.2",
+    "@babel/preset-react": "7.24.7",
+    "@electron-forge/cli": "7.4.0",
+    "@electron-forge/maker-deb": "7.4.0",
+    "@electron-forge/maker-rpm": "7.4.0",
+    "@electron-forge/maker-squirrel": "7.4.0",
+    "@electron-forge/maker-zip": "7.4.0",
+    "@electron-forge/plugin-auto-unpack-natives": "7.4.0",
+    "@electron-forge/plugin-fuses": "7.4.0",
+    "@electron-forge/plugin-webpack": "7.4.0",
+    "@electron/fuses": "1.8.0",
     "@types/node": "^22.5.2",
-    "@types/react": "^18.3.5",
-    "@types/react-dom": "^18.3.0",
-    "@vercel/webpack-asset-relocator-loader": "^1.7.3",
-    "babel-loader": "^9.1.3",
-    "css-loader": "^6.11.0",
-    "electron": "*",
-    "fork-ts-checker-webpack-plugin": "^7.3.0",
-    "node-loader": "^2.0.0",
-    "style-loader": "^3.3.4",
-    "ts-loader": "^9.5.1",
-    "ts-node": "^10.9.2",
+    "@types/react": "18.3.5",
+    "@types/react-dom": "18.3.0",
+    "@vercel/webpack-asset-relocator-loader": "1.7.3",
+    "babel-loader": "9.1.3",
+    "css-loader": "6.11.0",
+    "electron": "31.3.1",
+    "fork-ts-checker-webpack-plugin": "7.3.0",
+    "node-loader": "2.0.0",
+    "style-loader": "3.3.4",
+    "ts-loader": "9.5.1",
+    "ts-node": "10.9.2",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
     "typescript": "~4.5.4"
   },
@@ -46,9 +46,9 @@
   "dependencies": {
     "@zwa73/react-utils": "*",
     "@zwa73/utils": "*",
-    "electron-squirrel-startup": "^1.0.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "electron-squirrel-startup": "1.0.1",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "styled-components": "^6.1.13"
   }
 }

package/dist/{cjs/Command → Command}/GenI18n.js

@@ -5,18 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CmdGenI18n = void 0;
 const utils_1 = require("@zwa73/utils");
-const ts_morph_1 = require("ts-morph");
 const UtilAst_1 = require("../UtilAst");
 const pathe_1 = __importDefault(require("pathe"));
+const DynImport_1 = require("../DynImport");
 function format(str) {
     return str.replace(/\\(.)/g, '$1').replace(/%/g, '\\%');
 }
 async function procFile(p, filePath, funckey) {
+    const TsMorph = await (0, DynImport_1.importTsMorph)();
+    const { SyntaxKind } = TsMorph;
     const date = new Date().toISOString();
     //const content = await fs.promises.readFile(filePath,'utf-8');
     const b = p.addSourceFileAtPath(filePath);
     //const b = p.createSourceFile(path.relative(process.cwd(),filePath),content,{overwrite:true});
-    const ds = b.getDescendantsOfKind(ts_morph_1.SyntaxKind.TaggedTemplateExpression);
+    const ds = b.getDescendantsOfKind(SyntaxKind.TaggedTemplateExpression);
     const dats = [];
     for (const d of ds) {
         if (!funckey.includes(d.getTag().getText()))
@@ -25,17 +27,17 @@ async function procFile(p, filePath, funckey) {
         let result = '';
         let i = 0;
         UtilAst_1.UtilAst.withKind(template, {
-            [ts_morph_1.SyntaxKind.NoSubstitutionTemplateLiteral]: (t) => result += format(t.getLiteralText()),
-            [ts_morph_1.SyntaxKind.TemplateExpression]: (t) => {
+            [SyntaxKind.NoSubstitutionTemplateLiteral]: (t) => result += format(t.getLiteralText()),
+            [SyntaxKind.TemplateExpression]: (t) => {
                 t.getChildren().forEach((c) => {
                     UtilAst_1.UtilAst.withKind(c, {
-                        [ts_morph_1.SyntaxKind.TemplateHead]: (sc) => result += format(sc.getLiteralText()),
-                        [ts_morph_1.SyntaxKind.SyntaxList]: (sc) => {
-                            sc.getChildrenOfKind(ts_morph_1.SyntaxKind.TemplateSpan).forEach((span) => {
+                        [SyntaxKind.TemplateHead]: (sc) => result += format(sc.getLiteralText()),
+                        [SyntaxKind.SyntaxList]: (sc) => {
+                            sc.getChildrenOfKind(SyntaxKind.TemplateSpan).forEach((span) => {
                                 span.getChildren().forEach((ssc) => {
                                     result += UtilAst_1.UtilAst.withKind(ssc, {
-                                        [ts_morph_1.SyntaxKind.TemplateMiddle]: (sssc) => format(sssc.getLiteralText()),
-                                        [ts_morph_1.SyntaxKind.TemplateTail]: (sssc) => format(sssc.getLiteralText()),
+                                        [SyntaxKind.TemplateMiddle]: (sssc) => format(sssc.getLiteralText()),
+                                        [SyntaxKind.TemplateTail]: (sssc) => format(sssc.getLiteralText()),
                                     }) ?? String(`%${i++}`);
                                 });
                             });
@@ -57,10 +59,12 @@ async function procFile(p, filePath, funckey) {
     return dats;
 }
 async function scanI18n(i18nDataDir, include, exclude, funckey) {
+    const TsMorph = await (0, DynImport_1.importTsMorph)();
+    const { Project } = TsMorph;
     const fixedKey = typeof funckey == 'string' ? [funckey] : funckey;
     const filePaths = (await utils_1.UtilFT.fileSearchGlob(process.cwd(), include, { ingore: exclude }))
         .filter(p => ['.ts', '.tsx'].includes(pathe_1.default.parse(p).ext));
-    const project = new ts_morph_1.Project();
+    const project = new Project();
     await utils_1.SI18n.init(i18nDataDir, '*');
     //console.log(filePaths);
     (await Promise.all(filePaths.map(p => procFile(project, p, fixedKey))))

package/dist/{cjs/Command → Command}/GenTemplate.js

@@ -41,7 +41,7 @@ const CmdGenTemplate = (program) => program
     .command("Gen-Template")
     .alias("gentemplate")
     .description("生成项目模板")
-    .argument("<template>", "项目模板 可用 base|electron")
+    .argument("<template>", "项目模板 可用 base|cjs|electron")
     .requiredOption("-n, --projectName <name>", "项目名称")
     .requiredOption("-d, --projectDescription <description>", "项目描述")
     .requiredOption("-a, --authorName <name>", "作者名")
@@ -51,15 +51,18 @@ const CmdGenTemplate = (program) => program
         utils_1.SLogger.error(`模板 ${templateName} 不存在`);
     const projectPath = pathe_1.default.join(process.cwd(), opt.projectName);
     await utils_1.UtilFT.ensurePathExists(projectPath, { dir: true });
+    //复制模板
     await copyData(templatePath, projectPath);
-    await installPackage(projectPath, ['@zwa73/utils'], ['@types/node']);
-    if (await utils_1.UtilFT.pathExists(pathe_1.default.join(projectPath, "gitignore")))
-        await fs_1.default.promises.rename(pathe_1.default.join(projectPath, "gitignore"), pathe_1.default.join(projectPath, ".gitignore"));
+    //修改package.json
     const packageJson = await utils_1.UtilFT.loadJSONFile(pathe_1.default.join(projectPath, 'package.json'));
     packageJson.name = opt.projectName;
     packageJson.description = opt.projectDescription;
     packageJson.author = opt.authorName;
     await utils_1.UtilFT.writeJSONFile(pathe_1.default.join(projectPath, 'package.json'), packageJson);
+    //安装依赖
+    await installPackage(projectPath, ['@zwa73/utils'], ['@types/node']);
+    if (await utils_1.UtilFT.pathExists(pathe_1.default.join(projectPath, "gitignore")))
+        await fs_1.default.promises.rename(pathe_1.default.join(projectPath, "gitignore"), pathe_1.default.join(projectPath, ".gitignore"));
     switch (templateName) {
         case 'base': break;
         case 'electron': break;

package/dist/{cjs/Command → Command}/ScanDups.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CmdScanDups = void 0;
 const utils_1 = require("@zwa73/utils");
 const pathe_1 = __importDefault(require("pathe"));
-const cli_progress_1 = __importDefault(require("cli-progress"));
 const fs_1 = __importDefault(require("fs"));
+const DynImport_1 = require("../DynImport");
 const { tap } = utils_1.UtilFP;
 /**hashlist转为dupmap */
 const reduce2Dupmap = (list) => list.reduce((acc, cur) => {
@@ -61,10 +61,11 @@ const CmdScanDups = (program) => program
         ? [process.cwd()]
         : dir.map(d => pathe_1.default.isAbsolute(d) ? d : pathe_1.default.join(process.cwd(), d));
     // 添加一个多步进度条
-    const progressBar = new cli_progress_1.default.MultiBar({
+    const cliProgress = await (0, DynImport_1.importCliProgress)();
+    const progressBar = new cliProgress.MultiBar({
         clearOnComplete: true, hideCursor: true,
         format: " {task} [{bar}] {percentage}% | ETA: {eta}s | {value}/{total} | {status}",
-    }, cli_progress_1.default.Presets.shades_classic);
+    }, cliProgress.Presets.shades_classic);
     // 文件结构进度条
     const structProgress = struct ? progressBar.create(1, 0, { task: "结构扫描", status: "准备中..." }) : undefined;
     // 采样哈希进度条

package/dist/DynImport.d.ts

@@ -0,0 +1,15 @@
+import type { getProgramFromFiles, buildGenerator } from 'typescript-json-schema';
+import type { Project, SyntaxKind } from 'ts-morph';
+import type cliProgress from "cli-progress";
+type TJSInstance = {
+    getProgramFromFiles: typeof getProgramFromFiles;
+    buildGenerator: typeof buildGenerator;
+};
+type TsMorphInstance = {
+    Project: typeof Project;
+    SyntaxKind: typeof SyntaxKind;
+};
+export declare function importTsMorph(): Promise<TsMorphInstance>;
+export declare function importTJS(): Promise<TJSInstance>;
+export declare function importCliProgress(): Promise<typeof cliProgress>;
+export {};

package/dist/DynImport.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.importTsMorph = importTsMorph;
+exports.importTJS = importTJS;
+exports.importCliProgress = importCliProgress;
+const utils_1 = require("@zwa73/utils");
+async function importTsMorph() {
+    return await utils_1.UtilFunc.dynamicImport("ts-morph");
+}
+async function importTJS() {
+    return await utils_1.UtilFunc.dynamicImport("typescript-json-schema");
+}
+async function importCliProgress() {
+    return await utils_1.UtilFunc.dynamicImport("cli-progress");
+}

package/dist/{mjs/UtilAst.d.ts → UtilAst.d.ts}

@@ -1,5 +1,5 @@
 import { AnyFunc } from "@zwa73/utils";
-import { SyntaxKind, KindToNodeMappings, Node } from "ts-morph";
+import type { SyntaxKind, KindToNodeMappings, Node } from "ts-morph";
 export declare namespace UtilAst {
     /**匹配Node的类型进行处理  无法匹配时返回undefined
      * @param node    - ast节点

package/dist/{cjs/UtilDevTool.js → UtilDevTool.js}

@@ -1,37 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilDT = void 0;
 const pathe_1 = __importDefault(require("pathe"));
-const TJS = __importStar(require("typescript-json-schema"));
-const fs = __importStar(require("fs"));
+const fs_1 = __importDefault(require("fs"));
 const utils_1 = require("@zwa73/utils");
-const ts_morph_1 = require("ts-morph");
+const DynImport_1 = require("./DynImport");
 var UtilDT;
 (function (UtilDT) {
     /**生成匹配的文件的所有type的schema
@@ -47,6 +23,9 @@ var UtilDT;
      * @param opt.excludeTypes - 排除的types正则匹配数组
      */
     async function generateSchema(dir, opt) {
+        //导入
+        const TJS = await (0, DynImport_1.importTJS)();
+        const TsMorph = await (0, DynImport_1.importTsMorph)();
         //生成
         const settings = {
             required: true,
@@ -65,10 +44,10 @@ var UtilDT;
         //const schema = TJS.generateSchema(program, opt?.typeName??"*", settings,undefined,gener) as JObject;
         const it = opt?.includeTypes?.map(t => new RegExp(t)) ?? [/.*/];
         const et = opt?.excludeTypes?.map(t => new RegExp(t)) ?? [];
-        const p = new ts_morph_1.Project();
+        const p = new TsMorph.Project();
         const types = files.map(fp => p
             .addSourceFileAtPath(fp)
-            .getDescendantsOfKind(ts_morph_1.SyntaxKind.TypeAliasDeclaration)
+            .getDescendantsOfKind(TsMorph.SyntaxKind.TypeAliasDeclaration)
             .map(d => d.getName())).flat();
         const list = gener.getUserSymbols()
             .filter(t => types.some(i => i === t))
@@ -89,8 +68,8 @@ var UtilDT;
     function procSchema(schema, coverDefine) {
         //覆盖
         coverObj(schema["definitions"], coverDefine);
-        //替换SchemaString标识符
-        schema = JSON.parse(JSON.stringify(schema).replace(/\^\.\*SchemaString\$/g, '^.*$'));
+        ////替换SchemaString标识符
+        //schema = JSON.parse(JSON.stringify(schema).replace(/\^\.\*SchemaString\$/g,'^.*$'));
         return schema;
     }
     /**展开schema以供使用 */
@@ -174,7 +153,7 @@ var UtilDT;
                     : opt?.filePath.map((filepath) => filepath)
             : [basePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/, "$1.$2")];
     };
-    const readFile = async (basePath) => (await fs.promises.readFile(basePath, 'utf-8')).replaceAll("\r\n", "\n");
+    const readFile = async (basePath) => (await fs_1.default.promises.readFile(basePath, 'utf-8')).replaceAll("\r\n", "\n");
     const parseCodeText = async (codeText, opt) => {
         const strText = typeof codeText === "function" ? await codeText(opt) : codeText;
         return strText.split('\n').map((line) => `${opt.inent}${line}`).join('\n');
@@ -229,7 +208,7 @@ var UtilDT;
                     regex.lastIndex += fileText.length - ol;
                 }
                 if (hasMatch)
-                    await fs.promises.writeFile(filePath, fileText, 'utf-8');
+                    await fs_1.default.promises.writeFile(filePath, fileText, 'utf-8');
                 else if (!opt?.glob)
                     utils_1.SLogger.error(`UtilDT.regionMacro 无法找到区域 ${regionId}`);
             };
@@ -287,7 +266,7 @@ var UtilDT;
                     regex.lastIndex += fileText.length - ol;
                 }
                 if (hasMatch)
-                    await fs.promises.writeFile(filePath, fileText, 'utf-8');
+                    await fs_1.default.promises.writeFile(filePath, fileText, 'utf-8');
                 else if (!opt?.glob)
                     utils_1.SLogger.error(`UtilDT.commentMacro 无法找到注释 ${commentId}`);
             };
@@ -316,7 +295,7 @@ var UtilDT;
                     inent: '',
                     filePath
                 });
-                await fs.promises.writeFile(filePath, parseCode, 'utf-8');
+                await fs_1.default.promises.writeFile(filePath, parseCode, 'utf-8');
             };
             plist.push(utils_1.PromiseQueue.enqueue(pathe_1.default.normalize(filePath), queuefunc));
         }

package/dist/UtilInterface.d.ts

@@ -0,0 +1,8 @@
+/**用在转换为Schema时解析为string并且不影响智能补全的类型
+ * @TJS-type string
+ */
+export type SchemaString = (string & String);
+/**用于在转换为schema时解析为整数的类型
+ * @TJS-type integer
+ */
+export type SchemaInt = (string & String);

package/dist/UtilMacro.d.ts

@@ -0,0 +1,7 @@
+export declare namespace UtilMacro {
+    /**根据注释批量生成导出
+     * @param glob - 应用的golb 默认 src\/**\/index.ts
+     * @example
+     */
+    function exportComment(glob?: string): void;
+}

package/dist/{cjs/UtilMacro.js → UtilMacro.js}

@@ -10,10 +10,10 @@ const pathe_1 = __importDefault(require("pathe"));
 var UtilMacro;
 (function (UtilMacro) {
     /**根据注释批量生成导出
-     * @param glob - 应用的golb
+     * @param glob - 应用的golb 默认 src\/**\/index.ts
      * @example
      */
-    function exportComment(glob) {
+    function exportComment(glob = 'src/**/index.ts') {
         (0, QuickFunc_1.commentMacro)(/export (\S*)/, async ({ filePath, matchId, execArr }) => {
             const basedir = pathe_1.default.dirname(filePath);
             const result = (await utils_1.UtilFT.fileSearchGlob(basedir, execArr[1]))

package/package.json

@@ -1,14 +1,8 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.88",
+	"version": "1.0.89",
 	"description": "编译与调试工具",
-	"exports": {
-		".": {
-			"require": "./dist/cjs/index.js",
-			"import": "./dist/mjs/index.js"
-		}
-	},
-	"types": "./dist/mjs/index.d.ts",
+	"main": "dist/index.js",
 	"scripts": {
 		"test": "jest",
 		"release": "powershell scripts/release",

package/dist/cjs/UtilAst.d.ts

@@ -1,13 +0,0 @@
-import { AnyFunc } from "@zwa73/utils";
-import { SyntaxKind, KindToNodeMappings, Node } from "ts-morph";
-export declare namespace UtilAst {
-    /**匹配Node的类型进行处理  无法匹配时返回undefined
-     * @param node    - ast节点
-     * @param funcMap - 处理函数映射表
-     */
-    function withKind<T extends Partial<{
-        [P in SyntaxKind]: ((n: KindToNodeMappings[P]) => unknown);
-    }>>(node: Node, funcMap: T): {
-        [P in keyof T]: T[P] extends AnyFunc ? ReturnType<T[P]> : never;
-    }[keyof T] | undefined;
-}

package/dist/cjs/UtilInterface.d.ts

@@ -1,4 +0,0 @@
-/**用于辅助解析只能补全的类型
- * 输出后替换为 ^.*$ 的 string 匹配
- */
-export type SchemaString = `${string}SchemaString`;

package/dist/cjs/UtilMacro.d.ts

@@ -1,7 +0,0 @@
-export declare namespace UtilMacro {
-    /**根据注释批量生成导出
-     * @param glob - 应用的golb
-     * @example
-     */
-    function exportComment(glob: string): void;
-}

package/dist/cjs/test/testFileMacro.d.ts

@@ -1 +0,0 @@
-type FileMacro = 5;

package/dist/cjs/test/testFileMacro.js

@@ -1 +0,0 @@
-"use strict";

package/dist/cjs/test/testGlobMacro.d.ts

@@ -1 +0,0 @@
-type Test3 = 4;