@zwa73/dev-utils 1.0.54 → 1.0.55

package/dist/Command/GenSchema.js

@@ -10,13 +10,15 @@ 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, --out-dir <dir>", "schema输出路径目录 默认 ./schema/")
+    .option("-o, --out <dir>", "schema输出路径目录 默认 ./schema/")
+    .option("-t, --type <string>", "若传入则仅输出 type 对应的类型 此时将直接输出至outDir/type.json, 且不会展开")
     .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
     });
 });
 exports.CmdGenSchema = CmdGenSchema;

package/dist/UtilDevTool.d.ts

@@ -18,6 +18,8 @@ export declare namespace UtilDT {
         coverDefine: JObject;
         /**schema输出路径目录 如 ./schema/ */
         outDir: string;
+        /**若传入则仅输出 typeName 对应的类型 此时将直接输出至outDir/typeName.json, 且不会展开 */
+        typeName?: string;
     }> & BuildMatchOpt;
     /**生成匹配的文件的所有type的schema
      * @async
@@ -28,6 +30,7 @@ export declare namespace UtilDT {
      * @param opt.coverDefine - 将会覆盖 definitions 对应内容的表
      * @param opt.project     - tsconfig路径
      * @param opt.outDir      - schema输出路径目录 默认 ./schema/
+     * @param opt.typeName    - 若传入则仅输出 typeName 对应的类型 此时将直接输出至outDir/typeName.json, 且不会展开
      */
     export function generateSchema(dir: string, opt?: BuildSchemaOpt): Promise<void>;
     /**运行所有匹配的的js/ts文件

package/dist/UtilDevTool.js

@@ -42,6 +42,7 @@ var UtilDT;
      * @param opt.coverDefine - 将会覆盖 definitions 对应内容的表
      * @param opt.project     - tsconfig路径
      * @param opt.outDir      - schema输出路径目录 默认 ./schema/
+     * @param opt.typeName    - 若传入则仅输出 typeName 对应的类型 此时将直接输出至outDir/typeName.json, 且不会展开
      */
     async function generateSchema(dir, opt) {
         //生成
@@ -49,6 +50,7 @@ var UtilDT;
             required: true,
             aliasRef: true,
             tsNodeRegister: true,
+            ignoreErrors: true,
         };
         const compilerOptions = {
             strictNullChecks: true,
@@ -57,21 +59,30 @@ 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, "*", settings);
+        const schema = TJS.generateSchema(program, opt?.typeName ?? "*", settings);
         const outDir = opt?.outDir ?? pathe_1.default.join(process.cwd(), 'schema');
-        const schemasPath = pathe_1.default.join(outDir, 'schemas.json');
-        //进行预处理并展开
-        await expandSchema(schemasPath, schema, opt?.coverDefine ?? {});
+        const schemasPath = opt?.typeName != undefined
+            ? pathe_1.default.join(outDir, `${opt.typeName}.json`)
+            : 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),
+        ]);
     }
     UtilDT.generateSchema = generateSchema;
-    /**展开schema以供使用 */
-    async function expandSchema(schemasPath, schema, coverDefine) {
+    function procSchema(schema, coverDefine) {
         //覆盖
         coverObj(schema["definitions"], coverDefine);
         //替换SchemaString标识符
         schema = JSON.parse(JSON.stringify(schema).replace(/\^\.\*SchemaString\$/g, '^.*$'));
+        return schema;
+    }
+    /**展开schema以供使用 */
+    async function expandSchema(schema, schemasPath) {
         const plist = [];
-        plist.push(utils_1.UtilFT.writeJSONFile(schemasPath, schema));
         const definitions = schema["definitions"];
         //展开定义
         for (const typeName in definitions) {

package/package.json

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

package/src/Command/GenSchema.ts

@@ -9,12 +9,14 @@ 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, --out-dir <dir>" , "schema输出路径目录 默认 ./schema/")
+    .option("-o, --out <dir>", "schema输出路径目录 默认 ./schema/")
+    .option("-t, --type <string>", "若传入则仅输出 type 对应的类型 此时将直接输出至outDir/type.json, 且不会展开")
     .action(async (opt) => {
         await UtilDT.generateSchema(process.cwd(), {
-            include: opt.include,
-            exclude: opt.exclude,
-            project: opt.project,
-            outDir: opt.outDir,
+            include : opt.include,
+            exclude : opt.exclude,
+            project : opt.project,
+            outDir  : opt.outDir,
+            typeName: opt.type
         });
     });

package/src/UtilDevTool.ts

@@ -25,6 +25,8 @@ type BuildSchemaOpt = Partial<{
     coverDefine:JObject;
     /**schema输出路径目录 如 ./schema/ */
     outDir:string;
+    /**若传入则仅输出 typeName 对应的类型 此时将直接输出至outDir/typeName.json, 且不会展开 */
+    typeName?:string;
 }>&BuildMatchOpt;
 
 
@@ -38,6 +40,7 @@ type BuildSchemaOpt = Partial<{
  * @param opt.coverDefine - 将会覆盖 definitions 对应内容的表
  * @param opt.project     - tsconfig路径
  * @param opt.outDir      - schema输出路径目录 默认 ./schema/
+ * @param opt.typeName    - 若传入则仅输出 typeName 对应的类型 此时将直接输出至outDir/typeName.json, 且不会展开
  */
 export async function generateSchema(dir:string,opt?:BuildSchemaOpt){
     //生成
@@ -45,6 +48,7 @@ export async function generateSchema(dir:string,opt?:BuildSchemaOpt){
         required: true,
         aliasRef:true,
         tsNodeRegister:true,
+        ignoreErrors:true,
     };
     const compilerOptions: TJS.CompilerOptions = {
         strictNullChecks: true,
@@ -56,21 +60,29 @@ export async function generateSchema(dir:string,opt?:BuildSchemaOpt){
         files,
         compilerOptions,
     );
-    const schema = TJS.generateSchema(program, "*", settings) as JObject;
+    const schema = TJS.generateSchema(program, opt?.typeName??"*", settings) as JObject;
     const outDir = opt?.outDir ?? path.join(process.cwd(),'schema');
-    const schemasPath = path.join(outDir,'schemas.json');
-    //进行预处理并展开
-    await expandSchema(schemasPath,schema,opt?.coverDefine??{});
+    const schemasPath = opt?.typeName !=undefined
+        ? path.join(outDir,`${opt.typeName}.json`)
+        : 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),
+    ]);
 }
-/**展开schema以供使用 */
-async function expandSchema(schemasPath:string,schema:JObject,coverDefine:JObject){
+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>[] = [];
-    plist.push(UtilFT.writeJSONFile(schemasPath,schema));
-
     const definitions = schema["definitions"] as Record<string,JObject>;
     //展开定义
     for(const typeName in definitions){