@naturalcycles/db-lib 8.12.0 → 8.13.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [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)
 
 

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

@@ -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,7 +5,6 @@ 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 = (0, nodejs_lib_1.Debug)('nc:db-lib:filedb');
 /**
  * Provides barebone implementation for "whole file" based CommonDB.
@@ -140,7 +139,10 @@ class FileDB extends __1.BaseCommonDB {
     }
     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) {

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,7 +8,6 @@ const fs = require("fs-extra");
 const stream_1 = require("stream");
 const zlib_1 = require("zlib");
 const __1 = require("../..");
-const __2 = require("../..");
 const log = (0, nodejs_lib_1.Debug)('nc:db-lib:inmemorydb');
 class InMemoryDB {
     constructor(cfg) {
@@ -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] = {};
         }

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;
     }

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 { 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.
@@ -120,8 +119,8 @@ export declare class CommonDao<BM extends Partial<ObjectWithId>, DBM extends Obj
      * Does NOT mutate the object.
      */
     validateAndConvert<IN, OUT = IN>(obj: IN, schema?: ObjectSchemaTyped<IN> | AjvSchema<IN>, modelType?: DBModelType, opt?: CommonDaoOptions): OUT;
-    getTableSchema(): Promise<CommonSchema>;
-    createTable(schema: CommonSchema, opt?: CommonDaoCreateOptions): Promise<void>;
+    getTableSchema(): Promise<JsonSchemaObject<DBM>>;
+    createTable(schema: JsonSchemaObject<DBM>, opt?: CommonDaoCreateOptions): Promise<void>;
     /**
      * Proxy to this.cfg.db.ping
      */

package/dist/commondao/common.dao.js

