@eggjs/dal-runtime 4.0.0-beta.9 → 4.0.1-beta.0

package/dist/TableSqlMap.js

@@ -1,92 +1,98 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _TableSqlMap_instances, _TableSqlMap_extract;
-import { Template } from 'nunjucks';
-import { SqlType } from '@eggjs/tegg-types';
-import { NunjucksUtils } from "./NunjucksUtil.js";
 import { TemplateUtil } from "./TemplateUtil.js";
-export class TableSqlMap {
-    constructor(name, map) {
-        _TableSqlMap_instances.add(this);
-        this.name = name;
-        this.map = map;
-        const env = NunjucksUtils.createEnv(name);
-        const extracted = __classPrivateFieldGet(this, _TableSqlMap_instances, "m", _TableSqlMap_extract).call(this, this.map);
-        this.blocks = extracted.blocks;
-        this.sqlGenerator = extracted.sqlGenerator;
-        for (const key in this.blocks) {
-            // istanbul ignore if
-            if (!this.blocks.hasOwnProperty(key))
-                continue;
-            env.addGlobal(key, this.blocks[key]);
-        }
-        env.addFilter('toJson', TemplateUtil.toJson);
-        env.addFilter('toPoint', TemplateUtil.toPoint);
-        env.addFilter('toLine', TemplateUtil.toLine);
-        env.addFilter('toPolygon', TemplateUtil.toPolygon);
-        env.addFilter('toGeometry', TemplateUtil.toGeometry);
-        env.addFilter('toMultiPoint', TemplateUtil.toMultiPoint);
-        env.addFilter('toMultiLine', TemplateUtil.toMultiLine);
-        env.addFilter('toMultiPolygon', TemplateUtil.toMultiPolygon);
-        env.addFilter('toGeometryCollection', TemplateUtil.toGeometryCollection);
-    }
-    generate(name, data, timezone) {
-        const generator = this.sqlGenerator[name];
-        // istanbul ignore if
-        if (!generator) {
-            throw new Error(`No sql map named '${name}' in '${name}'.`);
-        }
-        const template = generator.template;
-        template.env.timezone = timezone;
-        return template.render(data);
-    }
-    getType(name) {
-        const generator = this.sqlGenerator[name];
-        // istanbul ignore if
-        if (!generator) {
-            throw new Error(`No sql map named '${name}' in '${name}'.`);
-        }
-        return generator.type;
-    }
-    getTemplateString(name) {
-        const generator = this.sqlGenerator[name];
-        // istanbul ignore if
-        if (!generator) {
-            throw new Error(`No sql map named '${name}' in '${name}'.`);
-        }
-        return generator.raw;
-    }
-}
-_TableSqlMap_instances = new WeakSet(), _TableSqlMap_extract = function _TableSqlMap_extract(map) {
-    const ret = {
-        blocks: {},
-        sqlGenerator: {},
-    };
-    for (const key in map) {
-        // istanbul ignore if
-        if (!map.hasOwnProperty(key))
-            continue;
-        const sqlMap = map[key];
-        switch (sqlMap.type) {
-            case SqlType.BLOCK:
-                ret.blocks[key] = sqlMap.content || '';
-                break;
-            case SqlType.INSERT:
-            case SqlType.SELECT:
-            case SqlType.UPDATE:
-            case SqlType.DELETE:
-            default:
-                ret.sqlGenerator[key] = {
-                    type: sqlMap.type,
-                    template: NunjucksUtils.compile(this.name, key, sqlMap.sql || ''),
-                    raw: sqlMap.sql,
-                };
-                break;
-        }
-    }
-    return ret;
+import { NunjucksUtils } from "./NunjucksUtil.js";
+import { SqlType } from "@eggjs/tegg-types";
+import { Template } from "nunjucks";
+
+//#region src/TableSqlMap.ts
+const SQL_PARAMS = "$$__sql_params";
+var TableSqlMap = class {
+	name;
+	map;
+	blocks;
+	sqlGenerator;
+	constructor(name, map) {
+		this.name = name;
+		this.map = map;
+		const env = NunjucksUtils.createEnv(name);
+		const extracted = this.#extract(this.map);
+		this.blocks = extracted.blocks;
+		this.sqlGenerator = extracted.sqlGenerator;
+		for (const key in this.blocks) {
+			// istanbul ignore if
+			if (!this.blocks.hasOwnProperty(key)) continue;
+			env.addGlobal(key, this.blocks[key]);
+		}
+		env.addFilter("toJson", TemplateUtil.toJson);
+		env.addFilter("toPoint", TemplateUtil.toPoint);
+		env.addFilter("toLine", TemplateUtil.toLine);
+		env.addFilter("toPolygon", TemplateUtil.toPolygon);
+		env.addFilter("toGeometry", TemplateUtil.toGeometry);
+		env.addFilter("toMultiPoint", TemplateUtil.toMultiPoint);
+		env.addFilter("toMultiLine", TemplateUtil.toMultiLine);
+		env.addFilter("toMultiPolygon", TemplateUtil.toMultiPolygon);
+		env.addFilter("toGeometryCollection", TemplateUtil.toGeometryCollection);
+		env.addFilter("param", function(value) {
+			if (this.ctx[SQL_PARAMS]) this.ctx[SQL_PARAMS].push(value);
+			return "?";
+		});
+	}
+	#extract(map) {
+		const ret = {
+			blocks: {},
+			sqlGenerator: {}
+		};
+		for (const key in map) {
+			// istanbul ignore if
+			if (!map.hasOwnProperty(key)) continue;
+			const sqlMap = map[key];
+			switch (sqlMap.type) {
+				case SqlType.BLOCK:
+					ret.blocks[key] = sqlMap.content || "";
+					break;
+				case SqlType.INSERT:
+				case SqlType.SELECT:
+				case SqlType.UPDATE:
+				case SqlType.DELETE:
+				default:
+					ret.sqlGenerator[key] = {
+						type: sqlMap.type,
+						template: NunjucksUtils.compile(this.name, key, sqlMap.sql || ""),
+						raw: sqlMap.sql
+					};
+					break;
+			}
+		}
+		return ret;
+	}
+	generate(name, data, timezone) {
+		const generator = this.sqlGenerator[name];
+		// istanbul ignore if
+		if (!generator) throw new Error(`No sql map named '${name}' in '${name}'.`);
+		const template = generator.template;
+		const params = [];
+		template.env.timezone = timezone;
+		const context = {
+			...data,
+			[SQL_PARAMS]: params
+		};
+		return {
+			sql: template.render(context),
+			params
+		};
+	}
+	getType(name) {
+		const generator = this.sqlGenerator[name];
+		// istanbul ignore if
+		if (!generator) throw new Error(`No sql map named '${name}' in '${name}'.`);
+		return generator.type;
+	}
+	getTemplateString(name) {
+		const generator = this.sqlGenerator[name];
+		// istanbul ignore if
+		if (!generator) throw new Error(`No sql map named '${name}' in '${name}'.`);
+		return generator.raw;
+	}
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFibGVTcWxNYXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvVGFibGVTcWxNYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUNwQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHNUMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQVFqRCxNQUFNLE9BQU8sV0FBVztJQU10QixZQUFZLElBQVksRUFBRSxHQUEyQjs7UUFDbkQsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7UUFDakIsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFFZixNQUFNLEdBQUcsR0FBRyxhQUFhLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzFDLE1BQU0sU0FBUyxHQUFHLHVCQUFBLElBQUksb0RBQVMsTUFBYixJQUFJLEVBQVUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzFDLElBQUksQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLE1BQU0sQ0FBQztRQUMvQixJQUFJLENBQUMsWUFBWSxHQUFHLFNBQVMsQ0FBQyxZQUFZLENBQUM7UUFFM0MsS0FBSyxNQUFNLEdBQUcsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDOUIscUJBQXFCO1lBQ3JCLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUM7Z0JBQUUsU0FBUztZQUMvQyxHQUFHLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDdkMsQ0FBQztRQUVELEdBQUcsQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLFlBQVksQ0FBQyxNQUFN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
+
+//#endregion
+export { TableSqlMap };

package/dist/TemplateUtil.d.ts

@@ -1,19 +1,22 @@
-import { ColumnModel } from '@eggjs/dal-decorator';
-import { ColumnType } from '@eggjs/tegg-types';
-import type { Geometry, GeometryCollection, Line, MultiLine, MultiPoint, MultiPolygon, Point, Polygon } from '@eggjs/tegg-types';
-export declare class TemplateUtil {
-    static isSpatialType(columnModel: ColumnModel): boolean;
-    static importPath(tableModelPath: string, currentPath: string): string;
-    static dbTypeToTsType(columnType: ColumnType): string;
-    static toJson(value: any): string;
-    static toPoint(point: Point): string;
-    static toLine(val: Line): string;
-    static toPolygon(val: Polygon): string;
-    static toGeometry(val: Geometry): string;
-    static toMultiPoint(val: MultiPoint): string;
-    static toMultiLine(val: MultiLine): string;
-    static toMultiPolygon(val: MultiPolygon): string;
-    static toGeometryCollection(val: GeometryCollection): string;
-    static spatialFilter: Record<ColumnType, string>;
-    static getSpatialFilter(columnType: ColumnType): string;
+import { ColumnModel } from "@eggjs/dal-decorator";
+import { ColumnType, Geometry, GeometryCollection, Line, MultiLine, MultiPoint, MultiPolygon, Point, Polygon } from "@eggjs/tegg-types";
+
+//#region src/TemplateUtil.d.ts
+declare class TemplateUtil {
+  static isSpatialType(columnModel: ColumnModel): boolean;
+  static importPath(tableModelPath: string, currentPath: string): string;
+  static dbTypeToTsType(columnType: ColumnType): string;
+  static toJson(value: any): string;
+  static toPoint(point: Point): string;
+  static toLine(val: Line): string;
+  static toPolygon(val: Polygon): string;
+  static toGeometry(val: Geometry): string;
+  static toMultiPoint(val: MultiPoint): string;
+  static toMultiLine(val: MultiLine): string;
+  static toMultiPolygon(val: MultiPolygon): string;
+  static toGeometryCollection(val: GeometryCollection): string;
+  static spatialFilter: Record<ColumnType, string>;
+  static getSpatialFilter(columnType: ColumnType): string;
 }
+//#endregion
+export { TemplateUtil };

package/dist/TemplateUtil.js

@@ -1,86 +1,75 @@
-import path from 'node:path';
-import { ColumnModel, SpatialHelper } from '@eggjs/dal-decorator';
-import { ColumnType } from '@eggjs/tegg-types';
-export class TemplateUtil {
-    static isSpatialType(columnModel) {
-        switch (columnModel.type.type) {
-            case ColumnType.GEOMETRY:
-            case ColumnType.POINT:
-            case ColumnType.LINESTRING:
-            case ColumnType.POLYGON:
-            case ColumnType.MULTIPOINT:
-            case ColumnType.MULTILINESTRING:
-            case ColumnType.MULTIPOLYGON:
-            case ColumnType.GEOMETRYCOLLECTION: {
-                return true;
-            }
-            default: {
-                return false;
-            }
-        }
-    }
-    static importPath(tableModelPath, currentPath) {
-        return path.relative(currentPath, tableModelPath);
-    }
-    static dbTypeToTsType(columnType) {
-        return `ColumnTsType['${columnType}']`;
-    }
-    static toJson(value) {
-        return JSON.stringify(JSON.stringify(value));
-    }
-    static toPoint(point) {
-        if (typeof point.x !== 'number' || typeof point.y !== 'number') {
-            throw new Error(`invalidate point ${JSON.stringify(point)}`);
-        }
-        return `Point(${point.x}, ${point.y})`;
-    }
-    static toLine(val) {
-        const points = val.map(t => TemplateUtil.toPoint(t));
-        return `LINESTRING(${points.join(',')})`;
-    }
-    static toPolygon(val) {
-        const lines = val.map(t => TemplateUtil.toLine(t));
-        return `POLYGON(${lines.join(',')})`;
-    }
-    static toGeometry(val) {
-        const type = SpatialHelper.getGeometryType(val);
-        const filterName = TemplateUtil.getSpatialFilter(type);
-        return TemplateUtil[filterName](val);
-    }
-    static toMultiPoint(val) {
-        const points = val.map(t => TemplateUtil.toPoint(t));
-        return `MULTIPOINT(${points.join(',')})`;
-    }
-    static toMultiLine(val) {
-        const lines = val.map(t => TemplateUtil.toLine(t));
-        return `MULTILINESTRING(${lines.join(',')})`;
-    }
-    static toMultiPolygon(val) {
-        const polygon = val.map(t => TemplateUtil.toPolygon(t));
-        return `MULTIPOLYGON(${polygon.join(',')})`;
-    }
-    static toGeometryCollection(val) {
-        const geometries = val.map(t => {
-            return TemplateUtil.toGeometry(t);
-        });
-        return `GEOMETRYCOLLECTION(${geometries.join(',')})`;
-    }
-    static getSpatialFilter(columnType) {
-        const filter = TemplateUtil.spatialFilter[columnType];
-        if (!filter) {
-            throw new Error(`type ${columnType} is not spatial type`);
-        }
-        return filter;
-    }
-}
-TemplateUtil.spatialFilter = {
-    [ColumnType.POINT]: 'toPoint',
-    [ColumnType.LINESTRING]: 'toLine',
-    [ColumnType.POLYGON]: 'toPolygon',
-    [ColumnType.GEOMETRY]: 'toGeometry',
-    [ColumnType.MULTIPOINT]: 'toMultiPoint',
-    [ColumnType.MULTILINESTRING]: 'toMultiLine',
-    [ColumnType.MULTIPOLYGON]: 'toMultiPolygon',
-    [ColumnType.GEOMETRYCOLLECTION]: 'toGeometryCollection',
+import { ColumnModel, SpatialHelper } from "@eggjs/dal-decorator";
+import { ColumnType } from "@eggjs/tegg-types";
+import path from "node:path";
+
+//#region src/TemplateUtil.ts
+var TemplateUtil = class TemplateUtil {
+	static isSpatialType(columnModel) {
+		switch (columnModel.type.type) {
+			case ColumnType.GEOMETRY:
+			case ColumnType.POINT:
+			case ColumnType.LINESTRING:
+			case ColumnType.POLYGON:
+			case ColumnType.MULTIPOINT:
+			case ColumnType.MULTILINESTRING:
+			case ColumnType.MULTIPOLYGON:
+			case ColumnType.GEOMETRYCOLLECTION: return true;
+			default: return false;
+		}
+	}
+	static importPath(tableModelPath, currentPath) {
+		return path.relative(currentPath, tableModelPath);
+	}
+	static dbTypeToTsType(columnType) {
+		return `ColumnTsType['${columnType}']`;
+	}
+	static toJson(value) {
+		return JSON.stringify(JSON.stringify(value));
+	}
+	static toPoint(point) {
+		if (typeof point.x !== "number" || typeof point.y !== "number") throw new Error(`invalidate point ${JSON.stringify(point)}`);
+		return `Point(${point.x}, ${point.y})`;
+	}
+	static toLine(val) {
+		return `LINESTRING(${val.map((t) => TemplateUtil.toPoint(t)).join(",")})`;
+	}
+	static toPolygon(val) {
+		return `POLYGON(${val.map((t) => TemplateUtil.toLine(t)).join(",")})`;
+	}
+	static toGeometry(val) {
+		const type = SpatialHelper.getGeometryType(val);
+		return TemplateUtil[TemplateUtil.getSpatialFilter(type)](val);
+	}
+	static toMultiPoint(val) {
+		return `MULTIPOINT(${val.map((t) => TemplateUtil.toPoint(t)).join(",")})`;
+	}
+	static toMultiLine(val) {
+		return `MULTILINESTRING(${val.map((t) => TemplateUtil.toLine(t)).join(",")})`;
+	}
+	static toMultiPolygon(val) {
+		return `MULTIPOLYGON(${val.map((t) => TemplateUtil.toPolygon(t)).join(",")})`;
+	}
+	static toGeometryCollection(val) {
+		return `GEOMETRYCOLLECTION(${val.map((t) => {
+			return TemplateUtil.toGeometry(t);
+		}).join(",")})`;
+	}
+	static spatialFilter = {
+		[ColumnType.POINT]: "toPoint",
+		[ColumnType.LINESTRING]: "toLine",
+		[ColumnType.POLYGON]: "toPolygon",
+		[ColumnType.GEOMETRY]: "toGeometry",
+		[ColumnType.MULTIPOINT]: "toMultiPoint",
+		[ColumnType.MULTILINESTRING]: "toMultiLine",
+		[ColumnType.MULTIPOLYGON]: "toMultiPolygon",
+		[ColumnType.GEOMETRYCOLLECTION]: "toGeometryCollection"
+	};
+	static getSpatialFilter(columnType) {
+		const filter = TemplateUtil.spatialFilter[columnType];
+		if (!filter) throw new Error(`type ${columnType} is not spatial type`);
+		return filter;
+	}
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVtcGxhdGVVdGlsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL1RlbXBsYXRlVXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLElBQUksTUFBTSxXQUFXLENBQUM7QUFFN0IsT0FBTyxFQUFFLFdBQVcsRUFBRSxhQUFhLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFZL0MsTUFBTSxPQUFPLFlBQVk7SUFDdkIsTUFBTSxDQUFDLGFBQWEsQ0FBQyxXQUF3QjtRQUMzQyxRQUFRLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDOUIsS0FBSyxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQ3pCLEtBQUssVUFBVSxDQUFDLEtBQUssQ0FBQztZQUN0QixLQUFLLFVBQVUsQ0FBQyxVQUFVLENBQUM7WUFDM0IsS0FBSyxVQUFVLENBQUMsT0FBTyxDQUFDO1lBQ3hCLEtBQUssVUFBVSxDQUFDLFVBQVUsQ0FBQztZQUMzQixLQUFLLFVBQVUsQ0FBQyxlQUFlLENBQUM7WUFDaEMsS0FBSyxVQUFVLENBQUMsWUFBWSxDQUFDO1lBQzdCLEtBQUssVUFBVSxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQztnQkFDbkMsT0FBTyxJQUFJLENBQUM7WUFDZCxDQUFDO1lBQ0QsT0FBTyxDQUFDLENBQUMsQ0FBQztnQkFDUixPQUFPLEtBQUssQ0FBQztZQUNmLENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQztJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsY0FBc0IsRUFBRSxXQUFtQjtRQUMzRCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLGNBQWMsQ0FBQyxDQUFDO0lBQ3BELENBQUM7SUFFRCxNQUFNLENBQUMsY0FBYyxDQUFDLFVBQXNCO1FBQzFDLE9BQU8saUJBQWlCLFVBQVUsSUFBSSxDQUFDO0lBQ3pDLENBQUM7SUFFRCxNQUFN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
+
+//#endregion
+export { TemplateUtil };

package/dist/index.d.ts

@@ -1,15 +1,15 @@
-export * from './BaseSqlMap.ts';
-export * from './CodeGenerator.ts';
-export * from './CodeGenerator.ts';
-export * from './DaoLoader.ts';
-export * from './DatabaseForker.ts';
-export * from './DataSource.ts';
-export * from './MySqlDataSource.ts';
-export * from './NunjucksConverter.ts';
-export * from './NunjucksUtil.ts';
-export * from './SqlGenerator.ts';
-export * from './SqlMapLoader.ts';
-export * from './SqlUtil.ts';
-export * from './TableModelInstanceBuilder.ts';
-export { TableSqlMap } from './TableSqlMap.ts';
-export * from './TemplateUtil.ts';
+import { BaseSqlMapGenerator } from "./BaseSqlMap.js";
+import { CodeGenerator } from "./CodeGenerator.js";
+import { DaoLoader } from "./DaoLoader.js";
+import { DataSourceOptions, EggQueryOptions, MysqlDataSource } from "./MySqlDataSource.js";
+import { DatabaseForker } from "./DatabaseForker.js";
+import { TableSqlMap } from "./TableSqlMap.js";
+import { DataSource, ExecuteSql } from "./DataSource.js";
+import { NunjucksConverter } from "./NunjucksConverter.js";
+import { NunjucksUtils } from "./NunjucksUtil.js";
+import { SqlGenerator } from "./SqlGenerator.js";
+import { SqlMapLoader } from "./SqlMapLoader.js";
+import { SqlUtil } from "./SqlUtil.js";
+import { TableModelInstanceBuilder } from "./TableModelInstanceBuilder.js";
+import { TemplateUtil } from "./TemplateUtil.js";
+export { BaseSqlMapGenerator, CodeGenerator, DaoLoader, DataSource, DataSourceOptions, DatabaseForker, EggQueryOptions, ExecuteSql, MysqlDataSource, NunjucksConverter, NunjucksUtils, SqlGenerator, SqlMapLoader, SqlUtil, TableModelInstanceBuilder, TableSqlMap, TemplateUtil };

package/dist/index.js

@@ -1,16 +1,16 @@
-export * from "./BaseSqlMap.js";
-export * from "./CodeGenerator.js";
-export * from "./CodeGenerator.js";
-export * from "./DaoLoader.js";
-export * from "./DatabaseForker.js";
-export * from "./DataSource.js";
-export * from "./MySqlDataSource.js";
-export * from "./NunjucksConverter.js";
-export * from "./NunjucksUtil.js";
-export * from "./SqlGenerator.js";
-export * from "./SqlMapLoader.js";
-export * from "./SqlUtil.js";
-export * from "./TableModelInstanceBuilder.js";
-export { TableSqlMap } from "./TableSqlMap.js";
-export * from "./TemplateUtil.js";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsZ0NBQWdDLENBQUM7QUFDL0MsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQy9DLGNBQWMsbUJBQW1CLENBQUMifQ==
+import { TemplateUtil } from "./TemplateUtil.js";
+import { BaseSqlMapGenerator } from "./BaseSqlMap.js";
+import { SqlGenerator } from "./SqlGenerator.js";
+import { CodeGenerator } from "./CodeGenerator.js";
+import { DaoLoader } from "./DaoLoader.js";
+import { MysqlDataSource } from "./MySqlDataSource.js";
+import { DatabaseForker } from "./DatabaseForker.js";
+import { TableModelInstanceBuilder } from "./TableModelInstanceBuilder.js";
+import { NunjucksConverter } from "./NunjucksConverter.js";
+import { SqlUtil } from "./SqlUtil.js";
+import { NunjucksUtils } from "./NunjucksUtil.js";
+import { TableSqlMap } from "./TableSqlMap.js";
+import { DataSource } from "./DataSource.js";
+import { SqlMapLoader } from "./SqlMapLoader.js";
+
+export { BaseSqlMapGenerator, CodeGenerator, DaoLoader, DataSource, DatabaseForker, MysqlDataSource, NunjucksConverter, NunjucksUtils, SqlGenerator, SqlMapLoader, SqlUtil, TableModelInstanceBuilder, TableSqlMap, TemplateUtil };

package/package.json

@@ -1,67 +1,64 @@
 {
   "name": "@eggjs/dal-runtime",
-  "version": "4.0.0-beta.9",
-  "description": "tegg dal decorator",
+  "version": "4.0.1-beta.0",
+  "description": "tegg dal runtime",
   "keywords": [
-    "egg",
-    "typescript",
+    "dal",
     "decorator",
+    "egg",
+    "runtime",
     "tegg",
-    "dal"
-  ],
-  "type": "module",
-  "exports": {
-    ".": "./dist/index.js",
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "dist"
+    "typescript"
   ],
-  "author": "killagu <killa123@126.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/eggjs/tegg/tree/next/core/dal-runtime",
+  "homepage": "https://github.com/eggjs/egg/tree/next/tegg/core/dal-runtime",
   "bugs": {
-    "url": "https://github.com/eggjs/tegg/issues"
+    "url": "https://github.com/eggjs/egg/issues"
   },
+  "license": "MIT",
+  "author": "killagu <killa123@126.com>",
   "repository": {
     "type": "git",
-    "url": "git@github.com:eggjs/tegg.git",
-    "directory": "core/dal-decorator"
+    "url": "git+https://github.com/eggjs/egg.git",
+    "directory": "tegg/core/dal-runtime"
   },
-  "engines": {
-    "node": ">=22.18.0"
+  "files": [
+    "dist"
+  ],
+  "type": "module",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": "./dist/index.js",
+    "./package.json": "./package.json"
+  },
+  "publishConfig": {
+    "access": "public"
   },
   "dependencies": {
-    "@eggjs/rds": "^1.3.0",
+    "@eggjs/rds": "^1.5.0",
     "js-beautify": "^1.15.3",
     "lodash": "^4.17.21",
     "nunjucks": "^3.2.4",
     "sdk-base": "^5.0.1",
     "sqlstring": "^2.3.3",
-    "@eggjs/core-decorator": "4.0.0-beta.9",
-    "@eggjs/dal-decorator": "4.0.0-beta.9",
-    "@eggjs/tegg-loader": "4.0.0-beta.9",
-    "@eggjs/tegg-types": "4.0.0-beta.9"
-  },
-  "publishConfig": {
-    "access": "public"
+    "@eggjs/core-decorator": "4.0.1-beta.0",
+    "@eggjs/dal-decorator": "4.0.1-beta.0",
+    "@eggjs/tegg-loader": "4.0.1-beta.0",
+    "@eggjs/tegg-types": "4.0.1-beta.0"
   },
   "devDependencies": {
     "@types/js-beautify": "^1.14.3",
     "@types/lodash": "^4.17.20",
-    "@types/node": "^22.10.5",
+    "@types/node": "^24.10.2",
     "@types/nunjucks": "^3.2.6",
     "@types/sqlstring": "^2.3.2",
-    "typescript": "^5.9.3",
-    "tsdown": "^0.15.6",
-    "unplugin-unused": "^0.5.3"
+    "typescript": "^5.9.3"
+  },
+  "engines": {
+    "node": ">=22.18.0"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "scripts": {
-    "clean": "rimraf dist",
-    "build": "tsdown && rimraf dist && tsc -b --clean && tsc",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsgo --noEmit"
   }
 }