@eggjs/dal-runtime 3.51.2 → 4.0.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/dal-runtime",
-  "version": "3.51.2",
+  "version": "4.0.0-beta.1",
   "description": "tegg dal decorator",
   "keywords": [
     "egg",
@@ -9,20 +9,22 @@
     "tegg",
     "dal"
   ],
-  "main": "dist/index.js",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./src/index.d.ts",
+      "default": "./src/index.js"
+    }
+  },
   "files": [
-    "dist/**/*.js",
-    "dist/**/*.d.ts",
-    "dist/**/*.njk"
+    "src/**/*.js",
+    "src/**/*.d.ts"
   ],
-  "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "cross-env NODE_ENV=test NODE_OPTIONS='--no-deprecation' mocha",
     "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": "rm -rf dist/src/templates && cp -r src/templates dist/src/templates",
-    "prepublishOnly": "npm run tsc:pub"
+    "tsc:pub": "npm run tsc",
+    "prepublishOnly": "npm run tsc"
   },
   "author": "killagu <killa123@126.com>",
   "license": "MIT",
@@ -36,30 +38,31 @@
     "directory": "core/dal-decorator"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=20.0.0"
   },
   "dependencies": {
+    "@eggjs/core-decorator": "^4.0.0-beta.1",
+    "@eggjs/dal-decorator": "^4.0.0-beta.1",
     "@eggjs/rds": "^1.0.0",
-    "@eggjs/tegg": "^3.51.2",
-    "@eggjs/tegg-types": "^3.51.2",
-    "js-beautify": "^1.15.1",
+    "@eggjs/tegg-loader": "^4.0.0-beta.1",
+    "@eggjs/tegg-types": "^4.0.0-beta.1",
+    "js-beautify": "^1.15.3",
     "lodash": "^4.17.21",
     "nunjucks": "^3.2.4",
-    "sdk-base": "^4.2.1",
+    "sdk-base": "^5.0.1",
     "sqlstring": "^2.3.3"
   },
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
-    "@types/lodash": "^4.17.0",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.2.4",
-    "@types/nunjucks": "^3.2.6",
-    "cross-env": "^7.0.3",
-    "mocha": "^10.2.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "@types/js-beautify": "^1.14.3",
+    "@types/lodash": "4",
+    "@types/node": "22",
+    "@types/nunjucks": "3",
+    "@types/sqlstring": "^2.3.2",
+    "ts-node": "10",
+    "typescript": "5"
   },
-  "gitHead": "b310ec3c772067b98b4f91342d877bebcee4e673"
+  "gitHead": "79a22905272d6de7fe06152231dff65d213d9166"
 }

package/{dist/src → src}/BaseSqlMap.d.ts

