@naturalcycles/datastore-lib 4.17.0 → 4.18.1

package/dist/datastore.db.d.ts

@@ -2,9 +2,9 @@ import type { Key, Transaction } from '@google-cloud/datastore';
 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 { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
 import type { CommonLogger } from '@naturalcycles/js-lib/log';
 import { type ObjectWithId, type 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';
 /**
@@ -57,9 +57,9 @@ export declare class DatastoreDB extends BaseCommonDB implements CommonDB {
     key(ds: Datastore, kind: string, id: string): Key;
     private getDsKey;
     private getIdFromKey;
-    createTable<ROW extends ObjectWithId>(_table: string, _schema: JsonSchemaObject<ROW>): Promise<void>;
+    createTable<ROW extends ObjectWithId>(_table: string, _schema: JsonSchema<ROW>): Promise<void>;
     getTables(): Promise<string[]>;
-    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;
+    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchema<ROW>>;
     private getPRetryOptions;
     /**
      * Silently rollback the transaction.

package/dist/datastore.db.js

@@ -200,18 +200,17 @@ export class DatastoreDB extends BaseCommonDB {
         };
     }
     streamQuery(dbQuery, _opt) {
-        return Pipeline.fromAsyncReadable(async () => {
-            const ds = this.ds();
-            const q = dbQueryToDatastoreQuery(dbQuery, ds.createQuery(dbQuery.table));
-            const opt = {
-                logger: this.cfg.logger,
-                ...this.cfg.streamOptions,
-                ..._opt,
-            };
-            return opt.experimentalCursorStream
-                ? new DatastoreStreamReadable(q, opt)
-                : ds.runQueryStream(q, this.getRunQueryOptions(opt));
-        }).mapSync(r => this.mapId(r));
+        const ds = this.ds();
+        const q = dbQueryToDatastoreQuery(dbQuery, ds.createQuery(dbQuery.table));
+        const opt = {
+            logger: this.cfg.logger,
+            ...this.cfg.streamOptions,
+            ..._opt,
+        };
+        const readable = opt.experimentalCursorStream
+            ? new DatastoreStreamReadable(q, opt)
+            : ds.runQueryStream(q, this.getRunQueryOptions(opt));
+        return Pipeline.from(readable).mapSync(r => this.mapId(r));
     }
     // https://github.com/GoogleCloudPlatform/nodejs-getting-started/blob/master/2-structured-data/books/model-datastore.js
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/datastore-lib",
   "type": "module",
-  "version": "4.17.0",
+  "version": "4.18.1",
   "description": "Opinionated library to work with Google Datastore, implements CommonDB",
   "dependencies": {
     "@google-cloud/datastore": "^10",
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@types/node": "^24",
-    "@naturalcycles/dev-lib": "20.6.0"
+    "@naturalcycles/dev-lib": "20.11.0"
   },
   "exports": {
     ".": "./dist/index.js"
@@ -27,7 +27,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=24.10.0"
   },
   "publishConfig": {
     "access": "public"

package/src/datastore.db.ts

@@ -20,15 +20,6 @@ import { _chunk } from '@naturalcycles/js-lib/array/array.util.js'
 import { _ms } from '@naturalcycles/js-lib/datetime/time.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,
-  JsonSchemaNull,
-  JsonSchemaNumber,
-  JsonSchemaObject,
-  JsonSchemaRootObject,
-  JsonSchemaString,
-} from '@naturalcycles/js-lib/json-schema'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { _omit } from '@naturalcycles/js-lib/object/object.util.js'
 import type { PRetryOptions } from '@naturalcycles/js-lib/promise'
@@ -41,6 +32,7 @@ import {
   type ObjectWithId,
   type 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'
 import type {
@@ -310,21 +302,20 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     dbQuery: DBQuery<ROW>,
     _opt?: DatastoreDBStreamOptions,
   ): Pipeline<ROW> {
-    return Pipeline.fromAsyncReadable<ROW>(async () => {
-      const ds = this.ds()
+    const ds = this.ds()
+    const q = dbQueryToDatastoreQuery(dbQuery, ds.createQuery(dbQuery.table))
 
-      const q = dbQueryToDatastoreQuery(dbQuery, ds.createQuery(dbQuery.table))
+    const opt = {
+      logger: this.cfg.logger,
+      ...this.cfg.streamOptions,
+      ..._opt,
+    }
 
-      const opt = {
-        logger: this.cfg.logger,
-        ...this.cfg.streamOptions,
-        ..._opt,
-      }
+    const readable = opt.experimentalCursorStream
+      ? new DatastoreStreamReadable<ROW>(q, opt)
+      : ds.runQueryStream(q, this.getRunQueryOptions(opt))
 
-      return opt.experimentalCursorStream
-        ? new DatastoreStreamReadable<ROW>(q, opt)
-        : ds.runQueryStream(q, this.getRunQueryOptions(opt))
-    }).mapSync(r => this.mapId<ROW>(r))
+    return Pipeline.from<ROW>(readable).mapSync(r => this.mapId<ROW>(r))
   }
 
   // https://github.com/GoogleCloudPlatform/nodejs-getting-started/blob/master/2-structured-data/books/model-datastore.js
@@ -585,7 +576,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
 
   override async createTable<ROW extends ObjectWithId>(
     _table: string,
-    _schema: JsonSchemaObject<ROW>,
+    _schema: JsonSchema<ROW>,
   ): Promise<void> {}
 
   override async getTables(): Promise<string[]> {
@@ -594,12 +585,10 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     return statsArray.map(stats => stats.kind_name).filter(table => table && !table.startsWith('_'))
   }
 
-  override async getTableSchema<ROW extends ObjectWithId>(
-    table: string,
-  ): Promise<JsonSchemaRootObject<ROW>> {
+  override async getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchema<ROW>> {
     const stats = await this.getTableProperties(table)
 
-    const s: JsonSchemaRootObject<ROW> = {
+    const s: JsonSchema<ROW> = {
       $id: `${table}.schema.json`,
       type: 'object',
       properties: {
@@ -616,40 +605,40 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
         const name = stats.property_name as keyof ROW
 
         if (dtype === DatastoreType.Blob) {
-          s.properties[name] = {
+          s.properties![name] = {
             instanceof: 'Buffer',
-          } as JsonSchemaAny
+          } as JsonSchema<any, ROW[typeof name]>
         } else if (dtype === DatastoreType.Text || dtype === DatastoreType.String) {
-          s.properties[name] = {
+          s.properties![name] = {
             type: 'string',
-          } as JsonSchemaString
+          } as JsonSchema<ROW[typeof name]>
         } else if (dtype === DatastoreType.EmbeddedEntity) {
-          s.properties[name] = {
+          s.properties![name] = {
             type: 'object',
             additionalProperties: true,
-            properties: {},
+            properties: {} as any,
             required: [],
-          } as JsonSchemaObject
+          } as JsonSchema<ROW[typeof name]>
         } else if (dtype === DatastoreType.Integer) {
-          s.properties[name] = {
+          s.properties![name] = {
             type: 'integer',
-          } as JsonSchemaNumber
+          } as JsonSchema<ROW[typeof name]>
         } else if (dtype === DatastoreType.Float) {
-          s.properties[name] = {
+          s.properties![name] = {
             type: 'number',
-          } as JsonSchemaNumber
+          } as JsonSchema<ROW[typeof name]>
         } else if (dtype === DatastoreType.Boolean) {
-          s.properties[name] = {
+          s.properties![name] = {
             type: 'boolean',
-          } as JsonSchemaBoolean
+          } as JsonSchema<ROW[typeof name]>
         } else if (dtype === DatastoreType.DATE_TIME) {
           // Don't know how to map it properly
-          s.properties[name] = {} as JsonSchemaAny
+          s.properties![name] = {} as JsonSchema<any>
         } else if (dtype === DatastoreType.NULL) {
           // check, maybe we can just skip this type and do nothing?
-          s.properties[name] ||= {
+          s.properties![name] ||= {
             type: 'null',
-          } as JsonSchemaNull
+          } as JsonSchema<ROW[typeof name]>
         } else {
           throw new Error(
             `Unknown Datastore Type '${stats.property_type}' for ${table}.${name as string}`,