@naturalcycles/nodejs-lib 15.122.1 → 15.122.3

package/dist/validation/ajv/jSchema.js

@@ -543,10 +543,15 @@ export class JString extends JBuilder {
     }
     pattern(pattern, opt) {
         const clone = this.cloneAndUpdateSchema({ pattern });
-        if (opt?.name)
-            clone.setErrorMessage('pattern', `is not a valid ${opt.name}`);
-        if (opt?.msg)
+        if (opt?.msg) {
             clone.setErrorMessage('pattern', opt.msg);
+        }
+        else if (opt?.name) {
+            clone.setErrorMessage('pattern', `is not a valid ${opt.name}`);
+        }
+        else {
+            clone.setErrorMessage('pattern', 'is not matching the expected pattern');
+        }
         return clone;
     }
     minLength(minLength) {
@@ -1268,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.
@@ -1351,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/dist/zip/zipInternal.js

@@ -60,8 +60,13 @@ const MAX_DOS_DATE = new Date(2107, 11, 31, 23, 59, 58);
  * timestamp is rendered in the local timezone. Out-of-range dates are clamped to 1980-2107.
  */
 export function unixToDosDateTime(ts) {
-    const jsDate = new Date(ts * 1000);
-    const d = jsDate < MIN_DOS_DATE ? MIN_DOS_DATE : jsDate > MAX_DOS_DATE ? MAX_DOS_DATE : jsDate;
+    let d = new Date(ts * 1000);
+    if (d < MIN_DOS_DATE) {
+        d = MIN_DOS_DATE;
+    }
+    else if (d > MAX_DOS_DATE) {
+        d = MAX_DOS_DATE;
+    }
     const date = (d.getDate() & 0x1f) | // 1-31
         (((d.getMonth() + 1) & 0x0f) << 5) | // 1-12
         (((d.getFullYear() - 1980) & 0x7f) << 9); // 1980-2107

package/package.json

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

package/src/validation/ajv/jSchema.ts

@@ -734,8 +734,14 @@ export class JString<
 
   pattern(pattern: string, opt?: JsonBuilderRuleOpt): this {
     const clone = this.cloneAndUpdateSchema({ pattern })
-    if (opt?.name) clone.setErrorMessage('pattern', `is not a valid ${opt.name}`)
-    if (opt?.msg) clone.setErrorMessage('pattern', opt.msg)
+    if (opt?.msg) {
+      clone.setErrorMessage('pattern', opt.msg)
+    } else if (opt?.name) {
+      clone.setErrorMessage('pattern', `is not a valid ${opt.name}`)
+    } else {
+      clone.setErrorMessage('pattern', 'is not matching the expected pattern')
+    }
+
     return clone
   }
 
@@ -1816,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]
 }
 
 /**
@@ -1906,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')

package/src/zip/zipInternal.ts

@@ -76,8 +76,12 @@ const MAX_DOS_DATE = new Date(2107, 11, 31, 23, 59, 58)
  * timestamp is rendered in the local timezone. Out-of-range dates are clamped to 1980-2107.
  */
 export function unixToDosDateTime(ts: UnixTimestamp): { date: number; time: number } {
-  const jsDate = new Date(ts * 1000)
-  const d = jsDate < MIN_DOS_DATE ? MIN_DOS_DATE : jsDate > MAX_DOS_DATE ? MAX_DOS_DATE : jsDate
+  let d = new Date(ts * 1000)
+  if (d < MIN_DOS_DATE) {
+    d = MIN_DOS_DATE
+  } else if (d > MAX_DOS_DATE) {
+    d = MAX_DOS_DATE
+  }
 
   const date =
     (d.getDate() & 0x1f) | // 1-31