@naturalcycles/db-lib 8.11.0 → 8.13.0

package/dist/pipeline/dbPipelineCopy.js

@@ -15,14 +15,14 @@ const dbQuery_1 = require("../query/dbQuery");
 async function dbPipelineCopy(opt) {
     const { batchSize = 100, dbInput, dbOutput, concurrency = 16, limit = 0, sinceUpdated, mapperPerTable = {}, saveOptionsPerTable = {}, transformMapOptions, errorMode = js_lib_1.ErrorMode.SUPPRESS, } = opt;
     let { tables } = opt;
-    const sinceUpdatedStr = sinceUpdated ? ' since ' + colors_1.grey(time_lib_1.dayjs.unix(sinceUpdated).toPretty()) : '';
-    console.log(`>> ${colors_1.dimWhite('dbPipelineCopy')} started...${sinceUpdatedStr}`);
+    const sinceUpdatedStr = sinceUpdated ? ' since ' + (0, colors_1.grey)(time_lib_1.dayjs.unix(sinceUpdated).toPretty()) : '';
+    console.log(`>> ${(0, colors_1.dimWhite)('dbPipelineCopy')} started...${sinceUpdatedStr}`);
     if (!tables) {
         tables = await dbInput.getTables();
     }
-    console.log(`${colors_1.yellow(tables.length)} ${colors_1.boldWhite('table(s)')}:\n` + tables.join('\n'));
+    console.log(`${(0, colors_1.yellow)(tables.length)} ${(0, colors_1.boldWhite)('table(s)')}:\n` + tables.join('\n'));
     const statsPerTable = {};
-    await js_lib_1.pMap(tables, async (table) => {
+    await (0, js_lib_1.pMap)(tables, async (table) => {
         let q = dbQuery_1.DBQuery.create(table).limit(limit);
         if (sinceUpdated) {
             q = q.filter('updated', '>=', sinceUpdated);
@@ -32,22 +32,22 @@ async function dbPipelineCopy(opt) {
         const stream = dbInput.streamQuery(q);
         const started = Date.now();
         let rows = 0;
-        await nodejs_lib_1._pipeline([
+        await (0, nodejs_lib_1._pipeline)([
             stream,
-            nodejs_lib_1.transformLogProgress({
+            (0, nodejs_lib_1.transformLogProgress)({
                 logEvery: 1000,
                 ...opt,
                 metric: table,
             }),
-            nodejs_lib_1.transformMap(mapper, {
+            (0, nodejs_lib_1.transformMap)(mapper, {
                 errorMode,
                 flattenArrayOutput: true,
                 ...transformMapOptions,
                 metric: table,
             }),
-            nodejs_lib_1.transformTap(() => rows++),
-            nodejs_lib_1.transformBuffer({ batchSize }),
-            nodejs_lib_1.writableForEach(async (dbms) => {
+            (0, nodejs_lib_1.transformTap)(() => rows++),
+            (0, nodejs_lib_1.transformBuffer)({ batchSize }),
+            (0, nodejs_lib_1.writableForEach)(async (dbms) => {
                 await dbOutput.saveBatch(table, dbms, saveOptions);
             }),
         ]);
@@ -56,7 +56,7 @@ async function dbPipelineCopy(opt) {
             rows,
             sizeBytes: 0, // n/a
         });
-        console.log(`>> ${colors_1.grey(table)}\n` + stats.toPretty());
+        console.log(`>> ${(0, colors_1.grey)(table)}\n` + stats.toPretty());
         statsPerTable[table] = stats;
     }, { concurrency, errorMode });
     const statsTotal = nodejs_lib_1.NDJsonStats.createCombined(Object.values(statsPerTable));

package/dist/pipeline/dbPipelineRestore.js

@@ -18,8 +18,8 @@ async function dbPipelineRestore(opt) {
     const { db, concurrency = 16, batchSize = 100, limit, sinceUpdated, inputDirPath, mapperPerTable = {}, saveOptionsPerTable = {}, transformMapOptions, errorMode = js_lib_1.ErrorMode.SUPPRESS, recreateTables = false, } = opt;
     const strict = errorMode !== js_lib_1.ErrorMode.SUPPRESS;
     const onlyTables = opt.tables && new Set(opt.tables);
-    const sinceUpdatedStr = sinceUpdated ? ' since ' + colors_1.grey(time_lib_1.dayjs.unix(sinceUpdated).toPretty()) : '';
-    console.log(`>> ${colors_1.dimWhite('dbPipelineRestore')} started in ${colors_1.grey(inputDirPath)}...${sinceUpdatedStr}`);
+    const sinceUpdatedStr = sinceUpdated ? ' since ' + (0, colors_1.grey)(time_lib_1.dayjs.unix(sinceUpdated).toPretty()) : '';
+    console.log(`>> ${(0, colors_1.dimWhite)('dbPipelineRestore')} started in ${(0, colors_1.grey)(inputDirPath)}...${sinceUpdatedStr}`);
     fs.ensureDirSync(inputDirPath);
     const tablesToGzip = new Set();
     const sizeByTable = {};
@@ -45,51 +45,51 @@ async function dbPipelineRestore(opt) {
             tablesToGzip.add(table);
         sizeByTable[table] = fs.statSync(`${inputDirPath}/${f}`).size;
     });
-    const sizeStrByTable = js_lib_1._mapValues(sizeByTable, (_k, b) => js_lib_1._hb(b));
-    console.log(`${colors_1.yellow(tables.length)} ${colors_1.boldWhite('table(s)')}:\n`, sizeStrByTable);
+    const sizeStrByTable = (0, js_lib_1._mapValues)(sizeByTable, (_k, b) => (0, js_lib_1._hb)(b));
+    console.log(`${(0, colors_1.yellow)(tables.length)} ${(0, colors_1.boldWhite)('table(s)')}:\n`, sizeStrByTable);
     // const schemaByTable: Record<string, CommonSchema> = {}
     if (recreateTables) {
-        await js_lib_1.pMap(tables, async (table) => {
+        await (0, js_lib_1.pMap)(tables, async (table) => {
             const schemaFilePath = `${inputDirPath}/${table}.schema.json`;
             if (!fs.existsSync(schemaFilePath)) {
                 console.warn(`${schemaFilePath} does not exist!`);
                 return;
             }
             const schema = await fs.readJson(schemaFilePath);
-            await db.createTable(schema, { dropIfExists: true });
+            await db.createTable(table, schema, { dropIfExists: true });
         });
     }
-    await js_lib_1.pMap(tables, async (table) => {
+    await (0, js_lib_1.pMap)(tables, async (table) => {
         const gzip = tablesToGzip.has(table);
         const filePath = `${inputDirPath}/${table}.ndjson` + (gzip ? '.gz' : '');
         const saveOptions = saveOptionsPerTable[table] || {};
         const started = Date.now();
         let rows = 0;
         const sizeBytes = sizeByTable[table];
-        console.log(`<< ${colors_1.grey(filePath)} ${colors_1.dimWhite(js_lib_1._hb(sizeBytes))} started...`);
-        await nodejs_lib_1._pipeline([
+        console.log(`<< ${(0, colors_1.grey)(filePath)} ${(0, colors_1.dimWhite)((0, js_lib_1._hb)(sizeBytes))} started...`);
+        await (0, nodejs_lib_1._pipeline)([
             fs.createReadStream(filePath),
-            ...(gzip ? [zlib_1.createUnzip()] : []),
-            nodejs_lib_1.transformSplit(),
-            nodejs_lib_1.transformJsonParse({ strict }),
-            nodejs_lib_1.transformTap(() => rows++),
-            nodejs_lib_1.transformLogProgress({
+            ...(gzip ? [(0, zlib_1.createUnzip)()] : []),
+            (0, nodejs_lib_1.transformSplit)(),
+            (0, nodejs_lib_1.transformJsonParse)({ strict }),
+            (0, nodejs_lib_1.transformTap)(() => rows++),
+            (0, nodejs_lib_1.transformLogProgress)({
                 logEvery: 1000,
                 ...opt,
                 metric: table,
             }),
-            nodejs_lib_1.transformLimit(limit),
+            (0, nodejs_lib_1.transformLimit)(limit),
             ...(sinceUpdated
-                ? [nodejs_lib_1.transformFilterSync(r => r.updated >= sinceUpdated)]
+                ? [(0, nodejs_lib_1.transformFilterSync)(r => r.updated >= sinceUpdated)]
                 : []),
-            nodejs_lib_1.transformMap(mapperPerTable[table] || js_lib_1._passthroughMapper, {
+            (0, nodejs_lib_1.transformMap)(mapperPerTable[table] || js_lib_1._passthroughMapper, {
                 errorMode,
                 flattenArrayOutput: true,
                 ...transformMapOptions,
                 metric: table,
             }),
-            nodejs_lib_1.transformBuffer({ batchSize }),
-            nodejs_lib_1.writableForEach(async (dbms) => {
+            (0, nodejs_lib_1.transformBuffer)({ batchSize }),
+            (0, nodejs_lib_1.writableForEach)(async (dbms) => {
                 await db.saveBatch(table, dbms, saveOptions);
             }),
         ]);
@@ -98,7 +98,7 @@ async function dbPipelineRestore(opt) {
             rows,
             sizeBytes,
         });
-        console.log(`<< ${colors_1.grey(filePath)}\n` + stats.toPretty());
+        console.log(`<< ${(0, colors_1.grey)(filePath)}\n` + stats.toPretty());
         statsPerTable[table] = stats;
     }, { concurrency, errorMode });
     const statsTotal = nodejs_lib_1.NDJsonStats.createCombined(Object.values(statsPerTable));

package/dist/query/dbQuery.js

@@ -116,10 +116,10 @@ class DBQuery {
             tokens.push(`limit ${this._limitValue}`);
         }
         if (this._startCursor) {
-            tokens.push(`startCursor ${js_lib_1._truncate(this._startCursor, 8)}`);
+            tokens.push(`startCursor ${(0, js_lib_1._truncate)(this._startCursor, 8)}`);
         }
         if (this._endCursor) {
-            tokens.push(`endCursor ${js_lib_1._truncate(this._endCursor, 8)}`);
+            tokens.push(`endCursor ${(0, js_lib_1._truncate)(this._endCursor, 8)}`);
         }
         return tokens;
     }

package/dist/testing/daoTest.js

@@ -28,8 +28,8 @@ function runCommonDaoTest(db, features = {}, quirks = {}) {
     // allowBooleansAsUndefined,
     // } = quirks
     const eventualConsistencyDelay = !strongConsistency && quirks.eventualConsistencyDelay;
-    const items = test_model_1.createTestItemsBM(3);
-    const itemsClone = js_lib_1._deepCopy(items);
+    const items = (0, test_model_1.createTestItemsBM)(3);
+    const itemsClone = (0, js_lib_1._deepCopy)(items);
     // deepFreeze(items) // mutation of id/created/updated is allowed now! (even expected)
     const item1 = items[0];
     const expectedItems = items.map(i => ({
@@ -42,7 +42,7 @@ function runCommonDaoTest(db, features = {}, quirks = {}) {
     // CREATE TABLE, DROP
     if (createTable) {
         test('createTable, dropIfExists=true', async () => {
-            await dao.createTable(_1.getTestItemSchema(), { dropIfExists: true });
+            await dao.createTable((0, _1.getTestItemSchema)(), { dropIfExists: true });
         });
     }
     if (querying) {
@@ -54,7 +54,7 @@ function runCommonDaoTest(db, features = {}, quirks = {}) {
         // QUERY empty
         test('runQuery(all), runQueryCount should return empty', async () => {
             if (eventualConsistencyDelay)
-                await js_lib_1.pDelay(eventualConsistencyDelay);
+                await (0, js_lib_1.pDelay)(eventualConsistencyDelay);
             expect(await dao.query().runQuery()).toEqual([]);
             expect(await dao.query().runQueryCount()).toEqual(0);
         });
@@ -78,40 +78,40 @@ function runCommonDaoTest(db, features = {}, quirks = {}) {
         // no unnecessary mutation
         const { updated: _, ...clone } = itemsClone[0];
         expect(items[0]).toMatchObject(clone);
-        dbTest_1.expectMatch(expectedItems, itemsSaved, quirks);
+        (0, dbTest_1.expectMatch)(expectedItems, itemsSaved, quirks);
     });
     // GET not empty
     test('getByIds all items', async () => {
         const rows = await dao.getByIds(items.map(i => i.id).concat('abcd'));
-        dbTest_1.expectMatch(expectedItems, rows, quirks);
+        (0, dbTest_1.expectMatch)(expectedItems, rows, quirks);
     });
     // QUERY
     if (querying) {
         test('runQuery(all) should return all items', async () => {
             if (eventualConsistencyDelay)
-                await js_lib_1.pDelay(eventualConsistencyDelay);
+                await (0, js_lib_1.pDelay)(eventualConsistencyDelay);
             let rows = await dao.query().runQuery();
-            rows = js_lib_1._sortBy(rows, r => r.id);
-            dbTest_1.expectMatch(expectedItems, rows, quirks);
+            rows = (0, js_lib_1._sortBy)(rows, r => r.id);
+            (0, dbTest_1.expectMatch)(expectedItems, rows, quirks);
         });
         if (dbQueryFilter) {
             test('query even=true', async () => {
                 let rows = await dao.query().filter('even', '==', true).runQuery();
-                rows = js_lib_1._sortBy(rows, r => r.id);
-                dbTest_1.expectMatch(expectedItems.filter(i => i.even), rows, quirks);
+                rows = (0, js_lib_1._sortBy)(rows, r => r.id);
+                (0, dbTest_1.expectMatch)(expectedItems.filter(i => i.even), rows, quirks);
             });
         }
         if (dbQueryOrder) {
             test('query order by k1 desc', async () => {
                 const rows = await dao.query().order('k1', true).runQuery();
-                dbTest_1.expectMatch([...expectedItems].reverse(), rows, quirks);
+                (0, dbTest_1.expectMatch)([...expectedItems].reverse(), rows, quirks);
             });
         }
         if (dbQuerySelectFields) {
             test('projection query with only ids', async () => {
                 let rows = await dao.query().select(['id']).runQuery();
-                rows = js_lib_1._sortBy(rows, r => r.id);
-                dbTest_1.expectMatch(expectedItems.map(item => js_lib_1._pick(item, ['id'])), rows, quirks);
+                rows = (0, js_lib_1._sortBy)(rows, r => r.id);
+                (0, dbTest_1.expectMatch)(expectedItems.map(item => (0, js_lib_1._pick)(item, ['id'])), rows, quirks);
             });
         }
         test('runQueryCount should return 3', async () => {
@@ -123,24 +123,24 @@ function runCommonDaoTest(db, features = {}, quirks = {}) {
         test('streamQueryForEach all', async () => {
             let rows = [];
             await dao.query().streamQueryForEach(bm => void rows.push(bm));
-            rows = js_lib_1._sortBy(rows, r => r.id);
-            dbTest_1.expectMatch(expectedItems, rows, quirks);
+            rows = (0, js_lib_1._sortBy)(rows, r => r.id);
+            (0, dbTest_1.expectMatch)(expectedItems, rows, quirks);
         });
         test('streamQuery all', async () => {
-            let rows = await nodejs_lib_1.readableToArray(dao.query().streamQuery());
-            rows = js_lib_1._sortBy(rows, r => r.id);
-            dbTest_1.expectMatch(expectedItems, rows, quirks);
+            let rows = await (0, nodejs_lib_1.readableToArray)(dao.query().streamQuery());
+            rows = (0, js_lib_1._sortBy)(rows, r => r.id);
+            (0, dbTest_1.expectMatch)(expectedItems, rows, quirks);
         });
         test('streamQueryIdsForEach all', async () => {
             let ids = [];
             await dao.query().streamQueryIdsForEach(id => void ids.push(id));
             ids = ids.sort();
-            dbTest_1.expectMatch(expectedItems.map(i => i.id), ids, quirks);
+            (0, dbTest_1.expectMatch)(expectedItems.map(i => i.id), ids, quirks);
         });
         test('streamQueryIds all', async () => {
-            let ids = await nodejs_lib_1.readableToArray(dao.query().streamQueryIds());
+            let ids = await (0, nodejs_lib_1.readableToArray)(dao.query().streamQueryIds());
             ids = ids.sort();
-            dbTest_1.expectMatch(expectedItems.map(i => i.id), ids, quirks);
+            (0, dbTest_1.expectMatch)(expectedItems.map(i => i.id), ids, quirks);
         });
     }
     // DELETE BY
@@ -149,7 +149,7 @@ function runCommonDaoTest(db, features = {}, quirks = {}) {
             const deleted = await dao.query().filter('even', '==', false).deleteByQuery();
             expect(deleted).toBe(items.filter(item => !item.even).length);
             if (eventualConsistencyDelay)
-                await js_lib_1.pDelay(eventualConsistencyDelay);
+                await (0, js_lib_1.pDelay)(eventualConsistencyDelay);
             expect(await dao.query().runQueryCount()).toBe(1);
         });
         test('cleanup', async () => {

package/dist/testing/dbTest.js

@@ -18,8 +18,8 @@ function runCommonDBTest(db, features = {}, quirks = {}) {
     // allowBooleansAsUndefined,
     // } = quirks
     const eventualConsistencyDelay = !strongConsistency && quirks.eventualConsistencyDelay;
-    const items = test_model_1.createTestItemsDBM(3);
-    test_util_1.deepFreeze(items);
+    const items = (0, test_model_1.createTestItemsDBM)(3);
+    (0, test_util_1.deepFreeze)(items);
     const item1 = items[0];
     const queryAll = () => dbQuery_1.DBQuery.create(test_model_1.TEST_TABLE);
     test('ping', async () => {
@@ -28,7 +28,7 @@ function runCommonDBTest(db, features = {}, quirks = {}) {
     // CREATE TABLE, DROP
     if (createTable) {
         test('createTable, dropIfExists=true', async () => {
-            await db.createTable(test_model_1.getTestItemSchema(), { dropIfExists: true });
+            await db.createTable(test_model_1.TEST_TABLE, (0, test_model_1.getTestItemSchema)(), { dropIfExists: true });
         });
     }
     if (querying) {
@@ -40,7 +40,7 @@ function runCommonDBTest(db, features = {}, quirks = {}) {
         // QUERY empty
         test('runQuery(all), runQueryCount should return empty', async () => {
             if (eventualConsistencyDelay)
-                await js_lib_1.pDelay(eventualConsistencyDelay);
+                await (0, js_lib_1.pDelay)(eventualConsistencyDelay);
             expect((await db.runQuery(queryAll())).rows).toEqual([]);
             expect(await db.runQueryCount(queryAll())).toEqual(0);
         });
@@ -70,9 +70,9 @@ function runCommonDBTest(db, features = {}, quirks = {}) {
     if (querying) {
         test('runQuery(all) should return all items', async () => {
             if (eventualConsistencyDelay)
-                await js_lib_1.pDelay(eventualConsistencyDelay);
+                await (0, js_lib_1.pDelay)(eventualConsistencyDelay);
             let { rows } = await db.runQuery(queryAll());
-            rows = js_lib_1._sortBy(rows, r => r.id); // because query doesn't specify order here
+            rows = (0, js_lib_1._sortBy)(rows, r => r.id); // because query doesn't specify order here
             expectMatch(items, rows, quirks);
         });
         if (dbQueryFilter) {
@@ -80,7 +80,7 @@ function runCommonDBTest(db, features = {}, quirks = {}) {
                 const q = new dbQuery_1.DBQuery(test_model_1.TEST_TABLE).filter('even', '==', true);
                 let { rows } = await db.runQuery(q);
                 if (!dbQueryOrder)
-                    rows = js_lib_1._sortBy(rows, r => r.id);
+                    rows = (0, js_lib_1._sortBy)(rows, r => r.id);
                 expectMatch(items.filter(i => i.even), rows, quirks);
             });
         }
@@ -95,14 +95,14 @@ function runCommonDBTest(db, features = {}, quirks = {}) {
             test('projection query with only ids', async () => {
                 const q = new dbQuery_1.DBQuery(test_model_1.TEST_TABLE).select(['id']);
                 let { rows } = await db.runQuery(q);
-                rows = js_lib_1._sortBy(rows, r => r.id); // cause order is not specified
-                expectMatch(items.map(item => js_lib_1._pick(item, ['id'])), rows, quirks);
+                rows = (0, js_lib_1._sortBy)(rows, r => r.id); // cause order is not specified
+                expectMatch(items.map(item => (0, js_lib_1._pick)(item, ['id'])), rows, quirks);
             });
             test('projection query without ids', async () => {
                 const q = new dbQuery_1.DBQuery(test_model_1.TEST_TABLE).select(['k1']);
                 let { rows } = await db.runQuery(q);
-                rows = js_lib_1._sortBy(rows, r => r.k1); // cause order is not specified
-                expectMatch(items.map(item => js_lib_1._pick(item, ['k1'])), rows, quirks);
+                rows = (0, js_lib_1._sortBy)(rows, r => r.k1); // cause order is not specified
+                expectMatch(items.map(item => (0, js_lib_1._pick)(item, ['k1'])), rows, quirks);
             });
             test('projection query empty fields (edge case)', async () => {
                 const q = new dbQuery_1.DBQuery(test_model_1.TEST_TABLE).select([]);
@@ -117,8 +117,8 @@ function runCommonDBTest(db, features = {}, quirks = {}) {
     // STREAM
     if (streaming) {
         test('streamQuery all', async () => {
-            let rows = await nodejs_lib_1.readableToArray(db.streamQuery(queryAll()));
-            rows = js_lib_1._sortBy(rows, r => r.id); // cause order is not specified in DBQuery
+            let rows = await (0, nodejs_lib_1.readableToArray)(db.streamQuery(queryAll()));
+            rows = (0, js_lib_1._sortBy)(rows, r => r.id); // cause order is not specified in DBQuery
             expectMatch(items, rows, quirks);
         });
     }
@@ -127,7 +127,7 @@ function runCommonDBTest(db, features = {}, quirks = {}) {
         const tables = await db.getTables();
         console.log({ tables });
         if (tableSchemas) {
-            await js_lib_1.pMap(tables, async (table) => {
+            await (0, js_lib_1.pMap)(tables, async (table) => {
                 const schema = await db.getTableSchema(table);
                 console.log(schema);
                 expect(schema).toBeDefined();
@@ -141,7 +141,7 @@ function runCommonDBTest(db, features = {}, quirks = {}) {
             const deleted = await db.deleteByQuery(q);
             expect(deleted).toBe(items.filter(item => !item.even).length);
             if (eventualConsistencyDelay)
-                await js_lib_1.pDelay(eventualConsistencyDelay);
+                await (0, js_lib_1.pDelay)(eventualConsistencyDelay);
             expect(await db.runQueryCount(queryAll())).toBe(1);
         });
     }
@@ -151,7 +151,7 @@ function runCommonDBTest(db, features = {}, quirks = {}) {
             const s = 'helloWorld 1';
             const b1 = Buffer.from(s);
             const item = {
-                ...test_model_1.createTestItemDBM(1),
+                ...(0, test_model_1.createTestItemDBM)(1),
                 b1,
             };
             await db.saveBatch(test_model_1.TEST_TABLE, [item]);
@@ -183,7 +183,7 @@ function expectMatch(expected, actual, quirks) {
     // const actualSorted = sortObjectDeep(actual)
     if (quirks.allowBooleansAsUndefined) {
         expected = expected.map(r => {
-            return typeof r !== 'object' ? r : js_lib_1._filterObject(r, (_k, v) => v !== false);
+            return typeof r !== 'object' ? r : (0, js_lib_1._filterObject)(r, (_k, v) => v !== false);
         });
     }
     if (quirks.allowExtraPropertiesInResponse) {

package/dist/testing/keyValueDBTest.js

@@ -4,7 +4,7 @@ exports.runCommonKeyValueDBTest = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const test_model_1 = require("./test.model");
-const testIds = js_lib_1._range(1, 4).map(n => `id${n}`);
+const testIds = (0, js_lib_1._range)(1, 4).map(n => `id${n}`);
 const testEntries = testIds.map(id => [id, Buffer.from(`${id}value`)]);
 function runCommonKeyValueDBTest(db) {
     test('ping', async () => {
@@ -23,38 +23,42 @@ function runCommonKeyValueDBTest(db) {
     test('saveBatch, then getByIds', async () => {
         await db.saveBatch(test_model_1.TEST_TABLE, testEntries);
         const entries = await db.getByIds(test_model_1.TEST_TABLE, testIds);
-        js_lib_1._sortBy(entries, e => e[0], true);
+        (0, js_lib_1._sortBy)(entries, e => e[0], true);
         expect(entries).toEqual(testEntries);
     });
     test('streamIds', async () => {
-        const ids = await nodejs_lib_1.readableToArray(db.streamIds(test_model_1.TEST_TABLE));
+        const ids = await (0, nodejs_lib_1.readableToArray)(db.streamIds(test_model_1.TEST_TABLE));
         ids.sort();
         expect(ids).toEqual(testIds);
     });
     test('streamIds limited', async () => {
-        const idsLimited = await nodejs_lib_1.readableToArray(db.streamIds(test_model_1.TEST_TABLE, 2));
-        idsLimited.sort();
-        expect(idsLimited).toEqual(testIds.slice(0, 2));
+        const idsLimited = await (0, nodejs_lib_1.readableToArray)(db.streamIds(test_model_1.TEST_TABLE, 2));
+        // Order is non-deterministic, so, cannot compare values
+        // idsLimited.sort()
+        // expect(idsLimited).toEqual(testIds.slice(0, 2))
+        expect(idsLimited.length).toBe(2);
     });
     test('streamValues', async () => {
-        const values = await nodejs_lib_1.readableToArray(db.streamValues(test_model_1.TEST_TABLE));
+        const values = await (0, nodejs_lib_1.readableToArray)(db.streamValues(test_model_1.TEST_TABLE));
         values.sort();
         expect(values).toEqual(testEntries.map(e => e[1]));
     });
     test('streamValues limited', async () => {
-        const valuesLimited = await nodejs_lib_1.readableToArray(db.streamValues(test_model_1.TEST_TABLE, 2));
-        valuesLimited.sort();
-        expect(valuesLimited).toEqual(testEntries.map(e => e[1]).slice(0, 2));
+        const valuesLimited = await (0, nodejs_lib_1.readableToArray)(db.streamValues(test_model_1.TEST_TABLE, 2));
+        // valuesLimited.sort()
+        // expect(valuesLimited).toEqual(testEntries.map(e => e[1]).slice(0, 2))
+        expect(valuesLimited.length).toBe(2);
     });
     test('streamEntries', async () => {
-        const entries = await nodejs_lib_1.readableToArray(db.streamEntries(test_model_1.TEST_TABLE));
+        const entries = await (0, nodejs_lib_1.readableToArray)(db.streamEntries(test_model_1.TEST_TABLE));
         entries.sort();
         expect(entries).toEqual(testEntries);
     });
     test('streamEntries limited', async () => {
-        const entriesLimited = await nodejs_lib_1.readableToArray(db.streamEntries(test_model_1.TEST_TABLE, 2));
-        entriesLimited.sort();
-        expect(entriesLimited).toEqual(testEntries.slice(0, 2));
+        const entriesLimited = await (0, nodejs_lib_1.readableToArray)(db.streamEntries(test_model_1.TEST_TABLE, 2));
+        // entriesLimited.sort()
+        // expect(entriesLimited).toEqual(testEntries.slice(0, 2))
+        expect(entriesLimited.length).toBe(2);
     });
     test('deleteByIds should clear', async () => {
         await db.deleteByIds(test_model_1.TEST_TABLE, testIds);

package/dist/testing/keyValueDaoTest.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCommonKeyValueDaoTest = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const testIds = js_lib_1._range(1, 4).map(n => `id${n}`);
+const testIds = (0, js_lib_1._range)(1, 4).map(n => `id${n}`);
 const testEntries = testIds.map(id => [id, Buffer.from(`${id}value`)]);
 function runCommonKeyValueDaoTest(dao) {
     test('ping', async () => {
@@ -22,38 +22,42 @@ function runCommonKeyValueDaoTest(dao) {
     test('saveBatch, then getByIds', async () => {
         await dao.saveBatch(testEntries);
         const entries = await dao.getByIds(testIds);
-        js_lib_1._sortBy(entries, e => e[0], true);
+        (0, js_lib_1._sortBy)(entries, e => e[0], true);
         expect(entries).toEqual(testEntries);
     });
     test('streamIds', async () => {
-        const ids = await nodejs_lib_1.readableToArray(dao.streamIds());
+        const ids = await (0, nodejs_lib_1.readableToArray)(dao.streamIds());
         ids.sort();
         expect(ids).toEqual(testIds);
     });
     test('streamIds limited', async () => {
-        const idsLimited = await nodejs_lib_1.readableToArray(dao.streamIds(2));
-        idsLimited.sort();
-        expect(idsLimited).toEqual(testIds.slice(0, 2));
+        const idsLimited = await (0, nodejs_lib_1.readableToArray)(dao.streamIds(2));
+        // Order is non-deterministic, so, cannot compare values
+        // idsLimited.sort()
+        // expect(idsLimited).toEqual(testIds.slice(0, 2))
+        expect(idsLimited.length).toBe(2);
     });
     test('streamValues', async () => {
-        const values = await nodejs_lib_1.readableToArray(dao.streamValues());
+        const values = await (0, nodejs_lib_1.readableToArray)(dao.streamValues());
         values.sort();
         expect(values).toEqual(testEntries.map(e => e[1]));
     });
     test('streamValues limited', async () => {
-        const valuesLimited = await nodejs_lib_1.readableToArray(dao.streamValues(2));
-        valuesLimited.sort();
-        expect(valuesLimited).toEqual(testEntries.map(e => e[1]).slice(0, 2));
+        const valuesLimited = await (0, nodejs_lib_1.readableToArray)(dao.streamValues(2));
+        // valuesLimited.sort()
+        // expect(valuesLimited).toEqual(testEntries.map(e => e[1]).slice(0, 2))
+        expect(valuesLimited.length).toBe(2);
     });
     test('streamEntries', async () => {
-        const entries = await nodejs_lib_1.readableToArray(dao.streamEntries());
+        const entries = await (0, nodejs_lib_1.readableToArray)(dao.streamEntries());
         entries.sort();
         expect(entries).toEqual(testEntries);
     });
     test('streamEntries limited', async () => {
-        const entriesLimited = await nodejs_lib_1.readableToArray(dao.streamEntries(2));
-        entriesLimited.sort();
-        expect(entriesLimited).toEqual(testEntries.slice(0, 2));
+        const entriesLimited = await (0, nodejs_lib_1.readableToArray)(dao.streamEntries(2));
+        // entriesLimited.sort()
+        // expect(entriesLimited).toEqual(testEntries.slice(0, 2))
+        expect(entriesLimited.length).toBe(2);
     });
     test('deleteByIds should clear', async () => {
         await dao.deleteByIds(testIds);

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 {
@@ -18,8 +18,10 @@ export interface TestItemTM {
 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 testItemBMJsonSchema: import("@naturalcycles/js-lib/dist/json-schema/jsonSchemaBuilder").JsonSchemaObjectBuilder<TestItemBM & Partial<import("@naturalcycles/js-lib").SavedDBEntity>>;
+export declare const testItemDBMJsonSchema: import("@naturalcycles/js-lib/dist/json-schema/jsonSchemaBuilder").JsonSchemaObjectBuilder<TestItemDBM>;
 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

@@ -1,30 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTestItemSchema = exports.createTestItemsBM = exports.createTestItemsDBM = exports.createTestItemBM = exports.createTestItemDBM = exports.testItemTMSchema = exports.testItemDBMSchema = exports.testItemBMSchema = exports.TEST_TABLE = void 0;
+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';
-exports.testItemBMSchema = nodejs_lib_1.objectSchema({
+exports.testItemBMSchema = (0, nodejs_lib_1.objectSchema)({
     k1: nodejs_lib_1.stringSchema,
     k2: nodejs_lib_1.stringSchema.optional(),
     k3: nodejs_lib_1.numberSchema.optional(),
     even: nodejs_lib_1.booleanSchema.optional(),
     b1: nodejs_lib_1.binarySchema.optional(),
 }).concat(db_model_1.baseDBEntitySchema);
-exports.testItemDBMSchema = nodejs_lib_1.objectSchema({
+exports.testItemDBMSchema = (0, nodejs_lib_1.objectSchema)({
     k1: nodejs_lib_1.stringSchema,
     k2: nodejs_lib_1.stringSchema.optional(),
     k3: nodejs_lib_1.numberSchema.optional(),
     even: nodejs_lib_1.booleanSchema.optional(),
     b1: nodejs_lib_1.binarySchema.optional(),
 }).concat(db_model_1.savedDBEntitySchema);
-exports.testItemTMSchema = nodejs_lib_1.objectSchema({
+exports.testItemTMSchema = (0, nodejs_lib_1.objectSchema)({
     k1: nodejs_lib_1.stringSchema,
     even: nodejs_lib_1.booleanSchema.optional(),
 });
+exports.testItemBMJsonSchema = js_lib_1.jsonSchema
+    .rootObject({
+    k1: js_lib_1.jsonSchema.string(),
+    k2: js_lib_1.jsonSchema.string().optional(),
+    k3: js_lib_1.jsonSchema.number().optional(),
+    even: js_lib_1.jsonSchema.boolean().optional(),
+    b1: js_lib_1.jsonSchema.buffer().optional(),
+})
+    .baseDBEntity();
+exports.testItemDBMJsonSchema = js_lib_1.jsonSchema.rootObject({
+    // todo: figure out how to not copy-paste these 3 fields
+    id: js_lib_1.jsonSchema.string(),
+    created: js_lib_1.jsonSchema.unixTimestamp(),
+    updated: js_lib_1.jsonSchema.unixTimestamp(),
+    k1: js_lib_1.jsonSchema.string(),
+    k2: js_lib_1.jsonSchema.string().optional(),
+    k3: js_lib_1.jsonSchema.number().optional(),
+    even: js_lib_1.jsonSchema.boolean().optional(),
+    b1: js_lib_1.jsonSchema.buffer().optional(),
+});
 function createTestItemDBM(num = 1) {
     return {
         id: `id${num}`,
@@ -42,14 +61,26 @@ function createTestItemBM(num = 1) {
 }
 exports.createTestItemBM = createTestItemBM;
 function createTestItemsDBM(count = 1) {
-    return js_lib_1._range(1, count + 1).map(num => createTestItemDBM(num));
+    return (0, js_lib_1._range)(1, count + 1).map(num => createTestItemDBM(num));
 }
 exports.createTestItemsDBM = createTestItemsDBM;
 function createTestItemsBM(count = 1) {
-    return js_lib_1._range(1, count + 1).map(num => createTestItemBM(num));
+    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/dist/testing/timeSeriesTest.util.js

@@ -4,6 +4,6 @@ exports.createTestTimeSeries = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 function createTestTimeSeries(count = 10) {
     const ts = Date.now();
-    return js_lib_1._range(1, count + 1).map(i => [ts - i * 60000, js_lib_1._randomInt(10, 20)]);
+    return (0, js_lib_1._range)(1, count + 1).map(i => [ts - i * 60000, (0, js_lib_1._randomInt)(10, 20)]);
 }
 exports.createTestTimeSeries = createTestTimeSeries;