@naturalcycles/nodejs-lib 15.107.3 → 15.108.0

package/bin/generate-build-info.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '../dist/bin/generate-build-info.js'

package/bin/json2env.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '../dist/bin/json2env.js'

package/bin/kpy.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '../dist/bin/kpy.js'

package/bin/secrets-decrypt.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '../dist/bin/secrets-decrypt.js'

package/bin/secrets-encrypt.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '../dist/bin/secrets-encrypt.js'

package/bin/secrets-gen-key.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '../dist/bin/secrets-gen-key.js'

package/bin/slack-this.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '../dist/bin/slack-this.js'

package/dist/bin/generate-build-info.d.ts

@@ -1,2 +1 @@
-#!/usr/bin/env node
 export {};

package/dist/bin/generate-build-info.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import fs from 'node:fs';
 import path from 'node:path';
 import { appendToBashEnv, appendToGithubEnv, appendToGithubOutput } from '../fs/json2env.js';

package/dist/bin/json2env.d.ts

@@ -1,2 +1 @@
-#!/usr/bin/env node
 export {};

package/dist/bin/json2env.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { json2env } from '../fs/json2env.js';
 import { runScript } from '../script/runScript.js';
 import { _yargs } from '../yargs/yargs.util.js';

package/dist/bin/kpy.d.ts

@@ -1,2 +1 @@
-#!/usr/bin/env node
 export {};

package/dist/bin/kpy.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { kpySync } from '../fs/kpy.js';
 import { runScript } from '../script/runScript.js';
 import { _yargs } from '../yargs/yargs.util.js';

package/dist/bin/secrets-decrypt.d.ts

@@ -1,2 +1 @@
-#!/usr/bin/env node
 export {};

package/dist/bin/secrets-decrypt.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { dimGrey } from '../colors/colors.js';
 import { runScript } from '../script/runScript.js';
 import { secretsDecrypt } from '../secret/secrets-decrypt.util.js';

package/dist/bin/secrets-encrypt.d.ts

@@ -1,2 +1 @@
-#!/usr/bin/env node
 export {};

package/dist/bin/secrets-encrypt.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { dimGrey } from '../colors/colors.js';
 import { runScript } from '../script/runScript.js';
 import { secretsEncrypt } from '../secret/secrets-encrypt.util.js';

package/dist/bin/secrets-gen-key.d.ts

@@ -1,2 +1 @@
-#!/usr/bin/env node
 export {};

package/dist/bin/secrets-gen-key.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { randomBytes } from 'node:crypto';
 import { dimGrey } from '../colors/colors.js';
 import { runScript } from '../script/runScript.js';

package/dist/bin/slack-this.d.ts

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 declare global {
     namespace NodeJS {
         interface ProcessEnv {

package/dist/bin/slack-this.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { runScript } from '../script/runScript.js';
 import { SlackService } from '../slack/index.js';
 import { _yargs } from '../yargs/yargs.util.js';

package/dist/validation/ajv/jSchema.js

@@ -1180,7 +1180,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 +1204,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)))

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.107.3",
+  "version": "15.108.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",
@@ -41,15 +41,16 @@
     "./zip": "./dist/zip/zip2.js"
   },
   "bin": {
-    "kpy": "dist/bin/kpy.js",
-    "json2env": "dist/bin/json2env.js",
-    "generate-build-info": "dist/bin/generate-build-info.js",
-    "slack-this": "dist/bin/slack-this.js",
-    "secrets-gen-key": "dist/bin/secrets-gen-key.js",
-    "secrets-encrypt": "dist/bin/secrets-encrypt.js",
-    "secrets-decrypt": "dist/bin/secrets-decrypt.js"
+    "kpy": "bin/kpy.js",
+    "json2env": "bin/json2env.js",
+    "generate-build-info": "bin/generate-build-info.js",
+    "slack-this": "bin/slack-this.js",
+    "secrets-gen-key": "bin/secrets-gen-key.js",
+    "secrets-encrypt": "bin/secrets-encrypt.js",
+    "secrets-decrypt": "bin/secrets-decrypt.js"
   },
   "files": [
+    "bin",
     "dist",
     "src",
     "!src/test",

package/src/bin/generate-build-info.ts

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 import fs from 'node:fs'
 import path from 'node:path'
 import type { UnixTimestamp } from '@naturalcycles/js-lib/types'

package/src/bin/json2env.ts

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 import { json2env } from '../fs/json2env.js'
 import { runScript } from '../script/runScript.js'
 import { _yargs } from '../yargs/yargs.util.js'

package/src/bin/kpy.ts

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 import { kpySync } from '../fs/kpy.js'
 import { runScript } from '../script/runScript.js'
 import { _yargs } from '../yargs/yargs.util.js'

package/src/bin/secrets-decrypt.ts

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 import { dimGrey } from '../colors/colors.js'
 import { runScript } from '../script/runScript.js'
 import type { DecryptCLIOptions } from '../secret/secrets-decrypt.util.js'

package/src/bin/secrets-encrypt.ts

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 import { dimGrey } from '../colors/colors.js'
 import { runScript } from '../script/runScript.js'
 import type { EncryptCLIOptions } from '../secret/secrets-encrypt.util.js'

package/src/bin/secrets-gen-key.ts

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 import { randomBytes } from 'node:crypto'
 import { dimGrey } from '../colors/colors.js'
 import { runScript } from '../script/runScript.js'

package/src/bin/slack-this.ts

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 import { runScript } from '../script/runScript.js'
 import { SlackService } from '../slack/index.js'
 import { _yargs } from '../yargs/yargs.util.js'

package/src/validation/ajv/jSchema.ts

@@ -1694,7 +1694,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 +1735,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)))