Pad 'date-time' inputs, if needed, to mach ISO format.

Author: dschnelldavis

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "angular2-json-schema-form",
-  "version": "0.6.0-alpha.2",
+  "version": "0.6.0-alpha.3",
   "author": {
     "name": "David Schnell-Davis",
     "email": "[email protected]"
@@ -85,7 +85,7 @@
     "@angular/platform-browser-dynamic": "^5.0.1",
     "@angular/router": "^5.0.1",
     "@types/ace": "^0.0.35",
-    "@types/jasmine": "^2.8.0",
+    "@types/jasmine": "^2.8.2",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "^8.0.52",
     "brace": "^0.10.0",

package.json

@@ -120,9 +120,9 @@ export class JsonSchemaFormService {
             case 'date':
               return 'Must be a date, like "2000-12-31"'
             case 'time':
-              return 'Must be a time, like "1:59" or "01:59.265"'
+              return 'Must be a time, like "16:20" or "03:14:15.9265"'
             case 'date-time':
-              return 'Must be a date-time, like "2000-12-31" or "2000-03-14T01:59.265"'
+              return 'Must be a date-time, like "2000-03-14T01:59" or "2000-03-14T01:59:26.535Z"'
             case 'email':
               return 'Must be an email address, like "[email protected]"'
             case 'hostname':
@@ -466,7 +466,9 @@ export class JsonSchemaFormService {
     return Object.keys(errors)
       // Hide 'required' error, unless it is the only one
       .filter(errorKey => errorKey !== 'required' || Object.keys(errors).length === 1)
-      .map(errorKey => typeof errorMessages[errorKey] === 'function' ? // If custom error message is a function, return result
+      .map(errorKey =>
+        // If custom error message is a function, return function result
+        typeof errorMessages[errorKey] === 'function' ?
           errorMessages[errorKey](errors[errorKey]) :
         // If custom error message is a string, replace placeholders and return
         typeof errorMessages[errorKey] === 'string' ?

src/lib/src/json-schema-form.service.ts

@@ -83,6 +83,10 @@ export function buildFormGroupTemplate(
   if (!nodeOptions.has('schemaType')) {
     nodeOptions.set('schemaPointer', schemaPointer);
     nodeOptions.set('schemaType', schema.type);
+    if (schema.format) {
+      nodeOptions.set('schemaFormat', schema.format);
+      if (!schema.type) { nodeOptions.set('schemaType', 'string'); }
+    }
     if (controlType) {
       nodeOptions.set('templatePointer', templatePointer);
       nodeOptions.set('templateType', controlType);
@@ -406,8 +410,7 @@ export function formatFormData(
           inArray(schemaType, ['string', 'integer', 'number', 'boolean'])
         ) {
           const newValue = (fixErrors || (value === null && returnEmptyFields)) ?
-            toSchemaType(value, schemaType) :
-            toJavaScriptType(value, schemaType);
+            toSchemaType(value, schemaType) : toJavaScriptType(value, schemaType);
           if (isDefined(newValue) || returnEmptyFields) {
             JsonPointer.set(formattedData, dataPointer, newValue);
           }
@@ -425,6 +428,19 @@ export function formatFormData(
             }
           });
         }
+        // Finish incomplete 'date-time' entries
+        if (dataMap.get(genericPointer).get('schemaFormat') === 'date-time') {
+          // "2000-03-14T01:59:26.535" -> "2000-03-14T01:59:26.535Z" (add "Z")
+          if (/^\d\d\d\d-[0-1]\d-[0-3]\d[t\s][0-2]\d:[0-5]\d:[0-5]\d(?:\.\d+)?$/i.test(value)) {
+            JsonPointer.set(formattedData, dataPointer, `${value}Z`);
+          // "2000-03-14T01:59" -> "2000-03-14T01:59:00Z" (add ":00Z")
+          } else if (/^\d\d\d\d-[0-1]\d-[0-3]\d[t\s][0-2]\d:[0-5]\d$/i.test(value)) {
+            JsonPointer.set(formattedData, dataPointer, `${value}:00Z`);
+          // "2000-03-14" -> "2000-03-14T00:00:00Z" (add "T00:00:00Z")
+          } else if (fixErrors && /^\d\d\d\d-[0-1]\d-[0-3]\d$/i.test(value)) {
+            JsonPointer.set(formattedData, dataPointer, `${value}:00:00:00Z`);
+          }
+        }
       } else if (typeof value !== 'object' || isDate(value) ||
         (value === null && returnEmptyFields)
       ) {

src/lib/src/shared/form-group.functions.ts

@@ -7,7 +7,7 @@ export const jsonSchemaFormatTests = {
 
   'time': /^[0-2]\d:[0-5]\d:[0-5]\d(?:\.\d+)?(?:z|[+-]\d\d:\d\d)?$/i,
 
-  'date-time': /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s][0-2]\d:[0-5]\d:[0-5]\d(?:\.\d+)?(?:z|[+-]\d\d:\d\d)$/i,
+  'date-time': /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s][0-2]\d:[0-5]\d(?::[0-5]\d)?(?:\.\d+)?(?:z|[+-]\d\d:\d\d)?$/i,
 
   // email (sources from jsen validator):
   // http://stackoverflow.com/questions/201323/using-a-regular-expression-to-validate-an-email-address#answer-8829363

src/lib/src/shared/format-regex.constants.ts

@@ -7,6 +7,7 @@
     "inlineSources": true,
     "declaration": true,
     "experimentalDecorators": true,
+    "removeComments": true,
     "suppressImplicitAnyIndexErrors": true,
     "skipLibCheck": true,
     "stripInternal": true,