@zwa73/dev-utils 1.0.51 → 1.0.53

package/dist/Command/GenI18n.d.ts

@@ -0,0 +1,3 @@
+import { Command } from "commander";
+/**生成i18n */
+export declare const CmdGenI18n: (program: Command) => Command;

package/dist/Command/GenI18n.js

@@ -0,0 +1,74 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": 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 fs_1 = __importDefault(require("fs"));
+const pathe_1 = __importDefault(require("pathe"));
+async function procFile(p, filePath) {
+    const date = new Date().toISOString();
+    const content = await fs_1.default.promises.readFile(filePath, 'utf-8');
+    const b = p.createSourceFile(pathe_1.default.relative(process.cwd(), filePath), content);
+    const ds = b.getDescendantsOfKind(ts_morph_1.SyntaxKind.TaggedTemplateExpression);
+    const dats = [];
+    for (const d of ds) {
+        const template = d.getTemplate();
+        let result = '';
+        let i = 0;
+        UtilAst_1.UtilAst.withKind(template, {
+            [ts_morph_1.SyntaxKind.NoSubstitutionTemplateLiteral]: (t) => result += t.getLiteralText(),
+            [ts_morph_1.SyntaxKind.TemplateExpression]: (t) => {
+                t.getChildren().forEach((c) => {
+                    UtilAst_1.UtilAst.withKind(c, {
+                        [ts_morph_1.SyntaxKind.TemplateHead]: (sc) => result += sc.getLiteralText(),
+                        [ts_morph_1.SyntaxKind.SyntaxList]: (sc) => {
+                            sc.getChildrenOfKind(ts_morph_1.SyntaxKind.TemplateSpan).forEach((span) => {
+                                span.getChildren().forEach((ssc) => {
+                                    result += UtilAst_1.UtilAst.withKind(ssc, {
+                                        [ts_morph_1.SyntaxKind.TemplateMiddle]: (sssc) => sssc.getLiteralText(),
+                                        [ts_morph_1.SyntaxKind.TemplateTail]: (sssc) => sssc.getLiteralText(),
+                                    }) ?? String(`%${i++}`);
+                                });
+                            });
+                        },
+                    });
+                });
+            }
+        });
+        const pos = b.getLineAndColumnAtPos(d.getStart());
+        const dat = {
+            original: result,
+            scan_time: date,
+            position: `${filePath}:${pos.line}:${pos.column}`,
+            lang_table: {},
+            source: "Ast"
+        };
+        dats.push(dat);
+    }
+    return dats;
+}
+async function scanI18n(i18nDataDir, include, exclude) {
+    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();
+    await utils_1.SI18n.init(i18nDataDir, '*');
+    (await Promise.all(filePaths.map(p => procFile(project, p))))
+        .flat().forEach(dat => utils_1.SI18n.addOriginalText(dat));
+    await utils_1.SI18n.saveTable();
+}
+/**生成i18n */
+const CmdGenI18n = (program) => program
+    .command("Gen-I18n")
+    .alias("geni18n")
+    .description("根据文件行为树生成i18n数据")
+    .option("-o, --output <path>", "输出的数据目录位置")
+    .option("-i, --include <glob>", "包含的glob 默认 src/**/*.macro.ts", "src/**/*.macro.ts")
+    .option("-g, --exclude <glob>", "忽略的glob")
+    .action(async (opt) => {
+    await scanI18n(opt.output, opt.include, opt.exclude);
+});
+exports.CmdGenI18n = CmdGenI18n;

package/dist/Command/GenSchema.js

@@ -10,11 +10,11 @@ const CmdGenSchema = (program) => program
     .option("-i, --include <glob>", "包含的glob 默认 src/**/*.schema.ts", "src/**/*.schema.ts")
     .option("-g, --exclude <glob>", "忽略的glob")
     .option("-p, --project <path>", "tsconfig路径 默认tsconfig.json", "tsconfig.json")
