@naturalcycles/db-lib 8.60.0 → 8.60.1

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

@@ -26,10 +26,10 @@ class LocalFilePersistencePlugin {
             .map(f => f.split('.ndjson')[0]);
     }
     async loadFile(table) {
-        await (0, nodejs_lib_1._ensureDir)(this.cfg.storagePath);
+        await nodejs_lib_1.fs2.ensureDirAsync(this.cfg.storagePath);
         const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`;
         const filePath = `${this.cfg.storagePath}/${table}.${ext}`;
-        if (!(await (0, nodejs_lib_1._pathExists)(filePath)))
+        if (!(await nodejs_lib_1.fs2.pathExistsAsync(filePath)))
             return [];
         const transformUnzip = this.cfg.gzip ? [(0, node_zlib_1.createUnzip)()] : [];
         const rows = [];
@@ -46,7 +46,7 @@ class LocalFilePersistencePlugin {
         await (0, js_lib_1.pMap)(ops, async (op) => await this.saveFile(op.table, op.rows), { concurrency: 16 });
     }
     async saveFile(table, rows) {
-        await (0, nodejs_lib_1._ensureDir)(this.cfg.storagePath);
+        await nodejs_lib_1.fs2.ensureDirAsync(this.cfg.storagePath);
         const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`;
         const filePath = `${this.cfg.storagePath}/${table}.${ext}`;
         const transformZip = this.cfg.gzip ? [(0, node_zlib_1.createGzip)()] : [];

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

@@ -167,7 +167,7 @@ class InMemoryDB {
         (0, js_lib_1._assert)(this.cfg.persistenceEnabled, 'flushToDisk() called but persistenceEnabled=false');
         const { persistentStoragePath, persistZip } = this.cfg;
         const started = Date.now();
-        await (0, nodejs_lib_1._emptyDir)(persistentStoragePath);
+        await nodejs_lib_1.fs2.emptyDirAsync(persistentStoragePath);
         const transformZip = persistZip ? [(0, node_zlib_1.createGzip)()] : [];
         let tables = 0;
         // infinite concurrency for now
@@ -193,7 +193,7 @@ class InMemoryDB {
         (0, js_lib_1._assert)(this.cfg.persistenceEnabled, 'restoreFromDisk() called but persistenceEnabled=false');
         const { persistentStoragePath } = this.cfg;
         const started = Date.now();
-        await (0, nodejs_lib_1._ensureDir)(persistentStoragePath);
+        await nodejs_lib_1.fs2.ensureDirAsync(persistentStoragePath);
         this.data = {}; // empty it in the beginning!
         const files = (await promises_1.default.readdir(persistentStoragePath)).filter(f => f.includes('.ndjson'));
         // infinite concurrency for now

package/dist/common.db.d.ts

@@ -31,7 +31,7 @@ export interface CommonDB {
      * Order of items returned is not guaranteed to match order of ids.
      * (Such limitation exists because Datastore doesn't support it).
      */
-    getByIds: <ROW extends ObjectWithId>(table: string, ids: ROW['id'][], opt?: CommonDBOptions) => Promise<ROW[]>;
+    getByIds: <ROW extends ObjectWithId>(table: string, ids: string[], opt?: CommonDBOptions) => Promise<ROW[]>;
     /**
      * Order by 'id' is not supported by all implementations (for example, Datastore doesn't support it).
      */

package/dist/pipeline/dbPipelineBackup.js

@@ -23,7 +23,7 @@ async function dbPipelineBackup(opt) {
     const gzip = opt.gzip !== false; // default to true
     let { tables } = opt;
     console.log(`>> ${(0, nodejs_lib_1.dimWhite)('dbPipelineBackup')} started in ${(0, nodejs_lib_1.grey)(outputDirPath)}...`);
-    (0, nodejs_lib_1._ensureDirSync)(outputDirPath);
+    nodejs_lib_1.fs2.ensureDir(outputDirPath);
     tables ||= await db.getTables();
     console.log(`${(0, nodejs_lib_1.yellow)(tables.length)} ${(0, nodejs_lib_1.boldWhite)('table(s)')}:\n` + tables.join('\n'));
     const statsPerTable = {};
@@ -46,16 +46,16 @@ async function dbPipelineBackup(opt) {
         }
         const filePath = `${outputDirPath}/${table}.ndjson` + (gzip ? '.gz' : '');
         const schemaFilePath = `${outputDirPath}/${table}.schema.json`;
-        if (protectFromOverwrite && (0, nodejs_lib_1._pathExistsSync)(filePath)) {
+        if (protectFromOverwrite && nodejs_lib_1.fs2.pathExists(filePath)) {
             throw new js_lib_1.AppError(`dbPipelineBackup: output file exists: ${filePath}`);
         }
         const started = Date.now();
         let rows = 0;
-        (0, nodejs_lib_1._ensureFileSync)(filePath);
+        nodejs_lib_1.fs2.ensureFile(filePath);
         // console.log(`>> ${grey(filePath)} started...`)
         if (emitSchemaFromDB) {
             const schema = await db.getTableSchema(table);
-            await (0, nodejs_lib_1._writeJson)(schemaFilePath, schema, { spaces: 2 });
+            await nodejs_lib_1.fs2.writeJsonAsync(schemaFilePath, schema, { spaces: 2 });
             console.log(`>> ${(0, nodejs_lib_1.grey)(schemaFilePath)} saved (generated from DB)`);
         }
         await (0, nodejs_lib_1._pipeline)([

package/dist/pipeline/dbPipelineRestore.js

@@ -19,7 +19,7 @@ async function dbPipelineRestore(opt) {
     const onlyTables = opt.tables && new Set(opt.tables);
     const sinceUpdatedStr = sinceUpdated ? ' since ' + (0, nodejs_lib_1.grey)((0, js_lib_1.localTime)(sinceUpdated).toPretty()) : '';
     console.log(`>> ${(0, nodejs_lib_1.dimWhite)('dbPipelineRestore')} started in ${(0, nodejs_lib_1.grey)(inputDirPath)}...${sinceUpdatedStr}`);
-    (0, nodejs_lib_1._ensureDirSync)(inputDirPath);
+    nodejs_lib_1.fs2.ensureDir(inputDirPath);
     const tablesToGzip = new Set();
     const sizeByTable = {};
     const statsPerTable = {};
@@ -54,7 +54,7 @@ async function dbPipelineRestore(opt) {
                 console.warn(`${schemaFilePath} does not exist!`);
                 return;
             }
-            const schema = await (0, nodejs_lib_1._readJson)(schemaFilePath);
+            const schema = await nodejs_lib_1.fs2.readJsonAsync(schemaFilePath);
             await db.createTable(table, schema, { dropIfExists: true });
         });
     }

package/package.json

@@ -40,7 +40,7 @@
   "engines": {
     "node": ">=18.12"
   },
-  "version": "8.60.0",
+  "version": "8.60.1",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

package/src/adapter/file/localFile.persistence.plugin.ts

@@ -9,8 +9,7 @@ import {
   transformToNDJson,
   writablePushToArray,
   _pipeline,
-  _ensureDir,
-  _pathExists,
+  fs2,
 } from '@naturalcycles/nodejs-lib'
 import { DBSaveBatchOperation } from '../../db.model'
 import { FileDBPersistencePlugin } from './file.db.model'
@@ -50,11 +49,11 @@ export class LocalFilePersistencePlugin implements FileDBPersistencePlugin {
   }
 
   async loadFile<ROW extends ObjectWithId>(table: string): Promise<ROW[]> {
-    await _ensureDir(this.cfg.storagePath)
+    await fs2.ensureDirAsync(this.cfg.storagePath)
     const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`
     const filePath = `${this.cfg.storagePath}/${table}.${ext}`
 
-    if (!(await _pathExists(filePath))) return []
+    if (!(await fs2.pathExistsAsync(filePath))) return []
 
     const transformUnzip = this.cfg.gzip ? [createUnzip()] : []
 
@@ -76,7 +75,7 @@ export class LocalFilePersistencePlugin implements FileDBPersistencePlugin {
   }
 
   async saveFile<ROW extends ObjectWithId>(table: string, rows: ROW[]): Promise<void> {
-    await _ensureDir(this.cfg.storagePath)
+    await fs2.ensureDirAsync(this.cfg.storagePath)
     const ext = `ndjson${this.cfg.gzip ? '.gz' : ''}`
     const filePath = `${this.cfg.storagePath}/${table}.${ext}`
     const transformZip = this.cfg.gzip ? [createGzip()] : []

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

@@ -25,10 +25,9 @@ import {
   transformToNDJson,
   writablePushToArray,
   _pipeline,
-  _emptyDir,
-  _ensureDir,
   dimGrey,
   yellow,
+  fs2,
 } from '@naturalcycles/nodejs-lib'
 import { CommonDB, DBIncrement, DBPatch, DBTransaction, queryInMemory } from '../..'
 import {
@@ -283,7 +282,7 @@ export class InMemoryDB implements CommonDB {
 
     const started = Date.now()
 
-    await _emptyDir(persistentStoragePath)
+    await fs2.emptyDirAsync(persistentStoragePath)
 
     const transformZip = persistZip ? [createGzip()] : []
     let tables = 0
@@ -318,7 +317,7 @@ export class InMemoryDB implements CommonDB {
 
     const started = Date.now()
 
-    await _ensureDir(persistentStoragePath)
+    await fs2.ensureDirAsync(persistentStoragePath)
 
     this.data = {} // empty it in the beginning!
 

package/src/common.db.ts

@@ -50,7 +50,7 @@ export interface CommonDB {
    */
   getByIds: <ROW extends ObjectWithId>(
     table: string,
-    ids: ROW['id'][],
+    ids: string[],
     opt?: CommonDBOptions,
   ) => Promise<ROW[]>
 

package/src/pipeline/dbPipelineBackup.ts

@@ -20,14 +20,11 @@ import {
   transformTap,
   transformToNDJson,
   _pipeline,
-  _ensureDirSync,
-  _pathExistsSync,
-  _ensureFileSync,
-  _writeJson,
   boldWhite,
   dimWhite,
   grey,
   yellow,
+  fs2,
 } from '@naturalcycles/nodejs-lib'
 import { CommonDB } from '../common.db'
 import { DBQuery } from '../index'
@@ -180,7 +177,7 @@ export async function dbPipelineBackup(opt: DBPipelineBackupOptions): Promise<ND
 
   console.log(`>> ${dimWhite('dbPipelineBackup')} started in ${grey(outputDirPath)}...`)
 
-  _ensureDirSync(outputDirPath)
+  fs2.ensureDir(outputDirPath)
 
   tables ||= await db.getTables()
 
@@ -213,20 +210,20 @@ export async function dbPipelineBackup(opt: DBPipelineBackupOptions): Promise<ND
       const filePath = `${outputDirPath}/${table}.ndjson` + (gzip ? '.gz' : '')
       const schemaFilePath = `${outputDirPath}/${table}.schema.json`
 
-      if (protectFromOverwrite && _pathExistsSync(filePath)) {
+      if (protectFromOverwrite && fs2.pathExists(filePath)) {
         throw new AppError(`dbPipelineBackup: output file exists: ${filePath}`)
       }
 
       const started = Date.now()
       let rows = 0
 
-      _ensureFileSync(filePath)
+      fs2.ensureFile(filePath)
 
       // console.log(`>> ${grey(filePath)} started...`)
 
       if (emitSchemaFromDB) {
         const schema = await db.getTableSchema(table)
-        await _writeJson(schemaFilePath, schema, { spaces: 2 })
+        await fs2.writeJsonAsync(schemaFilePath, schema, { spaces: 2 })
         console.log(`>> ${grey(schemaFilePath)} saved (generated from DB)`)
       }
 

package/src/pipeline/dbPipelineRestore.ts

@@ -25,12 +25,11 @@ import {
   transformTap,
   writableForEach,
   _pipeline,
-  _ensureDirSync,
-  _readJson,
   boldWhite,
   dimWhite,
   grey,
   yellow,
+  fs2,
 } from '@naturalcycles/nodejs-lib'
 import { CommonDB } from '../common.db'
 import { CommonDBSaveOptions } from '../index'
@@ -145,7 +144,7 @@ export async function dbPipelineRestore(opt: DBPipelineRestoreOptions): Promise<
     `>> ${dimWhite('dbPipelineRestore')} started in ${grey(inputDirPath)}...${sinceUpdatedStr}`,
   )
 
-  _ensureDirSync(inputDirPath)
+  fs2.ensureDir(inputDirPath)
 
   const tablesToGzip = new Set<string>()
   const sizeByTable: Record<string, number> = {}
@@ -185,7 +184,7 @@ export async function dbPipelineRestore(opt: DBPipelineRestoreOptions): Promise<
         return
       }
 
-      const schema = await _readJson<JsonSchemaObject<any>>(schemaFilePath)
+      const schema = await fs2.readJsonAsync<JsonSchemaObject<any>>(schemaFilePath)
       await db.createTable(table, schema, { dropIfExists: true })
     })
   }