@jayfong/x-server 1.10.2 → 1.10.3

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.10.3](https://github.com/jfWorks/x-server/compare/v1.10.2...v1.10.3) (2022-04-19)
+
+
+### Bug Fixes
+
+* initModels ([85c6aa7](https://github.com/jfWorks/x-server/commit/85c6aa77d28ded5aeb336e57b2c62de3817a18f3))
+
 ### [1.10.2](https://github.com/jfWorks/x-server/compare/v1.10.1...v1.10.2) (2022-04-19)
 
 

package/lib/cli/cli.js

@@ -6,8 +6,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const chokidar_1 = __importDefault(require("chokidar"));
 const execa_1 = __importDefault(require("execa"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const node_path_1 = __importDefault(require("node:path"));
 const yargs_1 = __importDefault(require("yargs"));
 const api_generator_1 = require("./api_generator");
 const build_util_1 = require("./build_util");
@@ -48,10 +46,7 @@ yargs_1.default
             stdio: 'inherit',
         });
     }
-    await Promise.all([
-        template_util_1.TemplateUtil.initHelperPackage(process.cwd()),
-        template_util_1.TemplateUtil.initModels(process.cwd()),
-    ]);
+    await template_util_1.TemplateUtil.initHelperPackage(process.cwd());
     const watcher = chokidar_1.default.watch(['src', '.env'], {
         cwd: process.cwd(),
     });
@@ -149,29 +144,7 @@ yargs_1.default
         stdio: 'inherit',
     });
     if (!argv.production) {
-        const modelsDir = node_path_1.default.join(process.cwd(), 'src/models');
-        const baseModelFile = node_path_1.default.join(modelsDir, '_.ts');
-        await (0, vscode_generate_index_standalone_1.generateIndex)({
-            filePath: baseModelFile,
-            replaceFile: true,
-        });
-        const baseModelContent = await fs_extra_1.default.readFile(baseModelFile, 'utf-8');
-        const modelNames = [
-            ...baseModelContent.matchAll(/makeBaseModel\('(\w+?)'\)/g),
-        ].map(match => (0, vtils_1.snakeCase)(match[1]));
-        await Promise.all(modelNames.map(async (modelName) => {
-            const modelFile = node_path_1.default.join(modelsDir, `${modelName}.ts`);
-            if (!(await fs_extra_1.default.pathExists(modelFile))) {
-                const ModelName = (0, vtils_1.pascalCase)(modelName);
-                await fs_extra_1.default.writeFile(modelFile, (0, vtils_1.dedent) `
-                  import { ${ModelName}BaseModel } from './_'
-                  
-                  export class ${ModelName}Model extends ${ModelName}BaseModel {}
-                  
-                  export const ${(0, vtils_1.camelCase)(modelName)}Model = new ${ModelName}Model()
-                `);
-            }
-        }));
+        await template_util_1.TemplateUtil.initModels(process.cwd());
     }
 })
     .command('run [script]', '执行脚本', _ => _.positional('script', {

package/lib/cli/template_util.js

@@ -7,6 +7,7 @@ exports.TemplateUtil = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const vtils_1 = require("vtils");
+const vscode_generate_index_standalone_1 = require("vscode-generate-index-standalone");
 class TemplateUtil {
     /**
      * 初始化辅助包。
@@ -24,12 +25,7 @@ class TemplateUtil {
     static async initModels(cwd) {
         const modelsDir = path_1.default.join(cwd, 'src/models');
         const indexFile = path_1.default.join(modelsDir, 'index.ts');
-        if (!(await fs_extra_1.default.pathExists(indexFile))) {
-            await fs_extra_1.default.outputFile(indexFile, (0, vtils_1.dedent) `
-          // @index(['./**/*.ts', '!**/*.test.ts', '!**/_*'], f => \`export * from '\${f.path}'\`)
-          // @endindex
-        `);
-        }
+        const indexFile2 = path_1.default.join(cwd, 'node_modules/.x/models.ts');
         const prismaClientFile = path_1.default.join(cwd, 'node_modules/.prisma/client/index.d.ts');
         const prismaClientFileContent = await fs_extra_1.default.readFile(prismaClientFile, 'utf8');
         const modelNames = [
@@ -51,6 +47,16 @@ class TemplateUtil {
             `);
             }
         }));
+        if (!(await fs_extra_1.default.pathExists(indexFile))) {
+            await fs_extra_1.default.outputFile(indexFile, (0, vtils_1.dedent) `
+          // @index(['./**/*.ts', '!**/*.test.ts', '!**/_*'], f => \`export * from '\${f.path}'\`)
+          // @endindex
+        `);
+        }
+        await (0, vscode_generate_index_standalone_1.generateManyIndex)({
+            patterns: [indexFile, indexFile2],
+            replaceFile: true,
+        });
     }
 }
 exports.TemplateUtil = TemplateUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "license": "ISC",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",