@naturalcycles/db-lib 10.30.0 → 10.31.0

package/dist/adapter/cachedb/cache.db.d.ts

@@ -1,5 +1,5 @@
-import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
 import type { ObjectWithId } from '@naturalcycles/js-lib/types';
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv';
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import { BaseCommonDB } from '../../commondb/base.common.db.js';
 import type { CommonDB, CommonDBSupport } from '../../commondb/common.db.js';
@@ -21,8 +21,8 @@ export declare class CacheDB extends BaseCommonDB implements CommonDB {
      * Resets InMemory DB data
      */
     getTables(): Promise<string[]>;
-    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;
-    createTable<ROW extends ObjectWithId>(table: string, schema: JsonSchemaObject<ROW>, opt?: CacheDBCreateOptions): Promise<void>;
+    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchema<ROW>>;
+    createTable<ROW extends ObjectWithId>(table: string, schema: JsonSchema<ROW>, opt?: CacheDBCreateOptions): Promise<void>;
     getByIds<ROW extends ObjectWithId>(table: string, ids: string[], opt?: CacheDBSaveOptions<ROW>): Promise<ROW[]>;
     saveBatch<ROW extends ObjectWithId>(table: string, rows: ROW[], opt?: CacheDBSaveOptions<ROW>): Promise<void>;
     runQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CacheDBSaveOptions<ROW>): Promise<RunQueryResult<ROW>>;

package/dist/adapter/file/file.db.d.ts

@@ -1,5 +1,5 @@
-import type { JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
 import { type ObjectWithId } from '@naturalcycles/js-lib/types';
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv';
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import { BaseCommonDB } from '../../commondb/base.common.db.js';
 import type { CommonDB, CommonDBSupport } from '../../commondb/common.db.js';
@@ -29,7 +29,7 @@ export declare class FileDB extends BaseCommonDB implements CommonDB {
     streamQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CommonDBStreamOptions): Pipeline<ROW>;
     deleteByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, _opt?: CommonDBOptions): Promise<number>;
     deleteByIds(table: string, ids: string[], _opt?: CommonDBOptions): Promise<number>;
-    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;
+    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchema<ROW>>;
     loadFile<ROW extends ObjectWithId>(table: string): Promise<ROW[]>;
     saveFile<ROW extends ObjectWithId>(table: string, _rows: ROW[]): Promise<void>;
     saveFiles<ROW extends ObjectWithId>(ops: DBSaveBatchOperation<ROW>[]): Promise<void>;

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

@@ -1,6 +1,6 @@
 import type { Transform } from 'node:stream';
-import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
 import { type BaseDBEntity, type NonNegativeInteger, type StringMap, type Unsaved } from '@naturalcycles/js-lib/types';
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv';
 import { type Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDBTransactionOptions, RunQueryResult } from '../db.model.js';
 import type { DBQuery } from '../query/dbQuery.js';
@@ -138,8 +138,8 @@ export declare class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity
      * Validates (unless `skipValidation=true` passed).
      */
     private validateAndConvert;
-    getTableSchema(): Promise<JsonSchemaRootObject<DBM>>;
-    createTable(schema: JsonSchemaObject<DBM>, opt?: CommonDaoCreateOptions): Promise<void>;
+    getTableSchema(): Promise<JsonSchema<any, DBM>>;
+    createTable(schema: JsonSchema<any, DBM>, opt?: CommonDaoCreateOptions): Promise<void>;
     /**
      * Proxy to this.cfg.db.ping
      */

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

@@ -89,7 +89,7 @@ export interface CommonDaoCfg<BM extends BaseDBEntity, DBM extends BaseDBEntity
      * It removes the knowledge from CommonDao about the validation library used
      * and abstracts it away.
      */
-    validateBM?: ValidationFunction<BM, any>;
+    validateBM?: ValidationFunction<BM, BM, any>;
     /**
      * Used by e.g Datastore.
      */

package/dist/commondb/base.common.db.d.ts

