@asla/yoursql 0.13.0 → 0.14.0

package/dist/sql_gen/sql_value/sql_value.js

@@ -1,11 +1,12 @@
-import { TemplateSqlStatement } from './ValueSqlTemplate.js';
-import { AssertError, getColumnInfo, internalObjectToValues, getObjectValueInfo } from './_to_values.js';
-
+import { ExplicitSqlValues } from "./SqlValuesDataset.js";
+import { TemplateSqlStatement } from "./ValueSqlTemplate.js";
+import { AssertError, getColumnInfo, getObjectValueInfo, internalObjectToValues, } from "./_to_values.js";
+export { TemplateSqlStatement } from "./ValueSqlTemplate.js";
 /**
  * SQL value 生成器
  * @public
  */
-class SqlValuesCreator {
+export class SqlValuesCreator {
     static create(map) {
         const obj = new this(map);
         const fn = obj.toSqlStr.bind(obj);
@@ -161,13 +162,13 @@ class SqlValuesCreator {
             let message = error instanceof Error ? error.message : String(error);
             throw new Error("第 " + i + " 项，字段 '" + keys[j] + "' 异常，" + message);
         }
-        return new SqlValuesDataset(keys, firstRow.types, firstRow.values, rows);
+        return new ExplicitSqlValues(keys, firstRow.types, firstRow.values, rows);
     }
     _objectToValue(object, keys_types, option = {}) {
         const { keys, type } = getObjectValueInfo(object, keys_types);
         const undefinedDefault = option.undefinedDefault || "DEFAULT";
         const res = internalObjectToValues(object, keys, type, undefinedDefault, this);
-        return new SqlValuesDataset(keys, res.types, res.values, []);
+        return new ExplicitSqlValues(keys, res.types, res.values, []);
     }
     /**
      * 将数组列表转为 SQL 的一个 value
@@ -182,57 +183,3 @@ class SqlValuesCreator {
         return values.map((v) => this.toSqlStr(v)).join(",");
     }
 }
-/** @public */
-class SqlValuesDataset {
-    columns;
-    columnsSqlType;
-    constructor(columns, columnsSqlType, firstValues, nextRows) {
-        this.columns = columns;
-        this.columnsSqlType = columnsSqlType;
-        this.#firstValues = firstValues;
-        this.#rows = nextRows;
-    }
-    #rows;
-    #firstValues;
-    #text;
-    get text() {
-        if (!this.#text) {
-            this.#text = this.#genText();
-        }
-        return this.#text;
-    }
-    #genText() {
-        const { columnsSqlType } = this;
-        const firstValues = this.#firstValues;
-        let firstRow = new Array(firstValues.length);
-        for (let i = 0; i < firstValues.length; i++) {
-            firstRow[i] = firstValues[i];
-            if (columnsSqlType[i])
-                firstRow[i] += "::" + columnsSqlType[i];
-        }
-        const base = "(" + firstRow.join(",") + ")";
-        if (this.#rows.length === 0) {
-            return base;
-        }
-        return "(" + firstRow.join(",") + "),\n" + this.#rows.join(",\n");
-    }
-    /**
-     * @example
-     * ```ts
-     *  const t = v.createImplicitValues(
-     *    [
-     *      { id: 1, name: "name1" },
-     *      { id: 2, name: "name2" },
-     *    ],
-     *    { id: "INT", name: "VARCHAR" },
-     *  );
-     *  // 返回 (VALUES (1::INT,'name1'::VARCHAR),(2,'name2')) AS t1(id,name)
-     *  t.toSelect("t1(id,name)")
-     * ```
-     */
-    toSelect(name) {
-        return `(VALUES\n${this.text})\nAS ${name}(${this.columns.join(",")})`;
-    }
-}
-
-export { SqlValuesCreator, SqlValuesDataset, TemplateSqlStatement as ValueSqlTemplate };

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

@@ -15,4 +15,3 @@ export type ObjectToValueKeys<T extends {}> = readonly string[] | ({
 } & {
     [key: string]: string | undefined | ColumnToValueConfig;
 });
-//# sourceMappingURL=type.d.ts.map

package/dist/sql_gen/sql_value/type.js

@@ -0,0 +1 @@
+export {};

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

@@ -3,4 +3,3 @@ import { SqlStatementDataset, SqlStatement } from "../SqlStatement.ts";
 export interface ChainModifyReturning extends SqlStatement {
     returning<R extends TableType>(columns: Constructable<SelectParam>): SqlStatementDataset<R>;
 }
-//# sourceMappingURL=_modify.d.ts.map

package/dist/sql_gen/statement/_modify.js

@@ -0,0 +1 @@
+export {};

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

@@ -49,4 +49,3 @@ export declare function withAs(name: string, statement: Constructable<string>):
 export declare function withRecursiveAs(statement: Constructable<string>): ChainCTE;
 /** @public */
 export declare function withRecursiveAs(name: string, statement: Constructable<string>): ChainCTE;
-//# sourceMappingURL=cte.d.ts.map

package/dist/sql_gen/statement/cte.js

@@ -1,13 +1,12 @@
-import { selectColumns } from '../util.js';
-import { SelectChainAfterSelect } from './select_impl.js';
-import { DeleteChain } from './delete_impl.js';
-import { UpdateChain } from './update_impl.js';
-import { InsertChain } from './insert_impl.js';
-
-function withAs(nameOrStatement, statement) {
+import { selectColumns } from "../util.js";
+import { SelectChainAfterSelect } from "./select_impl.js";
+import { DeleteChain } from "./delete_impl.js";
+import { UpdateChain } from "./update_impl.js";
+import { InsertChain } from "./insert_impl.js";
+export function withAs(nameOrStatement, statement) {
     return new ChainCETImpl(`WITH \n${concat(nameOrStatement, statement)}`);
 }
-function withRecursiveAs(nameOrStatement, statement) {
+export function withRecursiveAs(nameOrStatement, statement) {
     return new ChainCETImpl(`WITH RECURSIVE \n${concat(nameOrStatement, statement)}`);
 }
 class ChainCETImpl {
@@ -64,5 +63,3 @@ function concat(nameOrStatement, statement) {
         return statement;
     }
 }
-
-export { withAs, withRecursiveAs };

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

@@ -1,4 +1,3 @@
 import { DeleteFromSqlGenerator } from "./delete_chain.ts";
 /** @public */
 export declare const deleteFrom: DeleteFromSqlGenerator;
-//# sourceMappingURL=delete.d.ts.map

package/dist/sql_gen/statement/delete.js

@@ -1,12 +1,9 @@
-import { DeleteChain } from './delete_impl.js';
-
+import { DeleteChain } from "./delete_impl.js";
 /** @public */
-const deleteFrom = function deleteFrom(table, option) {
+export const deleteFrom = function deleteFrom(table, option) {
     let sql = `DELETE FROM ${table}`;
     if (option?.as) {
         sql += ` AS ${option.as}`;
     }
     return new DeleteChain(sql);
 };
-
-export { deleteFrom };

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

@@ -38,4 +38,3 @@ export interface ChainDeleteAfterUsing extends ChainDeleteReturning {
 /** @public */
 export interface ChainDeleteReturning extends ChainModifyReturning {
 }
-//# sourceMappingURL=delete_chain.d.ts.map

package/dist/sql_gen/statement/delete_chain.js

@@ -0,0 +1 @@
+export {};

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

@@ -9,4 +9,3 @@ export declare class DeleteChain extends SqlStatement implements ChainDelete {
     where(where: Constructable<ConditionParam | void>): ChainDeleteReturning;
     genSql(): string;
 }
-//# sourceMappingURL=delete_impl.d.ts.map

package/dist/sql_gen/statement/delete_impl.js

@@ -1,7 +1,6 @@
-import { SqlStatement, SqlTextStatementDataset } from '../SqlStatement.js';
-import { returningToString, whereToString } from '../_statement.js';
-
-class DeleteChain extends SqlStatement {
+import { SqlStatement, SqlTextStatementDataset } from "../SqlStatement.js";
+import { returningToString, whereToString } from "../_statement.js";
+export class DeleteChain extends SqlStatement {
     sql;
     constructor(sql) {
         super();
@@ -27,5 +26,3 @@ class DeleteChain extends SqlStatement {
         return this.sql;
     }
 }
-
-export { DeleteChain };

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

@@ -1,4 +1,3 @@
 import { InsertIntoSqlGenerator } from "./insert_chain.ts";
 /** @public */
 export declare const insertInto: InsertIntoSqlGenerator;
-//# sourceMappingURL=insert.d.ts.map

package/dist/sql_gen/statement/insert.js

@@ -1,7 +1,6 @@
-import { InsertChain } from './insert_impl.js';
-
+import { InsertChain } from "./insert_impl.js";
 /** @public */
-const insertInto = function insertInto(table, columns) {
+export const insertInto = function insertInto(table, columns) {
     if (columns) {
         return new InsertChain(`INSERT INTO ${table}(${columns.join(",")})`);
     }
@@ -9,5 +8,3 @@ const insertInto = function insertInto(table, columns) {
         return new InsertChain(`INSERT INTO ${table}`);
     }
 };
-
-export { insertInto };

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

@@ -8,6 +8,14 @@ export interface InsertIntoSqlGenerator {
 /** @public */
 export interface ChainAfterConflict {
     doNotThing(): ChainInsertReturning;
+    /**
+     * @example
+     * ```ts
+     *  doUpdate("SET level= 89,name= 11") // " DO UPDATE SET level= 89,name= 11"
+     *  doUpdate(["level= 89", "name= 11"]) // " DO UPDATE SET\nlevel= 89,name= 11"
+     *  doUpdate({level: "89", name: "11"}) // " DO UPDATE SET\nlevel= 89,name= 11"
+     * ```
+     */
     doUpdate(set: Constructable<string | readonly string[] | Record<string, string>>): ChainInsertReturning;
     toString(): string;
 }
@@ -30,4 +38,3 @@ export interface ChainInsertAfterValues extends ChainInsertReturning {
 /** @public */
 export interface ChainInsertReturning extends ChainModifyReturning {
 }
-//# sourceMappingURL=insert_chain.d.ts.map

package/dist/sql_gen/statement/insert_chain.js

@@ -0,0 +1 @@
+export {};

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

@@ -11,4 +11,3 @@ export declare class InsertChain extends SqlStatement implements ChainInsert {
     where(where: Constructable<ConditionParam | void>): ChainInsertReturning;
     genSql(): string;
 }
-//# sourceMappingURL=insert_impl.d.ts.map

package/dist/sql_gen/statement/insert_impl.js

@@ -1,8 +1,7 @@
-import { selectColumns } from '../util.js';
-import { whereToString, createUpdateSetFromObject } from '../_statement.js';
-import { SqlStatement, SqlTextStatementDataset } from '../SqlStatement.js';
-
-class InsertChain extends SqlStatement {
+import { selectColumns } from "../util.js";
+import { createUpdateSetFromObject, whereToString } from "../_statement.js";
+import { SqlStatement, SqlTextStatementDataset } from "../SqlStatement.js";
+export class InsertChain extends SqlStatement {
     sql;
     constructor(sql) {
         super();
@@ -95,5 +94,3 @@ class InsertAfterOnConflict {
         return this.sql;
     }
 }
-
-export { InsertChain };

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

@@ -7,4 +7,3 @@ export * from "./update_chain.ts";
 export * from "./delete.ts";
 export * from "./delete_chain.ts";
 export * from "./cte.ts";
-//# sourceMappingURL=mod.d.ts.map

package/dist/sql_gen/statement/mod.js

@@ -0,0 +1,9 @@
+export * from "./select.js";
+export * from "./select_chain.js";
+export * from "./insert.js";
+export * from "./insert_chain.js";
+export * from "./update.js";
+export * from "./update_chain.js";
+export * from "./delete.js";
+export * from "./delete_chain.js";
+export * from "./cte.js";

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

@@ -2,4 +2,3 @@ import { SelectSqlGenerator } from "./select_chain.ts";
 /** @public */
 export declare const select: SelectSqlGenerator;
 export { orderBy } from "./select_impl.ts";
-//# sourceMappingURL=select.d.ts.map

package/dist/sql_gen/statement/select.js

@@ -1,14 +1,11 @@
-import { selectColumns } from '../util.js';
-import { SelectChainAfterSelect } from './select_impl.js';
-export { orderBy } from './select_impl.js';
-
+import { selectColumns } from "../util.js";
+import { SelectChainAfterSelect } from "./select_impl.js";
 /** @public */
-const select = function select(columns) {
+export const select = function select(columns) {
     if (!columns)
         return new SelectChainAfterSelect("SELECT ");
     if (typeof columns === "function")
         columns = columns();
     return new SelectChainAfterSelect("SELECT " + selectColumns(columns));
 };
-
-export { select };
+export { orderBy } from "./select_impl.js";

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

@@ -111,4 +111,3 @@ export type OrderBehavior = {
 /** @public */
 export type OrderByParam = string | OrderBehavior | (string | OrderBehavior)[];
 export {};
-//# sourceMappingURL=select_chain.d.ts.map

package/dist/sql_gen/statement/select_chain.js

@@ -0,0 +1 @@
+export {};

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

@@ -28,4 +28,3 @@ export declare class SelectChainAfterSelect<T extends TableType> implements Chai
  * ```
  */
 export declare function orderBy(by?: Constructable<OrderByParam | void>): string;
-//# sourceMappingURL=select_impl.d.ts.map

package/dist/sql_gen/statement/select_impl.js

@@ -1,7 +1,6 @@
-import { selectableToString, whereToString, condition } from '../_statement.js';
-import { SqlTextStatementDataset } from '../SqlStatement.js';
-
-class SelectChainAfterSelect {
+import { condition, selectableToString, whereToString } from "../_statement.js";
+import { SqlTextStatementDataset } from "../SqlStatement.js";
+export class SelectChainAfterSelect {
     constructor(sql) {
         this.#sql = sql;
     }
@@ -107,7 +106,7 @@ function havingToString(conditions, type) {
  *
  * ```
  */
-function orderBy(by) {
+export function orderBy(by) {
     if (typeof by === "function")
         by = by();
     let sql = "";
@@ -142,5 +141,3 @@ function handlerOrderValue(value) {
     }
     return value.key + " " + target;
 }
-
-export { SelectChainAfterSelect, orderBy };

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

@@ -1,4 +1,3 @@
 import { UpdateSqlGenerator } from "./update_chain.ts";
 /** @public */
 export declare const update: UpdateSqlGenerator;
-//# sourceMappingURL=update.d.ts.map

package/dist/sql_gen/statement/update.js

@@ -1,12 +1,9 @@
-import { UpdateChain } from './update_impl.js';
-
+import { UpdateChain } from "./update_impl.js";
 /** @public */
-const update = function update(table, options) {
+export const update = function update(table, options) {
     let sql = `UPDATE ${table}`;
     if (options?.as) {
         sql += ` AS ${options.as}`;
     }
     return new UpdateChain(sql);
 };
-
-export { update };

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

@@ -49,4 +49,3 @@ export interface ChainUpdateAfterForm extends ChainUpdateReturning {
 /** @public */
 export interface ChainUpdateReturning extends ChainModifyReturning {
 }
-//# sourceMappingURL=update_chain.d.ts.map

package/dist/sql_gen/statement/update_chain.js

@@ -0,0 +1 @@
+export {};

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

@@ -20,4 +20,3 @@ export declare class UpdateChain extends SqlStatement implements ChainUpdate {
     where(where: Constructable<ConditionParam | void>): ChainUpdateReturning;
     genSql(): string;
 }
-//# sourceMappingURL=update_impl.d.ts.map

package/dist/sql_gen/statement/update_impl.js

@@ -1,8 +1,7 @@
-import { selectColumns } from '../util.js';
-import { SqlStatement, SqlTextStatementDataset } from '../SqlStatement.js';
-import { createUpdateSetFromObject, whereToString } from '../_statement.js';
-
-class UpdateChain extends SqlStatement {
+import { selectColumns } from "../util.js";
+import { SqlStatement, SqlTextStatementDataset } from "../SqlStatement.js";
+import { createUpdateSetFromObject, whereToString } from "../_statement.js";
+export class UpdateChain extends SqlStatement {
     sql;
     constructor(sql) {
         super();
@@ -68,5 +67,3 @@ class UpdateChain extends SqlStatement {
         return this.sql;
     }
 }
-
-export { UpdateChain };

package/dist/sql_gen/util.d.ts

@@ -34,4 +34,3 @@ export type UpdateRowValue<T extends object> = {
 export type TableType = {
     [key: string]: any;
 };
-//# sourceMappingURL=util.d.ts.map

package/dist/sql_gen/util.js

@@ -6,7 +6,7 @@
  * selectColumns("c1,count(*) AS c2,column as c3")  //  "c1,count(*) AS c2,column as c3"
  * ```
  */
-function selectColumns(columns) {
+export function selectColumns(columns) {
     if (typeof columns === "function")
         columns = columns();
     switch (typeof columns) {
@@ -45,5 +45,3 @@ function selectColumns(columns) {
             throw new TypeError("columns 应为 string 或 object 类型");
     }
 }
-
-export { selectColumns };

package/dist/sql_gen/your_table/checker.d.ts

@@ -10,4 +10,3 @@ export declare class TypeChecker<T> {
     private checkArray;
     private checkItem;
 }
-//# sourceMappingURL=checker.d.ts.map

package/dist/sql_gen/your_table/checker.js

@@ -1,7 +1,6 @@
-import { CustomDbType } from './infer_db_type.js';
-
+import { CustomDbType } from "./infer_db_type.js";
 /** @public */
-class TypeChecker {
+export class TypeChecker {
     map;
     constructor(map) {
         this.map = map;
@@ -78,5 +77,3 @@ class TypeChecker {
 function getErrStr(expect, actual) {
     return `Expect ${expect}, Actual ${actual}`;
 }
-
-export { TypeChecker };

package/dist/sql_gen/your_table/infer_db_type.d.ts

@@ -71,4 +71,3 @@ export type InferTableDefined<T extends TableDefined> = {
     [key in keyof T]: T[key] extends ColumnMeta<infer P> ? P : unknown;
 };
 export {};
-//# sourceMappingURL=infer_db_type.d.ts.map

package/dist/sql_gen/your_table/infer_db_type.js

@@ -2,7 +2,7 @@
  * 表格列的信息
  * @public
  */
-class ColumnMeta {
+export class ColumnMeta {
     type;
     sqlType;
     notNull;
@@ -34,7 +34,7 @@ class ColumnMeta {
  * 数据库类型到JS类型的映射
  * @public
  */
-class YourTypeMap {
+export class YourTypeMap {
     typeMap;
     static create(rawTypeMap) {
         return new this(rawTypeMap);
@@ -60,7 +60,7 @@ function baseType(v) {
  * 自定义数据类型
  * @public
  */
-class CustomDbType {
+export class CustomDbType {
     is;
     name;
     static bigint = new CustomDbType(baseType, "bigint");
@@ -72,5 +72,3 @@ class CustomDbType {
         this.name = name;
     }
 }
-
-export { ColumnMeta, CustomDbType, YourTypeMap };

package/dist/sql_gen/your_table/mod.d.ts

@@ -1,4 +1,3 @@
 export * from "./checker.ts";
 export * from "./infer_db_type.ts";
 export * from "./table.ts";
-//# sourceMappingURL=mod.d.ts.map

package/dist/sql_gen/your_table/mod.js

@@ -0,0 +1,3 @@
+export * from "./checker.js";
+export * from "./infer_db_type.js";
+export * from "./table.js";

package/dist/sql_gen/your_table/table.d.ts

@@ -13,4 +13,3 @@ export declare class YourTable<T extends TableType = TableType> {
     getColumnMeta(name: keyof T): ColumnMeta<unknown>;
     createTypeChecker<T>(keys: readonly string[]): TypeChecker<T>;
 }
-//# sourceMappingURL=table.d.ts.map

package/dist/sql_gen/your_table/table.js

@@ -1,10 +1,9 @@
-import { TypeChecker } from './checker.js';
-
+import { TypeChecker } from "./checker.js";
 /**
  * 完整数据库表数据
  * @public
  */
-class YourTable {
+export class YourTable {
     name;
     define;
     constructor(name, define) {
@@ -29,5 +28,3 @@ class YourTable {
         return new TypeChecker(map);
     }
 }
-
-export { YourTable };

package/package.json

@@ -1,54 +1,51 @@
 {
   "name": "@asla/yoursql",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "",
-  "type": "module",
-  "types": "./dist/mod.d.ts",
-  "packageManager": "pnpm@10.4.0",
-  "scripts": {
-    "ci:test": "vitest run",
-    "ci:build": "pnpm rollup -c build/rollup.config.js",
-    "build": "pnpm rollup -c  build/rollup.config.js && pnpm run ci:check-api -l",
-    "test": "vitest",
-    "type:check": "tsc",
-    "publish-check": "deno publish --dry-run --allow-dirty",
-    "ci:check-api": "api-extractor run -c api-extractor.jsonc -v"
-  },
-  "devDependencies": {
-    "@microsoft/api-extractor": "^7.47.9",
-    "@rollup/plugin-typescript": "^12.1.0",
-    "prettier": "^3.5.3",
-    "rollup": "^4.22.4",
-    "tslib": "^2.7.0",
-    "typescript": "^5.6.2",
-    "vitest": "^2.1.1"
+  "keywords": [
+    "sql"
+  ],
+  "license": "MIT",
+  "author": {
+    "name": "Eavid",
+    "url": "https://github.com/eavidy"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/asnowc/yoursql"
   },
-  "exports": {
-    ".": "./dist/sql_gen/mod.js",
-    "./client": "./dist/client/mod.js"
-  },
   "files": [
     "dist/**/*.js",
     "dist/**/*d.ts"
   ],
+  "type": "module",
+  "types": "./dist/mod.d.ts",
+  "exports": {
+    ".": "./dist/sql_gen/mod.js"
+  },
   "publishConfig": {
     "access": "public",
-    "registry": "https://registry.npmjs.org",
-    "provenance": true
+    "provenance": true,
+    "registry": "https://registry.npmjs.org"
   },
-  "keywords": [
-    "sql"
-  ],
-  "author": {
-    "name": "Eavid",
-    "url": "https://github.com/eavidy"
+  "scripts": {
+    "ci:test": "vitest run",
+    "ci:build": "tsc -p tsconfig.lib.json",
+    "build": "tsc -p tsconfig.lib.json",
+    "test": "vitest",
+    "type:check": "tsc -p tsconfig.lib.json --noEmit && tsc -p tsconfig.node.json --noEmit",
+    "publish-check": "deno publish --dry-run --allow-dirty"
+  },
+  "devDependencies": {
+    "@types/node": "^25.6.2",
+    "oxfmt": "^0.48.0",
+    "tslib": "^2.8.1",
+    "typescript": "^6.0.3",
+    "vite": "^8.0.11",
+    "vitest": "^4.1.5"
   },
   "engines": {
     "node": ">=18"
   },
-  "license": "MIT"
+  "packageManager": "pnpm@11.0.9"
 }

package/dist/client/DbCursor.d.ts

@@ -1,14 +0,0 @@
-/** @public */
-export interface DbCursorOption {
-    defaultSize?: number;
-}
-/** @public */
-export declare abstract class DbCursor<T> implements AsyncDisposable, AsyncIterable<T> {
-    /** 读取游标，如果读取结束，返回空数组 */
-    abstract read(maxSize?: number): Promise<T[]>;
-    /** 提前关闭游标，如果多次调用，会被忽略 */
-    abstract close(): Promise<void>;
-    [Symbol.asyncDispose](): Promise<void>;
-    [Symbol.asyncIterator](): AsyncGenerator<T, undefined, void>;
-}
-//# sourceMappingURL=DbCursor.d.ts.map