@naturalcycles/datastore-lib 4.7.0 → 4.8.1

package/dist/DatastoreStreamReadable.js

@@ -1,6 +1,6 @@
 import { Readable } from 'node:stream';
-import { _ms } from '@naturalcycles/js-lib/datetime';
-import { pRetry } from '@naturalcycles/js-lib/promise';
+import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js';
+import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js';
 export class DatastoreStreamReadable extends Readable {
     q;
     logger;

package/dist/datastore.db.js

@@ -1,10 +1,14 @@
 import { Transform } from 'node:stream';
 import { BaseCommonDB, commonDBFullSupport } from '@naturalcycles/db-lib';
-import { _chunk } from '@naturalcycles/js-lib';
-import { _assert, _errorDataAppend, TimeoutError } from '@naturalcycles/js-lib/error';
+import { _round } from '@naturalcycles/js-lib';
+import { _chunk } from '@naturalcycles/js-lib/array/array.util.js';
+import { _assert } from '@naturalcycles/js-lib/error/assert.js';
+import { _errorDataAppend, TimeoutError } from '@naturalcycles/js-lib/error/error.util.js';
 import { commonLoggerMinLevel } from '@naturalcycles/js-lib/log';
-import { _omit } from '@naturalcycles/js-lib/object';
-import { pMap, pRetry, pRetryFn, pTimeout } from '@naturalcycles/js-lib/promise';
+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 { boldWhite } from '@naturalcycles/nodejs-lib/colors';
 import { DatastoreType } from './datastore.model.js';
 import { DatastoreStreamReadable } from './DatastoreStreamReadable.js';
@@ -468,7 +472,8 @@ export class DatastoreDB extends BaseCommonDB {
             return {};
         return {
             // Datastore expects UnixTimestamp in milliseconds
-            readTime: opt.readAt * 1000,
+            // Datastore requires the timestamp to be rounded to the whole minutes
+            readTime: _round(opt.readAt, 60) * 1000,
         };
     }
 }

package/dist/datastoreKeyValueDB.js

@@ -1,6 +1,6 @@
 import { DBQuery } from '@naturalcycles/db-lib';
 import { commonKeyValueDBFullSupport } from '@naturalcycles/db-lib/kv';
-import { AppError } from '@naturalcycles/js-lib/error';
+import { AppError } from '@naturalcycles/js-lib/error/error.util.js';
 import { DatastoreDB } from './datastore.db.js';
 const excludeFromIndexes = ['v'];
 export class DatastoreKeyValueDB {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/datastore-lib",
   "type": "module",
-  "version": "4.7.0",
+  "version": "4.8.1",
   "description": "Opinionated library to work with Google Datastore, implements CommonDB",
   "dependencies": {
     "@google-cloud/datastore": "^10",
@@ -10,8 +10,8 @@
     "@naturalcycles/nodejs-lib": "^15"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "*",
-    "@types/node": "^24"
+    "@types/node": "^24",
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {
     ".": "./dist/index.js"

package/src/DatastoreStreamReadable.ts

@@ -1,9 +1,9 @@
 import { Readable } from 'node:stream'
 import type { Query } from '@google-cloud/datastore'
 import type { RunQueryInfo, RunQueryOptions } from '@google-cloud/datastore/build/src/query.js'
-import { _ms } from '@naturalcycles/js-lib/datetime'
+import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
-import { pRetry } from '@naturalcycles/js-lib/promise'
+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'
 import type { DatastoreDBStreamOptions } from './datastore.model.js'

package/src/datastore.db.ts

@@ -15,8 +15,10 @@ import type {
   RunQueryResult,
 } from '@naturalcycles/db-lib'
 import { BaseCommonDB, commonDBFullSupport } from '@naturalcycles/db-lib'
-import { _chunk } from '@naturalcycles/js-lib'
-import { _assert, _errorDataAppend, TimeoutError } from '@naturalcycles/js-lib/error'
+import { _round } from '@naturalcycles/js-lib'
+import { _chunk } from '@naturalcycles/js-lib/array/array.util.js'
+import { _assert } from '@naturalcycles/js-lib/error/assert.js'
+import { _errorDataAppend, TimeoutError } from '@naturalcycles/js-lib/error/error.util.js'
 import type {
   JsonSchemaAny,
   JsonSchemaBoolean,
@@ -28,9 +30,11 @@ import type {
 } from '@naturalcycles/js-lib/json-schema'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { commonLoggerMinLevel } from '@naturalcycles/js-lib/log'
-import { _omit } from '@naturalcycles/js-lib/object'
+import { _omit } from '@naturalcycles/js-lib/object/object.util.js'
 import type { PRetryOptions } from '@naturalcycles/js-lib/promise'
-import { pMap, pRetry, pRetryFn, pTimeout } 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 type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import { boldWhite } from '@naturalcycles/nodejs-lib/colors'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
@@ -657,7 +661,8 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
 
     return {
       // Datastore expects UnixTimestamp in milliseconds
-      readTime: opt.readAt * 1000,
+      // Datastore requires the timestamp to be rounded to the whole minutes
+      readTime: _round(opt.readAt, 60) * 1000,
     }
   }
 }

package/src/datastoreKeyValueDB.ts

@@ -1,7 +1,7 @@
 import { DBQuery } from '@naturalcycles/db-lib'
 import type { CommonKeyValueDB, IncrementTuple, KeyValueDBTuple } from '@naturalcycles/db-lib/kv'
 import { commonKeyValueDBFullSupport } from '@naturalcycles/db-lib/kv'
-import { AppError } from '@naturalcycles/js-lib/error'
+import { AppError } from '@naturalcycles/js-lib/error/error.util.js'
 import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import { DatastoreDB } from './datastore.db.js'