@naturalcycles/db-lib 8.54.1 → 8.54.3

package/dist/cnst.js

@@ -7,4 +7,4 @@ var DBLibError;
     DBLibError["DAO_IS_READ_ONLY"] = "DAO_IS_READ_ONLY";
     DBLibError["NON_UNIQUE_ID"] = "NON_UNIQUE_ID";
     DBLibError["OBJECT_IS_IMMUTABLE"] = "OBJECT_IS_IMMUTABLE";
-})(DBLibError = exports.DBLibError || (exports.DBLibError = {}));
+})(DBLibError || (exports.DBLibError = DBLibError = {}));

package/dist/commondao/common.dao.d.ts

@@ -1,5 +1,5 @@
 import { AnyObject, AsyncMapper, JsonSchemaObject, JsonSchemaRootObject, ObjectWithId, Promisable, Saved, UnixTimestampMillisNumber, Unsaved, ZodSchema } from '@naturalcycles/js-lib';
-import { AjvSchema, ObjectSchemaTyped, ReadableTyped } from '@naturalcycles/nodejs-lib';
+import { AjvSchema, ObjectSchema, ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { DBDeleteByIdsOperation, DBModelType, DBOperation, DBPatch, DBSaveBatchOperation, RunQueryResult } from '../db.model';
 import { DBQuery, RunnableDBQuery } from '../query/dbQuery';
 import { CommonDaoCfg, CommonDaoCreateOptions, CommonDaoOptions, CommonDaoSaveOptions, CommonDaoStreamForEachOptions, CommonDaoStreamOptions } from './common.dao.model';
@@ -145,7 +145,7 @@ export declare class CommonDao<BM extends Partial<ObjectWithId<ID>>, DBM extends
      *
      * Does NOT mutate the object.
      */
-    validateAndConvert<IN, OUT = IN>(obj: Partial<IN>, schema: ObjectSchemaTyped<IN> | AjvSchema<IN> | ZodSchema<IN> | undefined, modelType: DBModelType, opt?: CommonDaoOptions): OUT;
+    validateAndConvert<IN, OUT = IN>(obj: Partial<IN>, schema: ObjectSchema<IN> | AjvSchema<IN> | ZodSchema<IN> | undefined, modelType: DBModelType, opt?: CommonDaoOptions): OUT;
     getTableSchema(): Promise<JsonSchemaRootObject<DBM>>;
     createTable(schema: JsonSchemaObject<DBM>, opt?: CommonDaoCreateOptions): Promise<void>;
     /**

package/dist/commondao/common.dao.js

@@ -215,7 +215,7 @@ class CommonDao {
     }
     throwRequiredError(id, opt) {
         const table = opt.table || this.cfg.table;
-        throw new js_lib_1.AppError(`DB row required, but not found: ${table}.${id}`, {
+        throw new js_lib_1.AppError(`DB row required, but not found in ${table}`, {
             code: cnst_1.DBLibError.DB_ROW_REQUIRED,
             table,
             id,

package/dist/commondao/common.dao.model.d.ts

@@ -1,5 +1,5 @@
 import { CommonLogger, ErrorMode, ObjectWithId, Promisable, Saved, ZodError, ZodSchema } from '@naturalcycles/js-lib';
-import { AjvSchema, AjvValidationError, JoiValidationError, ObjectSchemaTyped, TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
+import { AjvSchema, AjvValidationError, JoiValidationError, ObjectSchema, TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
 import { CommonDB } from '../common.db';
 import { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions } from '../db.model';
 export interface CommonDaoHooks<BM extends Partial<ObjectWithId<ID>>, DBM extends ObjectWithId<ID>, TM, ID extends string | number> {
@@ -110,9 +110,9 @@ export interface CommonDaoCfg<BM extends Partial<ObjectWithId<ID>>, DBM extends
     /**
      * Joi, AjvSchema or ZodSchema is supported.
      */
-    dbmSchema?: ObjectSchemaTyped<DBM> | AjvSchema<DBM> | ZodSchema<DBM>;
-    bmSchema?: ObjectSchemaTyped<BM> | AjvSchema<BM> | ZodSchema<BM>;
-    tmSchema?: ObjectSchemaTyped<TM> | AjvSchema<TM> | ZodSchema<TM>;
+    dbmSchema?: ObjectSchema<DBM> | AjvSchema<DBM> | ZodSchema<DBM>;
+    bmSchema?: ObjectSchema<BM> | AjvSchema<BM> | ZodSchema<BM>;
+    tmSchema?: ObjectSchema<TM> | AjvSchema<TM> | ZodSchema<TM>;
     excludeFromIndexes?: (keyof DBM)[];
     /**
      * Defaults to false.

package/dist/commondao/common.dao.model.js

@@ -19,4 +19,4 @@ var CommonDaoLogLevel;
      * Log EVERYTHING - all data passing in and out (max 10 rows). Very verbose!
      */
     CommonDaoLogLevel[CommonDaoLogLevel["DATA_FULL"] = 30] = "DATA_FULL";
-})(CommonDaoLogLevel = exports.CommonDaoLogLevel || (exports.CommonDaoLogLevel = {}));
+})(CommonDaoLogLevel || (exports.CommonDaoLogLevel = CommonDaoLogLevel = {}));

