@zwa73/dev-utils 1.0.80 → 1.0.82

package/src/UtilDevTool.ts

@@ -1,345 +0,0 @@
-import path from 'pathe';
-import * as TJS from 'typescript-json-schema';
-import * as fs from 'fs';
-import { JObject, SLogger, UtilFT, UtilFunc, dedent, throwError } from '@zwa73/utils';
-import { Project, SyntaxKind } from 'ts-morph';
-
-export namespace UtilDT{
-
-/**执行js/ts的可选项 */
-type BatchNodeOpt = Partial<{
-    /**tsconfig路径 */
-    project:string;
-}>
-
-/**build任意ts文件的可选项 */
-type BuildMatchOpt = Partial<{
-    /**包含的glob */
-    include:string|string[];
-    /**忽略的glob */
-    exclude:string|string[];
-}>&BatchNodeOpt;
-
-/**build schema的可选项 */
-type BuildSchemaOpt = Partial<{
-    /**将会覆盖 definitions 对应内容的表 */
-    coverDefine:JObject;
-    /**schema输出路径目录 如 ./schema/ */
-    outDir:string;
-    /**包含的types正则匹配数组 默认 [/.*\/] */
-    includeTypes?:string[];
-    /**排除的types正则匹配数组 */
-    excludeTypes?:string[];
-}>&BuildMatchOpt;
-
-
-
-/**生成匹配的文件的所有type的schema
- * @async
- * @param dir         - 基础目录
- * @param opt         - 可选参数
- * @param opt.include      - 包含的glob 默认 **\/\*.schema.ts
- * @param opt.exclude      - 忽略的glob
- * @param opt.coverDefine  - 将会覆盖 definitions 对应内容的表
- * @param opt.project      - tsconfig路径
- * @param opt.outDir       - schema输出路径目录 默认 ./schema/
- * @param opt.includeTypes - 包含的types正则匹配数组 默认 [/.*\/]
- * @param opt.excludeTypes - 排除的types正则匹配数组
- */
-export async function generateSchema(dir:string,opt?:BuildSchemaOpt){
-    //生成
-    const settings: TJS.PartialArgs = {
-        required: true,
-        aliasRef:true,
-        tsNodeRegister:true,
-        ignoreErrors:true,
-    };
-    const compilerOptions: TJS.CompilerOptions = {
-        strictNullChecks: true,
-    };
-    if(opt?.project) Object.assign(compilerOptions,(await UtilFT.loadJSONFile(opt.project) as any).compilerOptions);
-    const files = await UtilFT.fileSearchGlob(dir,opt?.include ?? "**/*.schema.ts",{ingore:opt?.exclude});
-
-    const program = TJS.getProgramFromFiles(
-        files,
-        compilerOptions,
-    );
-    const gener = TJS.buildGenerator(program,settings)!;
-    //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 Project();
-    const types = files.map(fp => p
-        .addSourceFileAtPath(fp)
-        .getDescendantsOfKind(SyntaxKind.TypeAliasDeclaration)
-        .map(d=>d.getName())
-    ).flat();
-    const list = gener.getUserSymbols()
-            .filter(t=>types.some(i=>i===t))
-            .filter(t=>it.some(i=>i.test(t)))
-            .filter(t=>!et.some(i=>i.test(t)));
-    const schema = gener.getSchemaForSymbols(list) as JObject;
-    const outDir = opt?.outDir ?? path.join(process.cwd(),'schema');
-    const schemasPath = path.join(outDir,'schemas.json');
-    //预处理
-    const proced = procSchema(schema,opt?.coverDefine??{});
-    await Promise.all([
-        UtilFT.writeJSONFile(schemasPath,proced),
-        //展开
-        expandSchema(proced,schemasPath),
-    ]);
-}
-function procSchema(schema:JObject,coverDefine:JObject){
-    //覆盖
-    coverObj(schema["definitions"] as JObject,coverDefine);
-    //替换SchemaString标识符
-    schema = JSON.parse(JSON.stringify(schema).replace(/\^\.\*SchemaString\$/g,'^.*$'));
-    return schema;
-}
-/**展开schema以供使用 */
-async function expandSchema(schema:JObject,schemasPath:string){
-    const plist:Promise<void>[] = [];
-    const definitions = schema["definitions"] as Record<string,JObject>;
-    //展开定义
-    for(const typeName in definitions){
-        const schema = definitions[typeName];
-        //展开所有object与忽略检测的类型
-        if(!(schema.type == "object" || schema.type == "array" || schema.type == undefined)) continue;
-        if((/^.+_[0-9]/).test(typeName) || (/^{./).test(typeName)) continue;
-
-        const basename = path.basename(schemasPath);
-        const tpath = path.join(path.dirname(schemasPath),`${typeName}.schema.json`);
-        if(!UtilFT.isValidFilePath(tpath)) continue;
-        plist.push(UtilFT.writeJSONFile(tpath,{
-            "$schema": "http://json-schema.org/draft-07/schema#",
-            "$ref": `${basename}#/definitions/${typeName}`
-        }));
-    }
-    await Promise.all(plist);
-}
-/**覆盖object */
-function coverObj(base:JObject,cover:JObject){
-    for(const k in cover){
-        const v = cover[k];
-        if( typeof v === "object" && !Array.isArray(v) &&
-            typeof base[k] === "object" && !Array.isArray(base[k]) )
-            coverObj(base[k] as JObject,v as JObject);
-        else
-            base[k] = v;
-    }
-}
-
-/**运行所有匹配的的js/ts文件
- * @async
- * @param dir         - 基础目录
- * @param opt         - 可选参数
- * @param opt.include     - 包含的glob 默认 index.ts
- * @param opt.exclude     - 忽略的glob
- * @param opt.project     - tsconfig路径
- */
-export async function matchNode(dir:string,opt?:BuildMatchOpt) {
-    const files = await UtilFT.fileSearchGlob(dir,opt?.include ?? "index.ts",{ingore:opt?.exclude});
-    await batchNode(files,opt);
-}
-/**运行所有js/ts文件  
- * @async
- * @param filepath - 需要运行的文件
- * @param opt      - 可选参数
- * @param opt.project     - tsconfig路径
- */
-export async function batchNode(filepath:string|string[],opt?:BatchNodeOpt) {
-    // 确保 filepath 总是一个数组
-    if (!Array.isArray(filepath)) filepath = [filepath];
-    // 将所有的相对路径转换为绝对路径
-    const absolutePaths = filepath.map(fp => path.resolve(process.cwd(), fp));
-    // 创建一个字符串，其中包含所有文件的 require 语句
-    const requires = absolutePaths.map(fp => `require('${fp}')`).join(';');
-    // 创建并执行 ts-node 命令
-    const cmd = `ts-node -r tsconfig-paths/register -e "${requires}" ${opt?.project?`-P "${opt.project}"` : ""}`;
-    await UtilFunc.exec(cmd, { outlvl: 'info', errlvl: 'warn' });
-}
-
-/**宏的可选参数 */
-type MacroOpt = Partial<{
-    /**宏展开的目标文件 */
-    filePath:string[]|string;
-    /**使用glob匹配而非文件路径 */
-    glob:boolean;
-}>
-/**codeText的参数 */
-type CodeTextOpt = {
-    /**匹配的region/comment id */
-    matchId:string;
-    /**region/comment id正则的执行结果*/
-    execArr:RegExpExecArray;
-    /**展开宏的目标文件 */
-    filePath:string;
-    /**展开宏区域的原文本 */
-    text:string;
-    /**缩进 会自动应用 */
-    inent:string;
-}
-//#region macro工具
-const parseMacroPaths = (opt?:MacroOpt)=>{
-    const loc = UtilFunc.getFuncLoc(3);
-    if(!loc && !opt?.filePath) throwError(`parseMacroPaths 未能找到函数位置`);
-    const basePath = loc?.filePath!;
-    return opt?.filePath
-        ? opt.glob
-            ? UtilFT.fileSearchGlob(process.cwd(),opt.filePath)
-            : typeof opt?.filePath==="string"
-                ? [opt?.filePath]
-                : opt?.filePath.map((filepath)=>filepath)
-        : [basePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/,"$1.$2")];
-}
-const readFile = async (basePath:string)=>
-    (await fs.promises.readFile(basePath,'utf-8')).replaceAll("\r\n","\n");
-const parseCodeText = async (codeText:string|((opt:CodeTextOpt)=>string|Promise<string>),opt:CodeTextOpt)=>{
-    const strText = typeof codeText === "function" ? await codeText(opt) : codeText;
-    return strText.split('\n').map((line)=>`${opt.inent}${line}`).join('\n');
-}
-const literalRegex = (str:string)=>new RegExp(
-    `^${str.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')}(?!\\S)`);
-//#endregion
-/**将codeText写入对应region  
- * @param regionId   - 区域id \`//#region ${id}\`
- * @param codeText   - 文本
- * @param opt        - 可选参数
- * @param opt.filePath - 目标文件 默认为去除".macro"的同名文件
- * @param opt.glob     - 使用glob匹配而非文件路径
- */
-export async function regionMacro(regionId:string|RegExp,codeText:string|((opt:CodeTextOpt)=>string|Promise<string>),opt?:MacroOpt){
-    const plist:Promise<void>[] = [];
-    const filePaths = await parseMacroPaths(opt);
-    for(const filePath of filePaths){
-        const queuefunc = async ()=>{
-            if(!(await UtilFT.pathExists(filePath))) {
-                SLogger.error(`UtilDT.regionMacro ${filePath} 不存在`);
-                return
-            }
-            let fileText = await readFile(filePath);
-            const regex = new RegExp(
-                    /(^|\n)([^\S\n]*)(\/\/#region (.*)\n)/.source+
-                    /([\s\S]*?)/.source+
-                    /([^\S\n]*\/\/#endregion(?!\S).*)/.source
-                    ,"g")
-            regex.lastIndex=0;
-            let match:RegExpExecArray|null;
-            let hasMatch = false;
-            while(match = regex.exec(fileText)){
-                const id = match[4];
-                const prefix = match[1];
-                const content = match[5];
-                const inent = match[2];
-                const comment = match[3];
-                const endcomment = match[6];
-
-                const idregex = typeof regionId === "string"
-                    ? literalRegex(regionId) : regionId;
-                let idmatch = idregex.exec(id);
-                if(idmatch==null) continue;
-                hasMatch=true;
-                const ol = fileText.length;
-                const parseCode = await parseCodeText(codeText,{
-                    matchId :idmatch[0],
-                    execArr :idmatch,
-                    text    :dedent(content),
-                    inent   ,
-                    filePath
-                });
-                fileText = fileText.replace(match[0], `${prefix}${inent}${comment}${parseCode}\n${endcomment}`);
-                regex.lastIndex += fileText.length - ol;
-            }
-            if(hasMatch)
-                await fs.promises.writeFile(filePath, fileText, 'utf-8');
-            else if(!opt?.glob) SLogger.error(`UtilDT.regionMacro 无法找到区域 ${regionId}`);
-        }
-        plist.push(UtilFunc.queueProc(path.normalize(filePath),queuefunc))
-    }
-    await Promise.all(plist);
-}
-/**将codeText写入对应注释下  
- * @param commentId - 注释id \`// ${id}\`
- * @param codeText  - 文本
- * @param opt       - 可选参数
- * @param opt.filePath - 目标文件 默认为去除".macro"的同名文件
- * @param opt.glob     - 使用glob匹配而非文件路径
- */
-export async function commentMacro(commentId:string|RegExp,codeText:string|((opt:CodeTextOpt)=>string|Promise<string>),opt?:MacroOpt){
-    const plist:Promise<void>[] = [];
-    const filePaths = await parseMacroPaths(opt);
-    for(const filePath of filePaths){
-        const queuefunc = async ()=>{
-            if(!(await UtilFT.pathExists(filePath))) {
-                SLogger.error(`UtilDT.commentMacro ${filePath} 不存在`);
-                return
-            }
-            let fileText = await readFile(filePath);
-            const regex = new RegExp(
-                    /(^|\n)([^\S\n]*)(\/\/ (.*))(\n|)/.source+
-                    /([^\n]*)/.source
-                    ,"g")
-            let match:RegExpExecArray|null;
-            let hasMatch = false;
-            while(match = regex.exec(fileText)){
-                const id = match[4];
-                const prefix = match[1];
-                const content = match[6];
-                const inent = match[2];
-                const comment = match[3];
-
-                const idregex = typeof commentId === "string"
-                    ? literalRegex(commentId) : commentId;
-                let idmatch = idregex.exec(id);
-                if(idmatch==null) continue;
-                hasMatch=true;
-                const ol = fileText.length;
-                const parseCode = await parseCodeText(codeText,{
-                    matchId :idmatch[0],
-                    execArr :idmatch,
-                    text    :dedent(content),
-                    inent   ,
-                    filePath
-                });
-                if(parseCode.includes('\n')){
-                    SLogger.error(`UtilDT.commentMacro 无法使用多行文本, 考虑使用regionMacro ${codeText}`);
-                    return;
-                }
-                fileText = fileText.replace(match[0], `${prefix}${inent}${comment}\n${parseCode}`);
-                regex.lastIndex += fileText.length - ol;
-            }
-            if(hasMatch)
-                await fs.promises.writeFile(filePath, fileText, 'utf-8');
-            else if(!opt?.glob) SLogger.error(`UtilDT.commentMacro 无法找到注释 ${commentId}`);
-        }
-        plist.push(UtilFunc.queueProc(path.normalize(filePath),queuefunc))
-    }
-    await Promise.all(plist);
-}
-/**将codeText写入对应文件 不存在则创建  
- * @param codeText  - 文本
- * @param opt       - 可选参数
- * @param opt.filePath - 目标文件 默认为去除".macro"的同名文件
- * @param opt.glob     - 使用glob匹配而非文件路径
- */
-export async function fileMacro(codeText:string|((opt:Omit<CodeTextOpt,'ident'|'matchId'|'execArr'>)=>string|Promise<string>),opt?:MacroOpt){
-    const plist:Promise<void>[] = [];
-    const filePaths = await parseMacroPaths(opt);
-    for(const filePath of filePaths){
-        const queuefunc = async ()=>{
-            await UtilFT.ensurePathExists(filePath);
-            const text = await readFile(filePath);
-            const parseCode = await parseCodeText(codeText,{
-                matchId:'',
-                execArr:/''/.exec('')!,
-                text,
-                inent:'',
-                filePath
-            });
-            await fs.promises.writeFile(filePath, parseCode, 'utf-8');
-        }
-        plist.push(UtilFunc.queueProc(path.normalize(filePath),queuefunc))
-    }
-    await Promise.all(plist);
-}
-}

package/src/UtilInterface.ts

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

package/src/UtilMacro.ts

@@ -1,23 +0,0 @@
-import { UtilFT } from "@zwa73/utils";
-import { commentMacro } from "./QuickFunc"
-import path from "pathe";
-
-
-export namespace UtilMacro{
-    /**根据注释批量生成导出
-     * @param glob - 应用的golb
-     * @example
-     */
-    export function exportComment(glob:string){
-        commentMacro(/export (\S*)/,async ({filePath,matchId,execArr})=>{
-            const basedir = path.dirname(filePath);
-            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)
-                .map((file)=>`export * from './${file}'`)
-                .join(';');
-            return result.length>0? `${result};` : result;
-        },{glob:true,filePath:glob});
-    }
-}

package/src/index.ts

@@ -1,5 +0,0 @@
-export * from './UtilDevTool';
-export * from './Command';
-export * from "./QuickFunc";
-export * from './UtilMacro';
-export * from './UtilInterface';

package/test.js

@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-const {UtilFT} = require('@zwa73/utils')
-const fs = require('fs');
-const path = require('path');
-async function main(){
-    const root = __filename;
-    const dirpath = path.join(__dirname,'src');
-
-    const ts = await fs.promises.readdir(dirpath,{withFileTypes:true})
-    ts//?
-    const list = await UtilFT.fileSearchRegex(dirpath, '')
-        .map((filePath)=>path.relative(dirpath, filePath));
-
-    console.log(
-        path.parse(root),
-        path.basename(root)
-    );
-    list.forEach((file)=>{
-        console.log(file)
-    })
-}
-main();

package/tsconfig.compile.json

@@ -1,4 +0,0 @@
-{
-    "extends": "./tsconfig.json",
-    "include": ["./src/**/*.ts", "./src/**/*.js"]
-}