@zwa73/dev-utils 1.0.55 → 1.0.56

package/UnableTypes.txt

@@ -0,0 +1 @@
+PartialOption,ProperSubset,ProperSubsetCheck,Literal,LiteralCheck,AssignObject,FixedLengthTuple,UnionToIntersection,ExclusiveSub,ExclusiveRecursive,ExclusiveRecord,ExclusiveJObject,Await,FuncPropNames,ComposedClass,Mixinable,IsCtor,RefMixinable,ComposedMixinable,ComposedRefMixinable,ExtendThen,MatchableFlag,ExtractOutcome,AnnotableTuple,bigint,UnionInclude

package/dist/Command/GenI18n.js

@@ -75,19 +75,7 @@ const CmdGenI18n = (program) => program
     .option("-o, --output <path>", "输出的数据目录位置 默认 i18n", 'i18n')
     .option("-i, --include <glob>", "包含的glob 默认 src/**/*.ts", "src/**/*.ts")
     .option("-g, --exclude <glob>", "忽略的glob")
-    .option("-f, --funckey <string|string[]>", "扫描的目标函数名, 默认 t", (i) => {
-    const v = (0, utils_1.ivk)(() => {
-        try {
-            return JSON.parse(i);
-        }
-        catch (e) {
-            return undefined;
-        }
-    });
-    if (Array.isArray(v))
-        return v;
-    return i;
-}, 't')
+    .option("-f, --funckey <string|strings>", "扫描的目标函数名, 可传入逗号分隔数组, 默认 t", (i) => i.split(','), ['t'])
     .action(async (opt) => {
     await scanI18n(opt.output, opt.include, opt.exclude, opt.funckey);
 });

package/dist/Command/GenSchema.js

@@ -11,14 +11,16 @@ const CmdGenSchema = (program) => program
     .option("-g, --exclude <glob>", "忽略的glob")
     .option("-p, --project <path>", "tsconfig路径 默认tsconfig.json", "tsconfig.json")
     .option("-o, --out <dir>", "schema输出路径目录 默认 ./schema/")
-    .option("-t, --type <string>", "若传入则仅输出 type 对应的类型 此时将直接输出至outDir/type.json, 且不会展开")
+    .option("-it, --include-types <string[]>", "包含的type名数组, 传入逗号分隔数组", (i) => i.split(','))
+    .option("-et, --exclude-types <string[]>", "排除的type名数组, 传入逗号分隔数组", (i) => i.split(','))
     .action(async (opt) => {
     await UtilDevTool_1.UtilDT.generateSchema(process.cwd(), {
         include: opt.include,
         exclude: opt.exclude,
         project: opt.project,
         outDir: opt.outDir,
-        typeName: opt.type
+        includeTypes: opt.includeTypes,
+        excludeTypes: opt.excludeTypes
     });
 });
 exports.CmdGenSchema = CmdGenSchema;

package/dist/UtilDevTool.d.ts

@@ -18,19 +18,22 @@ export declare namespace UtilDT {
         coverDefine: JObject;
         /**schema输出路径目录 如 ./schema/ */
         outDir: string;
-        /**若传入则仅输出 typeName 对应的类型 此时将直接输出至outDir/typeName.json, 且不会展开 */
-        typeName?: 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.typeName    - 若传入则仅输出 typeName 对应的类型 此时将直接输出至outDir/typeName.json, 且不会展开
+     * @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 function generateSchema(dir: string, opt?: BuildSchemaOpt): Promise<void>;
     /**运行所有匹配的的js/ts文件

package/dist/UtilDevTool.js

@@ -37,12 +37,13 @@ var UtilDT;
      * @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.typeName    - 若传入则仅输出 typeName 对应的类型 此时将直接输出至outDir/typeName.json, 且不会展开
+     * @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 支持正则
      */
     async function generateSchema(dir, opt) {
         //生成
@@ -59,17 +60,23 @@ var UtilDT;
             Object.assign(compilerOptions, (await utils_1.UtilFT.loadJSONFile(opt.project)).compilerOptions);
         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, opt?.typeName ?? "*", settings);
+        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 list = gener.getUserSymbols()
+            .filter(t => it.some(i => i.test(t)))
+            .filter(t => !et.some(i => i.test(t)));
+        //await UtilFT.writeJSONFile('testout',list);
+        const schema = gener.getSchemaForSymbols(list);
         const outDir = opt?.outDir ?? pathe_1.default.join(process.cwd(), 'schema');
-        const schemasPath = opt?.typeName != undefined
-            ? pathe_1.default.join(outDir, `${opt.typeName}.json`)
-            : pathe_1.default.join(outDir, 'schemas.json');
+        const schemasPath = pathe_1.default.join(outDir, 'schemas.json');
         //预处理
         const proced = procSchema(schema, opt?.coverDefine ?? {});
         await Promise.all([
             utils_1.UtilFT.writeJSONFile(schemasPath, schema),
-            //全范围类型则展开
-            opt?.typeName != undefined ? undefined : expandSchema(proced, schemasPath),
+            //展开
+            expandSchema(proced, schemasPath),
         ]);
     }
     UtilDT.generateSchema = generateSchema;

