@naturalcycles/backend-lib 9.52.0 → 9.54.0

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

@@ -1,11 +1,11 @@
 import { _lazyValue } from '@naturalcycles/js-lib';
-import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv';
+import { JSchema } from '@naturalcycles/nodejs-lib/ajv';
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
 import { yaml2 } from '@naturalcycles/nodejs-lib/yaml2';
 import { resourcesDir } from '../paths.cnst.js';
 const getBackendCfgSchema = _lazyValue(() => {
     const schemaJson = fs2.readJson(`${resourcesDir}/backendCfg.schema.json`);
-    return AjvSchema.create(schemaJson, { inputName: 'backend.cfg.yaml' });
+    return new JSchema(schemaJson, { inputName: 'backend.cfg.yaml' });
 });
 export function getBackendCfg(projectDir = '.') {
     const backendCfgYamlPath = `${projectDir}/backend.cfg.yaml`;

package/dist/sentry/sentry.shared.service.d.ts

@@ -1,7 +1,7 @@
 import type { CommonLogger } from '@naturalcycles/js-lib/log';
 import type { Primitive, StringMap } from '@naturalcycles/js-lib/types';
-import type { Breadcrumb, SeverityLevel } from '@sentry/node';
-import type * as SentryLib from '@sentry/node';
+import type { Breadcrumb, SeverityLevel } from '@sentry/node-core/light';
+import type * as SentryLib from '@sentry/node-core/light';
 export interface SentrySharedServiceCfg {
     sentry: typeof SentryLib;
 }

package/dist/server/compressionMiddleware.js

@@ -64,8 +64,11 @@ export function compressionMiddleware(options) {
         let length;
         let listeners = [];
         let stream;
+        // oxlint-disable-next-line typescript/unbound-method -- monkey-patching, rebound via .call()
         const _end = res.end;
+        // oxlint-disable-next-line typescript/unbound-method -- monkey-patching, rebound via .call()
         const _on = res.on;
+        // oxlint-disable-next-line typescript/unbound-method -- monkey-patching, rebound via .call()
         const _write = res.write;
         res.flush = function flush() {
             if (stream) {

package/dist/validation/ajv/validateRequest.js

@@ -1,4 +1,4 @@
-import { AjvSchema, getCoercingAjv } from '@naturalcycles/nodejs-lib/ajv';
+import { AjvSchema, getCoercingAjv, JSchema } from '@naturalcycles/nodejs-lib/ajv';
 import { handleValidationError } from '../validateRequest.util.js';
 class AjvValidateRequest {
     body(req, schema, opt = {}) {
@@ -48,8 +48,11 @@ class AjvValidateRequest {
         const input = req[reqProperty] || {};
         const { coerceTypes, mutateInput } = opt;
         const ajv = coerceTypes ? getCoercingAjv() : undefined;
-        const ajvSchema = AjvSchema.create(schema, { ajv });
-        const [error, output] = ajvSchema.getValidationResult(input, {
+        const validatable = schema instanceof JSchema || schema instanceof AjvSchema
+            ? schema
+            : new JSchema(schema);
+        const [error, output] = validatable.getValidationResult(input, {
+            ajv,
             inputName: `request.${reqProperty}`,
             getOriginalInput,
             mutateInput,

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.52.0",
+  "version": "9.54.0",
   "peerDependencies": {
-    "@sentry/node": "^10"
+    "@sentry/node-core": "^10"
   },
   "dependencies": {
     "@naturalcycles/db-lib": "^10",
@@ -32,10 +32,10 @@
     "vary": "^1"
   },
   "devDependencies": {
-    "@sentry/node": "^10",
+    "@sentry/node-core": "^10",
     "@typescript/native-preview": "7.0.0-dev.20260201.1",
     "fastify": "^5",
-    "@naturalcycles/dev-lib": "18.4.2"
+    "@naturalcycles/dev-lib": "20.36.0"
   },
   "exports": {
     ".": "./dist/index.js",

package/src/deploy/backend.cfg.util.ts

@@ -1,6 +1,6 @@
 import { _lazyValue } from '@naturalcycles/js-lib'
 import type { StringMap } from '@naturalcycles/js-lib/types'
-import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv'
+import { JSchema } from '@naturalcycles/nodejs-lib/ajv'
 import type { JsonSchema } from '@naturalcycles/nodejs-lib/ajv'
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
 import { yaml2 } from '@naturalcycles/nodejs-lib/yaml2'
@@ -42,7 +42,7 @@ export interface BackendCfg {
 
 const getBackendCfgSchema = _lazyValue(() => {
   const schemaJson = fs2.readJson<JsonSchema<BackendCfg>>(`${resourcesDir}/backendCfg.schema.json`)
-  return AjvSchema.create(schemaJson, { inputName: 'backend.cfg.yaml' })
+  return new JSchema<BackendCfg, false>(schemaJson, { inputName: 'backend.cfg.yaml' })
 })
 
 export function getBackendCfg(projectDir = '.'): BackendCfg {

package/src/deploy/deploy.util.ts

@@ -162,19 +162,16 @@ export function createAppYaml(
     .split(',')
     .filter(Boolean)
     // oxlint-disable-next-line unicorn/no-array-reduce
-    .reduce(
-      (map, key) => {
-        const v = process.env[key]
-        if (!v) {
-          throw new Error(
-            `appYamlPassEnv.${key} is requested, but process.env.${key} is not defined!`,
-          )
-        }
-        map[key] = v
-        return map
-      },
-      {} as Record<string, string>,
-    )
+    .reduce<Record<string, string>>((map, key) => {
+      const v = process.env[key]
+      if (!v) {
+        throw new Error(
+          `appYamlPassEnv.${key} is requested, but process.env.${key} is not defined!`,
+        )
+      }
+      map[key] = v
+      return map
+    }, {})
 
   if (Object.keys(passEnv).length) {
     console.log(

package/src/sentry/sentry.shared.service.ts

@@ -3,8 +3,8 @@ import type { CommonLogger, CommonLogLevel } from '@naturalcycles/js-lib/log'
 import type { Primitive, StringMap } from '@naturalcycles/js-lib/types'
 import type { InspectAnyOptions } from '@naturalcycles/nodejs-lib'
 import { _inspect } from '@naturalcycles/nodejs-lib'
-import type { Breadcrumb, SeverityLevel } from '@sentry/node'
-import type * as SentryLib from '@sentry/node'
+import type { Breadcrumb, SeverityLevel } from '@sentry/node-core/light'
+import type * as SentryLib from '@sentry/node-core/light'
 import { getRequestLogger } from '../server/asyncLocalStorageMiddleware.js'
 
 export interface SentrySharedServiceCfg {

package/src/server/compressionMiddleware.ts

@@ -114,8 +114,11 @@ export function compressionMiddleware(options?: CompressionOptions): BackendRequ
     let listeners: [string, (...args: any[]) => void][] | null = []
     let stream: zlib.Gzip | zlib.Deflate | zlib.BrotliCompress | zlib.ZstdCompress | undefined
 
+    // oxlint-disable-next-line typescript/unbound-method -- monkey-patching, rebound via .call()
     const _end = res.end
+    // oxlint-disable-next-line typescript/unbound-method -- monkey-patching, rebound via .call()
     const _on = res.on
+    // oxlint-disable-next-line typescript/unbound-method -- monkey-patching, rebound via .call()
     const _write = res.write
 
     // flush

package/src/validation/ajv/validateRequest.ts

@@ -1,4 +1,4 @@
-import { AjvSchema, getCoercingAjv } from '@naturalcycles/nodejs-lib/ajv'
+import { AjvSchema, getCoercingAjv, JSchema } from '@naturalcycles/nodejs-lib/ajv'
 import type { AjvValidationError, SchemaHandledByAjv } from '@naturalcycles/nodejs-lib/ajv'
 import type { BackendRequest } from '../../server/server.model.js'
 import { handleValidationError } from '../validateRequest.util.js'
@@ -85,9 +85,14 @@ class AjvValidateRequest {
 
     const { coerceTypes, mutateInput } = opt
     const ajv = coerceTypes ? getCoercingAjv() : undefined
-    const ajvSchema = AjvSchema.create(schema, { ajv })
 
-    const [error, output] = ajvSchema.getValidationResult(input, {
+    const validatable =
+      schema instanceof JSchema || schema instanceof AjvSchema
+        ? schema
+        : new JSchema<OUT, false>(schema)
+
+    const [error, output] = validatable.getValidationResult(input, {
+      ajv,
       inputName: `request.${reqProperty}`,
       getOriginalInput,
       mutateInput,