@naturalcycles/nodejs-lib 15.122.2 → 15.122.4

package/dist/validation/ajv/jSchema.js

@@ -771,13 +771,13 @@ export class JNumber extends JBuilder {
         return this;
     }
     unixTimestamp() {
-        return this.integer().min(0).max(TS_2500).branded();
+        return this.integer().branded();
     }
     unixTimestamp2000() {
         return this.integer().min(TS_2000).max(TS_2500).branded();
     }
     unixTimestampMillis() {
-        return this.integer().min(0).max(TS_2500_MILLIS).branded();
+        return this.integer().branded();
     }
     unixTimestamp2000Millis() {
         return this.integer().min(TS_2000_MILLIS).max(TS_2500_MILLIS).branded();
@@ -1273,18 +1273,14 @@ function applyImprovementsOnErrorMessages(errors, schema) {
 }
 /**
  * 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).
+ * for a given AJV error, resolving the error's schemaPath to the exact subschema that
+ * failed - which, unlike the instancePath, also addresses anyOf/oneOf branches.
  * 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];
+    if (!error.schemaPath)
+        return undefined;
+    return resolveSchemaPath(schema, error.schemaPath)?.errorMessages?.[error.keyword];
 }
 /**
  * Groups repeated validation errors by rule rather than by unique request content.
@@ -1356,59 +1352,6 @@ function resolveSchemaPath(schema, schemaPath) {
     }
     return current;
 }
-function getErrorMessageForInstancePath(schema, instancePath, keyword) {
-    if (!schema || !instancePath)
-        return undefined;
-    const segments = instancePath.split('/').filter(Boolean);
-    return traverseSchemaPath(schema, segments, keyword);
-}
-function traverseSchemaPath(schema, segments, keyword) {
-    if (!segments.length)
-        return undefined;
-    const [currentSegment, ...remainingSegments] = segments;
-    const nextSchema = getChildSchema(schema, currentSegment);
-    if (!nextSchema)
-        return undefined;
-    if (nextSchema.errorMessages?.[keyword]) {
-        return nextSchema.errorMessages[keyword];
-    }
-    // Check through nullable wrapper
-    const unwrapped = unwrapNullableAnyOf(nextSchema);
-    if (unwrapped?.errorMessages?.[keyword]) {
-        return unwrapped.errorMessages[keyword];
-    }
-    if (remainingSegments.length) {
-        return traverseSchemaPath(nextSchema, remainingSegments, keyword);
-    }
-    return undefined;
-}
-function getChildSchema(schema, segment) {
-    if (!segment)
-        return undefined;
-    // Unwrap nullable anyOf to find properties/items through nullable wrappers
-    const effectiveSchema = unwrapNullableAnyOf(schema) ?? schema;
-    if (/^\d+$/.test(segment) && effectiveSchema.items) {
-        return getArrayItemSchema(effectiveSchema, segment);
-    }
-    return getObjectPropertySchema(effectiveSchema, segment);
-}
-function getArrayItemSchema(schema, indexSegment) {
-    if (!schema.items)
-        return undefined;
-    if (Array.isArray(schema.items)) {
-        return schema.items[Number(indexSegment)];
-    }
-    return schema.items;
-}
-function getObjectPropertySchema(schema, segment) {
-    return schema.properties?.[segment];
-}
-function unwrapNullableAnyOf(schema) {
-    const nullIndex = unwrapNullableAnyOfIndex(schema);
-    if (nullIndex === -1)
-        return undefined;
-    return schema.anyOf[1 - nullIndex];
-}
 function unwrapNullableAnyOfIndex(schema) {
     if (schema.anyOf?.length !== 2)
         return -1;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.122.2",
+  "version": "15.122.4",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",

package/src/validation/ajv/jSchema.ts

@@ -1030,7 +1030,7 @@ export class JNumber<
   }
 
   unixTimestamp(): JNumber<UnixTimestamp, Opt> {
-    return this.integer().min(0).max(TS_2500).branded<UnixTimestamp>()
+    return this.integer().branded<UnixTimestamp>()
   }
 
   unixTimestamp2000(): JNumber<UnixTimestamp, Opt> {
@@ -1038,7 +1038,7 @@ export class JNumber<
   }
 
   unixTimestampMillis(): JNumber<UnixTimestampMillis, Opt> {
-    return this.integer().min(0).max(TS_2500_MILLIS).branded<UnixTimestampMillis>()
+    return this.integer().branded<UnixTimestampMillis>()
   }
 
   unixTimestamp2000Millis(): JNumber<UnixTimestampMillis, Opt> {
@@ -1822,16 +1822,13 @@ function applyImprovementsOnErrorMessages(
 
 /**
  * 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).
+ * for a given AJV error, resolving the error's schemaPath to the exact subschema that
+ * failed - which, unlike the instancePath, also addresses anyOf/oneOf branches.
  * 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]
+  if (!error.schemaPath) return undefined
+  return resolveSchemaPath(schema, error.schemaPath)?.errorMessages?.[error.keyword]
 }
 
 /**
@@ -1912,79 +1909,6 @@ function resolveSchemaPath(schema: JsonSchema, schemaPath: string): JsonSchema |
   return current as JsonSchema | undefined
 }
 
-function getErrorMessageForInstancePath(
-  schema: JsonSchema | undefined,
-  instancePath: string,
-  keyword: string,
-): string | undefined {
-  if (!schema || !instancePath) return undefined
-
-  const segments = instancePath.split('/').filter(Boolean)
-  return traverseSchemaPath(schema, segments, keyword)
-}
-
-function traverseSchemaPath(
-  schema: JsonSchema,
-  segments: string[],
-  keyword: string,
-): string | undefined {
-  if (!segments.length) return undefined
-
-  const [currentSegment, ...remainingSegments] = segments
-
-  const nextSchema = getChildSchema(schema, currentSegment)
-  if (!nextSchema) return undefined
-
-  if (nextSchema.errorMessages?.[keyword]) {
-    return nextSchema.errorMessages[keyword]
-  }
-
-  // Check through nullable wrapper
-  const unwrapped = unwrapNullableAnyOf(nextSchema)
-  if (unwrapped?.errorMessages?.[keyword]) {
-    return unwrapped.errorMessages[keyword]
-  }
-
-  if (remainingSegments.length) {
-    return traverseSchemaPath(nextSchema, remainingSegments, keyword)
-  }
-
-  return undefined
-}
-
-function getChildSchema(schema: JsonSchema, segment: string | undefined): JsonSchema | undefined {
-  if (!segment) return undefined
-
-  // Unwrap nullable anyOf to find properties/items through nullable wrappers
-  const effectiveSchema = unwrapNullableAnyOf(schema) ?? schema
-
-  if (/^\d+$/.test(segment) && effectiveSchema.items) {
-    return getArrayItemSchema(effectiveSchema, segment)
-  }
-
-  return getObjectPropertySchema(effectiveSchema, segment)
-}
-
-function getArrayItemSchema(schema: JsonSchema, indexSegment: string): JsonSchema | undefined {
-  if (!schema.items) return undefined
-
-  if (Array.isArray(schema.items)) {
-    return schema.items[Number(indexSegment)]
-  }
-
-  return schema.items
-}
-
-function getObjectPropertySchema(schema: JsonSchema, segment: string): JsonSchema | undefined {
-  return schema.properties?.[segment as keyof typeof schema.properties]
-}
-
-function unwrapNullableAnyOf(schema: JsonSchema): JsonSchema | undefined {
-  const nullIndex = unwrapNullableAnyOfIndex(schema)
-  if (nullIndex === -1) return undefined
-  return schema.anyOf![1 - nullIndex]!
-}
-
 function unwrapNullableAnyOfIndex(schema: JsonSchema): number {
   if (schema.anyOf?.length !== 2) return -1
   const nullIndex = schema.anyOf.findIndex(s => s.type === 'null')