@asla/yoursql 0.10.0 → 0.10.1

package/dist/sql_gen/sql_value/sql_value.d.ts

@@ -1,5 +1,5 @@
 import { SqlStatementDataset, SqlTemplate } from "../SqlStatement.ts";
-import { AssertJsType, ObjectToValueKeys, SqlValueData } from "./type.ts";
+import { AssertJsType, ObjectToValueKeys, SqlValuesTextData } from "./type.ts";
 /** @public js 对象到编码函数的映射*/
 export type JsObjectMapSql = Map<new (...args: any[]) => any, SqlValueEncoder>;
 /** @public 将 js 值转为 SQl 字符串的函数*/
@@ -53,7 +53,7 @@ export declare class SqlValuesCreator {
      * @param keys - 选择的键。如果指定了 keys, 值为 undefined 的属性将自动填充为 null; 如果未指定 keys，将选择 objectList 所有不是 undefined 项的键的并集
      * @param keepUndefinedKey - 是否保留 undefined 的键。默认值为 false，如果为 true , 数组的某一个字段均为 undefined时，将忽略字段,
      */
-    objectListToValues<T extends object>(objectList: T[], keys?: ObjectToValueKeys<T>, keepUndefinedKey?: boolean): SqlValueData;
+    objectListToValues<T extends object>(objectList: T[], keys?: ObjectToValueKeys<T>, keepUndefinedKey?: boolean): SqlValuesTextData;
     /**
      * @deprecated 请使用 objectToValue 代替
      */
@@ -62,16 +62,17 @@ export declare class SqlValuesCreator {
      * 将对象转为 SQL 的 value
      * @example
      * ```ts
-     *  v.objectToValues({ a: 1, b: "2", c: null, d: undefined }).text // " '1', '2', NULL, DEFAULT "
-     *  v.objectToValues({ a: 1, b: "2", c: null, d: undefined }, ["a", "b"]).text // " '1', '2' "
-     *  v.objectToValues(
+     *  v.objectToValue({ a: 1, b: "2", c: null, d: undefined }).text // "('1', '2', NULL, DEFAULT)"
+     *  v.objectToValue({ a: 1, b: "2", c: null, d: undefined }, ["a", "b"]).text // "('1', '2')"
+     *  v.objectToValue(
      *    { a: 1, b: "2", c: null, d: undefined },
      *    { a: "INT", b: "TEXT", c: "JSONB", d: "TEXT" }
-     *  ).text // " '1'::INT, '2'::TEXT, NULL::JSONB, DEFAULT::TEXT "
+     *  ).text // "('1'::INT, '2'::TEXT, NULL::JSONB, DEFAULT::TEXT)"
      * ```
      * @param keys - 如果指定了key, object undefined 的属性值将填充为 null，如果不指定，将自获取 object 所有非 undefined 的属性的key
      */
-    objectToValue<T extends object>(object: T, keys?: ObjectToValueKeys<T>): SqlValueData;
+    objectToValue<T extends object>(object: T, keys?: ObjectToValueKeys<T>): SqlValuesTextData;
+    private _getObjectValueInfo;
     private _internalObjectToValues;
     /**
      * 将数组列表转为 SQL 的一个 value

package/dist/sql_gen/sql_value/sql_value.js

@@ -159,17 +159,20 @@ class SqlValuesCreator {
         }
         return { columns: keys, text: str };
     }
-    /**
-     * @deprecated 请使用 objectToValue 代替
-     */
-    objectToValues(object, keys) {
-        return this.objectToValue(object, keys).text;
+    objectToValues(object, keys_types) {
+        const { keys, type } = this._getObjectValueInfo(object, keys_types);
+        return this._internalObjectToValues(object, keys, type);
     }
     objectToValue(object, keys_types) {
+        const { keys, type } = this._getObjectValueInfo(object, keys_types);
+        const text = this._internalObjectToValues(object, keys, type);
+        return { columns: keys, text: "(" + text + ")" };
+    }
+    _getObjectValueInfo(object, keys_types) {
         let type;
         let keys;
         if (keys_types instanceof Array) {
-            keys = keys_types;
+            keys = [...keys_types];
             type = [];
         }
         else if (keys_types) {
@@ -180,8 +183,7 @@ class SqlValuesCreator {
             keys = Object.keys(object);
             type = [];
         }
-        const text = this._internalObjectToValues(object, keys, type);
-        return { columns: keys, text };
+        return { keys, type };
     }
     _internalObjectToValues(object, keys, type) {
         const values = [];

package/dist/sql_gen/sql_value/type.d.ts

@@ -1,8 +1,8 @@
 /** @public 断言类型 */
 export type AssertJsType = "bigint" | "number" | "string" | "boolean" | "object" | (new (...args: any[]) => any);
 /** @public */
-export type SqlValueData = {
-    columns: readonly string[];
+export type SqlValuesTextData = {
+    columns: string[];
     text: string;
 };
 /** @public */

package/dist/sql_gen/statement/insert.d.ts

@@ -2,5 +2,5 @@ import { ChainInsert } from "./insert_chain.ts";
 /** @public */
 export declare function insertInto(target: string): ChainInsert;
 /** @public */
-export declare function insertInto(table: string, columns: string[]): ChainInsert;
+export declare function insertInto(table: string, columns: readonly string[]): ChainInsert;
 //# sourceMappingURL=insert.d.ts.map

package/dist/sql_gen/statement/insert_chain.d.ts

@@ -3,7 +3,7 @@ import { ChainModifyReturning } from "./_modify.ts";
 /** @public */
 export interface ChainAfterConflict {
     doNotThing(): ChainInsertReturning;
-    doUpdate(set: Constructable<string | string[] | Record<string, string>>): ChainInsertReturning;
+    doUpdate(set: Constructable<string | readonly string[] | Record<string, string>>): ChainInsertReturning;
     toString(): string;
 }
 /** @public */
@@ -15,7 +15,7 @@ export interface ChainInsert extends ChainInsertAfterValues {
      *  values(["(18, 'hi')", "(17, 'hh')"]) // " VALUES(18, 'hi'), (17, 'hh')"
      * ```
      */
-    values(statement: Constructable<string | string[]>): ChainInsertAfterValues;
+    values(statement: Constructable<string | readonly string[]>): ChainInsertAfterValues;
     select(statement: Constructable<string>): ChainInsertAfterValues;
 }
 /** @public */

package/dist/sql_gen/statement/select.d.ts

@@ -11,8 +11,8 @@ export declare function select<T extends TableType>(columns: Constructable<{
 /** @public */
 export declare function select<T extends TableType>(columns: Constructable<string | string[]>): ChainSelect<T>;
 /** @public */
-export declare function select<T extends TableType>(columns: Constructable<string | string[] | {
-    [key in keyof T]: string | boolean;
+export declare function select<T extends TableType>(columns: Constructable<string | readonly string[] | {
+    readonly [key in keyof T]: string | boolean;
 }>): ChainSelect<T>;
 /**
  * 生成 ORDER BY 语句

package/dist/sql_gen/util.d.ts

@@ -1,9 +1,9 @@
 /** @public */
-export type ConditionParam = string | string[];
+export type ConditionParam = string | readonly string[];
 /** @public */
 export type Constructable<T> = T | (() => T);
 /** @public */
-export type SelectParam = string | string[] | Record<string, string | boolean>;
+export type SelectParam = string | readonly string[] | Record<string, string | boolean>;
 /**
  * @public
  * @example

package/package.json

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