@naturalcycles/nodejs-lib 15.37.2 → 15.38.0

package/dist/security/nanoid.js

@@ -4,7 +4,7 @@ This file is "vendored" from Nanoid, all credit is to Nanoid authors:
 https://github.com/ai/nanoid/
 
  */
-/* eslint-disable */
+// oxlint-disable no-bitwise -- NanoID implementation relies on bitwise operations
 import { randomFillSync } from 'node:crypto';
 export const ALPHABET_NONAMBIGUOUS = '23456789ABCDEFGHJKLMNPQRSTUVWXYZ';
 export const ALPHABET_NUMBER = '0123456789';

package/dist/validation/ajv/getAjv.js

@@ -1,9 +1,8 @@
-/* eslint-disable @typescript-eslint/prefer-string-starts-ends-with */
-/* eslint-disable unicorn/prefer-code-point */
 import { _lazyValue } from '@naturalcycles/js-lib';
-import { Ajv } from 'ajv';
+import { _, Ajv } from 'ajv';
 import ajvFormats from 'ajv-formats';
-import ajvKeywords from 'ajv-keywords';
+/* eslint-disable @typescript-eslint/prefer-string-starts-ends-with */
+// oxlint-disable unicorn/prefer-code-point
 const AJV_OPTIONS = {
     removeAdditional: true,
     allErrors: true,
@@ -51,17 +50,56 @@ export function createAjv(opt) {
     // https://ajv.js.org/guide/formats.html
     // @ts-expect-error types are wrong
     ajvFormats(ajv);
-    // https://ajv.js.org/packages/ajv-keywords.html
-    // @ts-expect-error types are wrong
-    ajvKeywords(ajv, [
-        'transform', // trim, toLowerCase, etc.
-        'uniqueItemProperties',
-        'instanceof',
-    ]);
     // Adds $merge, $patch keywords
     // https://github.com/ajv-validator/ajv-merge-patch
     // Kirill: temporarily disabled, as it creates a noise of CVE warnings
     // require('ajv-merge-patch')(ajv)
+    ajv.addKeyword({
+        keyword: 'transform',
+        type: 'string',
+        modifying: true,
+        schemaType: 'object',
+        code(cxt) {
+            const { gen, data, schema, it } = cxt;
+            const { parentData, parentDataProperty } = it;
+            if (schema.trim) {
+                gen.assign(_ `${data}`, _ `${data}.trim()`);
+            }
+            if (schema.toLowerCase) {
+                gen.assign(_ `${data}`, _ `${data}.toLowerCase()`);
+            }
+            if (schema.toUpperCase) {
+                gen.assign(_ `${data}`, _ `${data}.toUpperCase()`);
+            }
+            if (typeof schema.truncate === 'number' && schema.truncate >= 0) {
+                gen.assign(_ `${data}`, _ `${data}.slice(0, ${schema.truncate})`);
+                if (schema.trim) {
+                    gen.assign(_ `${data}`, _ `${data}.trim()`);
+                }
+            }
+            gen.if(_ `${parentData} !== undefined`, () => {
+                gen.assign(_ `${parentData}[${parentDataProperty}]`, data);
+            });
+        },
+    });
+    ajv.addKeyword({
+        keyword: 'instanceof',
+        modifying: true,
+        schemaType: 'string',
+        validate(instanceOf, data, _schema, _ctx) {
+            if (typeof data !== 'object')
+                return false;
+            if (data === null)
+                return false;
+            let proto = Object.getPrototypeOf(data);
+            while (proto) {
+                if (proto.constructor?.name === instanceOf)
+                    return true;
+                proto = Object.getPrototypeOf(proto);
+            }
+            return false;
+        },
+    });
     return ajv;
 }
 const TS_2500 = 16725225600; // 2500-01-01

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.37.2",
+  "version": "15.38.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",
@@ -9,7 +9,6 @@
     "@types/yargs": "^16",
     "ajv": "^8",
     "ajv-formats": "^3",
-    "ajv-keywords": "^5",
     "chalk": "^5",
     "dotenv": "^17",
     "joi": "^18",

package/src/security/nanoid.ts

@@ -5,7 +5,7 @@ https://github.com/ai/nanoid/
 
  */
 
-/* eslint-disable */
+// oxlint-disable no-bitwise -- NanoID implementation relies on bitwise operations
 
 import { randomFillSync } from 'node:crypto'
 

package/src/validation/ajv/getAjv.ts

@@ -1,10 +1,10 @@
-/* eslint-disable @typescript-eslint/prefer-string-starts-ends-with */
-/* eslint-disable unicorn/prefer-code-point */
 import { _lazyValue } from '@naturalcycles/js-lib'
 import type { Options } from 'ajv'
-import { Ajv } from 'ajv'
+import { _, Ajv } from 'ajv'
 import ajvFormats from 'ajv-formats'
-import ajvKeywords from 'ajv-keywords'
+
+/* eslint-disable @typescript-eslint/prefer-string-starts-ends-with */
+// oxlint-disable unicorn/prefer-code-point
 
 const AJV_OPTIONS: Options = {
   removeAdditional: true,
@@ -60,19 +60,64 @@ export function createAjv(opt?: Options): Ajv {
   // @ts-expect-error types are wrong
   ajvFormats(ajv)
 
-  // https://ajv.js.org/packages/ajv-keywords.html
-  // @ts-expect-error types are wrong
-  ajvKeywords(ajv, [
-    'transform', // trim, toLowerCase, etc.
-    'uniqueItemProperties',
-    'instanceof',
-  ])
-
   // Adds $merge, $patch keywords
   // https://github.com/ajv-validator/ajv-merge-patch
   // Kirill: temporarily disabled, as it creates a noise of CVE warnings
   // require('ajv-merge-patch')(ajv)
 
+  ajv.addKeyword({
+    keyword: 'transform',
+    type: 'string',
+    modifying: true,
+    schemaType: 'object',
+    code(cxt) {
+      const { gen, data, schema, it } = cxt
+      const { parentData, parentDataProperty } = it
+
+      if (schema.trim) {
+        gen.assign(_`${data}`, _`${data}.trim()`)
+      }
+
+      if (schema.toLowerCase) {
+        gen.assign(_`${data}`, _`${data}.toLowerCase()`)
+      }
+
+      if (schema.toUpperCase) {
+        gen.assign(_`${data}`, _`${data}.toUpperCase()`)
+      }
+
+      if (typeof schema.truncate === 'number' && schema.truncate >= 0) {
+        gen.assign(_`${data}`, _`${data}.slice(0, ${schema.truncate})`)
+
+        if (schema.trim) {
+          gen.assign(_`${data}`, _`${data}.trim()`)
+        }
+      }
+
+      gen.if(_`${parentData} !== undefined`, () => {
+        gen.assign(_`${parentData}[${parentDataProperty}]`, data)
+      })
+    },
+  })
+
+  ajv.addKeyword({
+    keyword: 'instanceof',
+    modifying: true,
+    schemaType: 'string',
+    validate(instanceOf: string, data: unknown, _schema, _ctx) {
+      if (typeof data !== 'object') return false
+      if (data === null) return false
+
+      let proto = Object.getPrototypeOf(data)
+      while (proto) {
+        if (proto.constructor?.name === instanceOf) return true
+        proto = Object.getPrototypeOf(proto)
+      }
+
+      return false
+    },
+  })
+
   return ajv
 }
 

package/src/validation/joi/joi.extensions.ts

@@ -5,9 +5,9 @@ import type { StringSchema } from './string.extensions.js'
 import { stringExtensions } from './string.extensions.js'
 
 export interface ExtendedJoi extends JoiLib.Root {
-  // eslint-disable-next-line id-blacklist
+  // eslint-disable-next-line id-denylist
   string: <TSchema = string>() => StringSchema<TSchema>
-  // eslint-disable-next-line id-blacklist
+  // eslint-disable-next-line id-denylist
   number: <TSchema = number>() => NumberSchema<TSchema>
 }