@@ -659,7 +659,7 @@ class CommonDao {
     }
     async createTable(schema, opt) {
         this.requireWriteAccess();
-        await this.cfg.db.createTable(schema, opt);
+        await this.cfg.db.createTable(this.cfg.table, schema, opt);
     }
     /**
      * Proxy to this.cfg.db.ping

package/dist/index.d.ts

@@ -15,9 +15,7 @@ import { dbPipelineBackup, DBPipelineBackupOptions } from './pipeline/dbPipeline
 import { dbPipelineCopy, DBPipelineCopyOptions } from './pipeline/dbPipelineCopy';
 import { dbPipelineRestore, DBPipelineRestoreOptions } from './pipeline/dbPipelineRestore';
 import { DBQuery, DBQueryFilter, DBQueryFilterOperator, DBQueryFilterOperatorValues, DBQueryOrder, RunnableDBQuery } from './query/dbQuery';
-import { CommonSchema, CommonSchemaField, DATA_TYPE } from './schema/common.schema';
-import { CommonSchemaGenerator, CommonSchemaGeneratorCfg } from './schema/commonSchemaGenerator';
 import { DBTransaction, RunnableDBTransaction } from './transaction/dbTransaction';
 import { commitDBTransactionSimple, mergeDBOperations } from './transaction/dbTransaction.util';
-export type { DBQueryFilterOperator, DBQueryFilter, DBQueryOrder, CommonDaoCreateOptions, CommonDaoOptions, CommonDaoSaveOptions, CommonDaoStreamForEachOptions, CommonDaoStreamOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, CommonDBCreateOptions, CommonDB, RunQueryResult, CreatedUpdated, CreatedUpdatedId, CreatedUpdatedVer, ObjectWithId, BaseDBEntity, SavedDBEntity, Saved, Unsaved, CommonDaoCfg, CommonDaoCreateIdHook, CommonDaoParseNaturalIdHook, CommonDaoBeforeCreateHook, CommonDaoBeforeDBMValidateHook, CommonDaoBeforeDBMToBMHook, CommonDaoBeforeBMToDBMHook, CommonDaoBeforeTMToBMHook, CommonDaoBeforeBMToTMHook, CommonDaoAnonymizeHook, InMemoryDBCfg, InMemoryKeyValueDBCfg, DBPipelineBackupOptions, DBPipelineRestoreOptions, DBPipelineCopyOptions, CommonSchema, CommonSchemaField, CommonSchemaGeneratorCfg, CommonDBAdapter, DBOperation, DBSaveBatchOperation, DBDeleteByIdsOperation, CommonKeyValueDB, CommonKeyValueDaoCfg, KeyValueDBTuple, };
-export { DBQuery, DBQueryFilterOperatorValues, RunnableDBQuery, CommonDaoLogLevel, DBRelation, DBModelType, baseDBEntitySchema, savedDBEntitySchema, CommonDao, createdUpdatedFields, createdUpdatedIdFields, idField, InMemoryDB, InMemoryKeyValueDB, queryInMemory, serializeJsonField, deserializeJsonField, dbPipelineBackup, dbPipelineRestore, dbPipelineCopy, DATA_TYPE, getDB, DBLibError, BaseCommonDB, DBTransaction, RunnableDBTransaction, mergeDBOperations, commitDBTransactionSimple, CommonSchemaGenerator, CommonKeyValueDao, };
+export type { DBQueryFilterOperator, DBQueryFilter, DBQueryOrder, CommonDaoCreateOptions, CommonDaoOptions, CommonDaoSaveOptions, CommonDaoStreamForEachOptions, CommonDaoStreamOptions, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, CommonDBCreateOptions, CommonDB, RunQueryResult, CreatedUpdated, CreatedUpdatedId, CreatedUpdatedVer, ObjectWithId, BaseDBEntity, SavedDBEntity, Saved, Unsaved, CommonDaoCfg, CommonDaoCreateIdHook, CommonDaoParseNaturalIdHook, CommonDaoBeforeCreateHook, CommonDaoBeforeDBMValidateHook, CommonDaoBeforeDBMToBMHook, CommonDaoBeforeBMToDBMHook, CommonDaoBeforeTMToBMHook, CommonDaoBeforeBMToTMHook, CommonDaoAnonymizeHook, InMemoryDBCfg, InMemoryKeyValueDBCfg, DBPipelineBackupOptions, DBPipelineRestoreOptions, DBPipelineCopyOptions, CommonDBAdapter, DBOperation, DBSaveBatchOperation, DBDeleteByIdsOperation, CommonKeyValueDB, CommonKeyValueDaoCfg, KeyValueDBTuple, };
+export { DBQuery, DBQueryFilterOperatorValues, RunnableDBQuery, CommonDaoLogLevel, DBRelation, DBModelType, baseDBEntitySchema, savedDBEntitySchema, CommonDao, createdUpdatedFields, createdUpdatedIdFields, idField, InMemoryDB, InMemoryKeyValueDB, queryInMemory, serializeJsonField, deserializeJsonField, dbPipelineBackup, dbPipelineRestore, dbPipelineCopy, getDB, DBLibError, BaseCommonDB, DBTransaction, RunnableDBTransaction, mergeDBOperations, commitDBTransactionSimple, CommonKeyValueDao, };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonKeyValueDao = exports.CommonSchemaGenerator = exports.commitDBTransactionSimple = exports.mergeDBOperations = exports.RunnableDBTransaction = exports.DBTransaction = exports.BaseCommonDB = exports.DBLibError = exports.getDB = exports.DATA_TYPE = exports.dbPipelineCopy = exports.dbPipelineRestore = exports.dbPipelineBackup = exports.deserializeJsonField = exports.serializeJsonField = exports.queryInMemory = exports.InMemoryKeyValueDB = exports.InMemoryDB = exports.idField = exports.createdUpdatedIdFields = exports.createdUpdatedFields = exports.CommonDao = exports.savedDBEntitySchema = exports.baseDBEntitySchema = exports.DBModelType = exports.DBRelation = exports.CommonDaoLogLevel = exports.RunnableDBQuery = exports.DBQueryFilterOperatorValues = exports.DBQuery = void 0;
+exports.CommonKeyValueDao = exports.commitDBTransactionSimple = exports.mergeDBOperations = exports.RunnableDBTransaction = exports.DBTransaction = exports.BaseCommonDB = exports.DBLibError = exports.getDB = exports.dbPipelineCopy = exports.dbPipelineRestore = exports.dbPipelineBackup = exports.deserializeJsonField = exports.serializeJsonField = exports.queryInMemory = exports.InMemoryKeyValueDB = exports.InMemoryDB = exports.idField = exports.createdUpdatedIdFields = exports.createdUpdatedFields = exports.CommonDao = exports.savedDBEntitySchema = exports.baseDBEntitySchema = exports.DBModelType = exports.DBRelation = exports.CommonDaoLogLevel = exports.RunnableDBQuery = exports.DBQueryFilterOperatorValues = exports.DBQuery = void 0;
 const inMemory_db_1 = require("./adapter/inmemory/inMemory.db");
 Object.defineProperty(exports, "InMemoryDB", { enumerable: true, get: function () { return inMemory_db_1.InMemoryDB; } });
 const inMemoryKeyValueDB_1 = require("./adapter/inmemory/inMemoryKeyValueDB");
@@ -40,10 +40,6 @@ const dbQuery_1 = require("./query/dbQuery");
 Object.defineProperty(exports, "DBQuery", { enumerable: true, get: function () { return dbQuery_1.DBQuery; } });
 Object.defineProperty(exports, "DBQueryFilterOperatorValues", { enumerable: true, get: function () { return dbQuery_1.DBQueryFilterOperatorValues; } });
 Object.defineProperty(exports, "RunnableDBQuery", { enumerable: true, get: function () { return dbQuery_1.RunnableDBQuery; } });
-const common_schema_1 = require("./schema/common.schema");
-Object.defineProperty(exports, "DATA_TYPE", { enumerable: true, get: function () { return common_schema_1.DATA_TYPE; } });
-const commonSchemaGenerator_1 = require("./schema/commonSchemaGenerator");
-Object.defineProperty(exports, "CommonSchemaGenerator", { enumerable: true, get: function () { return commonSchemaGenerator_1.CommonSchemaGenerator; } });
 const dbTransaction_1 = require("./transaction/dbTransaction");
 Object.defineProperty(exports, "DBTransaction", { enumerable: true, get: function () { return dbTransaction_1.DBTransaction; } });
 Object.defineProperty(exports, "RunnableDBTransaction", { enumerable: true, get: function () { return dbTransaction_1.RunnableDBTransaction; } });

package/dist/pipeline/dbPipelineBackup.d.ts

@@ -76,7 +76,6 @@ export interface DBPipelineBackupOptions extends TransformLogProgressOptions {
      * @default false
      * If true - will use CommonSchemaGenerator to detect schema from input data.
      */
