@naturalcycles/nodejs-lib 15.125.3 → 15.125.4

package/dist/validation/ajv/getAjv.js

@@ -633,8 +633,10 @@ export function createAjv(opt) {
 const monthLengths = [0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 const DASH_CODE = '-'.charCodeAt(0);
 const ZERO_CODE = '0'.charCodeAt(0);
+const NINE_CODE = '9'.charCodeAt(0);
 const PLUS_CODE = '+'.charCodeAt(0);
 const COLON_CODE = ':'.charCodeAt(0);
+const DOT_CODE = '.'.charCodeAt(0);
 /**
  * This is a performance optimized correct validation
  * for ISO dates formatted as YYYY-MM-DD.
@@ -650,13 +652,10 @@ function isIsoDateValid(s) {
     if (s.charCodeAt(4) !== DASH_CODE || s.charCodeAt(7) !== DASH_CODE)
         return false;
     // fast parse numbers without substrings/Number()
-    const year = (s.charCodeAt(0) - ZERO_CODE) * 1000 +
-        (s.charCodeAt(1) - ZERO_CODE) * 100 +
-        (s.charCodeAt(2) - ZERO_CODE) * 10 +
-        (s.charCodeAt(3) - ZERO_CODE);
-    const month = (s.charCodeAt(5) - ZERO_CODE) * 10 + (s.charCodeAt(6) - ZERO_CODE);
-    const day = (s.charCodeAt(8) - ZERO_CODE) * 10 + (s.charCodeAt(9) - ZERO_CODE);
-    if (month < 1 || month > 12 || day < 1)
+    const year = parseDigits(s, 0, 4);
+    const month = parseDigits(s, 5, 2);
+    const day = parseDigits(s, 8, 2);
+    if (year < 0 || month < 1 || month > 12 || day < 1)
         return false;
     if (month !== 2) {
         return day <= monthLengths[month];
@@ -666,15 +665,16 @@ function isIsoDateValid(s) {
 }
 /**
  * This is a performance optimized correct validation
- * for ISO datetimes formatted as "YYYY-MM-DDTHH:MM:SS" followed by
- * nothing, "Z" or "+hh:mm" or "-hh:mm".
+ * for ISO datetimes formatted as "YYYY-MM-DDTHH:MM:SS",
+ * optionally followed by fractional seconds of 1 to 9 digits (e.g. ".231" or ".231263"),
+ * followed by nothing, "Z" or "+hh:mm" or "-hh:mm".
  *
  * - Slightly more performant than using `localTime`.
  * - More performant than string splitting and `Number()` conversions
  * - Less performant than regex, but it does not allow invalid dates.
  */
 function isIsoDateTimeValid(s) {
-    if (s.length < 19 || s.length > 25)
+    if (s.length < 19 || s.length > 35)
         return false;
     if (s.charCodeAt(10) !== 84)
         return false; // 'T'
@@ -684,7 +684,16 @@ function isIsoDateTimeValid(s) {
     const timePart = s.slice(11, 19); // HH:MM:SS
     if (!isIsoTimeValid(timePart))
         return false;
-    const zonePart = s.slice(19); // nothing or Z or +/-hh:mm
+    let zoneStart = 19;
+    if (s.charCodeAt(19) === DOT_CODE) {
+        zoneStart = 20;
+        while (isDigitCode(s.charCodeAt(zoneStart)))
+            zoneStart++;
+        const fractionDigits = zoneStart - 20;
+        if (fractionDigits < 1 || fractionDigits > 9)
+            return false;
+    }
+    const zonePart = s.slice(zoneStart); // nothing or Z or +/-hh:mm
     if (!isIsoTimezoneValid(zonePart))
         return false;
     return true;
@@ -702,13 +711,13 @@ function isIsoTimeValid(s) {
         return false;
     if (s.charCodeAt(2) !== COLON_CODE || s.charCodeAt(5) !== COLON_CODE)
         return false;
-    const hour = (s.charCodeAt(0) - ZERO_CODE) * 10 + (s.charCodeAt(1) - ZERO_CODE);
+    const hour = parseDigits(s, 0, 2);
     if (hour < 0 || hour > 23)
         return false;
-    const minute = (s.charCodeAt(3) - ZERO_CODE) * 10 + (s.charCodeAt(4) - ZERO_CODE);
+    const minute = parseDigits(s, 3, 2);
     if (minute < 0 || minute > 59)
         return false;
-    const second = (s.charCodeAt(6) - ZERO_CODE) * 10 + (s.charCodeAt(7) - ZERO_CODE);
+    const second = parseDigits(s, 6, 2);
     if (second < 0 || second > 59)
         return false;
     return true;
@@ -733,14 +742,14 @@ function isIsoTimezoneValid(s) {
         return false;
     const isWestern = s[0] === '-';
     const isEastern = s[0] === '+';
-    const hour = (s.charCodeAt(1) - ZERO_CODE) * 10 + (s.charCodeAt(2) - ZERO_CODE);
+    const hour = parseDigits(s, 1, 2);
     if (hour < 0)
         return false;
     if (isWestern && hour > 12)
         return false;
     if (isEastern && hour > 14)
         return false;
-    const minute = (s.charCodeAt(4) - ZERO_CODE) * 10 + (s.charCodeAt(5) - ZERO_CODE);
+    const minute = parseDigits(s, 4, 2);
     if (minute < 0 || minute > 59)
         return false;
     if (isEastern && hour === 14 && minute > 0)
@@ -760,13 +769,23 @@ function isIsoMonthValid(s) {
     if (s.charCodeAt(4) !== DASH_CODE)
         return false;
     // fast parse numbers without substrings/Number()
-    const year = (s.charCodeAt(0) - ZERO_CODE) * 1000 +
-        (s.charCodeAt(1) - ZERO_CODE) * 100 +
-        (s.charCodeAt(2) - ZERO_CODE) * 10 +
-        (s.charCodeAt(3) - ZERO_CODE);
-    const month = (s.charCodeAt(5) - ZERO_CODE) * 10 + (s.charCodeAt(6) - ZERO_CODE);
+    const year = parseDigits(s, 0, 4);
+    const month = parseDigits(s, 5, 2);
     return _isBetween(year, 1900, 2500, '[]') && _isBetween(month, 1, 12, '[]');
 }
+function parseDigits(s, start, count) {
+    let value = 0;
+    for (let i = start; i < start + count; i++) {
+        const code = s.charCodeAt(i);
+        if (!isDigitCode(code))
+            return -1;
+        value = value * 10 + code - ZERO_CODE;
+    }
+    return value;
+}
+function isDigitCode(code) {
+    return code >= ZERO_CODE && code <= NINE_CODE;
+}
 function isPrimitive(data) {
     return data !== null && typeof data === 'object';
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.125.3",
+  "version": "15.125.4",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",
@@ -14,7 +14,7 @@
     "yaml": "^2"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "20.65.1",
+    "@naturalcycles/dev-lib": "0.0.0",
     "typescript": "^7"
   },
   "exports": {

package/src/validation/ajv/getAjv.ts

@@ -738,8 +738,10 @@ const monthLengths = [0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
 
 const DASH_CODE = '-'.charCodeAt(0)
 const ZERO_CODE = '0'.charCodeAt(0)
+const NINE_CODE = '9'.charCodeAt(0)
 const PLUS_CODE = '+'.charCodeAt(0)
 const COLON_CODE = ':'.charCodeAt(0)
+const DOT_CODE = '.'.charCodeAt(0)
 
 /**
  * This is a performance optimized correct validation
@@ -755,16 +757,12 @@ function isIsoDateValid(s: string): boolean {
   if (s.charCodeAt(4) !== DASH_CODE || s.charCodeAt(7) !== DASH_CODE) return false
 
   // fast parse numbers without substrings/Number()
-  const year =
-    (s.charCodeAt(0) - ZERO_CODE) * 1000 +
-    (s.charCodeAt(1) - ZERO_CODE) * 100 +
-    (s.charCodeAt(2) - ZERO_CODE) * 10 +
-    (s.charCodeAt(3) - ZERO_CODE)
+  const year = parseDigits(s, 0, 4)
 
-  const month = (s.charCodeAt(5) - ZERO_CODE) * 10 + (s.charCodeAt(6) - ZERO_CODE)
-  const day = (s.charCodeAt(8) - ZERO_CODE) * 10 + (s.charCodeAt(9) - ZERO_CODE)
+  const month = parseDigits(s, 5, 2)
+  const day = parseDigits(s, 8, 2)
 
-  if (month < 1 || month > 12 || day < 1) return false
+  if (year < 0 || month < 1 || month > 12 || day < 1) return false
 
   if (month !== 2) {
     return day <= monthLengths[month]!
@@ -776,15 +774,16 @@ function isIsoDateValid(s: string): boolean {
 
 /**
  * This is a performance optimized correct validation
- * for ISO datetimes formatted as "YYYY-MM-DDTHH:MM:SS" followed by
- * nothing, "Z" or "+hh:mm" or "-hh:mm".
+ * for ISO datetimes formatted as "YYYY-MM-DDTHH:MM:SS",
+ * optionally followed by fractional seconds of 1 to 9 digits (e.g. ".231" or ".231263"),
+ * followed by nothing, "Z" or "+hh:mm" or "-hh:mm".
  *
  * - Slightly more performant than using `localTime`.
  * - More performant than string splitting and `Number()` conversions
  * - Less performant than regex, but it does not allow invalid dates.
  */
 function isIsoDateTimeValid(s: string): boolean {
-  if (s.length < 19 || s.length > 25) return false
+  if (s.length < 19 || s.length > 35) return false
   if (s.charCodeAt(10) !== 84) return false // 'T'
 
   const datePart = s.slice(0, 10) // YYYY-MM-DD
@@ -793,7 +792,15 @@ function isIsoDateTimeValid(s: string): boolean {
   const timePart = s.slice(11, 19) // HH:MM:SS
   if (!isIsoTimeValid(timePart)) return false
 
-  const zonePart = s.slice(19) // nothing or Z or +/-hh:mm
+  let zoneStart = 19
+  if (s.charCodeAt(19) === DOT_CODE) {
+    zoneStart = 20
+    while (isDigitCode(s.charCodeAt(zoneStart))) zoneStart++
+    const fractionDigits = zoneStart - 20
+    if (fractionDigits < 1 || fractionDigits > 9) return false
+  }
+
+  const zonePart = s.slice(zoneStart) // nothing or Z or +/-hh:mm
   if (!isIsoTimezoneValid(zonePart)) return false
 
   return true
@@ -811,13 +818,13 @@ function isIsoTimeValid(s: string): boolean {
   if (s.length !== 8) return false
   if (s.charCodeAt(2) !== COLON_CODE || s.charCodeAt(5) !== COLON_CODE) return false
 
-  const hour = (s.charCodeAt(0) - ZERO_CODE) * 10 + (s.charCodeAt(1) - ZERO_CODE)
+  const hour = parseDigits(s, 0, 2)
   if (hour < 0 || hour > 23) return false
 
-  const minute = (s.charCodeAt(3) - ZERO_CODE) * 10 + (s.charCodeAt(4) - ZERO_CODE)
+  const minute = parseDigits(s, 3, 2)
   if (minute < 0 || minute > 59) return false
 
-  const second = (s.charCodeAt(6) - ZERO_CODE) * 10 + (s.charCodeAt(7) - ZERO_CODE)
+  const second = parseDigits(s, 6, 2)
   if (second < 0 || second > 59) return false
 
   return true
@@ -840,12 +847,12 @@ function isIsoTimezoneValid(s: string): boolean {
   const isWestern = s[0] === '-'
   const isEastern = s[0] === '+'
 
-  const hour = (s.charCodeAt(1) - ZERO_CODE) * 10 + (s.charCodeAt(2) - ZERO_CODE)
+  const hour = parseDigits(s, 1, 2)
   if (hour < 0) return false
   if (isWestern && hour > 12) return false
   if (isEastern && hour > 14) return false
 
-  const minute = (s.charCodeAt(4) - ZERO_CODE) * 10 + (s.charCodeAt(5) - ZERO_CODE)
+  const minute = parseDigits(s, 4, 2)
   if (minute < 0 || minute > 59) return false
 
   if (isEastern && hour === 14 && minute > 0) return false // max is +14:00
@@ -864,17 +871,27 @@ function isIsoMonthValid(s: string): boolean {
   if (s.charCodeAt(4) !== DASH_CODE) return false
 
   // fast parse numbers without substrings/Number()
-  const year =
-    (s.charCodeAt(0) - ZERO_CODE) * 1000 +
-    (s.charCodeAt(1) - ZERO_CODE) * 100 +
-    (s.charCodeAt(2) - ZERO_CODE) * 10 +
-    (s.charCodeAt(3) - ZERO_CODE)
+  const year = parseDigits(s, 0, 4)
 
-  const month = (s.charCodeAt(5) - ZERO_CODE) * 10 + (s.charCodeAt(6) - ZERO_CODE)
+  const month = parseDigits(s, 5, 2)
 
   return _isBetween(year, 1900, 2500, '[]') && _isBetween(month, 1, 12, '[]')
 }
 
+function parseDigits(s: string, start: number, count: number): number {
+  let value = 0
+  for (let i = start; i < start + count; i++) {
+    const code = s.charCodeAt(i)
+    if (!isDigitCode(code)) return -1
+    value = value * 10 + code - ZERO_CODE
+  }
+  return value
+}
+
+function isDigitCode(code: number): boolean {
+  return code >= ZERO_CODE && code <= NINE_CODE
+}
+
 function isPrimitive(data: any): boolean {
   return data !== null && typeof data === 'object'
 }