@@ -1,5 +1,5 @@
-import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
 import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib/types';
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv';
 import type { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDBOptions, CommonDBReadOptions, CommonDBSaveOptions, CommonDBTransactionOptions, DBTransaction, DBTransactionFn, RunQueryResult } from '../db.model.js';
 import type { DBQuery } from '../query/dbQuery.js';
@@ -14,8 +14,8 @@ export declare class BaseCommonDB implements CommonDB {
     support: CommonDBSupport;
     ping(): Promise<void>;
     getTables(): Promise<string[]>;
-    getTableSchema<ROW extends ObjectWithId>(_table: string): Promise<JsonSchemaRootObject<ROW>>;
-    createTable<ROW extends ObjectWithId>(_table: string, _schema: JsonSchemaObject<ROW>): Promise<void>;
+    getTableSchema<ROW extends ObjectWithId>(_table: string): Promise<JsonSchema<ROW>>;
+    createTable<ROW extends ObjectWithId>(_table: string, _schema: JsonSchema<ROW>): Promise<void>;
     getByIds<ROW extends ObjectWithId>(_table: string, _ids: string[]): Promise<ROW[]>;
     deleteByQuery<ROW extends ObjectWithId>(_q: DBQuery<ROW>): Promise<number>;
     patchByQuery<ROW extends ObjectWithId>(_q: DBQuery<ROW>, _patch: Partial<ROW>, _opt?: CommonDBOptions): Promise<number>;

package/dist/commondb/common.db.d.ts

@@ -1,5 +1,5 @@
-import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
 import type { NonNegativeInteger, ObjectWithId, StringMap } from '@naturalcycles/js-lib/types';
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv';
 import type { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import type { CommonDBCreateOptions, CommonDBOptions, CommonDBReadOptions, CommonDBSaveOptions, CommonDBStreamOptions, CommonDBTransactionOptions, DBTransaction, DBTransactionFn, RunQueryResult } from '../db.model.js';
 import type { DBQuery } from '../query/dbQuery.js';
@@ -13,7 +13,7 @@ export interface CommonDB {
      */
     support: CommonDBSupport;
     /**
-     * Checks that connection/credentials/etc is ok.
+     * Checks that connection/credentials/etc is okay.
      * Also acts as a "warmup request" for a DB.
      * It SHOULD fail if DB setup is wrong (e.g on wrong credentials).
      * It SHOULD succeed if e.g getByIds(['nonExistingKey']) doesn't throw.
@@ -29,12 +29,12 @@ export interface CommonDB {
      *
      * This is important for the code to rely on it, and it's verified by dbTest
      */
-    getTableSchema: <ROW extends ObjectWithId>(table: string) => Promise<JsonSchemaRootObject<ROW>>;
+    getTableSchema: <ROW extends ObjectWithId>(table: string) => Promise<JsonSchema<ROW>>;
     /**
      * Will do like `create table ...` for mysql.
      * Caution! dropIfExists defaults to false. If set to true - will actually DROP the table!
      */
-    createTable: <ROW extends ObjectWithId>(table: string, schema: JsonSchemaObject<ROW>, opt?: CommonDBCreateOptions) => Promise<void>;
+    createTable: <ROW extends ObjectWithId>(table: string, schema: JsonSchema<ROW>, opt?: CommonDBCreateOptions) => Promise<void>;
     /**
      * Order of items returned is not guaranteed to match order of ids.
      * (Such limitation exists because Datastore doesn't support it).

package/dist/inmemory/inMemory.db.d.ts

@@ -1,6 +1,6 @@
-import { type JsonSchemaObject, type JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema';
 import type { CommonLogger } from '@naturalcycles/js-lib/log';
 import { type AnyObjectWithId, 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 { CommonDB, CommonDBSupport } from '../commondb/common.db.js';
 import { CommonDBType } from '../commondb/common.db.js';
@@ -47,8 +47,8 @@ export declare class InMemoryDB implements CommonDB {
      */
     resetCache(_table?: string): Promise<void>;
     getTables(): Promise<string[]>;
-    getTableSchema<ROW extends ObjectWithId>(_table: string): Promise<JsonSchemaRootObject<ROW>>;
-    createTable<ROW extends ObjectWithId>(_table: string, _schema: JsonSchemaObject<ROW>, opt?: CommonDBCreateOptions): Promise<void>;
+    getTableSchema<ROW extends ObjectWithId>(_table: string): Promise<JsonSchema<ROW>>;
+    createTable<ROW extends ObjectWithId>(_table: string, _schema: JsonSchema<ROW>, opt?: CommonDBCreateOptions): Promise<void>;
     getByIds<ROW extends ObjectWithId>(_table: string, ids: string[], _opt?: CommonDBOptions): Promise<ROW[]>;
     multiGet<ROW extends ObjectWithId>(map: StringMap<string[]>, _opt?: CommonDBOptions): Promise<StringMap<ROW[]>>;
     saveBatch<ROW extends ObjectWithId>(_table: string, rows: ROW[], opt?: CommonDBSaveOptions<ROW>): Promise<void>;

package/dist/inmemory/inMemory.db.js

@@ -1,6 +1,6 @@
 import { _isEmptyObject } from '@naturalcycles/js-lib';
 import { _assert } from '@naturalcycles/js-lib/error/assert.js';
-import { generateJsonSchemaFromData, } from '@naturalcycles/js-lib/json-schema';
+import { generateJsonSchemaFromData } from '@naturalcycles/js-lib/json-schema';
 import { _deepCopy, _sortObjectDeep } from '@naturalcycles/js-lib/object';
 import { _stringMapEntries, _stringMapValues, } from '@naturalcycles/js-lib/types';
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream';

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

@@ -1,4 +1,3 @@
-import type { JsonSchemaObject } from '@naturalcycles/js-lib/json-schema';
 import type { BaseDBEntity } from '@naturalcycles/js-lib/types';
 import { type ObjectSchema } from '@naturalcycles/nodejs-lib/joi';
 export declare const TEST_TABLE = "TEST_TABLE";
@@ -21,7 +20,7 @@ export interface TestItemTM {
 }
 export declare const testItemBMSchema: ObjectSchema<TestItemBM>;
 export declare const testItemTMSchema: ObjectSchema<TestItemTM>;
-export declare const testItemBMJsonSchema: JsonSchemaObject<TestItemBM>;
+export declare const testItemBMJsonSchema: any;
 export declare function createTestItemDBM(num?: number): TestItemDBM;
 export declare function createTestItemBM(num?: number): TestItemBM;
 export declare function createTestItemsDBM(count?: number): TestItemDBM[];

package/dist/testing/test.model.js

@@ -1,5 +1,5 @@
 import { _range } from '@naturalcycles/js-lib/array/range.js';
-import { j } from '@naturalcycles/js-lib/json-schema';
+import { j } from '@naturalcycles/nodejs-lib/ajv';
 import { baseDBEntitySchema, binarySchema, booleanSchema, numberSchema, objectSchema, stringSchema, } from '@naturalcycles/nodejs-lib/joi';
 const MOCK_TS_2018_06_21 = 1529539200;
 export const TEST_TABLE = 'TEST_TABLE';
@@ -19,18 +19,20 @@ export const testItemTMSchema = objectSchema({
     even: booleanSchema.optional(),
 });
 export const testItemBMJsonSchema = j
-    .rootObject({
+    .object({
     // todo: figure out how to not copy-paste these 3 fields
     id: j.string(), // todo: not strictly needed here
-    created: j.integer().unixTimestamp(),
-    updated: j.integer().unixTimestamp(),
+    created: j.number().integer().unixTimestamp(),
+    updated: j.number().integer().unixTimestamp(),
     k1: j.string(),
-    k2: j.oneOf([j.string(), j.null()]).optional(),
+    k2: j.string().nullable().optional(),
     k3: j.number().optional(),
     even: j.boolean().optional(),
     b1: j.buffer().optional(),
+    nested: j.object({ foo: j.number() }).optional(),
 })
-    .baseDBEntity()
+    .dbEntity()
+    .isOfType()
     .build();
 export function createTestItemDBM(num = 1) {
     return {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@naturalcycles/db-lib",
   "type": "module",
-  "version": "10.30.0",
+  "version": "10.31.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^15"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "20.6.0"
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "files": [
     "dist",

package/src/adapter/cachedb/cache.db.ts

@@ -1,6 +1,6 @@
 import { _isTruthy } from '@naturalcycles/js-lib'
-import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema'
 import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib/types'
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream'
 import { BaseCommonDB } from '../../commondb/base.common.db.js'
 import type { CommonDB, CommonDBSupport } from '../../commondb/common.db.js'
@@ -55,15 +55,13 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
     return await this.cfg.downstreamDB.getTables()
   }
 
-  override async getTableSchema<ROW extends ObjectWithId>(
-    table: string,
-  ): Promise<JsonSchemaRootObject<ROW>> {
+  override async getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchema<ROW>> {
     return await this.cfg.downstreamDB.getTableSchema<ROW>(table)
   }
 
   override async createTable<ROW extends ObjectWithId>(
     table: string,
-    schema: JsonSchemaObject<ROW>,
+    schema: JsonSchema<ROW>,
     opt: CacheDBCreateOptions = {},
   ): Promise<void> {
     if (!opt.onlyCache && !this.cfg.onlyCache) {

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

@@ -2,7 +2,6 @@ import { Readable } from 'node:stream'
 import { _by, _sortBy } from '@naturalcycles/js-lib/array'
 import { _since, localTime } from '@naturalcycles/js-lib/datetime'
 import { _assert } from '@naturalcycles/js-lib/error/assert.js'
-import type { JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema'
 import { generateJsonSchemaFromData } from '@naturalcycles/js-lib/json-schema'
 import { _deepEquals, _filterUndefinedValues, _sortObjectDeep } from '@naturalcycles/js-lib/object'
 import {
@@ -10,6 +9,7 @@ import {
   type ObjectWithId,
   type UnixTimestampMillis,
 } from '@naturalcycles/js-lib/types'
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
 import { dimGrey } from '@naturalcycles/nodejs-lib/colors'
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream'
 import { BaseCommonDB } from '../../commondb/base.common.db.js'
@@ -174,14 +174,12 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     return deleted
   }
 
-  override async getTableSchema<ROW extends ObjectWithId>(
-    table: string,
-  ): Promise<JsonSchemaRootObject<ROW>> {
+  override async getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchema<ROW>> {
     const rows = await this.loadFile(table)
     return {
       ...generateJsonSchemaFromData(rows),
       $id: `${table}.schema.json`,
-    }
+    } as any
   }
 
   // wrapper, to handle logging

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

@@ -109,7 +109,7 @@ export interface CommonDaoCfg<
    * It removes the knowledge from CommonDao about the validation library used
    * and abstracts it away.
    */
-  validateBM?: ValidationFunction<BM, any>
+  validateBM?: ValidationFunction<BM, BM, any>
 
   /**
    * Used by e.g Datastore.

package/src/commondao/common.dao.ts

@@ -3,7 +3,6 @@ import { _isTruthy } from '@naturalcycles/js-lib'
 import { _uniqBy } from '@naturalcycles/js-lib/array/array.util.js'
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js'
 import { _assert, ErrorMode } from '@naturalcycles/js-lib/error'
-import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema'
 import { _deepJsonEquals } from '@naturalcycles/js-lib/object/deepEquals.js'
 import {
   _filterUndefinedValues,
@@ -22,6 +21,7 @@ import {
   type Unsaved,
 } from '@naturalcycles/js-lib/types'
 import { stringId } from '@naturalcycles/nodejs-lib'
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
 import {
   type Pipeline,
   transformChunk,
@@ -810,11 +810,11 @@ export class CommonDao<
     return convertedValue
   }
 
-  async getTableSchema(): Promise<JsonSchemaRootObject<DBM>> {
+  async getTableSchema(): Promise<JsonSchema<any, DBM>> {
     return await this.cfg.db.getTableSchema<DBM>(this.cfg.table)
   }
 
-  async createTable(schema: JsonSchemaObject<DBM>, opt?: CommonDaoCreateOptions): Promise<void> {
+  async createTable(schema: JsonSchema<any, DBM>, opt?: CommonDaoCreateOptions): Promise<void> {
     this.requireWriteAccess()
     await this.cfg.db.createTable(this.cfg.table, schema, opt)
   }

package/src/commondb/base.common.db.ts

@@ -1,5 +1,5 @@
-import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema'
 import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib/types'
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
 import type { Pipeline } from '@naturalcycles/nodejs-lib/stream'
 import type {
   CommonDBOptions,
@@ -32,15 +32,13 @@ export class BaseCommonDB implements CommonDB {
     throw new Error('getTables is not implemented')
   }
 
-  async getTableSchema<ROW extends ObjectWithId>(
-    _table: string,
-  ): Promise<JsonSchemaRootObject<ROW>> {
+  async getTableSchema<ROW extends ObjectWithId>(_table: string): Promise<JsonSchema<ROW>> {
     throw new Error('getTableSchema is not implemented')
   }
 
   async createTable<ROW extends ObjectWithId>(
     _table: string,
-    _schema: JsonSchemaObject<ROW>,
+    _schema: JsonSchema<ROW>,
   ): Promise<void> {
     // no-op
   }

package/src/commondb/common.db.ts

@@ -1,5 +1,5 @@
-import type { JsonSchemaObject, JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema'
 import type { NonNegativeInteger, ObjectWithId, StringMap } from '@naturalcycles/js-lib/types'
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
 import type { Pipeline } from '@naturalcycles/nodejs-lib/stream'
 import type {
   CommonDBCreateOptions,
@@ -26,7 +26,7 @@ export interface CommonDB {
   support: CommonDBSupport
 
   /**
-   * Checks that connection/credentials/etc is ok.
+   * Checks that connection/credentials/etc is okay.
    * Also acts as a "warmup request" for a DB.
    * It SHOULD fail if DB setup is wrong (e.g on wrong credentials).
    * It SHOULD succeed if e.g getByIds(['nonExistingKey']) doesn't throw.
@@ -44,7 +44,7 @@ export interface CommonDB {
    *
    * This is important for the code to rely on it, and it's verified by dbTest
    */
-  getTableSchema: <ROW extends ObjectWithId>(table: string) => Promise<JsonSchemaRootObject<ROW>>
+  getTableSchema: <ROW extends ObjectWithId>(table: string) => Promise<JsonSchema<ROW>>
 
   /**
    * Will do like `create table ...` for mysql.
@@ -52,7 +52,7 @@ export interface CommonDB {
    */
   createTable: <ROW extends ObjectWithId>(
     table: string,
-    schema: JsonSchemaObject<ROW>,
+    schema: JsonSchema<ROW>,
     opt?: CommonDBCreateOptions,
   ) => Promise<void>
 

package/src/inmemory/inMemory.db.ts

@@ -1,10 +1,6 @@
 import { _isEmptyObject } from '@naturalcycles/js-lib'
 import { _assert } from '@naturalcycles/js-lib/error/assert.js'
-import {
-  generateJsonSchemaFromData,
-  type JsonSchemaObject,
-  type JsonSchemaRootObject,
-} from '@naturalcycles/js-lib/json-schema'
+import { generateJsonSchemaFromData } from '@naturalcycles/js-lib/json-schema'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { _deepCopy, _sortObjectDeep } from '@naturalcycles/js-lib/object'
 import {
@@ -14,6 +10,7 @@ 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 { bufferReviver } from '@naturalcycles/nodejs-lib/stream/ndjson/transformJsonParse.js'
 import type { CommonDB, CommonDBSupport } from '../commondb/common.db.js'
@@ -111,19 +108,17 @@ export class InMemoryDB implements CommonDB {
     return Object.keys(this.data).filter(t => t.startsWith(this.cfg.tablesPrefix))
   }
 
-  async getTableSchema<ROW extends ObjectWithId>(
-    _table: string,
-  ): Promise<JsonSchemaRootObject<ROW>> {
+  async getTableSchema<ROW extends ObjectWithId>(_table: string): Promise<JsonSchema<ROW>> {
     const table = this.cfg.tablesPrefix + _table
     return {
       ...generateJsonSchemaFromData(_stringMapValues(this.data[table] || {})),
       $id: `${table}.schema.json`,
-    }
+    } as any
   }
 
   async createTable<ROW extends ObjectWithId>(
     _table: string,
-    _schema: JsonSchemaObject<ROW>,
+    _schema: JsonSchema<ROW>,
     opt: CommonDBCreateOptions = {},
   ): Promise<void> {
     const table = this.cfg.tablesPrefix + _table

package/src/pipeline/dbPipelineRestore.ts

@@ -1,11 +1,11 @@
 import { _hb } from '@naturalcycles/js-lib'
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js'
 import { ErrorMode } from '@naturalcycles/js-lib/error/errorMode.js'
-import type { JsonSchemaObject } from '@naturalcycles/js-lib/json-schema'
 import { _mapValues } from '@naturalcycles/js-lib/object'
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
 import type { AsyncMapper, BaseDBEntity, UnixTimestamp } from '@naturalcycles/js-lib/types'
 import { _passthroughMapper } from '@naturalcycles/js-lib/types'
+import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
 import { boldWhite, dimWhite, grey, yellow } from '@naturalcycles/nodejs-lib/colors'
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
 import {
@@ -166,7 +166,7 @@ export async function dbPipelineRestore(opt: DBPipelineRestoreOptions): Promise<
         return
       }
 
-      const schema = await fs2.readJsonAsync<JsonSchemaObject<any>>(schemaFilePath)
+      const schema = await fs2.readJsonAsync<JsonSchema<any>>(schemaFilePath)
       await db.createTable(table, schema, { dropIfExists: true })
     })
   }

package/src/testing/test.model.ts

@@ -1,7 +1,6 @@
 import { _range } from '@naturalcycles/js-lib/array/range.js'
-import type { JsonSchemaObject } from '@naturalcycles/js-lib/json-schema'
-import { j } from '@naturalcycles/js-lib/json-schema'
 import type { BaseDBEntity, UnixTimestamp } from '@naturalcycles/js-lib/types'
+import { j } from '@naturalcycles/nodejs-lib/ajv'
 import {
   baseDBEntitySchema,
   binarySchema,
@@ -51,19 +50,21 @@ export const testItemTMSchema: ObjectSchema<TestItemTM> = objectSchema<TestItemT
   even: booleanSchema.optional(),
 })
 
-export const testItemBMJsonSchema: JsonSchemaObject<TestItemBM> = j
-  .rootObject<TestItemBM>({
+export const testItemBMJsonSchema = j
+  .object({
     // todo: figure out how to not copy-paste these 3 fields
     id: j.string(), // todo: not strictly needed here
-    created: j.integer().unixTimestamp(),
-    updated: j.integer().unixTimestamp(),
+    created: j.number().integer().unixTimestamp(),
+    updated: j.number().integer().unixTimestamp(),
     k1: j.string(),
-    k2: j.oneOf([j.string(), j.null()]).optional(),
+    k2: j.string().nullable().optional(),
     k3: j.number().optional(),
     even: j.boolean().optional(),
     b1: j.buffer().optional(),
+    nested: j.object({ foo: j.number() }).optional(),
   })
-  .baseDBEntity()
+  .dbEntity()
+  .isOfType<TestItemBM>()
   .build()
 
 export function createTestItemDBM(num = 1): TestItemDBM {