@naturalcycles/db-lib 10.44.0 → 10.45.1

package/dist/testing/commonDaoTest.js

@@ -1,7 +1,6 @@
 import { _sortBy } from '@naturalcycles/js-lib/array/sort.js';
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js';
 import { _deepCopy, _filterObject, _omit, _pick } from '@naturalcycles/js-lib/object';
-import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv';
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import { CommonDao } from '../commondao/common.dao.js';
 import { DBQuery } from '../query/dbQuery.js';
@@ -13,7 +12,7 @@ export async function runCommonDaoTest(db, quirks = {}) {
     const dao = new CommonDao({
         table: TEST_TABLE,
         db,
-        validateBM: AjvSchema.create(testItemBMSchema).getValidationFunction(),
+        validateBM: testItemBMSchema.getValidationFunction(),
     });
     const items = createTestItemsBM(3);
     const itemsClone = _deepCopy(items);

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

@@ -1,5 +1,5 @@
 import type { BaseDBEntity } from '@naturalcycles/js-lib/types';
-import type { JsonSchemaObjectBuilder } from '@naturalcycles/nodejs-lib/ajv';
+import type { JSchema } from '@naturalcycles/nodejs-lib/ajv';
 export declare const TEST_TABLE = "TEST_TABLE";
 export declare const TEST_TABLE_2 = "TEST_TABLE_2";
 export interface TestItemBM extends BaseDBEntity {
@@ -19,7 +19,7 @@ export interface TestItemTM {
     even?: boolean;
 }
 export declare const testItemTMSchema: any;
-export declare const testItemBMSchema: JsonSchemaObjectBuilder<TestItemBM, false>;
+export declare const testItemBMSchema: JSchema<TestItemBM, false>;
 export declare function createTestItemDBM(num?: number): TestItemDBM;
 export declare function createTestItemBM(num?: number): TestItemBM;
 export declare function createTestItemsDBM(count?: number): TestItemDBM[];

package/dist/validation/index.d.ts

@@ -1,5 +1,5 @@
 import type { CommonDBOptions } from '../db.model.js';
-export declare const commonDBOptionsSchema: () => JsonSchemaObjectBuilder<CommonDBOptions, false>;
+export declare const commonDBOptionsSchema: () => JBuilder<CommonDBOptions, false>;
 export declare const commonDBSaveOptionsSchema: <ROW extends ObjectWithId>() => any;
 export declare const dbQueryFilterOperatorSchema: any;
 export declare const dbQueryFilterSchema: <ROW extends ObjectWithId>() => any;

package/dist/validation/index.js

@@ -1,15 +1,15 @@
-import { j, JsonSchemaAnyBuilder } from '@naturalcycles/nodejs-lib/ajv';
+import { j, JBuilder } from '@naturalcycles/nodejs-lib/ajv';
 import { dbQueryFilterOperatorValues } from '../query/dbQuery.js';
 // oxlint-disable typescript/explicit-function-return-type
 // DBTransaction schema - validates presence without deep validation
-const dbTransactionSchema = j.object.any().castAs();
+const dbTransactionSchema = j.object.any();
 // Schema that accepts any value (string, number, boolean, object, array, null)
-const anyValueSchema = new JsonSchemaAnyBuilder({});
+const anyValueSchema = new JBuilder({});
 export const commonDBOptionsSchema = () => j.object({
-    tx: dbTransactionSchema.optional(),
+    tx: dbTransactionSchema.optional().castAs(),
 });
 export const commonDBSaveOptionsSchema = () => j.object({
-    tx: dbTransactionSchema.optional(),
+    tx: dbTransactionSchema.optional().castAs(),
     excludeFromIndexes: j.array(j.string().castAs()).optional(),
     saveMethod: j.enum(['upsert', 'insert', 'update']).optional(),
     assignGeneratedIds: j.boolean().optional(),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/db-lib",
   "type": "module",
-  "version": "10.44.0",
+  "version": "10.45.1",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^15"

package/src/testing/commonDaoTest.ts

@@ -1,7 +1,6 @@
 import { _sortBy } from '@naturalcycles/js-lib/array/sort.js'
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js'
 import { _deepCopy, _filterObject, _omit, _pick } from '@naturalcycles/js-lib/object'
-import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv'
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream'
 import { CommonDao } from '../commondao/common.dao.js'
 import type { CommonDB } from '../commondb/common.db.js'
@@ -21,7 +20,7 @@ export async function runCommonDaoTest(
   const dao = new CommonDao({
     table: TEST_TABLE,
     db,
-    validateBM: AjvSchema.create(testItemBMSchema).getValidationFunction(),
+    validateBM: testItemBMSchema.getValidationFunction(),
   })
 
   const items = createTestItemsBM(3)

package/src/testing/test.model.ts

@@ -1,7 +1,7 @@
 import { _range } from '@naturalcycles/js-lib/array/range.js'
 import type { BaseDBEntity, UnixTimestamp } from '@naturalcycles/js-lib/types'
+import type { JSchema } from '@naturalcycles/nodejs-lib/ajv'
 import { j } from '@naturalcycles/nodejs-lib/ajv'
-import type { JsonSchemaObjectBuilder } from '@naturalcycles/nodejs-lib/ajv'
 
 const MOCK_TS_2018_06_21 = 1529539200 as UnixTimestamp
 
@@ -31,19 +31,18 @@ export const testItemTMSchema = j.object<TestItemTM>({
   even: j.boolean().optional(),
 })
 
-export const testItemBMSchema: JsonSchemaObjectBuilder<TestItemBM, false> =
-  j.object.dbEntity<TestItemBM>({
-    // todo: figure out how to not copy-paste these 3 fields
-    id: j.string(), // todo: not strictly needed here
-    created: j.number().integer().unixTimestamp(),
-    updated: j.number().integer().unixTimestamp(),
-    k1: j.string(),
-    k2: j.string().nullable().optional(),
-    k3: j.number().optional(),
-    even: j.boolean().optional(),
-    b1: j.buffer().optional(),
-    nested: j.object.infer({ foo: j.number() }).optional(),
-  })
+export const testItemBMSchema: JSchema<TestItemBM, false> = j.object.dbEntity<TestItemBM>({
+  // todo: figure out how to not copy-paste these 3 fields
+  id: j.string(), // todo: not strictly needed here
+  created: j.number().integer().unixTimestamp(),
+  updated: j.number().integer().unixTimestamp(),
+  k1: j.string(),
+  k2: j.string().nullable().optional(),
+  k3: j.number().optional(),
+  even: j.boolean().optional(),
+  b1: j.buffer().optional(),
+  nested: j.object.infer({ foo: j.number() }).optional(),
+})
 
 export function createTestItemDBM(num = 1): TestItemDBM {
   return {

package/src/validation/index.ts

@@ -1,26 +1,25 @@
 import type { ObjectWithId } from '@naturalcycles/js-lib/types'
-import { j, JsonSchemaAnyBuilder } from '@naturalcycles/nodejs-lib/ajv'
-import type { JsonSchemaObjectBuilder } from '@naturalcycles/nodejs-lib/ajv'
+import { j, JBuilder } from '@naturalcycles/nodejs-lib/ajv'
 import type { CommonDBOptions, CommonDBSaveOptions, DBTransaction } from '../db.model.js'
-import { dbQueryFilterOperatorValues } from '../query/dbQuery.js'
 import type { DBQueryFilter, DBQueryOrder } from '../query/dbQuery.js'
+import { dbQueryFilterOperatorValues } from '../query/dbQuery.js'
 
 // oxlint-disable typescript/explicit-function-return-type
 
 // DBTransaction schema - validates presence without deep validation
-const dbTransactionSchema = j.object.any().castAs<DBTransaction>()
+const dbTransactionSchema = j.object.any()
 
 // Schema that accepts any value (string, number, boolean, object, array, null)
-const anyValueSchema = new JsonSchemaAnyBuilder<any, false>({})
+const anyValueSchema = new JBuilder<any, false>({})
 
-export const commonDBOptionsSchema = (): JsonSchemaObjectBuilder<CommonDBOptions, false> =>
+export const commonDBOptionsSchema = (): JBuilder<CommonDBOptions, false> =>
   j.object<CommonDBOptions>({
-    tx: dbTransactionSchema.optional(),
+    tx: dbTransactionSchema.optional().castAs<DBTransaction | undefined>(),
   })
 
 export const commonDBSaveOptionsSchema = <ROW extends ObjectWithId>() =>
   j.object<CommonDBSaveOptions<ROW>>({
-    tx: dbTransactionSchema.optional(),
+    tx: dbTransactionSchema.optional().castAs<DBTransaction | undefined>(),
     excludeFromIndexes: j.array(j.string().castAs<keyof ROW>()).optional(),
     saveMethod: j.enum(['upsert', 'insert', 'update'] as const).optional(),
     assignGeneratedIds: j.boolean().optional(),