@@ -1,4 +1,4 @@
-import { TableModel } from '@eggjs/tegg/dal';
+import { TableModel } from '@eggjs/dal-decorator';
 import { SqlMap } from '@eggjs/tegg-types';
 import type { Logger, GenerateSqlMap } from '@eggjs/tegg-types';
 export declare class BaseSqlMapGenerator {

package/src/BaseSqlMap.js

@@ -0,0 +1,303 @@
+import _ from 'lodash';
+import { ColumnType, IndexType, SqlType } from '@eggjs/tegg-types';
+import { TemplateUtil } from './TemplateUtil.js';
+export class BaseSqlMapGenerator {
+    constructor(tableModel, logger) {
+        this.tableModel = tableModel;
+        this.logger = logger;
+    }
+    generateAllColumns(countIf) {
+        const str = this.tableModel.columns.map(t => `\`${t.columnName}\``)
+            .join(',');
+        return countIf ? `{% if $$count == true %}0{% else %}${str}{% endif %}` : str;
+    }
+    generateFindByPrimary() {
+        const result = [];
+        const primary = this.tableModel.getPrimary();
+        if (!primary) {
+            this.logger.warn(`表 \`${this.tableModel.name}\` 没有主键，无法生成主键查询语句。`);
+            return result;
+        }
+        let sql = `SELECT ${this.generateAllColumns(true)}
+               FROM \`${this.tableModel.name}\`
+               WHERE `;
+        sql += primary.keys.map(indexKey => `\`${indexKey.columnName}\` = {{$${indexKey.propertyName}}}`)
+            .join(' AND ');
+        if (primary.keys.length === 1) {
+            result.push({
+                type: SqlType.SELECT,
+                name: `findBy${_.upperFirst(primary.keys[0].propertyName)}`,
+                sql,
+            });
+        }
+        result.push({
+            name: 'findByPrimary',
+            type: SqlType.SELECT,
+            sql,
+        });
+        return result;
+    }
+    // TODO index 的左匹配
+    generateFindByIndexes() {
+        const sqlMaps = [];
+        for (const index of this.tableModel.indices) {
+            if (index.type === IndexType.PRIMARY)
+                continue;
+            let sql = `SELECT ${this.generateAllColumns(true)}
+                 FROM \`${this.tableModel.name}\`
+                 WHERE `;
+            sql += index.keys.map(indexKey => {
+                const s = `\`${indexKey.columnName}\` {{ "IS" if $${indexKey.propertyName} == null else "=" }} {{$${indexKey.propertyName}}}`;
+                return s;
+            })
+                .join(' AND ');
+            const tempName = _.upperFirst(_.camelCase(index.keys.length === 1 ? index.keys[0].propertyName : index.name));
+            sqlMaps.push({
+                name: `findBy${tempName}`,
+                type: SqlType.SELECT,
+                sql,
+            });
+            sqlMaps.push({
+                name: `findOneBy${tempName}`,
+                type: SqlType.SELECT,
+                sql: `${sql} LIMIT 0, 1`,
+            });
+        }
+        return sqlMaps;
+    }
+    generateInsert() {
+        let sql = `INSERT INTO \`${this.tableModel.name}\` `;
+        sql += '{% set ___first = true %}';
+        const keys = [];
+        const values = [];
+        for (const column of this.tableModel.columns) {
+            const { propertyName, columnName, type } = column;
+            if (column.propertyName !== 'gmtCreate' && column.propertyName !== 'gmtModified') {
+                // Add filter for Spatial Type
+                // - toPoint
+                // - toLine
+                // - toPolygon
+                // - toGeometry
+                // - toMultiPoint
+                // - toMultiLine
+                // - toMultiPolygon
+                // - toGeometryCollection
+                keys.push((`
+        {% if $${propertyName} !== undefined %}
+          {% if ___first %}
+            {% set ___first = false %}
+          {% else %}
+          ,
+          {% endif %}
+
+          \`${columnName}\`
+        {% endif %}
+        `).trim());
+                if (TemplateUtil.isSpatialType(column)) {
+                    const filter = TemplateUtil.getSpatialFilter(column.type.type);
+                    values.push((`
+        {% if $${propertyName} !== undefined %}
+          {% if ___first %}
+            {% set ___first = false %}
+          {% else %}
+          ,
+          {% endif %}
+
+          {{$${propertyName} | ${filter}}}
+        {% endif %}
+        `).trim());
+                }
+                else if (column.type.type === ColumnType.JSON) {
+                    values.push((`
+        {% if $${propertyName} !== undefined %}
+          {% if ___first %}
+            {% set ___first = false %}
+          {% else %}
+          ,
+          {% endif %}
+
+          {{$${propertyName} | toJson}}
+        {% endif %}
+        `).trim());
+                }
+                else {
+                    values.push((`
+        {% if $${propertyName} !== undefined %}
+          {% if ___first %}
+            {% set ___first = false %}
+          {% else %}
+          ,
+          {% endif %}
+
+          {{$${propertyName}}}
+        {% endif %}
+        `).trim());
+                }
+            }
+            else {
+                let now;
+                // Default value for gmtCreate/gmtModified
+                // int:UNIX_TEIMESTAMP
+                // bigint: ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)
+                // datetime/timestamp Now()
+                if (type.type === ColumnType.INT) {
+                    // 秒级时间戳
+                    now = 'UNIX_TIMESTAMP()';
+                }
+                else if (type.type === ColumnType.BIGINT) {
+                    // 毫秒级时间戳
+                    now = 'ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)';
+                }
+                else if (type.type === ColumnType.DATETIME || type.type === ColumnType.TIMESTAMP) {
+                    now = type.precision ? `NOW(${type.precision})` : 'NOW()';
+                }
+                else {
+                    this.logger.warn(`unknown type ${type.type} for ${propertyName}`);
+                }
+                keys.push((`
+        {% if ___first %}
+          {% set ___first = false %}
+        {% else %}
+        ,
+        {% endif %}
+
+        \`${columnName}\`
+        `).trim());
+                values.push((`
+        {% if ___first %}
+          {% set ___first = false %}
+        {% else %}
+        ,
+        {% endif %}
+
+        {{ $${propertyName} if $${propertyName} !== undefined else '${now}' }}
+        `).trim());
+            }
+        }
+        sql += `(${keys.join('')})`;
+        sql += '{% set ___first = true %}';
+        sql += `VALUES(${values.join('')});`;
+        return sql;
+    }
+    generateUpdate() {
+        const primary = this.tableModel.getPrimary();
+        if (!primary) {
+            this.logger.warn(`表 \`${this.tableModel.name}\` 没有主键，无法生成主键更新语句。`);
+            return;
+        }
+        let sql = `UPDATE \`${this.tableModel.name}\` SET`;
+        sql += '{% set ___first = true %}';
+        const kv = [];
+        for (const column of this.tableModel.columns) {
+            const { type, propertyName, columnName } = column;
+            let now;
+            if (type.type === ColumnType.INT) {
+                // 秒级时间戳
+                now = 'UNIX_TIMESTAMP()';
+            }
+            else if (type.type === ColumnType.BIGINT) {
+                // 毫秒级时间戳
+                now = 'ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)';
+            }
+            else if (type.type === ColumnType.TIMESTAMP || type.type === ColumnType.DATETIME) {
+                now = type.precision ? `NOW(${type.precision})` : 'NOW()';
+            }
+            // 若无更新时间字段，则自动更新该字段
+            const temp = propertyName !== 'gmtModified' ?
+                `
+      {% if $${propertyName} !== undefined %}
+        {% if ___first %}
+          {% set ___first = false %}
+        {% else %}
+        ,
+        {% endif %}
+
+        \`${columnName}\` = {{$${propertyName}}}
+      {% endif %}
+      ` :
+                `
+      {% if ___first %}
+        {% set ___first = false %}
+      {% else %}
+      ,
+      {% endif %}
+
+      \`${columnName}\` =
+      {{ $${propertyName} if $${propertyName} !== undefined else '${now}' }}
+      `;
+            kv.push(temp);
+        }
+        sql += kv.join('');
+        sql += `WHERE ${primary.keys.map(indexKey => `\`${indexKey.columnName}\` = {{primary.${indexKey.propertyName}}}`)
+            .join(' AND ')}`;
+        return sql;
+    }
+    generateDelete() {
+        const primary = this.tableModel.getPrimary();
+        if (!primary) {
+            this.logger.warn(`表 \`${this.tableModel.name}\` 没有主键，无法生成主键删除语句。`);
+            return;
+        }
+        let sql = `DELETE
+               FROM \`${this.tableModel.name}\`
+               WHERE `;
+        sql += primary.keys.map(indexKey => `\`${indexKey.columnName}\` = {{${indexKey.propertyName}}}`)
+            .join(' AND ');
+        return sql;
+    }
+    load() {
+        const map = {};
+        map.allColumns = {
+            type: SqlType.BLOCK,
+            content: this.generateAllColumns(false),
+        };
+        const sqlMaps = [
+            /**
+             * 以主键进行索引
+             *
+             *   + `findByPrimary`
+             *   + 若为单主键，则再加 `findBy键名`
+             */
+            ...this.generateFindByPrimary(),
+            /**
+             * findBy 各索引
+             *
+             *   + 若为多列索引，则为 `findBy索引名`
+             *   + 若为单列索引，则为 `findBy列名`
+             */
+            ...this.generateFindByIndexes(),
+            /**
+             * 插入
+             */
+            {
+                name: 'insert',
+                type: SqlType.INSERT,
+                sql: this.generateInsert(),
+            },
+            /**
+             * 主键更新
+             */
+            {
+                name: 'update',
+                type: SqlType.UPDATE,
+                sql: this.generateUpdate(),
+            },
+            /**
+             * 主键删除
+             */
+            {
+                name: 'delete',
+                type: SqlType.DELETE,
+                sql: this.generateDelete(),
+            },
+        ];
+        for (const sqlMap of sqlMaps) {
+            map[sqlMap.name] = {
+                type: sqlMap.type,
+                sql: sqlMap.sql,
+            };
+        }
+        return map;
+    }
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BaseSqlMap.js","sourceRoot":"","sources":["BaseSqlMap.ts"],"names":[],"mappings":"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"}

