@naturalcycles/nodejs-lib 15.122.0 → 15.122.2

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) {
@@ -1202,22 +1207,28 @@ function executeValidation(fn, builtSchema, input, opt = {}, defaultInputName) {
     // rewritten into below (a property name may itself contain a dot).
     // Root errors (empty instancePath) resolve to undefined - there the value is the whole Input,
     // which is printed anyway.
+    // `required` errors also resolve to undefined - their instancePath points at the parent object
+    // that lacks the property, so `got:` would print that whole object - noise next to the Input print.
     const failingValueByError = new Map(errors.map(e => [
         e,
-        e.instancePath ? getValueAtJsonPointer(inputForPrint, e.instancePath) : undefined,
+        e.instancePath && e.keyword !== 'required'
+            ? getValueAtJsonPointer(inputForPrint, e.instancePath)
+            : undefined,
     ]));
     applyImprovementsOnErrorMessages(errors, builtSchema);
     // Same line format as Ajv's errorsText().
-    // Each nested error line additionally ends with the narrow failing value itself (`, got: ...`),
+    // Each error line is followed by a `Got: ...` line printing the narrow failing value itself,
     // so it stays visible even when the Input print below gets truncated for large inputs.
+    // `Got` is a separate line (and is allowed to print multi-line) on purpose: consumers that
+    // only take the first line of the message keep getting the unchanged (pre-Got) error line.
     let message = errors
-        .map(e => {
-        let line = `${dataVar}${e.instancePath} ${e.message}`;
+        .flatMap(e => {
+        const lines = [`${dataVar}${e.instancePath} ${e.message}`];
         const value = failingValueByError.get(e);
         if (value !== undefined) {
-            line += `, got: ${_inspect(value, { maxLen: 500 })}`;
+            lines.push(`Got: ${_inspect(value, { maxLen: 500 })}`);
         }
-        return line;
+        return lines;
     })
         .join(separator);
     const inputStringified = _inspect(inputForPrint, { maxLen: 4000 });

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.0",
+  "version": "15.122.2",
   "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
   }
 
@@ -1732,26 +1738,32 @@ function executeValidation<OUT>(
   // rewritten into below (a property name may itself contain a dot).
   // Root errors (empty instancePath) resolve to undefined - there the value is the whole Input,
   // which is printed anyway.
+  // `required` errors also resolve to undefined - their instancePath points at the parent object
+  // that lacks the property, so `got:` would print that whole object - noise next to the Input print.
   const failingValueByError = new Map<ErrorObject, unknown>(
     errors.map(e => [
       e,
-      e.instancePath ? getValueAtJsonPointer(inputForPrint, e.instancePath) : undefined,
+      e.instancePath && e.keyword !== 'required'
+        ? getValueAtJsonPointer(inputForPrint, e.instancePath)
+        : undefined,
     ]),
   )
 
   applyImprovementsOnErrorMessages(errors, builtSchema)
 
   // Same line format as Ajv's errorsText().
-  // Each nested error line additionally ends with the narrow failing value itself (`, got: ...`),
+  // Each error line is followed by a `Got: ...` line printing the narrow failing value itself,
   // so it stays visible even when the Input print below gets truncated for large inputs.
+  // `Got` is a separate line (and is allowed to print multi-line) on purpose: consumers that
+  // only take the first line of the message keep getting the unchanged (pre-Got) error line.
   let message = errors
-    .map(e => {
-      let line = `${dataVar}${e.instancePath} ${e.message}`
+    .flatMap(e => {
+      const lines = [`${dataVar}${e.instancePath} ${e.message}`]
       const value = failingValueByError.get(e)
       if (value !== undefined) {
-        line += `, got: ${_inspect(value, { maxLen: 500 })}`
+        lines.push(`Got: ${_inspect(value, { maxLen: 500 })}`)
       }
-      return line
+      return lines
     })
     .join(separator)
 

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