@eggjs/dal-runtime 4.0.0-beta.34 → 4.0.0-beta.36

package/dist/TableSqlMap.js

@@ -1,89 +1,85 @@
-import { Template } from 'nunjucks';
-import { SqlType } from '@eggjs/tegg-types';
-import { NunjucksUtils } from "./NunjucksUtil.js";
 import { TemplateUtil } from "./TemplateUtil.js";
-export class TableSqlMap {
-    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);
-    }
-    #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;
-        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;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFibGVTcWxNYXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvVGFibGVTcWxNYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUNwQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHNUMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQVFqRCxNQUFNLE9BQU8sV0FBVztJQUNiLElBQUksQ0FBUztJQUNMLEdBQUcsQ0FBeUI7SUFDNUIsTUFBTSxDQUF5QjtJQUMvQixZQUFZLENBQStCO0lBRTVELFlBQVksSUFBWSxFQUFFLEdBQTJCO1FBQ25ELElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ2pCLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBRWYsTUFBTSxHQUFHLEdBQUcsYUFBYSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMxQyxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUMxQyxJQUFJLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxNQUFNLENBQUM7UUFDL0IsSUFBSSxDQUFDLFlBQVksR0FBRyxTQUFTLENBQUMsWUFBWSxDQUFDO1FBRTNDLEtBQUssTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQzlCLHFCQUFxQjtZQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDO2dCQUFFLFNBQVM7WUFDL0MsR0FBRyxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ3ZDLENBQUM7UUFFRCxHQUFHLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0MsR0FBRyxDQUFDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQy9DLEdBQUcsQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM3QyxHQUFHLENBQUMsU0FBUyxDQUFDLFdBQVcsRUFBRSxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDbkQsR0FBRyxDQUFDLFNBQVMsQ0FBQyxZQUFZLEVBQUUsWUFBWSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3JELEdBQUcsQ0FBQyxTQUFTLENBQUMsY0FBYyxFQUFFLFlBQVksQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUN6RCxHQUFHLENBQUMsU0FBUyxDQUFDLGFBQWEsRUFBRSxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDdkQsR0FBRyxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsRUFBRSxZQUFZLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDN0QsR0FBRyxDQUFDLFNBQVMsQ0FBQyxzQkFBc0IsRUFBRSxZQUFZLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUMzRSxDQUFDO0lBRUQsUUFBUSxDQUFDLEdBQTJCO1FBQ2xDLE1BQU0sR0FBRyxHQUFHO1lBQ1YsTUFBTSxFQUFFLEVBQUU7WUFDVixZQUFZLEVBQUUsRUFBRTtTQUlqQixDQUFDO1FBRUYsS0FBSyxNQUFNLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUN0QixxQkFBcUI7WUFDckIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDO2dCQUFFLFNBQVM7WUFFdkMsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBRXhCLFFBQVEsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDO2dCQUNwQixLQUFLLE9BQU8sQ0FBQyxLQUFLO29CQUNoQixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxPQUFPLElBQUksRUFBRSxDQUFDO29CQUN2QyxNQUFNO2dCQUNSLEtBQUssT0FBTyxDQUFDLE1BQU0sQ0FBQztnQkFDcEIsS0FBSyxPQUFPLENBQUMsTUFBTSxDQUFDO2dCQUNwQixLQUFLLE9BQU8sQ0FBQyxNQUFNLENBQUM7Z0JBQ3BCLEtBQUssT0FBTyxDQUFDLE1BQU0sQ0FBQztnQkFDcEI7b0JBQ0UsR0FBRyxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsR0FBRzt3QkFDdEIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJO3dCQUNqQixRQUFRLEVBQUUsYUFBYSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxNQUFNLENBQUMsR0FBRyxJQUFJLEVBQUUsQ0FBQzt3QkFDakUsR0FBRyxFQUFFLE1BQU0sQ0FBQyxHQUFHO3FCQUNoQixDQUFDO29CQUNGLE1BQU07WUFDVixDQUFDO1FBQ0gsQ0FBQztRQUVELE9BQU8sR0FBRyxDQUFDO0lBQ2IsQ0FBQztJQUVELFFBQVEsQ0FBQyxJQUFZLEVBQUUsSUFBWSxFQUFFLFFBQWdCO1FBQ25ELE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDMUMscUJBQXFCO1FBQ3JCLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNmLE1BQU0sSUFBSSxLQUFLLENBQUMscUJBQXFCLElBQUksU0FBUyxJQUFJLElBQUksQ0FBQyxDQUFDO1FBQzlELENBQUM7UUFFRCxNQUFNLFFBQVEsR0FBRyxTQUFTLENBQUMsUUFBUSxDQUFDO1FBQ25DLFFBQWdCLENBQUMsR0FBRyxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7UUFDMUMsT0FBTyxRQUFRLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQy9CLENBQUM7SUFFRCxPQUFPLENBQUMsSUFBWTtRQUNsQixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzFDLHFCQUFxQjtRQUNyQixJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDZixNQUFNLElBQUksS0FBSyxDQUFDLHFCQUFxQixJQUFJLFNBQVMsSUFBSSxJQUFJLENBQUMsQ0FBQztRQUM5RCxDQUFDO1FBRUQsT0FBTyxTQUFTLENBQUMsSUFBSSxDQUFDO0lBQ3hCLENBQUM7SUFFRCxpQkFBaUIsQ0FBQyxJQUFZO1FBQzVCLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDMUMscUJBQXFCO1FBQ3JCLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNmLE1BQU0sSUFBSSxLQUFLLENBQUMscUJBQXFCLElBQUksU0FBUyxJQUFJLElBQUksQ0FBQyxDQUFDO1FBQzlELENBQUM7UUFFRCxPQUFPLFNBQVMsQ0FBQyxHQUFHLENBQUM7SUFDdkIsQ0FBQztDQUNGIn0=
+import { NunjucksUtils } from "./NunjucksUtil.js";
+import { SqlType } from "@eggjs/tegg-types";
+import { Template } from "nunjucks";
+
+//#region src/TableSqlMap.ts
+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);
+	}
+	#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;
+		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;
+	}
+};
+
+//#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 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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
+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;
+	}
+};
+
+//#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, 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, 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,36 +1,39 @@
 {
   "name": "@eggjs/dal-runtime",
-  "version": "4.0.0-beta.34",
+  "version": "4.0.0-beta.36",
   "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/egg/tree/next/tegg/core/dal-runtime",
   "bugs": {
     "url": "https://github.com/eggjs/egg/issues"
   },
+  "license": "MIT",
+  "author": "killagu <killa123@126.com>",
   "repository": {
     "type": "git",
-    "url": "git@github.com:eggjs/egg.git",
+    "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",
@@ -39,30 +42,23 @@
     "nunjucks": "^3.2.4",
     "sdk-base": "^5.0.1",
     "sqlstring": "^2.3.3",
-    "@eggjs/core-decorator": "4.0.0-beta.34",
-    "@eggjs/tegg-types": "4.0.0-beta.34",
-    "@eggjs/tegg-loader": "4.0.0-beta.34",
-    "@eggjs/dal-decorator": "4.0.0-beta.34"
+    "@eggjs/core-decorator": "4.0.0-beta.36",
+    "@eggjs/tegg-loader": "4.0.0-beta.36",
+    "@eggjs/dal-decorator": "4.0.0-beta.36",
+    "@eggjs/tegg-types": "4.0.0-beta.36"
   },
   "devDependencies": {
     "@types/js-beautify": "^1.14.3",
     "@types/lodash": "^4.17.20",
-    "@types/node": "^24.9.1",
+    "@types/node": "^24.10.2",
     "@types/nunjucks": "^3.2.6",
     "@types/sqlstring": "^2.3.2",
-    "typescript": "^5.9.3",
-    "tsdown": "0.15.11",
-    "unplugin-unused": "^0.5.4"
+    "typescript": "^5.9.3"
   },
-  "publishConfig": {
-    "access": "public"
+  "engines": {
+    "node": ">=22.18.0"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "scripts": {
-    "clean": "rimraf dist *.tsbuildinfo",
-    "build": "tsdown && npm run clean && tsc -p tsconfig.build.json",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsgo --noEmit"
   }
 }