@naturalcycles/db-lib 10.33.0 → 10.35.0

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

@@ -2,9 +2,9 @@ import { Readable } from 'node:stream';
 import { _by, _sortBy } from '@naturalcycles/js-lib/array';
 import { _since, localTime } from '@naturalcycles/js-lib/datetime';
 import { _assert } from '@naturalcycles/js-lib/error/assert.js';
-import { generateJsonSchemaFromData } from '@naturalcycles/js-lib/json-schema';
 import { _deepEquals, _filterUndefinedValues, _sortObjectDeep } from '@naturalcycles/js-lib/object';
 import { _stringMapValues, } from '@naturalcycles/js-lib/types';
+import { generateJsonSchemaFromData } from '@naturalcycles/nodejs-lib/ajv';
 import { dimGrey } from '@naturalcycles/nodejs-lib/colors';
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import { BaseCommonDB } from '../../commondb/base.common.db.js';

package/dist/inmemory/inMemory.db.js

@@ -1,8 +1,8 @@
 import { _isEmptyObject } from '@naturalcycles/js-lib';
 import { _assert } from '@naturalcycles/js-lib/error/assert.js';
-import { generateJsonSchemaFromData } from '@naturalcycles/js-lib/json-schema';
 import { _deepCopy, _sortObjectDeep } from '@naturalcycles/js-lib/object';
 import { _stringMapEntries, _stringMapValues, } from '@naturalcycles/js-lib/types';
+import { generateJsonSchemaFromData } from '@naturalcycles/nodejs-lib/ajv';
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream';
 import { bufferReviver } from '@naturalcycles/nodejs-lib/stream/ndjson/transformJsonParse.js';
 import { commonDBFullSupport, CommonDBType } from '../commondb/common.db.js';

package/dist/testing/test.model.js

@@ -18,8 +18,8 @@ export const testItemTMSchema = objectSchema({
     k1: stringSchema,
     even: booleanSchema.optional(),
 });
-export const testItemBMJsonSchema = j
-    .object({
+export const testItemBMJsonSchema = j.object
+    .dbEntity({
     // todo: figure out how to not copy-paste these 3 fields
     id: j.string(), // todo: not strictly needed here
     created: j.number().integer().unixTimestamp(),
@@ -31,7 +31,6 @@ export const testItemBMJsonSchema = j
     b1: j.buffer().optional(),
     nested: j.object.infer({ foo: j.number() }).optional(),
 })
-    .dbEntity()
     .build();
 export function createTestItemDBM(num = 1) {
     return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/db-lib",
   "type": "module",
-  "version": "10.33.0",
+  "version": "10.35.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^15"
@@ -40,7 +40,7 @@
     "directory": "packages/db-lib"
   },
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=24.10.0"
   },
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [

package/readme.md

@@ -314,10 +314,3 @@ Passing empty array will actually return an array of empty objects (documented e
   - Test models, utils, etc
 - `/validation`
   - Joi validation schemas for DBQuery, CommonDBOptions, CommonSchema, etc
-
-# Packaging
-
-- `engines.node >= LTS`
-- `main: dist/index.js`: commonjs, es2020
-- `types: dist/index.d.ts`: typescript types
-- `/src` folder with source `*.ts` files included

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

@@ -2,7 +2,6 @@ import { Readable } from 'node:stream'
 import { _by, _sortBy } from '@naturalcycles/js-lib/array'
 import { _since, localTime } from '@naturalcycles/js-lib/datetime'
 import { _assert } from '@naturalcycles/js-lib/error/assert.js'
-import { generateJsonSchemaFromData } from '@naturalcycles/js-lib/json-schema'
 import { _deepEquals, _filterUndefinedValues, _sortObjectDeep } from '@naturalcycles/js-lib/object'
 import {
   _stringMapValues,
@@ -10,6 +9,7 @@ import {
   type UnixTimestampMillis,
 } from '@naturalcycles/js-lib/types'
 import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
+import { generateJsonSchemaFromData } from '@naturalcycles/nodejs-lib/ajv'
 import { dimGrey } from '@naturalcycles/nodejs-lib/colors'
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream'
 import { BaseCommonDB } from '../../commondb/base.common.db.js'

package/src/inmemory/inMemory.db.ts

@@ -1,6 +1,5 @@
 import { _isEmptyObject } from '@naturalcycles/js-lib'
 import { _assert } from '@naturalcycles/js-lib/error/assert.js'
-import { generateJsonSchemaFromData } from '@naturalcycles/js-lib/json-schema'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { _deepCopy, _sortObjectDeep } from '@naturalcycles/js-lib/object'
 import {
@@ -11,6 +10,7 @@ import {
   type StringMap,
 } from '@naturalcycles/js-lib/types'
 import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
+import { generateJsonSchemaFromData } from '@naturalcycles/nodejs-lib/ajv'
 import { Pipeline } from '@naturalcycles/nodejs-lib/stream'
 import { bufferReviver } from '@naturalcycles/nodejs-lib/stream/ndjson/transformJsonParse.js'
 import type { CommonDB, CommonDBSupport } from '../commondb/common.db.js'

package/src/testing/test.model.ts

@@ -50,8 +50,8 @@ export const testItemTMSchema: ObjectSchema<TestItemTM> = objectSchema<TestItemT
   even: booleanSchema.optional(),
 })
 
-export const testItemBMJsonSchema = j
-  .object<TestItemBM>({
+export const testItemBMJsonSchema = j.object
+  .dbEntity<TestItemBM>({
     // todo: figure out how to not copy-paste these 3 fields
     id: j.string(), // todo: not strictly needed here
     created: j.number().integer().unixTimestamp(),
@@ -63,7 +63,6 @@ export const testItemBMJsonSchema = j
     b1: j.buffer().optional(),
     nested: j.object.infer({ foo: j.number() }).optional(),
   })
-  .dbEntity()
   .build()
 
 export function createTestItemDBM(num = 1): TestItemDBM {