fix: deps

NaturalCycles · Jan 16, 2024 · 8dce1be · 8dce1be
1 parent d749545
commit 8dce1be
Show file tree

Hide file tree

Showing 5 changed files with 316 additions and 348 deletions.
diff --git a/package.json b/package.json
@@ -31,7 +31,6 @@
     "express-promise-router": "^4.0.0",
     "firebase-admin": "^12.0.0",
     "helmet": "^7.0.0",
-    "js-yaml": "^4.0.0",
     "on-finished": "^2.3.0",
     "simple-git": "^3.0.3",
     "yargs": "^17.0.0"
@@ -41,7 +40,6 @@
     "@naturalcycles/dev-lib": "^13.0.0",
     "@sentry/node": "^7.0.0",
     "@types/ejs": "^3.0.0",
-    "@types/js-yaml": "^4.0.0",
     "@types/node": "^20.1.0",
     "@types/yargs": "^16.0.0",
     "fastify": "^4.0.0",

diff --git a/src/db/httpDBRequestHandler.ts b/src/db/httpDBRequestHandler.ts
@@ -75,7 +75,7 @@ export function httpDBRequestHandler(db: CommonDB): BackendRouter {
 
   // getTableSchema
   router.get('/:table/schema', async (req, res) => {
-    res.json(await db.getTableSchema(req.params['table']!))
+    res.json(await db.getTableSchema(req.params['table']))
   })
 
   // todo: createTable

diff --git a/src/deploy/backend.cfg.util.ts b/src/deploy/backend.cfg.util.ts
@@ -1,6 +1,5 @@
 import { StringMap } from '@naturalcycles/js-lib'
-import { _readFileSync, AjvSchema, requireFileToExist } from '@naturalcycles/nodejs-lib'
-import yaml from 'js-yaml'
+import { AjvSchema, fs2, requireFileToExist } from '@naturalcycles/nodejs-lib'
 import { resourcesDir } from '../paths.cnst'
 
 export interface BackendCfg {
@@ -63,7 +62,7 @@ export function getBackendCfg(projectDir: string = '.'): BackendCfg {
 
   const backendCfg: BackendCfg = {
     serviceWithBranchName: true,
-    ...(yaml.load(_readFileSync(backendCfgYamlPath)) as any),
+    ...fs2.readYaml(backendCfgYamlPath),
   }
 
   backendCfgSchema.validate(backendCfg)

diff --git a/src/deploy/deployPrepare.ts b/src/deploy/deployPrepare.ts
@@ -1,4 +1,4 @@
-import { _emptyDirSync, _writeFileSync, dimGrey, kpySync } from '@naturalcycles/nodejs-lib'
+import { dimGrey, fs2, kpySync } from '@naturalcycles/nodejs-lib'
 import { srcDir } from '../paths.cnst'
 import { getBackendCfg } from './backend.cfg.util'
 import { DeployInfo } from './deploy.model'
@@ -75,7 +75,7 @@ export async function deployPrepare(opt: DeployPrepareOptions = {}): Promise<Dep
   console.log(`1. Copy files to ${dimGrey(targetDir)}`)
 
   // Clean targetDir
-  _emptyDirSync(targetDir)
+  fs2.emptyDir(targetDir)
 
   kpySync({
     baseDir: defaultFilesDir,
@@ -94,7 +94,7 @@ export async function deployPrepare(opt: DeployPrepareOptions = {}): Promise<Dep
   if (NPM_TOKEN && createNpmrc) {
     const npmrcPath = `${targetDir}/.npmrc`
     const npmrc = `//registry.npmjs.org/:_authToken=${NPM_TOKEN}`
-    _writeFileSync(npmrcPath, npmrc)
+    fs2.writeFile(npmrcPath, npmrc)
   }
 
   console.log(`2. Generate ${dimGrey('deployInfo.json')} and ${dimGrey('app.yaml')} in targetDir`)