@asla/yoursql 0.1.2 → 0.3.0

package/dist/mod.js

@@ -75,6 +75,12 @@ _SqlRaw_value = new WeakMap();
  * @public
  */
 class SqlValuesCreator {
+    static create(map) {
+        const obj = new this(map);
+        const fn = obj.toSqlStr.bind(obj);
+        Reflect.setPrototypeOf(fn, obj);
+        return fn;
+    }
     /**
      * 将字符串转为 SQL 的字符串值的形式(单引号会被转义)。
      * @example 输入 a'b'c , 返回 a''b''c.
@@ -87,10 +93,6 @@ class SqlValuesCreator {
      */
     constructor(map = new Map()) {
         this.map = map;
-        const fn = this.toSqlStr.bind(this);
-        this.toSqlStr = fn;
-        Reflect.setPrototypeOf(fn, this);
-        return fn;
     }
     /** 设置转换器 */
     setTransformer(type, transformer) {
@@ -104,7 +106,10 @@ class SqlValuesCreator {
         let basicType;
         if (expectType) {
             if (typeof expectType === "function") {
-                return this.map.get(expectType).call(this, value, this.map);
+                let type = this.map.get(expectType);
+                if (!type)
+                    throw new Error("类型不存在");
+                return type.call(this, value);
             }
             else {
                 basicType = expectType;
@@ -121,8 +126,13 @@ class SqlValuesCreator {
                 return SqlValuesCreator.string(value);
             case "boolean":
                 return value.toString();
-            case "object":
-                return this.toObjectStr(value);
+            case "object": {
+                if (value === null)
+                    return "NULL";
+                if (value instanceof SqlRaw)
+                    return value.toString();
+                return this.getObjectType(value).call(this, value);
+            }
             case "undefined":
                 return "DEFAULT";
             default:
@@ -131,16 +141,13 @@ class SqlValuesCreator {
                 throw new Error("不支持转换 " + type + " 类型");
         }
     }
-    toObjectStr(value) {
-        if (value === null)
-            return "NULL";
-        if (value instanceof SqlRaw)
-            return value.toString();
+    /** 获取值对应的 SqlValueEncoder */
+    getObjectType(value) {
         for (const Class of this.map.keys()) {
             if (value instanceof Class)
-                return this.map.get(Class).call(this, value, this.map);
+                return this.map.get(Class);
         }
-        return this.defaultObject(value);
+        return this.defaultObject;
     }
     defaultObject(value) {
         return SqlValuesCreator.string(JSON.stringify(value));
@@ -233,7 +240,20 @@ const pgSqlTransformer = new Map([
     [
         Array,
         function encodePgArray(value) {
-            return "ARRAY[" + value.map(this).join(", ") + "]";
+            if (value.length === 0)
+                return "NULL";
+            const valueStr = [];
+            let type;
+            let basicType;
+            for (let i = 0; i < value.length; i++) {
+                {
+                    basicType = typeof value[i];
+                    if (value[i] === null || basicType === "undefined")
+                        basicType = undefined;
+                    valueStr[i] = this.toSqlStr(value[i], type);
+                }
+            }
+            return "ARRAY[" + valueStr.join(",") + "]";
         },
     ],
     [Date, (value) => SqlValuesCreator.string(value.toISOString())],
@@ -646,7 +666,7 @@ class DbTableQuery extends DbTable {
         for (const [k, v] of updateKey) {
             if (v === undefined)
                 continue;
-            setList.push(k + " = " + this.statement(v));
+            setList.push(k + " = " + this.statement.toSqlStr(v));
         }
         let sql = `UPDATE ${this.name}\nSET ${setList.join(",\n")}`;
         if (where)

package/dist/sql_value/sql_value.d.ts

@@ -13,13 +13,11 @@ export declare class SqlRaw<T = any> {
 /** @public */
 export type JsObjectMapSql = Map<new (...args: any[]) => any, SqlValueEncoder>;
 /** @public */
-export type SqlValueEncoder<T = any> = (this: SqlValuesCreator, value: T, map: JsObjectMapSql) => string;
+export type SqlValueEncoder<T = any> = (this: SqlValuesCreator, value: T) => string;
 /** @public */
-export type ManualType = "bigint" | "number" | "string" | "boolean" | (new (...args: any[]) => any);
-/**
- * @public
- */
-export interface SqlValuesCreator {
+export type ManualType = "bigint" | "number" | "string" | "boolean" | "object" | (new (...args: any[]) => any);
+/** @public */
+export interface SqlValueFn {
     /** 将 JS 对象转为 SQL 的字符值的形式 。 undefined 将被转换为 DEFAULT */
     (value: any, expectType?: ManualType): string;
 }
@@ -28,6 +26,7 @@ export interface SqlValuesCreator {
  * @public
  */
 export declare class SqlValuesCreator {
+    static create(map?: JsObjectMapSql): SqlValuesCreator & SqlValueFn;
     /**
      * 将字符串转为 SQL 的字符串值的形式(单引号会被转义)。
      * @example 输入 a'b'c , 返回 a''b''c.
@@ -41,8 +40,9 @@ export declare class SqlValuesCreator {
     setTransformer<T>(type: new (...args: any[]) => T, transformer?: SqlValueEncoder): void;
     private readonly map;
     /** 将 JS 对象转为 SQL 的字符值的形式 。 undefined 将被转换为 DEFAULT */
-    protected toSqlStr(value: any, expectType?: "bigint" | "number" | "string" | "boolean" | (new (...args: any[]) => any)): string;
-    protected toObjectStr(value: object): string;
+    toSqlStr(value: any, expectType?: ManualType): string;
+    /** 获取值对应的 SqlValueEncoder */
+    getObjectType(value: object): SqlValueEncoder;
     protected defaultObject(value: object): string;
     /**
      * 将对象列表转为 SQL 的 VALUES

package/package.json

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