@asla/yoursql 0.0.3 → 0.0.4

package/dist/mod.js

@@ -65,6 +65,16 @@ class SqlValuesCreator {
      */
     constructor(map = new Map()) {
         this.map = map;
+        const fn = (value) => this.toSqlStr(value);
+        Reflect.setPrototypeOf(fn, this);
+        return fn;
+    }
+    /** 设置转换器 */
+    setTransformer(type, transformer) {
+        if (!transformer)
+            this.map.delete(type);
+        else
+            this.map.set(type, transformer);
     }
     string(value) {
         return SqlValuesCreator.string(value);
@@ -72,7 +82,9 @@ class SqlValuesCreator {
     number(value) {
         return value.toString();
     }
-    /** 将 JS 对象转为 SQL 的字符值的形式 */
+    /**
+     * 将 JS 对象转为 SQL 的字符值的形式
+     */
     toSqlStr(value) {
         switch (typeof value) {
             case "bigint":
@@ -93,14 +105,18 @@ class SqlValuesCreator {
                     if (value instanceof Class)
                         return this.map.get(Class).call(this, value);
                 }
-                return this.string(JSON.stringify(value));
+                return this.defaultObject(value);
+            case "undefined":
+                return "NULL";
             default:
+                //function、symbol
                 let type = typeof value;
-                if (type === "object")
-                    type = value.constructor?.name ?? "object";
                 throw new Error("不支持转换 " + type + " 类型");
         }
     }
+    defaultObject(value) {
+        return this.string(JSON.stringify(value));
+    }
     objectListToValuesList(objectList, keys_types) {
         if (objectList.length <= 0)
             throw new Error("objectList 不能是空数组");
@@ -203,8 +219,8 @@ function getKeys(objectList) {
  * PgSql的值转换
  */
 class PgSqlValue extends SqlValuesCreator {
-    constructor() {
-        const map = new Map();
+    constructor(custom) {
+        const map = new Map(custom);
         map.set(Array, PgSqlValue.prototype.array);
         map.set(Date, PgSqlValue.prototype.timestamp);
         super(map);
@@ -587,7 +603,7 @@ class DbTableQuery extends DbTable {
         }
         else if (values instanceof SqlQueryStatement) {
             // todo 验证 values.columns 和 this.columns 是否匹配
-            valuesStr = values.toSelect();
+            valuesStr = values.toString();
             insertCol = values.columns;
         }
         else

package/dist/sql_value/db_type.d.ts

@@ -1,10 +1,10 @@
-import { SqlValuesCreator } from "./sql_value.ts";
+import { SqlValuesCreator, JsObjectMapSql } from "./sql_value.ts";
 /**
  * @public
  * PgSql的值转换
  */
 export declare class PgSqlValue extends SqlValuesCreator {
-    constructor();
+    constructor(custom?: JsObjectMapSql);
     timestamp(value: Date): string;
     array(value: any[]): string;
 }

package/dist/sql_value/sql_value.d.ts

@@ -11,7 +11,14 @@ export declare class SqlRaw<T = any> {
     [SQL_RAW]: T;
 }
 /** @public */
-export type JsObjectMapSql = Map<new (...args: any[]) => any, (value: object) => string>;
+export type JsObjectMapSql = Map<new (...args: any[]) => any, (value: any) => string>;
+/**
+ * @public
+ */
+export interface SqlValuesCreator {
+    /** 将 JS 对象转为 SQL 的字符值的形式 */
+    (value: any): string;
+}
 /**
  * SQL value 生成器
  * @public
@@ -26,11 +33,16 @@ export declare class SqlValuesCreator {
      * @param map - 自定义对象转换
      */
     constructor(map?: JsObjectMapSql);
+    /** 设置转换器 */
+    setTransformer<T>(type: new (...args: any[]) => T, transformer?: (value: T) => string): void;
     private readonly map;
     string(value: string): string;
     number(value: number | bigint): string;
-    /** 将 JS 对象转为 SQL 的字符值的形式 */
+    /**
+     * 将 JS 对象转为 SQL 的字符值的形式
+     */
     toSqlStr(value: any): string;
+    protected defaultObject(value: object): string;
     /**
      * 将对象列表转为 SQL 的 VALUES
      * @example 返回示例： " (...),(...) "

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asla/yoursql",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "",
   "type": "module",
   "types": "./dist/mod.d.ts",