@eggjs/dal-runtime 3.35.0 → 3.36.0

package/dist/index.d.ts

@@ -5,3 +5,4 @@ export * from './src/SqlMapLoader';
 export * from './src/DataSource';
 export * from './src/MySqlDataSource';
 export * from './src/TableModelInstanceBuilder';
+export * from './src/DatabaseForker';

package/dist/index.js

@@ -23,4 +23,5 @@ __exportStar(require("./src/SqlMapLoader"), exports);
 __exportStar(require("./src/DataSource"), exports);
 __exportStar(require("./src/MySqlDataSource"), exports);
 __exportStar(require("./src/TableModelInstanceBuilder"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHFEQUFtQztBQUNuQyxzREFBb0M7QUFDcEMsaURBQWdEO0FBQXZDLDBHQUFBLFdBQVcsT0FBQTtBQUNwQixxREFBbUM7QUFFbkMsbURBQWlDO0FBQ2pDLHdEQUFzQztBQUN0QyxrRUFBZ0QifQ==
+__exportStar(require("./src/DatabaseForker"), exports);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHFEQUFtQztBQUNuQyxzREFBb0M7QUFDcEMsaURBQWdEO0FBQXZDLDBHQUFBLFdBQVcsT0FBQTtBQUNwQixxREFBbUM7QUFFbkMsbURBQWlDO0FBQ2pDLHdEQUFzQztBQUN0QyxrRUFBZ0Q7QUFDaEQsdURBQXFDIn0=

package/dist/src/DatabaseForker.d.ts

@@ -0,0 +1,12 @@
+import { DataSourceOptions } from './MySqlDataSource';
+export declare class DatabaseForker {
+    private readonly env;
+    private readonly options;
+    constructor(env: string, options: DataSourceOptions);
+    shouldFork(): boolean | undefined;
+    forkDb(dalDir: string): Promise<void>;
+    private forkTables;
+    private doForkTable;
+    private doCreateUtDb;
+    destroy(): Promise<void>;
+}

package/dist/src/DatabaseForker.js

@@ -0,0 +1,66 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DatabaseForker = void 0;
+const rds_1 = require("@eggjs/rds");
+const node_path_1 = __importDefault(require("node:path"));
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_assert_1 = __importDefault(require("node:assert"));
+class DatabaseForker {
+    constructor(env, options) {
+        this.env = env;
+        this.options = options;
+    }
+    shouldFork() {
+        return this.env === 'unittest' && this.options.forkDb;
+    }
+    async forkDb(dalDir) {
+        (0, node_assert_1.default)(this.shouldFork(), 'fork db only run in unittest');
+        // 尽早判断不应该 fork，避免对 rds pool 配置造成污染
+        try {
+            await promises_1.default.access(dalDir);
+        }
+        catch (_) {
+            return;
+        }
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { name, initSql, forkDb, database, ...mysqlOptions } = this.options;
+        const client = new rds_1.RDSClient(Object.assign(mysqlOptions));
+        const conn = await client.getConnection();
+        await this.doCreateUtDb(conn);
+        await this.forkTables(conn, dalDir);
+        conn.release();
+        await client.end();
+    }
+    async forkTables(conn, dalDir) {
+        const sqlDir = node_path_1.default.join(dalDir, 'structure');
+        const structureFiles = await promises_1.default.readdir(sqlDir);
+        const sqlFiles = structureFiles.filter(t => t.endsWith('.sql'));
+        for (const sqlFile of sqlFiles) {
+            await this.doForkTable(conn, node_path_1.default.join(sqlDir, sqlFile));
+        }
+    }
+    async doForkTable(conn, sqlFileName) {
+        const sqlFile = await promises_1.default.readFile(sqlFileName, 'utf8');
+        const sqls = sqlFile.split(';').filter(t => !!t.trim());
+        for (const sql of sqls) {
+            await conn.query(sql);
+        }
+    }
+    async doCreateUtDb(conn) {
+        await conn.query(`CREATE DATABASE IF NOT EXISTS ${this.options.database};`);
+        await conn.query(`use ${this.options.database};`);
+    }
+    async destroy() {
+        (0, node_assert_1.default)(this.shouldFork(), 'fork db only run in unittest');
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { name, initSql, forkDb, database, ...mysqlOptions } = this.options;
+        const client = new rds_1.RDSClient(Object.assign(mysqlOptions));
+        await client.query(`DROP DATABASE ${database}`);
+        await client.end();
+    }
+}
+exports.DatabaseForker = DatabaseForker;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGF0YWJhc2VGb3JrZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvRGF0YWJhc2VGb3JrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0Esb0NBQXVDO0FBQ3ZDLDBEQUE2QjtBQUM3QixnRUFBa0M7QUFDbEMsOERBQWlDO0FBRWpDLE1BQWEsY0FBYztJQUl6QixZQUFZLEdBQVcsRUFBRSxPQUEwQjtRQUNqRCxJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztRQUNmLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO0lBQ3pCLENBQUM7SUFFRCxVQUFVO1FBQ1IsT0FBTyxJQUFJLENBQUMsR0FBRyxLQUFLLFVBQVUsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQztJQUN4RCxDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFjO1FBQ3pCLElBQUEscUJBQU0sRUFBQyxJQUFJLENBQUMsVUFBVSxFQUFFLEVBQUUsOEJBQThCLENBQUMsQ0FBQztRQUMxRCxtQ0FBbUM7UUFDbkMsSUFBSSxDQUFDO1lBQ0gsTUFBTSxrQkFBRSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUMxQixDQUFDO1FBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUNYLE9BQU87UUFDVCxDQUFDO1FBQ0QsNkRBQTZEO1FBQzdELE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsR0FBRyxZQUFZLEVBQUUsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQzFFLE1BQU0sTUFBTSxHQUFHLElBQUksZUFBUyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQztRQUMxRCxNQUFNLElBQUksR0FBRyxNQUFNLE1BQU0sQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUMxQyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDOUIsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUNwQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDZixNQUFNLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUNyQixDQUFDO0lBRU8sS0FBSyxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsTUFBYztRQUMzQyxNQUFNLE1BQU0sR0FBRyxtQkFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsV0FBVyxDQUFDLENBQUM7UUFDOUMsTUFBTSxjQUFjLEdBQUcsTUFBTSxrQkFBRSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNoRCxNQUFNLFFBQVEsR0FBRyxjQUFjLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2hFLEtBQUssTUFBTSxPQUFPLElBQUksUUFBUSxFQUFFLENBQUM7WUFDL0IsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksRUFBRSxtQkFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUMzRCxDQUFDO0lBQ0gsQ0FBQztJQUVPLEtBQUssQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFLFdBQW1CO1FBQ2pELE1BQU0sT0FBTyxHQUFHLE1BQU0sa0JBQUUsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQ3ZELE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ3hELEtBQUssTUFBTSxHQUFHLElBQUksSUFBSSxFQUFFLENBQUM7WUFDdkIsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3hCLENBQUM7SUFDSCxDQUFDO0lBRU8sS0FBSyxDQUFDLFlBQVksQ0FBQyxJQUFJO1FBQzdCLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxpQ0FBaUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEdBQUcsQ0FBQyxDQUFDO1FBQzVFLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxHQUFHLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU87UUFDWCxJQUFBLHFCQUFNLEVBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxFQUFFLDhCQUE4QixDQUFDLENBQUM7UUFDMUQsNkRBQTZEO1FBQzdELE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsR0FBRyxZQUFZLEVBQUUsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQzFFLE1BQU0sTUFBTSxHQUFHLElBQUksZUFBUyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQztRQUMxRCxNQUFNLE1BQU0sQ0FBQyxLQUFLLENBQUMsaUJBQWlCLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDaEQsTUFBTSxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDckIsQ0FBQztDQUNGO0FBN0RELHdDQTZEQyJ9

package/dist/src/MySqlDataSource.d.ts

@@ -1,14 +1,17 @@
-import type { RDSClientOptions } from '@eggjs/rds/lib/types';
+import type { RDSClientOptions } from '@eggjs/rds';
 import Base from 'sdk-base';
 export interface DataSourceOptions extends RDSClientOptions {
     name: string;
     initSql?: string;
+    forkDb?: boolean;
 }
 export declare class MysqlDataSource extends Base {
-    private readonly client;
+    private client;
     private readonly initSql;
     readonly name: string;
     readonly timezone?: string;
+    readonly rdsOptions: RDSClientOptions;
+    readonly forkDb?: boolean;
     constructor(options: DataSourceOptions);
     protected _init(): Promise<void>;
     query<T = any>(sql: string): Promise<T>;

package/dist/src/MySqlDataSource.js

@@ -14,11 +14,13 @@ const DEFAULT_OPTIONS = {
 class MysqlDataSource extends sdk_base_1.default {
     constructor(options) {
         super({ initMethod: '_init' });
-        const { name, initSql, ...mysqlOptions } = options;
-        this.client = new rds_1.RDSClient(Object.assign({}, DEFAULT_OPTIONS, mysqlOptions));
+        const { name, initSql, forkDb, ...mysqlOptions } = options;
+        this.forkDb = forkDb;
         this.initSql = initSql ?? 'SELECT 1 + 1';
         this.name = name;
         this.timezone = options.timezone;
+        this.rdsOptions = Object.assign({}, DEFAULT_OPTIONS, mysqlOptions);
+        this.client = new rds_1.RDSClient(this.rdsOptions);
     }
     async _init() {
         if (this.initSql) {
@@ -30,4 +32,4 @@ class MysqlDataSource extends sdk_base_1.default {
     }
 }
 exports.MysqlDataSource = MysqlDataSource;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTXlTcWxEYXRhU291cmNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL015U3FsRGF0YVNvdXJjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxvQ0FBdUM7QUFHdkMsd0RBQTRCO0FBUTVCLE1BQU0sZUFBZSxHQUFxQjtJQUN4QyxpQkFBaUIsRUFBRSxJQUFJO0lBQ3ZCLGdCQUFnQixFQUFFLElBQUk7SUFDdEIsS0FBSyxFQUFFLElBQUk7Q0FDWixDQUFDO0FBRUYsTUFBYSxlQUFnQixTQUFRLGtCQUFJO0lBTXZDLFlBQVksT0FBMEI7UUFDcEMsS0FBSyxDQUFDLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7UUFDL0IsTUFBTSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsR0FBRyxZQUFZLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFDbkQsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLGVBQVMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxlQUFlLEVBQUUsWUFBWSxDQUFDLENBQUMsQ0FBQztRQUM5RSxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sSUFBSSxjQUFjLENBQUM7UUFDekMsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7UUFDakIsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDO0lBQ25DLENBQUM7SUFFUyxLQUFLLENBQUMsS0FBSztRQUNuQixJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNqQixNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUN4QyxDQUFDO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxLQUFLLENBQVUsR0FBVztRQUM5QixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ2hDLENBQUM7Q0FDRjtBQXhCRCwwQ0F3QkMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTXlTcWxEYXRhU291cmNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL015U3FsRGF0YVNvdXJjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxvQ0FBdUM7QUFFdkMsd0RBQTRCO0FBUzVCLE1BQU0sZUFBZSxHQUFxQjtJQUN4QyxpQkFBaUIsRUFBRSxJQUFJO0lBQ3ZCLGdCQUFnQixFQUFFLElBQUk7SUFDdEIsS0FBSyxFQUFFLElBQUk7Q0FDWixDQUFDO0FBRUYsTUFBYSxlQUFnQixTQUFRLGtCQUFJO0lBUXZDLFlBQVksT0FBMEI7UUFDcEMsS0FBSyxDQUFDLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7UUFDL0IsTUFBTSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEdBQUcsWUFBWSxFQUFFLEdBQUcsT0FBTyxDQUFDO1FBQzNELElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxJQUFJLGNBQWMsQ0FBQztRQUN6QyxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsUUFBUSxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUM7UUFDakMsSUFBSSxDQUFDLFVBQVUsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxlQUFlLEVBQUUsWUFBWSxDQUFDLENBQUM7UUFDbkUsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLGVBQVMsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUVTLEtBQUssQ0FBQyxLQUFLO1FBQ25CLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2pCLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3hDLENBQUM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBVSxHQUFXO1FBQzlCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDaEMsQ0FBQztDQUNGO0FBNUJELDBDQTRCQyJ9

package/dist/src/SqlGenerator.js

@@ -124,7 +124,23 @@ class SqlGenerator {
                 break;
             }
             case dal_decorator_1.ColumnType.DATETIME:
-            case dal_decorator_1.ColumnType.TIMESTAMP:
+            case dal_decorator_1.ColumnType.TIMESTAMP: {
+                if (columnType.precision) {
+                    sqls.push(`${columnType.type}(${columnType.precision})`);
+                }
+                else {
+                    sqls.push(columnType.type);
+                }
+                if (columnType.autoUpdate) {
+                    if (columnType.precision) {
+                        sqls.push(`ON UPDATE CURRENT_TIMESTAMP(${columnType.precision})`);
+                    }
+                    else {
+                        sqls.push('ON UPDATE CURRENT_TIMESTAMP');
+                    }
+                }
+                break;
+            }
             case dal_decorator_1.ColumnType.TIME: {
                 if (columnType.precision) {
                     sqls.push(`${columnType.type}(${columnType.precision})`);
@@ -376,4 +392,4 @@ class SqlGenerator {
     }
 }
 exports.SqlGenerator = SqlGenerator;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SqlGenerator.js","sourceRoot":"","sources":["../../src/SqlGenerator.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SqlGenerator.js","sourceRoot":"","sources":["../../src/SqlGenerator.ts"],"names":[],"mappings":"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"}

package/dist/src/templates/base_dao.njk

@@ -68,16 +68,16 @@ Optional<{{clazzName}},
 >
 {% endmacro %}
 
-import type { InsertResult, UpdateResult, DeleteResult } from '@eggjs/rds/lib/types';
-import { SingletonProto, AccessLevel, Inject } from '@eggjs/tegg';
-import { DataSource, DataSourceInjectName, DataSourceQualifier, ColumnTsType } from '@eggjs/tegg/dal';
+import type { InsertResult, UpdateResult, DeleteResult } from '{{dalPkg}}';
+import { SingletonProto, AccessLevel, Inject } from '{{teggPkg}}';
+import { DataSource, DataSourceInjectName, DataSourceQualifier, ColumnTsType } from '{{dalPkg}}';
 import { {{ clazzName }} } from '{{ tableModelPath }}';
 // empty-line
 type Optional<T, K extends keyof T> = Omit<T, K> & Partial<T>;
 /**
  * 自动生成的 {{ clazzName }}DAO 基类
  * @class Base{{ clazzName }}DAO
- * @classdesc 该文件由 @eggjs/tegg 自动生成，请**不要**修改它！
+ * @classdesc 该文件由 {{teggPkg}} 自动生成，请**不要**修改它！
  */
 /* istanbul ignore next */
 @SingletonProto({

package/dist/src/templates/dao.njk

@@ -1,4 +1,4 @@
-import { SingletonProto, AccessLevel } from '@eggjs/tegg';
+import { SingletonProto, AccessLevel } from '{{teggPkg}}';
 import { Base{{ clazzName }}DAO } from './base/Base{{ clazzName }}DAO';
 // empty-line
 /**

package/dist/src/templates/extension.njk

@@ -1,9 +1,9 @@
-import { SqlMap } from '@eggjs/tegg/dal';
+import { SqlMap } from '{{dalPkg}}';
 // empty-line
 /**
  * Define Custom SQLs
  *
- * import { SqlMap, SqlType } from '@eggjs/tegg/dal';
+ * import { SqlMap, SqlType } from '{{dalPkg}}';
  *
  * export default {
  *   findByName: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/dal-runtime",
-  "version": "3.35.0",
+  "version": "3.36.0",
   "description": "tegg dal decorator",
   "keywords": [
     "egg",
@@ -21,7 +21,7 @@
     "clean": "tsc -b --clean",
     "tsc": "npm run clean && tsc -p ./tsconfig.json",
     "tsc:pub": "npm run clean && tsc -p ./tsconfig.pub.json && npm run cp:template",
-    "cp:template": "cp -r src/templates dist/src/templates",
+    "cp:template": "rm -rf dist/src/templates && cp -r src/templates dist/src/templates",
     "prepublishOnly": "npm run tsc:pub"
   },
   "author": "killagu <killa123@126.com>",
@@ -39,7 +39,7 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@eggjs/dal-decorator": "^3.35.0",
+    "@eggjs/dal-decorator": "^3.36.0",
     "@eggjs/rds": "^1.0.0",
     "js-beautify": "^1.15.1",
     "lodash": "^4.17.21",
@@ -51,7 +51,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@eggjs/tegg": "^3.35.0",
+    "@eggjs/tegg": "^3.36.0",
     "@types/lodash": "^4.17.0",
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.2.4",
@@ -61,5 +61,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "8e3fc0de8de5cb22b43739335763246cdece362d"
+  "gitHead": "b550d59a21f7c9991310ca6b6fd16ee581a5e17d"
 }

package/dist/src/templates/templates/base_dao.njk

@@ -1,150 +0,0 @@
-{% macro newDataLogic(columns, old, new) %}
-let tmp;
-{% for column in table.columns %}
-// empty-line
-tmp = {{ old }}.{{ column.propertyName }};
-if (tmp !== undefined) {
-  {{ new }}.${{ column.propertyName }} = tmp;
-}
-{% endfor %}
-{% endmacro %}
-
-{% macro findLogic(funcName, sqlName, idx, uniq) %}
-public async {{ funcName }}(
-  {% for key in idx.keys %}
-  ${{ key.propertyName }}: {{columnMap[key.propertyName].type.type | dbTypeToTSType}}{% if loop.last !== true %},{% endif%}
-  {% endfor %}
-): Promise<{{ clazzName }}{{ '| null' if uniq else '[]' }}> {
-  return this.dataSource.{{ 'executeScalar' if uniq else 'execute' }}('{{ sqlName }}', {
-    {% for key in idx.keys %}
-    ${{ key.propertyName }},
-    {% endfor %}
-  });
-}
-{% endmacro %}
-
-{% macro generatePrimaryType(primary) %}
-{% if (primary.keys | length) === 1 %}
-{{primary.keys[0].propertyName}}: {{ columnMap[primary.keys[0].propertyName].type.type | dbTypeToTSType}}
-{% else %}
-primary: {
-  {% for key in primary.keys %}
-  {{ key.propertyName }}: {{columnMap[key.propertyName].type.type | dbTypeToTSType}}{% if loop.last !== true %},{% endif%}
-  {% endfor %}
-}
-{% endif %}
-{% endmacro %}
-
-{% macro generateUpdateValue(primary) %}
-{% if (primary.keys | length) === 1 %}
-const newData: Record<string, any> = {
-  primary: {
-    {{primary.keys[0].propertyName}},
-  },
-};
-{% else %}
-const newData: Record<string, any> = {
-  primary,
-};
-{% endif %}
-{% endmacro %}
-
-{% macro generateDeleteValue(primary) %}
-{% if (primary.keys | length) === 1 %}
-{
-  {{primary.keys[0].propertyName}},
-}
-
-{% else %}
-primary
-{% endif %}
-{% endmacro %}
-
-{% macro generateInsertType(primary) %}
-Optional<{{clazzName}},
-  {% for key in primary.keys %}
-  '{{ key.propertyName }}'{% if loop.last !== true %}|{% endif%}
-  {% endfor %}
->
-{% endmacro %}
-
-import type { InsertResult, UpdateResult, DeleteResult } from '{{dalPkg}}';
-import { SingletonProto, AccessLevel, Inject } from '{{teggPkg}}';
-import { DataSource, DataSourceInjectName, DataSourceQualifier, ColumnTsType } from '{{dalPkg}}';
-import { {{ clazzName }} } from '{{ tableModelPath }}';
-// empty-line
-type Optional<T, K extends keyof T> = Omit<T, K> & Partial<T>;
-/**
- * 自动生成的 {{ clazzName }}DAO 基类
- * @class Base{{ clazzName }}DAO
- * @classdesc 该文件由 {{teggPkg}} 自动生成，请**不要**修改它！
- */
-/* istanbul ignore next */
-@SingletonProto({
-  accessLevel: AccessLevel.PUBLIC,
-})
-export class Base{{ clazzName }}DAO {
-  static clazzModel = {{ clazzName }};
-
-  @Inject({
-    name: DataSourceInjectName,
-  })
-  @DataSourceQualifier('{{moduleName}}.{{ table.dataSourceName }}.{{ clazzName }}')
-  protected readonly dataSource: DataSource<{{clazzName}}>;
-
-  // empty-line
-  {# insert: 插入 #}
-  public async insert(raw: {{generateInsertType(primaryIndex)}}): Promise<InsertResult> {
-    const data: Record<string, any> = {};
-
-    {{ newDataLogic(columns, 'raw', 'data') }}
-
-    // empty-line
-    return this.dataSource.executeRawScalar('insert', data);
-  }
-
-  // empty-line
-  {# update: 更新 #}
-  public async update({{generatePrimaryType(primaryIndex)}}, data: Partial<{{ ((clazzName)) }}>): Promise<UpdateResult> {
-    // empty-line
-    {{ generateUpdateValue(primaryIndex) }}
-
-    {{ newDataLogic(columns, 'data', 'newData') }}
-
-    // empty-line
-    return this.dataSource.executeRawScalar('update', newData);
-  }
-
-  {% for funcName in [ 'delete', 'del' ] %}
-  // empty-line
-  {# delete: 删除 #}
-  public async {{ funcName }}({{generatePrimaryType(primaryIndex)}}): Promise<DeleteResult> {
-    return this.dataSource.executeRawScalar('delete', {{generateDeleteValue(primaryIndex)}});
-  }
-  {% endfor %}
-
-  {% for idx in table.indices %}
-  // empty-line
-  {# 某个索引 #}
-  {% set tmpName = ((idx.keys[0].propertyName if (idx.keys | length) === 1 else idx.name) | pascalCase) %}
-  {% set findName = 'findBy' + tmpName %}
-  {% set findOneName = 'findOneBy' + tmpName %}
-    {{ findLogic(findName, findName, idx, false) }}
-    // empty-line
-    {{ findLogic(findOneName, findOneName, idx, true) }}
-  {% endfor %}
-
-  // empty-line
-  {# 某个索引 #}
-  {% if primaryIndex %}
-    {% set tmpName = ((primaryIndex.keys[0].propertyName if (primaryIndex.keys | length) === 1 else primaryIndex.name) | pascalCase) %}
-    {% set findName = 'findBy' + tmpName %}
-    {% set findOneName = 'findOneBy' + tmpName %}
-      {{ findLogic(findName, findName, primaryIndex, true) }}
-      {% if (primaryIndex.keys | length) === 1 %}
-      // empty-line
-      {{ findLogic('findByPrimary', findName, primaryIndex, true) }}
-      {% endif %}
-  {% endif %}
-}
-// empty-line

package/dist/src/templates/templates/dao.njk

@@ -1,17 +0,0 @@
-import { SingletonProto, AccessLevel } from '{{teggPkg}}';
-import { Base{{ clazzName }}DAO } from './base/Base{{ clazzName }}DAO';
-// empty-line
-/**
- * {{ clazzName }}DAO 类
-{% if user.name %} * @author {{ user.name }} {% if user.email %}<{{ user.email }}>{% endif %}
-{% endif %} * @class {{ clazzName }}DAO
- * @classdesc 在此扩展关于 {{ clazzName }} 数据的一切操作
- * @extends Base{{ clazzName }}DAO
- */
-@SingletonProto({
-  accessLevel: AccessLevel.PUBLIC,
-})
-export default class {{ clazzName }}DAO extends Base{{ clazzName }}DAO {
-  // empty-line
-}
-// empty-line

package/dist/src/templates/templates/extension.njk

@@ -1,17 +0,0 @@
-import { SqlMap } from '{{dalPkg}}';
-// empty-line
-/**
- * Define Custom SQLs
- *
- * import { SqlMap, SqlType } from '{{dalPkg}}';
- *
- * export default {
- *   findByName: {
- *     type: SqlType.SELECT,
- *     sql: 'SELECT {{ allColumns }} from foo where name = {{ name }}'
- *   },
- * }
- */
-export default {
-// empty-line
-} as Record<string, SqlMap>;