package/dist/db.model.js

@@ -5,13 +5,13 @@ var DBRelation;
 (function (DBRelation) {
     DBRelation["ONE_TO_ONE"] = "ONE_TO_ONE";
     DBRelation["ONE_TO_MANY"] = "ONE_TO_MANY";
-})(DBRelation = exports.DBRelation || (exports.DBRelation = {}));
+})(DBRelation || (exports.DBRelation = DBRelation = {}));
 var DBModelType;
 (function (DBModelType) {
     DBModelType["DBM"] = "DBM";
     DBModelType["BM"] = "BM";
     DBModelType["TM"] = "TM";
-})(DBModelType = exports.DBModelType || (exports.DBModelType = {}));
+})(DBModelType || (exports.DBModelType = DBModelType = {}));
 /**
  * Allows to construct a query similar to:
  *

package/dist/kv/commonKeyValueDao.js

@@ -44,7 +44,7 @@ class CommonKeyValueDao {
         const [r] = await this.getByIds([id]);
         if (!r) {
             const { table } = this.cfg;
-            throw new js_lib_1.AppError(`DB row required, but not found: ${table}.${id}`, {
+            throw new js_lib_1.AppError(`DB row required, but not found in ${table}`, {
                 code: cnst_1.DBLibError.DB_ROW_REQUIRED,
                 table,
                 id,
@@ -56,7 +56,7 @@ class CommonKeyValueDao {
         const [r] = await this.cfg.db.getByIds(this.cfg.table, [id]);
         if (!r) {
             const { table } = this.cfg;
-            throw new js_lib_1.AppError(`DB row required, but not found: ${table}.${id}`, {
+            throw new js_lib_1.AppError(`DB row required, but not found in ${table}`, {
                 code: cnst_1.DBLibError.DB_ROW_REQUIRED,
                 table,
                 id,

package/dist/testing/test.model.d.ts

@@ -15,9 +15,9 @@ export interface TestItemTM {
     k1: string;
     even?: boolean;
 }
-export declare const testItemBMSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<TestItemBM, TestItemBM>;
-export declare const testItemDBMSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<TestItemDBM, TestItemDBM>;
-export declare const testItemTMSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<TestItemTM, TestItemTM>;
+export declare const testItemBMSchema: import("joi").ObjectSchema<TestItemBM>;
+export declare const testItemDBMSchema: import("joi").ObjectSchema<TestItemDBM>;
+export declare const testItemTMSchema: import("joi").ObjectSchema<TestItemTM>;
 export declare const testItemBMJsonSchema: JsonSchemaObject<TestItemBM>;
 export declare const testItemDBMJsonSchema: JsonSchemaObject<TestItemDBM>;
 export declare function createTestItemDBM(num?: number): TestItemDBM;

package/dist/timeseries/commonTimeSeriesDao.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonTimeSeriesDao = void 0;
+const js_lib_1 = require("@naturalcycles/js-lib");
 const __1 = require("..");
 const dbQuery_1 = require("../query/dbQuery");
 const _TIMESERIES_RAW = '_TIMESERIES_RAW';
@@ -20,7 +21,7 @@ class CommonTimeSeriesDao {
     async getSeries() {
         return (await this.cfg.db.getTables())
             .map(t => /^(.*)_TIMESERIES_RAW$/.exec(t)?.[1])
-            .filter(Boolean);
+            .filter(js_lib_1._isTruthy);
     }
     // convenience method
     async save(series, tsMillis, value) {

package/dist/validation/index.d.ts

@@ -1,8 +1,8 @@
 import { CommonDBOptions, CommonDBSaveOptions } from '../db.model';
-import { DBQuery, DBQueryFilter, DBQueryOrder } from '../query/dbQuery';
-export declare const commonDBOptionsSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<CommonDBOptions, CommonDBOptions>;
-export declare const commonDBSaveOptionsSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<CommonDBSaveOptions<any>, CommonDBSaveOptions<any>>;
-export declare const dbQueryFilterOperatorSchema: import("@naturalcycles/nodejs-lib/dist/validation/joi/string.extensions").ExtendedStringSchema;
-export declare const dbQueryFilterSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<DBQueryFilter<import("@naturalcycles/js-lib").AnyObjectWithId<string | number>>, DBQueryFilter<import("@naturalcycles/js-lib").AnyObjectWithId<string | number>>>;
-export declare const dbQueryOrderSchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<DBQueryOrder<import("@naturalcycles/js-lib").AnyObjectWithId<string | number>>, DBQueryOrder<import("@naturalcycles/js-lib").AnyObjectWithId<string | number>>>;
-export declare const dbQuerySchema: import("@naturalcycles/nodejs-lib").ObjectSchemaTyped<DBQuery<any>, DBQuery<any>>;
+import { DBQuery, DBQueryFilter, DBQueryFilterOperator, DBQueryOrder } from '../query/dbQuery';
+export declare const commonDBOptionsSchema: import("joi").ObjectSchema<CommonDBOptions>;
+export declare const commonDBSaveOptionsSchema: import("joi").ObjectSchema<CommonDBSaveOptions<any>>;
+export declare const dbQueryFilterOperatorSchema: import("@naturalcycles/nodejs-lib/dist/validation/joi/string.extensions").StringSchema<DBQueryFilterOperator>;
+export declare const dbQueryFilterSchema: import("joi").ObjectSchema<DBQueryFilter<import("@naturalcycles/js-lib").AnyObjectWithId<string | number>>>;
+export declare const dbQueryOrderSchema: import("joi").ObjectSchema<DBQueryOrder<import("@naturalcycles/js-lib").AnyObjectWithId<string | number>>>;
+export declare const dbQuerySchema: import("joi").ObjectSchema<DBQuery<any>>;

package/dist/validation/index.js

@@ -10,7 +10,7 @@ exports.commonDBOptionsSchema = (0, nodejs_lib_1.objectSchema)({
 exports.commonDBSaveOptionsSchema = (0, nodejs_lib_1.objectSchema)({
     excludeFromIndexes: (0, nodejs_lib_1.arraySchema)(nodejs_lib_1.stringSchema).optional(),
 }).concat(exports.commonDBOptionsSchema);
-exports.dbQueryFilterOperatorSchema = nodejs_lib_1.stringSchema.valid(...dbQuery_1.dbQueryFilterOperatorValues);
+exports.dbQueryFilterOperatorSchema = nodejs_lib_1.Joi.string().valid(...dbQuery_1.dbQueryFilterOperatorValues);
 exports.dbQueryFilterSchema = (0, nodejs_lib_1.objectSchema)({
     name: nodejs_lib_1.stringSchema,
     op: exports.dbQueryFilterOperatorSchema,

package/package.json

@@ -40,7 +40,7 @@
   "engines": {
     "node": ">=18.12"
   },
-  "version": "8.54.1",
+  "version": "8.54.3",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

package/readme.md

@@ -5,7 +5,7 @@
 [![npm](https://img.shields.io/npm/v/@naturalcycles/db-lib/latest.svg)](https://www.npmjs.com/package/@naturalcycles/db-lib)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
 [![loc](https://badgen.net/codeclimate/loc/NaturalCycles/db-lib)](https://github.com/NaturalCycles/db-lib)
-[![Actions](https://github.com/NaturalCycles/db-lib/workflows/default/badge.svg)](https://github.com/NaturalCycles/db-lib/actions)
+[![Actions](https://github.com/NaturalCycles/db-lib/workflows/ci/badge.svg)](https://github.com/NaturalCycles/db-lib/actions)
 
 Defines 3 things:
 

package/src/adapter/file/file.db.ts

@@ -52,7 +52,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     }
   }
 
-  public cfg!: FileDBCfg
+  cfg!: FileDBCfg
 
   override async ping(): Promise<void> {
     await this.cfg.plugin.ping()

package/src/adapter/file/localFile.persistence.plugin.ts

@@ -39,7 +39,7 @@ export class LocalFilePersistencePlugin implements FileDBPersistencePlugin {
     }
   }
 
-  public cfg!: LocalFilePersistencePluginCfg
+  cfg!: LocalFilePersistencePluginCfg
 
   async ping(): Promise<void> {}
 

package/src/commondao/common.dao.model.ts

@@ -11,7 +11,7 @@ import {
   AjvSchema,
   AjvValidationError,
   JoiValidationError,
-  ObjectSchemaTyped,
+  ObjectSchema,
   TransformLogProgressOptions,
   TransformMapOptions,
 } from '@naturalcycles/nodejs-lib'
@@ -148,9 +148,9 @@ export interface CommonDaoCfg<
   /**
    * Joi, AjvSchema or ZodSchema is supported.
    */
