@naturalcycles/nodejs-lib 15.107.4 → 15.109.0

package/dist/csv/csvWriter.js

@@ -52,5 +52,5 @@ export function arrayToCSVColumns(arr) {
             cols.add(col);
         }
     }
-    return [...cols];
+    return Array.from(cols);
 }

package/dist/fs/fs2.d.ts

@@ -63,9 +63,9 @@ declare class FS2 {
     isDirectory(filePath: string): boolean;
     fs: typeof fs;
     fsp: typeof fsp;
-    lstat: fs.StatSyncFn;
+    lstat: typeof fs.lstatSync;
     lstatAsync: typeof fsp.lstat;
-    stat: fs.StatSyncFn;
+    stat: typeof fs.statSync;
     statAsync: typeof fsp.stat;
     mkdir: typeof fs.mkdirSync;
     mkdirAsync: typeof fsp.mkdir;

package/dist/validation/ajv/from-data/generateJsonSchemaFromData.js

@@ -23,7 +23,7 @@ function objectToJsonSchema(rows) {
         additionalProperties: true,
     };
     _stringMapEntries(typesByKey).forEach(([key, types]) => {
-        const schema = mergeTypes([...types], rows.map(r => r[key]));
+        const schema = mergeTypes(Array.from(types), rows.map(r => r[key]));
         if (!schema)
             return;
         s.properties[key] = schema;

package/dist/validation/ajv/jSchema.js

@@ -472,14 +472,14 @@ export class JBuilder extends JSchema {
         const innerSchema = {
             ...(builtSchema.type ? { type: builtSchema.type } : {}),
             anyOf: [builtSchema, alternativesSchema],
-            optionalValues: [...optionalValues],
+            optionalValues: optionalValues.slice(),
         };
         // When `null` is specified, we want `null` to be stripped and the value to become `undefined`,
         // so we must allow `null` values to be parsed by Ajv,
         // but the typing should not reflect that.
         if (optionalValues.includes(null)) {
             return new JSchema({
-                anyOf: [{ type: 'null', optionalValues: [...optionalValues] }, innerSchema],
+                anyOf: [{ type: 'null', optionalValues: optionalValues.slice() }, innerSchema],
                 optionalField: true,
             });
         }
@@ -1111,9 +1111,7 @@ export class AjvSchema {
     cfg;
     _compiledFn;
     _getValidateFn() {
-        if (!this._compiledFn) {
-            this._compiledFn = this.cfg.ajv.compile(this.schema);
-        }
+        this._compiledFn ||= this.cfg.ajv.compile(this.schema);
         return this._compiledFn;
     }
     /**
@@ -1180,7 +1178,7 @@ function executeValidation(fn, builtSchema, input, opt = {}, defaultInputName) {
     const dataVar = [inputName, inputId].filter(Boolean).join('.');
     // Build fingerprint before applyImprovementsOnErrorMessages: after it, /items/0/name becomes
     // .items[0].name, embedding the index into the segment and making it harder to strip without regex
-    const fingerprint = buildAjvErrorFingerprint(errors[0], inputName);
+    const fingerprint = buildAjvErrorFingerprint(errors[0], inputName, resolveCustomErrorMessage(builtSchema, errors[0]));
     applyImprovementsOnErrorMessages(errors, builtSchema);
     let message = getAjv().errorsText(errors, {
         dataVar,
@@ -1204,33 +1202,46 @@ function applyImprovementsOnErrorMessages(errors, schema) {
     if (!errors)
         return;
     filterNullableAnyOfErrors(errors, schema);
-    const { errorMessages } = schema;
     for (const error of errors) {
-        const errorMessage = getErrorMessageForInstancePath(schema, error.instancePath, error.keyword);
-        if (errorMessage) {
-            error.message = errorMessage;
-        }
-        else if (errorMessages?.[error.keyword]) {
-            error.message = errorMessages[error.keyword];
-        }
-        else {
-            const unwrapped = unwrapNullableAnyOf(schema);
-            if (unwrapped?.errorMessages?.[error.keyword]) {
-                error.message = unwrapped.errorMessages[error.keyword];
-            }
+        const customMessage = resolveCustomErrorMessage(schema, error);
+        if (customMessage) {
+            error.message = customMessage;
+            // A custom `msg` signals "the underlying rule param is an implementation detail".
+            // Drop params so consumers (e.g. HTTP responses, Sentry payloads) don't surface
+            // the raw regex/limit/etc. — the custom message is now the canonical rule label.
+            error.params = {};
         }
         error.instancePath = error.instancePath.replaceAll(/\/(\d+)/g, `[$1]`).replaceAll('/', '.');
     }
 }
+/**
+ * Looks up the user-provided custom error message (set via `{ msg }` / `{ name }`)
+ * for a given AJV error, walking the schema along the error's instancePath and
+ * falling back to top-level `errorMessages` (including through nullable wrappers).
+ * Returns undefined if no custom message was registered for the failing keyword.
+ */
+function resolveCustomErrorMessage(schema, error) {
+    const byPath = getErrorMessageForInstancePath(schema, error.instancePath, error.keyword);
+    if (byPath)
+        return byPath;
+    if (schema.errorMessages?.[error.keyword])
+        return schema.errorMessages[error.keyword];
+    const unwrapped = unwrapNullableAnyOf(schema);
+    return unwrapped?.errorMessages?.[error.keyword];
+}
 /**
  * Groups repeated validation errors by rule rather than by unique request content.
  * Excludes instance-specific data like record IDs and array indices.
+ *
+ * When a custom error message is registered for the failing rule, prefer it over
+ * the raw param value (e.g. regex source) — it is both stable across regex tweaks
+ * and avoids leaking the underlying pattern into Sentry fingerprints.
  */
-function buildAjvErrorFingerprint(e, inputName) {
-    const value = Object.values(e.params || {})[0];
+function buildAjvErrorFingerprint(e, inputName, customMessage) {
+    const ruleValue = customMessage ?? Object.values(e.params || {})[0];
     let rule = e.keyword;
-    if (value !== undefined)
-        rule += `:${value}`;
+    if (ruleValue !== undefined)
+        rule += `:${ruleValue}`;
     const path = e.instancePath
         .split('/')
         .filter(s => s && isNaN(Number(s)))
@@ -1394,7 +1405,7 @@ function deepCopyPreservingFunctions(obj) {
         const value = obj[key];
         copy[key] =
             (key === 'customValidations' || key === 'customConversions') && Array.isArray(value)
-                ? [...value]
+                ? value.slice()
                 : deepCopyPreservingFunctions(value);
     }
     return copy;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.107.4",
+  "version": "15.109.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",
@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "@typescript/native-preview": "beta",
-    "@naturalcycles/dev-lib": "20.45.1"
+    "@naturalcycles/dev-lib": "20.48.0"
   },
   "exports": {
     ".": "./dist/index.js",

package/src/csv/csvWriter.ts

@@ -83,5 +83,5 @@ export function arrayToCSVColumns(arr: AnyObject[]): string[] {
       cols.add(col)
     }
   }
-  return [...cols]
+  return Array.from(cols)
 }

package/src/validation/ajv/from-data/generateJsonSchemaFromData.ts

@@ -36,7 +36,7 @@ function objectToJsonSchema<T extends AnyObject>(rows: AnyObject[]): JsonSchema<
 
   _stringMapEntries(typesByKey).forEach(([key, types]) => {
     const schema = mergeTypes(
-      [...types],
+      Array.from(types),
       rows.map(r => r[key]),
     )
     if (!schema) return

package/src/validation/ajv/jSchema.ts

@@ -644,7 +644,7 @@ export class JBuilder<OUT, Opt> extends JSchema<OUT, Opt> {
     const innerSchema: JsonSchema = {
       ...(builtSchema.type ? { type: builtSchema.type } : {}),
       anyOf: [builtSchema, alternativesSchema],
-      optionalValues: [...optionalValues],
+      optionalValues: optionalValues.slice(),
     }
 
     // When `null` is specified, we want `null` to be stripped and the value to become `undefined`,
@@ -652,7 +652,7 @@ export class JBuilder<OUT, Opt> extends JSchema<OUT, Opt> {
     // but the typing should not reflect that.
     if (optionalValues.includes(null)) {
       return new JSchema({
-        anyOf: [{ type: 'null', optionalValues: [...optionalValues] }, innerSchema],
+        anyOf: [{ type: 'null', optionalValues: optionalValues.slice() }, innerSchema],
         optionalField: true,
       }) as any
     }
@@ -1598,9 +1598,7 @@ export class AjvSchema<OUT> {
   private _compiledFn: any
 
   private _getValidateFn(): any {
-    if (!this._compiledFn) {
-      this._compiledFn = this.cfg.ajv.compile(this.schema as any)
-    }
+    this._compiledFn ||= this.cfg.ajv.compile(this.schema as any)
     return this._compiledFn
   }
 
@@ -1694,7 +1692,11 @@ function executeValidation<OUT>(
 
   // Build fingerprint before applyImprovementsOnErrorMessages: after it, /items/0/name becomes
   // .items[0].name, embedding the index into the segment and making it harder to strip without regex
-  const fingerprint = buildAjvErrorFingerprint(errors[0], inputName)
+  const fingerprint = buildAjvErrorFingerprint(
+    errors[0],
+    inputName,
+    resolveCustomErrorMessage(builtSchema, errors[0]),
+  )
 
   applyImprovementsOnErrorMessages(errors, builtSchema)
 
@@ -1731,34 +1733,51 @@ function applyImprovementsOnErrorMessages(
 
   filterNullableAnyOfErrors(errors, schema)
 
-  const { errorMessages } = schema
-
   for (const error of errors) {
-    const errorMessage = getErrorMessageForInstancePath(schema, error.instancePath, error.keyword)
-
-    if (errorMessage) {
-      error.message = errorMessage
-    } else if (errorMessages?.[error.keyword]) {
-      error.message = errorMessages[error.keyword]
-    } else {
-      const unwrapped = unwrapNullableAnyOf(schema)
-      if (unwrapped?.errorMessages?.[error.keyword]) {
-        error.message = unwrapped.errorMessages[error.keyword]
-      }
+    const customMessage = resolveCustomErrorMessage(schema, error)
+
+    if (customMessage) {
+      error.message = customMessage
+      // A custom `msg` signals "the underlying rule param is an implementation detail".
+      // Drop params so consumers (e.g. HTTP responses, Sentry payloads) don't surface
+      // the raw regex/limit/etc. — the custom message is now the canonical rule label.
+      error.params = {}
     }
 
     error.instancePath = error.instancePath.replaceAll(/\/(\d+)/g, `[$1]`).replaceAll('/', '.')
   }
 }
 
+/**
+ * Looks up the user-provided custom error message (set via `{ msg }` / `{ name }`)
+ * for a given AJV error, walking the schema along the error's instancePath and
+ * falling back to top-level `errorMessages` (including through nullable wrappers).
+ * Returns undefined if no custom message was registered for the failing keyword.
+ */
+function resolveCustomErrorMessage(schema: JsonSchema, error: ErrorObject): string | undefined {
+  const byPath = getErrorMessageForInstancePath(schema, error.instancePath, error.keyword)
+  if (byPath) return byPath
+  if (schema.errorMessages?.[error.keyword]) return schema.errorMessages[error.keyword]
+  const unwrapped = unwrapNullableAnyOf(schema)
+  return unwrapped?.errorMessages?.[error.keyword]
+}
+
 /**
  * Groups repeated validation errors by rule rather than by unique request content.
  * Excludes instance-specific data like record IDs and array indices.
+ *
+ * When a custom error message is registered for the failing rule, prefer it over
+ * the raw param value (e.g. regex source) — it is both stable across regex tweaks
+ * and avoids leaking the underlying pattern into Sentry fingerprints.
  */
-function buildAjvErrorFingerprint(e: ErrorObject, inputName: string): string {
-  const value = Object.values(e.params || {})[0]
+function buildAjvErrorFingerprint(
+  e: ErrorObject,
+  inputName: string,
+  customMessage: string | undefined,
+): string {
+  const ruleValue = customMessage ?? Object.values(e.params || {})[0]
   let rule = e.keyword
-  if (value !== undefined) rule += `:${value}`
+  if (ruleValue !== undefined) rule += `:${ruleValue}`
   const path = e.instancePath
     .split('/')
     .filter(s => s && isNaN(Number(s)))
@@ -1953,7 +1972,7 @@ function deepCopyPreservingFunctions<T>(obj: T): T {
     // customValidations/customConversions are arrays of functions - shallow copy the array
     ;(copy as any)[key] =
       (key === 'customValidations' || key === 'customConversions') && Array.isArray(value)
-        ? [...value]
+        ? value.slice()
         : deepCopyPreservingFunctions(value)
   }
   return copy