@asla/yoursql 0.10.1 → 0.11.0

package/dist/sql_gen/statement/update.js

@@ -1,88 +1,12 @@
-import { selectColumns } from '../util.js';
-import { SqlStatement, SqlTextStatementDataset } from '../SqlStatement.js';
-import { createUpdateSetFromObject, whereToString } from '../_statement.js';
+import { UpdateChain } from './update_impl.js';
 
-/**
- * @public
- * @example
- * ```ts
- *  update("table1 AS t").where("t.id = b.id") // UPDATE table1 AS t WHERE t.id = b.id
- *  update("table1",{ as: "t" }).set({ k:"'v'"}) // UPDATE table1 AS t SET t.k = 'v'
- *  update("table1").where("id = 1") // UPDATE table1 AS t WHERE id = 1
- * ```
- */
-function update(table, options) {
+/** @public */
+const update = function update(table, options) {
     let sql = `UPDATE ${table}`;
     if (options?.as) {
         sql += ` AS ${options.as}`;
     }
     return new UpdateChain(sql);
-}
-class UpdateChain extends SqlStatement {
-    sql;
-    constructor(sql) {
-        super();
-        this.sql = sql;
-    }
-    from(...from) {
-        const textList = from.map((f, i) => {
-            if (typeof f === "function")
-                return f();
-            return f;
-        });
-        const sql = this.genSql() + `\nFROM ${textList.join(", ")}`;
-        return new UpdateChain(sql);
-    }
-    /**
-     * @example
-     * ```ts
-     * // SET age=3, name='hi', count=b.count
-     * set({age: "3", name: "'hi'", count:"b.count"})
-     * set(["age = 3", "name = 'hi'", "count = b.count"])
-     * set("age = 3, name = 'hi', count = b.count")
-     *
-     * ```
-     */
-    set(values) {
-        if (typeof values === "function")
-            values = values();
-        switch (typeof values) {
-            case "object": {
-                if (values instanceof Array) {
-                    let sql = values.join(", ");
-                    return new UpdateChain(this.sql + " " + sql);
-                }
-                else {
-                    let sql = createUpdateSetFromObject(values);
-                    return new UpdateChain(this.sql + " " + sql);
-                }
-            }
-            case "string":
-                return new UpdateChain(this.sql + " SET\n" + values);
-            default:
-                throw new TypeError("参数 values 类型错误");
-        }
-    }
-    returning(returns) {
-        if (typeof returns === "function")
-            returns = returns();
-        let columnsStr;
-        if (returns === "*") {
-            columnsStr = "*";
-        }
-        else {
-            columnsStr = selectColumns(returns);
-        }
-        let sql = this.genSql() + "\nRETURNING " + columnsStr;
-        return new SqlTextStatementDataset(sql);
-    }
-    where(where) {
-        const sql = whereToString(where);
-        return new UpdateChain(this.genSql() + sql);
-    }
-    genSql() {
-        return this.sql;
-    }
-}
+};
 
 export { update };

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

@@ -1,6 +1,22 @@
 import { ConditionParam, Constructable, TableType } from "../util.ts";
 import { ChainModifyReturning } from "./_modify.ts";
 /** @public */
