@asla/yoursql 0.0.4 → 0.0.5

package/dist/mod.js

@@ -76,36 +76,40 @@ class SqlValuesCreator {
         else
             this.map.set(type, transformer);
     }
+    /** @deprecated 已废弃，改用 toSqlStr(value, "string") */
     string(value) {
         return SqlValuesCreator.string(value);
     }
+    /** @deprecated 已废弃，改用 toSqlStr(value, "number") */
     number(value) {
         return value.toString();
     }
     /**
      * 将 JS 对象转为 SQL 的字符值的形式
      */
-    toSqlStr(value) {
-        switch (typeof value) {
+    toSqlStr(value, expectType) {
+        let basicType;
+        if (expectType) {
+            if (typeof expectType === "function") {
+                return this.map.get(expectType).call(this, value, this.map);
+            }
+            else {
+                basicType = expectType;
+            }
+        }
+        else
+            basicType = typeof value;
+        switch (basicType) {
             case "bigint":
-                return this.number(value);
+                return value.toString();
             case "number":
-                return this.number(value);
+                return value.toString();
             case "string":
-                return this.string(value);
+                return SqlValuesCreator.string(value);
             case "boolean":
                 return value.toString();
             case "object":
-                if (value === null)
-                    return "NULL";
-                if (value instanceof SqlRaw) {
-                    return value.toString();
-                }
-                for (const Class of this.map.keys()) {
-                    if (value instanceof Class)
-                        return this.map.get(Class).call(this, value);
-                }
-                return this.defaultObject(value);
+                return this.toObjectStr(value);
             case "undefined":
                 return "NULL";
             default:
@@ -114,15 +118,26 @@ class SqlValuesCreator {
                 throw new Error("不支持转换 " + type + " 类型");
         }
     }
+    toObjectStr(value) {
+        if (value === null)
+            return "NULL";
+        if (value instanceof SqlRaw)
+            return value.toString();
+        for (const Class of this.map.keys()) {
+            if (value instanceof Class)
+                return this.map.get(Class).call(this, value, this.map);
+        }
+        return this.defaultObject(value);
+    }
     defaultObject(value) {
-        return this.string(JSON.stringify(value));
+        return SqlValuesCreator.string(JSON.stringify(value));
     }
     objectListToValuesList(objectList, keys_types) {
         if (objectList.length <= 0)
             throw new Error("objectList 不能是空数组");
         let keys;
         if (!keys_types) {
-            keys = getKeys(objectList);
+            keys = getObjectListKeys(objectList, true);
         }
         else if (keys_types instanceof Array) {
             keys = keys_types;
@@ -180,7 +195,7 @@ class SqlValuesCreator {
      * @example 返回示例： " 'abc', '6', 'now()' "
      */
     toValues(values) {
-        return values.map(this.toSqlStr.bind(this)).join(",");
+        return values.map((v) => this.toSqlStr(v)).join(",");
     }
 }
 function toKeyType(object, keys_types) {
@@ -199,7 +214,10 @@ function toKeyType(object, keys_types) {
     }
     return { type, keys };
 }
-function getKeys(objectList) {
+/**
+ * @public
+ */
+function getObjectListKeys(objectList, keepNull) {
     let keys = new Set();
     for (let i = 0; i < objectList.length; i++) {
         let obj = objectList[i];
@@ -207,29 +225,41 @@ function getKeys(objectList) {
         let k;
         for (let j = 0; j < hasKeys.length; j++) {
             k = hasKeys[j];
-            if (obj[k] !== undefined && typeof k === "string")
-                keys.add(k);
+            if (keepNull && obj[k] === null)
+                continue;
+            if (obj[k] === undefined || typeof k !== "string")
+                continue;
+            keys.add(k);
         }
     }
     return Array.from(keys);
 }
 
+/** @public PgSql 转换器 */
+const pgSqlTransformer = new Map([
+    [
+        Array,
+        function encodePgArray(value) {
+            return "ARRAY[" + value.map(this).join(", ") + "]";
+        },
+    ],
+    [Date, (value) => SqlValuesCreator.string(value.toISOString())],
+]);
 /**
  * @public
+ * @deprecated 已废弃
  * PgSql的值转换
  */
 class PgSqlValue extends SqlValuesCreator {
     constructor(custom) {
-        const map = new Map(custom);
-        map.set(Array, PgSqlValue.prototype.array);
-        map.set(Date, PgSqlValue.prototype.timestamp);
+        const map = new Map(custom ? [...pgSqlTransformer, ...custom] : pgSqlTransformer);
         super(map);
     }
     timestamp(value) {
         return SqlValuesCreator.string(value.toISOString());
     }
     array(value) {
-        return "ARRAY[" + value.map(this.toSqlStr.bind(this)).join(", ") + "]";
+        return this.toSqlStr(value, Array);
     }
 }
 
@@ -681,4 +711,4 @@ function genWhere(where) {
     return "\nWHERE " + where;
 }
 
-export { DbTable, DbTableQuery, PgSqlValue, SqlQueryStatement, SqlRaw, SqlSelectable, SqlValuesCreator, createSelect };
+export { DbTable, DbTableQuery, PgSqlValue, SqlQueryStatement, SqlRaw, SqlSelectable, SqlValuesCreator, createSelect, getObjectListKeys, pgSqlTransformer };

package/dist/select/selectable.d.ts

@@ -23,7 +23,7 @@ export declare abstract class SqlSelectable<T extends TableType> {
     /** 获取 SQL 语句 */
     abstract toString(): string;
     /** 保留以推断类型 */
-    [SQL_SELECTABLE]: T;
+    private [SQL_SELECTABLE];
 }
 /**
  * 数据库表

package/dist/sql_value/db_type.d.ts

@@ -1,6 +1,9 @@
 import { SqlValuesCreator, JsObjectMapSql } from "./sql_value.ts";
+/** @public PgSql 转换器 */
+export declare const pgSqlTransformer: JsObjectMapSql;
 /**
  * @public
+ * @deprecated 已废弃
  * PgSql的值转换
  */
 export declare class PgSqlValue extends SqlValuesCreator {

package/dist/sql_value/sql_value.d.ts

@@ -8,10 +8,12 @@ export declare class SqlRaw<T = any> {
     constructor(value: string);
     toString(): string;
     /** 保留以推断类型 */
-    [SQL_RAW]: T;
+    private [SQL_RAW];
 }
 /** @public */
-export type JsObjectMapSql = Map<new (...args: any[]) => any, (value: any) => string>;
+export type JsObjectMapSql = Map<new (...args: any[]) => any, SqlValueEncoder>;
+/** @public */
+export type SqlValueEncoder<T = any> = (this: SqlValuesCreator, value: T, map: JsObjectMapSql) => string;
 /**
  * @public
  */
@@ -34,14 +36,17 @@ export declare class SqlValuesCreator {
      */
     constructor(map?: JsObjectMapSql);
     /** 设置转换器 */
-    setTransformer<T>(type: new (...args: any[]) => T, transformer?: (value: T) => string): void;
+    setTransformer<T>(type: new (...args: any[]) => T, transformer?: SqlValueEncoder): void;
     private readonly map;
+    /** @deprecated 已废弃，改用 toSqlStr(value, "string") */
     string(value: string): string;
+    /** @deprecated 已废弃，改用 toSqlStr(value, "number") */
     number(value: number | bigint): string;
     /**
      * 将 JS 对象转为 SQL 的字符值的形式
      */
-    toSqlStr(value: any): string;
+    toSqlStr(value: any, expectType?: "bigint" | "number" | "string" | "boolean" | (new (...args: any[]) => any)): string;
+    protected toObjectStr(value: object): string;
     protected defaultObject(value: object): string;
     /**
      * 将对象列表转为 SQL 的 VALUES
@@ -65,5 +70,9 @@ export declare class SqlValuesCreator {
      */
     toValues(values: readonly any[]): string;
 }
+/**
+ * @public
+ */
+export declare function getObjectListKeys(objectList: any[], keepNull?: boolean): string[];
 export {};
 //# sourceMappingURL=sql_value.d.ts.map

package/package.json

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