@asla/yoursql 0.1.1 → 0.2.0

package/dist/mod.d.ts

@@ -4,4 +4,5 @@ export * from "./select/type.ts";
 export * from "./select/select.ts";
 export * from "./select/selectable.ts";
 export * from "./select/TableQuery.ts";
+export * from "./util.ts";
 //# sourceMappingURL=mod.d.ts.map

package/dist/mod.js

@@ -33,6 +33,28 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
+/**
+ * @public
+ * @param keepUndefinedKey - 是否保留值为 undefined 的 key
+ */
+function getObjectListKeys(objectList, keepUndefinedKey) {
+    let keys = new Set();
+    for (let i = 0; i < objectList.length; i++) {
+        let obj = objectList[i];
+        let hasKeys = Object.keys(obj);
+        let k;
+        for (let j = 0; j < hasKeys.length; j++) {
+            k = hasKeys[j];
+            if (typeof k !== "string")
+                continue;
+            if (!keepUndefinedKey && obj[k] === undefined)
+                continue;
+            keys.add(k);
+        }
+    }
+    return Array.from(keys);
+}
+
 var _SqlRaw_value;
 /**
  * SQL 原始字符对象
@@ -53,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.
@@ -65,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) {
@@ -205,34 +229,19 @@ function toKeyType(object, keys_types) {
     }
     return { type, keys };
 }
-/**
- * @public
- * @param keepUndefinedKey - 是否保留值为 undefined 的 key
- */
-function getObjectListKeys(objectList, keepUndefinedKey) {
-    let keys = new Set();
-    for (let i = 0; i < objectList.length; i++) {
-        let obj = objectList[i];
-        let hasKeys = Object.keys(obj);
-        let k;
-        for (let j = 0; j < hasKeys.length; j++) {
-            k = hasKeys[j];
-            if (typeof k !== "string")
-                continue;
-            if (!keepUndefinedKey && obj[k] === undefined)
-                continue;
-            keys.add(k);
-        }
-    }
-    return Array.from(keys);
-}
 
 /** @public PgSql 转换器 */
 const pgSqlTransformer = new Map([
     [
         Array,
         function encodePgArray(value) {
-            return "ARRAY[" + value.map(this).join(", ") + "]";
+            return ("ARRAY[" +
+                value
+                    .map(function (item) {
+                    return this.toSqlStr(item);
+                })
+                    .join(", ") +
+                "]");
         },
     ],
     [Date, (value) => SqlValuesCreator.string(value.toISOString())],
@@ -603,7 +612,7 @@ class DbTableQuery extends DbTable {
         if (values instanceof Array) {
             if (values.length === 0)
                 throw new Error("值不能为空");
-            insertCol = Object.keys(values[0]);
+            insertCol = getObjectListKeys(values);
             valuesStr = `VALUES\n${this.statement.objectListToValuesList(values, insertCol)}`;
         }
         else if (values instanceof SqlQueryStatement) {
@@ -645,7 +654,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

@@ -16,18 +16,15 @@ export type JsObjectMapSql = Map<new (...args: any[]) => any, SqlValueEncoder>;
 export type SqlValueEncoder<T = any> = (this: SqlValuesCreator, value: T, map: JsObjectMapSql) => string;
 /** @public */
 export type ManualType = "bigint" | "number" | "string" | "boolean" | (new (...args: any[]) => any);
-/**
- * @public
- */
-export interface SqlValuesCreator {
-    /** 将 JS 对象转为 SQL 的字符值的形式 。 undefined 将被转换为 DEFAULT */
-    (value: any, expectType?: ManualType): string;
-}
 /**
  * SQL value 生成器
  * @public
  */
 export declare class SqlValuesCreator {
+    static create(map?: JsObjectMapSql): SqlValuesCreator & {
+        /** 将 JS 对象转为 SQL 的字符值的形式 。 undefined 将被转换为 DEFAULT */
+        (value: any, expectType?: ManualType): string;
+    };
     /**
      * 将字符串转为 SQL 的字符串值的形式(单引号会被转义)。
      * @example 输入 a'b'c , 返回 a''b''c.
@@ -41,7 +38,7 @@ 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;
+    toSqlStr(value: any, expectType?: "bigint" | "number" | "string" | "boolean" | (new (...args: any[]) => any)): string;
     protected toObjectStr(value: object): string;
     protected defaultObject(value: object): string;
     /**
@@ -66,10 +63,5 @@ export declare class SqlValuesCreator {
      */
     toValues(values: readonly any[]): string;
 }
-/**
- * @public
- * @param keepUndefinedKey - 是否保留值为 undefined 的 key
- */
-export declare function getObjectListKeys(objectList: any[], keepUndefinedKey?: boolean): string[];
 export {};
 //# sourceMappingURL=sql_value.d.ts.map

package/dist/util.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @public
+ * @param keepUndefinedKey - 是否保留值为 undefined 的 key
+ */
+export declare function getObjectListKeys(objectList: any[], keepUndefinedKey?: boolean): string[];
+//# sourceMappingURL=util.d.ts.map

package/package.json

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