package/{dist/src → src}/CodeGenerator.d.ts

@@ -1,6 +1,6 @@
 import { Templates } from '@eggjs/tegg-types';
 import type { CodeGeneratorOptions } from '@eggjs/tegg-types';
-import { TableModel } from '@eggjs/tegg/dal';
+import { TableModel } from '@eggjs/dal-decorator';
 export declare class CodeGenerator {
     private readonly moduleDir;
     private readonly moduleName;

package/src/CodeGenerator.js

@@ -0,0 +1,138 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import js_beautify from 'js-beautify';
+import _ from 'lodash';
+import nunjucks from 'nunjucks';
+import { Templates } from '@eggjs/tegg-types';
+import { PrototypeUtil } from '@eggjs/core-decorator';
+import { SqlGenerator } from './SqlGenerator.js';
+import { TemplateUtil } from './TemplateUtil.js';
+export class CodeGenerator {
+    constructor(options) {
+        this.moduleDir = options.moduleDir;
+        this.moduleName = options.moduleName;
+        this.teggPkg = options.teggPkg ?? '@eggjs/tegg';
+        this.dalPkg = options.dalPkg ?? '@eggjs/tegg/dal';
+        this.createNunjucksEnv();
+    }
+    createNunjucksEnv() {
+        this.njkEnv = nunjucks.configure(path.join(__dirname, './templates'), {
+            autoescape: false,
+        });
+        this.njkEnv.addFilter('pascalCase', name => _.upperFirst(_.camelCase(name)));
+        this.njkEnv.addFilter('camelCase', name => _.camelCase(name));
+        this.njkEnv.addFilter('dbTypeToTSType', TemplateUtil.dbTypeToTsType);
+    }
+    genCode(tplName, filePath, tableModel) {
+        let tableModelAbsolutePath = PrototypeUtil.getFilePath(tableModel.clazz);
+        tableModelAbsolutePath = tableModelAbsolutePath.substring(0, tableModelAbsolutePath.length - 3);
+        const data = {
+            table: tableModel,
+            file: filePath,
+            fileName: path.basename(filePath),
+            clazzName: tableModel.clazz.name,
+            moduleName: this.moduleName,
+            teggPkg: this.teggPkg,
+            dalPkg: this.dalPkg,
+            id: tableModel.columns.find(t => t.propertyName === 'id'),
+            primaryIndex: tableModel.getPrimary(),
+            tableModelPath: TemplateUtil.importPath(tableModelAbsolutePath, path.dirname(filePath)),
+            extensionPath: `../../extension/${tableModel.clazz.name}Extension`,
+            structurePath: `../../structure/${tableModel.clazz.name}.json`,
+            sqlPath: `../../structure/${tableModel.clazz.name}.sql`,
+            columnMap: tableModel.columns.reduce((p, c) => {
+                p[c.propertyName] = c;
+                return p;
+            }, {}),
+        };
+        return this.njkEnv.render(`${tplName}.njk`, data);
+    }
+    async generate(tableModel) {
+        let dalDir;
+        try {
+            await fs.access(path.join(this.moduleDir, 'src'));
+            dalDir = path.join(this.moduleDir, 'src/dal');
+        }
+        catch {
+            dalDir = path.join(this.moduleDir, 'dal');
+        }
+        // const tableName = tableModel.name;
+        // const clazzName = tableModel.clazz.name;
+        const clazzFileName = path.basename(PrototypeUtil.getFilePath(tableModel.clazz));
+        const baseFileName = path.basename(clazzFileName, '.ts');
+        // 要动的一些文件
+        const paths = {
+            // e.g. app/dal/dao/base/example.ts
+            baseBizDAO: path.join(dalDir, `dao/base/Base${baseFileName}DAO.ts`),
+            // e.g. app/dal/dao/example.ts
+            bizDAO: path.join(dalDir, `dao/${baseFileName}DAO.ts`),
+            // e.g. app/dal/extension/example.ts
+            extension: path.join(dalDir, `extension/${baseFileName}Extension.ts`),
+            // e.g. app/dal/structure/example.json
+            structure: path.join(dalDir, `structure/${baseFileName}.json`),
+            // e.g. app/dal/structure/example.sql
+            structureSql: path.join(dalDir, `structure/${baseFileName}.sql`),
+        };
+        // 建立 structure 文件
+        await fs.mkdir(path.dirname(paths.structure), {
+            recursive: true,
+        });
+        await fs.writeFile(paths.structure, JSON.stringify(tableModel, null, 2), 'utf8');
+        const sqlGenerator = new SqlGenerator();
+        const structureSql = sqlGenerator.generate(tableModel);
+        await fs.writeFile(paths.structureSql, structureSql, 'utf8');
+        const codes = [{
+                templates: Templates.BASE_DAO,
+                filePath: paths.baseBizDAO,
+                beautify: true,
+                overwrite: true,
+            }, {
+                templates: Templates.DAO,
+                filePath: paths.bizDAO,
+                beautify: true,
+                overwrite: false,
+            }, {
+                templates: Templates.EXTENSION,
+                filePath: paths.extension,
+                beautify: false,
+                overwrite: false,
+            }];
+        for (const { templates, filePath, beautify, overwrite } of codes) {
+            await fs.mkdir(path.dirname(filePath), {
+                recursive: true,
+            });
+            const code = this.genCode(templates, filePath, tableModel);
+            let beautified;
+            if (beautify) {
+                beautified = js_beautify(code, {
+                    brace_style: 'preserve-inline',
+                    indent_size: 2,
+                    jslint_happy: true,
+                    preserve_newlines: false,
+                });
+            }
+            else {
+                beautified = code;
+            }
+            beautified = beautified
+                .replace(/( )*\/\/ empty-line( )*/g, '')
+                .replace(/Promise( )*<( )*(.+?)( )*>/g, 'Promise<$3>')
+                .replace(/Optional( )*<( )*(.+?)( )*>/g, 'Optional<$3>')
+                .replace(/Record( )*<( )*(.+?)( )*>/g, 'Record<$3>')
+                .replace(/Partial( )*<( )*(.+?)( )*>/g, 'Partial<$3>')
+                .replace(/DataSource( )*<( )*(.+?)( )*>/g, 'DataSource<$3>')
+                .replace(/ \? :/g, '?:');
+            if (overwrite !== true) {
+                try {
+                    await fs.access(filePath);
+                    continue;
+                }
+                catch {
+                    // file not exists
+                }
+            }
+            await fs.writeFile(filePath, beautified, 'utf8');
+        }
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29kZUdlbmVyYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkNvZGVHZW5lcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDbEMsT0FBTyxJQUFJLE1BQU0sV0FBVyxDQUFDO0FBQzdCLE9BQU8sV0FBVyxNQUFNLGFBQWEsQ0FBQztBQUN0QyxPQUFPLENBQUMsTUFBTSxRQUFRLENBQUM7QUFDdkIsT0FBTyxRQUE4QixNQUFNLFVBQVUsQ0FBQztBQUN0RCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHOUMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3RELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNqRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFakQsTUFBTSxPQUFPLGFBQWE7SUFNeEIsWUFBWSxPQUE2QjtRQUN2QyxJQUFJLENBQUMsU0FBUyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUM7UUFDbkMsSUFBSSxDQUFDLFVBQVUsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDO1FBQ3JDLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sSUFBSSxhQUFhLENBQUM7UUFDaEQsSUFBSSxDQUFDLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxJQUFJLGlCQUFpQixDQUFDO1FBQ2xELElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFJRCxpQkFBaUI7UUFDZixJQUFJLENBQUMsTUFBTSxHQUFHLFFBQVEsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsYUFBYSxDQUFDLEVBQUU7WUFDcEUsVUFBVSxFQUFFLEtBQUs7U0FDbEIsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMs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

package/{dist/src → src}/DaoLoader.d.ts

@@ -1,4 +1,4 @@
 import { BaseDaoType } from '@eggjs/tegg-types/dal';
 export declare class DaoLoader {
-    static loadDaos(moduleDir: string): Array<BaseDaoType>;
+    static loadDaos(moduleDir: string): Promise<Array<BaseDaoType>>;
 }

package/src/DaoLoader.js

@@ -0,0 +1,13 @@
+import { EggLoadUnitType } from '@eggjs/tegg-types';
+import { DaoInfoUtil } from '@eggjs/dal-decorator';
+import { LoaderFactory } from '@eggjs/tegg-loader';
+export class DaoLoader {
+    static async loadDaos(moduleDir) {
+        const loader = LoaderFactory.createLoader(moduleDir, EggLoadUnitType.MODULE);
+        const clazzList = await loader.load();
+        return clazzList.filter((t) => {
+            return DaoInfoUtil.getIsDao(t);
+        });
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGFvTG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRGFvTG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFbkQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRW5ELE1BQU0sT0FBTyxTQUFTO0lBQ3BCLE1BQU0sQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLFNBQWlCO1FBQ3JDLE1BQU0sTUFBTSxHQUFHLGFBQWEsQ0FBQyxZQUFZLENBQUMsU0FBUyxFQUFFLGVBQWUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM3RSxNQUFNLFNBQVMsR0FBRyxNQUFNLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUN0QyxPQUFPLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQW9CLEVBQUU7WUFDOUMsT0FBTyxXQUFXLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2pDLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIn0=

package/{dist/src → src}/DataSource.d.ts

@@ -1,7 +1,7 @@
-import { TableModel } from '@eggjs/tegg/dal';
+import { TableModel } from '@eggjs/dal-decorator';
 import type { DataSource as IDataSource, PaginateData, SqlType } from '@eggjs/tegg-types';
-import { MysqlDataSource } from './MySqlDataSource';
-import { TableSqlMap } from './TableSqlMap';
+import { MysqlDataSource } from './MySqlDataSource.js';
+import { TableSqlMap } from './TableSqlMap.js';
 export interface ExecuteSql {
     sql: string;
     template: string;
@@ -15,8 +15,8 @@ export declare class DataSource<T> implements IDataSource<T> {
     constructor(tableModel: TableModel<T>, mysqlDataSource: MysqlDataSource, sqlMap: TableSqlMap);
     /**
      * public for aop execute to implement sql hint append
-     * @param sqlName
-     * @param data
+     * @param sqlName - sql name
+     * @param data - sql data
      */
     generateSql(sqlName: string, data: object): Promise<ExecuteSql>;
     count(sqlName: string, data?: any): Promise<number>;