+export interface UpdateOption {
+    as?: string;
+}
+/**
+ * @public
+ * @example
+ * ```ts
+ *  update("table1 AS t").where("t.id = b.id") // UPDATE table1 AS t WHERE t.id = b.id
+ *  update("table1",{ as: "t" }).set({ k:"'v'"}) // UPDATE table1 AS t SET t.k = 'v'
+ *  update("table1").where("id = 1") // UPDATE table1 AS t WHERE id = 1
+ * ```
+ */
+export interface UpdateSqlGenerator {
+    <T extends TableType>(table: string, options?: UpdateOption): ChainUpdate<T>;
+}
+/** @public */
 export interface ChainUpdate<T extends TableType = TableType> {
     set(value: Constructable<{
         [key in keyof T]?: string;

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

@@ -0,0 +1,23 @@
+import { ConditionParam, Constructable, SelectParam } from "../util.ts";
+import { SqlStatementDataset, SqlStatement } from "../SqlStatement.ts";
+import { ChainUpdate, ChainUpdateAfterForm, ChainUpdateAfterSet, ChainUpdateReturning } from "./update_chain.ts";
+export declare class UpdateChain extends SqlStatement implements ChainUpdate {
+    private sql;
+    constructor(sql: string);
+    from(...from: Constructable<string>[]): ChainUpdateAfterForm;
+    /**
+     * @example
+     * ```ts
+     * // SET age=3, name='hi', count=b.count
+     * set({age: "3", name: "'hi'", count:"b.count"})
+     * set(["age = 3", "name = 'hi'", "count = b.count"])
+     * set("age = 3, name = 'hi', count = b.count")
+     *
+     * ```
+     */
+    set(values: Constructable<Record<string, string | undefined> | string[] | string>): ChainUpdateAfterSet;
+    returning<R extends {}>(returns: Constructable<SelectParam | "*">): SqlStatementDataset<R>;
+    where(where: Constructable<ConditionParam | void>): ChainUpdateReturning;
+    genSql(): string;
+}
+//# sourceMappingURL=update_impl.d.ts.map

package/dist/sql_gen/statement/update_impl.js

@@ -0,0 +1,72 @@
+import { selectColumns } from '../util.js';
+import { SqlStatement, SqlTextStatementDataset } from '../SqlStatement.js';
+import { createUpdateSetFromObject, whereToString } from '../_statement.js';
+
+class UpdateChain extends SqlStatement {
+    sql;
+    constructor(sql) {
+        super();
+        this.sql = sql;
+    }
+    from(...from) {
+        const textList = from.map((f, i) => {
+            if (typeof f === "function")
+                return f();
+            return f;
+        });
+        const sql = this.genSql() + `\nFROM ${textList.join(", ")}`;
+        return new UpdateChain(sql);
+    }
+    /**
+     * @example
+     * ```ts
+     * // SET age=3, name='hi', count=b.count
+     * set({age: "3", name: "'hi'", count:"b.count"})
+     * set(["age = 3", "name = 'hi'", "count = b.count"])
+     * set("age = 3, name = 'hi', count = b.count")
+     *
+     * ```
+     */
+    set(values) {
+        if (typeof values === "function")
+            values = values();
+        switch (typeof values) {
+            case "object": {
+                if (values instanceof Array) {
+                    let sql = values.join(", ");
+                    return new UpdateChain(this.sql + " " + sql);
+                }
+                else {
+                    let sql = createUpdateSetFromObject(values);
+                    return new UpdateChain(this.sql + " " + sql);
+                }
+            }
+            case "string":
+                return new UpdateChain(this.sql + " SET\n" + values);
+            default:
+                throw new TypeError("参数 values 类型错误");
+        }
+    }
+    returning(returns) {
+        if (typeof returns === "function")
+            returns = returns();
+        let columnsStr;
+        if (returns === "*") {
+            columnsStr = "*";
+        }
+        else {
+            columnsStr = selectColumns(returns);
+        }
+        let sql = this.genSql() + "\nRETURNING " + columnsStr;
+        return new SqlTextStatementDataset(sql);
+    }
+    where(where) {
+        const sql = whereToString(where);
+        return new UpdateChain(this.genSql() + sql);
+    }
+    genSql() {
+        return this.sql;
+    }
+}
+
+export { UpdateChain };

package/package.json

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

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

@@ -1,11 +0,0 @@
-import { SqlStatementDataset } from "../SqlStatement.ts";
-import { TableType } from "../util.ts";
-import { ColumnToValueConfig } from "./type.ts";
-export declare class YourValuesAs<T extends TableType> extends SqlStatementDataset<T> {
-    #private;
-    constructor(columns: readonly string[], asName: string, valuesStr: string);
-    toSelect(): string;
-    genSql(): string;
-}
-export declare function initColumnAssert(keys: readonly string[], keys_types: Record<string, string | undefined | ColumnToValueConfig>): any[];
-//# sourceMappingURL=_utils.d.ts.map

package/dist/sql_gen/sql_value/_utils.js

@@ -1,37 +0,0 @@
-import { SqlStatementDataset } from '../SqlStatement.js';
-
-class YourValuesAs extends SqlStatementDataset {
-    constructor(columns, asName, valuesStr) {
-        super();
-        this.#asName = asName;
-        this.#valuesStr = valuesStr;
-        this.#sql = `(VALUES\n${this.#valuesStr})\nAS ${this.#asName}(${columns.join(",")})`;
-    }
-    #asName;
-    #valuesStr;
-    #sql;
-    toSelect() {
-        return this.#sql;
-    }
-    genSql() {
-        return this.#sql;
-    }
-}
-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;
-        }
-    }
-    return type;
-}
-
-export { YourValuesAs, initColumnAssert };