-    emitSchemaFromData?: boolean;
     /**
      * @default false
      * If true - will use CommonDB.getTableSchema() and emit schema.

package/dist/pipeline/dbPipelineBackup.js

@@ -8,7 +8,6 @@ const time_lib_1 = require("@naturalcycles/time-lib");
 const fs = require("fs-extra");
 const zlib_1 = require("zlib");
 const index_1 = require("../index");
-const commonSchemaGenerator_1 = require("../schema/commonSchemaGenerator");
 // const log = Debug('nc:db-lib:pipeline')
 /**
  * Pipeline from input stream(s) to a NDJSON file (optionally gzipped).
@@ -20,7 +19,7 @@ const commonSchemaGenerator_1 = require("../schema/commonSchemaGenerator");
  * Optionally you can provide mapperPerTable and @param transformMapOptions (one for all mappers) - it will run for each table.
  */
 async function dbPipelineBackup(opt) {
-    const { db, concurrency = 16, limit = 0, sinceUpdated, outputDirPath, protectFromOverwrite = false, zlibOptions, mapperPerTable = {}, transformMapOptions, errorMode = js_lib_1.ErrorMode.SUPPRESS, emitSchemaFromDB = false, emitSchemaFromData = false, sortObjects = false, } = opt;
+    const { db, concurrency = 16, limit = 0, sinceUpdated, outputDirPath, protectFromOverwrite = false, zlibOptions, mapperPerTable = {}, transformMapOptions, errorMode = js_lib_1.ErrorMode.SUPPRESS, emitSchemaFromDB = false, sortObjects = false, } = opt;
     const strict = errorMode !== js_lib_1.ErrorMode.SUPPRESS;
     const gzip = opt.gzip !== false; // default to true
     let { tables } = opt;
@@ -51,9 +50,6 @@ async function dbPipelineBackup(opt) {
             await fs.writeJson(schemaFilePath, schema, { spaces: 2 });
             console.log(`>> ${(0, colors_1.grey)(schemaFilePath)} saved (generated from DB)`);
         }
-        const schemaGen = emitSchemaFromData
-            ? new commonSchemaGenerator_1.CommonSchemaGenerator({ table, sortedFields: true })
-            : undefined;
         await (0, nodejs_lib_1._pipeline)([
             db.streamQuery(q),
             (0, nodejs_lib_1.transformLogProgress)({
@@ -67,10 +63,8 @@ async function dbPipelineBackup(opt) {
                 ...transformMapOptions,
                 metric: table,
             }),
-            (0, nodejs_lib_1.transformTap)(row => {
+            (0, nodejs_lib_1.transformTap)(() => {
                 rows++;
-                if (schemaGen)
-                    schemaGen.add(row);
             }),
             (0, nodejs_lib_1.transformToNDJson)({ strict, sortObjects }),
             ...(gzip ? [(0, zlib_1.createGzip)(zlibOptions)] : []),
@@ -83,11 +77,6 @@ async function dbPipelineBackup(opt) {
             sizeBytes,
         });
         console.log(`>> ${(0, colors_1.grey)(filePath)}\n` + stats.toPretty());
-        if (schemaGen) {
-            const schema = schemaGen.generate();
-            await fs.writeJson(schemaFilePath, schema, { spaces: 2 });
-            console.log(`>> ${(0, colors_1.grey)(schemaFilePath)} saved (generated from data)`);
-        }
         statsPerTable[table] = stats;
     }, { concurrency, errorMode });
     const statsTotal = nodejs_lib_1.NDJsonStats.createCombined(Object.values(statsPerTable));

package/dist/pipeline/dbPipelineRestore.js

@@ -56,7 +56,7 @@ async function dbPipelineRestore(opt) {
                 return;
             }
             const schema = await fs.readJson(schemaFilePath);
-            await db.createTable(schema, { dropIfExists: true });
+            await db.createTable(table, schema, { dropIfExists: true });
         });
     }
     await (0, js_lib_1.pMap)(tables, async (table) => {

package/dist/testing/dbTest.js

@@ -28,7 +28,7 @@ function runCommonDBTest(db, features = {}, quirks = {}) {
     // CREATE TABLE, DROP
     if (createTable) {
         test('createTable, dropIfExists=true', async () => {
-            await db.createTable((0, test_model_1.getTestItemSchema)(), { dropIfExists: true });
+            await db.createTable(test_model_1.TEST_TABLE, (0, test_model_1.getTestItemSchema)(), { dropIfExists: true });
         });
     }
     if (querying) {

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

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { CommonSchema } from '..';
+import { JsonSchemaObject } from '@naturalcycles/js-lib';
 import { BaseDBEntity, Saved } from '../db.model';
 export declare const TEST_TABLE = "TEST_TABLE";
 export interface TestItemBM extends BaseDBEntity {
@@ -24,4 +24,4 @@ export declare function createTestItemDBM(num?: number): TestItemDBM;
 export declare function createTestItemBM(num?: number): Saved<TestItemBM>;
 export declare function createTestItemsDBM(count?: number): TestItemDBM[];
 export declare function createTestItemsBM(count?: number): Saved<TestItemBM>[];
-export declare function getTestItemSchema(): CommonSchema<TestItemDBM>;
+export declare function getTestItemSchema(): JsonSchemaObject<TestItemDBM>;

package/dist/testing/test.model.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTestItemSchema = exports.createTestItemsBM = exports.createTestItemsDBM = exports.createTestItemBM = exports.createTestItemDBM = exports.testItemDBMJsonSchema = exports.testItemBMJsonSchema = exports.testItemTMSchema = exports.testItemDBMSchema = exports.testItemBMSchema = exports.TEST_TABLE = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const __1 = require("..");
 const db_model_1 = require("../db.model");
 const MOCK_TS_2018_06_21 = 1529539200;
 exports.TEST_TABLE = 'TEST_TABLE';
@@ -69,7 +68,19 @@ function createTestItemsBM(count = 1) {
     return (0, js_lib_1._range)(1, count + 1).map(num => createTestItemBM(num));
 }
 exports.createTestItemsBM = createTestItemsBM;
+const testItemJsonSchema = js_lib_1.jsonSchema
+    .object({
+    id: js_lib_1.jsonSchema.string(),
+    k1: js_lib_1.jsonSchema.string(),
+    k2: js_lib_1.jsonSchema.string(),
+    k3: js_lib_1.jsonSchema.number(),
+    even: js_lib_1.jsonSchema.boolean(),
+    created: js_lib_1.jsonSchema.unixTimestamp(),
+    updated: js_lib_1.jsonSchema.unixTimestamp(),
+})
+    .build();
 function getTestItemSchema() {
-    return __1.CommonSchemaGenerator.generateFromRows({ table: exports.TEST_TABLE }, createTestItemsDBM());
+    // return CommonSchemaGenerator.generateFromRows({ table: TEST_TABLE }, createTestItemsDBM())
+    return testItemJsonSchema;
 }
 exports.getTestItemSchema = getTestItemSchema;

package/package.json

@@ -42,7 +42,7 @@
   "engines": {
     "node": ">=12.13"
   },
-  "version": "8.12.0",
+  "version": "8.13.0",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

package/readme.md

@@ -216,19 +216,20 @@ await db.getTables()
 
 ###### getTableSchema
 
-`getTableSchema(table: string): Promise<CommonSchema>`
+`getTableSchema(table: string): Promise<JsonSchemaObject>`
 
 ```typescript
 await db.getTableSchema('table1')
-// todo: describe CommonSchema example
 ```
 
+Returns a JsonSchema, generated from the table.
+
 ###### createTable
 
-`createTable(schema: CommonSchema): Promise<void>`
+`createTable(table: string, schema: JsonSchemaObject): Promise<void>`
 
 Applicable to Relational DBs, like MySQL. Will invoke smth like `create table Table1 ... ;`. Takes a
-`CommonSchema` as an argument.
+`JsonSchema` as an argument.
 
 # DBQuery
 

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

@@ -1,10 +1,10 @@
+import { JsonSchemaObject } from '@naturalcycles/js-lib'
 import { Debug, 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,
@@ -45,17 +45,21 @@ export class CacheDB extends BaseCommonDB implements CommonDB {
 
   override async getTableSchema<ROW extends ObjectWithId>(
     table: string,
-  ): Promise<CommonSchema<ROW>> {
+  ): Promise<JsonSchemaObject<ROW>> {
     return await this.cfg.downstreamDB.getTableSchema<ROW>(table)
   }
 
-  override async createTable(schema: CommonSchema, opt: CacheDBCreateOptions = {}): Promise<void> {
+  override async createTable(
+    table: string,
+    schema: JsonSchemaObject,
+    opt: CacheDBCreateOptions = {},
+  ): Promise<void> {
     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)
     }
   }
 

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

@@ -1,4 +1,6 @@
 import {
+  generateJsonSchemaFromData,
+  JsonSchemaObject,
   pMap,
   StringMap,
   _by,
@@ -12,8 +14,6 @@ import {
 import { Debug, readableCreate, ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { dimGrey } from '@naturalcycles/nodejs-lib/dist/colors'
 import { BaseCommonDB, DBSaveBatchOperation, ObjectWithId, queryInMemory } from '../..'
-import { CommonSchema } from '../..'
-import { CommonSchemaGenerator } from '../..'
 import { CommonDB } from '../../common.db'
 import {
   CommonDBOptions,
@@ -213,9 +213,12 @@ export class FileDB extends BaseCommonDB implements CommonDB {
 
   override async getTableSchema<ROW extends ObjectWithId>(
     table: string,
-  ): Promise<CommonSchema<ROW>> {
+  ): Promise<JsonSchemaObject<ROW>> {
     const rows = await this.loadFile(table)
-    return CommonSchemaGenerator.generateFromRows({ table }, rows)
+    return {
+      ...generateJsonSchemaFromData(rows),
+      $id: `${table}.schema.json`,
+    } as JsonSchemaObject<ROW>
   }
 
   // wrapper, to handle logging

package/src/adapter/inmemory/inMemory.db.ts

@@ -1,4 +1,12 @@
-import { pMap, StringMap, _by, _since, _sortObjectDeep } from '@naturalcycles/js-lib'
+import {
+  generateJsonSchemaFromData,
+  JsonSchemaObject,
+  pMap,
+  StringMap,
+  _by,
+  _since,
+  _sortObjectDeep,
+} from '@naturalcycles/js-lib'
 import {
   bufferReviver,
   Debug,
@@ -14,8 +22,6 @@ import * as fs from 'fs-extra'
 import { Readable } from 'stream'
 import { createGzip, createUnzip } from 'zlib'
 import { CommonDB, DBTransaction, ObjectWithId, queryInMemory } from '../..'
-import { CommonSchema } from '../..'
-import { CommonSchemaGenerator } from '../..'
 import {
   CommonDBCreateOptions,
   CommonDBOptions,
@@ -105,13 +111,20 @@ 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<CommonSchema<ROW>> {
+  async getTableSchema<ROW extends ObjectWithId>(_table: string): Promise<JsonSchemaObject<ROW>> {
     const table = this.cfg.tablesPrefix + _table
-    return CommonSchemaGenerator.generateFromRows({ table }, Object.values(this.data[table] || {}))
+    return {
+      ...generateJsonSchemaFromData(Object.values(this.data[table] || {})),
+      $id: `${table}.schema.json`,
+    } as JsonSchemaObject<ROW>
   }
 
-  async createTable(schema: CommonSchema, opt: CommonDBCreateOptions = {}): Promise<void> {
-    const table = this.cfg.tablesPrefix + schema.table
+  async createTable(
+    _table: string,
+    _schema: JsonSchemaObject,
+    opt: CommonDBCreateOptions = {},
+  ): Promise<void> {
+    const table = this.cfg.tablesPrefix + _table
     if (opt.dropIfExists) {
       this.data[table] = {}
     } else {

package/src/base.common.db.ts

@@ -1,9 +1,9 @@
+import { JsonSchemaObject } from '@naturalcycles/js-lib'
 import { ReadableTyped } from '@naturalcycles/nodejs-lib'
 import { Readable } from 'stream'
 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'
 import { commitDBTransactionSimple } from './transaction/dbTransaction.util'
 
@@ -18,11 +18,17 @@ export class BaseCommonDB implements CommonDB {
     return []
   }
 
-  async getTableSchema<ROW>(table: string): Promise<CommonSchema<ROW>> {
-    return { table, fields: [] }
+  async getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaObject<ROW>> {
+    return {
+      $id: `${table}.schema.json`,
+      type: 'object',
+      additionalProperties: true,
+      properties: {} as any,
+      required: [],
+    }
   }
 
-  async createTable(_schema: CommonSchema): Promise<void> {}
+  async createTable(_table: string, _schema: JsonSchemaObject): Promise<void> {}
 
   async deleteByIds(_table: string, _ids: string[]): Promise<number> {
     return 0

package/src/common.db.ts

@@ -1,3 +1,4 @@
+import { JsonSchemaObject } from '@naturalcycles/js-lib'
 import { ReadableTyped } from '@naturalcycles/nodejs-lib'
 import {
   CommonDBCreateOptions,
@@ -8,7 +9,6 @@ import {
   RunQueryResult,
 } from './db.model'
 import { DBQuery } from './query/dbQuery'
-import { CommonSchema } from './schema/common.schema'
 import { DBTransaction } from './transaction/dbTransaction'
 
 export interface CommonDB {
@@ -25,13 +25,13 @@ export interface CommonDB {
    */
   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>
 
   // GET
   /**