@naturalcycles/datastore-lib 4.18.6 → 4.19.1

package/dist/datastore.db.d.ts

@@ -3,7 +3,7 @@ import { Datastore } from '@google-cloud/datastore';
 import type { CommonDB, CommonDBOptions, CommonDBReadOptions, CommonDBSaveOptions, CommonDBSupport, CommonDBTransactionOptions, DBQuery, DBTransaction, DBTransactionFn, RunQueryResult } from '@naturalcycles/db-lib';
 import { BaseCommonDB } from '@naturalcycles/db-lib';
 import type { CommonLogger } from '@naturalcycles/js-lib/log';
-import { type ObjectWithId, type StringMap } from '@naturalcycles/js-lib/types';
+import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib/types';
 import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv';
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import type { DatastoreDBCfg, DatastoreDBOptions, DatastoreDBReadOptions, DatastoreDBSaveOptions, DatastoreDBStreamOptions, DatastorePropertyStats, DatastoreStats } from './datastore.model.js';
@@ -61,10 +61,6 @@ export declare class DatastoreDB extends BaseCommonDB implements CommonDB {
     getTables(): Promise<string[]>;
     getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchema<ROW>>;
     private getPRetryOptions;
-    /**
-     * Silently rollback the transaction.
-     * It may happen that transaction is already committed/rolled back, so we don't want to throw an error here.
-     */
     private rollback;
 }
 /**

package/dist/datastore.db.js

@@ -8,7 +8,7 @@ import { _omit } from '@naturalcycles/js-lib/object/object.util.js';
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js';
 import { pRetry, pRetryFn } from '@naturalcycles/js-lib/promise/pRetry.js';
 import { pTimeout } from '@naturalcycles/js-lib/promise/pTimeout.js';
-import { _stringMapEntries, _stringMapValues, } from '@naturalcycles/js-lib/types';
+import { _stringMapEntries, _stringMapValues } from '@naturalcycles/js-lib/types';
 import { boldWhite } from '@naturalcycles/nodejs-lib/colors';
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import { DatastoreType } from './datastore.model.js';
@@ -229,7 +229,7 @@ export class DatastoreDB extends BaseCommonDB {
                 await save(chunks[0]);
             }
             else {
-                await pMap(chunks, async (batch) => await save(batch), {
+                await pMap(chunks, async batch => await save(batch), {
                     concurrency: DATASTORE_RECOMMENDED_CONCURRENCY,
                 });
             }
@@ -268,7 +268,7 @@ export class DatastoreDB extends BaseCommonDB {
         const retryOptions = this.getPRetryOptions(`DatastoreLib.deleteByIds(${table})`);
         await pMap(_chunk(keys, MAX_ITEMS), 
         // async batch => await doDelete(batch),
-        async (batchOfKeys) => {
+        async batchOfKeys => {
             await pRetry(async () => {
                 await (opt.tx?.tx || ds).delete(batchOfKeys);
             }, retryOptions);
@@ -286,7 +286,7 @@ export class DatastoreDB extends BaseCommonDB {
         const retryOptions = this.getPRetryOptions(`DatastoreLib.multiDeleteByIds`);
         await pMap(_chunk(keys, MAX_ITEMS), 
         // async batch => await doDelete(batch),
-        async (batchOfKeys) => {
+        async batchOfKeys => {
             await pRetry(async () => {
                 await (opt.tx?.tx || ds).delete(batchOfKeys);
             }, retryOptions);

package/dist/datastore.model.d.ts

@@ -106,12 +106,12 @@ export interface DatastoreStats {
 export declare enum DatastoreType {
     Blob = "Blob",
     Text = "Text",
-    String = "String",// eslint-disable-line id-denylist
+    String = "String",
     EmbeddedEntity = "EmbeddedEntity",
     Float = "Float",
     Integer = "Integer",
     DATE_TIME = "Date/Time",
-    Boolean = "Boolean",// eslint-disable-line id-denylist
+    Boolean = "Boolean",
     NULL = "NULL"
 }
 export interface DatastorePropertyStats {

package/dist/datastore.model.js

@@ -1,4 +1,5 @@
-export var DatastoreType;
+export { DatastoreType };
+var DatastoreType;
 (function (DatastoreType) {
     DatastoreType["Blob"] = "Blob";
     DatastoreType["Text"] = "Text";

package/dist/datastoreStreamReadable.js

@@ -1,6 +1,7 @@
 import { Readable } from 'node:stream';
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js';
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js';
+import { TimeoutError } from '@naturalcycles/js-lib/error';
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log';
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js';
 import { getRunQueryOptions } from './query.util.js';
@@ -159,7 +160,8 @@ export class DatastoreStreamReadable extends Readable {
                 return await q.run(this.dsOpt);
             }, {
                 name: `DatastoreStreamReadable.query(${table})`,
-                predicate: err => RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
+                predicate: err => err instanceof TimeoutError ||
+                    RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
                 maxAttempts: 5,
                 delay: 5000,
                 delayMultiplier: 2,

package/dist/query.util.d.ts

@@ -1,4 +1,4 @@
-import { type Query } from '@google-cloud/datastore';
+import type { Query } from '@google-cloud/datastore';
 import type { RunQueryOptions } from '@google-cloud/datastore/build/src/query.js';
 import type { DBQuery } from '@naturalcycles/db-lib';
 import type { ObjectWithId } from '@naturalcycles/js-lib/types';

package/dist/query.util.js

@@ -3,6 +3,7 @@ import { _round } from '@naturalcycles/js-lib';
 const FNAME_MAP = {
     id: '__key__',
 };
+// export type Operator = '=' | '<' | '>' | '<=' | '>=' | 'HAS_ANCESTOR' | '!=' | 'IN' | 'NOT_IN'
 const OP_MAP = {
     '==': '=',
     in: 'IN',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/datastore-lib",
   "type": "module",
-  "version": "4.18.6",
+  "version": "4.19.1",
   "description": "Opinionated library to work with Google Datastore, implements CommonDB",
   "dependencies": {
     "@google-cloud/datastore": "^10",
@@ -11,6 +11,7 @@
   },
   "devDependencies": {
     "@types/node": "^25",
+    "@typescript/native-preview": "7.0.0-dev.20260201.1",
     "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {

package/readme.md

@@ -16,3 +16,7 @@
 - Streaming with RxJS Observable interface
 - Anonymization hook to be able to plug your implementation (privacy by design)
 - ...
+
+## chore-counter
+
+1

package/src/datastore.db.ts

@@ -25,12 +25,8 @@ import type { PRetryOptions } from '@naturalcycles/js-lib/promise'
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
 import { pRetry, pRetryFn } from '@naturalcycles/js-lib/promise/pRetry.js'
 import { pTimeout } from '@naturalcycles/js-lib/promise/pTimeout.js'
-import {
-  _stringMapEntries,
-  _stringMapValues,
-  type ObjectWithId,
-  type StringMap,
-} from '@naturalcycles/js-lib/types'
+import { _stringMapEntries, _stringMapValues } from '@naturalcycles/js-lib/types'
+import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib/types'
 import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
 import { boldWhite } from '@naturalcycles/nodejs-lib/colors'
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream'
@@ -606,7 +602,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
         if (dtype === DatastoreType.Blob) {
           s.properties![name] = {
             instanceof: 'Buffer',
-          } as JsonSchema<any, ROW[typeof name]>
+          } as JsonSchema<ROW[typeof name]>
         } else if (dtype === DatastoreType.Text || dtype === DatastoreType.String) {
           s.properties![name] = {
             type: 'string',

package/src/datastoreStreamReadable.ts

@@ -7,7 +7,9 @@ import type {
 } from '@google-cloud/datastore/build/src/query.js'
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js'
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
-import { type CommonLogger, createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
+import { TimeoutError } from '@naturalcycles/js-lib/error'
+import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js'
 import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
@@ -213,7 +215,9 @@ export class DatastoreStreamReadable<T = any> extends Readable implements Readab
         },
         {
           name: `DatastoreStreamReadable.query(${table})`,
-          predicate: err => RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
+          predicate: err =>
+            err instanceof TimeoutError ||
+            RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
           maxAttempts: 5,
           delay: 5000,
           delayMultiplier: 2,

package/src/query.util.ts

@@ -1,5 +1,6 @@
-import { PropertyFilter, type Query } from '@google-cloud/datastore'
-import type { RunQueryOptions } from '@google-cloud/datastore/build/src/query.js'
+import { PropertyFilter } from '@google-cloud/datastore'
+import type { Query } from '@google-cloud/datastore'
+import type { Operator, RunQueryOptions } from '@google-cloud/datastore/build/src/query.js'
 import type { DBQuery, DBQueryFilterOperator } from '@naturalcycles/db-lib'
 import { _round } from '@naturalcycles/js-lib'
 import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib/types'
@@ -9,7 +10,8 @@ const FNAME_MAP: StringMap = {
   id: '__key__',
 }
 
-const OP_MAP: Partial<Record<DBQueryFilterOperator, string>> = {
+// export type Operator = '=' | '<' | '>' | '<=' | '>=' | 'HAS_ANCESTOR' | '!=' | 'IN' | 'NOT_IN'
+const OP_MAP: Partial<Record<DBQueryFilterOperator, Operator>> = {
   '==': '=',
   in: 'IN',
   'not-in': 'NOT_IN',