@naturalcycles/datastore-lib 3.25.0 → 3.25.2

package/dist/datastore.db.d.ts

@@ -1,6 +1,6 @@
 import type { Datastore, Key, Query } from '@google-cloud/datastore';
 import { BaseCommonDB, CommonDB, DBQuery, DBTransaction, RunQueryResult } from '@naturalcycles/db-lib';
-import { ObjectWithId, JsonSchemaRootObject, CommonLogger } from '@naturalcycles/js-lib';
+import { ObjectWithId, JsonSchemaObject, JsonSchemaRootObject, CommonLogger } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { DatastoreDBCfg, DatastoreDBOptions, DatastoreDBSaveOptions, DatastoreDBStreamOptions, DatastorePayload, DatastorePropertyStats, DatastoreStats } from './datastore.model';
 /**
@@ -55,6 +55,7 @@ export declare class DatastoreDB extends BaseCommonDB implements CommonDB {
     key(kind: string, id: string | number): Key;
     getDsKey(o: any): Key | undefined;
     getKey(key: Key): string | undefined;
+    createTable<ROW extends ObjectWithId>(_table: string, _schema: JsonSchemaObject<ROW>): Promise<void>;
     getTables(): Promise<string[]>;
     getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;
     private getPRetryOptions;

package/dist/datastore.db.js

@@ -33,13 +33,12 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
     }
     // @memo() // not used to be able to connect to many DBs in the same server instance
     ds() {
-        var _a;
         if (!this.cachedDatastore) {
             (0, js_lib_1._assert)(process.env['APP_ENV'] !== 'test', 'DatastoreDB cannot be used in Test env, please use InMemoryDB');
             // Lazy-loading
             const datastoreLib = require('@google-cloud/datastore');
             const DS = datastoreLib.Datastore;
-            (_a = this.cfg).projectId || (_a.projectId = this.cfg.credentials?.project_id || process.env['GOOGLE_CLOUD_PROJECT']);
+            this.cfg.projectId ||= this.cfg.credentials?.project_id || process.env['GOOGLE_CLOUD_PROJECT'];
             if (this.cfg.projectId) {
                 this.cfg.logger.log(`DatastoreDB connected to ${(0, colors_1.boldWhite)(this.cfg.projectId)}`);
             }
@@ -68,7 +67,7 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
         if (this.cfg.timeout) {
             // First try
             try {
-                const r = await (0, js_lib_1.pTimeout)(this.ds().get(keys), {
+                const r = await (0, js_lib_1.pTimeout)(() => this.ds().get(keys), {
                     timeout: this.cfg.timeout,
                     name: `datastore.getByIds(${table})`,
                 });
@@ -81,7 +80,7 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
                 const DS = datastoreLib.Datastore;
                 this.cachedDatastore = new DS(this.cfg);
                 // Second try (will throw)
-                const r = await (0, js_lib_1.pTimeout)(this.ds().get(keys), {
+                const r = await (0, js_lib_1.pTimeout)(() => this.ds().get(keys), {
                     timeout: this.cfg.timeout,
                     name: `datastore.getByIds(${table}) second try`,
                     errorData: {
@@ -107,6 +106,11 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
         return q.kinds[0];
     }
     async runQuery(dbQuery, _opt) {
+        if (dbQuery._ids?.length) {
+            return {
+                rows: await this.getByIds(dbQuery.table, dbQuery._ids),
+            };
+        }
         const q = (0, query_util_1.dbQueryToDatastoreQuery)(dbQuery, this.ds().createQuery(dbQuery.table));
         const qr = await this.runDatastoreQuery(q);
         // Special case when projection query didn't specify 'id'
@@ -278,6 +282,7 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
         const id = key.id || key.name;
         return id?.toString();
     }
+    async createTable(_table, _schema) { }
     async getTables() {
         const statsArray = await this.getAllStats();
         // Filter out tables starting with `_` by default (internal Datastore tables)

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@naturalcycles/datastore-lib",
-  "version": "3.25.0",
+  "version": "3.25.2",
   "description": "Opinionated library to work with Google Datastore",
   "scripts": {
     "prepare": "husky install"
   },
   "dependencies": {
     "@google-cloud/datastore": "^7.0.0",
-    "@naturalcycles/db-lib": "^8.0.0",
-    "@naturalcycles/js-lib": "^14.0.0",
+    "@naturalcycles/db-lib": "^8.46.1",
+    "@naturalcycles/js-lib": "^14.116.0",
     "@naturalcycles/nodejs-lib": "^12.0.0",
     "grpc": "^1.24.2"
   },
@@ -31,7 +31,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=16.10.0"
   },
   "publishConfig": {
     "access": "public"

package/src/datastore.db.ts

@@ -130,7 +130,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     if (this.cfg.timeout) {
       // First try
       try {
-        const r = await pTimeout(this.ds().get(keys), {
+        const r = await pTimeout(() => this.ds().get(keys), {
           timeout: this.cfg.timeout,
           name: `datastore.getByIds(${table})`,
         })
@@ -144,7 +144,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
         this.cachedDatastore = new DS(this.cfg)
 
         // Second try (will throw)
-        const r = await pTimeout(this.ds().get(keys), {
+        const r = await pTimeout(() => this.ds().get(keys), {
           timeout: this.cfg.timeout,
           name: `datastore.getByIds(${table}) second try`,
           errorData: {
@@ -176,6 +176,12 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     dbQuery: DBQuery<ROW>,
     _opt?: DatastoreDBOptions,
   ): Promise<RunQueryResult<ROW>> {
+    if (dbQuery._ids?.length) {
+      return {
+        rows: await this.getByIds(dbQuery.table, dbQuery._ids),
+      }
+    }
+
     const q = dbQueryToDatastoreQuery(dbQuery, this.ds().createQuery(dbQuery.table))
     const qr = await this.runDatastoreQuery<ROW>(q)
 
@@ -418,6 +424,11 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     return id?.toString()
   }
 
+  override async createTable<ROW extends ObjectWithId>(
+    _table: string,
+    _schema: JsonSchemaObject<ROW>,
+  ): Promise<void> {}
+
   override async getTables(): Promise<string[]> {
     const statsArray = await this.getAllStats()
     // Filter out tables starting with `_` by default (internal Datastore tables)

package/src/datastoreKeyValueDB.ts

@@ -45,7 +45,7 @@ export class DatastoreKeyValueDB implements CommonKeyValueDB {
   }
 
   streamIds(table: string, limit?: number): ReadableTyped<string> {
-    const q = DBQuery.create(table)
+    const q = DBQuery.create<KVObject>(table)
       .select(['id'])
       .limit(limit || 0)
 
@@ -63,7 +63,7 @@ export class DatastoreKeyValueDB implements CommonKeyValueDB {
 
   streamValues(table: string, limit?: number): ReadableTyped<Buffer> {
     // `select v` doesn't work for some reason
-    const q = DBQuery.create(table).limit(limit || 0)
+    const q = DBQuery.create<KVObject>(table).limit(limit || 0)
 
     const stream: ReadableTyped<string> = this.db
       .streamQuery<KVObject>(q)
@@ -78,7 +78,7 @@ export class DatastoreKeyValueDB implements CommonKeyValueDB {
   }
 
   streamEntries(table: string, limit?: number): ReadableTyped<KeyValueDBTuple> {
-    const q = DBQuery.create(table).limit(limit || 0)
+    const q = DBQuery.create<KVObject>(table).limit(limit || 0)
 
     const stream: ReadableTyped<string> = this.db
       .streamQuery<KVObject>(q)