-    .option("-o, --outDir <dir>", "schema输出路径目录 默认 ./schema/")
+    .option("-o, --out-dir <dir>", "schema输出路径目录 默认 ./schema/")
     .action(async (opt) => {
     await UtilDevTool_1.UtilDT.generateSchema(process.cwd(), {
         include: opt.include,
-        exclude: opt.ignore,
+        exclude: opt.exclude,
         project: opt.project,
         outDir: opt.outDir,
     });

package/dist/Command/MapPath.js

@@ -29,7 +29,7 @@ const CmdMapPath = (program) => program
     const duplicateHandling = options.duplicateHandling;
     const basePath = process.cwd();
     // 遍历当前目录下的所有文件
-    const filePaths = utils_1.UtilFT.fileSearchRegex(basePath, regex.source, { relative: options.recursive })
+    const filePaths = (await utils_1.UtilFT.fileSearchRegex(basePath, regex.source, { relative: options.recursive }))
         .map((filePath) => pathe_1.default.relative(basePath, filePath))
         .filter((filePath) => excludeRegex ? (!excludeRegex.test(filePath)) : true);
     //对单个路径映射

package/dist/Command/Route.js

@@ -9,6 +9,7 @@ const MapPath_1 = require("./MapPath");
 const ScanDups_1 = require("./ScanDups");
 const GenSchema_1 = require("./GenSchema");
 const ExpandMacro_1 = require("./ExpandMacro");
+const GenI18n_1 = require("./GenI18n");
 async function cliRoute() {
     (0, Init_1.CmdInit)(commander_1.program);
     (0, Node_1.CmdNode)(commander_1.program);
@@ -17,6 +18,7 @@ async function cliRoute() {
     (0, ScanDups_1.CmdScanDups)(commander_1.program);
     (0, GenSchema_1.CmdGenSchema)(commander_1.program);
     (0, ExpandMacro_1.CmdExpandMacro)(commander_1.program);
+    (0, GenI18n_1.CmdGenI18n)(commander_1.program);
     commander_1.program.parse(process.argv);
 }
 exports.cliRoute = cliRoute;

package/dist/Command/ScanDups.js

@@ -28,9 +28,9 @@ const CmdScanDups = (program) => program
     .action(async (options) => {
     const regex = new RegExp(options.regex);
     const basePath = process.cwd();
-    const pList = utils_1.UtilFT.fileSearchRegex(basePath, regex.source, {
+    const pList = (await utils_1.UtilFT.fileSearchRegex(basePath, regex.source, {
         relative: options.recursive,
-    }).map(async (filePath) => ({ filePath, hash: await calculateHash(filePath) }));
+    })).map(async (filePath) => ({ filePath, hash: await calculateHash(filePath) }));
     const hashMap = (await Promise.all(pList)).reduce((obj, cur) => {
         obj[cur.hash] = (obj[cur.hash] ?? []).concat(cur.filePath);
         return obj;

package/dist/UtilAst.d.ts

@@ -0,0 +1,13 @@
+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/UtilAst.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UtilAst = void 0;
+var UtilAst;
+(function (UtilAst) {
+    /**匹配Node的类型进行处理  无法匹配时返回undefined
+     * @param node    - ast节点
+     * @param funcMap - 处理函数映射表
+     */
+    function withKind(node, funcMap) {
+        const kind = node.getKind();
+        const func = funcMap[kind];
+        if (func)
+            return func(node);
+        return undefined;
+    }
+    UtilAst.withKind = withKind;
+})(UtilAst || (exports.UtilAst = UtilAst = {}));

package/dist/UtilDevTool.js

@@ -55,7 +55,7 @@ var UtilDT;
         };
         if (opt?.project)
             Object.assign(compilerOptions, (await utils_1.UtilFT.loadJSONFile(opt.project)).compilerOptions);
-        const files = utils_1.UtilFT.fileSearchGlob(dir, opt?.include ?? "**/*.schema.ts", { ingore: opt?.exclude });
+        const files = await utils_1.UtilFT.fileSearchGlob(dir, opt?.include ?? "**/*.schema.ts", { ingore: opt?.exclude });
         const program = TJS.getProgramFromFiles(files, compilerOptions);
         const schema = TJS.generateSchema(program, "*", settings);
         const outDir = opt?.outDir ?? pathe_1.default.join(process.cwd(), 'schema');
@@ -112,7 +112,7 @@ var UtilDT;
      * @param opt.project     - tsconfig路径
      */
     async function matchNode(dir, opt) {
-        const files = utils_1.UtilFT.fileSearchGlob(dir, opt?.include ?? "index.ts", { ingore: opt?.exclude });
+        const files = await utils_1.UtilFT.fileSearchGlob(dir, opt?.include ?? "index.ts", { ingore: opt?.exclude });
         await batchNode(files, opt);
     }
     UtilDT.matchNode = matchNode;
@@ -165,7 +165,7 @@ var UtilDT;
      */
     async function regionMacro(regionId, codeText, opt) {
         const plist = [];
-        const filePaths = parseMacroPaths(opt);
+        const filePaths = await parseMacroPaths(opt);
         for (const filePath of filePaths) {
             const queuefunc = async () => {
                 if (!(await utils_1.UtilFT.pathExists(filePath))) {
@@ -222,7 +222,7 @@ var UtilDT;
      */
     async function commentMacro(commentId, codeText, opt) {
         const plist = [];
-        const filePaths = parseMacroPaths(opt);
+        const filePaths = await parseMacroPaths(opt);
         for (const filePath of filePaths) {
             const queuefunc = async () => {
                 if (!(await utils_1.UtilFT.pathExists(filePath))) {
@@ -279,7 +279,7 @@ var UtilDT;
      */
     async function fileMacro(codeText, opt) {
         const plist = [];
-        const filePaths = parseMacroPaths(opt);
+        const filePaths = await parseMacroPaths(opt);
         for (const filePath of filePaths) {
             const queuefunc = async () => {
                 await utils_1.UtilFT.ensurePathExists(filePath);

package/dist/UtilMacro.js

@@ -14,9 +14,9 @@ var UtilMacro;
      * @example
      */
     function exportComment(glob) {
-        (0, QuickFunc_1.commentMacro)(/export (\S*)/, ({ filePath, matchId, execArr }) => {
+        (0, QuickFunc_1.commentMacro)(/export (\S*)/, async ({ filePath, matchId, execArr }) => {
             const basedir = pathe_1.default.dirname(filePath);
-            const result = utils_1.UtilFT.fileSearchGlob(basedir, execArr[1])
+            const result = (await utils_1.UtilFT.fileSearchGlob(basedir, execArr[1]))
                 .map((file) => pathe_1.default.relative(basedir, file))
                 .map((file) => pathe_1.default.parse(file).name)
                 .filter((file) => file != pathe_1.default.parse(filePath).name)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.51",
+	"version": "1.0.53",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {
@@ -16,9 +16,10 @@
 	"author": "zwa73",
 	"license": "ISC",
 	"dependencies": {
-		"@zwa73/utils": "^1.0.127",
+		"@zwa73/utils": "^1.0.143",
 		"commander": "^11.1.0",
 		"pathe": "^1.1.2",
+		"ts-morph": "^23.0.0",
 		"ts-node": "^10.9.2",
 		"tsconfig-paths": "^4.2.0",
 		"typescript-json-schema": "^0.63.0"

package/src/Command/GenI18n.ts

@@ -0,0 +1,75 @@
+import { Command } from "commander";
+import { I18nTextData, SI18n, UtilFT } from "@zwa73/utils";
+import { Project,SourceFile,SyntaxKind } from 'ts-morph';
+import { UtilAst } from "@src/UtilAst";
+import fs from 'fs';
+import path from 'pathe';
+
+async function procFile(p:Project,filePath:string){
+    const date = new Date().toISOString();
+    const content = await fs.promises.readFile(filePath,'utf-8');
+    const b = p.createSourceFile(path.relative(process.cwd(),filePath),content);
+    const ds = b.getDescendantsOfKind(SyntaxKind.TaggedTemplateExpression);
+    const dats:I18nTextData[] = [];
+    for(const d of ds){
+        const template = d.getTemplate();
+        let result = '';
+        let i=0;
+        UtilAst.withKind(template,{
+            [SyntaxKind.NoSubstitutionTemplateLiteral]:(t)=>result+=t.getLiteralText(),
+            [SyntaxKind.TemplateExpression]:(t)=>{
+                t.getChildren().forEach((c)=>{
+                    UtilAst.withKind(c,{
+                        [SyntaxKind.TemplateHead]:(sc)=>result += sc.getLiteralText(),
+                        [SyntaxKind.SyntaxList]:(sc)=>{
+                            sc.getChildrenOfKind(SyntaxKind.TemplateSpan).forEach((span)=>{
+                                span.getChildren().forEach((ssc)=>{
+                                    result += UtilAst.withKind(ssc,{
+                                        [SyntaxKind.TemplateMiddle]:(sssc)=>sssc.getLiteralText(),
+                                        [SyntaxKind.TemplateTail]  :(sssc)=>sssc.getLiteralText(),
+                                    })??String(`%${i++}`);
+                                })
+                            })
+                        },
+                    });
+                });
+            }
+        });
+        const pos = b.getLineAndColumnAtPos(d.getStart());
+        const dat:I18nTextData={
+            original:result,
+            scan_time:date,
+            position: `${filePath}:${pos.line}:${pos.column}`,
+            lang_table:{},
+            source:"Ast"
+        }
+        dats.push(dat);
+    }
+    return dats;
+}
+
+async function scanI18n(i18nDataDir:string,include:string,exclude:string){
+    const filePaths = (await UtilFT.fileSearchGlob(process.cwd(),include,{ingore:exclude}))
+        .filter(p=>['.ts','.tsx'].includes(path.parse(p).ext));
+    const project = new Project();
+    await SI18n.init(i18nDataDir,'*');
+    (await Promise.all(filePaths.map(p=>procFile(project,p))))
+        .flat().forEach(dat=>SI18n.addOriginalText(dat));
+    await SI18n.saveTable();
+}
+
+/**生成i18n */
+export const CmdGenI18n = (program:Command) => program
+    .command("Gen-I18n")
+    .alias("geni18n")
+    .description("根据文件行为树生成i18n数据")
+    .option("-o, --output <path>" , "输出的数据目录位置")
+    .option("-i, --include <glob>", "包含的glob 默认 src/**/*.macro.ts","src/**/*.macro.ts")
+    .option("-g, --exclude <glob>", "忽略的glob")
+    .action(async (opt) => {
+        await scanI18n(
+            opt.output,
+            opt.include,
+            opt.exclude,
+        );
+    });

package/src/Command/GenSchema.ts

@@ -9,11 +9,11 @@ export const CmdGenSchema = (program:Command) => program
     .option("-i, --include <glob>", "包含的glob 默认 src/**/*.schema.ts","src/**/*.schema.ts")
     .option("-g, --exclude <glob>", "忽略的glob")
     .option("-p, --project <path>", "tsconfig路径 默认tsconfig.json","tsconfig.json")
-    .option("-o, --outDir <dir>", "schema输出路径目录 默认 ./schema/")
+    .option("-o, --out-dir <dir>" , "schema输出路径目录 默认 ./schema/")
     .action(async (opt) => {
         await UtilDT.generateSchema(process.cwd(), {
             include: opt.include,
-            exclude: opt.ignore,
+            exclude: opt.exclude,
             project: opt.project,
             outDir: opt.outDir,
         });

package/src/Command/MapPath.ts

@@ -27,7 +27,7 @@ export const CmdMapPath = (program: Command) => program
         const duplicateHandling = options.duplicateHandling as DupMethod;
         const basePath = process.cwd();
         // 遍历当前目录下的所有文件
-        const filePaths = UtilFT.fileSearchRegex(basePath, regex.source,{relative:options.recursive})
+        const filePaths = (await UtilFT.fileSearchRegex(basePath, regex.source,{relative:options.recursive}))
             .map((filePath)=>path.relative(basePath, filePath))
             .filter((filePath)=>excludeRegex ? (!excludeRegex.test(filePath)) : true);
 

package/src/Command/Route.ts

@@ -7,6 +7,7 @@ import { CmdMapPath } from './MapPath';
 import { CmdScanDups } from './ScanDups';
 import { CmdGenSchema } from './GenSchema';
 import { CmdExpandMacro } from './ExpandMacro';
+import { CmdGenI18n } from './GenI18n';
 
 export async function cliRoute(){
     CmdInit(program);
@@ -16,5 +17,6 @@ export async function cliRoute(){
     CmdScanDups(program);
     CmdGenSchema(program);
     CmdExpandMacro(program);
+    CmdGenI18n(program);
     program.parse(process.argv);
 }

package/src/Command/ScanDups.ts

@@ -26,9 +26,9 @@ export const CmdScanDups = (program: Command) => program
     .action(async (options) => {
         const regex = new RegExp(options.regex);
         const basePath = process.cwd();
-        const pList = UtilFT.fileSearchRegex(basePath, regex.source, {
+        const pList = (await UtilFT.fileSearchRegex(basePath, regex.source, {
             relative: options.recursive,
-        }).map(async (filePath) => ({ filePath, hash: await calculateHash(filePath) }));
+        })).map(async (filePath) => ({ filePath, hash: await calculateHash(filePath) }));
 
         const hashMap = (await Promise.all(pList)).reduce((obj,cur)=>{
             obj[cur.hash] = (obj[cur.hash]??[]).concat(cur.filePath);

package/src/UtilAst.ts

@@ -0,0 +1,25 @@
+import { AnyFunc,I18nTextData } from "@zwa73/utils";
+import { SyntaxKind , KindToNodeMappings, Node} from "ts-morph";
+
+
+
+
+
+
+
+export namespace UtilAst{
+    /**匹配Node的类型进行处理  无法匹配时返回undefined
+     * @param node    - ast节点
+     * @param funcMap - 处理函数映射表
+     */
+    export 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{
+        const kind = node.getKind();
+        const func = funcMap[kind] as any;
+        if(func) return func(node);
+        return undefined;
+    }
+}

package/src/UtilDevTool.ts

@@ -50,7 +50,7 @@ export async function generateSchema(dir:string,opt?:BuildSchemaOpt){
         strictNullChecks: true,
     };
     if(opt?.project) Object.assign(compilerOptions,(await UtilFT.loadJSONFile(opt.project) as any).compilerOptions);
-    const files = UtilFT.fileSearchGlob(dir,opt?.include ?? "**/*.schema.ts",{ingore:opt?.exclude});
+    const files = await UtilFT.fileSearchGlob(dir,opt?.include ?? "**/*.schema.ts",{ingore:opt?.exclude});
 
     const program = TJS.getProgramFromFiles(
         files,
@@ -110,7 +110,7 @@ function coverObj(base:JObject,cover:JObject){
  * @param opt.project     - tsconfig路径
  */
 export async function matchNode(dir:string,opt?:BuildMatchOpt) {
-    const files = UtilFT.fileSearchGlob(dir,opt?.include ?? "index.ts",{ingore:opt?.exclude});
+    const files = await UtilFT.fileSearchGlob(dir,opt?.include ?? "index.ts",{ingore:opt?.exclude});
     await batchNode(files,opt);
 }
 /**运行所有js/ts文件  
@@ -182,7 +182,7 @@ const literalRegex = (str:string)=>new RegExp(
  */
 export async function regionMacro(regionId:string|RegExp,codeText:string|((opt:CodeTextOpt)=>string|Promise<string>),opt?:MacroOpt){
     const plist:Promise<void>[] = [];
-    const filePaths = parseMacroPaths(opt);
+    const filePaths = await parseMacroPaths(opt);
     for(const filePath of filePaths){
         const queuefunc = async ()=>{
             if(!(await UtilFT.pathExists(filePath))) {
@@ -239,7 +239,7 @@ export async function regionMacro(regionId:string|RegExp,codeText:string|((opt:C
  */
 export async function commentMacro(commentId:string|RegExp,codeText:string|((opt:CodeTextOpt)=>string|Promise<string>),opt?:MacroOpt){
     const plist:Promise<void>[] = [];
-    const filePaths = parseMacroPaths(opt);
+    const filePaths = await parseMacroPaths(opt);
     for(const filePath of filePaths){
         const queuefunc = async ()=>{
             if(!(await UtilFT.pathExists(filePath))) {
@@ -296,7 +296,7 @@ export async function commentMacro(commentId:string|RegExp,codeText:string|((opt
  */
 export async function fileMacro(codeText:string|((opt:Omit<CodeTextOpt,'ident'|'matchId'|'execArr'>)=>string|Promise<string>),opt?:MacroOpt){
     const plist:Promise<void>[] = [];
-    const filePaths = parseMacroPaths(opt);
+    const filePaths = await parseMacroPaths(opt);
     for(const filePath of filePaths){
         const queuefunc = async ()=>{
             await UtilFT.ensurePathExists(filePath);

package/src/UtilMacro.ts

@@ -9,9 +9,9 @@ export namespace UtilMacro{
      * @example
      */
     export function exportComment(glob:string){
-        commentMacro(/export (\S*)/,({filePath,matchId,execArr})=>{
+        commentMacro(/export (\S*)/,async ({filePath,matchId,execArr})=>{
             const basedir = path.dirname(filePath);
-            const result = UtilFT.fileSearchGlob(basedir,execArr[1])
+            const result = (await UtilFT.fileSearchGlob(basedir,execArr[1]))
                 .map((file)=>path.relative(basedir,file))
                 .map((file)=>path.parse(file).name)
                 .filter((file)=>file!=path.parse(filePath).name)