@zwa73/dev-utils 1.0.56 → 1.0.58

package/dist/Command/GenSchema.js

@@ -11,8 +11,8 @@ 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("-it, --include-types <string[]>", "包含的type名数组, 传入逗号分隔数组", (i) => i.split(','))
-    .option("-et, --exclude-types <string[]>", "排除的type名数组, 传入逗号分隔数组", (i) => i.split(','))
+    .option("-it, --include-types <regexp[]>", "包含的types正则匹配数组, 传入逗号分隔数组", (i) => i.split(','))
+    .option("-et, --exclude-types <regexp[]>", "排除的types正则匹配数组, 传入逗号分隔数组", (i) => i.split(','))
     .action(async (opt) => {
     await UtilDevTool_1.UtilDT.generateSchema(process.cwd(), {
         include: opt.include,

package/dist/UtilDevTool.d.ts

@@ -18,9 +18,9 @@ export declare namespace UtilDT {
         coverDefine: JObject;
         /**schema输出路径目录 如 ./schema/ */
         outDir: string;
-        /**包含的types 支持正则 */
+        /**包含的types正则匹配数组 默认 [/.*\/] */
         includeTypes?: string[];
-        /**排除的types 支持正则 */
+        /**排除的types正则匹配数组 */
         excludeTypes?: string[];
     }> & BuildMatchOpt;
     /**生成匹配的文件的所有type的schema
@@ -32,8 +32,8 @@ export declare namespace UtilDT {
      * @param opt.coverDefine  - 将会覆盖 definitions 对应内容的表
      * @param opt.project      - tsconfig路径
      * @param opt.outDir       - schema输出路径目录 默认 ./schema/
-     * @param opt.includeTypes - 包含的types 支持正则
-     * @param opt.excludeTypes - 排除的types 支持正则
+     * @param opt.includeTypes - 包含的types正则匹配数组 默认 [/.*\/]
+     * @param opt.excludeTypes - 排除的types正则匹配数组
      */
     export function generateSchema(dir: string, opt?: BuildSchemaOpt): Promise<void>;
     /**运行所有匹配的的js/ts文件

package/dist/UtilDevTool.js

@@ -31,6 +31,7 @@ const pathe_1 = __importDefault(require("pathe"));
 const TJS = __importStar(require("typescript-json-schema"));
 const fs = __importStar(require("fs"));
 const utils_1 = require("@zwa73/utils");
+const ts_morph_1 = require("ts-morph");
 var UtilDT;
 (function (UtilDT) {
     /**生成匹配的文件的所有type的schema
@@ -42,8 +43,8 @@ var UtilDT;
      * @param opt.coverDefine  - 将会覆盖 definitions 对应内容的表
      * @param opt.project      - tsconfig路径
      * @param opt.outDir       - schema输出路径目录 默认 ./schema/
-     * @param opt.includeTypes - 包含的types 支持正则
-     * @param opt.excludeTypes - 排除的types 支持正则
+     * @param opt.includeTypes - 包含的types正则匹配数组 默认 [/.*\/]
+     * @param opt.excludeTypes - 排除的types正则匹配数组
      */
     async function generateSchema(dir, opt) {
         //生成
@@ -62,11 +63,20 @@ var UtilDT;
         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 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 types = files.map(fp => {
+            const sf = p.addSourceFileAtPath(fp);
+            const ds = sf.getDescendantsOfKind(ts_morph_1.SyntaxKind.TypeAliasDeclaration);
+            return ds.map(d => d.getName());
+        }).flat();
+        //console.log(types)
         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)));
+        //console.log(list)
         //await UtilFT.writeJSONFile('testout',list);
         const schema = gener.getSchemaForSymbols(list);
         const outDir = opt?.outDir ?? pathe_1.default.join(process.cwd(), 'schema');

package/dist/b.schema.d.ts

@@ -0,0 +1,4 @@
+export type ASD<A, B> = {
+    a: 123;
+    b: 223;
+};

package/dist/{test.schema.js → b.schema.js}

@@ -1,2 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+let c = null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.56",
+	"version": "1.0.58",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {

package/src/Command/GenSchema.ts

@@ -10,8 +10,8 @@ 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("-it, --include-types <string[]>", "包含的type名数组, 传入逗号分隔数组",(i:string)=>i.split(','))
-    .option("-et, --exclude-types <string[]>", "排除的type名数组, 传入逗号分隔数组",(i:string)=>i.split(','))
+    .option("-it, --include-types <regexp[]>", "包含的types正则匹配数组, 传入逗号分隔数组",(i:string)=>i.split(','))
+    .option("-et, --exclude-types <regexp[]>", "排除的types正则匹配数组, 传入逗号分隔数组",(i:string)=>i.split(','))
     .action(async (opt) => {
         await UtilDT.generateSchema(process.cwd(), {
             include : opt.include,

package/src/UtilDevTool.ts

@@ -2,6 +2,7 @@ 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{
 
@@ -25,9 +26,9 @@ type BuildSchemaOpt = Partial<{
     coverDefine:JObject;
     /**schema输出路径目录 如 ./schema/ */
     outDir:string;
-    /**包含的types 支持正则 */
+    /**包含的types正则匹配数组 默认 [/.*\/] */
     includeTypes?:string[];
-    /**排除的types 支持正则 */
+    /**排除的types正则匹配数组 */
     excludeTypes?:string[];
 }>&BuildMatchOpt;
 
@@ -42,8 +43,8 @@ type BuildSchemaOpt = Partial<{
  * @param opt.coverDefine  - 将会覆盖 definitions 对应内容的表
  * @param opt.project      - tsconfig路径
  * @param opt.outDir       - schema输出路径目录 默认 ./schema/
- * @param opt.includeTypes - 包含的types 支持正则
- * @param opt.excludeTypes - 排除的types 支持正则
+ * @param opt.includeTypes - 包含的types正则匹配数组 默认 [/.*\/]
+ * @param opt.excludeTypes - 排除的types正则匹配数组
  */
 export async function generateSchema(dir:string,opt?:BuildSchemaOpt){
     //生成
@@ -65,11 +66,20 @@ export async function generateSchema(dir:string,opt?:BuildSchemaOpt){
     );
     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 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=>{
+        const sf = p.addSourceFileAtPath(fp);
+        const ds = sf.getDescendantsOfKind(SyntaxKind.TypeAliasDeclaration);
+        return ds.map(d=>d.getName());
+    }).flat();
+    //console.log(types)
     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)));
+    //console.log(list)
     //await UtilFT.writeJSONFile('testout',list);
     const schema = gener.getSchemaForSymbols(list) as JObject;
     const outDir = opt?.outDir ?? path.join(process.cwd(),'schema');

package/src/b.schema.ts

@@ -0,0 +1,5 @@
+import { PartialOption } from "@zwa73/utils";
+
+let c:PartialOption<{},{}>=null as any;
+
+export type ASD<A,B> = {a:123,b:223}

package/dist/test.schema.d.ts

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

package/i18n/base_lang.json

@@ -1,23 +0,0 @@
-{
-	"base_lang": "zh-CN",
-	"texts": [
-		{
-			"original": "你好？%0，吗？",
-			"scan_time": "2024-07-22T04:08:33.552Z",
-			"position": "F:/Sosarciel/SosarcielCore/NodeJs/dev-utils/jest/UtilI18n/test.ts:6:13",
-			"source": "Ast"
-		},
-		{
-			"original": "abcdefg %0rst",
-			"scan_time": "2024-07-22T04:08:33.552Z",
-			"position": "F:/Sosarciel/SosarcielCore/NodeJs/dev-utils/jest/UtilI18n/test.ts:7:13",
-			"source": "Ast"
-		},
-		{
-			"original": "higklmn%0",
-			"scan_time": "2024-07-22T04:08:33.552Z",
-			"position": "F:/Sosarciel/SosarcielCore/NodeJs/dev-utils/jest/UtilI18n/test.ts:7:25",
-			"source": "Ast"
-		}
-	]
-}

package/i18n/lang/en.json

@@ -1,10 +0,0 @@
-{
-	"base_lang": "zh-CN",
-	"modify_time": "2024-07-22T04:08:33.570Z",
-	"target_lang": "en",
-	"translate_table": {
-		"你好？%0，吗？": "hello? %0 \\%0",
-		"abcdefg %0rst": "ABCDEFG %0RST",
-		"higklmn%0": "HIJKLMN%0"
-	}
-}

package/i18n/template.json

@@ -1,10 +0,0 @@
-{
-	"base_lang": "zh-CN",
-	"modify_time": "2024-07-22T04:08:33.570Z",
-	"target_lang": "template",
-	"translate_table": {
-		"你好？%0，吗？": null,
-		"abcdefg %0rst": null,
-		"higklmn%0": null
-	}
-}