@asla/yoursql 0.7.0 → 0.7.1

package/dist/select/DbTable.d.ts

@@ -1,5 +1,5 @@
 import { SqlSelectable } from "./selectable.ts";
-import { ConditionParam, Constructable, SelectParam } from "../util.ts";
+import { ConditionParam, Constructable } from "../util.ts";
 import type { TableType } from "./type.ts";
 import { CurrentModifyWhere, CurrentOnConflict, CurrentWhere, Selection } from "./query_link.ts";
 /**
@@ -13,10 +13,11 @@ export declare class DbTable<T extends TableType> extends SqlSelectable<T> {
     /** 选择单表全部列 */
     select(columns: "*", as?: string): CurrentWhere<T>;
     /** 选择单表  */
+    select(columns: Constructable<Record<string, boolean | string> | string>, as?: string): CurrentWhere<Record<string, any>>;
+    /** 选择单表  */
     select<R extends {}>(columns: Constructable<{
         [key in keyof R]: boolean | string;
     } | string>, as?: string): CurrentWhere<R>;
-    select<R extends {}>(columns: Constructable<SelectParam>): CurrentWhere<R>;
     /**
      * INSERT 语句，需要注意 SQL 注入
      * @example

package/dist/select/query_link.d.ts

@@ -1,6 +1,6 @@
 import { SqlSelectable, SqlQueryStatement } from "./selectable.ts";
 import { OrderByParam, ConditionParam, SelectParam, Constructable } from "../util.ts";
-import type { ColumnsSelected, SelectColumns, TableType } from "./type.ts";
+import type { ColumnsSelected, TableType } from "./type.ts";
 /** @public */
 export interface CurrentLimit<T extends TableType> extends SqlQueryStatement<T> {
     limit(limit?: number | bigint, offset?: number | bigint): SqlQueryStatement<T>;
@@ -35,7 +35,7 @@ export declare class Selection {
     crossJoin(selectable: Constructable<SqlSelectable<any> | string>, as?: string | undefined): Selection;
     from(selectable: Constructable<SqlSelectable<any> | string>, as?: string): Selection;
     /** 选择全部列 */
-    select<T extends TableType = TableType>(columns: "*"): CurrentWhere<T>;
+    select<T extends TableType = Record<string, any>>(columns: "*"): CurrentWhere<T>;
     /**
      * 自定义SQL选择语句
      * @example
@@ -43,7 +43,7 @@ export declare class Selection {
      * selection.select("t.age, count(*) AS c") // SELECT t.age,count(*) AS c FROM ...
      * ```
      */
-    select<T extends TableType = TableType>(columns: Constructable<string>): CurrentWhere<T>;
+    select(columns: Constructable<SelectParam>): CurrentWhere<Record<string, any>>;
     /**
      * 通过 object 选择 列
      * @example
@@ -53,14 +53,13 @@ export declare class Selection {
      */
     select<T extends TableType>(columns: Constructable<{
         [key in keyof T]: string | boolean;
-    }>): CurrentWhere<T>;
-    select<R extends {}>(columns: Constructable<SelectParam>): CurrentWhere<R>;
+    } | string>): CurrentWhere<T>;
 }
 /** @public */
 export interface CurrentReturn<T extends TableType = {}> extends SqlQueryStatement<{}> {
     returning(columns: "*"): SqlQueryStatement<T>;
-    returning<R extends ColumnsSelected<T>>(columns: Constructable<R>): SqlQueryStatement<SelectColumns<T, R>>;
-    returning<R extends TableType>(columns: Constructable<R | string>): SqlQueryStatement<T>;
+    returning(columns: Constructable<ColumnsSelected<T> | string>): SqlQueryStatement<Record<string, any>>;
+    returning<R extends TableType>(columns: Constructable<ColumnsSelected<R> | string>): SqlQueryStatement<R>;
 }
 /** @public */
 export type CurrentModifyWhere<T extends TableType = {}> = CurrentReturn<T> & {
@@ -72,7 +71,7 @@ export type CurrentOnConflictDo<T extends TableType = {}> = {
     /**
      * 需要注意 SQL 注入
      */
-    doUpdate(set: Constructable<{
+    doUpdate(set: Constructable<string | {
         [key in keyof T]?: string;
     }>): CurrentModifyWhere<T>;
     toString(): string;

package/package.json

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