@naturalcycles/datastore-lib 3.23.1 → 3.23.3

package/dist/datastore.db.js

@@ -206,8 +206,8 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
         const tx = this.ds().transaction();
         try {
             await tx.run();
-            const ops = (0, db_lib_1.mergeDBOperations)(_tx.ops);
-            for await (const op of ops) {
+            // const ops = mergeDBOperations(_tx.ops)
+            for await (const op of _tx.ops) {
                 if (op.type === 'saveBatch') {
                     await this.saveBatch(op.table, op.rows, { ...opt, tx });
                 }

package/dist/datastore.model.d.ts

@@ -1,6 +1,6 @@
 import type { DatastoreOptions, Key, Transaction } from '@google-cloud/datastore';
 import { CommonDBOptions, CommonDBSaveOptions } from '@naturalcycles/db-lib';
-import { AnyObjectWithId, CommonLogger, ObjectWithId } from '@naturalcycles/js-lib';
+import { CommonLogger, ObjectWithId } from '@naturalcycles/js-lib';
 export interface DatastorePayload<T = any> {
     key: Key;
     data: T;
@@ -99,7 +99,7 @@ export interface DatastoreDBStreamOptions extends DatastoreDBOptions {
 export interface DatastoreDBOptions extends CommonDBOptions {
     tx?: Transaction;
 }
-export interface DatastoreDBSaveOptions<ROW extends Partial<ObjectWithId> = AnyObjectWithId> extends CommonDBSaveOptions<ROW> {
+export interface DatastoreDBSaveOptions<ROW extends Partial<ObjectWithId> = any> extends CommonDBSaveOptions<ROW> {
     tx?: Transaction;
 }
 export interface DatastoreStats {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/datastore-lib",
-  "version": "3.23.1",
+  "version": "3.23.3",
   "description": "Opinionated library to work with Google Datastore",
   "scripts": {
     "prepare": "husky install"

package/src/datastore.db.ts

@@ -6,7 +6,6 @@ import {
   CommonDBSaveMethod,
   DBQuery,
   DBTransaction,
-  mergeDBOperations,
   RunQueryResult,
 } from '@naturalcycles/db-lib'
 import {
@@ -334,9 +333,9 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     try {
       await tx.run()
 
-      const ops = mergeDBOperations(_tx.ops)
+      // const ops = mergeDBOperations(_tx.ops)
 
-      for await (const op of ops) {
+      for await (const op of _tx.ops) {
         if (op.type === 'saveBatch') {
           await this.saveBatch(op.table, op.rows, { ...opt, tx })
         } else if (op.type === 'deleteByIds') {

package/src/datastore.model.ts

@@ -1,6 +1,6 @@
 import type { DatastoreOptions, Key, Transaction } from '@google-cloud/datastore'
 import { CommonDBOptions, CommonDBSaveOptions } from '@naturalcycles/db-lib'
-import { AnyObjectWithId, CommonLogger, ObjectWithId } from '@naturalcycles/js-lib'
+import { CommonLogger, ObjectWithId } from '@naturalcycles/js-lib'
 
 export interface DatastorePayload<T = any> {
   key: Key
@@ -114,7 +114,7 @@ export interface DatastoreDBStreamOptions extends DatastoreDBOptions {
 export interface DatastoreDBOptions extends CommonDBOptions {
   tx?: Transaction
 }
-export interface DatastoreDBSaveOptions<ROW extends Partial<ObjectWithId> = AnyObjectWithId>
+export interface DatastoreDBSaveOptions<ROW extends Partial<ObjectWithId> = any>
   extends CommonDBSaveOptions<ROW> {
   tx?: Transaction
 }