package/dist/test.schema.d.ts

@@ -0,0 +1 @@
+export type AASSAA<B, P> = Record<string, 123>;

package/dist/test.schema.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.55",
+	"version": "1.0.56",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {
@@ -22,7 +22,7 @@
 		"ts-morph": "^23.0.0",
 		"ts-node": "^10.9.2",
 		"tsconfig-paths": "^4.2.0",
-		"typescript-json-schema": "^0.63.0"
+		"typescript-json-schema": "^0.64.0"
 	},
 	"devDependencies": {
 		"@types/fluent-ffmpeg": "^2.1.24",

package/src/Command/GenI18n.ts

@@ -73,17 +73,8 @@ export const CmdGenI18n = (program:Command) => program
     .option("-o, --output <path>" , "输出的数据目录位置 默认 i18n",'i18n')
     .option("-i, --include <glob>", "包含的glob 默认 src/**/*.ts","src/**/*.ts")
     .option("-g, --exclude <glob>", "忽略的glob")
-    .option("-f, --funckey <string|string[]>", "扫描的目标函数名, 默认 t",(i:string)=>{
-        const v = ivk(()=>{
-            try{
-                return JSON.parse(i);
-            } catch(e){
-                return undefined;
-            }
-        })
-        if(Array.isArray(v)) return v;
-        return i;
-    },'t')
+    .option("-f, --funckey <string|strings>", "扫描的目标函数名, 可传入逗号分隔数组, 默认 t",
+        (i:string)=>i.split(','),['t'])
     .action(async (opt) => {
         await scanI18n(
             opt.output ,

package/src/Command/GenSchema.ts

@@ -10,13 +10,15 @@ export const CmdGenSchema = (program:Command) => program
     .option("-g, --exclude <glob>", "忽略的glob")
     .option("-p, --project <path>", "tsconfig路径 默认tsconfig.json","tsconfig.json")
     .option("-o, --out <dir>", "schema输出路径目录 默认 ./schema/")
-    .option("-t, --type <string>", "若传入则仅输出 type 对应的类型 此时将直接输出至outDir/type.json, 且不会展开")
+    .option("-it, --include-types <string[]>", "包含的type名数组, 传入逗号分隔数组",(i:string)=>i.split(','))
+    .option("-et, --exclude-types <string[]>", "排除的type名数组, 传入逗号分隔数组",(i:string)=>i.split(','))
     .action(async (opt) => {
         await UtilDT.generateSchema(process.cwd(), {
             include : opt.include,
             exclude : opt.exclude,
             project : opt.project,
             outDir  : opt.outDir,
-            typeName: opt.type
+            includeTypes: opt.includeTypes,
+            excludeTypes: opt.excludeTypes
         });
     });

package/src/UtilDevTool.ts

@@ -25,8 +25,10 @@ type BuildSchemaOpt = Partial<{
     coverDefine:JObject;
     /**schema输出路径目录 如 ./schema/ */
     outDir:string;
-    /**若传入则仅输出 typeName 对应的类型 此时将直接输出至outDir/typeName.json, 且不会展开 */
-    typeName?:string;
+    /**包含的types 支持正则 */
+    includeTypes?:string[];
+    /**排除的types 支持正则 */
+    excludeTypes?:string[];
 }>&BuildMatchOpt;
 
 
@@ -35,12 +37,13 @@ type BuildSchemaOpt = Partial<{
  * @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.typeName    - 若传入则仅输出 typeName 对应的类型 此时将直接输出至outDir/typeName.json, 且不会展开
+ * @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){
     //生成
@@ -60,17 +63,23 @@ export async function generateSchema(dir:string,opt?:BuildSchemaOpt){
         files,
         compilerOptions,
     );
-    const schema = TJS.generateSchema(program, opt?.typeName??"*", settings) as JObject;
+    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 list = gener.getUserSymbols()
+            .filter(t=>it.some(i=>i.test(t)))
+            .filter(t=>!et.some(i=>i.test(t)));
+    //await UtilFT.writeJSONFile('testout',list);
+    const schema = gener.getSchemaForSymbols(list) as JObject;
     const outDir = opt?.outDir ?? path.join(process.cwd(),'schema');
-    const schemasPath = opt?.typeName !=undefined
-        ? path.join(outDir,`${opt.typeName}.json`)
-        : path.join(outDir,'schemas.json');
+    const schemasPath = path.join(outDir,'schemas.json');
     //预处理
     const proced = procSchema(schema,opt?.coverDefine??{});
     await Promise.all([
         UtilFT.writeJSONFile(schemasPath,schema),
-        //全范围类型则展开
-        opt?.typeName !=undefined ? undefined : expandSchema(proced,schemasPath),
+        //展开
+        expandSchema(proced,schemasPath),
     ]);
 }
 function procSchema(schema:JObject,coverDefine:JObject){