@naturalcycles/db-lib 10.20.0 → 10.20.2

package/dist/commondao/common.dao.d.ts

@@ -160,8 +160,8 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
     ping(): Promise<void>;
     withId(id: ID): DaoWithId<typeof this>;
     withIds(ids: ID[]): DaoWithIds<typeof this>;
-    withRows(rows: BM[]): DaoWithRows<typeof this>;
-    withRow(row: BM, opt?: DaoWithRowOptions<BM>): DaoWithRow<typeof this>;
+    withRowsToSave(rows: Unsaved<BM>[]): DaoWithRows<typeof this>;
+    withRowToSave(row: Unsaved<BM>, opt?: DaoWithRowOptions<BM>): DaoWithRow<typeof this>;
     /**
      * Load rows (by their ids) from Multiple tables at once.
      * An optimized way to load data, minimizing DB round-trips.
@@ -209,20 +209,19 @@ export interface DaoWithId<DAO extends AnyDao> {
     dao: DAO;
     id: string;
 }
-export interface DaoWithRows<DAO extends AnyDao> {
+export interface DaoWithRows<DAO extends AnyDao, BM = InferBM<DAO>> {
     dao: DAO;
-    rows: InferBM<DAO>[];
+    rows: Unsaved<BM>[];
 }
-export interface DaoWithRow<DAO extends AnyDao> {
+export interface DaoWithRow<DAO extends AnyDao, BM = InferBM<DAO>> {
     dao: DAO;
-    row: InferBM<DAO>;
-    opt?: DaoWithRowOptions<InferBM<DAO>>;
+    row: Unsaved<BM>;
+    opt?: DaoWithRowOptions<BM>;
 }
-interface DaoWithRowOptions<BM extends BaseDBEntity> {
+export interface DaoWithRowOptions<BM> {
     skipIfEquals?: BM;
 }
 export type InferBM<DAO> = DAO extends CommonDao<infer BM> ? BM : never;
 export type InferDBM<DAO> = DAO extends CommonDao<any, infer DBM> ? DBM : never;
 export type InferID<DAO> = DAO extends CommonDao<any, any, infer ID> ? ID : never;
 export type AnyDao = CommonDao<any>;
-export {};

package/dist/commondao/common.dao.js

@@ -779,13 +779,13 @@ export class CommonDao {
             ids,
         };
     }
-    withRows(rows) {
+    withRowsToSave(rows) {
         return {
             dao: this,
             rows: rows,
         };
     }
-    withRow(row, opt) {
+    withRowToSave(row, opt) {
         return {
             dao: this,
             row: row,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/db-lib",
   "type": "module",
-  "version": "10.20.0",
+  "version": "10.20.2",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^15"

package/src/commondao/common.dao.ts

@@ -1049,14 +1049,14 @@ export class CommonDao<
     }
   }
 
-  withRows(rows: BM[]): DaoWithRows<typeof this> {
+  withRowsToSave(rows: Unsaved<BM>[]): DaoWithRows<typeof this> {
     return {
       dao: this,
       rows: rows as any,
     }
   }
 
-  withRow(row: BM, opt?: DaoWithRowOptions<BM>): DaoWithRow<typeof this> {
+  withRowToSave(row: Unsaved<BM>, opt?: DaoWithRowOptions<BM>): DaoWithRow<typeof this> {
     return {
       dao: this,
       row: row as any,
@@ -1307,18 +1307,18 @@ export interface DaoWithId<DAO extends AnyDao> {
   id: string
 }
 
-export interface DaoWithRows<DAO extends AnyDao> {
+export interface DaoWithRows<DAO extends AnyDao, BM = InferBM<DAO>> {
   dao: DAO
-  rows: InferBM<DAO>[]
+  rows: Unsaved<BM>[]
 }
 
-export interface DaoWithRow<DAO extends AnyDao> {
+export interface DaoWithRow<DAO extends AnyDao, BM = InferBM<DAO>> {
   dao: DAO
-  row: InferBM<DAO>
-  opt?: DaoWithRowOptions<InferBM<DAO>>
+  row: Unsaved<BM>
+  opt?: DaoWithRowOptions<BM>
 }
 
-interface DaoWithRowOptions<BM extends BaseDBEntity> {
+export interface DaoWithRowOptions<BM> {
   skipIfEquals?: BM
 }