@jayfong/x-server 1.10.0 → 1.10.3

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 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)
+
+
+### Bug Fixes
+
+* api gen ([cc33df1](https://github.com/jfWorks/x-server/commit/cc33df1bf15c2b367b1a62cf920a1a1184c20339))
+
+### [1.10.1](https://github.com/jfWorks/x-server/compare/v1.10.0...v1.10.1) (2022-04-19)
+
 ## [1.10.0](https://github.com/jfWorks/x-server/compare/v1.8.0...v1.10.0) (2022-04-19)
 
 

package/lib/cli/api_generator.js

@@ -273,7 +273,7 @@ class ApiGenerator {
             tsConfigFilePath: node_path_1.default.join(this.cwd, 'tsconfig.json'),
         });
         this.debug('加载文件...');
-        const sourceFile = this.project.getSourceFileOrThrow(node_path_1.default.join(this.cwd, 'src/generated/handlers.ts'));
+        const sourceFile = this.project.createSourceFile(node_path_1.default.join(this.cwd, 'src/generated/handlers.ts'), await fs_extra_1.default.readFile(node_path_1.default.join(this.cwd, 'node_modules/.x/handlers.ts'), 'utf-8'));
         this.debug('导出处理器...');
         const handlerGroup = sourceFile.getExportSymbols();
         const handles = [];

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,7 +46,7 @@ yargs_1.default
             stdio: 'inherit',
         });
     }
-    await template_util_1.TemplateUtil.init(process.cwd());
+    await template_util_1.TemplateUtil.initHelperPackage(process.cwd());
     const watcher = chokidar_1.default.watch(['src', '.env'], {
         cwd: process.cwd(),
     });
@@ -101,7 +99,7 @@ yargs_1.default
         value: 'production',
         comment: '',
     });
-    await template_util_1.TemplateUtil.init(process.cwd());
+    await template_util_1.TemplateUtil.initHelperPackage(process.cwd());
     await (0, vscode_generate_index_standalone_1.generateManyIndex)({
         cwd: process.cwd(),
         patterns: ['src/.x/*.ts'],
@@ -146,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.d.ts

@@ -1,3 +1,10 @@
 export declare class TemplateUtil {
-    static init(cwd: string): Promise<void>;
+    /**
+     * 初始化辅助包。
+     */
+    static initHelperPackage(cwd: string): Promise<void>;
+    /**
+     * 初始化模型。
+     */
+    static initModels(cwd: string): Promise<void>;
 }

package/lib/cli/template_util.js

@@ -6,13 +6,57 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 {
-    static async init(cwd) {
+    /**
+     * 初始化辅助包。
+     */
+    static async initHelperPackage(cwd) {
         const fromDir = path_1.default.join(__dirname, 'templates');
         const toDir = path_1.default.join(cwd, 'node_modules/.x');
         await fs_extra_1.default.copy(fromDir, toDir, {
             overwrite: true,
         });
     }
+    /**
+     * 初始化模型。
+     */
+    static async initModels(cwd) {
+        const modelsDir = path_1.default.join(cwd, 'src/models');
+        const indexFile = path_1.default.join(modelsDir, 'index.ts');
+        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 = [
+            ...prismaClientFileContent
+                .match(/(?<=const ModelName:).+?(?=\})/s)[0]
+                .matchAll(/(\S+?):/g),
+        ].map(match => (0, vtils_1.camelCase)(match[1]));
+        await Promise.all(modelNames.map(async (modelName) => {
+            const model_name = (0, vtils_1.snakeCase)(modelName);
+            const ModelName = (0, vtils_1.upperFirst)(modelName);
+            const modelFile = path_1.default.join(modelsDir, `${model_name}.ts`);
+            if (!(await fs_extra_1.default.pathExists(modelFile))) {
+                await fs_extra_1.default.outputFile(modelFile, (0, vtils_1.dedent) `
+              import { ${ModelName}BaseModel } from '@jayfong/x-server'
+
+              export class ${ModelName}Model extends ${ModelName}BaseModel {}
+              
+              export const ${modelName}Model = new ${ModelName}Model()
+            `);
+            }
+        }));
+        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/lib/core/define_task.js

@@ -5,12 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineTask = void 0;
 const bull_1 = __importDefault(require("bull"));
-const server_1 = require("./server");
 const x_1 = require("../x");
 async function defineTask(options) {
     const queue = new bull_1.default(options.name, {
         redis: x_1.x.redis.options,
-        prefix: `${server_1.Server.options.name}_task`,
+        prefix: `${x_1.x.appName}_task`,
     });
     queue.process(async (job) => {
         return options.handle(job.data);

package/lib/core/types.d.ts

@@ -21,10 +21,6 @@ export declare namespace XServer {
         handler: Handler;
     }
     interface Options {
-        /**
-         * 应用名称
-         */
-        name: string;
         /**
          * 监听主机
          */

package/lib/services/cache.d.ts

@@ -4,9 +4,7 @@ import { MsValue } from 'vtils/date';
 export declare type CacheTTL = MsValue;
 export interface CacheOptions {
     /** 默认过期时间 */
-    defaultTTL: CacheTTL;
-    /** 存储键前缀 */
-    prefix: string;
+    ttl: CacheTTL;
 }
 declare type Data = {
     [K in string]: (...args: any[]) => any;

package/lib/services/cache.js

@@ -11,7 +11,7 @@ class CacheService {
     constructor(options) {
         this.options = options;
         this.serviceName = 'cache';
-        this.prefix = `${options.prefix}:`;
+        this.prefix = `${x_1.x.appName}:`;
     }
     toRedisKey(key) {
         return `${this.prefix}${Array.isArray(key) ? key.join('_') : String(key)}`;
@@ -25,10 +25,10 @@ class CacheService {
      * @returns 返回设置的缓存内容
      */
     async set(key, value, ttl = this.options
-        .defaultTTL) {
+        .ttl) {
         const redisKey = this.toRedisKey(key);
         const redisValue = JSON.stringify(value);
-        const redisTtl = typeof ttl === 'function' ? ttl(value, this.options.defaultTTL) : ttl;
+        const redisTtl = typeof ttl === 'function' ? ttl(value, this.options.ttl) : ttl;
         await x_1.x.redis.set(redisKey, redisValue, 
         // 毫秒
         'PX', (0, date_1.ms)(redisTtl));
@@ -40,7 +40,7 @@ class CacheService {
      * @param value 值
      * @param ttl 存活时间
      */
-    async save(value, ttl = this.options.defaultTTL) {
+    async save(value, ttl = this.options.ttl) {
         const key = `X__${(0, cuid_1.default)()}`;
         await this.set(key, typeof value === 'function' ? await value(key) : value, ttl);
         return key;
@@ -93,7 +93,7 @@ class CacheService {
      * @returns 返回获取到的内容
      */
     async remember(key, action, ttl = this.options
-        .defaultTTL) {
+        .ttl) {
         let value = await this.get(key);
         if (value === null) {
             value = await action();

package/lib/x.d.ts

@@ -1,6 +1,7 @@
 import { BaseService } from './services/base';
 import './services/dispose';
 export interface X {
+    readonly appName: string;
     readonly register: (...services: BaseService[]) => void;
 }
 export declare const x: X;

package/lib/x.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = void 0;
 const dispose_1 = require("./services/dispose");
 exports.x = {
+    appName: process.env.APP_NAME,
     register: (...services) => {
         for (const service of services) {
             // @ts-ignore

package/package.json

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