@asla/yoursql 0.6.2 → 0.6.4

package/dist/mod.js

@@ -337,21 +337,28 @@ class SqlValuesCreator {
      *  v() 和 v.toSqlStr() 是等价的
      * ```
      */
-    toSqlStr(value, assertType) {
-        let basicType;
-        if (assertType) {
-            if (typeof assertType === "function") {
-                let type = this._map.get(assertType);
-                if (!type)
+    toSqlStr(value, assertJsType) {
+        if (value === null)
+            return "NULL";
+        else if (value === undefined)
+            return "DEFAULT";
+        let basicType = typeof value;
+        if (assertJsType) {
+            if (typeof assertJsType === "function") {
+                if (basicType !== "object")
+                    throw new AssertError("object", basicType);
+                let type = this._map.get(assertJsType);
+                if (!type) {
+                    if (assertJsType === Object)
+                        return this.defaultObject(value);
                     throw new Error("类型不存在");
+                }
                 return type.call(this, value);
             }
-            else {
-                basicType = assertType;
+            else if (basicType !== assertJsType) {
+                throw new AssertError(assertJsType, basicType);
             }
         }
-        else
-            basicType = typeof value;
         switch (basicType) {
             case "bigint":
                 return value.toString();
@@ -362,8 +369,6 @@ class SqlValuesCreator {
             case "boolean":
                 return value.toString();
             case "object": {
-                if (value === null)
-                    return "NULL";
                 if (value instanceof String)
                     return value.toString();
                 return this.getObjectType(value).call(this, value);
@@ -373,10 +378,13 @@ class SqlValuesCreator {
             default:
                 //function、symbol
                 let type = typeof value;
-                throw new Error("不支持转换 " + type + " 类型");
+                throw new Error("不支持 " + type + " 类型");
         }
     }
-    /** 获取值对应的 SqlValueEncoder */
+    /**
+     * @deprecated 已废弃
+     * 获取值对应的 SqlValueEncoder
+     */
     getObjectType(value) {
         for (const Class of this._map.keys()) {
             if (value instanceof Class)
@@ -384,6 +392,13 @@ class SqlValuesCreator {
         }
         return this.defaultObject;
     }
+    /** 获取值对应已定义的类 */
+    getClassType(value) {
+        for (const Class of this._map.keys()) {
+            if (value instanceof Class)
+                return Class;
+        }
+    }
     defaultObject(value) {
         return SqlValuesCreator.string(JSON.stringify(value));
     }
@@ -391,16 +406,20 @@ class SqlValuesCreator {
         if (objectList.length <= 0)
             throw new Error("objectList 不能是空数组");
         let keys;
+        let asserts;
         if (!keys_types) {
             keys = Array.from(getObjectListKeys(objectList, keepUndefinedKey));
+            asserts = [];
         }
         else if (keys_types instanceof Array) {
             keys = keys_types;
+            asserts = [];
         }
         else {
             keys = Object.keys(keys_types);
+            asserts = initColumnAssert(keys, keys_types);
         }
-        let str = "(" + this.objectToValues(objectList[0], keys_types ?? keys) + ")";
+        let str = "(" + this._internalObjectToValues(objectList[0], keys, asserts) + ")";
         let i = 1;
         let j;
         let value;
@@ -412,7 +431,7 @@ class SqlValuesCreator {
                 j = 0;
                 for (; j < keys.length; j++) {
                     value = object[keys[j]];
-                    rows[j] = this.toSqlStr(value);
+                    rows[j] = this.toSqlStr(value, asserts[j]?.assertJsType);
                 }
                 str += ",\n(" + rows.join(",") + ")";
             }
@@ -424,17 +443,38 @@ class SqlValuesCreator {
         return str;
     }
     objectToValues(object, keys_types) {
-        const { keys, type } = toKeyType(object, keys_types);
+        let type;
+        let keys;
+        if (keys_types instanceof Array) {
+            keys = keys_types;
+            type = [];
+        }
+        else if (keys_types) {
+            keys = Object.keys(keys_types);
+            type = initColumnAssert(keys, keys_types);
+        }
+        else {
+            keys = Object.keys(object);
+            type = [];
+        }
+        return this._internalObjectToValues(object, keys, type);
+    }
+    _internalObjectToValues(object, keys, type) {
         const values = [];
         let i = 0;
         let key;
         let value;
+        let assertType;
         try {
             for (; i < keys.length; i++) {
                 key = keys[i];
                 value = object[key];
-                if (type[key])
-                    values[i] = this.toSqlStr(value) + "::" + type[key];
+                assertType = type[i];
+                if (assertType) {
+                    values[i] = this.toSqlStr(value, assertType.assertJsType);
+                    if (assertType.sqlType)
+                        values[i] += "::" + assertType.sqlType;
+                }
                 else
                     values[i] = this.toSqlStr(value);
             }
@@ -462,24 +502,26 @@ class SqlValuesCreator {
             const column0 = new Array(insertKeys.length);
             let columnName;
             let item;
-            let type;
+            let sqlType;
+            let assertJsType;
             let value;
             for (let i = 0; i < insertKeys.length; i++) {
                 columnName = insertKeys[i];
                 item = valuesTypes[columnName];
                 if (typeof item === "string") {
-                    type = item;
+                    sqlType = item;
                     defaultValues[i] = "NULL";
                 }
                 else {
-                    type = item.sqlType;
+                    sqlType = item.sqlType;
+                    assertJsType = item.assertJsType;
                     defaultValues[i] = item.sqlDefault ?? "NULL";
                 }
                 value = values[0][columnName];
                 if (value === undefined)
-                    column0[i] = defaultValues[i] + "::" + type;
+                    column0[i] = defaultValues[i] + "::" + sqlType;
                 else
-                    column0[i] = this.toSqlStr(value) + "::" + type;
+                    column0[i] = this.toSqlStr(value, assertJsType) + "::" + sqlType;
             }
             valuesStr[0] = "(" + column0.join(",") + ")";
         }
@@ -516,21 +558,26 @@ class YourValuesAs extends SqlSelectable {
     }
 }
 _YourValuesAs_asName = new WeakMap(), _YourValuesAs_valuesStr = new WeakMap(), _YourValuesAs_sql = new WeakMap();
-function toKeyType(object, keys_types) {
-    let type = {};
-    let keys;
-    if (keys_types instanceof Array) {
-        keys = keys_types;
-        type = {};
-    }
-    else if (keys_types) {
-        keys = Object.keys(keys_types);
-        type = keys_types;
+function initColumnAssert(keys, keys_types) {
+    let key;
+    let value;
+    let type = new Array(keys.length);
+    for (let i = 0; i < keys.length; i++) {
+        key = keys[i];
+        value = keys_types[key];
+        if (typeof value === "string") {
+            type[i] = { sqlType: value };
+        }
+        else {
+            type[i] = value;
+        }
     }
-    else {
-        keys = Object.keys(object);
+    return type;
+}
+class AssertError extends TypeError {
+    constructor(assertType, actual) {
+        super(`Assert ${assertType} type, Actual ${actual} type`);
     }
-    return { type, keys };
 }
 
 /** @public PgSql 转换器 */
@@ -544,17 +591,30 @@ const pgSqlTransformer = new Map([
             let type;
             let basicType;
             for (let i = 0; i < value.length; i++) {
-                {
+                if (value[i] === null || value[i] === undefined)
+                    valueStr[i] = this.toSqlStr(value[i]);
+                else if (type) {
+                    valueStr[i] = this.toSqlStr(value[i], type);
+                }
+                else {
                     basicType = typeof value[i];
-                    if (value[i] === null || basicType === "undefined")
-                        basicType = undefined;
+                    if (basicType === "object") {
+                        type = this.getClassType(value[i]);
+                    }
+                    else
+                        type = basicType;
                     valueStr[i] = this.toSqlStr(value[i], type);
                 }
             }
             return "ARRAY[" + valueStr.join(",") + "]";
         },
     ],
-    [Date, (value) => SqlValuesCreator.string(value.toISOString())],
+    [
+        Date,
+        function (value) {
+            return SqlValuesCreator.string(value.toISOString());
+        },
+    ],
 ]);
 
 var _Selection_instances, _a, _Selection_sql, _Selection_join;

package/dist/sql_value/sql_value.d.ts

@@ -13,14 +13,20 @@ export type JsObjectMapSql = Map<new (...args: any[]) => any, SqlValueEncoder>;
 /** @public 将 js 值转为 SQl 字符串的函数*/
 export type SqlValueEncoder<T = any> = (this: SqlValuesCreator, value: T) => string;
 /** @public 断言类型 */
-export type ManualType = "bigint" | "number" | "string" | "boolean" | "object" | (new (...args: any[]) => any);
+export type AssertJsType = "bigint" | "number" | "string" | "boolean" | "object" | (new (...args: any[]) => any);
+/**
+ * @deprecated 改用 AssertJsType
+ * @public 断言类型
+ */
+export type ManualType = AssertJsType;
 /** @public */
 export type SqlValueFn = SqlValuesCreator & {
     /**
      * 安全将 JS 对象转为 SQL 的字符值的形式，可避免 SQL 注入。
      * undefined 将被转换为 DEFAULT
+     * @param assertType - 如果断言了基本类型，并且值的基本类型与断言的类型不一致，则会抛出异常。 如果不是基本类型，则 value 会被传递给指定的转义器
      */
-    (value: any, assertType?: ManualType): string;
+    (value: any, assertType?: AssertJsType): string;
 };
 /**
  * SQL value 生成器
@@ -48,9 +54,14 @@ export declare class SqlValuesCreator {
      *  v() 和 v.toSqlStr() 是等价的
      * ```
      */
-    toSqlStr(value: any, assertType?: ManualType): string;
-    /** 获取值对应的 SqlValueEncoder */
+    toSqlStr(value: any, assertJsType?: AssertJsType): string;
+    /**
+     * @deprecated 已废弃
+     * 获取值对应的 SqlValueEncoder
+     */
     getObjectType(value: object): SqlValueEncoder;
+    /** 获取值对应已定义的类 */
+    getClassType(value: object): undefined | (new (...args: unknown[]) => unknown);
     protected defaultObject(value: object): string;
     /**
      * 将对象列表转为 SQL 的 VALUES。
@@ -58,7 +69,7 @@ export declare class SqlValuesCreator {
      * @param keys - 选择的键。如果指定了 keys, 值为 undefined 的属性将自动填充为 null; 如果未指定 keys，将选择 objectList 所有不是 undefined 项的键的并集
      */
     objectListToValuesList<T extends object>(objectList: T[], keys?: readonly (keyof T)[] | {
-        [key in keyof T]?: string | undefined;
+        [key in keyof T]?: string | undefined | ColumnToValueConfig;
     }, keepUndefinedKey?: boolean): string;
     /**
      * 将对象转为 SQL 的 value
@@ -66,8 +77,9 @@ export declare class SqlValuesCreator {
      * @param keys - 如果指定了key, object undefined 的属性值将填充为 null，如果不指定，将自获取 object 所有非 undefined 的属性的key
      */
     objectToValues<T extends object>(object: T, keys?: readonly (keyof T)[] | {
-        [key in keyof T]?: string | undefined;
+        [key in keyof T]?: string | undefined | ColumnToValueConfig;
     }): string;
+    private _internalObjectToValues;
     /**
      * 将数组列表转为 SQL 的一个 value
      * @example 返回示例： " 'abc', '6', 'now()' "
@@ -88,7 +100,13 @@ export declare class SqlValuesCreator {
     createValues<T extends {}>(asName: string, values: T[], valuesTypes: Record<string, string | {
         sqlType: string;
         sqlDefault?: string;
+        assertJsType?: AssertJsType;
     }>): SqlSelectable<T>;
 }
+/** @public */
+export type ColumnToValueConfig = {
+    sqlType?: string;
+    assertJsType?: AssertJsType;
+};
 export {};
 //# sourceMappingURL=sql_value.d.ts.map

package/package.json

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