@asla/yoursql 0.0.6 → 0.1.1

package/dist/mod.js

@@ -65,7 +65,8 @@ class SqlValuesCreator {
      */
     constructor(map = new Map()) {
         this.map = map;
-        const fn = (value) => this.toSqlStr(value);
+        const fn = this.toSqlStr.bind(this);
+        this.toSqlStr = fn;
         Reflect.setPrototypeOf(fn, this);
         return fn;
     }
@@ -76,17 +77,7 @@ 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 的字符值的形式
-     */
+    /** 将 JS 对象转为 SQL 的字符值的形式 。 undefined 将被转换为 DEFAULT */
     toSqlStr(value, expectType) {
         let basicType;
         if (expectType) {
@@ -111,7 +102,7 @@ class SqlValuesCreator {
             case "object":
                 return this.toObjectStr(value);
             case "undefined":
-                return "NULL";
+                return "DEFAULT";
             default:
                 //function、symbol
                 let type = typeof value;
@@ -132,12 +123,12 @@ class SqlValuesCreator {
     defaultObject(value) {
         return SqlValuesCreator.string(JSON.stringify(value));
     }
-    objectListToValuesList(objectList, keys_types) {
+    objectListToValuesList(objectList, keys_types, keepUndefinedKey) {
         if (objectList.length <= 0)
             throw new Error("objectList 不能是空数组");
         let keys;
         if (!keys_types) {
-            keys = getObjectListKeys(objectList, true);
+            keys = getObjectListKeys(objectList, keepUndefinedKey);
         }
         else if (keys_types instanceof Array) {
             keys = keys_types;
@@ -156,7 +147,7 @@ class SqlValuesCreator {
                 rows = [];
                 j = 0;
                 for (; j < keys.length; j++) {
-                    value = object[keys[j]] ?? null;
+                    value = object[keys[j]];
                     rows[j] = this.toSqlStr(value);
                 }
                 str += ",\n(" + rows.join(",") + ")";
@@ -177,7 +168,7 @@ class SqlValuesCreator {
         try {
             for (; i < keys.length; i++) {
                 key = keys[i];
-                value = object[key] ?? null;
+                value = object[key];
                 if (type[key])
                     values[i] = this.toSqlStr(value) + "::" + type[key];
                 else
@@ -210,14 +201,15 @@ function toKeyType(object, keys_types) {
         type = keys_types;
     }
     else {
-        keys = Object.keys(object).filter((key) => typeof key === "string" && object[key] !== undefined);
+        keys = Object.keys(object);
     }
     return { type, keys };
 }
 /**
  * @public
+ * @param keepUndefinedKey - 是否保留值为 undefined 的 key
  */
-function getObjectListKeys(objectList, keepNull) {
+function getObjectListKeys(objectList, keepUndefinedKey) {
     let keys = new Set();
     for (let i = 0; i < objectList.length; i++) {
         let obj = objectList[i];
@@ -225,9 +217,9 @@ function getObjectListKeys(objectList, keepNull) {
         let k;
         for (let j = 0; j < hasKeys.length; j++) {
             k = hasKeys[j];
-            if (keepNull && obj[k] === null)
+            if (typeof k !== "string")
                 continue;
-            if (obj[k] === undefined || typeof k !== "string")
+            if (!keepUndefinedKey && obj[k] === undefined)
                 continue;
             keys.add(k);
         }
@@ -245,23 +237,6 @@ const pgSqlTransformer = new Map([
     ],
     [Date, (value) => SqlValuesCreator.string(value.toISOString())],
 ]);
-/**
- * @public
- * @deprecated 已废弃
- * PgSql的值转换
- */
-class PgSqlValue extends SqlValuesCreator {
-    constructor(custom) {
-        const map = new Map(custom ? [...pgSqlTransformer, ...custom] : pgSqlTransformer);
-        super(map);
-    }
-    timestamp(value) {
-        return SqlValuesCreator.string(value.toISOString());
-    }
-    array(value) {
-        return this.toSqlStr(value, Array);
-    }
-}
 
 /**
  * 可选择项。可以是 table、查询结果等，它能被 select 语句选择
@@ -670,7 +645,7 @@ class DbTableQuery extends DbTable {
         for (const [k, v] of updateKey) {
             if (v === undefined)
                 continue;
-            setList.push(k + " = " + this.statement.toSqlStr(v));
+            setList.push(k + " = " + this.statement(v));
         }
         let sql = `UPDATE ${this.name}\nSET ${setList.join(",\n")}`;
         if (where)
@@ -711,4 +686,4 @@ function genWhere(where) {
     return "\nWHERE " + where;
 }
 
-export { DbTable, DbTableQuery, PgSqlValue, SqlQueryStatement, SqlRaw, SqlSelectable, SqlValuesCreator, createSelect, getObjectListKeys, pgSqlTransformer };
+export { DbTable, DbTableQuery, SqlQueryStatement, SqlRaw, SqlSelectable, SqlValuesCreator, createSelect, getObjectListKeys, pgSqlTransformer };

package/dist/sql_value/db_type.d.ts

@@ -1,14 +1,4 @@
-import { SqlValuesCreator, JsObjectMapSql } from "./sql_value.ts";
+import { JsObjectMapSql } from "./sql_value.ts";
 /** @public PgSql 转换器 */
 export declare const pgSqlTransformer: JsObjectMapSql;
-/**
- * @public
- * @deprecated 已废弃
- * PgSql的值转换
- */
-export declare class PgSqlValue extends SqlValuesCreator {
-    constructor(custom?: JsObjectMapSql);
-    timestamp(value: Date): string;
-    array(value: any[]): string;
-}
 //# sourceMappingURL=db_type.d.ts.map

package/dist/sql_value/sql_value.d.ts

@@ -14,12 +14,14 @@ export declare class SqlRaw<T = any> {
 export type JsObjectMapSql = Map<new (...args: any[]) => any, SqlValueEncoder>;
 /** @public */
 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 的字符值的形式 */
-    (value: any): string;
+    /** 将 JS 对象转为 SQL 的字符值的形式 。 undefined 将被转换为 DEFAULT */
+    (value: any, expectType?: ManualType): string;
 }
 /**
  * SQL value 生成器
@@ -38,14 +40,8 @@ export declare class SqlValuesCreator {
     /** 设置转换器 */
     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, expectType?: "bigint" | "number" | "string" | "boolean" | (new (...args: any[]) => any)): string;
+    /** 将 JS 对象转为 SQL 的字符值的形式 。 undefined 将被转换为 DEFAULT */
+    protected toSqlStr(value: any, expectType?: "bigint" | "number" | "string" | "boolean" | (new (...args: any[]) => any)): string;
     protected toObjectStr(value: object): string;
     protected defaultObject(value: object): string;
     /**
@@ -55,7 +51,7 @@ export declare class SqlValuesCreator {
      */
     objectListToValuesList<T extends object>(objectList: T[], keys?: readonly (keyof T)[] | {
         [key in keyof T]?: string | undefined;
-    }): string;
+    }, keepUndefinedKey?: boolean): string;
     /**
      * 将对象转为 SQL 的 value
      * @example 返回示例： " 'abc', '6', 'now()' "
@@ -72,7 +68,8 @@ export declare class SqlValuesCreator {
 }
 /**
  * @public
+ * @param keepUndefinedKey - 是否保留值为 undefined 的 key
  */
-export declare function getObjectListKeys(objectList: any[], keepNull?: boolean): string[];
+export declare function getObjectListKeys(objectList: any[], keepUndefinedKey?: boolean): string[];
 export {};
 //# sourceMappingURL=sql_value.d.ts.map

package/package.json

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