schema-markdown 1.3.2 → 1.3.3

package/lib/schema.js

@@ -159,8 +159,17 @@ export function validateType(types, typeName, value, memberFqn = null) {
 }
 
 
+// Helper to create a local date (midnight) - unlike new Date, years 0 through 99 aren't 1900 through 1999
+function newLocalDate(year, month, day) {
+    const date = new Date(0);
+    date.setFullYear(year, month - 1, day);
+    date.setHours(0, 0, 0, 0);
+    return date;
+}
+
+
 // Regular expressions used by validateTypeHelper
-const rDate = /^(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})$/;
+const rDate = /^(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})(?:T00:00(?::00(?:\.0+)?)?(?:Z|(?<tzhour>[+-]\d{2}):(?<tzminute>\d{2})))?$/;
 const rDatetime = /^(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})T\d{2}:\d{2}(?::\d{2}(?:\.\d+)?)?(?:Z|[+-]\d{2}:\d{2})$/;
 const rUuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 
@@ -221,26 +230,27 @@ function validateTypeHelper(types, type, value, memberFqn) {
 
         // date?
         } else if (builtin === 'date') {
-            // Convert string?
+            // Convert string? A date, or a datetime at midnight in its own offset - the date is the string's date.
             if (typeof value === 'string') {
-                // Date-only?
                 const mDate = value.match(rDate);
                 if (mDate !== null) {
                     const year = Number.parseInt(mDate.groups.year, 10);
                     const month = Number.parseInt(mDate.groups.month, 10);
                     const day = Number.parseInt(mDate.groups.day, 10);
-                    valueNew = new Date(year, month - 1, day);
-                    // new Date rolls an out-of-range month/day over (e.g. Feb 30 -> Mar 1); reject that
-                    if (valueNew.getMonth() !== month - 1) {
+                    const {tzhour = null, tzminute = null} = mDate.groups;
+                    valueNew = newLocalDate(year, month, day);
+                    // A date rolls an out-of-range month/day over (e.g. Feb 30 -> Mar 1); reject that, and an invalid offset
+                    if (valueNew.getMonth() !== month - 1 ||
+                        (tzhour !== null && (Math.abs(Number.parseInt(tzhour, 10)) > 23 || Number.parseInt(tzminute, 10) > 59))) {
                         throwMemberError(type, value, memberFqn);
                     }
                 } else {
                     throwMemberError(type, value, memberFqn);
                 }
 
-            // Not a date, or a date with a time-of-day?
-            } else if (!(value instanceof Date) ||
-                value.getHours() + value.getMinutes() + value.getSeconds() + value.getMilliseconds() !== 0) {
+            // Not a date - a datetime at the start of its day? A day's start is its local midnight, or its first time when a
+            // timezone change skips midnight.
+            } else if (!(value instanceof Date) || new Date(value).setHours(0, 0, 0, 0) !== value.getTime()) {
                 throwMemberError(type, value, memberFqn);
             }
 
@@ -254,8 +264,8 @@ function validateTypeHelper(types, type, value, memberFqn) {
                     const year = Number.parseInt(mDatetime.groups.year, 10);
                     const month = Number.parseInt(mDatetime.groups.month, 10);
                     const day = Number.parseInt(mDatetime.groups.day, 10);
-                    // new Date rolls an out-of-range day over (e.g. Feb 30 -> Mar 1); reject that
-                    if (Number.isNaN(valueNew.getTime()) || new Date(year, month - 1, day).getMonth() !== month - 1) {
+                    // A date rolls an out-of-range day over (e.g. Feb 30 -> Mar 1); reject that
+                    if (Number.isNaN(valueNew.getTime()) || newLocalDate(year, month, day).getMonth() !== month - 1) {
                         throwMemberError(type, value, memberFqn);
                     }
                 } else {

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "schema-markdown",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "description": "A schema definition and validation library",
     "keywords": [
         "schema",
@@ -25,9 +25,9 @@
     },
     "devDependencies": {
         "@eslint/js": "~10.0",
-        "c8": "~11.0",
-        "eslint": "~10.6",
-        "globals": "~17.7",
+        "c8": "~12.0",
+        "eslint": "~10.12",
+        "globals": "~17.13",
         "jsdoc": "~4.0"
     }
 }