@naturalcycles/datastore-lib 4.5.0 → 4.6.0

package/dist/DatastoreStreamReadable.d.ts

@@ -1,6 +1,6 @@
 import { Readable } from 'node:stream';
 import type { Query } from '@google-cloud/datastore';
-import type { CommonLogger } from '@naturalcycles/js-lib';
+import type { CommonLogger } from '@naturalcycles/js-lib/log';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { DatastoreDBStreamOptions } from './datastore.model.js';
 export declare class DatastoreStreamReadable<T = any> extends Readable implements ReadableTyped<T> {

package/dist/DatastoreStreamReadable.js

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

package/dist/datastore.db.d.ts

@@ -1,7 +1,9 @@
 import type { Datastore, Key, Transaction } 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, JsonSchemaObject, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
+import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
+import type { CommonLogger } from '@naturalcycles/js-lib/log';
+import type { ObjectWithId } from '@naturalcycles/js-lib/types';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { DatastoreDBCfg, DatastoreDBOptions, DatastoreDBReadOptions, DatastoreDBSaveOptions, DatastoreDBStreamOptions, DatastorePropertyStats, DatastoreStats } from './datastore.model.js';
 /**

package/dist/datastore.db.js

@@ -1,6 +1,10 @@
 import { Transform } from 'node:stream';
 import { BaseCommonDB, commonDBFullSupport } from '@naturalcycles/db-lib';
-import { _assert, _chunk, _errorDataAppend, _omit, commonLoggerMinLevel, pMap, pRetry, pRetryFn, pTimeout, TimeoutError, } from '@naturalcycles/js-lib';
+import { _chunk } from '@naturalcycles/js-lib';
+import { _assert, _errorDataAppend, TimeoutError } from '@naturalcycles/js-lib/error';
+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 { boldWhite } from '@naturalcycles/nodejs-lib/colors';
 import { DatastoreType } from './datastore.model.js';
 import { DatastoreStreamReadable } from './DatastoreStreamReadable.js';

package/dist/datastore.model.d.ts

@@ -1,6 +1,7 @@
 import type { DatastoreOptions, Key } from '@google-cloud/datastore';
 import type { CommonDBOptions, CommonDBReadOptions, CommonDBSaveOptions } from '@naturalcycles/db-lib';
-import type { CommonLogger, NumberOfSeconds, ObjectWithId } from '@naturalcycles/js-lib';
+import type { CommonLogger } from '@naturalcycles/js-lib/log';
+import type { NumberOfSeconds, ObjectWithId } from '@naturalcycles/js-lib/types';
 export interface DatastorePayload<T = any> {
     key: Key;
     data: T;

package/dist/datastoreKeyValueDB.d.ts

@@ -1,4 +1,4 @@
-import type { CommonKeyValueDB, IncrementTuple, KeyValueDBTuple } from '@naturalcycles/db-lib';
+import type { CommonKeyValueDB, IncrementTuple, KeyValueDBTuple } from '@naturalcycles/db-lib/kv';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import { DatastoreDB } from './datastore.db.js';
 import type { DatastoreDBCfg } from './datastore.model.js';

package/dist/datastoreKeyValueDB.js

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

package/dist/query.util.d.ts

@@ -1,4 +1,4 @@
 import type { PropertyFilter, Query } from '@google-cloud/datastore';
 import type { DBQuery } from '@naturalcycles/db-lib';
-import type { ObjectWithId } from '@naturalcycles/js-lib';
+import type { ObjectWithId } from '@naturalcycles/js-lib/types';
 export declare function dbQueryToDatastoreQuery<ROW extends ObjectWithId>(dbQuery: Readonly<DBQuery<ROW>>, emptyQuery: Query, propertyFilterClass: typeof PropertyFilter): Query;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/datastore-lib",
   "type": "module",
-  "version": "4.5.0",
+  "version": "4.6.0",
   "description": "Opinionated library to work with Google Datastore, implements CommonDB",
   "dependencies": {
     "@google-cloud/datastore": "^10",

package/src/DatastoreStreamReadable.ts

@@ -1,8 +1,10 @@
 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 type { CommonLogger, UnixTimestampMillis } from '@naturalcycles/js-lib'
-import { _ms, pRetry } from '@naturalcycles/js-lib'
+import { _ms } from '@naturalcycles/js-lib/datetime'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import { pRetry } from '@naturalcycles/js-lib/promise'
+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,9 @@ 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 type {
-  CommonLogger,
   JsonSchemaAny,
   JsonSchemaBoolean,
   JsonSchemaNull,
@@ -24,21 +25,13 @@ import type {
   JsonSchemaObject,
   JsonSchemaRootObject,
   JsonSchemaString,
-  ObjectWithId,
-  PRetryOptions,
-} from '@naturalcycles/js-lib'
-import {
-  _assert,
-  _chunk,
-  _errorDataAppend,
-  _omit,
-  commonLoggerMinLevel,
-  pMap,
-  pRetry,
-  pRetryFn,
-  pTimeout,
-  TimeoutError,
-} from '@naturalcycles/js-lib'
+} 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 type { PRetryOptions } from '@naturalcycles/js-lib/promise'
+import { pMap, pRetry, pRetryFn, pTimeout } from '@naturalcycles/js-lib/promise'
+import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import { boldWhite } from '@naturalcycles/nodejs-lib/colors'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import type {

package/src/datastore.model.ts

@@ -4,7 +4,8 @@ import type {
   CommonDBReadOptions,
   CommonDBSaveOptions,
 } from '@naturalcycles/db-lib'
-import type { CommonLogger, NumberOfSeconds, ObjectWithId } from '@naturalcycles/js-lib'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import type { NumberOfSeconds, ObjectWithId } from '@naturalcycles/js-lib/types'
 
 export interface DatastorePayload<T = any> {
   key: Key

package/src/datastoreKeyValueDB.ts

@@ -1,7 +1,8 @@
-import type { CommonKeyValueDB, IncrementTuple, KeyValueDBTuple } from '@naturalcycles/db-lib'
-import { commonKeyValueDBFullSupport, DBQuery } from '@naturalcycles/db-lib'
-import type { ObjectWithId } from '@naturalcycles/js-lib'
-import { AppError } from '@naturalcycles/js-lib'
+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 type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import { DatastoreDB } from './datastore.db.js'
 import type { DatastoreDBCfg } from './datastore.model.js'

package/src/query.util.ts

@@ -1,6 +1,6 @@
 import type { PropertyFilter, Query } from '@google-cloud/datastore'
 import type { DBQuery, DBQueryFilterOperator } from '@naturalcycles/db-lib'
-import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib'
+import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib/types'
 
 const FNAME_MAP: StringMap = {
   id: '__key__',