-  dbmSchema?: ObjectSchemaTyped<DBM> | AjvSchema<DBM> | ZodSchema<DBM>
-  bmSchema?: ObjectSchemaTyped<BM> | AjvSchema<BM> | ZodSchema<BM>
-  tmSchema?: ObjectSchemaTyped<TM> | AjvSchema<TM> | ZodSchema<TM>
+  dbmSchema?: ObjectSchema<DBM> | AjvSchema<DBM> | ZodSchema<DBM>
+  bmSchema?: ObjectSchema<BM> | AjvSchema<BM> | ZodSchema<BM>
+  tmSchema?: ObjectSchema<TM> | AjvSchema<TM> | ZodSchema<TM>
 
   excludeFromIndexes?: (keyof DBM)[]
 

package/src/commondao/common.dao.ts

@@ -30,7 +30,7 @@ import {
   AjvValidationError,
   getValidationResult,
   JoiValidationError,
-  ObjectSchemaTyped,
+  ObjectSchema,
   ReadableTyped,
   stringId,
   transformBuffer,
@@ -249,7 +249,7 @@ export class CommonDao<
 
   private throwRequiredError(id: ID, opt: CommonDaoOptions): never {
     const table = opt.table || this.cfg.table
-    throw new AppError(`DB row required, but not found: ${table}.${id}`, {
+    throw new AppError(`DB row required, but not found in ${table}`, {
       code: DBLibError.DB_ROW_REQUIRED,
       table,
       id,
@@ -453,7 +453,7 @@ export class CommonDao<
           if (partialQuery || opt.raw) return dbm as any
 
           if (this.cfg.hooks!.afterLoad) {
-            dbm = (await this.cfg.hooks!.afterLoad(dbm)) as DBM
+            dbm = (await this.cfg.hooks!.afterLoad(dbm))!
             if (dbm === null) return SKIP
           }
 
@@ -503,7 +503,7 @@ export class CommonDao<
           if (partialQuery || opt.raw) return dbm
 
           if (this.cfg.hooks!.afterLoad) {
-            dbm = (await this.cfg.hooks!.afterLoad(dbm)) as DBM
+            dbm = (await this.cfg.hooks!.afterLoad(dbm))!
             if (dbm === null) return SKIP
           }
 
@@ -550,7 +550,7 @@ export class CommonDao<
         transformMap<any, DBM>(
           async dbm => {
             if (this.cfg.hooks!.afterLoad) {
-              dbm = (await this.cfg.hooks!.afterLoad(dbm)) as DBM
+              dbm = (await this.cfg.hooks!.afterLoad(dbm))!
               if (dbm === null) return SKIP
             }
 
@@ -592,7 +592,7 @@ export class CommonDao<
           transformMap<DBM, Saved<BM>>(
             async dbm => {
               if (this.cfg.hooks!.afterLoad) {
-                dbm = (await this.cfg.hooks!.afterLoad(dbm)) as DBM
+                dbm = (await this.cfg.hooks!.afterLoad(dbm))!
                 if (dbm === null) return SKIP
               }
 
@@ -765,7 +765,7 @@ export class CommonDao<
     let dbm = await this.bmToDBM(bm as BM, opt)
 
     if (this.cfg.hooks!.beforeSave) {
-      dbm = (await this.cfg.hooks!.beforeSave(dbm)) as DBM
+      dbm = (await this.cfg.hooks!.beforeSave(dbm))!
       if (dbm === null && !opt.tx) return bm as any
     }
 
@@ -852,7 +852,7 @@ export class CommonDao<
     const assignGeneratedIds = opt.assignGeneratedIds || this.cfg.assignGeneratedIds
 
     if (this.cfg.hooks!.beforeSave) {
-      row = (await this.cfg.hooks!.beforeSave(row)) as DBM
+      row = (await this.cfg.hooks!.beforeSave(row))!
       if (row === null) return dbm
     }
 
@@ -1178,7 +1178,7 @@ export class CommonDao<
    */
   validateAndConvert<IN, OUT = IN>(
     obj: Partial<IN>,
-    schema: ObjectSchemaTyped<IN> | AjvSchema<IN> | ZodSchema<IN> | undefined,
+    schema: ObjectSchema<IN> | AjvSchema<IN> | ZodSchema<IN> | undefined,
     modelType: DBModelType,
     opt: CommonDaoOptions = {},
   ): OUT {
@@ -1231,7 +1231,7 @@ export class CommonDao<
       })
     } else {
       // Joi
-      const vr = getValidationResult<IN, OUT>(obj as IN, schema, objectName)
+      const vr = getValidationResult(obj, schema, objectName)
       error = vr.error
       convertedValue = vr.value
     }

package/src/kv/commonKeyValueDao.ts

@@ -90,7 +90,7 @@ export class CommonKeyValueDao<T> {
 
     if (!r) {
       const { table } = this.cfg
-      throw new AppError(`DB row required, but not found: ${table}.${id}`, {
+      throw new AppError(`DB row required, but not found in ${table}`, {
         code: DBLibError.DB_ROW_REQUIRED,
         table,
         id,
@@ -105,7 +105,7 @@ export class CommonKeyValueDao<T> {
 
     if (!r) {
       const { table } = this.cfg
-      throw new AppError(`DB row required, but not found: ${table}.${id}`, {
+      throw new AppError(`DB row required, but not found in ${table}`, {
         code: DBLibError.DB_ROW_REQUIRED,
         table,
         id,

package/src/query/dbQuery.ts

@@ -244,7 +244,10 @@ export class RunnableDBQuery<
   /**
    * Pass `table` to override table.
    */
-  constructor(public dao: CommonDao<BM, DBM, TM, ID>, table?: string) {
+  constructor(
+    public dao: CommonDao<BM, DBM, TM, ID>,
+    table?: string,
+  ) {
     super(table || dao.cfg.table)
   }
 

package/src/testing/dbTest.ts

@@ -112,7 +112,7 @@ export function runCommonDBTest(
   deepFreeze(items)
   const item1 = items[0]!
 
-  const queryAll = () => DBQuery.create<TestItemDBM>(TEST_TABLE)
+  const queryAll = (): DBQuery<TestItemDBM> => DBQuery.create<TestItemDBM>(TEST_TABLE)
 
   test('ping', async () => {
     await db.ping()

package/src/testing/test.model.ts

@@ -35,7 +35,7 @@ export const testItemBMSchema = objectSchema<TestItemBM>({
   k3: numberSchema.optional(),
   even: booleanSchema.optional(),
   b1: binarySchema.optional(),
-}).concat(baseDBEntitySchema)
+}).concat(baseDBEntitySchema as any)
 
 export const testItemDBMSchema = objectSchema<TestItemDBM>({
   k1: stringSchema,
@@ -43,7 +43,7 @@ export const testItemDBMSchema = objectSchema<TestItemDBM>({
   k3: numberSchema.optional(),
   even: booleanSchema.optional(),
   b1: binarySchema.optional(),
-}).concat(savedDBEntitySchema)
+}).concat(savedDBEntitySchema as any)
 
 export const testItemTMSchema = objectSchema<TestItemTM>({
   k1: stringSchema,

package/src/timeseries/commonTimeSeriesDao.ts

@@ -1,4 +1,4 @@
-import { ObjectWithId } from '@naturalcycles/js-lib'
+import { _isTruthy, ObjectWithId } from '@naturalcycles/js-lib'
 import { DBTransaction } from '..'
 import { DBQuery } from '../query/dbQuery'
 import {
@@ -26,8 +26,8 @@ export class CommonTimeSeriesDao {
 
   async getSeries(): Promise<string[]> {
     return (await this.cfg.db.getTables())
-      .map(t => /^(.*)_TIMESERIES_RAW$/.exec(t)?.[1] as string)
-      .filter(Boolean)
+      .map(t => /^(.*)_TIMESERIES_RAW$/.exec(t)?.[1])
+      .filter(_isTruthy)
   }
 
   // convenience method

package/src/validation/index.ts

@@ -3,11 +3,18 @@ import {
   arraySchema,
   booleanSchema,
   integerSchema,
+  Joi,
   objectSchema,
   stringSchema,
 } from '@naturalcycles/nodejs-lib'
 import { CommonDBOptions, CommonDBSaveOptions } from '../db.model'
-import { DBQuery, DBQueryFilter, dbQueryFilterOperatorValues, DBQueryOrder } from '../query/dbQuery'
+import {
+  DBQuery,
+  DBQueryFilter,
+  DBQueryFilterOperator,
+  dbQueryFilterOperatorValues,
+  DBQueryOrder,
+} from '../query/dbQuery'
 
 export const commonDBOptionsSchema = objectSchema<CommonDBOptions>({
   onlyCache: booleanSchema.optional(),
@@ -18,7 +25,9 @@ export const commonDBSaveOptionsSchema = objectSchema<CommonDBSaveOptions>({
   excludeFromIndexes: arraySchema(stringSchema).optional(),
 }).concat(commonDBOptionsSchema)
 
-export const dbQueryFilterOperatorSchema = stringSchema.valid(...dbQueryFilterOperatorValues)
+export const dbQueryFilterOperatorSchema = Joi.string<DBQueryFilterOperator>().valid(
+  ...dbQueryFilterOperatorValues,
+)
 
 export const dbQueryFilterSchema = objectSchema<DBQueryFilter>({
   name: stringSchema,