diff --git a/base/comment-injection-typescript/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.ts b/head/comment-injection-typescript/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.ts index 934c40e..972b57e 100644 --- a/base/comment-injection-typescript/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.ts +++ b/head/comment-injection-typescript/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.ts @@ -107,9 +107,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/comment-injection-typescript/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.ts b/head/comment-injection-typescript/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.ts index 2a64dc5..88de0d7 100644 --- a/base/comment-injection-typescript/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.ts +++ b/head/comment-injection-typescript/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.ts @@ -113,9 +113,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/comment-injection-typescript/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.ts b/head/comment-injection-typescript/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.ts index 504b925..bad4ef3 100644 --- a/base/comment-injection-typescript/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.ts +++ b/head/comment-injection-typescript/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.ts @@ -105,9 +105,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/comment-injection-typescript/test/inputs/schema/comment-injection.schema/default/TopLevel.ts b/head/comment-injection-typescript/test/inputs/schema/comment-injection.schema/default/TopLevel.ts index 7b4e86e..e04a37a 100644 --- a/base/comment-injection-typescript/test/inputs/schema/comment-injection.schema/default/TopLevel.ts +++ b/head/comment-injection-typescript/test/inputs/schema/comment-injection.schema/default/TopLevel.ts @@ -133,9 +133,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/00c36.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/00c36.json/default/TopLevel.js index 162dbc2..35b6b5a 100644 --- a/base/flow/test/inputs/json/misc/00c36.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/00c36.json/default/TopLevel.js @@ -121,9 +121,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/00ec5.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/00ec5.json/default/TopLevel.js index 4d45847..6dad09b 100644 --- a/base/flow/test/inputs/json/misc/00ec5.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/00ec5.json/default/TopLevel.js @@ -160,9 +160,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/010b1.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/010b1.json/default/TopLevel.js index 89794b9..3f15a1e 100644 --- a/base/flow/test/inputs/json/misc/010b1.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/010b1.json/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/016af.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/016af.json/default/TopLevel.js index 6cc839f..c7d8822 100644 --- a/base/flow/test/inputs/json/misc/016af.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/016af.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/033b1.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/033b1.json/default/TopLevel.js index 3bb973a..2243e9f 100644 --- a/base/flow/test/inputs/json/misc/033b1.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/033b1.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/050b0.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/050b0.json/default/TopLevel.js index 6c1c8a4..bdf5862 100644 --- a/base/flow/test/inputs/json/misc/050b0.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/050b0.json/default/TopLevel.js @@ -149,9 +149,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/06bee.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/06bee.json/default/TopLevel.js index e124161..fb8212a 100644 --- a/base/flow/test/inputs/json/misc/06bee.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/06bee.json/default/TopLevel.js @@ -137,9 +137,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/07540.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/07540.json/default/TopLevel.js index d9826f0..6dfbefd 100644 --- a/base/flow/test/inputs/json/misc/07540.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/07540.json/default/TopLevel.js @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/0779f.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/0779f.json/default/TopLevel.js index c7ac2de..22b3c6e 100644 --- a/base/flow/test/inputs/json/misc/0779f.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/0779f.json/default/TopLevel.js @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/07c75.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/07c75.json/default/TopLevel.js index a298561..ceb0b45 100644 --- a/base/flow/test/inputs/json/misc/07c75.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/07c75.json/default/TopLevel.js @@ -118,9 +118,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/09f54.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/09f54.json/default/TopLevel.js index 1eccbad..6dbe7f0 100644 --- a/base/flow/test/inputs/json/misc/09f54.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/09f54.json/default/TopLevel.js @@ -106,9 +106,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/0a358.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/0a358.json/default/TopLevel.js index fdf8c01..4f2e340 100644 --- a/base/flow/test/inputs/json/misc/0a358.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/0a358.json/default/TopLevel.js @@ -111,9 +111,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/0a91a.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/0a91a.json/default/TopLevel.js index 82bc4f2..69b3fef 100644 --- a/base/flow/test/inputs/json/misc/0a91a.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/0a91a.json/default/TopLevel.js @@ -313,9 +313,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/0b91a.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/0b91a.json/default/TopLevel.js index 209fdf8..5c69060 100644 --- a/base/flow/test/inputs/json/misc/0b91a.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/0b91a.json/default/TopLevel.js @@ -133,9 +133,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/0cffa.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/0cffa.json/default/TopLevel.js index 9b7923c..b807115 100644 --- a/base/flow/test/inputs/json/misc/0cffa.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/0cffa.json/default/TopLevel.js @@ -208,9 +208,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/0e0c2.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/0e0c2.json/default/TopLevel.js index 407cad3..356c50b 100644 --- a/base/flow/test/inputs/json/misc/0e0c2.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/0e0c2.json/default/TopLevel.js @@ -170,9 +170,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/0fecf.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/0fecf.json/default/TopLevel.js index 3ee24ee..f5e7b0f 100644 --- a/base/flow/test/inputs/json/misc/0fecf.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/0fecf.json/default/TopLevel.js @@ -93,9 +93,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/10be4.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/10be4.json/default/TopLevel.js index 63eecca..5efa86b 100644 --- a/base/flow/test/inputs/json/misc/10be4.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/10be4.json/default/TopLevel.js @@ -160,9 +160,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/112b5.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/112b5.json/default/TopLevel.js index f9cab5b..319b78a 100644 --- a/base/flow/test/inputs/json/misc/112b5.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/112b5.json/default/TopLevel.js @@ -106,9 +106,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/127a1.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/127a1.json/default/TopLevel.js index 3e28e99..8066e8c 100644 --- a/base/flow/test/inputs/json/misc/127a1.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/127a1.json/default/TopLevel.js @@ -207,9 +207,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/13d8d.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/13d8d.json/default/TopLevel.js index 48593f5..f1e1008 100644 --- a/base/flow/test/inputs/json/misc/13d8d.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/13d8d.json/default/TopLevel.js @@ -119,9 +119,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/14d38.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/14d38.json/default/TopLevel.js index 713e56b..1cdaeed 100644 --- a/base/flow/test/inputs/json/misc/14d38.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/14d38.json/default/TopLevel.js @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/167d6.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/167d6.json/default/TopLevel.js index 3bb973a..2243e9f 100644 --- a/base/flow/test/inputs/json/misc/167d6.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/167d6.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/16bc5.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/16bc5.json/default/TopLevel.js index 6dba12d..c169b15 100644 --- a/base/flow/test/inputs/json/misc/16bc5.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/16bc5.json/default/TopLevel.js @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/176f1.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/176f1.json/default/TopLevel.js index db78db6..2dfc4d3 100644 --- a/base/flow/test/inputs/json/misc/176f1.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/176f1.json/default/TopLevel.js @@ -118,9 +118,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/1a7f5.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/1a7f5.json/default/TopLevel.js index 89794b9..3f15a1e 100644 --- a/base/flow/test/inputs/json/misc/1a7f5.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/1a7f5.json/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/1b28c.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/1b28c.json/default/TopLevel.js index 6cc839f..c7d8822 100644 --- a/base/flow/test/inputs/json/misc/1b28c.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/1b28c.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/1b409.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/1b409.json/default/TopLevel.js index 56b0139..6c35398 100644 --- a/base/flow/test/inputs/json/misc/1b409.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/1b409.json/default/TopLevel.js @@ -184,9 +184,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/2465e.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/2465e.json/default/TopLevel.js index e283f26..637025f 100644 --- a/base/flow/test/inputs/json/misc/2465e.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/2465e.json/default/TopLevel.js @@ -166,9 +166,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/24f52.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/24f52.json/default/TopLevel.js index c7ac2de..22b3c6e 100644 --- a/base/flow/test/inputs/json/misc/24f52.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/24f52.json/default/TopLevel.js @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/262f0.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/262f0.json/default/TopLevel.js index 1dc4430..ff97a75 100644 --- a/base/flow/test/inputs/json/misc/262f0.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/262f0.json/default/TopLevel.js @@ -196,9 +196,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/26b49.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/26b49.json/default/TopLevel.js index c9ba533..c20dcf5 100644 --- a/base/flow/test/inputs/json/misc/26b49.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/26b49.json/default/TopLevel.js @@ -205,9 +205,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/26c9c.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/26c9c.json/default/TopLevel.js index d4b28ed..037c2fc 100644 --- a/base/flow/test/inputs/json/misc/26c9c.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/26c9c.json/default/TopLevel.js @@ -280,9 +280,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/27332.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/27332.json/default/TopLevel.js index 934296a..d3a5ef2 100644 --- a/base/flow/test/inputs/json/misc/27332.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/27332.json/default/TopLevel.js @@ -246,9 +246,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/29f47.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/29f47.json/default/TopLevel.js index 6c6029e..46bdeca 100644 --- a/base/flow/test/inputs/json/misc/29f47.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/29f47.json/default/TopLevel.js @@ -232,9 +232,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/2d4e2.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/2d4e2.json/default/TopLevel.js index 50f7c40..4b0582e 100644 --- a/base/flow/test/inputs/json/misc/2d4e2.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/2d4e2.json/default/TopLevel.js @@ -200,9 +200,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/2df80.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/2df80.json/default/TopLevel.js index e8a7f8a..94f13d4 100644 --- a/base/flow/test/inputs/json/misc/2df80.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/2df80.json/default/TopLevel.js @@ -166,9 +166,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/31189.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/31189.json/default/TopLevel.js index 4fb8245..50c5090 100644 --- a/base/flow/test/inputs/json/misc/31189.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/31189.json/default/TopLevel.js @@ -121,9 +121,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/32431.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/32431.json/default/TopLevel.js index 9b836ab..f3b8aac 100644 --- a/base/flow/test/inputs/json/misc/32431.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/32431.json/default/TopLevel.js @@ -164,9 +164,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/32d5c.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/32d5c.json/default/TopLevel.js index 8f57115..082b3d8 100644 --- a/base/flow/test/inputs/json/misc/32d5c.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/32d5c.json/default/TopLevel.js @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/337ed.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/337ed.json/default/TopLevel.js index 400a636..a0e7cb6 100644 --- a/base/flow/test/inputs/json/misc/337ed.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/337ed.json/default/TopLevel.js @@ -161,9 +161,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/33d2e.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/33d2e.json/default/TopLevel.js index 954c924..34c1b94 100644 --- a/base/flow/test/inputs/json/misc/33d2e.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/33d2e.json/default/TopLevel.js @@ -146,9 +146,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/34702.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/34702.json/default/TopLevel.js index f14ce92..3864fa7 100644 --- a/base/flow/test/inputs/json/misc/34702.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/34702.json/default/TopLevel.js @@ -181,9 +181,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/3536b.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/3536b.json/default/TopLevel.js index 4c5794e..557e020 100644 --- a/base/flow/test/inputs/json/misc/3536b.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/3536b.json/default/TopLevel.js @@ -128,9 +128,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/3659d.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/3659d.json/default/TopLevel.js index 6cc839f..c7d8822 100644 --- a/base/flow/test/inputs/json/misc/3659d.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/3659d.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/36d5d.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/36d5d.json/default/TopLevel.js index c7ac2de..22b3c6e 100644 --- a/base/flow/test/inputs/json/misc/36d5d.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/36d5d.json/default/TopLevel.js @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/3a6b3.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/3a6b3.json/default/TopLevel.js index c7ac2de..22b3c6e 100644 --- a/base/flow/test/inputs/json/misc/3a6b3.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/3a6b3.json/default/TopLevel.js @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/3e9a3.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/3e9a3.json/default/TopLevel.js index db78db6..2dfc4d3 100644 --- a/base/flow/test/inputs/json/misc/3e9a3.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/3e9a3.json/default/TopLevel.js @@ -118,9 +118,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/3f1ce.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/3f1ce.json/default/TopLevel.js index 870cf6a..1175aeb 100644 --- a/base/flow/test/inputs/json/misc/3f1ce.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/3f1ce.json/default/TopLevel.js @@ -194,9 +194,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/421d4.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/421d4.json/default/TopLevel.js index 5d852e7..c5a7f86 100644 --- a/base/flow/test/inputs/json/misc/421d4.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/421d4.json/default/TopLevel.js @@ -207,9 +207,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/437e7.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/437e7.json/default/TopLevel.js index 46aad64..c1ad6db 100644 --- a/base/flow/test/inputs/json/misc/437e7.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/437e7.json/default/TopLevel.js @@ -202,9 +202,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/43970.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/43970.json/default/TopLevel.js index 96da4f2..0088f7f 100644 --- a/base/flow/test/inputs/json/misc/43970.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/43970.json/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/43eaf.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/43eaf.json/default/TopLevel.js index 3bb973a..2243e9f 100644 --- a/base/flow/test/inputs/json/misc/43eaf.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/43eaf.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/458db.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/458db.json/default/TopLevel.js index 602758a..718ce8d 100644 --- a/base/flow/test/inputs/json/misc/458db.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/458db.json/default/TopLevel.js @@ -135,9 +135,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/4961a.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/4961a.json/default/TopLevel.js index 6cc839f..c7d8822 100644 --- a/base/flow/test/inputs/json/misc/4961a.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/4961a.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/4a0d7.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/4a0d7.json/default/TopLevel.js index 6cc839f..c7d8822 100644 --- a/base/flow/test/inputs/json/misc/4a0d7.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/4a0d7.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/4a455.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/4a455.json/default/TopLevel.js index af5a140..9dad281 100644 --- a/base/flow/test/inputs/json/misc/4a455.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/4a455.json/default/TopLevel.js @@ -136,9 +136,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/4c547.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/4c547.json/default/TopLevel.js index 6dba12d..c169b15 100644 --- a/base/flow/test/inputs/json/misc/4c547.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/4c547.json/default/TopLevel.js @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/4d6fb.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/4d6fb.json/default/TopLevel.js index e9dc36d..f93b014 100644 --- a/base/flow/test/inputs/json/misc/4d6fb.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/4d6fb.json/default/TopLevel.js @@ -241,9 +241,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/4e336.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/4e336.json/default/TopLevel.js index 6cc839f..c7d8822 100644 --- a/base/flow/test/inputs/json/misc/4e336.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/4e336.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/54147.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/54147.json/default/TopLevel.js index ebba231..031cb6a 100644 --- a/base/flow/test/inputs/json/misc/54147.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/54147.json/default/TopLevel.js @@ -109,9 +109,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/54d32.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/54d32.json/default/TopLevel.js index d884bb6..c0f0bc2 100644 --- a/base/flow/test/inputs/json/misc/54d32.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/54d32.json/default/TopLevel.js @@ -115,9 +115,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/570ec.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/570ec.json/default/TopLevel.js index df6a35e..dc71852 100644 --- a/base/flow/test/inputs/json/misc/570ec.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/570ec.json/default/TopLevel.js @@ -128,9 +128,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/5dd0d.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/5dd0d.json/default/TopLevel.js index c7ac2de..22b3c6e 100644 --- a/base/flow/test/inputs/json/misc/5dd0d.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/5dd0d.json/default/TopLevel.js @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/5eae5.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/5eae5.json/default/TopLevel.js index 2d34873..ced7b35 100644 --- a/base/flow/test/inputs/json/misc/5eae5.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/5eae5.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/5eb20.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/5eb20.json/default/TopLevel.js index c7ac2de..22b3c6e 100644 --- a/base/flow/test/inputs/json/misc/5eb20.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/5eb20.json/default/TopLevel.js @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/5f3a1.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/5f3a1.json/default/TopLevel.js index 3bb973a..2243e9f 100644 --- a/base/flow/test/inputs/json/misc/5f3a1.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/5f3a1.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/5f7fe.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/5f7fe.json/default/TopLevel.js index e0c97d0..64f41ba 100644 --- a/base/flow/test/inputs/json/misc/5f7fe.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/5f7fe.json/default/TopLevel.js @@ -281,9 +281,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/617e8.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/617e8.json/default/TopLevel.js index 772ffb1..555b439 100644 --- a/base/flow/test/inputs/json/misc/617e8.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/617e8.json/default/TopLevel.js @@ -280,9 +280,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/61b66.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/61b66.json/default/TopLevel.js index c7ac2de..22b3c6e 100644 --- a/base/flow/test/inputs/json/misc/61b66.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/61b66.json/default/TopLevel.js @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/6260a.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/6260a.json/default/TopLevel.js index 3bb973a..2243e9f 100644 --- a/base/flow/test/inputs/json/misc/6260a.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/6260a.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/65dec.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/65dec.json/default/TopLevel.js index 5439a46..c76be0d 100644 --- a/base/flow/test/inputs/json/misc/65dec.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/65dec.json/default/TopLevel.js @@ -180,9 +180,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/66121.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/66121.json/default/TopLevel.js index e1199ed..20a9b03 100644 --- a/base/flow/test/inputs/json/misc/66121.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/66121.json/default/TopLevel.js @@ -137,9 +137,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/6617c.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/6617c.json/default/TopLevel.js index 2c7f4a6..dc7048c 100644 --- a/base/flow/test/inputs/json/misc/6617c.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/6617c.json/default/TopLevel.js @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/67c03.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/67c03.json/default/TopLevel.js index d156dcd..f983f6e 100644 --- a/base/flow/test/inputs/json/misc/67c03.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/67c03.json/default/TopLevel.js @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/68c30.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/68c30.json/default/TopLevel.js index 46cf69f..d43d767 100644 --- a/base/flow/test/inputs/json/misc/68c30.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/68c30.json/default/TopLevel.js @@ -124,9 +124,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/6c155.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/6c155.json/default/TopLevel.js index c7e4986..63e89b7 100644 --- a/base/flow/test/inputs/json/misc/6c155.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/6c155.json/default/TopLevel.js @@ -146,9 +146,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/6de06.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/6de06.json/default/TopLevel.js index 7b5ef08..f69c0d3 100644 --- a/base/flow/test/inputs/json/misc/6de06.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/6de06.json/default/TopLevel.js @@ -241,9 +241,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/6dec6.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/6dec6.json/default/TopLevel.js index 3c0767b..7496d0f 100644 --- a/base/flow/test/inputs/json/misc/6dec6.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/6dec6.json/default/TopLevel.js @@ -196,9 +196,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/6eb00.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/6eb00.json/default/TopLevel.js index 7d2b1cf..04ebf3c 100644 --- a/base/flow/test/inputs/json/misc/6eb00.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/6eb00.json/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/70c77.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/70c77.json/default/TopLevel.js index 3bb973a..2243e9f 100644 --- a/base/flow/test/inputs/json/misc/70c77.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/70c77.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/734ad.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/734ad.json/default/TopLevel.js index 1966444..2ad4aac 100644 --- a/base/flow/test/inputs/json/misc/734ad.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/734ad.json/default/TopLevel.js @@ -167,9 +167,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/75912.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/75912.json/default/TopLevel.js index 3bb973a..2243e9f 100644 --- a/base/flow/test/inputs/json/misc/75912.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/75912.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/7681c.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/7681c.json/default/TopLevel.js index 5ffad09..30ac177 100644 --- a/base/flow/test/inputs/json/misc/7681c.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/7681c.json/default/TopLevel.js @@ -209,9 +209,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/76ae1.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/76ae1.json/default/TopLevel.js index f4001ff..51b388f 100644 --- a/base/flow/test/inputs/json/misc/76ae1.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/76ae1.json/default/TopLevel.js @@ -277,9 +277,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/77392.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/77392.json/default/TopLevel.js index ec26653..d55fdab 100644 --- a/base/flow/test/inputs/json/misc/77392.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/77392.json/default/TopLevel.js @@ -120,9 +120,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/7d397.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/7d397.json/default/TopLevel.js index daed49b..1db36f5 100644 --- a/base/flow/test/inputs/json/misc/7d397.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/7d397.json/default/TopLevel.js @@ -168,9 +168,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/7d722.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/7d722.json/default/TopLevel.js index c7ac2de..22b3c6e 100644 --- a/base/flow/test/inputs/json/misc/7d722.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/7d722.json/default/TopLevel.js @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/7df41.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/7df41.json/default/TopLevel.js index 46994ca..8d0b5aa 100644 --- a/base/flow/test/inputs/json/misc/7df41.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/7df41.json/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/7dfa6.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/7dfa6.json/default/TopLevel.js index 6cc839f..c7d8822 100644 --- a/base/flow/test/inputs/json/misc/7dfa6.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/7dfa6.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/7eb30.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/7eb30.json/default/TopLevel.js index 5932680..7a7c1f7 100644 --- a/base/flow/test/inputs/json/misc/7eb30.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/7eb30.json/default/TopLevel.js @@ -137,9 +137,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/7f568.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/7f568.json/default/TopLevel.js index 6f21818..e7a1f7f 100644 --- a/base/flow/test/inputs/json/misc/7f568.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/7f568.json/default/TopLevel.js @@ -124,9 +124,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/7fbfb.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/7fbfb.json/default/TopLevel.js index d84d9a6..76f87ee 100644 --- a/base/flow/test/inputs/json/misc/7fbfb.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/7fbfb.json/default/TopLevel.js @@ -121,9 +121,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/80aff.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/80aff.json/default/TopLevel.js index f58d28c..6c82a41 100644 --- a/base/flow/test/inputs/json/misc/80aff.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/80aff.json/default/TopLevel.js @@ -112,9 +112,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/82509.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/82509.json/default/TopLevel.js index 12cc75e..ba5042a 100644 --- a/base/flow/test/inputs/json/misc/82509.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/82509.json/default/TopLevel.js @@ -93,9 +93,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/8592b.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/8592b.json/default/TopLevel.js index 6ba8b46..2ff2fbd 100644 --- a/base/flow/test/inputs/json/misc/8592b.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/8592b.json/default/TopLevel.js @@ -216,9 +216,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/88130.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/88130.json/default/TopLevel.js index 6dba12d..c169b15 100644 --- a/base/flow/test/inputs/json/misc/88130.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/88130.json/default/TopLevel.js @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/8a62c.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/8a62c.json/default/TopLevel.js index 6cc839f..c7d8822 100644 --- a/base/flow/test/inputs/json/misc/8a62c.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/8a62c.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/908db.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/908db.json/default/TopLevel.js index 0a7d4d3..e19fb3d 100644 --- a/base/flow/test/inputs/json/misc/908db.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/908db.json/default/TopLevel.js @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/9617f.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/9617f.json/default/TopLevel.js index 3bb973a..2243e9f 100644 --- a/base/flow/test/inputs/json/misc/9617f.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/9617f.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/96f7c.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/96f7c.json/default/TopLevel.js index ef14be8..5e1eaaf 100644 --- a/base/flow/test/inputs/json/misc/96f7c.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/96f7c.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/9847b.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/9847b.json/default/TopLevel.js index 6533855..2e9516c 100644 --- a/base/flow/test/inputs/json/misc/9847b.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/9847b.json/default/TopLevel.js @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/9929c.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/9929c.json/default/TopLevel.js index 6dba12d..c169b15 100644 --- a/base/flow/test/inputs/json/misc/9929c.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/9929c.json/default/TopLevel.js @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/996bd.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/996bd.json/default/TopLevel.js index f298931..2477b3b 100644 --- a/base/flow/test/inputs/json/misc/996bd.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/996bd.json/default/TopLevel.js @@ -137,9 +137,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/9a503.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/9a503.json/default/TopLevel.js index 7a5b1c5..4206dc0 100644 --- a/base/flow/test/inputs/json/misc/9a503.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/9a503.json/default/TopLevel.js @@ -123,9 +123,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/9ac3b.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/9ac3b.json/default/TopLevel.js index be0be36..fd7757b 100644 --- a/base/flow/test/inputs/json/misc/9ac3b.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/9ac3b.json/default/TopLevel.js @@ -124,9 +124,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/9eed5.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/9eed5.json/default/TopLevel.js index 83fa291..4412c6c 100644 --- a/base/flow/test/inputs/json/misc/9eed5.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/9eed5.json/default/TopLevel.js @@ -122,9 +122,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/a0496.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/a0496.json/default/TopLevel.js index 5725050..17f2f85 100644 --- a/base/flow/test/inputs/json/misc/a0496.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/a0496.json/default/TopLevel.js @@ -114,9 +114,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/a1eca.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/a1eca.json/default/TopLevel.js index 6dba12d..c169b15 100644 --- a/base/flow/test/inputs/json/misc/a1eca.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/a1eca.json/default/TopLevel.js @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/a3d8c.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/a3d8c.json/default/TopLevel.js index 43e579f..cfa1b7e 100644 --- a/base/flow/test/inputs/json/misc/a3d8c.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/a3d8c.json/default/TopLevel.js @@ -209,9 +209,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/a45b0.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/a45b0.json/default/TopLevel.js index 89794b9..3f15a1e 100644 --- a/base/flow/test/inputs/json/misc/a45b0.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/a45b0.json/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/a71df.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/a71df.json/default/TopLevel.js index c7ac2de..22b3c6e 100644 --- a/base/flow/test/inputs/json/misc/a71df.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/a71df.json/default/TopLevel.js @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/a9691.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/a9691.json/default/TopLevel.js index 3bb973a..2243e9f 100644 --- a/base/flow/test/inputs/json/misc/a9691.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/a9691.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/ab0d1.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/ab0d1.json/default/TopLevel.js index 89794b9..3f15a1e 100644 --- a/base/flow/test/inputs/json/misc/ab0d1.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/ab0d1.json/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/abb4b.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/abb4b.json/default/TopLevel.js index 6cc839f..c7d8822 100644 --- a/base/flow/test/inputs/json/misc/abb4b.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/abb4b.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/ac944.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/ac944.json/default/TopLevel.js index 3bb973a..2243e9f 100644 --- a/base/flow/test/inputs/json/misc/ac944.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/ac944.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/ad8be.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/ad8be.json/default/TopLevel.js index 63eecca..5efa86b 100644 --- a/base/flow/test/inputs/json/misc/ad8be.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/ad8be.json/default/TopLevel.js @@ -160,9 +160,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/ae7f0.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/ae7f0.json/default/TopLevel.js index f6846b2..e399392 100644 --- a/base/flow/test/inputs/json/misc/ae7f0.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/ae7f0.json/default/TopLevel.js @@ -190,9 +190,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/ae9ca.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/ae9ca.json/default/TopLevel.js index 670c8dd..6117106 100644 --- a/base/flow/test/inputs/json/misc/ae9ca.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/ae9ca.json/default/TopLevel.js @@ -139,9 +139,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/af2d1.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/af2d1.json/default/TopLevel.js index a3bad4d..7fb0cef 100644 --- a/base/flow/test/inputs/json/misc/af2d1.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/af2d1.json/default/TopLevel.js @@ -201,9 +201,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/b4865.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/b4865.json/default/TopLevel.js index c90ee85..17092d6 100644 --- a/base/flow/test/inputs/json/misc/b4865.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/b4865.json/default/TopLevel.js @@ -121,9 +121,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/b6f2c.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/b6f2c.json/default/TopLevel.js index 6cc839f..c7d8822 100644 --- a/base/flow/test/inputs/json/misc/b6f2c.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/b6f2c.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/b6fe5.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/b6fe5.json/default/TopLevel.js index e38f3a8..3a29d03 100644 --- a/base/flow/test/inputs/json/misc/b6fe5.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/b6fe5.json/default/TopLevel.js @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/b9f64.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/b9f64.json/default/TopLevel.js index 8fa46b9..28687ea 100644 --- a/base/flow/test/inputs/json/misc/b9f64.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/b9f64.json/default/TopLevel.js @@ -93,9 +93,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/bb1ec.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/bb1ec.json/default/TopLevel.js index 6cc839f..c7d8822 100644 --- a/base/flow/test/inputs/json/misc/bb1ec.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/bb1ec.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/be234.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/be234.json/default/TopLevel.js index 0cb3e64..20aca5c 100644 --- a/base/flow/test/inputs/json/misc/be234.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/be234.json/default/TopLevel.js @@ -255,9 +255,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/c0356.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/c0356.json/default/TopLevel.js index c715046..debfc80 100644 --- a/base/flow/test/inputs/json/misc/c0356.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/c0356.json/default/TopLevel.js @@ -105,9 +105,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/c0a3a.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/c0a3a.json/default/TopLevel.js index c7ac2de..22b3c6e 100644 --- a/base/flow/test/inputs/json/misc/c0a3a.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/c0a3a.json/default/TopLevel.js @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/c3303.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/c3303.json/default/TopLevel.js index c0554e5..76f0a52 100644 --- a/base/flow/test/inputs/json/misc/c3303.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/c3303.json/default/TopLevel.js @@ -206,9 +206,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/c6cfd.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/c6cfd.json/default/TopLevel.js index ff97c25..384500f 100644 --- a/base/flow/test/inputs/json/misc/c6cfd.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/c6cfd.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/c8c7e.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/c8c7e.json/default/TopLevel.js index 2655a97..93b9a61 100644 --- a/base/flow/test/inputs/json/misc/c8c7e.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/c8c7e.json/default/TopLevel.js @@ -121,9 +121,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/cb0cc.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/cb0cc.json/default/TopLevel.js index 1ae3eae..221298e 100644 --- a/base/flow/test/inputs/json/misc/cb0cc.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/cb0cc.json/default/TopLevel.js @@ -116,9 +116,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/cb81e.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/cb81e.json/default/TopLevel.js index d6a0df8..06723de 100644 --- a/base/flow/test/inputs/json/misc/cb81e.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/cb81e.json/default/TopLevel.js @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/ccd18.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/ccd18.json/default/TopLevel.js index c7ac2de..22b3c6e 100644 --- a/base/flow/test/inputs/json/misc/ccd18.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/ccd18.json/default/TopLevel.js @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/cd238.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/cd238.json/default/TopLevel.js index c7ac2de..22b3c6e 100644 --- a/base/flow/test/inputs/json/misc/cd238.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/cd238.json/default/TopLevel.js @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/cd463.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/cd463.json/default/TopLevel.js index 3bb973a..2243e9f 100644 --- a/base/flow/test/inputs/json/misc/cd463.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/cd463.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/cda6c.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/cda6c.json/default/TopLevel.js index bb61a30..35ccbe9 100644 --- a/base/flow/test/inputs/json/misc/cda6c.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/cda6c.json/default/TopLevel.js @@ -121,9 +121,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/cf0d8.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/cf0d8.json/default/TopLevel.js index 6dba12d..c169b15 100644 --- a/base/flow/test/inputs/json/misc/cf0d8.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/cf0d8.json/default/TopLevel.js @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/cfbce.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/cfbce.json/default/TopLevel.js index 3bb973a..2243e9f 100644 --- a/base/flow/test/inputs/json/misc/cfbce.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/cfbce.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/d0908.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/d0908.json/default/TopLevel.js index 6cc839f..c7d8822 100644 --- a/base/flow/test/inputs/json/misc/d0908.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/d0908.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/d23d5.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/d23d5.json/default/TopLevel.js index 61d1e3f..f08a5bc 100644 --- a/base/flow/test/inputs/json/misc/d23d5.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/d23d5.json/default/TopLevel.js @@ -111,9 +111,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/dbfb3.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/dbfb3.json/default/TopLevel.js index 91a80f8..0add719 100644 --- a/base/flow/test/inputs/json/misc/dbfb3.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/dbfb3.json/default/TopLevel.js @@ -195,9 +195,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/dc44f.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/dc44f.json/default/TopLevel.js index ff5cb85..4fb3fc3 100644 --- a/base/flow/test/inputs/json/misc/dc44f.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/dc44f.json/default/TopLevel.js @@ -219,9 +219,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/dd1ce.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/dd1ce.json/default/TopLevel.js index ff5cb85..4fb3fc3 100644 --- a/base/flow/test/inputs/json/misc/dd1ce.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/dd1ce.json/default/TopLevel.js @@ -219,9 +219,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/dec3a.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/dec3a.json/default/TopLevel.js index 2eed152..1cbf283 100644 --- a/base/flow/test/inputs/json/misc/dec3a.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/dec3a.json/default/TopLevel.js @@ -154,9 +154,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/df957.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/df957.json/default/TopLevel.js index 6dba12d..c169b15 100644 --- a/base/flow/test/inputs/json/misc/df957.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/df957.json/default/TopLevel.js @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/e0ac7.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/e0ac7.json/default/TopLevel.js index ab2051d..57af0ce 100644 --- a/base/flow/test/inputs/json/misc/e0ac7.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/e0ac7.json/default/TopLevel.js @@ -203,9 +203,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/e2915.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/e2915.json/default/TopLevel.js index e774dfd..cfca49c 100644 --- a/base/flow/test/inputs/json/misc/e2915.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/e2915.json/default/TopLevel.js @@ -194,9 +194,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/e2a58.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/e2a58.json/default/TopLevel.js index 6ab5788..3100151 100644 --- a/base/flow/test/inputs/json/misc/e2a58.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/e2a58.json/default/TopLevel.js @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/e324e.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/e324e.json/default/TopLevel.js index 6f4278c..74b1025 100644 --- a/base/flow/test/inputs/json/misc/e324e.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/e324e.json/default/TopLevel.js @@ -165,9 +165,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/e53b5.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/e53b5.json/default/TopLevel.js index 15ed332..4234518 100644 --- a/base/flow/test/inputs/json/misc/e53b5.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/e53b5.json/default/TopLevel.js @@ -121,9 +121,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/e64a0.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/e64a0.json/default/TopLevel.js index f9cab5b..319b78a 100644 --- a/base/flow/test/inputs/json/misc/e64a0.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/e64a0.json/default/TopLevel.js @@ -106,9 +106,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/e8a0b.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/e8a0b.json/default/TopLevel.js index 89794b9..3f15a1e 100644 --- a/base/flow/test/inputs/json/misc/e8a0b.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/e8a0b.json/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/e8b04.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/e8b04.json/default/TopLevel.js index 1459701..dd0db17 100644 --- a/base/flow/test/inputs/json/misc/e8b04.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/e8b04.json/default/TopLevel.js @@ -363,9 +363,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/ed095.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/ed095.json/default/TopLevel.js index e58461b..775bd22 100644 --- a/base/flow/test/inputs/json/misc/ed095.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/ed095.json/default/TopLevel.js @@ -91,9 +91,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/f22f5.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/f22f5.json/default/TopLevel.js index ba01b2c..f284bfc 100644 --- a/base/flow/test/inputs/json/misc/f22f5.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/f22f5.json/default/TopLevel.js @@ -187,9 +187,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/f3139.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/f3139.json/default/TopLevel.js index 6533855..2e9516c 100644 --- a/base/flow/test/inputs/json/misc/f3139.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/f3139.json/default/TopLevel.js @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/f3edf.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/f3edf.json/default/TopLevel.js index 89794b9..3f15a1e 100644 --- a/base/flow/test/inputs/json/misc/f3edf.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/f3edf.json/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/f466a.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/f466a.json/default/TopLevel.js index 89794b9..3f15a1e 100644 --- a/base/flow/test/inputs/json/misc/f466a.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/f466a.json/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/f6a65.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/f6a65.json/default/TopLevel.js index 3b08027..a51f7f3 100644 --- a/base/flow/test/inputs/json/misc/f6a65.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/f6a65.json/default/TopLevel.js @@ -210,9 +210,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/f74d5.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/f74d5.json/default/TopLevel.js index f85b0f6..db3704d 100644 --- a/base/flow/test/inputs/json/misc/f74d5.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/f74d5.json/default/TopLevel.js @@ -209,9 +209,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/f82d9.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/f82d9.json/default/TopLevel.js index f0c5302..befe3fc 100644 --- a/base/flow/test/inputs/json/misc/f82d9.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/f82d9.json/default/TopLevel.js @@ -178,9 +178,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/f974d.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/f974d.json/default/TopLevel.js index 639b694..0ccbac8 100644 --- a/base/flow/test/inputs/json/misc/f974d.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/f974d.json/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/faff5.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/faff5.json/default/TopLevel.js index 2425915..e8e429e 100644 --- a/base/flow/test/inputs/json/misc/faff5.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/faff5.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/fcca3.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/fcca3.json/default/TopLevel.js index b7ca334..6ffacc0 100644 --- a/base/flow/test/inputs/json/misc/fcca3.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/fcca3.json/default/TopLevel.js @@ -306,9 +306,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/misc/fd329.json/default/TopLevel.js b/head/flow/test/inputs/json/misc/fd329.json/default/TopLevel.js index 1eccbad..6dbe7f0 100644 --- a/base/flow/test/inputs/json/misc/fd329.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/misc/fd329.json/default/TopLevel.js @@ -106,9 +106,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/blns-object.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/blns-object.json/default/TopLevel.js index 4486ec1..9852203 100644 --- a/base/flow/test/inputs/json/priority/blns-object.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/blns-object.json/default/TopLevel.js @@ -688,9 +688,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/bug2037.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/bug2037.json/default/TopLevel.js index 6524a5e..da6cbd9 100644 --- a/base/flow/test/inputs/json/priority/bug2037.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/bug2037.json/default/TopLevel.js @@ -104,9 +104,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/bug2521.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/bug2521.json/default/TopLevel.js index 7d43d7b..371c230 100644 --- a/base/flow/test/inputs/json/priority/bug2521.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/bug2521.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/bug2590.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/bug2590.json/default/TopLevel.js index 31d6694..22f90b1 100644 --- a/base/flow/test/inputs/json/priority/bug2590.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/bug2590.json/default/TopLevel.js @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/bug2663.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/bug2663.json/default/TopLevel.js index b0f0629..513abec 100644 --- a/base/flow/test/inputs/json/priority/bug2663.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/bug2663.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/bug2793.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/bug2793.json/default/TopLevel.js index 40f8379..d9e1ff0 100644 --- a/base/flow/test/inputs/json/priority/bug2793.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/bug2793.json/default/TopLevel.js @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/bug427.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/bug427.json/default/TopLevel.js index 87141a4..11a93fb 100644 --- a/base/flow/test/inputs/json/priority/bug427.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/bug427.json/default/TopLevel.js @@ -704,9 +704,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/bug790.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/bug790.json/default/TopLevel.js index 61aae0c..6446d0c 100644 --- a/base/flow/test/inputs/json/priority/bug790.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/bug790.json/default/TopLevel.js @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/bug855-short.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/bug855-short.json/default/TopLevel.js index 9228688..265c038 100644 --- a/base/flow/test/inputs/json/priority/bug855-short.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/bug855-short.json/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/bug863.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/bug863.json/default/TopLevel.js index 2d45f63..41503a7 100644 --- a/base/flow/test/inputs/json/priority/bug863.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/bug863.json/default/TopLevel.js @@ -179,9 +179,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/coin-pairs.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/coin-pairs.json/default/TopLevel.js index ce2c15a..714949d 100644 --- a/base/flow/test/inputs/json/priority/coin-pairs.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/coin-pairs.json/default/TopLevel.js @@ -105,9 +105,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations1.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/combinations1.json/default/TopLevel.js index 892898a..7993206 100644 --- a/base/flow/test/inputs/json/priority/combinations1.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations1.json/default/TopLevel.js @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations1.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js b/head/flow/test/inputs/json/priority/combinations1.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js index 8bdf8ea..665aff5 100644 --- a/base/flow/test/inputs/json/priority/combinations1.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations1.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations1.json/prefer-unions-false--a5053c0a486d/TopLevel.js b/head/flow/test/inputs/json/priority/combinations1.json/prefer-unions-false--a5053c0a486d/TopLevel.js index 892898a..7993206 100644 --- a/base/flow/test/inputs/json/priority/combinations1.json/prefer-unions-false--a5053c0a486d/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations1.json/prefer-unions-false--a5053c0a486d/TopLevel.js @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations1.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js b/head/flow/test/inputs/json/priority/combinations1.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js index 892898a..7993206 100644 --- a/base/flow/test/inputs/json/priority/combinations1.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations1.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations1.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js b/head/flow/test/inputs/json/priority/combinations1.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js index 3e621e4..490209e 100644 --- a/base/flow/test/inputs/json/priority/combinations1.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations1.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations2.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/combinations2.json/default/TopLevel.js index 5199f24..bd35ee0 100644 --- a/base/flow/test/inputs/json/priority/combinations2.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations2.json/default/TopLevel.js @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations2.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js b/head/flow/test/inputs/json/priority/combinations2.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js index c66bd33..094583c 100644 --- a/base/flow/test/inputs/json/priority/combinations2.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations2.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations2.json/prefer-unions-false--a5053c0a486d/TopLevel.js b/head/flow/test/inputs/json/priority/combinations2.json/prefer-unions-false--a5053c0a486d/TopLevel.js index 5199f24..bd35ee0 100644 --- a/base/flow/test/inputs/json/priority/combinations2.json/prefer-unions-false--a5053c0a486d/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations2.json/prefer-unions-false--a5053c0a486d/TopLevel.js @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations2.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js b/head/flow/test/inputs/json/priority/combinations2.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js index 5199f24..bd35ee0 100644 --- a/base/flow/test/inputs/json/priority/combinations2.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations2.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations2.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js b/head/flow/test/inputs/json/priority/combinations2.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js index e565a44..d358ea8 100644 --- a/base/flow/test/inputs/json/priority/combinations2.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations2.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations3.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/combinations3.json/default/TopLevel.js index a84f903..5f5ccd8 100644 --- a/base/flow/test/inputs/json/priority/combinations3.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations3.json/default/TopLevel.js @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations3.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js b/head/flow/test/inputs/json/priority/combinations3.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js index 0be9d36..2caa587 100644 --- a/base/flow/test/inputs/json/priority/combinations3.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations3.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations3.json/prefer-unions-false--a5053c0a486d/TopLevel.js b/head/flow/test/inputs/json/priority/combinations3.json/prefer-unions-false--a5053c0a486d/TopLevel.js index a84f903..5f5ccd8 100644 --- a/base/flow/test/inputs/json/priority/combinations3.json/prefer-unions-false--a5053c0a486d/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations3.json/prefer-unions-false--a5053c0a486d/TopLevel.js @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations3.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js b/head/flow/test/inputs/json/priority/combinations3.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js index a84f903..5f5ccd8 100644 --- a/base/flow/test/inputs/json/priority/combinations3.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations3.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations3.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js b/head/flow/test/inputs/json/priority/combinations3.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js index 1e61073..791cc28 100644 --- a/base/flow/test/inputs/json/priority/combinations3.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations3.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations4.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/combinations4.json/default/TopLevel.js index fb135e5..b774aa6 100644 --- a/base/flow/test/inputs/json/priority/combinations4.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations4.json/default/TopLevel.js @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations4.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js b/head/flow/test/inputs/json/priority/combinations4.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js index 4859842..fde7728 100644 --- a/base/flow/test/inputs/json/priority/combinations4.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations4.json/nice-property-names-true--f4d7920ee2ce/TopLevel.js @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations4.json/prefer-unions-false--a5053c0a486d/TopLevel.js b/head/flow/test/inputs/json/priority/combinations4.json/prefer-unions-false--a5053c0a486d/TopLevel.js index fb135e5..b774aa6 100644 --- a/base/flow/test/inputs/json/priority/combinations4.json/prefer-unions-false--a5053c0a486d/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations4.json/prefer-unions-false--a5053c0a486d/TopLevel.js @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations4.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js b/head/flow/test/inputs/json/priority/combinations4.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js index fb135e5..b774aa6 100644 --- a/base/flow/test/inputs/json/priority/combinations4.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations4.json/prefer-unknown-false--f1ab9e45d823/TopLevel.js @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combinations4.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js b/head/flow/test/inputs/json/priority/combinations4.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js index ecd1d0c..ed918aa 100644 --- a/base/flow/test/inputs/json/priority/combinations4.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combinations4.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/combined-enum.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/combined-enum.json/default/TopLevel.js index f1b13bb..5a07911 100644 --- a/base/flow/test/inputs/json/priority/combined-enum.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/combined-enum.json/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/direct-recursive.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/direct-recursive.json/default/TopLevel.js index 57ff834..b46d2af 100644 --- a/base/flow/test/inputs/json/priority/direct-recursive.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/direct-recursive.json/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/empty-enum.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/empty-enum.json/default/TopLevel.js index 3eb2ee8..e38ad9e 100644 --- a/base/flow/test/inputs/json/priority/empty-enum.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/empty-enum.json/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/identifiers.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/identifiers.json/default/TopLevel.js index 7b97fb6..c1209c3 100644 --- a/base/flow/test/inputs/json/priority/identifiers.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/identifiers.json/default/TopLevel.js @@ -124,9 +124,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/issue2680-object-array.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/issue2680-object-array.json/default/TopLevel.js index 3304381..6d40b1d 100644 --- a/base/flow/test/inputs/json/priority/issue2680-object-array.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/issue2680-object-array.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/issue2680-scalar-array.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/issue2680-scalar-array.json/default/TopLevel.js index 57ef2c0..a9d8502 100644 --- a/base/flow/test/inputs/json/priority/issue2680-scalar-array.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/issue2680-scalar-array.json/default/TopLevel.js @@ -91,9 +91,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/keywords.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/keywords.json/default/TopLevel.js index 2029e3d..7c74b51 100644 --- a/base/flow/test/inputs/json/priority/keywords.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/keywords.json/default/TopLevel.js @@ -1787,9 +1787,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/TopLevel.js index f80ddb1..c3b4a0c 100644 --- a/base/flow/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/TopLevel.js @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/list.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/list.json/default/TopLevel.js index 46b9ee9..c81907c 100644 --- a/base/flow/test/inputs/json/priority/list.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/list.json/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/name-style.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/name-style.json/default/TopLevel.js index 26fd739..4dc1320 100644 --- a/base/flow/test/inputs/json/priority/name-style.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/name-style.json/default/TopLevel.js @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/nbl-stats.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/nbl-stats.json/default/TopLevel.js index bc67efb..09975c9 100644 --- a/base/flow/test/inputs/json/priority/nbl-stats.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/nbl-stats.json/default/TopLevel.js @@ -425,9 +425,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/nested-objects.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/nested-objects.json/default/TopLevel.js index 70f13bb..b8a48b4 100644 --- a/base/flow/test/inputs/json/priority/nested-objects.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/nested-objects.json/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/no-classes.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/no-classes.json/default/TopLevel.js index a8973a2..46b4cfa 100644 --- a/base/flow/test/inputs/json/priority/no-classes.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/no-classes.json/default/TopLevel.js @@ -91,9 +91,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/nst-test-suite.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/nst-test-suite.json/default/TopLevel.js index 5f71ad1..a02093f 100644 --- a/base/flow/test/inputs/json/priority/nst-test-suite.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/nst-test-suite.json/default/TopLevel.js @@ -233,9 +233,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/number-map.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/number-map.json/default/TopLevel.js index cad18ef..f8b11e2 100644 --- a/base/flow/test/inputs/json/priority/number-map.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/number-map.json/default/TopLevel.js @@ -93,9 +93,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/omit-empty.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/omit-empty.json/default/TopLevel.js index 0273271..f67384c 100644 --- a/base/flow/test/inputs/json/priority/omit-empty.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/omit-empty.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/optional-union.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/optional-union.json/default/TopLevel.js index 643d117..e6637f6 100644 --- a/base/flow/test/inputs/json/priority/optional-union.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/optional-union.json/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/php-mixed-union.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/php-mixed-union.json/default/TopLevel.js index 4e4662d..fc40ecf 100644 --- a/base/flow/test/inputs/json/priority/php-mixed-union.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/php-mixed-union.json/default/TopLevel.js @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/php-validation.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/php-validation.json/default/TopLevel.js index 8b5565e..56375a0 100644 --- a/base/flow/test/inputs/json/priority/php-validation.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/php-validation.json/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/recursive.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/recursive.json/default/TopLevel.js index 3e0e277..f48ce50 100644 --- a/base/flow/test/inputs/json/priority/recursive.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/recursive.json/default/TopLevel.js @@ -212,9 +212,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/simple-identifiers.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/simple-identifiers.json/default/TopLevel.js index 4a7b9cd..127d540 100644 --- a/base/flow/test/inputs/json/priority/simple-identifiers.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/simple-identifiers.json/default/TopLevel.js @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/union-constructor-clash.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/union-constructor-clash.json/default/TopLevel.js index a3987a9..147d9ae 100644 --- a/base/flow/test/inputs/json/priority/union-constructor-clash.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/union-constructor-clash.json/default/TopLevel.js @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/unions.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/unions.json/default/TopLevel.js index 283c106..19cb961 100644 --- a/base/flow/test/inputs/json/priority/unions.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/unions.json/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/url.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/url.json/default/TopLevel.js index 4c1410e..3a43815 100644 --- a/base/flow/test/inputs/json/priority/url.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/url.json/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/priority/uuids.json/default/TopLevel.js b/head/flow/test/inputs/json/priority/uuids.json/default/TopLevel.js index ff9d6dd..503caa3 100644 --- a/base/flow/test/inputs/json/priority/uuids.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/priority/uuids.json/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/samples/bitcoin-block.json/default/TopLevel.js b/head/flow/test/inputs/json/samples/bitcoin-block.json/default/TopLevel.js index 639b694..0ccbac8 100644 --- a/base/flow/test/inputs/json/samples/bitcoin-block.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/samples/bitcoin-block.json/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/samples/copy-with-property.json/default/TopLevel.js b/head/flow/test/inputs/json/samples/copy-with-property.json/default/TopLevel.js index 9f7c83e..5006705 100644 --- a/base/flow/test/inputs/json/samples/copy-with-property.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/samples/copy-with-property.json/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/samples/getting-started.json/default/TopLevel.js b/head/flow/test/inputs/json/samples/getting-started.json/default/TopLevel.js index 0a0728d..0ce138c 100644 --- a/base/flow/test/inputs/json/samples/getting-started.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/samples/getting-started.json/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/samples/github-events.json/default/TopLevel.js b/head/flow/test/inputs/json/samples/github-events.json/default/TopLevel.js index f17022b..c78dd12 100644 --- a/base/flow/test/inputs/json/samples/github-events.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/samples/github-events.json/default/TopLevel.js @@ -381,9 +381,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/samples/kitchen-sink.json/default/TopLevel.js b/head/flow/test/inputs/json/samples/kitchen-sink.json/default/TopLevel.js index 536024f..544d037 100644 --- a/base/flow/test/inputs/json/samples/kitchen-sink.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/samples/kitchen-sink.json/default/TopLevel.js @@ -125,9 +125,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/samples/null-safe.json/default/TopLevel.js b/head/flow/test/inputs/json/samples/null-safe.json/default/TopLevel.js index aacaf95..a3fcd2e 100644 --- a/base/flow/test/inputs/json/samples/null-safe.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/samples/null-safe.json/default/TopLevel.js @@ -106,9 +106,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/samples/objc-control-characters.json/default/TopLevel.js b/head/flow/test/inputs/json/samples/objc-control-characters.json/default/TopLevel.js index d7e76ba..4415028 100644 --- a/base/flow/test/inputs/json/samples/objc-control-characters.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/samples/objc-control-characters.json/default/TopLevel.js @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/samples/pokedex.json/default/TopLevel.js b/head/flow/test/inputs/json/samples/pokedex.json/default/TopLevel.js index 74b9473..9ea3e4a 100644 --- a/base/flow/test/inputs/json/samples/pokedex.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/samples/pokedex.json/default/TopLevel.js @@ -145,9 +145,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/samples/reddit.json/default/TopLevel.js b/head/flow/test/inputs/json/samples/reddit.json/default/TopLevel.js index 2f58942..1643f16 100644 --- a/base/flow/test/inputs/json/samples/reddit.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/samples/reddit.json/default/TopLevel.js @@ -234,9 +234,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/samples/simple-object.json/default/TopLevel.js b/head/flow/test/inputs/json/samples/simple-object.json/default/TopLevel.js index 381cd53..68dc09b 100644 --- a/base/flow/test/inputs/json/samples/simple-object.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/samples/simple-object.json/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/samples/spotify-album.json/default/TopLevel.js b/head/flow/test/inputs/json/samples/spotify-album.json/default/TopLevel.js index 99106e9..896a9c9 100644 --- a/base/flow/test/inputs/json/samples/spotify-album.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/samples/spotify-album.json/default/TopLevel.js @@ -163,9 +163,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/samples/us-avg-temperatures.json/default/TopLevel.js b/head/flow/test/inputs/json/samples/us-avg-temperatures.json/default/TopLevel.js index 1eccbad..6dbe7f0 100644 --- a/base/flow/test/inputs/json/samples/us-avg-temperatures.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/samples/us-avg-temperatures.json/default/TopLevel.js @@ -106,9 +106,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/flow/test/inputs/json/samples/us-senators.json/default/TopLevel.js b/head/flow/test/inputs/json/samples/us-senators.json/default/TopLevel.js index a439e02..ef8f401 100644 --- a/base/flow/test/inputs/json/samples/us-senators.json/default/TopLevel.js +++ b/head/flow/test/inputs/json/samples/us-senators.json/default/TopLevel.js @@ -198,9 +198,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-flow/test/inputs/graphql/github1.graphql/default/TopLevel.js b/head/graphql-flow/test/inputs/graphql/github1.graphql/default/TopLevel.js index e0890fb..4485f66 100644 --- a/base/graphql-flow/test/inputs/graphql/github1.graphql/default/TopLevel.js +++ b/head/graphql-flow/test/inputs/graphql/github1.graphql/default/TopLevel.js @@ -107,9 +107,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-flow/test/inputs/graphql/github2.graphql/default/TopLevel.js b/head/graphql-flow/test/inputs/graphql/github2.graphql/default/TopLevel.js index 17c0615..b8612a4 100644 --- a/base/graphql-flow/test/inputs/graphql/github2.graphql/default/TopLevel.js +++ b/head/graphql-flow/test/inputs/graphql/github2.graphql/default/TopLevel.js @@ -116,9 +116,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-flow/test/inputs/graphql/github3.graphql/default/TopLevel.js b/head/graphql-flow/test/inputs/graphql/github3.graphql/default/TopLevel.js index 4e2fad5..6bd7766 100644 --- a/base/graphql-flow/test/inputs/graphql/github3.graphql/default/TopLevel.js +++ b/head/graphql-flow/test/inputs/graphql/github3.graphql/default/TopLevel.js @@ -124,9 +124,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-flow/test/inputs/graphql/github4.graphql/default/TopLevel.js b/head/graphql-flow/test/inputs/graphql/github4.graphql/default/TopLevel.js index 6970141..635dafe 100644 --- a/base/graphql-flow/test/inputs/graphql/github4.graphql/default/TopLevel.js +++ b/head/graphql-flow/test/inputs/graphql/github4.graphql/default/TopLevel.js @@ -125,9 +125,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-flow/test/inputs/graphql/github5.graphql/default/TopLevel.js b/head/graphql-flow/test/inputs/graphql/github5.graphql/default/TopLevel.js index 6f93b2c..df4062c 100644 --- a/base/graphql-flow/test/inputs/graphql/github5.graphql/default/TopLevel.js +++ b/head/graphql-flow/test/inputs/graphql/github5.graphql/default/TopLevel.js @@ -107,9 +107,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-flow/test/inputs/graphql/github6.graphql/default/TopLevel.js b/head/graphql-flow/test/inputs/graphql/github6.graphql/default/TopLevel.js index 82910a8..dc7be65 100644 --- a/base/graphql-flow/test/inputs/graphql/github6.graphql/default/TopLevel.js +++ b/head/graphql-flow/test/inputs/graphql/github6.graphql/default/TopLevel.js @@ -107,9 +107,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-flow/test/inputs/graphql/github7.graphql/default/TopLevel.js b/head/graphql-flow/test/inputs/graphql/github7.graphql/default/TopLevel.js index 144e435..bc53290 100644 --- a/base/graphql-flow/test/inputs/graphql/github7.graphql/default/TopLevel.js +++ b/head/graphql-flow/test/inputs/graphql/github7.graphql/default/TopLevel.js @@ -128,9 +128,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-flow/test/inputs/graphql/github8.graphql/default/TopLevel.js b/head/graphql-flow/test/inputs/graphql/github8.graphql/default/TopLevel.js index 0a8d281..964343f 100644 --- a/base/graphql-flow/test/inputs/graphql/github8.graphql/default/TopLevel.js +++ b/head/graphql-flow/test/inputs/graphql/github8.graphql/default/TopLevel.js @@ -118,9 +118,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-flow/test/inputs/graphql/github9.graphql/default/TopLevel.js b/head/graphql-flow/test/inputs/graphql/github9.graphql/default/TopLevel.js index 4244d70..103535a 100644 --- a/base/graphql-flow/test/inputs/graphql/github9.graphql/default/TopLevel.js +++ b/head/graphql-flow/test/inputs/graphql/github9.graphql/default/TopLevel.js @@ -125,9 +125,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-javascript/test/inputs/graphql/github1.graphql/default/TopLevel.js b/head/graphql-javascript/test/inputs/graphql/github1.graphql/default/TopLevel.js index a908803..0b3c25c 100644 --- a/base/graphql-javascript/test/inputs/graphql/github1.graphql/default/TopLevel.js +++ b/head/graphql-javascript/test/inputs/graphql/github1.graphql/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-javascript/test/inputs/graphql/github2.graphql/default/TopLevel.js b/head/graphql-javascript/test/inputs/graphql/github2.graphql/default/TopLevel.js index 327d7fd..7d9109f 100644 --- a/base/graphql-javascript/test/inputs/graphql/github2.graphql/default/TopLevel.js +++ b/head/graphql-javascript/test/inputs/graphql/github2.graphql/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-javascript/test/inputs/graphql/github3.graphql/default/TopLevel.js b/head/graphql-javascript/test/inputs/graphql/github3.graphql/default/TopLevel.js index 1f86530..4a190cc 100644 --- a/base/graphql-javascript/test/inputs/graphql/github3.graphql/default/TopLevel.js +++ b/head/graphql-javascript/test/inputs/graphql/github3.graphql/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-javascript/test/inputs/graphql/github4.graphql/default/TopLevel.js b/head/graphql-javascript/test/inputs/graphql/github4.graphql/default/TopLevel.js index 9eae08b..2f2c538 100644 --- a/base/graphql-javascript/test/inputs/graphql/github4.graphql/default/TopLevel.js +++ b/head/graphql-javascript/test/inputs/graphql/github4.graphql/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-javascript/test/inputs/graphql/github5.graphql/default/TopLevel.js b/head/graphql-javascript/test/inputs/graphql/github5.graphql/default/TopLevel.js index 420ace9..f4536f9 100644 --- a/base/graphql-javascript/test/inputs/graphql/github5.graphql/default/TopLevel.js +++ b/head/graphql-javascript/test/inputs/graphql/github5.graphql/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-javascript/test/inputs/graphql/github6.graphql/default/TopLevel.js b/head/graphql-javascript/test/inputs/graphql/github6.graphql/default/TopLevel.js index 15c6fba..a7c5765 100644 --- a/base/graphql-javascript/test/inputs/graphql/github6.graphql/default/TopLevel.js +++ b/head/graphql-javascript/test/inputs/graphql/github6.graphql/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-javascript/test/inputs/graphql/github7.graphql/default/TopLevel.js b/head/graphql-javascript/test/inputs/graphql/github7.graphql/default/TopLevel.js index 4249720..43dd38b 100644 --- a/base/graphql-javascript/test/inputs/graphql/github7.graphql/default/TopLevel.js +++ b/head/graphql-javascript/test/inputs/graphql/github7.graphql/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-javascript/test/inputs/graphql/github8.graphql/default/TopLevel.js b/head/graphql-javascript/test/inputs/graphql/github8.graphql/default/TopLevel.js index fd6d83e..6f6e38d 100644 --- a/base/graphql-javascript/test/inputs/graphql/github8.graphql/default/TopLevel.js +++ b/head/graphql-javascript/test/inputs/graphql/github8.graphql/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-javascript/test/inputs/graphql/github9.graphql/default/TopLevel.js b/head/graphql-javascript/test/inputs/graphql/github9.graphql/default/TopLevel.js index f9c07fe..1dea5cf 100644 --- a/base/graphql-javascript/test/inputs/graphql/github9.graphql/default/TopLevel.js +++ b/head/graphql-javascript/test/inputs/graphql/github9.graphql/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-typescript/test/inputs/graphql/github1.graphql/default/TopLevel.ts b/head/graphql-typescript/test/inputs/graphql/github1.graphql/default/TopLevel.ts index 578c5da..471d868 100644 --- a/base/graphql-typescript/test/inputs/graphql/github1.graphql/default/TopLevel.ts +++ b/head/graphql-typescript/test/inputs/graphql/github1.graphql/default/TopLevel.ts @@ -107,9 +107,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-typescript/test/inputs/graphql/github2.graphql/default/TopLevel.ts b/head/graphql-typescript/test/inputs/graphql/github2.graphql/default/TopLevel.ts index c8dc669..42d42ad 100644 --- a/base/graphql-typescript/test/inputs/graphql/github2.graphql/default/TopLevel.ts +++ b/head/graphql-typescript/test/inputs/graphql/github2.graphql/default/TopLevel.ts @@ -116,9 +116,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-typescript/test/inputs/graphql/github3.graphql/default/TopLevel.ts b/head/graphql-typescript/test/inputs/graphql/github3.graphql/default/TopLevel.ts index 3a9ea88..2a2b40a 100644 --- a/base/graphql-typescript/test/inputs/graphql/github3.graphql/default/TopLevel.ts +++ b/head/graphql-typescript/test/inputs/graphql/github3.graphql/default/TopLevel.ts @@ -121,9 +121,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-typescript/test/inputs/graphql/github4.graphql/default/TopLevel.ts b/head/graphql-typescript/test/inputs/graphql/github4.graphql/default/TopLevel.ts index 2365eaf..b693834 100644 --- a/base/graphql-typescript/test/inputs/graphql/github4.graphql/default/TopLevel.ts +++ b/head/graphql-typescript/test/inputs/graphql/github4.graphql/default/TopLevel.ts @@ -122,9 +122,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-typescript/test/inputs/graphql/github5.graphql/default/TopLevel.ts b/head/graphql-typescript/test/inputs/graphql/github5.graphql/default/TopLevel.ts index acdc9b7..5a41cb2 100644 --- a/base/graphql-typescript/test/inputs/graphql/github5.graphql/default/TopLevel.ts +++ b/head/graphql-typescript/test/inputs/graphql/github5.graphql/default/TopLevel.ts @@ -107,9 +107,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-typescript/test/inputs/graphql/github6.graphql/default/TopLevel.ts b/head/graphql-typescript/test/inputs/graphql/github6.graphql/default/TopLevel.ts index 020032a..43d8ebe 100644 --- a/base/graphql-typescript/test/inputs/graphql/github6.graphql/default/TopLevel.ts +++ b/head/graphql-typescript/test/inputs/graphql/github6.graphql/default/TopLevel.ts @@ -107,9 +107,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-typescript/test/inputs/graphql/github7.graphql/default/TopLevel.ts b/head/graphql-typescript/test/inputs/graphql/github7.graphql/default/TopLevel.ts index a0952a7..705cbb3 100644 --- a/base/graphql-typescript/test/inputs/graphql/github7.graphql/default/TopLevel.ts +++ b/head/graphql-typescript/test/inputs/graphql/github7.graphql/default/TopLevel.ts @@ -128,9 +128,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-typescript/test/inputs/graphql/github8.graphql/default/TopLevel.ts b/head/graphql-typescript/test/inputs/graphql/github8.graphql/default/TopLevel.ts index 09a4037..811e63f 100644 --- a/base/graphql-typescript/test/inputs/graphql/github8.graphql/default/TopLevel.ts +++ b/head/graphql-typescript/test/inputs/graphql/github8.graphql/default/TopLevel.ts @@ -116,9 +116,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/graphql-typescript/test/inputs/graphql/github9.graphql/default/TopLevel.ts b/head/graphql-typescript/test/inputs/graphql/github9.graphql/default/TopLevel.ts index 9d653c2..6fc40f0 100644 --- a/base/graphql-typescript/test/inputs/graphql/github9.graphql/default/TopLevel.ts +++ b/head/graphql-typescript/test/inputs/graphql/github9.graphql/default/TopLevel.ts @@ -119,9 +119,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/00c36.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/00c36.json/default/TopLevel.js index 7bde2a3..bc88a31 100644 --- a/base/javascript/test/inputs/json/misc/00c36.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/00c36.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/00ec5.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/00ec5.json/default/TopLevel.js index e58994e..e6f6c1f 100644 --- a/base/javascript/test/inputs/json/misc/00ec5.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/00ec5.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/010b1.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/010b1.json/default/TopLevel.js index 5072650..4e00fc1 100644 --- a/base/javascript/test/inputs/json/misc/010b1.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/010b1.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/016af.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/016af.json/default/TopLevel.js index a8a2cb9..750dc97 100644 --- a/base/javascript/test/inputs/json/misc/016af.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/016af.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/033b1.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/033b1.json/default/TopLevel.js index b5bc8f9..52e7b4d 100644 --- a/base/javascript/test/inputs/json/misc/033b1.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/033b1.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/050b0.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/050b0.json/default/TopLevel.js index b031cf3..8d88f1c 100644 --- a/base/javascript/test/inputs/json/misc/050b0.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/050b0.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/06bee.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/06bee.json/default/TopLevel.js index 4ed3634..2f407ed 100644 --- a/base/javascript/test/inputs/json/misc/06bee.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/06bee.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/07540.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/07540.json/default/TopLevel.js index ae8169d..22bed72 100644 --- a/base/javascript/test/inputs/json/misc/07540.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/07540.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/0779f.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/0779f.json/default/TopLevel.js index 7ed503d..d24f4fd 100644 --- a/base/javascript/test/inputs/json/misc/0779f.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/0779f.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/07c75.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/07c75.json/default/TopLevel.js index 8c10240..2480a3b 100644 --- a/base/javascript/test/inputs/json/misc/07c75.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/07c75.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/09f54.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/09f54.json/default/TopLevel.js index d23e2d7..26720c9 100644 --- a/base/javascript/test/inputs/json/misc/09f54.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/09f54.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/0a358.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/0a358.json/default/TopLevel.js index cc5cbe0..ef4034a 100644 --- a/base/javascript/test/inputs/json/misc/0a358.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/0a358.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/0a91a.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/0a91a.json/default/TopLevel.js index 874e0da..700ad45 100644 --- a/base/javascript/test/inputs/json/misc/0a91a.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/0a91a.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/0b91a.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/0b91a.json/default/TopLevel.js index 3b6f02b..2baf902 100644 --- a/base/javascript/test/inputs/json/misc/0b91a.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/0b91a.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/0cffa.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/0cffa.json/default/TopLevel.js index 4921f33..0d51588 100644 --- a/base/javascript/test/inputs/json/misc/0cffa.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/0cffa.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/0e0c2.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/0e0c2.json/default/TopLevel.js index d74c94d..0884266 100644 --- a/base/javascript/test/inputs/json/misc/0e0c2.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/0e0c2.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/0fecf.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/0fecf.json/default/TopLevel.js index c350529..4858ed8 100644 --- a/base/javascript/test/inputs/json/misc/0fecf.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/0fecf.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/10be4.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/10be4.json/default/TopLevel.js index 0f11bea..0463a60 100644 --- a/base/javascript/test/inputs/json/misc/10be4.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/10be4.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/112b5.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/112b5.json/default/TopLevel.js index 988b2e3..743a248 100644 --- a/base/javascript/test/inputs/json/misc/112b5.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/112b5.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/127a1.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/127a1.json/default/TopLevel.js index 5029be5..b9a1359 100644 --- a/base/javascript/test/inputs/json/misc/127a1.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/127a1.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/13d8d.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/13d8d.json/default/TopLevel.js index 1804248..2e1ec6a 100644 --- a/base/javascript/test/inputs/json/misc/13d8d.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/13d8d.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/14d38.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/14d38.json/default/TopLevel.js index 5d15cc8..d469f52 100644 --- a/base/javascript/test/inputs/json/misc/14d38.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/14d38.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/167d6.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/167d6.json/default/TopLevel.js index b5bc8f9..52e7b4d 100644 --- a/base/javascript/test/inputs/json/misc/167d6.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/167d6.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/16bc5.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/16bc5.json/default/TopLevel.js index acd1fb9..8fc7c62 100644 --- a/base/javascript/test/inputs/json/misc/16bc5.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/16bc5.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/176f1.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/176f1.json/default/TopLevel.js index 351e84a..850feb5 100644 --- a/base/javascript/test/inputs/json/misc/176f1.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/176f1.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/1a7f5.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/1a7f5.json/default/TopLevel.js index 5072650..4e00fc1 100644 --- a/base/javascript/test/inputs/json/misc/1a7f5.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/1a7f5.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/1b28c.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/1b28c.json/default/TopLevel.js index a8a2cb9..750dc97 100644 --- a/base/javascript/test/inputs/json/misc/1b28c.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/1b28c.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/1b409.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/1b409.json/default/TopLevel.js index 8192aa5..cc2617b 100644 --- a/base/javascript/test/inputs/json/misc/1b409.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/1b409.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/2465e.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/2465e.json/default/TopLevel.js index 6a33ed2..0515da0 100644 --- a/base/javascript/test/inputs/json/misc/2465e.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/2465e.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/24f52.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/24f52.json/default/TopLevel.js index 7ed503d..d24f4fd 100644 --- a/base/javascript/test/inputs/json/misc/24f52.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/24f52.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/262f0.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/262f0.json/default/TopLevel.js index fdbfeea..532e050 100644 --- a/base/javascript/test/inputs/json/misc/262f0.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/262f0.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/26b49.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/26b49.json/default/TopLevel.js index ca1a4e9..f436786 100644 --- a/base/javascript/test/inputs/json/misc/26b49.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/26b49.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/26c9c.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/26c9c.json/default/TopLevel.js index 9ef5a1a..5d88f5b 100644 --- a/base/javascript/test/inputs/json/misc/26c9c.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/26c9c.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/27332.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/27332.json/default/TopLevel.js index 06e876f..d7e43ff 100644 --- a/base/javascript/test/inputs/json/misc/27332.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/27332.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/29f47.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/29f47.json/default/TopLevel.js index a46f0c7..2fd4c92 100644 --- a/base/javascript/test/inputs/json/misc/29f47.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/29f47.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/2d4e2.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/2d4e2.json/default/TopLevel.js index dabaf9d..46dc81b 100644 --- a/base/javascript/test/inputs/json/misc/2d4e2.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/2d4e2.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/2df80.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/2df80.json/default/TopLevel.js index 5fc4099..e907f00 100644 --- a/base/javascript/test/inputs/json/misc/2df80.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/2df80.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/31189.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/31189.json/default/TopLevel.js index d0130c4..eee60a3 100644 --- a/base/javascript/test/inputs/json/misc/31189.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/31189.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/32431.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/32431.json/default/TopLevel.js index 59f34aa..51d047b 100644 --- a/base/javascript/test/inputs/json/misc/32431.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/32431.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/32d5c.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/32d5c.json/default/TopLevel.js index 6f852a2..dccf3af 100644 --- a/base/javascript/test/inputs/json/misc/32d5c.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/32d5c.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/337ed.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/337ed.json/default/TopLevel.js index 68c9784..5a1541a 100644 --- a/base/javascript/test/inputs/json/misc/337ed.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/337ed.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/33d2e.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/33d2e.json/default/TopLevel.js index 6d3e524..6cd06c5 100644 --- a/base/javascript/test/inputs/json/misc/33d2e.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/33d2e.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/34702.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/34702.json/default/TopLevel.js index f70dc0b..fe6e7c8 100644 --- a/base/javascript/test/inputs/json/misc/34702.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/34702.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/3536b.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/3536b.json/default/TopLevel.js index 5fc3e3b..9a88d41 100644 --- a/base/javascript/test/inputs/json/misc/3536b.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/3536b.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/3659d.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/3659d.json/default/TopLevel.js index a8a2cb9..750dc97 100644 --- a/base/javascript/test/inputs/json/misc/3659d.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/3659d.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/36d5d.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/36d5d.json/default/TopLevel.js index 7ed503d..d24f4fd 100644 --- a/base/javascript/test/inputs/json/misc/36d5d.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/36d5d.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/3a6b3.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/3a6b3.json/default/TopLevel.js index 7ed503d..d24f4fd 100644 --- a/base/javascript/test/inputs/json/misc/3a6b3.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/3a6b3.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/3e9a3.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/3e9a3.json/default/TopLevel.js index 351e84a..850feb5 100644 --- a/base/javascript/test/inputs/json/misc/3e9a3.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/3e9a3.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/3f1ce.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/3f1ce.json/default/TopLevel.js index b6b4271..1ef5b84 100644 --- a/base/javascript/test/inputs/json/misc/3f1ce.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/3f1ce.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/421d4.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/421d4.json/default/TopLevel.js index e80c8de..2ab5f38 100644 --- a/base/javascript/test/inputs/json/misc/421d4.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/421d4.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/437e7.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/437e7.json/default/TopLevel.js index 0c1fbce..f40a43c 100644 --- a/base/javascript/test/inputs/json/misc/437e7.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/437e7.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/43970.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/43970.json/default/TopLevel.js index 4e4bfd1..34b2d80 100644 --- a/base/javascript/test/inputs/json/misc/43970.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/43970.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/43eaf.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/43eaf.json/default/TopLevel.js index b5bc8f9..52e7b4d 100644 --- a/base/javascript/test/inputs/json/misc/43eaf.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/43eaf.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/458db.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/458db.json/default/TopLevel.js index 0899bf9..671b490 100644 --- a/base/javascript/test/inputs/json/misc/458db.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/458db.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/4961a.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/4961a.json/default/TopLevel.js index a8a2cb9..750dc97 100644 --- a/base/javascript/test/inputs/json/misc/4961a.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/4961a.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/4a0d7.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/4a0d7.json/default/TopLevel.js index a8a2cb9..750dc97 100644 --- a/base/javascript/test/inputs/json/misc/4a0d7.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/4a0d7.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/4a455.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/4a455.json/default/TopLevel.js index 405a535..429312f 100644 --- a/base/javascript/test/inputs/json/misc/4a455.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/4a455.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/4c547.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/4c547.json/default/TopLevel.js index acd1fb9..8fc7c62 100644 --- a/base/javascript/test/inputs/json/misc/4c547.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/4c547.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/4d6fb.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/4d6fb.json/default/TopLevel.js index e8d6e16..8bf0d93 100644 --- a/base/javascript/test/inputs/json/misc/4d6fb.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/4d6fb.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/4e336.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/4e336.json/default/TopLevel.js index a8a2cb9..750dc97 100644 --- a/base/javascript/test/inputs/json/misc/4e336.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/4e336.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/54147.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/54147.json/default/TopLevel.js index 8f17e68..78a23d2 100644 --- a/base/javascript/test/inputs/json/misc/54147.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/54147.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/54d32.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/54d32.json/default/TopLevel.js index d676c8d..02bbdda 100644 --- a/base/javascript/test/inputs/json/misc/54d32.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/54d32.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/570ec.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/570ec.json/default/TopLevel.js index 6ecbade..10ba263 100644 --- a/base/javascript/test/inputs/json/misc/570ec.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/570ec.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/5dd0d.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/5dd0d.json/default/TopLevel.js index 7ed503d..d24f4fd 100644 --- a/base/javascript/test/inputs/json/misc/5dd0d.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/5dd0d.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/5eae5.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/5eae5.json/default/TopLevel.js index f49ab65..252c58d 100644 --- a/base/javascript/test/inputs/json/misc/5eae5.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/5eae5.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/5eb20.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/5eb20.json/default/TopLevel.js index 7ed503d..d24f4fd 100644 --- a/base/javascript/test/inputs/json/misc/5eb20.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/5eb20.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/5f3a1.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/5f3a1.json/default/TopLevel.js index b5bc8f9..52e7b4d 100644 --- a/base/javascript/test/inputs/json/misc/5f3a1.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/5f3a1.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/5f7fe.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/5f7fe.json/default/TopLevel.js index 69bd742..ab0f69d 100644 --- a/base/javascript/test/inputs/json/misc/5f7fe.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/5f7fe.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/617e8.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/617e8.json/default/TopLevel.js index c7de983..caab510 100644 --- a/base/javascript/test/inputs/json/misc/617e8.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/617e8.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/61b66.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/61b66.json/default/TopLevel.js index 7ed503d..d24f4fd 100644 --- a/base/javascript/test/inputs/json/misc/61b66.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/61b66.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/6260a.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/6260a.json/default/TopLevel.js index b5bc8f9..52e7b4d 100644 --- a/base/javascript/test/inputs/json/misc/6260a.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/6260a.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/65dec.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/65dec.json/default/TopLevel.js index 5747bf4..37b1f8a 100644 --- a/base/javascript/test/inputs/json/misc/65dec.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/65dec.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/66121.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/66121.json/default/TopLevel.js index 6b45478..abdd631 100644 --- a/base/javascript/test/inputs/json/misc/66121.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/66121.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/6617c.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/6617c.json/default/TopLevel.js index c893589..55216a6 100644 --- a/base/javascript/test/inputs/json/misc/6617c.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/6617c.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/67c03.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/67c03.json/default/TopLevel.js index 8cc7071..f56a126 100644 --- a/base/javascript/test/inputs/json/misc/67c03.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/67c03.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/68c30.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/68c30.json/default/TopLevel.js index 0e491bb..475b268 100644 --- a/base/javascript/test/inputs/json/misc/68c30.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/68c30.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/6c155.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/6c155.json/default/TopLevel.js index 787e7f9..3a28a7a 100644 --- a/base/javascript/test/inputs/json/misc/6c155.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/6c155.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/6de06.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/6de06.json/default/TopLevel.js index bcdf20d..9df90b0 100644 --- a/base/javascript/test/inputs/json/misc/6de06.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/6de06.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/6dec6.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/6dec6.json/default/TopLevel.js index c65a864..d0b5c65 100644 --- a/base/javascript/test/inputs/json/misc/6dec6.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/6dec6.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/6eb00.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/6eb00.json/default/TopLevel.js index 7d4472c..e757080 100644 --- a/base/javascript/test/inputs/json/misc/6eb00.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/6eb00.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/70c77.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/70c77.json/default/TopLevel.js index b5bc8f9..52e7b4d 100644 --- a/base/javascript/test/inputs/json/misc/70c77.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/70c77.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/734ad.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/734ad.json/default/TopLevel.js index 2dd7df3..7320f4b 100644 --- a/base/javascript/test/inputs/json/misc/734ad.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/734ad.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/75912.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/75912.json/default/TopLevel.js index b5bc8f9..52e7b4d 100644 --- a/base/javascript/test/inputs/json/misc/75912.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/75912.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/7681c.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/7681c.json/default/TopLevel.js index c3f9405..cdfbded 100644 --- a/base/javascript/test/inputs/json/misc/7681c.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/7681c.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/76ae1.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/76ae1.json/default/TopLevel.js index 177fff6..78fc584 100644 --- a/base/javascript/test/inputs/json/misc/76ae1.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/76ae1.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/77392.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/77392.json/default/TopLevel.js index ad4ed63..acee94a 100644 --- a/base/javascript/test/inputs/json/misc/77392.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/77392.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/7d397.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/7d397.json/default/TopLevel.js index 2ba2912..77fb627 100644 --- a/base/javascript/test/inputs/json/misc/7d397.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/7d397.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/7d722.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/7d722.json/default/TopLevel.js index 7ed503d..d24f4fd 100644 --- a/base/javascript/test/inputs/json/misc/7d722.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/7d722.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/7df41.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/7df41.json/default/TopLevel.js index 4989112..f8b81a9 100644 --- a/base/javascript/test/inputs/json/misc/7df41.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/7df41.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/7dfa6.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/7dfa6.json/default/TopLevel.js index a8a2cb9..750dc97 100644 --- a/base/javascript/test/inputs/json/misc/7dfa6.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/7dfa6.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/7eb30.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/7eb30.json/default/TopLevel.js index 5a22b1c..6a66a6d 100644 --- a/base/javascript/test/inputs/json/misc/7eb30.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/7eb30.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/7f568.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/7f568.json/default/TopLevel.js index 03269ce..288c170 100644 --- a/base/javascript/test/inputs/json/misc/7f568.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/7f568.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/7fbfb.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/7fbfb.json/default/TopLevel.js index 6bca24b..0a9c3f3 100644 --- a/base/javascript/test/inputs/json/misc/7fbfb.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/7fbfb.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/80aff.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/80aff.json/default/TopLevel.js index e7036f9..05570ba 100644 --- a/base/javascript/test/inputs/json/misc/80aff.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/80aff.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/82509.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/82509.json/default/TopLevel.js index 59da7ef..7310b43 100644 --- a/base/javascript/test/inputs/json/misc/82509.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/82509.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/8592b.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/8592b.json/default/TopLevel.js index fb2baf4..ee687bb 100644 --- a/base/javascript/test/inputs/json/misc/8592b.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/8592b.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/88130.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/88130.json/default/TopLevel.js index acd1fb9..8fc7c62 100644 --- a/base/javascript/test/inputs/json/misc/88130.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/88130.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/8a62c.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/8a62c.json/default/TopLevel.js index a8a2cb9..750dc97 100644 --- a/base/javascript/test/inputs/json/misc/8a62c.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/8a62c.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/908db.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/908db.json/default/TopLevel.js index 47fd602..900980f 100644 --- a/base/javascript/test/inputs/json/misc/908db.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/908db.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/9617f.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/9617f.json/default/TopLevel.js index b5bc8f9..52e7b4d 100644 --- a/base/javascript/test/inputs/json/misc/9617f.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/9617f.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/96f7c.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/96f7c.json/default/TopLevel.js index f4e553d..fff174a 100644 --- a/base/javascript/test/inputs/json/misc/96f7c.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/96f7c.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/9847b.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/9847b.json/default/TopLevel.js index b2fbeb7..3d28f84 100644 --- a/base/javascript/test/inputs/json/misc/9847b.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/9847b.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/9929c.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/9929c.json/default/TopLevel.js index acd1fb9..8fc7c62 100644 --- a/base/javascript/test/inputs/json/misc/9929c.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/9929c.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/996bd.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/996bd.json/default/TopLevel.js index a623356..60072e7 100644 --- a/base/javascript/test/inputs/json/misc/996bd.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/996bd.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/9a503.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/9a503.json/default/TopLevel.js index b655f68..42c156b 100644 --- a/base/javascript/test/inputs/json/misc/9a503.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/9a503.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/9ac3b.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/9ac3b.json/default/TopLevel.js index 94ebbc9..a1dddb3 100644 --- a/base/javascript/test/inputs/json/misc/9ac3b.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/9ac3b.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/9eed5.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/9eed5.json/default/TopLevel.js index 865f78d..3ea1a8e 100644 --- a/base/javascript/test/inputs/json/misc/9eed5.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/9eed5.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/a0496.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/a0496.json/default/TopLevel.js index 4cbbdc6..5ddde08 100644 --- a/base/javascript/test/inputs/json/misc/a0496.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/a0496.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/a1eca.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/a1eca.json/default/TopLevel.js index acd1fb9..8fc7c62 100644 --- a/base/javascript/test/inputs/json/misc/a1eca.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/a1eca.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/a3d8c.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/a3d8c.json/default/TopLevel.js index 47ca086..13fda6e 100644 --- a/base/javascript/test/inputs/json/misc/a3d8c.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/a3d8c.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/a45b0.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/a45b0.json/default/TopLevel.js index 5072650..4e00fc1 100644 --- a/base/javascript/test/inputs/json/misc/a45b0.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/a45b0.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/a71df.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/a71df.json/default/TopLevel.js index 7ed503d..d24f4fd 100644 --- a/base/javascript/test/inputs/json/misc/a71df.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/a71df.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/a9691.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/a9691.json/default/TopLevel.js index b5bc8f9..52e7b4d 100644 --- a/base/javascript/test/inputs/json/misc/a9691.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/a9691.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/ab0d1.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/ab0d1.json/default/TopLevel.js index 5072650..4e00fc1 100644 --- a/base/javascript/test/inputs/json/misc/ab0d1.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/ab0d1.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/abb4b.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/abb4b.json/default/TopLevel.js index a8a2cb9..750dc97 100644 --- a/base/javascript/test/inputs/json/misc/abb4b.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/abb4b.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/ac944.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/ac944.json/default/TopLevel.js index b5bc8f9..52e7b4d 100644 --- a/base/javascript/test/inputs/json/misc/ac944.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/ac944.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/ad8be.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/ad8be.json/default/TopLevel.js index 0f11bea..0463a60 100644 --- a/base/javascript/test/inputs/json/misc/ad8be.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/ad8be.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/ae7f0.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/ae7f0.json/default/TopLevel.js index 58067a6..f08e663 100644 --- a/base/javascript/test/inputs/json/misc/ae7f0.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/ae7f0.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/ae9ca.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/ae9ca.json/default/TopLevel.js index a469f40..fccdf38 100644 --- a/base/javascript/test/inputs/json/misc/ae9ca.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/ae9ca.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/af2d1.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/af2d1.json/default/TopLevel.js index 61c13f0..24f2553 100644 --- a/base/javascript/test/inputs/json/misc/af2d1.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/af2d1.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/b4865.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/b4865.json/default/TopLevel.js index c92e808..f091e7f 100644 --- a/base/javascript/test/inputs/json/misc/b4865.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/b4865.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/b6f2c.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/b6f2c.json/default/TopLevel.js index a8a2cb9..750dc97 100644 --- a/base/javascript/test/inputs/json/misc/b6f2c.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/b6f2c.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/b6fe5.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/b6fe5.json/default/TopLevel.js index b614cc0..5debffa 100644 --- a/base/javascript/test/inputs/json/misc/b6fe5.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/b6fe5.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/b9f64.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/b9f64.json/default/TopLevel.js index f1717c7..c4c90a6 100644 --- a/base/javascript/test/inputs/json/misc/b9f64.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/b9f64.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/bb1ec.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/bb1ec.json/default/TopLevel.js index a8a2cb9..750dc97 100644 --- a/base/javascript/test/inputs/json/misc/bb1ec.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/bb1ec.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/be234.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/be234.json/default/TopLevel.js index 23847ff..6a8832f 100644 --- a/base/javascript/test/inputs/json/misc/be234.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/be234.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/c0356.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/c0356.json/default/TopLevel.js index 438a6fc..0e2e1a2 100644 --- a/base/javascript/test/inputs/json/misc/c0356.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/c0356.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/c0a3a.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/c0a3a.json/default/TopLevel.js index 7ed503d..d24f4fd 100644 --- a/base/javascript/test/inputs/json/misc/c0a3a.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/c0a3a.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/c3303.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/c3303.json/default/TopLevel.js index 2c286be..be1c268 100644 --- a/base/javascript/test/inputs/json/misc/c3303.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/c3303.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/c6cfd.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/c6cfd.json/default/TopLevel.js index ef2d6e9..1e9a589 100644 --- a/base/javascript/test/inputs/json/misc/c6cfd.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/c6cfd.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/c8c7e.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/c8c7e.json/default/TopLevel.js index ae17f28..b1fa60c 100644 --- a/base/javascript/test/inputs/json/misc/c8c7e.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/c8c7e.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/cb0cc.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/cb0cc.json/default/TopLevel.js index c408c01..21d2159 100644 --- a/base/javascript/test/inputs/json/misc/cb0cc.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/cb0cc.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/cb81e.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/cb81e.json/default/TopLevel.js index 150dfff..169f9ea 100644 --- a/base/javascript/test/inputs/json/misc/cb81e.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/cb81e.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/ccd18.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/ccd18.json/default/TopLevel.js index 7ed503d..d24f4fd 100644 --- a/base/javascript/test/inputs/json/misc/ccd18.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/ccd18.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/cd238.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/cd238.json/default/TopLevel.js index 7ed503d..d24f4fd 100644 --- a/base/javascript/test/inputs/json/misc/cd238.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/cd238.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/cd463.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/cd463.json/default/TopLevel.js index b5bc8f9..52e7b4d 100644 --- a/base/javascript/test/inputs/json/misc/cd463.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/cd463.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/cda6c.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/cda6c.json/default/TopLevel.js index 97e4dd1..78374f6 100644 --- a/base/javascript/test/inputs/json/misc/cda6c.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/cda6c.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/cf0d8.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/cf0d8.json/default/TopLevel.js index acd1fb9..8fc7c62 100644 --- a/base/javascript/test/inputs/json/misc/cf0d8.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/cf0d8.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/cfbce.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/cfbce.json/default/TopLevel.js index b5bc8f9..52e7b4d 100644 --- a/base/javascript/test/inputs/json/misc/cfbce.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/cfbce.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/d0908.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/d0908.json/default/TopLevel.js index a8a2cb9..750dc97 100644 --- a/base/javascript/test/inputs/json/misc/d0908.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/d0908.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/d23d5.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/d23d5.json/default/TopLevel.js index e5a1acd..5789707 100644 --- a/base/javascript/test/inputs/json/misc/d23d5.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/d23d5.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/dbfb3.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/dbfb3.json/default/TopLevel.js index ab0231f..ead8857 100644 --- a/base/javascript/test/inputs/json/misc/dbfb3.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/dbfb3.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/dc44f.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/dc44f.json/default/TopLevel.js index 3290a2f..fe476de 100644 --- a/base/javascript/test/inputs/json/misc/dc44f.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/dc44f.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/dd1ce.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/dd1ce.json/default/TopLevel.js index 3290a2f..fe476de 100644 --- a/base/javascript/test/inputs/json/misc/dd1ce.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/dd1ce.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/dec3a.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/dec3a.json/default/TopLevel.js index a1a1ab7..11c7754 100644 --- a/base/javascript/test/inputs/json/misc/dec3a.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/dec3a.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/df957.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/df957.json/default/TopLevel.js index acd1fb9..8fc7c62 100644 --- a/base/javascript/test/inputs/json/misc/df957.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/df957.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/e0ac7.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/e0ac7.json/default/TopLevel.js index 0985cf4..a3132f0 100644 --- a/base/javascript/test/inputs/json/misc/e0ac7.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/e0ac7.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/e2915.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/e2915.json/default/TopLevel.js index fd7fefa..79aa723 100644 --- a/base/javascript/test/inputs/json/misc/e2915.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/e2915.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/e2a58.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/e2a58.json/default/TopLevel.js index 0859361..bb9043d 100644 --- a/base/javascript/test/inputs/json/misc/e2a58.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/e2a58.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/e324e.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/e324e.json/default/TopLevel.js index fa10af3..39ed114 100644 --- a/base/javascript/test/inputs/json/misc/e324e.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/e324e.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/e53b5.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/e53b5.json/default/TopLevel.js index ec39a74..864acd1 100644 --- a/base/javascript/test/inputs/json/misc/e53b5.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/e53b5.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/e64a0.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/e64a0.json/default/TopLevel.js index 988b2e3..743a248 100644 --- a/base/javascript/test/inputs/json/misc/e64a0.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/e64a0.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/e8a0b.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/e8a0b.json/default/TopLevel.js index 5072650..4e00fc1 100644 --- a/base/javascript/test/inputs/json/misc/e8a0b.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/e8a0b.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/e8b04.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/e8b04.json/default/TopLevel.js index cfb13df..cc53a61 100644 --- a/base/javascript/test/inputs/json/misc/e8b04.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/e8b04.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/ed095.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/ed095.json/default/TopLevel.js index 12ecaff..fb47416 100644 --- a/base/javascript/test/inputs/json/misc/ed095.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/ed095.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/f22f5.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/f22f5.json/default/TopLevel.js index e7d55b9..c422d74 100644 --- a/base/javascript/test/inputs/json/misc/f22f5.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/f22f5.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/f3139.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/f3139.json/default/TopLevel.js index b2fbeb7..3d28f84 100644 --- a/base/javascript/test/inputs/json/misc/f3139.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/f3139.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/f3edf.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/f3edf.json/default/TopLevel.js index 5072650..4e00fc1 100644 --- a/base/javascript/test/inputs/json/misc/f3edf.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/f3edf.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/f466a.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/f466a.json/default/TopLevel.js index 5072650..4e00fc1 100644 --- a/base/javascript/test/inputs/json/misc/f466a.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/f466a.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/f6a65.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/f6a65.json/default/TopLevel.js index 2c60e6b..be7adf1 100644 --- a/base/javascript/test/inputs/json/misc/f6a65.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/f6a65.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/f74d5.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/f74d5.json/default/TopLevel.js index 580e744..b885e16 100644 --- a/base/javascript/test/inputs/json/misc/f74d5.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/f74d5.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/f82d9.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/f82d9.json/default/TopLevel.js index 2df6837..254384b 100644 --- a/base/javascript/test/inputs/json/misc/f82d9.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/f82d9.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/f974d.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/f974d.json/default/TopLevel.js index 22fb238..8c1c228 100644 --- a/base/javascript/test/inputs/json/misc/f974d.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/f974d.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/faff5.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/faff5.json/default/TopLevel.js index 984006a..e66e3bc 100644 --- a/base/javascript/test/inputs/json/misc/faff5.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/faff5.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/fcca3.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/fcca3.json/default/TopLevel.js index e17f74c..d79bc88 100644 --- a/base/javascript/test/inputs/json/misc/fcca3.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/fcca3.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/misc/fd329.json/default/TopLevel.js b/head/javascript/test/inputs/json/misc/fd329.json/default/TopLevel.js index d23e2d7..26720c9 100644 --- a/base/javascript/test/inputs/json/misc/fd329.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/misc/fd329.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/blns-object.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/blns-object.json/default/TopLevel.js index 02c4dcf..d7f8864 100644 --- a/base/javascript/test/inputs/json/priority/blns-object.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/blns-object.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/bug2037.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/bug2037.json/default/TopLevel.js index 4db6c3c..66155fc 100644 --- a/base/javascript/test/inputs/json/priority/bug2037.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/bug2037.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/bug2521.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/bug2521.json/default/TopLevel.js index 439166c..fab4828 100644 --- a/base/javascript/test/inputs/json/priority/bug2521.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/bug2521.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/bug2590.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/bug2590.json/default/TopLevel.js index 6c8f4c3..5b5ca0d 100644 --- a/base/javascript/test/inputs/json/priority/bug2590.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/bug2590.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/bug2663.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/bug2663.json/default/TopLevel.js index c6916a2..67fe61a 100644 --- a/base/javascript/test/inputs/json/priority/bug2663.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/bug2663.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/bug2793.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/bug2793.json/default/TopLevel.js index 4b2fe59..e213851 100644 --- a/base/javascript/test/inputs/json/priority/bug2793.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/bug2793.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/bug427.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/bug427.json/default/TopLevel.js index 0e23edd..05ec1bb 100644 --- a/base/javascript/test/inputs/json/priority/bug427.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/bug427.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/bug790.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/bug790.json/default/TopLevel.js index 076984a..e3c4f8d 100644 --- a/base/javascript/test/inputs/json/priority/bug790.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/bug790.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/bug855-short.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/bug855-short.json/default/TopLevel.js index bd2794c..afa6171 100644 --- a/base/javascript/test/inputs/json/priority/bug855-short.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/bug855-short.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/bug863.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/bug863.json/default/TopLevel.js index cabd493..9381f2a 100644 --- a/base/javascript/test/inputs/json/priority/bug863.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/bug863.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/coin-pairs.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/coin-pairs.json/default/TopLevel.js index c113e96..089a6fe 100644 --- a/base/javascript/test/inputs/json/priority/coin-pairs.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/coin-pairs.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations1.json/converters-top-level--67aa452ed509/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations1.json/converters-top-level--67aa452ed509/TopLevel.js index c6b3420..a23b466 100644 --- a/base/javascript/test/inputs/json/priority/combinations1.json/converters-top-level--67aa452ed509/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations1.json/converters-top-level--67aa452ed509/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations1.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations1.json/default/TopLevel.js index c6b3420..a23b466 100644 --- a/base/javascript/test/inputs/json/priority/combinations1.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations1.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations1.json/raw-type-any--474b307c39db/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations1.json/raw-type-any--474b307c39db/TopLevel.js index e220990..a3c3aca 100644 --- a/base/javascript/test/inputs/json/priority/combinations1.json/raw-type-any--474b307c39db/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations1.json/raw-type-any--474b307c39db/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations1.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations1.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js index 957f00f..7918c35 100644 --- a/base/javascript/test/inputs/json/priority/combinations1.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations1.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations2.json/converters-top-level--67aa452ed509/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations2.json/converters-top-level--67aa452ed509/TopLevel.js index 8de8df6..c1d83b1 100644 --- a/base/javascript/test/inputs/json/priority/combinations2.json/converters-top-level--67aa452ed509/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations2.json/converters-top-level--67aa452ed509/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations2.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations2.json/default/TopLevel.js index 8de8df6..c1d83b1 100644 --- a/base/javascript/test/inputs/json/priority/combinations2.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations2.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations2.json/raw-type-any--474b307c39db/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations2.json/raw-type-any--474b307c39db/TopLevel.js index 2362827..dbe29a3 100644 --- a/base/javascript/test/inputs/json/priority/combinations2.json/raw-type-any--474b307c39db/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations2.json/raw-type-any--474b307c39db/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations2.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations2.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js index fbb3c93..a5c1d45 100644 --- a/base/javascript/test/inputs/json/priority/combinations2.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations2.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations3.json/converters-top-level--67aa452ed509/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations3.json/converters-top-level--67aa452ed509/TopLevel.js index 7bdc1a8..4723d15 100644 --- a/base/javascript/test/inputs/json/priority/combinations3.json/converters-top-level--67aa452ed509/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations3.json/converters-top-level--67aa452ed509/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations3.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations3.json/default/TopLevel.js index 7bdc1a8..4723d15 100644 --- a/base/javascript/test/inputs/json/priority/combinations3.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations3.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations3.json/raw-type-any--474b307c39db/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations3.json/raw-type-any--474b307c39db/TopLevel.js index 0fc1b77..050abee 100644 --- a/base/javascript/test/inputs/json/priority/combinations3.json/raw-type-any--474b307c39db/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations3.json/raw-type-any--474b307c39db/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations3.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations3.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js index d88ee80..881744f 100644 --- a/base/javascript/test/inputs/json/priority/combinations3.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations3.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations4.json/converters-top-level--67aa452ed509/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations4.json/converters-top-level--67aa452ed509/TopLevel.js index 9098e52..c1d0758 100644 --- a/base/javascript/test/inputs/json/priority/combinations4.json/converters-top-level--67aa452ed509/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations4.json/converters-top-level--67aa452ed509/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations4.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations4.json/default/TopLevel.js index 9098e52..c1d0758 100644 --- a/base/javascript/test/inputs/json/priority/combinations4.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations4.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations4.json/raw-type-any--474b307c39db/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations4.json/raw-type-any--474b307c39db/TopLevel.js index 84b4eb4..42f267c 100644 --- a/base/javascript/test/inputs/json/priority/combinations4.json/raw-type-any--474b307c39db/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations4.json/raw-type-any--474b307c39db/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combinations4.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js b/head/javascript/test/inputs/json/priority/combinations4.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js index 60a61ff..d6de1a3 100644 --- a/base/javascript/test/inputs/json/priority/combinations4.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combinations4.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/combined-enum.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/combined-enum.json/default/TopLevel.js index 7db1140..942586f 100644 --- a/base/javascript/test/inputs/json/priority/combined-enum.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/combined-enum.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/direct-recursive.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/direct-recursive.json/default/TopLevel.js index 25bdd46..27af9e8 100644 --- a/base/javascript/test/inputs/json/priority/direct-recursive.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/direct-recursive.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/empty-enum.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/empty-enum.json/default/TopLevel.js index 2805dbb..c7f6476 100644 --- a/base/javascript/test/inputs/json/priority/empty-enum.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/empty-enum.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/identifiers.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/identifiers.json/default/TopLevel.js index 24aedef..4a773fc 100644 --- a/base/javascript/test/inputs/json/priority/identifiers.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/identifiers.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/issue2680-object-array.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/issue2680-object-array.json/default/TopLevel.js index 601b357..8536604 100644 --- a/base/javascript/test/inputs/json/priority/issue2680-object-array.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/issue2680-object-array.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/issue2680-scalar-array.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/issue2680-scalar-array.json/default/TopLevel.js index 9515706..d748932 100644 --- a/base/javascript/test/inputs/json/priority/issue2680-scalar-array.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/issue2680-scalar-array.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/keywords.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/keywords.json/default/TopLevel.js index 3210b84..e7bf8a2 100644 --- a/base/javascript/test/inputs/json/priority/keywords.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/keywords.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/TopLevel.js index afd8b5b..2b5f4d6 100644 --- a/base/javascript/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/list.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/list.json/default/TopLevel.js index 279b16f..474e237 100644 --- a/base/javascript/test/inputs/json/priority/list.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/list.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/name-style.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/name-style.json/default/TopLevel.js index 1f13def..e822845 100644 --- a/base/javascript/test/inputs/json/priority/name-style.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/name-style.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/nbl-stats.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/nbl-stats.json/default/TopLevel.js index 6a9855b..ae9d634 100644 --- a/base/javascript/test/inputs/json/priority/nbl-stats.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/nbl-stats.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/nested-objects.json/converters-all-objects--3a443babd1cb/TopLevel.js b/head/javascript/test/inputs/json/priority/nested-objects.json/converters-all-objects--3a443babd1cb/TopLevel.js index d14ecfb..07a5831 100644 --- a/base/javascript/test/inputs/json/priority/nested-objects.json/converters-all-objects--3a443babd1cb/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/nested-objects.json/converters-all-objects--3a443babd1cb/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/nested-objects.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/nested-objects.json/default/TopLevel.js index d14ecfb..07a5831 100644 --- a/base/javascript/test/inputs/json/priority/nested-objects.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/nested-objects.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/no-classes.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/no-classes.json/default/TopLevel.js index 38e3295..1e0698e 100644 --- a/base/javascript/test/inputs/json/priority/no-classes.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/no-classes.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/nst-test-suite.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/nst-test-suite.json/default/TopLevel.js index c52af80..93e8284 100644 --- a/base/javascript/test/inputs/json/priority/nst-test-suite.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/nst-test-suite.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/number-map.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/number-map.json/default/TopLevel.js index f67e389..9917207 100644 --- a/base/javascript/test/inputs/json/priority/number-map.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/number-map.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/omit-empty.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/omit-empty.json/default/TopLevel.js index 43380a8..c51301c 100644 --- a/base/javascript/test/inputs/json/priority/omit-empty.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/omit-empty.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/optional-union.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/optional-union.json/default/TopLevel.js index 2287ca4..1987f30 100644 --- a/base/javascript/test/inputs/json/priority/optional-union.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/optional-union.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/php-mixed-union.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/php-mixed-union.json/default/TopLevel.js index 555bab5..4c36d9e 100644 --- a/base/javascript/test/inputs/json/priority/php-mixed-union.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/php-mixed-union.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/php-validation.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/php-validation.json/default/TopLevel.js index 6cdb09a..32e05cf 100644 --- a/base/javascript/test/inputs/json/priority/php-validation.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/php-validation.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/recursive.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/recursive.json/default/TopLevel.js index ebdf80c..493e2f0 100644 --- a/base/javascript/test/inputs/json/priority/recursive.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/recursive.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/simple-identifiers.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/simple-identifiers.json/default/TopLevel.js index 1ecd528..4fbdf91 100644 --- a/base/javascript/test/inputs/json/priority/simple-identifiers.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/simple-identifiers.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/union-constructor-clash.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/union-constructor-clash.json/default/TopLevel.js index f541287..a27c20f 100644 --- a/base/javascript/test/inputs/json/priority/union-constructor-clash.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/union-constructor-clash.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/unions.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/unions.json/default/TopLevel.js index 5686cad..a44041e 100644 --- a/base/javascript/test/inputs/json/priority/unions.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/unions.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/url.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/url.json/default/TopLevel.js index eddd54c..c6b6a0c 100644 --- a/base/javascript/test/inputs/json/priority/url.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/url.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/priority/uuids.json/default/TopLevel.js b/head/javascript/test/inputs/json/priority/uuids.json/default/TopLevel.js index a8baed6..3991b2d 100644 --- a/base/javascript/test/inputs/json/priority/uuids.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/priority/uuids.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/samples/bitcoin-block.json/default/TopLevel.js b/head/javascript/test/inputs/json/samples/bitcoin-block.json/default/TopLevel.js index 22fb238..8c1c228 100644 --- a/base/javascript/test/inputs/json/samples/bitcoin-block.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/samples/bitcoin-block.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/samples/copy-with-property.json/default/TopLevel.js b/head/javascript/test/inputs/json/samples/copy-with-property.json/default/TopLevel.js index 744997a..6801649 100644 --- a/base/javascript/test/inputs/json/samples/copy-with-property.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/samples/copy-with-property.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/samples/getting-started.json/default/TopLevel.js b/head/javascript/test/inputs/json/samples/getting-started.json/default/TopLevel.js index 6286f9a..b401b62 100644 --- a/base/javascript/test/inputs/json/samples/getting-started.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/samples/getting-started.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/samples/github-events.json/default/TopLevel.js b/head/javascript/test/inputs/json/samples/github-events.json/default/TopLevel.js index 8cdad8e..abbe68c 100644 --- a/base/javascript/test/inputs/json/samples/github-events.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/samples/github-events.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/samples/kitchen-sink.json/default/TopLevel.js b/head/javascript/test/inputs/json/samples/kitchen-sink.json/default/TopLevel.js index 482996b..a7b5f3d 100644 --- a/base/javascript/test/inputs/json/samples/kitchen-sink.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/samples/kitchen-sink.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/samples/null-safe.json/default/TopLevel.js b/head/javascript/test/inputs/json/samples/null-safe.json/default/TopLevel.js index 561f080..b5e06fb 100644 --- a/base/javascript/test/inputs/json/samples/null-safe.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/samples/null-safe.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/samples/objc-control-characters.json/default/TopLevel.js b/head/javascript/test/inputs/json/samples/objc-control-characters.json/default/TopLevel.js index a887bec..c8a8fd1 100644 --- a/base/javascript/test/inputs/json/samples/objc-control-characters.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/samples/objc-control-characters.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/samples/pokedex.json/default/TopLevel.js b/head/javascript/test/inputs/json/samples/pokedex.json/default/TopLevel.js index 51d9840..130a172 100644 --- a/base/javascript/test/inputs/json/samples/pokedex.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/samples/pokedex.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/samples/reddit.json/default/TopLevel.js b/head/javascript/test/inputs/json/samples/reddit.json/default/TopLevel.js index 1ebb38a..c5ad44a 100644 --- a/base/javascript/test/inputs/json/samples/reddit.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/samples/reddit.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/samples/simple-object.json/default/TopLevel.js b/head/javascript/test/inputs/json/samples/simple-object.json/default/TopLevel.js index 6be8558..e89ee24 100644 --- a/base/javascript/test/inputs/json/samples/simple-object.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/samples/simple-object.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/samples/spotify-album.json/default/TopLevel.js b/head/javascript/test/inputs/json/samples/spotify-album.json/default/TopLevel.js index 86817b6..e5a7450 100644 --- a/base/javascript/test/inputs/json/samples/spotify-album.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/samples/spotify-album.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/samples/us-avg-temperatures.json/default/TopLevel.js b/head/javascript/test/inputs/json/samples/us-avg-temperatures.json/default/TopLevel.js index d23e2d7..26720c9 100644 --- a/base/javascript/test/inputs/json/samples/us-avg-temperatures.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/samples/us-avg-temperatures.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/javascript/test/inputs/json/samples/us-senators.json/default/TopLevel.js b/head/javascript/test/inputs/json/samples/us-senators.json/default/TopLevel.js index dc3a543..b8b2b56 100644 --- a/base/javascript/test/inputs/json/samples/us-senators.json/default/TopLevel.js +++ b/head/javascript/test/inputs/json/samples/us-senators.json/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/accessors.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/accessors.schema/default/TopLevel.js index 782c410..601cf38 100644 --- a/base/schema-flow/test/inputs/schema/accessors.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/accessors.schema/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/all-of-additional-properties-false.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/all-of-additional-properties-false.schema/default/TopLevel.js index 30facbe..1c4ba9b 100644 --- a/base/schema-flow/test/inputs/schema/all-of-additional-properties-false.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/all-of-additional-properties-false.schema/default/TopLevel.js @@ -105,9 +105,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/any.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/any.schema/default/TopLevel.js index 9b41bf2..75ab261 100644 --- a/base/schema-flow/test/inputs/schema/any.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/any.schema/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/bool-string.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/bool-string.schema/default/TopLevel.js index de3bb1e..55a27a2 100644 --- a/base/schema-flow/test/inputs/schema/bool-string.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/bool-string.schema/default/TopLevel.js @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/boolean-subschema.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/boolean-subschema.schema/default/TopLevel.js index 0ab5f8f..4ff70a3 100644 --- a/base/schema-flow/test/inputs/schema/boolean-subschema.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/boolean-subschema.schema/default/TopLevel.js @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/camelCase.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/camelCase.schema/default/TopLevel.js index e050014..7699dad 100644 --- a/base/schema-flow/test/inputs/schema/camelCase.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/camelCase.schema/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/class-map-union.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/class-map-union.schema/default/TopLevel.js index f8747ce..2c46211 100644 --- a/base/schema-flow/test/inputs/schema/class-map-union.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/class-map-union.schema/default/TopLevel.js @@ -110,9 +110,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/class-with-additional.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/class-with-additional.schema/default/TopLevel.js index 319b5d0..c7cfc40 100644 --- a/base/schema-flow/test/inputs/schema/class-with-additional.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/class-with-additional.schema/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.js index 03492d1..77c2e0f 100644 --- a/base/schema-flow/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.js @@ -108,9 +108,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.js index 7267743..2e87108 100644 --- a/base/schema-flow/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.js @@ -114,9 +114,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.js index 3883ea0..476b37c 100644 --- a/base/schema-flow/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.js @@ -105,9 +105,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/comment-injection.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/comment-injection.schema/default/TopLevel.js index a6c6ee5..810e5e0 100644 --- a/base/schema-flow/test/inputs/schema/comment-injection.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/comment-injection.schema/default/TopLevel.js @@ -133,9 +133,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/const-non-string.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/const-non-string.schema/default/TopLevel.js index bfdefce..56bbd5c 100644 --- a/base/schema-flow/test/inputs/schema/const-non-string.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/const-non-string.schema/default/TopLevel.js @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/constructor.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/constructor.schema/default/TopLevel.js index 461857e..5005d44 100644 --- a/base/schema-flow/test/inputs/schema/constructor.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/constructor.schema/default/TopLevel.js @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/cut-enum.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/cut-enum.schema/default/TopLevel.js index fd3804b..3b5370c 100644 --- a/base/schema-flow/test/inputs/schema/cut-enum.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/cut-enum.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/date-time-or-string.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/date-time-or-string.schema/default/TopLevel.js index 159b882..9df555f 100644 --- a/base/schema-flow/test/inputs/schema/date-time-or-string.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/date-time-or-string.schema/default/TopLevel.js @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/date-time.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/date-time.schema/default/TopLevel.js index 5679fa7..1ddead4 100644 --- a/base/schema-flow/test/inputs/schema/date-time.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/date-time.schema/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/default-value.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/default-value.schema/default/TopLevel.js index 9529bb0..ea149f5 100644 --- a/base/schema-flow/test/inputs/schema/default-value.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/default-value.schema/default/TopLevel.js @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.js index 460c470..ef27da7 100644 --- a/base/schema-flow/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/description.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/description.schema/default/TopLevel.js index 8a80a17..b9ea8af 100644 --- a/base/schema-flow/test/inputs/schema/description.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/description.schema/default/TopLevel.js @@ -132,9 +132,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/direct-union.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/direct-union.schema/default/TopLevel.js index 953338d..1df9624 100644 --- a/base/schema-flow/test/inputs/schema/direct-union.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/direct-union.schema/default/TopLevel.js @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/empty-object.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/empty-object.schema/default/TopLevel.js index 3b57852..7230cdf 100644 --- a/base/schema-flow/test/inputs/schema/empty-object.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/empty-object.schema/default/TopLevel.js @@ -91,9 +91,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/enum-large.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/enum-large.schema/default/TopLevel.js index da2bc16..2a53c1c 100644 --- a/base/schema-flow/test/inputs/schema/enum-large.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/enum-large.schema/default/TopLevel.js @@ -122,9 +122,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/enum-with-null.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/enum-with-null.schema/default/TopLevel.js index 6d8d098..27227f8 100644 --- a/base/schema-flow/test/inputs/schema/enum-with-null.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/enum-with-null.schema/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/enum-with-values.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/enum-with-values.schema/default/TopLevel.js index b984eb2..cf86cec 100644 --- a/base/schema-flow/test/inputs/schema/enum-with-values.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/enum-with-values.schema/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/enum.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/enum.schema/default/TopLevel.js index 6fe5b6c..12db1d5 100644 --- a/base/schema-flow/test/inputs/schema/enum.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/enum.schema/default/TopLevel.js @@ -115,9 +115,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/fractional-bounds.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/fractional-bounds.schema/default/TopLevel.js index 022ded2..bcd7f21 100644 --- a/base/schema-flow/test/inputs/schema/fractional-bounds.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/fractional-bounds.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.js index 35ad8a1..7c09a59 100644 --- a/base/schema-flow/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.js index 4142df5..06ccc31 100644 --- a/base/schema-flow/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/id-no-address.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/id-no-address.schema/default/TopLevel.js index 94dd602..22aa196 100644 --- a/base/schema-flow/test/inputs/schema/id-no-address.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/id-no-address.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/id-root.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/id-root.schema/default/TopLevel.js index 0da7b3c..0a7d4d0 100644 --- a/base/schema-flow/test/inputs/schema/id-root.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/id-root.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.js index 282e724..3831198 100644 --- a/base/schema-flow/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.js @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/implicit-all-of.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/implicit-all-of.schema/default/TopLevel.js index 3e5b1af..054eb72 100644 --- a/base/schema-flow/test/inputs/schema/implicit-all-of.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/implicit-all-of.schema/default/TopLevel.js @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.js index 7c09067..57b3b2b 100644 --- a/base/schema-flow/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.js @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/implicit-one-of.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/implicit-one-of.schema/default/TopLevel.js index 028af63..5a10a9b 100644 --- a/base/schema-flow/test/inputs/schema/implicit-one-of.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/implicit-one-of.schema/default/TopLevel.js @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/integer-before-number.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/integer-before-number.schema/default/TopLevel.js index c7d038a..2fb86c2 100644 --- a/base/schema-flow/test/inputs/schema/integer-before-number.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/integer-before-number.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/integer-float-union.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/integer-float-union.schema/default/TopLevel.js index c434c99..6c57eae 100644 --- a/base/schema-flow/test/inputs/schema/integer-float-union.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/integer-float-union.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/integer-string.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/integer-string.schema/default/TopLevel.js index ef28a5e..89814c2 100644 --- a/base/schema-flow/test/inputs/schema/integer-string.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/integer-string.schema/default/TopLevel.js @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/integer-type.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/integer-type.schema/default/TopLevel.js index 51b83f3..ef684a1 100644 --- a/base/schema-flow/test/inputs/schema/integer-type.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/integer-type.schema/default/TopLevel.js @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/intersection-nested.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/intersection-nested.schema/default/TopLevel.js index 58885fc..c3c787e 100644 --- a/base/schema-flow/test/inputs/schema/intersection-nested.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/intersection-nested.schema/default/TopLevel.js @@ -93,9 +93,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/intersection.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/intersection.schema/default/TopLevel.js index 7ff9370..bf4efc8 100644 --- a/base/schema-flow/test/inputs/schema/intersection.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/intersection.schema/default/TopLevel.js @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/issue2680-top-level-array.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/issue2680-top-level-array.schema/default/TopLevel.js index 57ef2c0..a9d8502 100644 --- a/base/schema-flow/test/inputs/schema/issue2680-top-level-array.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/issue2680-top-level-array.schema/default/TopLevel.js @@ -91,9 +91,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/keyword-enum.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/keyword-enum.schema/default/TopLevel.js index bbfdfd0..8231137 100644 --- a/base/schema-flow/test/inputs/schema/keyword-enum.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/keyword-enum.schema/default/TopLevel.js @@ -429,9 +429,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/keyword-unions.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/keyword-unions.schema/default/TopLevel.js index 0ba6f6c..f449281 100644 --- a/base/schema-flow/test/inputs/schema/keyword-unions.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/keyword-unions.schema/default/TopLevel.js @@ -2086,9 +2086,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/light.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/light.schema/default/TopLevel.js index 87eb58e..b02c34c 100644 --- a/base/schema-flow/test/inputs/schema/light.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/light.schema/default/TopLevel.js @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/list.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/list.schema/default/TopLevel.js index 17c0e10..a2458ef 100644 --- a/base/schema-flow/test/inputs/schema/list.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/list.schema/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/min-max-items.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/min-max-items.schema/default/TopLevel.js index 669266c..a6b70c5 100644 --- a/base/schema-flow/test/inputs/schema/min-max-items.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/min-max-items.schema/default/TopLevel.js @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/minmax-integer.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/minmax-integer.schema/default/TopLevel.js index 60be51d..cbebbb8 100644 --- a/base/schema-flow/test/inputs/schema/minmax-integer.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/minmax-integer.schema/default/TopLevel.js @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/minmax.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/minmax.schema/default/TopLevel.js index d58225c..7cf407a 100644 --- a/base/schema-flow/test/inputs/schema/minmax.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/minmax.schema/default/TopLevel.js @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/minmaxlength.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/minmaxlength.schema/default/TopLevel.js index bd4537b..8d283a0 100644 --- a/base/schema-flow/test/inputs/schema/minmaxlength.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/minmaxlength.schema/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/multi-type-enum.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/multi-type-enum.schema/default/TopLevel.js index 61a8238..2ade040 100644 --- a/base/schema-flow/test/inputs/schema/multi-type-enum.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/multi-type-enum.schema/default/TopLevel.js @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/mutually-recursive.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/mutually-recursive.schema/default/TopLevel.js index cbf3645..39499d4 100644 --- a/base/schema-flow/test/inputs/schema/mutually-recursive.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/mutually-recursive.schema/default/TopLevel.js @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.js index 11caa97..ea215a4 100644 --- a/base/schema-flow/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.js @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/non-standard-ref.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/non-standard-ref.schema/default/TopLevel.js index 63ee252..fa97e2f 100644 --- a/base/schema-flow/test/inputs/schema/non-standard-ref.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/non-standard-ref.schema/default/TopLevel.js @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.js index b682aea..1f69c34 100644 --- a/base/schema-flow/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.js @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/object-type-required.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/object-type-required.schema/default/TopLevel.js index 695aabc..49dba9c 100644 --- a/base/schema-flow/test/inputs/schema/object-type-required.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/object-type-required.schema/default/TopLevel.js @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/optional-any.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/optional-any.schema/default/TopLevel.js index e3ef54d..7604895 100644 --- a/base/schema-flow/test/inputs/schema/optional-any.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/optional-any.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/optional-const-ref.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/optional-const-ref.schema/default/TopLevel.js index c6e94b4..8927c18 100644 --- a/base/schema-flow/test/inputs/schema/optional-const-ref.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/optional-const-ref.schema/default/TopLevel.js @@ -104,9 +104,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/optional-constraints.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/optional-constraints.schema/default/TopLevel.js index 3afc5fb..64dcc3e 100644 --- a/base/schema-flow/test/inputs/schema/optional-constraints.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/optional-constraints.schema/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/optional-date-time.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/optional-date-time.schema/default/TopLevel.js index 5c5a63e..5d65579 100644 --- a/base/schema-flow/test/inputs/schema/optional-date-time.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/optional-date-time.schema/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/optional-enum.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/optional-enum.schema/default/TopLevel.js index 5708ba1..3453a0c 100644 --- a/base/schema-flow/test/inputs/schema/optional-enum.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/optional-enum.schema/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/optional-property.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/optional-property.schema/default/TopLevel.js index 9e8c173..f7fe541 100644 --- a/base/schema-flow/test/inputs/schema/optional-property.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/optional-property.schema/default/TopLevel.js @@ -93,9 +93,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/pattern.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/pattern.schema/default/TopLevel.js index 7259f33..decff9b 100644 --- a/base/schema-flow/test/inputs/schema/pattern.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/pattern.schema/default/TopLevel.js @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/postman-collection.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/postman-collection.schema/default/TopLevel.js index 8139ed9..08449ac 100644 --- a/base/schema-flow/test/inputs/schema/postman-collection.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/postman-collection.schema/default/TopLevel.js @@ -104,9 +104,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/prefix-items.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/prefix-items.schema/default/TopLevel.js index de153a7..8853184 100644 --- a/base/schema-flow/test/inputs/schema/prefix-items.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/prefix-items.schema/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.js index b1766ee..4a7d560 100644 --- a/base/schema-flow/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.js @@ -107,9 +107,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/ref-id-files.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/ref-id-files.schema/default/TopLevel.js index fd3804b..3b5370c 100644 --- a/base/schema-flow/test/inputs/schema/ref-id-files.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/ref-id-files.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/ref-remote.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/ref-remote.schema/default/TopLevel.js index 17c0e10..a2458ef 100644 --- a/base/schema-flow/test/inputs/schema/ref-remote.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/ref-remote.schema/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/renaming-bug.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/renaming-bug.schema/default/TopLevel.js index bfa4e9f..89fe00e 100644 --- a/base/schema-flow/test/inputs/schema/renaming-bug.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/renaming-bug.schema/default/TopLevel.js @@ -196,9 +196,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/required-draft3.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/required-draft3.schema/default/TopLevel.js index d35b9e7..ba73668 100644 --- a/base/schema-flow/test/inputs/schema/required-draft3.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/required-draft3.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/required-non-properties.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/required-non-properties.schema/default/TopLevel.js index 99c86ad..4994bfb 100644 --- a/base/schema-flow/test/inputs/schema/required-non-properties.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/required-non-properties.schema/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/required.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/required.schema/default/TopLevel.js index d35b9e7..ba73668 100644 --- a/base/schema-flow/test/inputs/schema/required.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/required.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.js index 9868a9b..5d99fbb 100644 --- a/base/schema-flow/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.js @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/schema-constraints.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/schema-constraints.schema/default/TopLevel.js index 2f38303..d6ec2ea 100644 --- a/base/schema-flow/test/inputs/schema/schema-constraints.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/schema-constraints.schema/default/TopLevel.js @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/simple-ref.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/simple-ref.schema/default/TopLevel.js index 17c0e10..a2458ef 100644 --- a/base/schema-flow/test/inputs/schema/simple-ref.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/simple-ref.schema/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/strict-optional.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/strict-optional.schema/default/TopLevel.js index f385a6f..fd4778e 100644 --- a/base/schema-flow/test/inputs/schema/strict-optional.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/strict-optional.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/top-level-array.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/top-level-array.schema/default/TopLevel.js index 6db6cca..dbfe72f 100644 --- a/base/schema-flow/test/inputs/schema/top-level-array.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/top-level-array.schema/default/TopLevel.js @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/top-level-enum.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/top-level-enum.schema/default/TopLevel.js index e182a8b..c24d320 100644 --- a/base/schema-flow/test/inputs/schema/top-level-enum.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/top-level-enum.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/top-level-primitive-array.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/top-level-primitive-array.schema/default/TopLevel.js index c8d59da..22b551b 100644 --- a/base/schema-flow/test/inputs/schema/top-level-primitive-array.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/top-level-primitive-array.schema/default/TopLevel.js @@ -91,9 +91,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/top-level-primitive.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/top-level-primitive.schema/default/TopLevel.js index bd2bada..52a9429 100644 --- a/base/schema-flow/test/inputs/schema/top-level-primitive.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/top-level-primitive.schema/default/TopLevel.js @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/tuple.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/tuple.schema/default/TopLevel.js index 0a3be23..817d6d8 100644 --- a/base/schema-flow/test/inputs/schema/tuple.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/tuple.schema/default/TopLevel.js @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.js index 8c9f7fb..c6c3c6b 100644 --- a/base/schema-flow/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.js @@ -112,9 +112,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/unicode-codepoint-length.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/unicode-codepoint-length.schema/default/TopLevel.js index ab0a898..321c0c7 100644 --- a/base/schema-flow/test/inputs/schema/unicode-codepoint-length.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/unicode-codepoint-length.schema/default/TopLevel.js @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/union-int-double.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/union-int-double.schema/default/TopLevel.js index 0e237ee..16111f5 100644 --- a/base/schema-flow/test/inputs/schema/union-int-double.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/union-int-double.schema/default/TopLevel.js @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/union-list.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/union-list.schema/default/TopLevel.js index 2b31d51..38cad22 100644 --- a/base/schema-flow/test/inputs/schema/union-list.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/union-list.schema/default/TopLevel.js @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/union.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/union.schema/default/TopLevel.js index af3f6dc..c7fda1f 100644 --- a/base/schema-flow/test/inputs/schema/union.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/union.schema/default/TopLevel.js @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/uuid.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/uuid.schema/default/TopLevel.js index b30ae68..8729e54 100644 --- a/base/schema-flow/test/inputs/schema/uuid.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/uuid.schema/default/TopLevel.js @@ -104,9 +104,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-flow/test/inputs/schema/vega-lite.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/vega-lite.schema/default/TopLevel.js index e870aef..f061ca7 100644 --- a/base/schema-flow/test/inputs/schema/vega-lite.schema/default/TopLevel.js +++ b/head/schema-flow/test/inputs/schema/vega-lite.schema/default/TopLevel.js @@ -6185,9 +6185,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/accessors.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/accessors.schema/default/TopLevel.js index eb93e60..60936b9 100644 --- a/base/schema-javascript/test/inputs/schema/accessors.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/accessors.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/all-of-additional-properties-false.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/all-of-additional-properties-false.schema/default/TopLevel.js index 01d1011..cb6b84f 100644 --- a/base/schema-javascript/test/inputs/schema/all-of-additional-properties-false.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/all-of-additional-properties-false.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/any.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/any.schema/default/TopLevel.js index 93439e6..c9ea8b0 100644 --- a/base/schema-javascript/test/inputs/schema/any.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/any.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/bool-string.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/bool-string.schema/default/TopLevel.js index d5a8ec8..790af0f 100644 --- a/base/schema-javascript/test/inputs/schema/bool-string.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/bool-string.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/boolean-subschema.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/boolean-subschema.schema/default/TopLevel.js index 596d20f..2a43a85 100644 --- a/base/schema-javascript/test/inputs/schema/boolean-subschema.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/boolean-subschema.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/camelCase.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/camelCase.schema/default/TopLevel.js index 4b3914b..3863055 100644 --- a/base/schema-javascript/test/inputs/schema/camelCase.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/camelCase.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/class-map-union.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/class-map-union.schema/default/TopLevel.js index 0c7c22f..d03cb9d 100644 --- a/base/schema-javascript/test/inputs/schema/class-map-union.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/class-map-union.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/class-with-additional.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/class-with-additional.schema/default/TopLevel.js index 13e6554..f528d70 100644 --- a/base/schema-javascript/test/inputs/schema/class-with-additional.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/class-with-additional.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.js index df87d90..bbf1758 100644 --- a/base/schema-javascript/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.js index df87d90..bbf1758 100644 --- a/base/schema-javascript/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.js index d5f1013..c4625a4 100644 --- a/base/schema-javascript/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/comment-injection.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/comment-injection.schema/default/TopLevel.js index fc9edb9..cc76fc9 100644 --- a/base/schema-javascript/test/inputs/schema/comment-injection.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/comment-injection.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/const-non-string.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/const-non-string.schema/default/TopLevel.js index 633025b..7e1a30f 100644 --- a/base/schema-javascript/test/inputs/schema/const-non-string.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/const-non-string.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/constructor.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/constructor.schema/default/TopLevel.js index 38db74a..dc09fc2 100644 --- a/base/schema-javascript/test/inputs/schema/constructor.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/constructor.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/cut-enum.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/cut-enum.schema/default/TopLevel.js index 8f33714..ca64a9e 100644 --- a/base/schema-javascript/test/inputs/schema/cut-enum.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/cut-enum.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/date-time-or-string.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/date-time-or-string.schema/default/TopLevel.js index 02a84a3..4cae228 100644 --- a/base/schema-javascript/test/inputs/schema/date-time-or-string.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/date-time-or-string.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/date-time.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/date-time.schema/default/TopLevel.js index e3c81ff..622a31d 100644 --- a/base/schema-javascript/test/inputs/schema/date-time.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/date-time.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/default-value.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/default-value.schema/default/TopLevel.js index fed7bb6..a7e090d 100644 --- a/base/schema-javascript/test/inputs/schema/default-value.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/default-value.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.js index a60a61d..37f4247 100644 --- a/base/schema-javascript/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/description.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/description.schema/default/TopLevel.js index 9beaaae..88e90b4 100644 --- a/base/schema-javascript/test/inputs/schema/description.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/description.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/direct-union.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/direct-union.schema/default/TopLevel.js index bd3ee9a..597af96 100644 --- a/base/schema-javascript/test/inputs/schema/direct-union.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/direct-union.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/empty-object.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/empty-object.schema/default/TopLevel.js index 57bbea2..59931f4 100644 --- a/base/schema-javascript/test/inputs/schema/empty-object.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/empty-object.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/enum-large.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/enum-large.schema/default/TopLevel.js index a0aed2b..daaa221 100644 --- a/base/schema-javascript/test/inputs/schema/enum-large.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/enum-large.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/enum-with-null.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/enum-with-null.schema/default/TopLevel.js index 492c8d8..eba023d 100644 --- a/base/schema-javascript/test/inputs/schema/enum-with-null.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/enum-with-null.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/enum-with-values.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/enum-with-values.schema/default/TopLevel.js index c7ec8cd..0552e18 100644 --- a/base/schema-javascript/test/inputs/schema/enum-with-values.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/enum-with-values.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/enum.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/enum.schema/default/TopLevel.js index 2242ba6..777d093 100644 --- a/base/schema-javascript/test/inputs/schema/enum.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/enum.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/fractional-bounds.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/fractional-bounds.schema/default/TopLevel.js index 2f0bc8f..49ecd10 100644 --- a/base/schema-javascript/test/inputs/schema/fractional-bounds.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/fractional-bounds.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.js index e5d80d9..771d8d1 100644 --- a/base/schema-javascript/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.js index 074fee8..2752504 100644 --- a/base/schema-javascript/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/id-no-address.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/id-no-address.schema/default/TopLevel.js index 8ceabb8..d3dc39a 100644 --- a/base/schema-javascript/test/inputs/schema/id-no-address.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/id-no-address.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/id-root.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/id-root.schema/default/TopLevel.js index c70a4f7..829c3ce 100644 --- a/base/schema-javascript/test/inputs/schema/id-root.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/id-root.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.js index b293c44..6873770 100644 --- a/base/schema-javascript/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/implicit-all-of.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/implicit-all-of.schema/default/TopLevel.js index afc3a12..7170c43 100644 --- a/base/schema-javascript/test/inputs/schema/implicit-all-of.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/implicit-all-of.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.js index 7b6d864..b9b42e2 100644 --- a/base/schema-javascript/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/implicit-one-of.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/implicit-one-of.schema/default/TopLevel.js index 77234bf..c03f694 100644 --- a/base/schema-javascript/test/inputs/schema/implicit-one-of.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/implicit-one-of.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/integer-before-number.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/integer-before-number.schema/default/TopLevel.js index 0be94db..ac7188d 100644 --- a/base/schema-javascript/test/inputs/schema/integer-before-number.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/integer-before-number.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/integer-float-union.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/integer-float-union.schema/default/TopLevel.js index dbc9c1a..08a09ff 100644 --- a/base/schema-javascript/test/inputs/schema/integer-float-union.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/integer-float-union.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/integer-string.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/integer-string.schema/default/TopLevel.js index 0464053..a9f265c 100644 --- a/base/schema-javascript/test/inputs/schema/integer-string.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/integer-string.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/integer-type.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/integer-type.schema/default/TopLevel.js index b132e1a..6d9df16 100644 --- a/base/schema-javascript/test/inputs/schema/integer-type.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/integer-type.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/intersection-nested.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/intersection-nested.schema/default/TopLevel.js index 42c8812..ac6244f 100644 --- a/base/schema-javascript/test/inputs/schema/intersection-nested.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/intersection-nested.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/intersection.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/intersection.schema/default/TopLevel.js index a7c7c5e..ffb98f7 100644 --- a/base/schema-javascript/test/inputs/schema/intersection.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/intersection.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/issue2680-top-level-array.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/issue2680-top-level-array.schema/default/TopLevel.js index 9515706..d748932 100644 --- a/base/schema-javascript/test/inputs/schema/issue2680-top-level-array.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/issue2680-top-level-array.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/keyword-enum.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/keyword-enum.schema/default/TopLevel.js index 72b3ce1..672c403 100644 --- a/base/schema-javascript/test/inputs/schema/keyword-enum.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/keyword-enum.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/keyword-unions.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/keyword-unions.schema/default/TopLevel.js index 39cbbd5..ed57578 100644 --- a/base/schema-javascript/test/inputs/schema/keyword-unions.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/keyword-unions.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/light.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/light.schema/default/TopLevel.js index 728625c..e8fe689 100644 --- a/base/schema-javascript/test/inputs/schema/light.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/light.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/list.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/list.schema/default/TopLevel.js index 2374532..139ad5d 100644 --- a/base/schema-javascript/test/inputs/schema/list.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/list.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/min-max-items.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/min-max-items.schema/default/TopLevel.js index b484c0d..94d2121 100644 --- a/base/schema-javascript/test/inputs/schema/min-max-items.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/min-max-items.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/minmax-integer.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/minmax-integer.schema/default/TopLevel.js index d29d8cb..7aa01d1 100644 --- a/base/schema-javascript/test/inputs/schema/minmax-integer.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/minmax-integer.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/minmax.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/minmax.schema/default/TopLevel.js index ef1dd4c..b4a7eae 100644 --- a/base/schema-javascript/test/inputs/schema/minmax.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/minmax.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/minmaxlength.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/minmaxlength.schema/default/TopLevel.js index 7fbee31..aa3f561 100644 --- a/base/schema-javascript/test/inputs/schema/minmaxlength.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/minmaxlength.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/multi-type-enum.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/multi-type-enum.schema/default/TopLevel.js index c378dc9..c76c268 100644 --- a/base/schema-javascript/test/inputs/schema/multi-type-enum.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/multi-type-enum.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/mutually-recursive.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/mutually-recursive.schema/default/TopLevel.js index ac03b2a..74bc4f9 100644 --- a/base/schema-javascript/test/inputs/schema/mutually-recursive.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/mutually-recursive.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.js index 5fcdf07..4ad5c69 100644 --- a/base/schema-javascript/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/non-standard-ref.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/non-standard-ref.schema/default/TopLevel.js index b3dee50..782a1d2 100644 --- a/base/schema-javascript/test/inputs/schema/non-standard-ref.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/non-standard-ref.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.js index ad02812..9cf137e 100644 --- a/base/schema-javascript/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/object-type-required.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/object-type-required.schema/default/TopLevel.js index 4b78556..4dda541 100644 --- a/base/schema-javascript/test/inputs/schema/object-type-required.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/object-type-required.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/optional-any.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/optional-any.schema/default/TopLevel.js index cb9365b..706e837 100644 --- a/base/schema-javascript/test/inputs/schema/optional-any.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/optional-any.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/optional-const-ref.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/optional-const-ref.schema/default/TopLevel.js index d9d25b7..49775d7 100644 --- a/base/schema-javascript/test/inputs/schema/optional-const-ref.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/optional-const-ref.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/optional-constraints.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/optional-constraints.schema/default/TopLevel.js index dfcbd91..2a4883f 100644 --- a/base/schema-javascript/test/inputs/schema/optional-constraints.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/optional-constraints.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/optional-date-time.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/optional-date-time.schema/default/TopLevel.js index 464092f..173fdb3 100644 --- a/base/schema-javascript/test/inputs/schema/optional-date-time.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/optional-date-time.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/optional-enum.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/optional-enum.schema/default/TopLevel.js index b06093c..f2157cc 100644 --- a/base/schema-javascript/test/inputs/schema/optional-enum.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/optional-enum.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/optional-property.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/optional-property.schema/default/TopLevel.js index 60e3446..82e37e7 100644 --- a/base/schema-javascript/test/inputs/schema/optional-property.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/optional-property.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/pattern.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/pattern.schema/default/TopLevel.js index 4b96753..e4e5b1d 100644 --- a/base/schema-javascript/test/inputs/schema/pattern.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/pattern.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/postman-collection.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/postman-collection.schema/default/TopLevel.js index 87d210f..1e70677 100644 --- a/base/schema-javascript/test/inputs/schema/postman-collection.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/postman-collection.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/prefix-items.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/prefix-items.schema/default/TopLevel.js index b2316bd..68e77da 100644 --- a/base/schema-javascript/test/inputs/schema/prefix-items.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/prefix-items.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.js index 17a3209..c030a9f 100644 --- a/base/schema-javascript/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/ref-id-files.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/ref-id-files.schema/default/TopLevel.js index 8f33714..ca64a9e 100644 --- a/base/schema-javascript/test/inputs/schema/ref-id-files.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/ref-id-files.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/ref-remote.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/ref-remote.schema/default/TopLevel.js index 2374532..139ad5d 100644 --- a/base/schema-javascript/test/inputs/schema/ref-remote.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/ref-remote.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/renaming-bug.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/renaming-bug.schema/default/TopLevel.js index 6759356..9409fb2 100644 --- a/base/schema-javascript/test/inputs/schema/renaming-bug.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/renaming-bug.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/required-draft3.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/required-draft3.schema/default/TopLevel.js index 28f27ca..525118f 100644 --- a/base/schema-javascript/test/inputs/schema/required-draft3.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/required-draft3.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/required-non-properties.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/required-non-properties.schema/default/TopLevel.js index 4f4880b..93d9bcc 100644 --- a/base/schema-javascript/test/inputs/schema/required-non-properties.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/required-non-properties.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/required.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/required.schema/default/TopLevel.js index 28f27ca..525118f 100644 --- a/base/schema-javascript/test/inputs/schema/required.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/required.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.js index c5a3d56..59f862d 100644 --- a/base/schema-javascript/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/schema-constraints.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/schema-constraints.schema/default/TopLevel.js index 90aacfd..1385373 100644 --- a/base/schema-javascript/test/inputs/schema/schema-constraints.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/schema-constraints.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/simple-ref.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/simple-ref.schema/default/TopLevel.js index 2374532..139ad5d 100644 --- a/base/schema-javascript/test/inputs/schema/simple-ref.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/simple-ref.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/strict-optional.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/strict-optional.schema/default/TopLevel.js index fc674aa..af0876b 100644 --- a/base/schema-javascript/test/inputs/schema/strict-optional.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/strict-optional.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/top-level-array.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/top-level-array.schema/default/TopLevel.js index c52556d..c246545 100644 --- a/base/schema-javascript/test/inputs/schema/top-level-array.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/top-level-array.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/top-level-enum.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/top-level-enum.schema/default/TopLevel.js index a86a1a2..2e63469 100644 --- a/base/schema-javascript/test/inputs/schema/top-level-enum.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/top-level-enum.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/top-level-primitive-array.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/top-level-primitive-array.schema/default/TopLevel.js index b35df94..45467d8 100644 --- a/base/schema-javascript/test/inputs/schema/top-level-primitive-array.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/top-level-primitive-array.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/top-level-primitive.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/top-level-primitive.schema/default/TopLevel.js index 28cb102..d0df57d 100644 --- a/base/schema-javascript/test/inputs/schema/top-level-primitive.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/top-level-primitive.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/tuple.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/tuple.schema/default/TopLevel.js index 0d95545..abd141d 100644 --- a/base/schema-javascript/test/inputs/schema/tuple.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/tuple.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.js index 2608ea9..d652b2b 100644 --- a/base/schema-javascript/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/unicode-codepoint-length.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/unicode-codepoint-length.schema/default/TopLevel.js index d82c497..b7179f8 100644 --- a/base/schema-javascript/test/inputs/schema/unicode-codepoint-length.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/unicode-codepoint-length.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/union-int-double.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/union-int-double.schema/default/TopLevel.js index 02359d9..b5eb296 100644 --- a/base/schema-javascript/test/inputs/schema/union-int-double.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/union-int-double.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/union-list.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/union-list.schema/default/TopLevel.js index a10786e..d7a79b1 100644 --- a/base/schema-javascript/test/inputs/schema/union-list.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/union-list.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/union.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/union.schema/default/TopLevel.js index 7b9e08f..e037471 100644 --- a/base/schema-javascript/test/inputs/schema/union.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/union.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/uuid.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/uuid.schema/default/TopLevel.js index 4694515..96d44d8 100644 --- a/base/schema-javascript/test/inputs/schema/uuid.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/uuid.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-javascript/test/inputs/schema/vega-lite.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/vega-lite.schema/default/TopLevel.js index 61dcf18..9457b8a 100644 --- a/base/schema-javascript/test/inputs/schema/vega-lite.schema/default/TopLevel.js +++ b/head/schema-javascript/test/inputs/schema/vega-lite.schema/default/TopLevel.js @@ -87,9 +87,10 @@ function transform(val, typ, getProps, key = '', parent = '') { } function transformDate(val) { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/accessors.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/accessors.schema/default/TopLevel.ts index eb5c28b..8e9c0e1 100644 --- a/base/schema-typescript/test/inputs/schema/accessors.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/accessors.schema/default/TopLevel.ts @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/all-of-additional-properties-false.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/all-of-additional-properties-false.schema/default/TopLevel.ts index 3a1e7c3..43ee9e3 100644 --- a/base/schema-typescript/test/inputs/schema/all-of-additional-properties-false.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/all-of-additional-properties-false.schema/default/TopLevel.ts @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/any.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/any.schema/default/TopLevel.ts index 293a64c..5a92dc2 100644 --- a/base/schema-typescript/test/inputs/schema/any.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/any.schema/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/bool-string.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/bool-string.schema/default/TopLevel.ts index 8604379..28e6511 100644 --- a/base/schema-typescript/test/inputs/schema/bool-string.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/bool-string.schema/default/TopLevel.ts @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/boolean-subschema.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/boolean-subschema.schema/default/TopLevel.ts index f2945d4..45a5546 100644 --- a/base/schema-typescript/test/inputs/schema/boolean-subschema.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/boolean-subschema.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/camelCase.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/camelCase.schema/default/TopLevel.ts index 1c2f56a..db2b398 100644 --- a/base/schema-typescript/test/inputs/schema/camelCase.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/camelCase.schema/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/class-map-union.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/class-map-union.schema/default/TopLevel.ts index dedacb8..9259be9 100644 --- a/base/schema-typescript/test/inputs/schema/class-map-union.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/class-map-union.schema/default/TopLevel.ts @@ -110,9 +110,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/class-with-additional.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/class-with-additional.schema/default/TopLevel.ts index 15df75c..a847af6 100644 --- a/base/schema-typescript/test/inputs/schema/class-with-additional.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/class-with-additional.schema/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.ts index 934c40e..972b57e 100644 --- a/base/schema-typescript/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/comment-injection-enum-nested-comment.schema/default/TopLevel.ts @@ -107,9 +107,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.ts index 2a64dc5..88de0d7 100644 --- a/base/schema-typescript/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/comment-injection-enum.schema/default/TopLevel.ts @@ -113,9 +113,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.ts index 504b925..bad4ef3 100644 --- a/base/schema-typescript/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/comment-injection-nested-comment.schema/default/TopLevel.ts @@ -105,9 +105,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/comment-injection.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/comment-injection.schema/default/TopLevel.ts index 7b4e86e..e04a37a 100644 --- a/base/schema-typescript/test/inputs/schema/comment-injection.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/comment-injection.schema/default/TopLevel.ts @@ -133,9 +133,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/const-non-string.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/const-non-string.schema/default/TopLevel.ts index 471597a..c24b9f0 100644 --- a/base/schema-typescript/test/inputs/schema/const-non-string.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/const-non-string.schema/default/TopLevel.ts @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/constructor.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/constructor.schema/default/TopLevel.ts index 213c0ae..01b7ccb 100644 --- a/base/schema-typescript/test/inputs/schema/constructor.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/constructor.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/cut-enum.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/cut-enum.schema/default/TopLevel.ts index 4b340a1..dd223b6 100644 --- a/base/schema-typescript/test/inputs/schema/cut-enum.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/cut-enum.schema/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/date-time-or-string.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/date-time-or-string.schema/default/TopLevel.ts index f2f2b10..26e932a 100644 --- a/base/schema-typescript/test/inputs/schema/date-time-or-string.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/date-time-or-string.schema/default/TopLevel.ts @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/date-time.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/date-time.schema/default/TopLevel.ts index 4427935..442ea66 100644 --- a/base/schema-typescript/test/inputs/schema/date-time.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/date-time.schema/default/TopLevel.ts @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/default-value.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/default-value.schema/default/TopLevel.ts index 3b6063c..852f837 100644 --- a/base/schema-typescript/test/inputs/schema/default-value.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/default-value.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.ts index 5fa5b81..5e67cdf 100644 --- a/base/schema-typescript/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/description-with-double-quotes.schema/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/description.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/description.schema/default/TopLevel.ts index 239362c..ec024f0 100644 --- a/base/schema-typescript/test/inputs/schema/description.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/description.schema/default/TopLevel.ts @@ -130,9 +130,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/direct-union.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/direct-union.schema/default/TopLevel.ts index 7c30718..f0c681f 100644 --- a/base/schema-typescript/test/inputs/schema/direct-union.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/direct-union.schema/default/TopLevel.ts @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/empty-object.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/empty-object.schema/default/TopLevel.ts index ad5255b..7098433 100644 --- a/base/schema-typescript/test/inputs/schema/empty-object.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/empty-object.schema/default/TopLevel.ts @@ -91,9 +91,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/enum-large.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/enum-large.schema/default/TopLevel.ts index 12c52ac..06f5da4 100644 --- a/base/schema-typescript/test/inputs/schema/enum-large.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/enum-large.schema/default/TopLevel.ts @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/enum-with-null.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/enum-with-null.schema/default/TopLevel.ts index faf205e..eefadd3 100644 --- a/base/schema-typescript/test/inputs/schema/enum-with-null.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/enum-with-null.schema/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/enum-with-values.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/enum-with-values.schema/default/TopLevel.ts index 0d0c447..9ca28f6 100644 --- a/base/schema-typescript/test/inputs/schema/enum-with-values.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/enum-with-values.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/enum.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/enum.schema/default/TopLevel.ts index 368ac2b..61a2481 100644 --- a/base/schema-typescript/test/inputs/schema/enum.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/enum.schema/default/TopLevel.ts @@ -106,9 +106,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/fractional-bounds.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/fractional-bounds.schema/default/TopLevel.ts index 8ea70f3..0da683b 100644 --- a/base/schema-typescript/test/inputs/schema/fractional-bounds.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/fractional-bounds.schema/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.ts index fc206e1..a335a74 100644 --- a/base/schema-typescript/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/go-schema-pattern-properties.schema/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.ts index e07edf0..528d3d9 100644 --- a/base/schema-typescript/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/haskell-enum-forbidden.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/id-no-address.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/id-no-address.schema/default/TopLevel.ts index 29bc994..58648e3 100644 --- a/base/schema-typescript/test/inputs/schema/id-no-address.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/id-no-address.schema/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/id-root.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/id-root.schema/default/TopLevel.ts index 444933f..6614195 100644 --- a/base/schema-typescript/test/inputs/schema/id-root.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/id-root.schema/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.ts index 9d2df90..efb66aa 100644 --- a/base/schema-typescript/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/ie-suffix-singularization.schema/default/TopLevel.ts @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/implicit-all-of.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/implicit-all-of.schema/default/TopLevel.ts index 9f7b670..256a8ae 100644 --- a/base/schema-typescript/test/inputs/schema/implicit-all-of.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/implicit-all-of.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.ts index 887b34d..ec8d690 100644 --- a/base/schema-typescript/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/implicit-class-array-union.schema/default/TopLevel.ts @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/implicit-one-of.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/implicit-one-of.schema/default/TopLevel.ts index 8345516..86023c1 100644 --- a/base/schema-typescript/test/inputs/schema/implicit-one-of.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/implicit-one-of.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/integer-before-number.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/integer-before-number.schema/default/TopLevel.ts index 6e4d1cf..d023106 100644 --- a/base/schema-typescript/test/inputs/schema/integer-before-number.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/integer-before-number.schema/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/integer-float-union.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/integer-float-union.schema/default/TopLevel.ts index 30bbefd..19a4b90 100644 --- a/base/schema-typescript/test/inputs/schema/integer-float-union.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/integer-float-union.schema/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/integer-string.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/integer-string.schema/default/TopLevel.ts index f9a36b5..188e780 100644 --- a/base/schema-typescript/test/inputs/schema/integer-string.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/integer-string.schema/default/TopLevel.ts @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/integer-type.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/integer-type.schema/default/TopLevel.ts index 54caffa..53717d0 100644 --- a/base/schema-typescript/test/inputs/schema/integer-type.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/integer-type.schema/default/TopLevel.ts @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/intersection-nested.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/intersection-nested.schema/default/TopLevel.ts index 2d9a3b2..e19be6f 100644 --- a/base/schema-typescript/test/inputs/schema/intersection-nested.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/intersection-nested.schema/default/TopLevel.ts @@ -93,9 +93,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/intersection.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/intersection.schema/default/TopLevel.ts index 29a519e..344ddbc 100644 --- a/base/schema-typescript/test/inputs/schema/intersection.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/intersection.schema/default/TopLevel.ts @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/issue2680-top-level-array.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/issue2680-top-level-array.schema/default/TopLevel.ts index 9f9b3d6..ca369a4 100644 --- a/base/schema-typescript/test/inputs/schema/issue2680-top-level-array.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/issue2680-top-level-array.schema/default/TopLevel.ts @@ -91,9 +91,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/keyword-enum.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/keyword-enum.schema/default/TopLevel.ts index e90b8c1..7157103 100644 --- a/base/schema-typescript/test/inputs/schema/keyword-enum.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/keyword-enum.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/keyword-unions.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/keyword-unions.schema/default/TopLevel.ts index 95fb785..eab28f8 100644 --- a/base/schema-typescript/test/inputs/schema/keyword-unions.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/keyword-unions.schema/default/TopLevel.ts @@ -1090,9 +1090,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/light.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/light.schema/default/TopLevel.ts index a84e1b1..c351a8b 100644 --- a/base/schema-typescript/test/inputs/schema/light.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/light.schema/default/TopLevel.ts @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/list.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/list.schema/default/TopLevel.ts index a3e9b2b..6e80836 100644 --- a/base/schema-typescript/test/inputs/schema/list.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/list.schema/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/min-max-items.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/min-max-items.schema/default/TopLevel.ts index a88d16b..585c26a 100644 --- a/base/schema-typescript/test/inputs/schema/min-max-items.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/min-max-items.schema/default/TopLevel.ts @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/minmax-integer.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/minmax-integer.schema/default/TopLevel.ts index 4d15bf4..26dbc87 100644 --- a/base/schema-typescript/test/inputs/schema/minmax-integer.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/minmax-integer.schema/default/TopLevel.ts @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/minmax.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/minmax.schema/default/TopLevel.ts index 74eb204..c1e422f 100644 --- a/base/schema-typescript/test/inputs/schema/minmax.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/minmax.schema/default/TopLevel.ts @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/minmaxlength.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/minmaxlength.schema/default/TopLevel.ts index ce21e9c..01daecb 100644 --- a/base/schema-typescript/test/inputs/schema/minmaxlength.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/minmaxlength.schema/default/TopLevel.ts @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/multi-type-enum.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/multi-type-enum.schema/default/TopLevel.ts index 2ac8eea..5600c61 100644 --- a/base/schema-typescript/test/inputs/schema/multi-type-enum.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/multi-type-enum.schema/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/mutually-recursive.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/mutually-recursive.schema/default/TopLevel.ts index 332f39c..f2e8a31 100644 --- a/base/schema-typescript/test/inputs/schema/mutually-recursive.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/mutually-recursive.schema/default/TopLevel.ts @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.ts index 8501247..3e472c6 100644 --- a/base/schema-typescript/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/nested-intersection-union.schema/default/TopLevel.ts @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/non-standard-ref.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/non-standard-ref.schema/default/TopLevel.ts index 9dd48da..124d30c 100644 --- a/base/schema-typescript/test/inputs/schema/non-standard-ref.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/non-standard-ref.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.ts index d59ca93..34d2fc5 100644 --- a/base/schema-typescript/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/nullable-optional-one-of.schema/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/object-type-required.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/object-type-required.schema/default/TopLevel.ts index 8a93edc..5e668a1 100644 --- a/base/schema-typescript/test/inputs/schema/object-type-required.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/object-type-required.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/optional-any.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/optional-any.schema/default/TopLevel.ts index 21f335b..1f2e4cd 100644 --- a/base/schema-typescript/test/inputs/schema/optional-any.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/optional-any.schema/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/optional-const-ref.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/optional-const-ref.schema/default/TopLevel.ts index 1d6ca31..62a54c8 100644 --- a/base/schema-typescript/test/inputs/schema/optional-const-ref.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/optional-const-ref.schema/default/TopLevel.ts @@ -104,9 +104,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/optional-constraints.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/optional-constraints.schema/default/TopLevel.ts index 8cf1679..f3eeb99 100644 --- a/base/schema-typescript/test/inputs/schema/optional-constraints.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/optional-constraints.schema/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/optional-date-time.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/optional-date-time.schema/default/TopLevel.ts index c6d057f..a0d110f 100644 --- a/base/schema-typescript/test/inputs/schema/optional-date-time.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/optional-date-time.schema/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/optional-enum.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/optional-enum.schema/default/TopLevel.ts index 0f2ad1e..aa12e9b 100644 --- a/base/schema-typescript/test/inputs/schema/optional-enum.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/optional-enum.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/optional-property.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/optional-property.schema/default/TopLevel.ts index 5d84647..f509762 100644 --- a/base/schema-typescript/test/inputs/schema/optional-property.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/optional-property.schema/default/TopLevel.ts @@ -93,9 +93,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/pattern.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/pattern.schema/default/TopLevel.ts index f596bff..9470b48 100644 --- a/base/schema-typescript/test/inputs/schema/pattern.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/pattern.schema/default/TopLevel.ts @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/postman-collection.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/postman-collection.schema/default/TopLevel.ts index 34dfb4e..713fdd0 100644 --- a/base/schema-typescript/test/inputs/schema/postman-collection.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/postman-collection.schema/default/TopLevel.ts @@ -104,9 +104,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/prefix-items.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/prefix-items.schema/default/TopLevel.ts index ee2e5bf..6888e92 100644 --- a/base/schema-typescript/test/inputs/schema/prefix-items.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/prefix-items.schema/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.ts index 3fc7608..bfab13c 100644 --- a/base/schema-typescript/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/recursive-union-flattening.schema/default/TopLevel.ts @@ -107,9 +107,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/ref-id-files.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/ref-id-files.schema/default/TopLevel.ts index 4b340a1..dd223b6 100644 --- a/base/schema-typescript/test/inputs/schema/ref-id-files.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/ref-id-files.schema/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/ref-remote.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/ref-remote.schema/default/TopLevel.ts index a3e9b2b..6e80836 100644 --- a/base/schema-typescript/test/inputs/schema/ref-remote.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/ref-remote.schema/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/renaming-bug.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/renaming-bug.schema/default/TopLevel.ts index f2841a1..ed37d32 100644 --- a/base/schema-typescript/test/inputs/schema/renaming-bug.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/renaming-bug.schema/default/TopLevel.ts @@ -181,9 +181,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/required-draft3.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/required-draft3.schema/default/TopLevel.ts index 5d752aa..4f307c4 100644 --- a/base/schema-typescript/test/inputs/schema/required-draft3.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/required-draft3.schema/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/required-non-properties.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/required-non-properties.schema/default/TopLevel.ts index b5a3f4a..41adfa0 100644 --- a/base/schema-typescript/test/inputs/schema/required-non-properties.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/required-non-properties.schema/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/required.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/required.schema/default/TopLevel.ts index 5d752aa..4f307c4 100644 --- a/base/schema-typescript/test/inputs/schema/required.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/required.schema/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.ts index b76a76b..4f2db63 100644 --- a/base/schema-typescript/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/rust-cycle-breaker-union.schema/default/TopLevel.ts @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/schema-constraints.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/schema-constraints.schema/default/TopLevel.ts index 80dbe26..18ad1a2 100644 --- a/base/schema-typescript/test/inputs/schema/schema-constraints.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/schema-constraints.schema/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/simple-ref.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/simple-ref.schema/default/TopLevel.ts index a3e9b2b..6e80836 100644 --- a/base/schema-typescript/test/inputs/schema/simple-ref.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/simple-ref.schema/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/strict-optional.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/strict-optional.schema/default/TopLevel.ts index 208356c..5e96fb7 100644 --- a/base/schema-typescript/test/inputs/schema/strict-optional.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/strict-optional.schema/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/top-level-array.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/top-level-array.schema/default/TopLevel.ts index bfa6424..34a0d0c 100644 --- a/base/schema-typescript/test/inputs/schema/top-level-array.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/top-level-array.schema/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/top-level-enum.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/top-level-enum.schema/default/TopLevel.ts index 26d77b6..cbd4964 100644 --- a/base/schema-typescript/test/inputs/schema/top-level-enum.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/top-level-enum.schema/default/TopLevel.ts @@ -91,9 +91,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/top-level-primitive-array.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/top-level-primitive-array.schema/default/TopLevel.ts index eb865a8..57e84ec 100644 --- a/base/schema-typescript/test/inputs/schema/top-level-primitive-array.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/top-level-primitive-array.schema/default/TopLevel.ts @@ -91,9 +91,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/top-level-primitive.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/top-level-primitive.schema/default/TopLevel.ts index e37cbbe..0c7f1c5 100644 --- a/base/schema-typescript/test/inputs/schema/top-level-primitive.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/top-level-primitive.schema/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/tuple.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/tuple.schema/default/TopLevel.ts index d90f7f5..ea1b7f5 100644 --- a/base/schema-typescript/test/inputs/schema/tuple.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/tuple.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.ts index 90b3f3e..87650d0 100644 --- a/base/schema-typescript/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/unevaluated-properties.schema/default/TopLevel.ts @@ -109,9 +109,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/unicode-codepoint-length.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/unicode-codepoint-length.schema/default/TopLevel.ts index 3da4931..5cd12f6 100644 --- a/base/schema-typescript/test/inputs/schema/unicode-codepoint-length.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/unicode-codepoint-length.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/union-int-double.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/union-int-double.schema/default/TopLevel.ts index bcd40b1..ebe49dc 100644 --- a/base/schema-typescript/test/inputs/schema/union-int-double.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/union-int-double.schema/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/union-list.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/union-list.schema/default/TopLevel.ts index 3cfb51f..97ce3ae 100644 --- a/base/schema-typescript/test/inputs/schema/union-list.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/union-list.schema/default/TopLevel.ts @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/union.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/union.schema/default/TopLevel.ts index 1ba82fe..97204b7 100644 --- a/base/schema-typescript/test/inputs/schema/union.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/union.schema/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/uuid.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/uuid.schema/default/TopLevel.ts index 052065c..4052af7 100644 --- a/base/schema-typescript/test/inputs/schema/uuid.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/uuid.schema/default/TopLevel.ts @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/schema-typescript/test/inputs/schema/vega-lite.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/vega-lite.schema/default/TopLevel.ts index 0ada8e0..ee21cbc 100644 --- a/base/schema-typescript/test/inputs/schema/vega-lite.schema/default/TopLevel.ts +++ b/head/schema-typescript/test/inputs/schema/vega-lite.schema/default/TopLevel.ts @@ -5942,9 +5942,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/00c36.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/00c36.json/default/TopLevel.ts index a983213..621863a 100644 --- a/base/typescript/test/inputs/json/misc/00c36.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/00c36.json/default/TopLevel.ts @@ -117,9 +117,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/00ec5.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/00ec5.json/default/TopLevel.ts index 5ec761b..434ce35 100644 --- a/base/typescript/test/inputs/json/misc/00ec5.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/00ec5.json/default/TopLevel.ts @@ -159,9 +159,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/010b1.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/010b1.json/default/TopLevel.ts index d624211..7ad82c9 100644 --- a/base/typescript/test/inputs/json/misc/010b1.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/010b1.json/default/TopLevel.ts @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/016af.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/016af.json/default/TopLevel.ts index 824027c..4410198 100644 --- a/base/typescript/test/inputs/json/misc/016af.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/016af.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/033b1.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/033b1.json/default/TopLevel.ts index 51c34f0..95815ab 100644 --- a/base/typescript/test/inputs/json/misc/033b1.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/033b1.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/050b0.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/050b0.json/default/TopLevel.ts index 16de21f..2b880b0 100644 --- a/base/typescript/test/inputs/json/misc/050b0.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/050b0.json/default/TopLevel.ts @@ -133,9 +133,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/06bee.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/06bee.json/default/TopLevel.ts index 5bb27b2..149c027 100644 --- a/base/typescript/test/inputs/json/misc/06bee.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/06bee.json/default/TopLevel.ts @@ -128,9 +128,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/07540.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/07540.json/default/TopLevel.ts index 6e06286..c8ff534 100644 --- a/base/typescript/test/inputs/json/misc/07540.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/07540.json/default/TopLevel.ts @@ -93,9 +93,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/0779f.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/0779f.json/default/TopLevel.ts index 05276b1..387c68b 100644 --- a/base/typescript/test/inputs/json/misc/0779f.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/0779f.json/default/TopLevel.ts @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/07c75.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/07c75.json/default/TopLevel.ts index 943765c..e953303 100644 --- a/base/typescript/test/inputs/json/misc/07c75.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/07c75.json/default/TopLevel.ts @@ -118,9 +118,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/09f54.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/09f54.json/default/TopLevel.ts index 38eedf1..2d57590 100644 --- a/base/typescript/test/inputs/json/misc/09f54.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/09f54.json/default/TopLevel.ts @@ -106,9 +106,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/0a358.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/0a358.json/default/TopLevel.ts index 4cb922c..4b6a3c6 100644 --- a/base/typescript/test/inputs/json/misc/0a358.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/0a358.json/default/TopLevel.ts @@ -108,9 +108,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/0a91a.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/0a91a.json/default/TopLevel.ts index 22b91e1..2bc7296 100644 --- a/base/typescript/test/inputs/json/misc/0a91a.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/0a91a.json/default/TopLevel.ts @@ -308,9 +308,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/0b91a.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/0b91a.json/default/TopLevel.ts index 507c416..7c4f6ba 100644 --- a/base/typescript/test/inputs/json/misc/0b91a.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/0b91a.json/default/TopLevel.ts @@ -133,9 +133,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/0cffa.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/0cffa.json/default/TopLevel.ts index 49be2bd..ec041e7 100644 --- a/base/typescript/test/inputs/json/misc/0cffa.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/0cffa.json/default/TopLevel.ts @@ -201,9 +201,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/0e0c2.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/0e0c2.json/default/TopLevel.ts index 7ad0a89..66af299 100644 --- a/base/typescript/test/inputs/json/misc/0e0c2.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/0e0c2.json/default/TopLevel.ts @@ -164,9 +164,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/0fecf.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/0fecf.json/default/TopLevel.ts index fc2446d..e60db46 100644 --- a/base/typescript/test/inputs/json/misc/0fecf.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/0fecf.json/default/TopLevel.ts @@ -93,9 +93,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/10be4.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/10be4.json/default/TopLevel.ts index 40b751e..23e7aea 100644 --- a/base/typescript/test/inputs/json/misc/10be4.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/10be4.json/default/TopLevel.ts @@ -133,9 +133,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/112b5.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/112b5.json/default/TopLevel.ts index 9a20499..5e05adc 100644 --- a/base/typescript/test/inputs/json/misc/112b5.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/112b5.json/default/TopLevel.ts @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/127a1.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/127a1.json/default/TopLevel.ts index 649aa7f..9accf41 100644 --- a/base/typescript/test/inputs/json/misc/127a1.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/127a1.json/default/TopLevel.ts @@ -201,9 +201,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/13d8d.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/13d8d.json/default/TopLevel.ts index 493d608..51f6b33 100644 --- a/base/typescript/test/inputs/json/misc/13d8d.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/13d8d.json/default/TopLevel.ts @@ -119,9 +119,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/14d38.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/14d38.json/default/TopLevel.ts index 4325fc0..643f46a 100644 --- a/base/typescript/test/inputs/json/misc/14d38.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/14d38.json/default/TopLevel.ts @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/167d6.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/167d6.json/default/TopLevel.ts index 51c34f0..95815ab 100644 --- a/base/typescript/test/inputs/json/misc/167d6.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/167d6.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/16bc5.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/16bc5.json/default/TopLevel.ts index 5e66d83..326fe2c 100644 --- a/base/typescript/test/inputs/json/misc/16bc5.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/16bc5.json/default/TopLevel.ts @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/176f1.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/176f1.json/default/TopLevel.ts index ecd58f0..1f7dc78 100644 --- a/base/typescript/test/inputs/json/misc/176f1.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/176f1.json/default/TopLevel.ts @@ -118,9 +118,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/1a7f5.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/1a7f5.json/default/TopLevel.ts index d624211..7ad82c9 100644 --- a/base/typescript/test/inputs/json/misc/1a7f5.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/1a7f5.json/default/TopLevel.ts @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/1b28c.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/1b28c.json/default/TopLevel.ts index 824027c..4410198 100644 --- a/base/typescript/test/inputs/json/misc/1b28c.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/1b28c.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/1b409.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/1b409.json/default/TopLevel.ts index d0d2ad2..b5da7aa 100644 --- a/base/typescript/test/inputs/json/misc/1b409.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/1b409.json/default/TopLevel.ts @@ -167,9 +167,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/2465e.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/2465e.json/default/TopLevel.ts index 4c9b561..bab2101 100644 --- a/base/typescript/test/inputs/json/misc/2465e.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/2465e.json/default/TopLevel.ts @@ -166,9 +166,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/24f52.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/24f52.json/default/TopLevel.ts index 05276b1..387c68b 100644 --- a/base/typescript/test/inputs/json/misc/24f52.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/24f52.json/default/TopLevel.ts @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/262f0.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/262f0.json/default/TopLevel.ts index 2f6399a..83c3955 100644 --- a/base/typescript/test/inputs/json/misc/262f0.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/262f0.json/default/TopLevel.ts @@ -193,9 +193,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/26b49.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/26b49.json/default/TopLevel.ts index 154183a..72ab317 100644 --- a/base/typescript/test/inputs/json/misc/26b49.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/26b49.json/default/TopLevel.ts @@ -200,9 +200,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/26c9c.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/26c9c.json/default/TopLevel.ts index b55faf6..396a82c 100644 --- a/base/typescript/test/inputs/json/misc/26c9c.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/26c9c.json/default/TopLevel.ts @@ -280,9 +280,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/27332.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/27332.json/default/TopLevel.ts index 35fbe5d..f4393ae 100644 --- a/base/typescript/test/inputs/json/misc/27332.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/27332.json/default/TopLevel.ts @@ -232,9 +232,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/29f47.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/29f47.json/default/TopLevel.ts index c976ff4..1023374 100644 --- a/base/typescript/test/inputs/json/misc/29f47.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/29f47.json/default/TopLevel.ts @@ -219,9 +219,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/2d4e2.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/2d4e2.json/default/TopLevel.ts index a7e2dd6..5963136 100644 --- a/base/typescript/test/inputs/json/misc/2d4e2.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/2d4e2.json/default/TopLevel.ts @@ -177,9 +177,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/2df80.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/2df80.json/default/TopLevel.ts index 450439c..2d0abe9 100644 --- a/base/typescript/test/inputs/json/misc/2df80.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/2df80.json/default/TopLevel.ts @@ -122,9 +122,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/31189.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/31189.json/default/TopLevel.ts index d4aaa45..e6a1f66 100644 --- a/base/typescript/test/inputs/json/misc/31189.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/31189.json/default/TopLevel.ts @@ -120,9 +120,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/32431.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/32431.json/default/TopLevel.ts index d47172c..4bbac66 100644 --- a/base/typescript/test/inputs/json/misc/32431.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/32431.json/default/TopLevel.ts @@ -156,9 +156,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/32d5c.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/32d5c.json/default/TopLevel.ts index 9774154..4793f9c 100644 --- a/base/typescript/test/inputs/json/misc/32d5c.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/32d5c.json/default/TopLevel.ts @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/337ed.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/337ed.json/default/TopLevel.ts index bfe127f..2a3faf7 100644 --- a/base/typescript/test/inputs/json/misc/337ed.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/337ed.json/default/TopLevel.ts @@ -151,9 +151,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/33d2e.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/33d2e.json/default/TopLevel.ts index b2bf5c1..9f6ca60 100644 --- a/base/typescript/test/inputs/json/misc/33d2e.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/33d2e.json/default/TopLevel.ts @@ -134,9 +134,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/34702.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/34702.json/default/TopLevel.ts index 695cfe1..e247519 100644 --- a/base/typescript/test/inputs/json/misc/34702.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/34702.json/default/TopLevel.ts @@ -148,9 +148,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/3536b.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/3536b.json/default/TopLevel.ts index dd27fff..c3b3401 100644 --- a/base/typescript/test/inputs/json/misc/3536b.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/3536b.json/default/TopLevel.ts @@ -122,9 +122,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/3659d.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/3659d.json/default/TopLevel.ts index 824027c..4410198 100644 --- a/base/typescript/test/inputs/json/misc/3659d.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/3659d.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/36d5d.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/36d5d.json/default/TopLevel.ts index 05276b1..387c68b 100644 --- a/base/typescript/test/inputs/json/misc/36d5d.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/36d5d.json/default/TopLevel.ts @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/3a6b3.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/3a6b3.json/default/TopLevel.ts index 05276b1..387c68b 100644 --- a/base/typescript/test/inputs/json/misc/3a6b3.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/3a6b3.json/default/TopLevel.ts @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/3e9a3.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/3e9a3.json/default/TopLevel.ts index ecd58f0..1f7dc78 100644 --- a/base/typescript/test/inputs/json/misc/3e9a3.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/3e9a3.json/default/TopLevel.ts @@ -118,9 +118,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/3f1ce.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/3f1ce.json/default/TopLevel.ts index c8671c7..31eab5d 100644 --- a/base/typescript/test/inputs/json/misc/3f1ce.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/3f1ce.json/default/TopLevel.ts @@ -193,9 +193,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/421d4.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/421d4.json/default/TopLevel.ts index 81973fb..81b465e 100644 --- a/base/typescript/test/inputs/json/misc/421d4.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/421d4.json/default/TopLevel.ts @@ -204,9 +204,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/437e7.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/437e7.json/default/TopLevel.ts index 3093256..2eeb4e6 100644 --- a/base/typescript/test/inputs/json/misc/437e7.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/437e7.json/default/TopLevel.ts @@ -197,9 +197,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/43970.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/43970.json/default/TopLevel.ts index a719de8..ab2bae3 100644 --- a/base/typescript/test/inputs/json/misc/43970.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/43970.json/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/43eaf.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/43eaf.json/default/TopLevel.ts index 51c34f0..95815ab 100644 --- a/base/typescript/test/inputs/json/misc/43eaf.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/43eaf.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/458db.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/458db.json/default/TopLevel.ts index 5f89b91..ad1d8f8 100644 --- a/base/typescript/test/inputs/json/misc/458db.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/458db.json/default/TopLevel.ts @@ -134,9 +134,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/4961a.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/4961a.json/default/TopLevel.ts index 824027c..4410198 100644 --- a/base/typescript/test/inputs/json/misc/4961a.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/4961a.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/4a0d7.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/4a0d7.json/default/TopLevel.ts index 824027c..4410198 100644 --- a/base/typescript/test/inputs/json/misc/4a0d7.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/4a0d7.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/4a455.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/4a455.json/default/TopLevel.ts index 563ca2d..323181c 100644 --- a/base/typescript/test/inputs/json/misc/4a455.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/4a455.json/default/TopLevel.ts @@ -133,9 +133,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/4c547.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/4c547.json/default/TopLevel.ts index 5e66d83..326fe2c 100644 --- a/base/typescript/test/inputs/json/misc/4c547.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/4c547.json/default/TopLevel.ts @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/4d6fb.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/4d6fb.json/default/TopLevel.ts index f0215d0..5d75d53 100644 --- a/base/typescript/test/inputs/json/misc/4d6fb.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/4d6fb.json/default/TopLevel.ts @@ -231,9 +231,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/4e336.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/4e336.json/default/TopLevel.ts index 824027c..4410198 100644 --- a/base/typescript/test/inputs/json/misc/4e336.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/4e336.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/54147.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/54147.json/default/TopLevel.ts index 021ff27..b436180 100644 --- a/base/typescript/test/inputs/json/misc/54147.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/54147.json/default/TopLevel.ts @@ -106,9 +106,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/54d32.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/54d32.json/default/TopLevel.ts index 38f7422..02d3a91 100644 --- a/base/typescript/test/inputs/json/misc/54d32.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/54d32.json/default/TopLevel.ts @@ -110,9 +110,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/570ec.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/570ec.json/default/TopLevel.ts index 4d6318e..c8512b1 100644 --- a/base/typescript/test/inputs/json/misc/570ec.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/570ec.json/default/TopLevel.ts @@ -125,9 +125,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/5dd0d.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/5dd0d.json/default/TopLevel.ts index 05276b1..387c68b 100644 --- a/base/typescript/test/inputs/json/misc/5dd0d.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/5dd0d.json/default/TopLevel.ts @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/5eae5.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/5eae5.json/default/TopLevel.ts index 1ec275a..bbd6657 100644 --- a/base/typescript/test/inputs/json/misc/5eae5.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/5eae5.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/5eb20.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/5eb20.json/default/TopLevel.ts index 05276b1..387c68b 100644 --- a/base/typescript/test/inputs/json/misc/5eb20.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/5eb20.json/default/TopLevel.ts @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/5f3a1.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/5f3a1.json/default/TopLevel.ts index 51c34f0..95815ab 100644 --- a/base/typescript/test/inputs/json/misc/5f3a1.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/5f3a1.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/5f7fe.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/5f7fe.json/default/TopLevel.ts index c0a3d03..5a13bd8 100644 --- a/base/typescript/test/inputs/json/misc/5f7fe.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/5f7fe.json/default/TopLevel.ts @@ -278,9 +278,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/617e8.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/617e8.json/default/TopLevel.ts index 2c1281b..d93eefb 100644 --- a/base/typescript/test/inputs/json/misc/617e8.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/617e8.json/default/TopLevel.ts @@ -277,9 +277,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/61b66.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/61b66.json/default/TopLevel.ts index 05276b1..387c68b 100644 --- a/base/typescript/test/inputs/json/misc/61b66.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/61b66.json/default/TopLevel.ts @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/6260a.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/6260a.json/default/TopLevel.ts index 51c34f0..95815ab 100644 --- a/base/typescript/test/inputs/json/misc/6260a.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/6260a.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/65dec.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/65dec.json/default/TopLevel.ts index 9324220..5dd6672 100644 --- a/base/typescript/test/inputs/json/misc/65dec.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/65dec.json/default/TopLevel.ts @@ -156,9 +156,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/66121.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/66121.json/default/TopLevel.ts index 9830cd5..7ceb5dd 100644 --- a/base/typescript/test/inputs/json/misc/66121.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/66121.json/default/TopLevel.ts @@ -128,9 +128,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/6617c.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/6617c.json/default/TopLevel.ts index 01ea72d..8b1b583 100644 --- a/base/typescript/test/inputs/json/misc/6617c.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/6617c.json/default/TopLevel.ts @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/67c03.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/67c03.json/default/TopLevel.ts index 078e091..ac5d03a 100644 --- a/base/typescript/test/inputs/json/misc/67c03.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/67c03.json/default/TopLevel.ts @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/68c30.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/68c30.json/default/TopLevel.ts index 821bced..bfb442a 100644 --- a/base/typescript/test/inputs/json/misc/68c30.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/68c30.json/default/TopLevel.ts @@ -124,9 +124,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/6c155.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/6c155.json/default/TopLevel.ts index fb256a3..dff0eb3 100644 --- a/base/typescript/test/inputs/json/misc/6c155.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/6c155.json/default/TopLevel.ts @@ -146,9 +146,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/6de06.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/6de06.json/default/TopLevel.ts index d66b8fa..c47808c 100644 --- a/base/typescript/test/inputs/json/misc/6de06.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/6de06.json/default/TopLevel.ts @@ -236,9 +236,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/6dec6.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/6dec6.json/default/TopLevel.ts index 6e2745b..f050abd 100644 --- a/base/typescript/test/inputs/json/misc/6dec6.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/6dec6.json/default/TopLevel.ts @@ -193,9 +193,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/6eb00.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/6eb00.json/default/TopLevel.ts index 63835a1..c6013e7 100644 --- a/base/typescript/test/inputs/json/misc/6eb00.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/6eb00.json/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/70c77.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/70c77.json/default/TopLevel.ts index 51c34f0..95815ab 100644 --- a/base/typescript/test/inputs/json/misc/70c77.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/70c77.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/734ad.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/734ad.json/default/TopLevel.ts index 7f98792..3f8bb6b 100644 --- a/base/typescript/test/inputs/json/misc/734ad.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/734ad.json/default/TopLevel.ts @@ -162,9 +162,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/75912.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/75912.json/default/TopLevel.ts index 51c34f0..95815ab 100644 --- a/base/typescript/test/inputs/json/misc/75912.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/75912.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/7681c.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/7681c.json/default/TopLevel.ts index 2c8c3d5..03dfd49 100644 --- a/base/typescript/test/inputs/json/misc/7681c.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/7681c.json/default/TopLevel.ts @@ -201,9 +201,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/76ae1.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/76ae1.json/default/TopLevel.ts index 1ff30e6..19d9d08 100644 --- a/base/typescript/test/inputs/json/misc/76ae1.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/76ae1.json/default/TopLevel.ts @@ -274,9 +274,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/77392.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/77392.json/default/TopLevel.ts index bd1d90f..e22c20c 100644 --- a/base/typescript/test/inputs/json/misc/77392.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/77392.json/default/TopLevel.ts @@ -108,9 +108,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/7d397.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/7d397.json/default/TopLevel.ts index cca1a7e..079d636 100644 --- a/base/typescript/test/inputs/json/misc/7d397.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/7d397.json/default/TopLevel.ts @@ -166,9 +166,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/7d722.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/7d722.json/default/TopLevel.ts index 05276b1..387c68b 100644 --- a/base/typescript/test/inputs/json/misc/7d722.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/7d722.json/default/TopLevel.ts @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/7df41.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/7df41.json/default/TopLevel.ts index 8bb0df8..72a929f 100644 --- a/base/typescript/test/inputs/json/misc/7df41.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/7df41.json/default/TopLevel.ts @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/7dfa6.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/7dfa6.json/default/TopLevel.ts index 824027c..4410198 100644 --- a/base/typescript/test/inputs/json/misc/7dfa6.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/7dfa6.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/7eb30.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/7eb30.json/default/TopLevel.ts index a522f6b..8ee3924 100644 --- a/base/typescript/test/inputs/json/misc/7eb30.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/7eb30.json/default/TopLevel.ts @@ -130,9 +130,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/7f568.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/7f568.json/default/TopLevel.ts index 908a330..043d2cd 100644 --- a/base/typescript/test/inputs/json/misc/7f568.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/7f568.json/default/TopLevel.ts @@ -122,9 +122,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/7fbfb.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/7fbfb.json/default/TopLevel.ts index 6884826..b963850 100644 --- a/base/typescript/test/inputs/json/misc/7fbfb.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/7fbfb.json/default/TopLevel.ts @@ -117,9 +117,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/80aff.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/80aff.json/default/TopLevel.ts index 7393e16..be6bb40 100644 --- a/base/typescript/test/inputs/json/misc/80aff.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/80aff.json/default/TopLevel.ts @@ -109,9 +109,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/82509.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/82509.json/default/TopLevel.ts index 3b002b1..3dfd80e 100644 --- a/base/typescript/test/inputs/json/misc/82509.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/82509.json/default/TopLevel.ts @@ -93,9 +93,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/8592b.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/8592b.json/default/TopLevel.ts index b0907a4..865b3bf 100644 --- a/base/typescript/test/inputs/json/misc/8592b.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/8592b.json/default/TopLevel.ts @@ -205,9 +205,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/88130.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/88130.json/default/TopLevel.ts index 5e66d83..326fe2c 100644 --- a/base/typescript/test/inputs/json/misc/88130.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/88130.json/default/TopLevel.ts @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/8a62c.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/8a62c.json/default/TopLevel.ts index 824027c..4410198 100644 --- a/base/typescript/test/inputs/json/misc/8a62c.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/8a62c.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/908db.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/908db.json/default/TopLevel.ts index 071e0d8..760fc3e 100644 --- a/base/typescript/test/inputs/json/misc/908db.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/908db.json/default/TopLevel.ts @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/9617f.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/9617f.json/default/TopLevel.ts index 51c34f0..95815ab 100644 --- a/base/typescript/test/inputs/json/misc/9617f.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/9617f.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/96f7c.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/96f7c.json/default/TopLevel.ts index 900a451..5b7617a 100644 --- a/base/typescript/test/inputs/json/misc/96f7c.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/96f7c.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/9847b.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/9847b.json/default/TopLevel.ts index b1f7df7..a534cd8 100644 --- a/base/typescript/test/inputs/json/misc/9847b.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/9847b.json/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/9929c.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/9929c.json/default/TopLevel.ts index 5e66d83..326fe2c 100644 --- a/base/typescript/test/inputs/json/misc/9929c.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/9929c.json/default/TopLevel.ts @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/996bd.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/996bd.json/default/TopLevel.ts index d940071..f2848e7 100644 --- a/base/typescript/test/inputs/json/misc/996bd.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/996bd.json/default/TopLevel.ts @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/9a503.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/9a503.json/default/TopLevel.ts index a7ce96f..c4374be 100644 --- a/base/typescript/test/inputs/json/misc/9a503.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/9a503.json/default/TopLevel.ts @@ -120,9 +120,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/9ac3b.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/9ac3b.json/default/TopLevel.ts index 9f4c57f..b6b89d6 100644 --- a/base/typescript/test/inputs/json/misc/9ac3b.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/9ac3b.json/default/TopLevel.ts @@ -117,9 +117,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/9eed5.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/9eed5.json/default/TopLevel.ts index f2587f8..606805b 100644 --- a/base/typescript/test/inputs/json/misc/9eed5.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/9eed5.json/default/TopLevel.ts @@ -120,9 +120,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/a0496.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/a0496.json/default/TopLevel.ts index b1b15e4..29a97ac 100644 --- a/base/typescript/test/inputs/json/misc/a0496.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/a0496.json/default/TopLevel.ts @@ -111,9 +111,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/a1eca.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/a1eca.json/default/TopLevel.ts index 5e66d83..326fe2c 100644 --- a/base/typescript/test/inputs/json/misc/a1eca.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/a1eca.json/default/TopLevel.ts @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/a3d8c.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/a3d8c.json/default/TopLevel.ts index e16a8f2..a6d4e9d 100644 --- a/base/typescript/test/inputs/json/misc/a3d8c.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/a3d8c.json/default/TopLevel.ts @@ -203,9 +203,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/a45b0.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/a45b0.json/default/TopLevel.ts index d624211..7ad82c9 100644 --- a/base/typescript/test/inputs/json/misc/a45b0.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/a45b0.json/default/TopLevel.ts @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/a71df.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/a71df.json/default/TopLevel.ts index 05276b1..387c68b 100644 --- a/base/typescript/test/inputs/json/misc/a71df.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/a71df.json/default/TopLevel.ts @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/a9691.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/a9691.json/default/TopLevel.ts index 51c34f0..95815ab 100644 --- a/base/typescript/test/inputs/json/misc/a9691.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/a9691.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/ab0d1.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/ab0d1.json/default/TopLevel.ts index d624211..7ad82c9 100644 --- a/base/typescript/test/inputs/json/misc/ab0d1.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/ab0d1.json/default/TopLevel.ts @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/abb4b.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/abb4b.json/default/TopLevel.ts index 824027c..4410198 100644 --- a/base/typescript/test/inputs/json/misc/abb4b.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/abb4b.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/ac944.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/ac944.json/default/TopLevel.ts index 51c34f0..95815ab 100644 --- a/base/typescript/test/inputs/json/misc/ac944.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/ac944.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/ad8be.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/ad8be.json/default/TopLevel.ts index 40b751e..23e7aea 100644 --- a/base/typescript/test/inputs/json/misc/ad8be.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/ad8be.json/default/TopLevel.ts @@ -133,9 +133,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/ae7f0.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/ae7f0.json/default/TopLevel.ts index faecb0c..d6dd558 100644 --- a/base/typescript/test/inputs/json/misc/ae7f0.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/ae7f0.json/default/TopLevel.ts @@ -181,9 +181,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/ae9ca.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/ae9ca.json/default/TopLevel.ts index 697ca29..840d9bd 100644 --- a/base/typescript/test/inputs/json/misc/ae9ca.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/ae9ca.json/default/TopLevel.ts @@ -129,9 +129,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/af2d1.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/af2d1.json/default/TopLevel.ts index 9bb1083..556989e 100644 --- a/base/typescript/test/inputs/json/misc/af2d1.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/af2d1.json/default/TopLevel.ts @@ -179,9 +179,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/b4865.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/b4865.json/default/TopLevel.ts index 62b85c8..4705f87 100644 --- a/base/typescript/test/inputs/json/misc/b4865.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/b4865.json/default/TopLevel.ts @@ -117,9 +117,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/b6f2c.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/b6f2c.json/default/TopLevel.ts index 824027c..4410198 100644 --- a/base/typescript/test/inputs/json/misc/b6f2c.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/b6f2c.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/b6fe5.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/b6fe5.json/default/TopLevel.ts index cc93842..fecaacc 100644 --- a/base/typescript/test/inputs/json/misc/b6fe5.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/b6fe5.json/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/b9f64.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/b9f64.json/default/TopLevel.ts index bff8ceb..ef419ae 100644 --- a/base/typescript/test/inputs/json/misc/b9f64.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/b9f64.json/default/TopLevel.ts @@ -93,9 +93,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/bb1ec.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/bb1ec.json/default/TopLevel.ts index 824027c..4410198 100644 --- a/base/typescript/test/inputs/json/misc/bb1ec.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/bb1ec.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/be234.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/be234.json/default/TopLevel.ts index 62b7427..8084cfa 100644 --- a/base/typescript/test/inputs/json/misc/be234.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/be234.json/default/TopLevel.ts @@ -242,9 +242,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/c0356.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/c0356.json/default/TopLevel.ts index 5489e4d..9c197dd 100644 --- a/base/typescript/test/inputs/json/misc/c0356.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/c0356.json/default/TopLevel.ts @@ -105,9 +105,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/c0a3a.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/c0a3a.json/default/TopLevel.ts index 05276b1..387c68b 100644 --- a/base/typescript/test/inputs/json/misc/c0a3a.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/c0a3a.json/default/TopLevel.ts @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/c3303.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/c3303.json/default/TopLevel.ts index afcc259..30c9816 100644 --- a/base/typescript/test/inputs/json/misc/c3303.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/c3303.json/default/TopLevel.ts @@ -200,9 +200,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/c6cfd.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/c6cfd.json/default/TopLevel.ts index 766e801..aedd67b 100644 --- a/base/typescript/test/inputs/json/misc/c6cfd.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/c6cfd.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/c8c7e.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/c8c7e.json/default/TopLevel.ts index 6cc0632..8ad8440 100644 --- a/base/typescript/test/inputs/json/misc/c8c7e.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/c8c7e.json/default/TopLevel.ts @@ -117,9 +117,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/cb0cc.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/cb0cc.json/default/TopLevel.ts index 185febd..7c1d718 100644 --- a/base/typescript/test/inputs/json/misc/cb0cc.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/cb0cc.json/default/TopLevel.ts @@ -110,9 +110,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/cb81e.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/cb81e.json/default/TopLevel.ts index 30b8696..0de13b7 100644 --- a/base/typescript/test/inputs/json/misc/cb81e.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/cb81e.json/default/TopLevel.ts @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/ccd18.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/ccd18.json/default/TopLevel.ts index 05276b1..387c68b 100644 --- a/base/typescript/test/inputs/json/misc/ccd18.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/ccd18.json/default/TopLevel.ts @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/cd238.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/cd238.json/default/TopLevel.ts index 05276b1..387c68b 100644 --- a/base/typescript/test/inputs/json/misc/cd238.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/cd238.json/default/TopLevel.ts @@ -126,9 +126,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/cd463.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/cd463.json/default/TopLevel.ts index 51c34f0..95815ab 100644 --- a/base/typescript/test/inputs/json/misc/cd463.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/cd463.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/cda6c.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/cda6c.json/default/TopLevel.ts index 02abac0..a08b87e 100644 --- a/base/typescript/test/inputs/json/misc/cda6c.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/cda6c.json/default/TopLevel.ts @@ -117,9 +117,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/cf0d8.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/cf0d8.json/default/TopLevel.ts index 5e66d83..326fe2c 100644 --- a/base/typescript/test/inputs/json/misc/cf0d8.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/cf0d8.json/default/TopLevel.ts @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/cfbce.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/cfbce.json/default/TopLevel.ts index 51c34f0..95815ab 100644 --- a/base/typescript/test/inputs/json/misc/cfbce.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/cfbce.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/d0908.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/d0908.json/default/TopLevel.ts index 824027c..4410198 100644 --- a/base/typescript/test/inputs/json/misc/d0908.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/d0908.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/d23d5.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/d23d5.json/default/TopLevel.ts index 20b6f90..a8e98e5 100644 --- a/base/typescript/test/inputs/json/misc/d23d5.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/d23d5.json/default/TopLevel.ts @@ -108,9 +108,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/dbfb3.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/dbfb3.json/default/TopLevel.ts index b728093..aea95f1 100644 --- a/base/typescript/test/inputs/json/misc/dbfb3.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/dbfb3.json/default/TopLevel.ts @@ -193,9 +193,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/dc44f.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/dc44f.json/default/TopLevel.ts index 700fadf..9f24f1d 100644 --- a/base/typescript/test/inputs/json/misc/dc44f.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/dc44f.json/default/TopLevel.ts @@ -161,9 +161,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/dd1ce.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/dd1ce.json/default/TopLevel.ts index 700fadf..9f24f1d 100644 --- a/base/typescript/test/inputs/json/misc/dd1ce.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/dd1ce.json/default/TopLevel.ts @@ -161,9 +161,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/dec3a.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/dec3a.json/default/TopLevel.ts index 1d071df..ee87204 100644 --- a/base/typescript/test/inputs/json/misc/dec3a.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/dec3a.json/default/TopLevel.ts @@ -154,9 +154,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/df957.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/df957.json/default/TopLevel.ts index 5e66d83..326fe2c 100644 --- a/base/typescript/test/inputs/json/misc/df957.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/df957.json/default/TopLevel.ts @@ -191,9 +191,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/e0ac7.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/e0ac7.json/default/TopLevel.ts index 5f4da6f..45dddb7 100644 --- a/base/typescript/test/inputs/json/misc/e0ac7.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/e0ac7.json/default/TopLevel.ts @@ -199,9 +199,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/e2915.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/e2915.json/default/TopLevel.ts index e19dd6e..24da29a 100644 --- a/base/typescript/test/inputs/json/misc/e2915.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/e2915.json/default/TopLevel.ts @@ -193,9 +193,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/e2a58.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/e2a58.json/default/TopLevel.ts index 88ed88f..02c1922 100644 --- a/base/typescript/test/inputs/json/misc/e2a58.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/e2a58.json/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/e324e.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/e324e.json/default/TopLevel.ts index b2a72cd..ba0e20a 100644 --- a/base/typescript/test/inputs/json/misc/e324e.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/e324e.json/default/TopLevel.ts @@ -164,9 +164,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/e53b5.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/e53b5.json/default/TopLevel.ts index 0216fc7..c8daa62 100644 --- a/base/typescript/test/inputs/json/misc/e53b5.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/e53b5.json/default/TopLevel.ts @@ -117,9 +117,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/e64a0.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/e64a0.json/default/TopLevel.ts index 9a20499..5e05adc 100644 --- a/base/typescript/test/inputs/json/misc/e64a0.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/e64a0.json/default/TopLevel.ts @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/e8a0b.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/e8a0b.json/default/TopLevel.ts index d624211..7ad82c9 100644 --- a/base/typescript/test/inputs/json/misc/e8a0b.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/e8a0b.json/default/TopLevel.ts @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/e8b04.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/e8b04.json/default/TopLevel.ts index 3bc4f02..c7f36cb 100644 --- a/base/typescript/test/inputs/json/misc/e8b04.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/e8b04.json/default/TopLevel.ts @@ -324,9 +324,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/ed095.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/ed095.json/default/TopLevel.ts index 281babf..4c5def7 100644 --- a/base/typescript/test/inputs/json/misc/ed095.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/ed095.json/default/TopLevel.ts @@ -91,9 +91,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/f22f5.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/f22f5.json/default/TopLevel.ts index 9c3cfa0..e6358bc 100644 --- a/base/typescript/test/inputs/json/misc/f22f5.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/f22f5.json/default/TopLevel.ts @@ -179,9 +179,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/f3139.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/f3139.json/default/TopLevel.ts index b1f7df7..a534cd8 100644 --- a/base/typescript/test/inputs/json/misc/f3139.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/f3139.json/default/TopLevel.ts @@ -96,9 +96,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/f3edf.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/f3edf.json/default/TopLevel.ts index d624211..7ad82c9 100644 --- a/base/typescript/test/inputs/json/misc/f3edf.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/f3edf.json/default/TopLevel.ts @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/f466a.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/f466a.json/default/TopLevel.ts index d624211..7ad82c9 100644 --- a/base/typescript/test/inputs/json/misc/f466a.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/f466a.json/default/TopLevel.ts @@ -102,9 +102,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/f6a65.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/f6a65.json/default/TopLevel.ts index 0388eb4..a59bbe4 100644 --- a/base/typescript/test/inputs/json/misc/f6a65.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/f6a65.json/default/TopLevel.ts @@ -201,9 +201,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/f74d5.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/f74d5.json/default/TopLevel.ts index e74ebdb..beb16ec 100644 --- a/base/typescript/test/inputs/json/misc/f74d5.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/f74d5.json/default/TopLevel.ts @@ -203,9 +203,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/f82d9.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/f82d9.json/default/TopLevel.ts index e8bc876..81d48e9 100644 --- a/base/typescript/test/inputs/json/misc/f82d9.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/f82d9.json/default/TopLevel.ts @@ -177,9 +177,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/f974d.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/f974d.json/default/TopLevel.ts index f045824..af9c786 100644 --- a/base/typescript/test/inputs/json/misc/f974d.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/f974d.json/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/faff5.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/faff5.json/default/TopLevel.ts index 41f69ac..d2dea8f 100644 --- a/base/typescript/test/inputs/json/misc/faff5.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/faff5.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/fcca3.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/fcca3.json/default/TopLevel.ts index a9e8711..f7842db 100644 --- a/base/typescript/test/inputs/json/misc/fcca3.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/fcca3.json/default/TopLevel.ts @@ -303,9 +303,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/misc/fd329.json/default/TopLevel.ts b/head/typescript/test/inputs/json/misc/fd329.json/default/TopLevel.ts index 38eedf1..2d57590 100644 --- a/base/typescript/test/inputs/json/misc/fd329.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/misc/fd329.json/default/TopLevel.ts @@ -106,9 +106,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/blns-object.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/blns-object.json/default/TopLevel.ts index 75c36fd..8e3f78e 100644 --- a/base/typescript/test/inputs/json/priority/blns-object.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/blns-object.json/default/TopLevel.ts @@ -688,9 +688,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/bug2037.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/bug2037.json/default/TopLevel.ts index b7774e3..0c3f438 100644 --- a/base/typescript/test/inputs/json/priority/bug2037.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/bug2037.json/default/TopLevel.ts @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/bug2521.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/bug2521.json/default/TopLevel.ts index 71bdb20..d331b6a 100644 --- a/base/typescript/test/inputs/json/priority/bug2521.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/bug2521.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/bug2590.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/bug2590.json/default/TopLevel.ts index 6f1b3c3..0107b2e 100644 --- a/base/typescript/test/inputs/json/priority/bug2590.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/bug2590.json/default/TopLevel.ts @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/bug2663.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/bug2663.json/default/TopLevel.ts index 551b34c..4e7f249 100644 --- a/base/typescript/test/inputs/json/priority/bug2663.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/bug2663.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/bug2793.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/bug2793.json/default/TopLevel.ts index 21337ab..35d7c00 100644 --- a/base/typescript/test/inputs/json/priority/bug2793.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/bug2793.json/default/TopLevel.ts @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/bug427.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/bug427.json/default/TopLevel.ts index ce49d3d..aea7e3d 100644 --- a/base/typescript/test/inputs/json/priority/bug427.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/bug427.json/default/TopLevel.ts @@ -650,9 +650,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/bug790.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/bug790.json/default/TopLevel.ts index 72f464b..8d49754 100644 --- a/base/typescript/test/inputs/json/priority/bug790.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/bug790.json/default/TopLevel.ts @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/bug855-short.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/bug855-short.json/default/TopLevel.ts index 3d18c2a..4c58dc8 100644 --- a/base/typescript/test/inputs/json/priority/bug855-short.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/bug855-short.json/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/bug863.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/bug863.json/default/TopLevel.ts index 1d678fc..67c5930 100644 --- a/base/typescript/test/inputs/json/priority/bug863.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/bug863.json/default/TopLevel.ts @@ -163,9 +163,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/coin-pairs.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/coin-pairs.json/default/TopLevel.ts index 48962b7..5c9d538 100644 --- a/base/typescript/test/inputs/json/priority/coin-pairs.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/coin-pairs.json/default/TopLevel.ts @@ -105,9 +105,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations1.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations1.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts index 542710c..679da36 100644 --- a/base/typescript/test/inputs/json/priority/combinations1.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations1.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations1.json/converters-all-objects--3a443babd1cb/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations1.json/converters-all-objects--3a443babd1cb/TopLevel.ts index 405bb56..7cff966 100644 --- a/base/typescript/test/inputs/json/priority/combinations1.json/converters-all-objects--3a443babd1cb/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations1.json/converters-all-objects--3a443babd1cb/TopLevel.ts @@ -589,9 +589,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations1.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations1.json/default/TopLevel.ts index 542710c..679da36 100644 --- a/base/typescript/test/inputs/json/priority/combinations1.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations1.json/default/TopLevel.ts @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations1.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations1.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts index fd0686c..e1afcff 100644 --- a/base/typescript/test/inputs/json/priority/combinations1.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations1.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations1.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations1.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts index 542710c..679da36 100644 --- a/base/typescript/test/inputs/json/priority/combinations1.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations1.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations1.json/prefer-types-true--df33e18681f9/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations1.json/prefer-types-true--df33e18681f9/TopLevel.ts index c459d41..8611e47 100644 --- a/base/typescript/test/inputs/json/priority/combinations1.json/prefer-types-true--df33e18681f9/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations1.json/prefer-types-true--df33e18681f9/TopLevel.ts @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations1.json/prefer-unions-false--a5053c0a486d/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations1.json/prefer-unions-false--a5053c0a486d/TopLevel.ts index 542710c..679da36 100644 --- a/base/typescript/test/inputs/json/priority/combinations1.json/prefer-unions-false--a5053c0a486d/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations1.json/prefer-unions-false--a5053c0a486d/TopLevel.ts @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations1.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations1.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts index 542710c..679da36 100644 --- a/base/typescript/test/inputs/json/priority/combinations1.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations1.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations1.json/raw-type-any--474b307c39db/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations1.json/raw-type-any--474b307c39db/TopLevel.ts index 9fa0df5..8582cd2 100644 --- a/base/typescript/test/inputs/json/priority/combinations1.json/raw-type-any--474b307c39db/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations1.json/raw-type-any--474b307c39db/TopLevel.ts @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations1.json/readonly-true--24da4fc107df/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations1.json/readonly-true--24da4fc107df/TopLevel.ts index 77a2ff0..34c703c 100644 --- a/base/typescript/test/inputs/json/priority/combinations1.json/readonly-true--24da4fc107df/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations1.json/readonly-true--24da4fc107df/TopLevel.ts @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations1.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations1.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts index baa7c41..7ae18c7 100644 --- a/base/typescript/test/inputs/json/priority/combinations1.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations1.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts @@ -485,9 +485,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations2.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations2.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts index 0cf2c61..b4c2c4f 100644 --- a/base/typescript/test/inputs/json/priority/combinations2.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations2.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations2.json/converters-all-objects--3a443babd1cb/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations2.json/converters-all-objects--3a443babd1cb/TopLevel.ts index 7af1f47..778fc0b 100644 --- a/base/typescript/test/inputs/json/priority/combinations2.json/converters-all-objects--3a443babd1cb/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations2.json/converters-all-objects--3a443babd1cb/TopLevel.ts @@ -517,9 +517,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations2.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations2.json/default/TopLevel.ts index 0cf2c61..b4c2c4f 100644 --- a/base/typescript/test/inputs/json/priority/combinations2.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations2.json/default/TopLevel.ts @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations2.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations2.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts index a998694..074568c 100644 --- a/base/typescript/test/inputs/json/priority/combinations2.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations2.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations2.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations2.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts index 0cf2c61..b4c2c4f 100644 --- a/base/typescript/test/inputs/json/priority/combinations2.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations2.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations2.json/prefer-types-true--df33e18681f9/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations2.json/prefer-types-true--df33e18681f9/TopLevel.ts index dd1c517..d40487c 100644 --- a/base/typescript/test/inputs/json/priority/combinations2.json/prefer-types-true--df33e18681f9/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations2.json/prefer-types-true--df33e18681f9/TopLevel.ts @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations2.json/prefer-unions-false--a5053c0a486d/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations2.json/prefer-unions-false--a5053c0a486d/TopLevel.ts index 0cf2c61..b4c2c4f 100644 --- a/base/typescript/test/inputs/json/priority/combinations2.json/prefer-unions-false--a5053c0a486d/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations2.json/prefer-unions-false--a5053c0a486d/TopLevel.ts @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations2.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations2.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts index 0cf2c61..b4c2c4f 100644 --- a/base/typescript/test/inputs/json/priority/combinations2.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations2.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations2.json/raw-type-any--474b307c39db/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations2.json/raw-type-any--474b307c39db/TopLevel.ts index 9b327ea..8c07b18 100644 --- a/base/typescript/test/inputs/json/priority/combinations2.json/raw-type-any--474b307c39db/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations2.json/raw-type-any--474b307c39db/TopLevel.ts @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations2.json/readonly-true--24da4fc107df/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations2.json/readonly-true--24da4fc107df/TopLevel.ts index 0add202..a3932d8 100644 --- a/base/typescript/test/inputs/json/priority/combinations2.json/readonly-true--24da4fc107df/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations2.json/readonly-true--24da4fc107df/TopLevel.ts @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations2.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations2.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts index 9ee5cc8..b09e292 100644 --- a/base/typescript/test/inputs/json/priority/combinations2.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations2.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts @@ -437,9 +437,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations3.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations3.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts index deeb945..0608432 100644 --- a/base/typescript/test/inputs/json/priority/combinations3.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations3.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations3.json/converters-all-objects--3a443babd1cb/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations3.json/converters-all-objects--3a443babd1cb/TopLevel.ts index dca1901..fdb79e6 100644 --- a/base/typescript/test/inputs/json/priority/combinations3.json/converters-all-objects--3a443babd1cb/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations3.json/converters-all-objects--3a443babd1cb/TopLevel.ts @@ -653,9 +653,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations3.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations3.json/default/TopLevel.ts index deeb945..0608432 100644 --- a/base/typescript/test/inputs/json/priority/combinations3.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations3.json/default/TopLevel.ts @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations3.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations3.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts index c4ee62d..ef98de0 100644 --- a/base/typescript/test/inputs/json/priority/combinations3.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations3.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations3.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations3.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts index deeb945..0608432 100644 --- a/base/typescript/test/inputs/json/priority/combinations3.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations3.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations3.json/prefer-types-true--df33e18681f9/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations3.json/prefer-types-true--df33e18681f9/TopLevel.ts index bab6e2e..f5081c5 100644 --- a/base/typescript/test/inputs/json/priority/combinations3.json/prefer-types-true--df33e18681f9/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations3.json/prefer-types-true--df33e18681f9/TopLevel.ts @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations3.json/prefer-unions-false--a5053c0a486d/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations3.json/prefer-unions-false--a5053c0a486d/TopLevel.ts index deeb945..0608432 100644 --- a/base/typescript/test/inputs/json/priority/combinations3.json/prefer-unions-false--a5053c0a486d/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations3.json/prefer-unions-false--a5053c0a486d/TopLevel.ts @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations3.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations3.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts index deeb945..0608432 100644 --- a/base/typescript/test/inputs/json/priority/combinations3.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations3.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations3.json/raw-type-any--474b307c39db/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations3.json/raw-type-any--474b307c39db/TopLevel.ts index 66a975d..bed1fe0 100644 --- a/base/typescript/test/inputs/json/priority/combinations3.json/raw-type-any--474b307c39db/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations3.json/raw-type-any--474b307c39db/TopLevel.ts @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations3.json/readonly-true--24da4fc107df/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations3.json/readonly-true--24da4fc107df/TopLevel.ts index 9ddb448..459f1a0 100644 --- a/base/typescript/test/inputs/json/priority/combinations3.json/readonly-true--24da4fc107df/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations3.json/readonly-true--24da4fc107df/TopLevel.ts @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations3.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations3.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts index ce3c4d5..f840f1e 100644 --- a/base/typescript/test/inputs/json/priority/combinations3.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations3.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts @@ -541,9 +541,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations4.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations4.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts index c743e3a..5951b18 100644 --- a/base/typescript/test/inputs/json/priority/combinations4.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations4.json/acronym-style-pascal--d9e0c1bd777a/TopLevel.ts @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations4.json/converters-all-objects--3a443babd1cb/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations4.json/converters-all-objects--3a443babd1cb/TopLevel.ts index 32879ba..e8877ed 100644 --- a/base/typescript/test/inputs/json/priority/combinations4.json/converters-all-objects--3a443babd1cb/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations4.json/converters-all-objects--3a443babd1cb/TopLevel.ts @@ -739,9 +739,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations4.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations4.json/default/TopLevel.ts index c743e3a..5951b18 100644 --- a/base/typescript/test/inputs/json/priority/combinations4.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations4.json/default/TopLevel.ts @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations4.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations4.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts index a531c43..1f585be 100644 --- a/base/typescript/test/inputs/json/priority/combinations4.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations4.json/nice-property-names-true--f4d7920ee2ce/TopLevel.ts @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations4.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations4.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts index c743e3a..5951b18 100644 --- a/base/typescript/test/inputs/json/priority/combinations4.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations4.json/prefer-const-values-true--6b26e4d1265c/TopLevel.ts @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations4.json/prefer-types-true--df33e18681f9/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations4.json/prefer-types-true--df33e18681f9/TopLevel.ts index 33bfc62..6ce3e0d 100644 --- a/base/typescript/test/inputs/json/priority/combinations4.json/prefer-types-true--df33e18681f9/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations4.json/prefer-types-true--df33e18681f9/TopLevel.ts @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations4.json/prefer-unions-false--a5053c0a486d/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations4.json/prefer-unions-false--a5053c0a486d/TopLevel.ts index c743e3a..5951b18 100644 --- a/base/typescript/test/inputs/json/priority/combinations4.json/prefer-unions-false--a5053c0a486d/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations4.json/prefer-unions-false--a5053c0a486d/TopLevel.ts @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations4.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations4.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts index c743e3a..5951b18 100644 --- a/base/typescript/test/inputs/json/priority/combinations4.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations4.json/prefer-unknown-false--f1ab9e45d823/TopLevel.ts @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations4.json/raw-type-any--474b307c39db/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations4.json/raw-type-any--474b307c39db/TopLevel.ts index db8aa65..939bcbc 100644 --- a/base/typescript/test/inputs/json/priority/combinations4.json/raw-type-any--474b307c39db/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations4.json/raw-type-any--474b307c39db/TopLevel.ts @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations4.json/readonly-true--24da4fc107df/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations4.json/readonly-true--24da4fc107df/TopLevel.ts index 095a16c..f34288f 100644 --- a/base/typescript/test/inputs/json/priority/combinations4.json/readonly-true--24da4fc107df/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations4.json/readonly-true--24da4fc107df/TopLevel.ts @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combinations4.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts b/head/typescript/test/inputs/json/priority/combinations4.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts index 95b3291..ce85e55 100644 --- a/base/typescript/test/inputs/json/priority/combinations4.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combinations4.json/runtime-typecheck-ignore-unknown-properties-true--d792c40f022e/TopLevel.ts @@ -611,9 +611,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/combined-enum.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/combined-enum.json/default/TopLevel.ts index 37bdf50..e30fce8 100644 --- a/base/typescript/test/inputs/json/priority/combined-enum.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/combined-enum.json/default/TopLevel.ts @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/direct-recursive.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/direct-recursive.json/default/TopLevel.ts index 2d5cdbd..1ccfd7b 100644 --- a/base/typescript/test/inputs/json/priority/direct-recursive.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/direct-recursive.json/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/empty-enum.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/empty-enum.json/default/TopLevel.ts index 7dfc6b7..7eb2cdb 100644 --- a/base/typescript/test/inputs/json/priority/empty-enum.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/empty-enum.json/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/identifiers.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/identifiers.json/default/TopLevel.ts index de42c53..ae67b29 100644 --- a/base/typescript/test/inputs/json/priority/identifiers.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/identifiers.json/default/TopLevel.ts @@ -121,9 +121,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/issue2680-object-array.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/issue2680-object-array.json/default/TopLevel.ts index c8e46d4..335b7dd 100644 --- a/base/typescript/test/inputs/json/priority/issue2680-object-array.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/issue2680-object-array.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/issue2680-scalar-array.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/issue2680-scalar-array.json/default/TopLevel.ts index 9f9b3d6..ca369a4 100644 --- a/base/typescript/test/inputs/json/priority/issue2680-scalar-array.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/issue2680-scalar-array.json/default/TopLevel.ts @@ -91,9 +91,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/keywords.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/keywords.json/default/TopLevel.ts index 9534f60..e24c517 100644 --- a/base/typescript/test/inputs/json/priority/keywords.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/keywords.json/default/TopLevel.ts @@ -1785,9 +1785,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/keywords.json/prefer-types-true--df33e18681f9/TopLevel.ts b/head/typescript/test/inputs/json/priority/keywords.json/prefer-types-true--df33e18681f9/TopLevel.ts index f1590b7..88ac711 100644 --- a/base/typescript/test/inputs/json/priority/keywords.json/prefer-types-true--df33e18681f9/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/keywords.json/prefer-types-true--df33e18681f9/TopLevel.ts @@ -1785,9 +1785,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/TopLevel.ts index eeab77a..545396a 100644 --- a/base/typescript/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/kotlin-enum-class-case-collision.json/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/list.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/list.json/default/TopLevel.ts index 550a950..1429f3a 100644 --- a/base/typescript/test/inputs/json/priority/list.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/list.json/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/name-style.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/name-style.json/default/TopLevel.ts index 2bcc4e2..21a322a 100644 --- a/base/typescript/test/inputs/json/priority/name-style.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/name-style.json/default/TopLevel.ts @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/nbl-stats.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/nbl-stats.json/default/TopLevel.ts index 26d8381..a265b9c 100644 --- a/base/typescript/test/inputs/json/priority/nbl-stats.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/nbl-stats.json/default/TopLevel.ts @@ -370,9 +370,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/nested-objects.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/nested-objects.json/default/TopLevel.ts index a1b089d..a741269 100644 --- a/base/typescript/test/inputs/json/priority/nested-objects.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/nested-objects.json/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/no-classes.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/no-classes.json/default/TopLevel.ts index 111e281..4876b01 100644 --- a/base/typescript/test/inputs/json/priority/no-classes.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/no-classes.json/default/TopLevel.ts @@ -91,9 +91,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/nst-test-suite.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/nst-test-suite.json/default/TopLevel.ts index 53012a2..0f2f138 100644 --- a/base/typescript/test/inputs/json/priority/nst-test-suite.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/nst-test-suite.json/default/TopLevel.ts @@ -230,9 +230,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/number-map.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/number-map.json/default/TopLevel.ts index 5acf2f5..41370fd 100644 --- a/base/typescript/test/inputs/json/priority/number-map.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/number-map.json/default/TopLevel.ts @@ -93,9 +93,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/omit-empty.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/omit-empty.json/default/TopLevel.ts index 4629d9d..c96f79b 100644 --- a/base/typescript/test/inputs/json/priority/omit-empty.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/omit-empty.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/optional-union.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/optional-union.json/default/TopLevel.ts index ed9914b..c8a3e45 100644 --- a/base/typescript/test/inputs/json/priority/optional-union.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/optional-union.json/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/php-mixed-union.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/php-mixed-union.json/default/TopLevel.ts index 14ba2bd..376e070 100644 --- a/base/typescript/test/inputs/json/priority/php-mixed-union.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/php-mixed-union.json/default/TopLevel.ts @@ -99,9 +99,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/php-validation.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/php-validation.json/default/TopLevel.ts index ffabdda..fc7a7ad 100644 --- a/base/typescript/test/inputs/json/priority/php-validation.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/php-validation.json/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/recursive.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/recursive.json/default/TopLevel.ts index 2c52978..3868bca 100644 --- a/base/typescript/test/inputs/json/priority/recursive.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/recursive.json/default/TopLevel.ts @@ -212,9 +212,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/simple-identifiers.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/simple-identifiers.json/default/TopLevel.ts index 61d8ad3..ab06d0f 100644 --- a/base/typescript/test/inputs/json/priority/simple-identifiers.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/simple-identifiers.json/default/TopLevel.ts @@ -101,9 +101,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/union-constructor-clash.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/union-constructor-clash.json/default/TopLevel.ts index 9bf4778..cb0039e 100644 --- a/base/typescript/test/inputs/json/priority/union-constructor-clash.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/union-constructor-clash.json/default/TopLevel.ts @@ -100,9 +100,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/unions.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/unions.json/default/TopLevel.ts index 3f729e7..49dfd80 100644 --- a/base/typescript/test/inputs/json/priority/unions.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/unions.json/default/TopLevel.ts @@ -103,9 +103,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/url.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/url.json/default/TopLevel.ts index 56df2ba..e92223c 100644 --- a/base/typescript/test/inputs/json/priority/url.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/url.json/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/priority/uuids.json/default/TopLevel.ts b/head/typescript/test/inputs/json/priority/uuids.json/default/TopLevel.ts index 450efa7..5f38ed6 100644 --- a/base/typescript/test/inputs/json/priority/uuids.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/priority/uuids.json/default/TopLevel.ts @@ -98,9 +98,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/bitcoin-block.json/default/TopLevel.ts b/head/typescript/test/inputs/json/samples/bitcoin-block.json/default/TopLevel.ts index f045824..af9c786 100644 --- a/base/typescript/test/inputs/json/samples/bitcoin-block.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/bitcoin-block.json/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/copy-with-property.json/default/TopLevel.ts b/head/typescript/test/inputs/json/samples/copy-with-property.json/default/TopLevel.ts index 2c5c49a..7f160e8 100644 --- a/base/typescript/test/inputs/json/samples/copy-with-property.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/copy-with-property.json/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/getting-started.json/default/TopLevel.ts b/head/typescript/test/inputs/json/samples/getting-started.json/default/TopLevel.ts index 68047d4..982350c 100644 --- a/base/typescript/test/inputs/json/samples/getting-started.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/getting-started.json/default/TopLevel.ts @@ -94,9 +94,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/github-events.json/default/TopLevel.ts b/head/typescript/test/inputs/json/samples/github-events.json/default/TopLevel.ts index f9be8e3..0f67ea7 100644 --- a/base/typescript/test/inputs/json/samples/github-events.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/github-events.json/default/TopLevel.ts @@ -379,9 +379,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/kitchen-sink.json/default/TopLevel.ts b/head/typescript/test/inputs/json/samples/kitchen-sink.json/default/TopLevel.ts index e3ddd80..32253aa 100644 --- a/base/typescript/test/inputs/json/samples/kitchen-sink.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/kitchen-sink.json/default/TopLevel.ts @@ -125,9 +125,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/null-safe.json/default/TopLevel.ts b/head/typescript/test/inputs/json/samples/null-safe.json/default/TopLevel.ts index acb9d31..6f4fbe6 100644 --- a/base/typescript/test/inputs/json/samples/null-safe.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/null-safe.json/default/TopLevel.ts @@ -106,9 +106,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/objc-control-characters.json/default/TopLevel.ts b/head/typescript/test/inputs/json/samples/objc-control-characters.json/default/TopLevel.ts index 1cfdd69..64bb986 100644 --- a/base/typescript/test/inputs/json/samples/objc-control-characters.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/objc-control-characters.json/default/TopLevel.ts @@ -97,9 +97,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/pokedex.json/default/TopLevel.ts b/head/typescript/test/inputs/json/samples/pokedex.json/default/TopLevel.ts index f442069..22737f1 100644 --- a/base/typescript/test/inputs/json/samples/pokedex.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/pokedex.json/default/TopLevel.ts @@ -122,9 +122,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/pokedex.json/prefer-types-true--df33e18681f9/TopLevel.ts b/head/typescript/test/inputs/json/samples/pokedex.json/prefer-types-true--df33e18681f9/TopLevel.ts index 871aee4..51b9278 100644 --- a/base/typescript/test/inputs/json/samples/pokedex.json/prefer-types-true--df33e18681f9/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/pokedex.json/prefer-types-true--df33e18681f9/TopLevel.ts @@ -122,9 +122,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/reddit.json/default/TopLevel.ts b/head/typescript/test/inputs/json/samples/reddit.json/default/TopLevel.ts index 49a90d6..a68d5e8 100644 --- a/base/typescript/test/inputs/json/samples/reddit.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/reddit.json/default/TopLevel.ts @@ -219,9 +219,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/simple-object.json/default/TopLevel.ts b/head/typescript/test/inputs/json/samples/simple-object.json/default/TopLevel.ts index 73b065e..5045fe9 100644 --- a/base/typescript/test/inputs/json/samples/simple-object.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/simple-object.json/default/TopLevel.ts @@ -95,9 +95,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/spotify-album.json/default/TopLevel.ts b/head/typescript/test/inputs/json/samples/spotify-album.json/default/TopLevel.ts index e1ac35d..97c4f70 100644 --- a/base/typescript/test/inputs/json/samples/spotify-album.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/spotify-album.json/default/TopLevel.ts @@ -163,9 +163,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/us-avg-temperatures.json/default/TopLevel.ts b/head/typescript/test/inputs/json/samples/us-avg-temperatures.json/default/TopLevel.ts index 38eedf1..2d57590 100644 --- a/base/typescript/test/inputs/json/samples/us-avg-temperatures.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/us-avg-temperatures.json/default/TopLevel.ts @@ -106,9 +106,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent); diff --git a/base/typescript/test/inputs/json/samples/us-senators.json/default/TopLevel.ts b/head/typescript/test/inputs/json/samples/us-senators.json/default/TopLevel.ts index dd9e267..fa36513 100644 --- a/base/typescript/test/inputs/json/samples/us-senators.json/default/TopLevel.ts +++ b/head/typescript/test/inputs/json/samples/us-senators.json/default/TopLevel.ts @@ -175,9 +175,10 @@ function transform(val: any, typ: any, getProps: any, key: any = '', parent: any } function transformDate(val: any): any { - if (val === null) { - return null; - } + if (val === null) return null; + if (val instanceof Date) return val; + if (typeof val !== "string" || !/^[0-9]{4}-(?:0[1-9]|1[0-2])-(?:[0-2][0-9]|3[01])(?:T(?:[01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](?:[.][0-9]+)?(?:Z|[+-](?:[01][0-9]|2[0-3]):[0-5][0-9]))?$/i.test(val)) + return invalidValue(l("Date"), val, key, parent); const d = new Date(val); if (isNaN(d.valueOf())) { return invalidValue(l("Date"), val, key, parent);