fix: deps

Author: kirillgroshkov

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()] : []

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!
 

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)`)
       }
 

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