@naturalcycles/db-lib 8.37.0 → 8.37.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/dist/testing/daoTest.js +1 -2
  2. package/dist/testing/dbTest.js +1 -1
  3. package/dist/testing/index.d.ts +2 -2
  4. package/dist/testing/index.js +3 -2
  5. package/dist/testing/test.model.d.ts +1 -2
  6. package/dist/testing/test.model.js +1 -17
  7. package/package.json +1 -1
  8. package/src/testing/daoTest.ts +3 -2
  9. package/src/testing/dbTest.ts +2 -2
  10. package/src/testing/index.ts +4 -2
  11. package/src/testing/test.model.ts +1 -18
package/dist/testing/daoTest.js CHANGED
@@ -7,7 +7,6 @@ const __1 = require("..");
7
7
  const common_dao_1 = require("../commondao/common.dao");
8
8
  const dbTest_1 = require("./dbTest");
9
9
  const test_model_1 = require("./test.model");
10
- const _1 = require(".");
11
10
  function runCommonDaoTest(db, features = {}, quirks = {}) {
12
11
  const dao = new common_dao_1.CommonDao({
13
12
  table: test_model_1.TEST_TABLE,
@@ -42,7 +41,7 @@ function runCommonDaoTest(db, features = {}, quirks = {}) {
42
41
  // CREATE TABLE, DROP
43
42
  if (createTable) {
44
43
  test('createTable, dropIfExists=true', async () => {
45
- await dao.createTable((0, _1.getTestItemSchema)(), { dropIfExists: true });
44
+ await dao.createTable(test_model_1.testItemDBMJsonSchema.build(), { dropIfExists: true });
46
45
  });
47
46
  }
48
47
  if (querying) {
package/dist/testing/dbTest.js CHANGED
@@ -28,7 +28,7 @@ function runCommonDBTest(db, features = {}, quirks = {}) {
28
28
  // CREATE TABLE, DROP
29
29
  if (createTable) {
30
30
  test('createTable, dropIfExists=true', async () => {
31
- await db.createTable(test_model_1.TEST_TABLE, (0, test_model_1.getTestItemSchema)(), { dropIfExists: true });
31
+ await db.createTable(test_model_1.TEST_TABLE, test_model_1.testItemDBMJsonSchema.build(), { dropIfExists: true });
32
32
  });
33
33
  }
34
34
  if (querying) {
package/dist/testing/index.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { runCommonDaoTest } from './daoTest';
2
2
  import { CommonDBImplementationFeatures, CommonDBImplementationQuirks, runCommonDBTest } from './dbTest';
3
3
  import { runCommonKeyValueDBTest } from './keyValueDBTest';
4
- import { createTestItemBM, createTestItemDBM, createTestItemsBM, createTestItemsDBM, getTestItemSchema, TestItemBM, testItemBMSchema, TestItemDBM, testItemDBMSchema, TestItemTM, testItemTMSchema, TEST_TABLE } from './test.model';
4
+ import { createTestItemBM, createTestItemDBM, createTestItemsBM, createTestItemsDBM, TestItemBM, testItemBMJsonSchema, testItemBMSchema, TestItemDBM, testItemDBMJsonSchema, testItemDBMSchema, TestItemTM, testItemTMSchema, TEST_TABLE } from './test.model';
5
5
  export type { TestItemDBM, TestItemBM, TestItemTM, CommonDBImplementationFeatures, CommonDBImplementationQuirks, };
6
- export { TEST_TABLE, createTestItemDBM, createTestItemBM, createTestItemsDBM, createTestItemsBM, testItemDBMSchema, testItemBMSchema, testItemTMSchema, getTestItemSchema, runCommonDBTest, runCommonDaoTest, runCommonKeyValueDBTest, };
6
+ export { TEST_TABLE, createTestItemDBM, createTestItemBM, createTestItemsDBM, createTestItemsBM, testItemDBMSchema, testItemBMSchema, testItemTMSchema, testItemBMJsonSchema, testItemDBMJsonSchema, runCommonDBTest, runCommonDaoTest, runCommonKeyValueDBTest, };
package/dist/testing/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.runCommonKeyValueDBTest = exports.runCommonDaoTest = exports.runCommonDBTest = exports.getTestItemSchema = exports.testItemTMSchema = exports.testItemBMSchema = exports.testItemDBMSchema = exports.createTestItemsBM = exports.createTestItemsDBM = exports.createTestItemBM = exports.createTestItemDBM = exports.TEST_TABLE = void 0;
3
+ exports.runCommonKeyValueDBTest = exports.runCommonDaoTest = exports.runCommonDBTest = exports.testItemDBMJsonSchema = exports.testItemBMJsonSchema = exports.testItemTMSchema = exports.testItemBMSchema = exports.testItemDBMSchema = exports.createTestItemsBM = exports.createTestItemsDBM = exports.createTestItemBM = exports.createTestItemDBM = exports.TEST_TABLE = void 0;
4
4
  const daoTest_1 = require("./daoTest");
5
5
  Object.defineProperty(exports, "runCommonDaoTest", { enumerable: true, get: function () { return daoTest_1.runCommonDaoTest; } });
6
6
  const dbTest_1 = require("./dbTest");
@@ -12,8 +12,9 @@ Object.defineProperty(exports, "createTestItemBM", { enumerable: true, get: func
12
12
  Object.defineProperty(exports, "createTestItemDBM", { enumerable: true, get: function () { return test_model_1.createTestItemDBM; } });
13
13
  Object.defineProperty(exports, "createTestItemsBM", { enumerable: true, get: function () { return test_model_1.createTestItemsBM; } });
14
14
  Object.defineProperty(exports, "createTestItemsDBM", { enumerable: true, get: function () { return test_model_1.createTestItemsDBM; } });
15
- Object.defineProperty(exports, "getTestItemSchema", { enumerable: true, get: function () { return test_model_1.getTestItemSchema; } });
15
+ Object.defineProperty(exports, "testItemBMJsonSchema", { enumerable: true, get: function () { return test_model_1.testItemBMJsonSchema; } });
16
16
  Object.defineProperty(exports, "testItemBMSchema", { enumerable: true, get: function () { return test_model_1.testItemBMSchema; } });
17
+ Object.defineProperty(exports, "testItemDBMJsonSchema", { enumerable: true, get: function () { return test_model_1.testItemDBMJsonSchema; } });
17
18
  Object.defineProperty(exports, "testItemDBMSchema", { enumerable: true, get: function () { return test_model_1.testItemDBMSchema; } });
18
19
  Object.defineProperty(exports, "testItemTMSchema", { enumerable: true, get: function () { return test_model_1.testItemTMSchema; } });
19
20
  Object.defineProperty(exports, "TEST_TABLE", { enumerable: true, get: function () { return test_model_1.TEST_TABLE; } });
package/dist/testing/test.model.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /// <reference types="node" />
2
- import { JsonSchemaObject, BaseDBEntity, Saved } from '@naturalcycles/js-lib';
2
+ import { BaseDBEntity, Saved } from '@naturalcycles/js-lib';
3
3
  export declare const TEST_TABLE = "TEST_TABLE";
4
4
  export interface TestItemBM extends BaseDBEntity {
5
5
  k1: string;
@@ -23,4 +23,3 @@ export declare function createTestItemDBM(num?: number): TestItemDBM;
23
23
  export declare function createTestItemBM(num?: number): Saved<TestItemBM>;
24
24
  export declare function createTestItemsDBM(count?: number): TestItemDBM[];
25
25
  export declare function createTestItemsBM(count?: number): Saved<TestItemBM>[];
26
- export declare function getTestItemSchema(): JsonSchemaObject<TestItemDBM>;
package/dist/testing/test.model.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- 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;
3
+ exports.createTestItemsBM = exports.createTestItemsDBM = exports.createTestItemBM = exports.createTestItemDBM = exports.testItemDBMJsonSchema = exports.testItemBMJsonSchema = exports.testItemTMSchema = exports.testItemDBMSchema = exports.testItemBMSchema = exports.TEST_TABLE = void 0;
4
4
  const js_lib_1 = require("@naturalcycles/js-lib");
5
5
  const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
6
6
  const MOCK_TS_2018_06_21 = 1529539200;
@@ -67,19 +67,3 @@ function createTestItemsBM(count = 1) {
67
67
  return (0, js_lib_1._range)(1, count + 1).map(num => createTestItemBM(num));
68
68
  }
69
69
  exports.createTestItemsBM = createTestItemsBM;
70
- const testItemJsonSchema = js_lib_1.jsonSchema
71
- .object({
72
- id: js_lib_1.jsonSchema.string(),
73
- k1: js_lib_1.jsonSchema.string(),
74
- k2: js_lib_1.jsonSchema.string(),
75
- k3: js_lib_1.jsonSchema.number(),
76
- even: js_lib_1.jsonSchema.boolean(),
77
- created: js_lib_1.jsonSchema.unixTimestamp(),
78
- updated: js_lib_1.jsonSchema.unixTimestamp(),
79
- })
80
- .build();
81
- function getTestItemSchema() {
82
- // return CommonSchemaGenerator.generateFromRows({ table: TEST_TABLE }, createTestItemsDBM())
83
- return testItemJsonSchema;
84
- }
85
- exports.getTestItemSchema = getTestItemSchema;
package/package.json CHANGED
@@ -42,7 +42,7 @@
42
42
  "engines": {
43
43
  "node": ">=14.15"
44
44
  },
45
- "version": "8.37.0",
45
+ "version": "8.37.1",
46
46
  "description": "Lowest Common Denominator API to supported Databases",
47
47
  "keywords": [
48
48
  "db",
package/src/testing/daoTest.ts CHANGED
@@ -11,8 +11,9 @@ import {
11
11
  testItemTMSchema,
12
12
  TEST_TABLE,
13
13
  createTestItemBM,
14
+ testItemDBMJsonSchema,
14
15
  } from './test.model'
15
- import { getTestItemSchema, TestItemBM } from '.'
16
+ import { TestItemBM } from '.'
16
17
 
17
18
  export function runCommonDaoTest(
18
19
  db: CommonDB,
@@ -65,7 +66,7 @@ export function runCommonDaoTest(
65
66
  // CREATE TABLE, DROP
66
67
  if (createTable) {
67
68
  test('createTable, dropIfExists=true', async () => {
68
- await dao.createTable(getTestItemSchema(), { dropIfExists: true })
69
+ await dao.createTable(testItemDBMJsonSchema.build(), { dropIfExists: true })
69
70
  })
70
71
  }
71
72
 
package/src/testing/dbTest.ts CHANGED
@@ -5,9 +5,9 @@ import { DBQuery } from '../query/dbQuery'
5
5
  import {
6
6
  createTestItemDBM,
7
7
  createTestItemsDBM,
8
- getTestItemSchema,
9
8
  TestItemDBM,
10
9
  TEST_TABLE,
10
+ testItemDBMJsonSchema,
11
11
  } from './test.model'
12
12
  import { deepFreeze } from './test.util'
13
13
 
@@ -110,7 +110,7 @@ export function runCommonDBTest(
110
110
  // CREATE TABLE, DROP
111
111
  if (createTable) {
112
112
  test('createTable, dropIfExists=true', async () => {
113
- await db.createTable(TEST_TABLE, getTestItemSchema(), { dropIfExists: true })
113
+ await db.createTable(TEST_TABLE, testItemDBMJsonSchema.build(), { dropIfExists: true })
114
114
  })
115
115
  }
116
116
 
package/src/testing/index.ts CHANGED
@@ -10,10 +10,11 @@ import {
10
10
  createTestItemDBM,
11
11
  createTestItemsBM,
12
12
  createTestItemsDBM,
13
- getTestItemSchema,
14
13
  TestItemBM,
14
+ testItemBMJsonSchema,
15
15
  testItemBMSchema,
16
16
  TestItemDBM,
17
+ testItemDBMJsonSchema,
17
18
  testItemDBMSchema,
18
19
  TestItemTM,
19
20
  testItemTMSchema,
@@ -37,7 +38,8 @@ export {
37
38
  testItemDBMSchema,
38
39
  testItemBMSchema,
39
40
  testItemTMSchema,
40
- getTestItemSchema,
41
+ testItemBMJsonSchema,
42
+ testItemDBMJsonSchema,
41
43
  runCommonDBTest,
42
44
  runCommonDaoTest,
43
45
  runCommonKeyValueDBTest,
package/src/testing/test.model.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { jsonSchema, JsonSchemaObject, _range, BaseDBEntity, Saved } from '@naturalcycles/js-lib'
1
+ import { jsonSchema, _range, BaseDBEntity, Saved } from '@naturalcycles/js-lib'
2
2
  import {
3
3
  baseDBEntitySchema,
4
4
  binarySchema,
@@ -94,20 +94,3 @@ export function createTestItemsDBM(count = 1): TestItemDBM[] {
94
94
  export function createTestItemsBM(count = 1): Saved<TestItemBM>[] {
95
95
  return _range(1, count + 1).map(num => createTestItemBM(num))
96
96
  }
97
-
98
- const testItemJsonSchema = jsonSchema
99
- .object<TestItemDBM>({
100
- id: jsonSchema.string(),
101
- k1: jsonSchema.string(),
102
- k2: jsonSchema.string(),
103
- k3: jsonSchema.number(),
104
- even: jsonSchema.boolean(),
105
- created: jsonSchema.unixTimestamp(),
106
- updated: jsonSchema.unixTimestamp(),
107
- })
108
- .build()
109
-
110
- export function getTestItemSchema(): JsonSchemaObject<TestItemDBM> {
111
- // return CommonSchemaGenerator.generateFromRows({ table: TEST_TABLE }, createTestItemsDBM())
112
- return testItemJsonSchema
113
- }