@naturalcycles/backend-lib 4.23.1 → 4.23.3

package/cfg/tsconfig.json

@@ -59,8 +59,8 @@
     // Other
     "pretty": true,
     "newLine": "lf",
-    "experimentalDecorators": true
-  }
+    "experimentalDecorators": true,
+  },
   // Need to be specified in the project tsconfig
   // "include": ["src"],
   // "exclude": ["**/__exclude"]

package/dist/db/httpDB.d.ts

@@ -1,4 +1,4 @@
-import { BaseCommonDB, CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, DBQuery, RunQueryResult } from '@naturalcycles/db-lib';
+import { BaseCommonDB, CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, CommonDBSupport, DBQuery, RunQueryResult } from '@naturalcycles/db-lib';
 import { FetcherOptions, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 export interface HttpDBCfg extends FetcherOptions {
@@ -9,6 +9,7 @@ export interface HttpDBCfg extends FetcherOptions {
  */
 export declare class HttpDB extends BaseCommonDB implements CommonDB {
     cfg: HttpDBCfg;
+    support: CommonDBSupport;
     constructor(cfg: HttpDBCfg);
     setCfg(cfg: HttpDBCfg): void;
     private fetcher;

package/dist/db/httpDB.js

@@ -11,6 +11,16 @@ class HttpDB extends db_lib_1.BaseCommonDB {
     constructor(cfg) {
         super();
         this.cfg = cfg;
+        this.support = {
+            ...db_lib_1.commonDBFullSupport,
+            streaming: false,
+            createTable: false,
+            bufferValues: false,
+            updateSaveMethod: false,
+            insertSaveMethod: false,
+            transactions: false,
+            updateByQuery: false,
+        };
         this.setCfg(cfg);
     }
     setCfg(cfg) {

package/dist/deploy/backend.cfg.util.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBackendCfg = void 0;
-const tslib_1 = require("tslib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const paths_cnst_1 = require("../paths.cnst");
 const backendCfgSchema = nodejs_lib_1.AjvSchema.readJsonSync(`${paths_cnst_1.resourcesDir}/backendCfg.schema.json`, {
     objectName: 'backend.cfg.yaml',
@@ -13,7 +11,7 @@ function getBackendCfg(projectDir = '.') {
     (0, nodejs_lib_1.requireFileToExist)(backendCfgYamlPath);
     const backendCfg = {
         serviceWithBranchName: true,
-        ...js_yaml_1.default.load((0, nodejs_lib_1._readFileSync)(backendCfgYamlPath)),
+        ...nodejs_lib_1.fs2.readYaml(backendCfgYamlPath),
     };
     backendCfgSchema.validate(backendCfg);
     return backendCfg;

package/dist/deploy/deployPrepare.js

@@ -58,7 +58,7 @@ async function deployPrepare(opt = {}) {
     const appYamlPassEnv = opt.appYamlPassEnv || backendCfg.appYamlPassEnv;
     console.log(`1. Copy files to ${(0, nodejs_lib_1.dimGrey)(targetDir)}`);
     // Clean targetDir
-    (0, nodejs_lib_1._emptyDirSync)(targetDir);
+    nodejs_lib_1.fs2.emptyDir(targetDir);
     (0, nodejs_lib_1.kpySync)({
         baseDir: defaultFilesDir,
         outputDir: targetDir,
@@ -74,7 +74,7 @@ async function deployPrepare(opt = {}) {
     if (NPM_TOKEN && createNpmrc) {
         const npmrcPath = `${targetDir}/.npmrc`;
         const npmrc = `//registry.npmjs.org/:_authToken=${NPM_TOKEN}`;
-        (0, nodejs_lib_1._writeFileSync)(npmrcPath, npmrc);
+        nodejs_lib_1.fs2.writeFile(npmrcPath, npmrc);
     }
     console.log(`2. Generate ${(0, nodejs_lib_1.dimGrey)('deployInfo.json')} and ${(0, nodejs_lib_1.dimGrey)('app.yaml')} in targetDir`);
     const deployInfo = await (0, deploy_util_1.createAndSaveDeployInfo)(backendCfg, targetDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.23.1",
+  "version": "4.23.3",
   "scripts": {
     "prepare": "husky install",
     "serve": "APP_ENV=dev nodemon",
@@ -16,7 +16,7 @@
     "@sentry/node": "^7.0.0"
   },
   "dependencies": {
-    "@naturalcycles/db-lib": "^8.0.2",
+    "@naturalcycles/db-lib": "^9.1.0",
     "@naturalcycles/js-lib": "^14.27.0",
     "@naturalcycles/nodejs-lib": "^13.1.0",
     "@types/cookie-parser": "^1.4.1",
@@ -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",

package/src/db/httpDB.ts

@@ -2,9 +2,11 @@ import { Readable } from 'node:stream'
 import {
   BaseCommonDB,
   CommonDB,
+  commonDBFullSupport,
   CommonDBOptions,
   CommonDBSaveOptions,
   CommonDBStreamOptions,
+  CommonDBSupport,
   DBQuery,
   RunQueryResult,
 } from '@naturalcycles/db-lib'
@@ -25,6 +27,17 @@ export interface HttpDBCfg extends FetcherOptions {
  * Implementation of CommonDB that proxies all requests via HTTP to "httpDBRequestHandler".
  */
 export class HttpDB extends BaseCommonDB implements CommonDB {
+  override support: CommonDBSupport = {
+    ...commonDBFullSupport,
+    streaming: false,
+    createTable: false,
+    bufferValues: false,
+    updateSaveMethod: false,
+    insertSaveMethod: false,
+    transactions: false,
+    updateByQuery: false,
+  }
+
   constructor(public cfg: HttpDBCfg) {
     super()
     this.setCfg(cfg)
@@ -106,7 +119,7 @@ export class HttpDB extends BaseCommonDB implements CommonDB {
     })
   }
 
-  async deleteByIds(table: string, ids: string[], opt?: CommonDBOptions): Promise<number> {
+  override async deleteByIds(table: string, ids: string[], opt?: CommonDBOptions): Promise<number> {
     return await this.fetcher.put(`deleteByIds`, {
       json: {
         table,

package/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

package/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)

package/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`)