@carecard/validate 3.19.0 → 3.20.0

package/lib/validate.js

@@ -256,24 +256,59 @@ const isValidDomainName = domain => {
   return domainRegex.test(domain);
 };
 
+// Pattern: Pure Function - validates calendar and clock fields without Date.parse normalization.
+const hasValidTimestampFields = match => {
+  if (!match) {
+    return false;
+  }
+  const [, year, month, day, hour, minute, second] = match;
+  return (
+    isValidCalendarDate(Number(year), Number(month), Number(day)) &&
+    Number(hour) <= 23 &&
+    Number(minute) <= 59 &&
+    Number(second) <= 59
+  );
+};
+
+// Pattern: Pure Function - validates the numeric UTC offset carried by a timestamp.
+const hasValidTimestampOffset = match => {
+  const zone = match?.[7];
+  return zone === 'Z' || (Number(match?.[8]) <= 23 && Number(match?.[9]) <= 59);
+};
+
+// Pattern: Predicate - accepts only real ISO timestamps with an explicit time zone.
 const isValidTimestampzString = str => {
   if (typeof str !== 'string' || str.length === 0 || str.length > 64) {
     return false;
   }
   // ISO 8601 for UTC or with Offset: 2023-10-27T10:00:00Z or 2023-10-27T10:00:00+02:00
-  const timestampzRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$/;
-  return timestampzRegex.test(str) && !isNaN(Date.parse(str));
+  const timestampzRegex =
+    /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.\d+)?(Z|[+-](\d{2}):(\d{2}))$/;
+  const match = str.match(timestampzRegex);
+  return hasValidTimestampFields(match) && hasValidTimestampOffset(match);
 };
 
+// Pattern: Predicate - accepts only real ISO local timestamps without a time zone.
 const isValidTimestampString = str => {
   if (typeof str !== 'string' || str.length === 0 || str.length > 64) {
     return false;
   }
   // ISO 8601 without time zone: 2023-10-27T10:00:00 or 2023-10-27T10:00:00.123
-  const timestampRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?$/;
-  return timestampRegex.test(str) && !isNaN(Date.parse(str));
+  const timestampRegex = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.\d+)?$/;
+  return hasValidTimestampFields(str.match(timestampRegex));
 };
 
+// Pattern: Pure Function - validates Gregorian date fields without runtime date coercion.
+function isValidCalendarDate(year, month, day) {
+  if (year < 1 || month < 1 || month > 12 || day < 1) {
+    return false;
+  }
+  const leapYear = year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
+  const monthLengths = [31, leapYear ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+  return day <= monthLengths[month - 1];
+}
+
+// Pattern: Predicate - accepts only real Gregorian dates in YYYY-MM-DD form.
 const isValidDateString = str => {
   if (typeof str !== 'string' || str.length === 0 || str.length > 10) {
     return false;
@@ -288,11 +323,7 @@ const isValidDateString = str => {
   const year = Number(match[1]);
   const month = Number(match[2]);
   const day = Number(match[3]);
-  const date = new Date(Date.UTC(year, month - 1, day));
-
-  return (
-    date.getUTCFullYear() === year && date.getUTCMonth() === month - 1 && date.getUTCDate() === day
-  );
+  return isValidCalendarDate(year, month, day);
 };
 
 const isValidUrl = url => {

package/lib/validateNewUserRoleRequest.js

@@ -8,25 +8,16 @@ const { isUserRoleRequestRoleString } = require('./validate');
 const DEFAULT_USER_ROLE_REQUEST_ROLE = 'student';
 const REQUIRE_SCOPE_WHEN_ROLE_OR_SCOPE_PRESENT = 'whenRoleOrScopePresent';
 
+// Pattern: Boundary Normalizer - returns canonical persisted fields for supported caller shapes.
 function validateNewUserRoleRequestObject(roleRequest = {}, options = {}) {
   const normalized = normalizeNewUserRoleRequestObject(roleRequest);
-  const defaultRole = Object.prototype.hasOwnProperty.call(options, 'defaultRole')
-    ? options.defaultRole
-    : DEFAULT_USER_ROLE_REQUEST_ROLE;
-  const requireScope = Object.prototype.hasOwnProperty.call(options, 'requireScope')
-    ? options.requireScope
-    : true;
+  const { defaultRole, requireScope } = readNewUserRoleRequestOptions(options);
 
   if (normalized.role_name === undefined && defaultRole !== undefined) {
     normalized.role_name = defaultRole;
   }
 
-  if (normalized.role_name !== undefined && !isUserRoleRequestRoleString(normalized.role_name)) {
-    throwBadInputError({
-      userMessage: 'Invalid property: role.role',
-      details: { role: 'Role requests are limited to student, intern, or volunteer' },
-    });
-  }
+  normalizeNewUserRoleRequestRole(normalized);
 
   if (shouldRequireScope(normalized, requireScope)) {
     requireNewUserRoleRequestScope(normalized);
@@ -35,6 +26,33 @@ function validateNewUserRoleRequestObject(roleRequest = {}, options = {}) {
   return normalized;
 }
 
+// Pattern: Options Object - supplies stable defaults for untyped JavaScript callers.
+function readNewUserRoleRequestOptions(options) {
+  const validatedOptions = options && typeof options === 'object' ? options : {};
+  return {
+    defaultRole: Object.hasOwn(validatedOptions, 'defaultRole')
+      ? validatedOptions.defaultRole
+      : DEFAULT_USER_ROLE_REQUEST_ROLE,
+    requireScope: Object.hasOwn(validatedOptions, 'requireScope')
+      ? validatedOptions.requireScope
+      : true,
+  };
+}
+
+// Pattern: Canonicalization - validates and normalizes the persisted role enum in one boundary.
+function normalizeNewUserRoleRequestRole(roleRequest) {
+  if (roleRequest.role_name === undefined) {
+    return;
+  }
+  if (!isUserRoleRequestRoleString(roleRequest.role_name)) {
+    throwBadInputError({
+      userMessage: 'Invalid property: role.role',
+      details: { role: 'Role requests are limited to student, intern, or volunteer' },
+    });
+  }
+  roleRequest.role_name = roleRequest.role_name.trim().toLowerCase();
+}
+
 function normalizeNewUserRoleRequestObject(roleRequest) {
   const normalized = { ...roleRequest };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carecard/validate",
-  "version": "3.19.0",
+  "version": "3.20.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/CareCard-ca/pkg-validate.git"
@@ -44,7 +44,7 @@
     "typescript": "6.0.3"
   },
   "dependencies": {
-    "@carecard/common-util": "3.18.0"
+    "@carecard/common-util": "3.20.0"
   },
   "nyc": {
     "all": true,