@asla/yoursql 0.13.1 → 0.14.0

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.1",
+  "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

package/dist/client/DbCursor.js

@@ -1,21 +0,0 @@
-/** @public */
-class DbCursor {
-    // implement
-    [Symbol.asyncDispose]() {
-        return this.close();
-    }
-    async *[Symbol.asyncIterator]() {
-        let data = await this.read();
-        try {
-            while (data.length) {
-                yield* data;
-                data = await this.read();
-            }
-        }
-        finally {
-            await this.close();
-        }
-    }
-}
-
-export { DbCursor };

package/dist/client/DbPoolConnection.d.ts

@@ -1,5 +0,0 @@
-import { type DbQueryBase } from "./DbQueryBase.ts";
-import type { DbPoolConnection } from "./interfaces.ts";
-/** @public */
-export declare function createDbPoolConnection(conn: DbQueryBase, onRelease: (conn: DbQueryBase) => void, onDispose?: (conn: DbQueryBase) => void): DbPoolConnection;
-//# sourceMappingURL=DbPoolConnection.d.ts.map

package/dist/client/DbPoolConnection.js

@@ -1,74 +0,0 @@
-import { DbQuery } from './DbQuery.js';
-import { ConnectionNotAvailableError } from './errors.js';
-
-class DbPoolConnectionImpl extends DbQuery {
-    constructor(conn, onRelease, onDispose = onRelease) {
-        super();
-        this.#conn = conn;
-        this.#onRelease = onRelease;
-        this.#onDispose = onDispose;
-    }
-    #onRelease;
-    #onDispose;
-    //implement
-    async begin(mode) {
-        await this.execute("BEGIN" + (mode ? " TRANSACTION ISOLATION LEVEL " + mode : ""));
-    }
-    #conn;
-    query(sql) {
-        if (!this.#conn)
-            return Promise.reject(new ConnectionNotAvailableError("Connection already release"));
-        if (typeof sql === "function")
-            sql = sql();
-        return this.#conn.query(sql);
-    }
-    execute(sql) {
-        if (!this.#conn)
-            return Promise.reject(new ConnectionNotAvailableError("Connection already release"));
-        if (typeof sql === "function")
-            sql = sql();
-        return this.#conn.execute(sql);
-    }
-    /** @deprecated 不建议使用 */
-    multipleQuery(sql) {
-        if (!this.#conn)
-            return Promise.reject(new ConnectionNotAvailableError("Connection already release"));
-        return this.#conn.multipleQuery(sql);
-    }
-    //implement
-    async rollback() {
-        await this.execute("ROLLBACK");
-    }
-    //implement
-    async commit() {
-        await this.execute("COMMIT");
-    }
-    get released() {
-        return !this.#conn;
-    }
-    /** 调用 release() 时，如果事务未提交，则抛出异常 */
-    release() {
-        const conn = this.#conn;
-        if (conn) {
-            this.#conn = undefined;
-            this.#onRelease(conn);
-        }
-    }
-    dispose() {
-        const conn = this.#conn;
-        if (conn) {
-            this.#conn = undefined;
-            this.#onDispose(conn);
-        }
-    }
-    //implement
-    [Symbol.dispose]() {
-        return this.release();
-    }
-}
-/** @public */
-function createDbPoolConnection(conn, onRelease, onDispose = onRelease) {
-    return new DbPoolConnectionImpl(conn, onRelease, onDispose);
-}
-
-export { createDbPoolConnection };

package/dist/client/DbPoolTransaction.d.ts

@@ -1,9 +0,0 @@
-import type { DbPoolConnection, DbPoolTransaction, TransactionMode } from "./interfaces.ts";
-/** @public */
-export type DbPoolTransactionOption = {
-    errorRollback?: boolean;
-    mode?: TransactionMode;
-};
-/** @public */
-export declare function createDbPoolTransaction(connect: () => Promise<DbPoolConnection>, option?: TransactionMode | DbPoolTransactionOption): DbPoolTransaction;
-//# sourceMappingURL=DbPoolTransaction.d.ts.map

package/dist/client/DbPoolTransaction.js

@@ -1,146 +0,0 @@
-import { DbQuery } from './DbQuery.js';
-import { ParallelQueryError, ConnectionNotAvailableError } from './errors.js';
-
-class DbPoolTransactionImpl extends DbQuery {
-    #errorRollback;
-    mode;
-    #begin;
-    constructor(connect, option) {
-        super();
-        if (option) {
-            if (typeof option === "string")
-                this.mode = option;
-            else {
-                this.mode = option.mode;
-                this.#errorRollback = option.errorRollback;
-            }
-        }
-        this.#begin = "BEGIN" + (this.mode ? " TRANSACTION ISOLATION LEVEL " + this.mode : "");
-        this.#connect = connect;
-    }
-    #connect;
-    #conn;
-    async commit() {
-        if (this.#conn) {
-            const conn = this.#conn;
-            const promise = conn.execute("COMMIT").then(() => conn.release(), (e) => conn.dispose());
-            return promise;
-        }
-        this.#release(undefined);
-    }
-    async rollback() {
-        if (this.#conn) {
-            const conn = this.#conn;
-            const promise = conn.execute("ROLLBACK").then(() => conn.release(), (e) => conn.dispose());
-            return promise;
-        }
-        this.#release(undefined);
-    }
-    savePoint(savePoint) {
-        return this.execute("SAVEPOINT " + savePoint);
-    }
-    rollbackTo(savePoint) {
-        return this.execute("ROLLBACK TO " + savePoint);
-    }
-    #pending;
-    #getConnQuery(call, callIfFirst = call, queryErrorCatch) {
-        if (this.#pending) {
-            return Promise.reject(new ParallelQueryError());
-        }
-        if (this.#error) {
-            return Promise.reject(this.#error);
-        }
-        let promise;
-        if (!this.#conn) {
-            promise = this.#connect().then((conn) => {
-                if (this.released) {
-                    conn.release();
-                    throw this.#error;
-                }
-                this.#conn = conn;
-                let promise = callIfFirst(conn);
-                if (queryErrorCatch) {
-                    promise = promise.catch(queryErrorCatch);
-                }
-                return promise;
-            }, (e) => {
-                this.#release(undefined);
-                throw e;
-            });
-        }
-        else {
-            promise = call(this.#conn);
-            if (queryErrorCatch) {
-                promise = promise.catch(queryErrorCatch);
-            }
-        }
-        this.#pending = promise;
-        return promise.finally(() => {
-            this.#pending = undefined;
-        });
-    }
-    #query(call, callIfFirst) {
-        const onError = (e) => {
-            if (this.#errorRollback) {
-                const passError = () => {
-                    throw e;
-                };
-                return this.rollback().then(passError, passError);
-            }
-            else {
-                this.#release(this.#conn);
-                throw e;
-            }
-        };
-        return this.#getConnQuery(call, callIfFirst, onError);
-    }
-    query(sql) {
-        return this.#query((conn) => {
-            return conn.query(sql);
-        }, async (conn) => {
-            if (typeof sql === "function")
-                sql = sql();
-            const isArray = sql instanceof Array;
-            const result = await conn.query(isArray ? [this.#begin, ...sql] : [this.#begin, sql]);
-            if (isArray)
-                return result.slice(1);
-            else
-                return result[1];
-        });
-    }
-    async execute(sql) {
-        return this.#query((conn) => {
-            return conn.execute(sql);
-        }, (conn) => {
-            if (typeof sql === "function")
-                sql = sql();
-            return conn.execute(sql instanceof Array ? [this.#begin, ...sql] : [this.#begin, sql]);
-        });
-    }
-    /** @deprecated 不建议使用 */
-    multipleQuery(sql) {
-        return this.#query((conn) => {
-            return conn.multipleQuery(sql);
-        }, (conn) => {
-            return conn.multipleQuery(sql instanceof Array ? [this.#begin, ...sql] : [this.#begin, sql]);
-        });
-    }
-    #error;
-    #release(conn, error = new ConnectionNotAvailableError("Connection already release")) {
-        this.#error = error;
-        this.#conn = undefined;
-        conn?.release();
-    }
-    get released() {
-        return !!this.#error;
-    }
-    [Symbol.asyncDispose]() {
-        return this.rollback();
-    }
-}
-/** @public */
-function createDbPoolTransaction(connect, option) {
-    return new DbPoolTransactionImpl(connect, option);
-}
-
-export { createDbPoolTransaction };