@asla/yoursql 0.11.1 → 0.11.2

package/dist/client/DbPoolConnection.d.ts

@@ -1,6 +1,6 @@
 import { SqlStatementDataset } from "./_type.ts";
 import { DbQuery } from "./DbQuery.ts";
-import type { MultipleQueryResult, QueryRowsResult, DbQueryBase } from "./DbQueryBase.ts";
+import { type MultipleQueryResult, type QueryRowsResult, type DbQueryBase } from "./DbQueryBase.ts";
 import type { SqlLike, TransactionMode } from "./interfaces.ts";
 /**
 

package/dist/client/DbQuery.d.ts

@@ -1,11 +1,12 @@
 import { SqlLike } from "./interfaces.ts";
-import { MultipleQueryResult, DbQueryBase, QueryRowsResult } from "./DbQueryBase.ts";
+import { MultipleQueryResult, QueryRowsResult } from "./DbQueryBase.ts";
 import { SqlStatementDataset } from "./_type.ts";
 /**
  * SQL 查询相关操作
  * @public
  */
-export declare abstract class DbQuery implements DbQueryBase {
+export declare abstract class DbQuery {
+    abstract query<T = any>(sql: SqlStatementDataset<T>): Promise<QueryRowsResult<T>>;
     abstract query<T = any>(sql: SqlLike): Promise<QueryRowsResult<T>>;
     abstract multipleQuery<T extends MultipleQueryResult = MultipleQueryResult>(sql: SqlLike | SqlLike[]): Promise<T>;
     /** 单语句查询受影响的行 */

package/dist/client/DbQueryBase.d.ts

@@ -1,4 +1,4 @@
-import { SqlStatementDataset } from "./_type.ts";
+import { SqlTemplate } from "./_type.ts";
 import { SqlLike } from "./interfaces.ts";
 /** @public */
 export interface SingleQueryResult {
@@ -12,17 +12,28 @@ export interface QueryRowsResult<T = any> extends SingleQueryResult {
 }
 /** @public */
 export type MultipleQueryResult = SingleQueryResult[];
-/** @public */
+/**
+ *
+ * @deprecated 已废弃
+ * @public
+ */
 export type QueryResult = MultipleQueryResult | SingleQueryResult;
-/** @public */
+/**
+ * 数据库客户端的最小实现接口
+ * @public
+ */
 export interface DbQueryBase {
-    /** 单语句查询，不应查询多语句，否则返回错误值  */
-    query<T = any>(sql: SqlStatementDataset<T>): Promise<QueryRowsResult<T>>;
     /** 单语句查询，不应查询多语句，否则返回错误值  */
     query<T = any>(sql: SqlLike): Promise<QueryRowsResult<T>>;
     /** 多语句查询 */
     multipleQuery<T extends MultipleQueryResult = MultipleQueryResult>(sql: SqlLike | SqlLike[]): Promise<T>;
 }
-/** @public */
+/**
+ * 将 SqlLike 转换为字符串
+ * @public
+ *
+ */
 export declare function sqlLikeToString(sqlLike: SqlLike): string;
+/** @public */
+export declare function isSqlTemplate(obj: any): obj is SqlTemplate;
 //# sourceMappingURL=DbQueryBase.d.ts.map

package/dist/client/DbQueryBase.js

@@ -1,11 +1,32 @@
-/** @public */
+/**
+ * 将 SqlLike 转换为字符串
+ * @public
+ *
+ */
 function sqlLikeToString(sqlLike) {
     if (typeof sqlLike === "string") {
         return sqlLike;
     }
     else {
-        return sqlLike.genSql();
+        if (isSqlTemplate(sqlLike)) {
+            const { templates } = sqlLike;
+            const textArgs = sqlLike.toTextArgs();
+            let sql = templates[0];
+            for (let i = 1; i < templates.length; i++) {
+                sql += textArgs[i - 1] + templates[i];
+            }
+            return sql;
+        }
+        else {
+            return sqlLike.genSql();
+        }
     }
 }
+/** @public */
+function isSqlTemplate(obj) {
+    if (typeof obj !== "object" || obj === null)
+        return false;
+    return Array.isArray(obj.templates) && Array.isArray(obj.args) && typeof obj.toTextArgs === "function";
+}
 
-export { sqlLikeToString };
+export { isSqlTemplate, sqlLikeToString };

package/dist/client/_type.d.ts

@@ -1,2 +1,2 @@
-export type { SqlStatementDataset } from "../sql_gen/mod.ts";
+export type { SqlStatementDataset, SqlTemplate, SqlTextTemplate } from "../sql_gen/mod.ts";
 //# sourceMappingURL=_type.d.ts.map

package/dist/client/interfaces.d.ts

@@ -1,7 +1,7 @@
 import { DbQuery } from "./DbQuery.ts";
 import { DbPoolConnection } from "./DbPoolConnection.ts";
 import { DbCursor, DbCursorOption } from "./DbCursor.ts";
-import { SqlStatementDataset } from "./_type.ts";
+import { SqlStatementDataset, SqlTemplate } from "./_type.ts";
 /**
  * 数据库连接
  * @public
@@ -64,5 +64,5 @@ export interface DbQueryPool extends DbQuery {
 /** @public */
 export type SqlLike = {
     genSql(): string;
-} | string;
+} | SqlTemplate | string;
 //# sourceMappingURL=interfaces.d.ts.map

package/dist/client/mod.js

@@ -1,5 +1,5 @@
 export { ConnectionNotAvailableError, ParallelQueryError } from './errors.js';
-export { sqlLikeToString } from './DbQueryBase.js';
+export { isSqlTemplate, sqlLikeToString } from './DbQueryBase.js';
 export { DbQuery } from './DbQuery.js';
 export { DbCursor } from './DbCursor.js';
 export { DbPoolConnection } from './DbPoolConnection.js';

package/dist/sql_gen/SqlStatement.d.ts

@@ -44,13 +44,14 @@ export declare class SqlTextStatementDataset<T> extends SqlStatementDataset<T> {
  */
 export type InferQueryResult<T> = T extends SqlStatementDataset<infer P> ? P : never;
 /** @public */
-export interface SqlTemplate {
+export interface SqlTemplate<T extends readonly any[] = readonly unknown[]> {
     readonly templates: readonly string[];
-    readonly args: readonly unknown[];
-    toTextTemplate(): {
-        text: string;
-        args: string[];
-    };
-    genSql(): string;
+    readonly args: T;
+    toTextArgs(): string[];
+}
+/** @public */
+export interface SqlTextTemplate {
+    readonly textTemplate: string;
+    readonly textArgs: readonly string[];
 }
 //# sourceMappingURL=SqlStatement.d.ts.map

package/dist/sql_gen/mod.js

@@ -11,6 +11,7 @@ export { selectColumns } from './util.js';
 export { TypeChecker } from './your_table/checker.js';
 export { ColumnMeta, CustomDbType, YourTypeMap } from './your_table/infer_db_type.js';
 export { YourTable } from './your_table/table.js';
+export { TemplateSqlStatement as ValueSqlTemplate } from './sql_value/ValueSqlTemplate.js';
 export { orderBy } from './statement/select_impl.js';
 
 /**

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

@@ -1,13 +1,14 @@
-import { SqlTemplate } from "../SqlStatement.ts";
-export declare class ValueSqlTemplate implements SqlTemplate {
+import { SqlTemplate, SqlTextTemplate, SqlStatement } from "../SqlStatement.ts";
+/** @alpha */
+export declare class TemplateSqlStatement extends SqlStatement implements SqlTemplate, SqlTextTemplate {
+    #private;
     private v;
     readonly templates: readonly string[];
     readonly args: readonly unknown[];
     constructor(v: (value: unknown) => string, templates: readonly string[], values: readonly unknown[]);
-    toTextTemplate(): {
-        text: string;
-        args: string[];
-    };
+    get textArgs(): readonly string[];
+    get textTemplate(): string;
+    toTextArgs(): string[];
     genSql(): string;
 }
 //# sourceMappingURL=ValueSqlTemplate.d.ts.map

package/dist/sql_gen/sql_value/ValueSqlTemplate.js

@@ -1,30 +1,49 @@
-class ValueSqlTemplate {
+import { SqlStatement } from '../SqlStatement.js';
+
+/** @alpha */
+class TemplateSqlStatement extends SqlStatement {
     v;
     templates;
     args;
     constructor(v, templates, values) {
+        super();
         this.v = v;
         this.templates = templates;
         this.args = values;
     }
-    toTextTemplate() {
-        const { templates, args } = this;
-        let text = templates[0];
-        for (let i = 1; i < templates.length; i++) {
-            text += "$" + i;
-            text += templates[i];
+    #textArgs;
+    get textArgs() {
+        if (!this.#textArgs) {
+            const textArgs = this.args.map((value) => this.v(value));
+            this.#textArgs = textArgs;
         }
-        const values = args.map((value) => this.v(value));
-        return { text, args: values };
+        return this.#textArgs;
+    }
+    #textTemplate;
+    get textTemplate() {
+        if (this.#textTemplate === undefined) {
+            const { templates } = this;
+            let text = templates[0];
+            for (let i = 1; i < templates.length; i++) {
+                text += "$" + i;
+                text += templates[i];
+            }
+            this.#textTemplate = text;
+        }
+        return this.#textTemplate;
+    }
+    toTextArgs() {
+        return [...this.textArgs];
     }
     genSql() {
-        const { templates, args } = this;
+        const { templates } = this;
+        const textArgs = this.textArgs;
         let sql = this.templates[0];
         for (let i = 1; i < templates.length; i++) {
-            sql += this.v(args[i - 1]) + templates[i];
+            sql += textArgs[i - 1] + templates[i];
         }
         return sql;
     }
 }
 
-export { ValueSqlTemplate };
+export { TemplateSqlStatement };

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

@@ -1,5 +1,6 @@
-import { SqlTemplate } from "../SqlStatement.ts";
+import { TemplateSqlStatement } from "./ValueSqlTemplate.ts";
 import { AssertJsType, ObjectToValueKeys } from "./type.ts";
+export { TemplateSqlStatement as ValueSqlTemplate } from "./ValueSqlTemplate.ts";
 /** @public js 对象到编码函数的映射*/
 export type JsObjectMapSql = Map<new (...args: any[]) => any, SqlValueEncoder>;
 /** @public 将 js 值转为 SQl 字符串的函数*/
@@ -41,7 +42,7 @@ export declare class SqlValuesCreator {
      */
     toSqlStr(value: any, assertJsType?: AssertJsType): string;
     /** @alpha */
-    gen(split: TemplateStringsArray, ...values: any[]): SqlTemplate;
+    gen(split: TemplateStringsArray, ...values: any[]): TemplateSqlStatement;
     /** 获取值对应已定义的类 */
     getClassType(value: object): undefined | (new (...args: unknown[]) => unknown);
     protected defaultObject(value: object): string;

package/dist/sql_gen/sql_value/sql_value.js

@@ -1,5 +1,5 @@
 import { getObjectListKeys } from '../_statement.js';
-import { ValueSqlTemplate } from './ValueSqlTemplate.js';
+import { TemplateSqlStatement } from './ValueSqlTemplate.js';
 
 /**
  * SQL value 生成器
@@ -102,7 +102,7 @@ class SqlValuesCreator {
             sql += this.toSqlStr(values[i]);
             sql += split[i + 1];
         }
-        return new ValueSqlTemplate(this.toSqlStr.bind(this), split, values);
+        return new TemplateSqlStatement(this.toSqlStr.bind(this), split, values);
     }
     /** 获取值对应已定义的类 */
     getClassType(value) {
@@ -277,4 +277,4 @@ class SqlExplicitValuesStatement {
     }
 }
 
-export { SqlExplicitValuesStatement, SqlValuesCreator };
+export { SqlExplicitValuesStatement, SqlValuesCreator, TemplateSqlStatement as ValueSqlTemplate };

package/package.json

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