@naturalcycles/db-lib 8.11.0 → 8.13.0

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+# [8.13.0](https://github.com/NaturalCycles/db-lib/compare/v8.12.0...v8.13.0) (2021-10-01)
+
+
+### Features
+
+* remove CommonSchema in favor of JsonSchema ([1827ec5](https://github.com/NaturalCycles/db-lib/commit/1827ec5709053b97a6b9e131f2ec0b40176c3e23))
+
+# [8.12.0](https://github.com/NaturalCycles/db-lib/compare/v8.11.2...v8.12.0) (2021-09-10)
+
+
+### Features
+
+* CommonDao hooks return types are loosened to Partial ([141bd29](https://github.com/NaturalCycles/db-lib/commit/141bd29166676eee1bc9bd72f23cd5b88dc22f3b))
+* remove `throwOnError*` CommonDao options ([008674f](https://github.com/NaturalCycles/db-lib/commit/008674fc7a755cbb2e540250d9e752c7db2faeb4))
+
+## [8.11.2](https://github.com/NaturalCycles/db-lib/compare/v8.11.1...v8.11.2) (2021-08-24)
+
+
+### Bug Fixes
+
+* CommonDaoStreamForEachOptions to extend TransformMapOpt ([dd8e5b5](https://github.com/NaturalCycles/db-lib/commit/dd8e5b5e0e5d20897182ecda7c2c70e723b5e2bb))
+
+## [8.11.1](https://github.com/NaturalCycles/db-lib/compare/v8.11.0...v8.11.1) (2021-08-24)
+
+
+### Bug Fixes
+
+* kvDBTest to not rely on deterministic output ([d150e44](https://github.com/NaturalCycles/db-lib/commit/d150e4499a7f2a5f9c266b153628826e5ebb6e96))
+
 # [8.11.0](https://github.com/NaturalCycles/db-lib/compare/v8.10.0...v8.11.0) (2021-08-24)
 
 

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

@@ -1,11 +1,11 @@
 /// <reference types="node" />
+import { JsonSchemaObject } from '@naturalcycles/js-lib';
 import { IDebugger } from '@naturalcycles/nodejs-lib';
 import { Readable } from 'stream';
 import { BaseCommonDB } from '../../base.common.db';
 import { CommonDB } from '../../common.db';
 import { ObjectWithId, RunQueryResult } from '../../db.model';
 import { DBQuery } from '../../query/dbQuery';
-import { CommonSchema } from '../../schema/common.schema';
 import { CacheDBCfg, CacheDBCreateOptions, CacheDBOptions, CacheDBStreamOptions } from './cache.db.model';
 /**
  * CommonDB implementation that proxies requests to downstream CommonDB
@@ -22,8 +22,8 @@ export declare class CacheDB extends BaseCommonDB implements CommonDB {
      * Resets InMemory DB data
      */
     getTables(): Promise<string[]>;
-    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<CommonSchema<ROW>>;
-    createTable(schema: CommonSchema, opt?: CacheDBCreateOptions): Promise<void>;
+    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaObject<ROW>>;
+    createTable(table: string, schema: JsonSchemaObject, opt?: CacheDBCreateOptions): Promise<void>;
     getByIds<ROW extends ObjectWithId>(table: string, ids: string[], opt?: CacheDBOptions): Promise<ROW[]>;
     deleteByIds(table: string, ids: string[], opt?: CacheDBOptions): Promise<number>;
     saveBatch<ROW extends ObjectWithId>(table: string, rows: ROW[], opt?: CacheDBOptions): Promise<void>;

package/dist/adapter/cachedb/cache.db.js

@@ -14,7 +14,7 @@ class CacheDB extends base_common_db_1.BaseCommonDB {
     constructor(cfg) {
         super();
         this.cfg = cfg;
-        this.log = nodejs_lib_1.Debug(`nc:db-lib:${cfg.name}`);
+        this.log = (0, nodejs_lib_1.Debug)(`nc:db-lib:${cfg.name}`);
     }
     async ping() {
         await Promise.all([this.cfg.cacheDB.ping(), this.cfg.downstreamDB.ping()]);
@@ -33,12 +33,12 @@ class CacheDB extends base_common_db_1.BaseCommonDB {
     async getTableSchema(table) {
         return await this.cfg.downstreamDB.getTableSchema(table);
     }
-    async createTable(schema, opt = {}) {
+    async createTable(table, schema, opt = {}) {
         if (!opt.onlyCache && !this.cfg.onlyCache) {
-            await this.cfg.downstreamDB.createTable(schema, opt);
+            await this.cfg.downstreamDB.createTable(table, schema, opt);
         }
         if (!opt.skipCache && !this.cfg.skipCache) {
-            await this.cfg.cacheDB.createTable(schema, opt);
+            await this.cfg.cacheDB.createTable(table, schema, opt);
         }
     }
     async getByIds(table, ids, opt = {}) {

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

@@ -1,6 +1,6 @@
+import { JsonSchemaObject } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { BaseCommonDB, DBSaveBatchOperation, ObjectWithId } from '../..';
-import { CommonSchema } from '../..';
 import { CommonDB } from '../../common.db';
 import { CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, RunQueryResult } from '../../db.model';
 import { DBQuery } from '../../query/dbQuery';
@@ -32,7 +32,7 @@ export declare class FileDB extends BaseCommonDB implements CommonDB {
     streamQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: CommonDBStreamOptions): ReadableTyped<ROW>;
     deleteByIds<ROW extends ObjectWithId>(table: string, ids: string[], _opt?: CommonDBOptions): Promise<number>;
     deleteByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, _opt?: CommonDBOptions): Promise<number>;
-    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<CommonSchema<ROW>>;
+    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaObject<ROW>>;
     loadFile<ROW extends ObjectWithId>(table: string): Promise<ROW[]>;
     saveFile<ROW extends ObjectWithId>(table: string, _rows: ROW[]): Promise<void>;
     saveFiles(ops: DBSaveBatchOperation[]): Promise<void>;

package/dist/adapter/file/file.db.js

@@ -5,8 +5,7 @@ const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 const __1 = require("../..");
-const __2 = require("../..");
-const log = nodejs_lib_1.Debug('nc:db-lib:filedb');
+const log = (0, nodejs_lib_1.Debug)('nc:db-lib:filedb');
 /**
  * Provides barebone implementation for "whole file" based CommonDB.
  * "whole file" means that the persistence layer doesn't allow any querying,
@@ -36,18 +35,18 @@ class FileDB extends __1.BaseCommonDB {
         return tables;
     }
     async getByIds(table, ids, _opt) {
-        const byId = js_lib_1._by(await this.loadFile(table), r => r.id);
+        const byId = (0, js_lib_1._by)(await this.loadFile(table), r => r.id);
         return ids.map(id => byId[id]).filter(Boolean);
     }
     async saveBatch(table, rows, _opt) {
         if (!rows.length)
             return; // save some api calls
         // 1. Load the whole file from gh
-        const byId = js_lib_1._by(await this.loadFile(table), r => r.id);
+        const byId = (0, js_lib_1._by)(await this.loadFile(table), r => r.id);
         // 2. Merge with new data (using ids)
         let saved = 0;
         rows.forEach(r => {
-            if (!js_lib_1._deepEquals(byId[r.id], r)) {
+            if (!(0, js_lib_1._deepEquals)(byId[r.id], r)) {
                 byId[r.id] = r;
                 saved++;
             }
@@ -55,7 +54,7 @@ class FileDB extends __1.BaseCommonDB {
         // Only save if there are changed rows
         if (saved > 0) {
             // 3. Save the whole file
-            await this.saveFile(table, js_lib_1._stringMapValues(byId));
+            await this.saveFile(table, (0, js_lib_1._stringMapValues)(byId));
         }
     }
     /**
@@ -65,10 +64,10 @@ class FileDB extends __1.BaseCommonDB {
         // data[table][id] => row
         const data = {};
         // 1. Load all tables data (concurrently)
-        const tables = js_lib_1._uniq(tx.ops.map(o => o.table));
-        await js_lib_1.pMap(tables, async (table) => {
+        const tables = (0, js_lib_1._uniq)(tx.ops.map(o => o.table));
+        await (0, js_lib_1.pMap)(tables, async (table) => {
             const rows = await this.loadFile(table);
-            data[table] = js_lib_1._by(rows, r => r.id);
+            data[table] = (0, js_lib_1._by)(rows, r => r.id);
         }, { concurrency: 16 });
         // 2. Apply ops one by one (in order)
         tx.ops.forEach(op => {
@@ -96,14 +95,14 @@ class FileDB extends __1.BaseCommonDB {
     }
     async runQuery(q, _opt) {
         return {
-            rows: __1.queryInMemory(q, await this.loadFile(q.table)),
+            rows: (0, __1.queryInMemory)(q, await this.loadFile(q.table)),
         };
     }
     async runQueryCount(q, _opt) {
         return (await this.loadFile(q.table)).length;
     }
     streamQuery(q, opt) {
-        const readable = nodejs_lib_1.readableCreate();
+        const readable = (0, nodejs_lib_1.readableCreate)();
         void this.runQuery(q, opt).then(({ rows }) => {
             rows.forEach(r => readable.push(r));
             readable.push(null); // done
@@ -127,20 +126,23 @@ class FileDB extends __1.BaseCommonDB {
         return deleted;
     }
     async deleteByQuery(q, _opt) {
-        const byId = js_lib_1._by(await this.loadFile(q.table), r => r.id);
+        const byId = (0, js_lib_1._by)(await this.loadFile(q.table), r => r.id);
         let deleted = 0;
-        __1.queryInMemory(q, js_lib_1._stringMapValues(byId)).forEach(r => {
+        (0, __1.queryInMemory)(q, (0, js_lib_1._stringMapValues)(byId)).forEach(r => {
             delete byId[r.id];
             deleted++;
         });
         if (deleted > 0) {
-            await this.saveFile(q.table, js_lib_1._stringMapValues(byId));
+            await this.saveFile(q.table, (0, js_lib_1._stringMapValues)(byId));
         }
         return deleted;
     }
     async getTableSchema(table) {
         const rows = await this.loadFile(table);
-        return __2.CommonSchemaGenerator.generateFromRows({ table }, rows);
+        return {
+            ...(0, js_lib_1.generateJsonSchemaFromData)(rows),
+            $id: `${table}.schema.json`,
+        };
     }
     // wrapper, to handle logging
     async loadFile(table) {
@@ -172,12 +174,12 @@ class FileDB extends __1.BaseCommonDB {
      */
     sortRows(rows) {
         if (this.cfg.sortOnSave) {
-            js_lib_1._sortBy(rows, r => r[this.cfg.sortOnSave.name], true);
+            (0, js_lib_1._sortBy)(rows, r => r[this.cfg.sortOnSave.name], true);
             if (this.cfg.sortOnSave.descending)
                 rows.reverse(); // mutates
         }
         if (this.cfg.sortObjects) {
-            return js_lib_1._sortObjectDeep(rows);
+            return (0, js_lib_1._sortObjectDeep)(rows);
         }
         return rows;
     }
@@ -190,7 +192,7 @@ class FileDB extends __1.BaseCommonDB {
     logFinished(started, op) {
         if (!this.cfg.logFinished)
             return;
-        log(`<< ${op} ${colors_1.dimGrey(`in ${js_lib_1._since(started)}`)}`);
+        log(`<< ${op} ${(0, colors_1.dimGrey)(`in ${(0, js_lib_1._since)(started)}`)}`);
     }
 }
 exports.FileDB = FileDB;

package/dist/adapter/file/inMemory.persistence.plugin.js

@@ -18,7 +18,7 @@ class InMemoryPersistencePlugin {
     }
     async saveFiles(ops) {
         ops.forEach(op => {
-            this.data[op.table] = js_lib_1._by(op.rows, r => r.id);
+            this.data[op.table] = (0, js_lib_1._by)(op.rows, r => r.id);
         });
     }
 }

package/dist/adapter/file/localFile.persistence.plugin.js

@@ -29,28 +29,28 @@ class LocalFilePersistencePlugin {
         const filePath = `${this.cfg.storagePath}/${table}.${ext}`;
         if (!(await fs.pathExists(filePath)))
             return [];
-        const transformUnzip = this.cfg.gzip ? [zlib_1.createUnzip()] : [];
+        const transformUnzip = this.cfg.gzip ? [(0, zlib_1.createUnzip)()] : [];
         const rows = [];
-        await nodejs_lib_1._pipeline([
+        await (0, nodejs_lib_1._pipeline)([
             fs.createReadStream(filePath),
             ...transformUnzip,
-            nodejs_lib_1.transformSplit(),
-            nodejs_lib_1.transformJsonParse(),
-            nodejs_lib_1.writablePushToArray(rows),
+            (0, nodejs_lib_1.transformSplit)(),
+            (0, nodejs_lib_1.transformJsonParse)(),
+            (0, nodejs_lib_1.writablePushToArray)(rows),
         ]);
         return rows;
     }
     async saveFiles(ops) {
-        await js_lib_1.pMap(ops, async (op) => await this.saveFile(op.table, op.rows), { concurrency: 16 });
+        await (0, js_lib_1.pMap)(ops, async (op) => await this.saveFile(op.table, op.rows), { concurrency: 16 });
     }
     async saveFile(table, rows) {
         await fs.ensureDir(this.cfg.storagePath);
         const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`;
         const filePath = `${this.cfg.storagePath}/${table}.${ext}`;
-        const transformZip = this.cfg.gzip ? [zlib_1.createGzip()] : [];
-        await nodejs_lib_1._pipeline([
+        const transformZip = this.cfg.gzip ? [(0, zlib_1.createGzip)()] : [];
+        await (0, nodejs_lib_1._pipeline)([
             stream_1.Readable.from(rows),
-            nodejs_lib_1.transformToNDJson(),
+            (0, nodejs_lib_1.transformToNDJson)(),
             ...transformZip,
             fs.createWriteStream(filePath),
         ]);

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

@@ -1,7 +1,6 @@
-import { StringMap } from '@naturalcycles/js-lib';
+import { JsonSchemaObject, StringMap } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { CommonDB, DBTransaction, ObjectWithId } from '../..';
-import { CommonSchema } from '../..';
 import { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, RunQueryResult } from '../../db.model';
 import { DBQuery } from '../../query/dbQuery';
 export interface InMemoryDBCfg {
@@ -47,8 +46,8 @@ export declare class InMemoryDB implements CommonDB {
      */
     resetCache(_table?: string): Promise<void>;
     getTables(): Promise<string[]>;
-    getTableSchema<ROW extends ObjectWithId>(_table: string): Promise<CommonSchema<ROW>>;
-    createTable(schema: CommonSchema, opt?: CommonDBCreateOptions): Promise<void>;
+    getTableSchema<ROW extends ObjectWithId>(_table: string): Promise<JsonSchemaObject<ROW>>;
+    createTable(_table: string, _schema: JsonSchemaObject, opt?: CommonDBCreateOptions): Promise<void>;
     getByIds<ROW extends ObjectWithId>(_table: string, ids: string[], _opt?: CommonDBOptions): Promise<ROW[]>;
     saveBatch<ROW extends ObjectWithId>(_table: string, rows: ROW[], _opt?: CommonDBSaveOptions): Promise<void>;
     deleteByIds(_table: string, ids: string[], _opt?: CommonDBOptions): Promise<number>;

package/dist/adapter/inmemory/inMemory.db.js

@@ -8,8 +8,7 @@ const fs = require("fs-extra");
 const stream_1 = require("stream");
 const zlib_1 = require("zlib");
 const __1 = require("../..");
-const __2 = require("../..");
-const log = nodejs_lib_1.Debug('nc:db-lib:inmemorydb');
+const log = (0, nodejs_lib_1.Debug)('nc:db-lib:inmemorydb');
 class InMemoryDB {
     constructor(cfg) {
         // data[table][id] > {id: 'a', created: ... }
@@ -28,7 +27,7 @@ class InMemoryDB {
      * Deterministic - jsonSorted.
      */
     getDataSnapshot() {
-        return js_lib_1._sortObjectDeep(this.data);
+        return (0, js_lib_1._sortObjectDeep)(this.data);
     }
     async ping() { }
     /**
@@ -53,10 +52,13 @@ class InMemoryDB {
     }
     async getTableSchema(_table) {
         const table = this.cfg.tablesPrefix + _table;
-        return __2.CommonSchemaGenerator.generateFromRows({ table }, Object.values(this.data[table] || {}));
+        return {
+            ...(0, js_lib_1.generateJsonSchemaFromData)(Object.values(this.data[table] || {})),
+            $id: `${table}.schema.json`,
+        };
     }
-    async createTable(schema, opt = {}) {
-        const table = this.cfg.tablesPrefix + schema.table;
+    async createTable(_table, _schema, opt = {}) {
+        const table = this.cfg.tablesPrefix + _table;
         if (opt.dropIfExists) {
             this.data[table] = {};
         }
@@ -103,21 +105,21 @@ class InMemoryDB {
     }
     async deleteByQuery(q, _opt) {
         const table = this.cfg.tablesPrefix + q.table;
-        const rows = __1.queryInMemory(q, Object.values(this.data[table] || {}));
+        const rows = (0, __1.queryInMemory)(q, Object.values(this.data[table] || {}));
         const ids = rows.map(r => r.id);
         return await this.deleteByIds(q.table, ids);
     }
     async runQuery(q, _opt) {
         const table = this.cfg.tablesPrefix + q.table;
-        return { rows: __1.queryInMemory(q, Object.values(this.data[table] || {})) };
+        return { rows: (0, __1.queryInMemory)(q, Object.values(this.data[table] || {})) };
     }
     async runQueryCount(q, _opt) {
         const table = this.cfg.tablesPrefix + q.table;
-        return __1.queryInMemory(q, Object.values(this.data[table] || {})).length;
+        return (0, __1.queryInMemory)(q, Object.values(this.data[table] || {})).length;
     }
     streamQuery(q, _opt) {
         const table = this.cfg.tablesPrefix + q.table;
-        return stream_1.Readable.from(__1.queryInMemory(q, Object.values(this.data[table] || {})));
+        return stream_1.Readable.from((0, __1.queryInMemory)(q, Object.values(this.data[table] || {})));
     }
     async commitTransaction(tx, opt) {
         for await (const op of tx.ops) {
@@ -142,23 +144,23 @@ class InMemoryDB {
         const { persistentStoragePath, persistZip } = this.cfg;
         const started = Date.now();
         await fs.emptyDir(persistentStoragePath);
-        const transformZip = persistZip ? [zlib_1.createGzip()] : [];
+        const transformZip = persistZip ? [(0, zlib_1.createGzip)()] : [];
         let tables = 0;
         // infinite concurrency for now
-        await js_lib_1.pMap(Object.keys(this.data), async (table) => {
+        await (0, js_lib_1.pMap)(Object.keys(this.data), async (table) => {
             const rows = Object.values(this.data[table]);
             if (rows.length === 0)
                 return; // 0 rows
             tables++;
             const fname = `${persistentStoragePath}/${table}.ndjson${persistZip ? '.gz' : ''}`;
-            await nodejs_lib_1._pipeline([
+            await (0, nodejs_lib_1._pipeline)([
                 stream_1.Readable.from(rows),
-                nodejs_lib_1.transformToNDJson(),
+                (0, nodejs_lib_1.transformToNDJson)(),
                 ...transformZip,
                 fs.createWriteStream(fname),
             ]);
         });
-        log(`flushToDisk took ${colors_1.dimGrey(js_lib_1._since(started))} to save ${colors_1.yellow(tables)} tables`);
+        log(`flushToDisk took ${(0, colors_1.dimGrey)((0, js_lib_1._since)(started))} to save ${(0, colors_1.yellow)(tables)} tables`);
     }
     /**
      * Restores all tables (all namespaces) at once.
@@ -173,21 +175,21 @@ class InMemoryDB {
         this.data = {}; // empty it in the beginning!
         const files = (await fs.readdir(persistentStoragePath)).filter(f => f.includes('.ndjson'));
         // infinite concurrency for now
-        await js_lib_1.pMap(files, async (file) => {
+        await (0, js_lib_1.pMap)(files, async (file) => {
             const fname = `${persistentStoragePath}/${file}`;
             const table = file.split('.ndjson')[0];
-            const transformUnzip = file.endsWith('.gz') ? [zlib_1.createUnzip()] : [];
+            const transformUnzip = file.endsWith('.gz') ? [(0, zlib_1.createUnzip)()] : [];
             const rows = [];
-            await nodejs_lib_1._pipeline([
+            await (0, nodejs_lib_1._pipeline)([
                 fs.createReadStream(fname),
                 ...transformUnzip,
-                nodejs_lib_1.transformSplit(),
-                nodejs_lib_1.transformJsonParse(),
-                nodejs_lib_1.writablePushToArray(rows),
+                (0, nodejs_lib_1.transformSplit)(),
+                (0, nodejs_lib_1.transformJsonParse)(),
+                (0, nodejs_lib_1.writablePushToArray)(rows),
             ]);
-            this.data[table] = js_lib_1._by(rows, r => r.id);
+            this.data[table] = (0, js_lib_1._by)(rows, r => r.id);
         });
-        log(`restoreFromDisk took ${colors_1.dimGrey(js_lib_1._since(started))} to read ${colors_1.yellow(files.length)} tables`);
+        log(`restoreFromDisk took ${(0, colors_1.dimGrey)((0, js_lib_1._since)(started))} to read ${(0, colors_1.yellow)(files.length)} tables`);
     }
 }
 exports.InMemoryDB = InMemoryDB;

package/dist/adapter/inmemory/queryInMemory.js

@@ -23,7 +23,7 @@ function queryInMemory(q, rows = []) {
     }, rows);
     // .select(fieldNames)
     if (q._selectedFieldNames) {
-        rows = rows.map(row => js_lib_1._pick(row, q._selectedFieldNames));
+        rows = rows.map(row => (0, js_lib_1._pick)(row, q._selectedFieldNames));
     }
     // todo: only one order is supported (first)
     const [order] = q._orders;

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

@@ -1,8 +1,8 @@
+import { JsonSchemaObject } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { CommonDB } from './common.db';
 import { CommonDBSaveOptions, ObjectWithId, RunQueryResult } from './db.model';
 import { DBQuery } from './query/dbQuery';
-import { CommonSchema } from './schema/common.schema';
 import { DBTransaction } from './transaction/dbTransaction';
 /**
  * No-op implementation of CommonDB interface.
@@ -11,8 +11,8 @@ import { DBTransaction } from './transaction/dbTransaction';
 export declare class BaseCommonDB implements CommonDB {
     ping(): Promise<void>;
     getTables(): Promise<string[]>;
-    getTableSchema<ROW>(table: string): Promise<CommonSchema<ROW>>;
-    createTable(_schema: CommonSchema): Promise<void>;
+    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaObject<ROW>>;
+    createTable(_table: string, _schema: JsonSchemaObject): Promise<void>;
     deleteByIds(_table: string, _ids: string[]): Promise<number>;
     deleteByQuery<ROW extends ObjectWithId>(_q: DBQuery<ROW>): Promise<number>;
     getByIds<ROW extends ObjectWithId>(_table: string, _ids: string[]): Promise<ROW[]>;

package/dist/base.common.db.js

@@ -13,9 +13,15 @@ class BaseCommonDB {
         return [];
     }
     async getTableSchema(table) {
-        return { table, fields: [] };
-    }
-    async createTable(_schema) { }
+        return {
+            $id: `${table}.schema.json`,
+            type: 'object',
+            additionalProperties: true,
+            properties: {},
+            required: [],
+        };
+    }
+    async createTable(_table, _schema) { }
     async deleteByIds(_table, _ids) {
         return 0;
     }
@@ -40,7 +46,7 @@ class BaseCommonDB {
      * To be extended.
      */
     async commitTransaction(tx, opt) {
-        await dbTransaction_util_1.commitDBTransactionSimple(this, tx, opt);
+        await (0, dbTransaction_util_1.commitDBTransactionSimple)(this, tx, opt);
     }
 }
 exports.BaseCommonDB = BaseCommonDB;

package/dist/common.db.d.ts

@@ -1,7 +1,7 @@
+import { JsonSchemaObject } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, ObjectWithId, RunQueryResult } from './db.model';
 import { DBQuery } from './query/dbQuery';
-import { CommonSchema } from './schema/common.schema';
 import { DBTransaction } from './transaction/dbTransaction';
 export interface CommonDB {
     /**
@@ -15,12 +15,12 @@ export interface CommonDB {
      * Return all tables (table names) available in this DB.
      */
     getTables(): Promise<string[]>;
-    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<CommonSchema<ROW>>;
+    getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaObject<ROW>>;
     /**
      * Will do like `create table ...` for mysql.
      * Caution! dropIfExists defaults to false. If set to true - will actually DROP the table!
      */
-    createTable(schema: CommonSchema, opt?: CommonDBCreateOptions): Promise<void>;
+    createTable(table: string, schema: JsonSchemaObject, 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/commondao/common.dao.d.ts

@@ -1,8 +1,7 @@
-import { AsyncMapper } from '@naturalcycles/js-lib';
-import { ObjectSchemaTyped, ReadableTyped } from '@naturalcycles/nodejs-lib';
+import { AsyncMapper, JsonSchemaObject } from '@naturalcycles/js-lib';
+import { AjvSchema, ObjectSchemaTyped, ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { DBModelType, ObjectWithId, RunQueryResult, Saved } from '../db.model';
 import { DBQuery, RunnableDBQuery } from '../query/dbQuery';
-import { CommonSchema } from '../schema/common.schema';
 import { CommonDaoCfg, CommonDaoCreateOptions, CommonDaoOptions, CommonDaoSaveOptions, CommonDaoStreamForEachOptions, CommonDaoStreamOptions } from './common.dao.model';
 /**
  * Lowest common denominator API between supported Databases.
@@ -116,11 +115,12 @@ export declare class CommonDao<BM extends Partial<ObjectWithId>, DBM extends Obj
     /**
      * Returns *converted value*.
      * Validates (unless `skipValidation=true` passed).
-     * Throws only if `throwOnError=true` passed OR if `env().throwOnEntityValidationError`
+     *
+     * Does NOT mutate the object.
      */
-    validateAndConvert<IN = any, OUT = IN>(obj: IN, schema?: ObjectSchemaTyped<IN>, modelType?: DBModelType, opt?: CommonDaoOptions): OUT;
-    getTableSchema(): Promise<CommonSchema>;
-    createTable(schema: CommonSchema, opt?: CommonDaoCreateOptions): Promise<void>;
+    validateAndConvert<IN, OUT = IN>(obj: IN, schema?: ObjectSchemaTyped<IN> | AjvSchema<IN>, modelType?: DBModelType, opt?: CommonDaoOptions): OUT;
+    getTableSchema(): Promise<JsonSchemaObject<DBM>>;
+    createTable(schema: JsonSchemaObject<DBM>, opt?: CommonDaoCreateOptions): Promise<void>;
     /**
      * Proxy to this.cfg.db.ping
      */