Make 2020-12 format a distinct keyword

Author: jdesrosiers

README.md

@@ -507,32 +507,31 @@ associate that format handler with the format keyword that applies to the
 dialects you're targeting.
 
 ```JavaScript
-import { registerSchema, validate } from "@hyperjump/json-schema/draft-2020-12";
-import {
-  setShouldValiateFormat,
-  addFormat,
-  setFormatHandler
-} from "@hyperjump/json-schema/formats";
+import { registerSchema, validate, setShouldValidateFormat } from "@hyperjump/json-schema/draft-2020-12";
+import { addFormat, setFormatHandler } from "@hyperjump/json-schema/experimental";
 
-const isoDateFormatUri = "https://example.com/format/iso-8601-date"; 
+const isoDateFormatUri = "https://example.com/format/iso-8601-date";
 
+// Add the iso-date format handler
 addFormat({
   id: isoDateFormatUri,
-  handler: (date) => Date.parse(date).toISOString() === date
+  handler: (date) => new Date(date).toISOString() === date
 });
 
-addFormatHandler("https://json-schema.org/keyword/format", "iso-date", isoDateFormatUri);
-addFormatHandler("https://json-schema.org/keyword/format-assertion", "iso-date", isoDateFormatUri);
-// Optional: Add the iso-date format to other dialects
-addFormatHandler("https://json-schema.org/keyword/draft-2019-09/format", "iso-date", isoDateFormatUri);
-addFormatHandler("https://json-schema.org/keyword/draft-2019-09/format-assertion", "iso-date", isoDateFormatUri);
-addFormatHandler("https://json-schema.org/keyword/draft-07/format", "iso-date", isoDateFormatUri);
-addFormatHandler("https://json-schema.org/keyword/draft-06/format", "iso-date", isoDateFormatUri);
-addFormatHandler("https://json-schema.org/keyword/draft-04/format", "iso-date", isoDateFormatUri);
+// Add the "iso-date" format to the 2020-12 version of `format`
+setFormatHandler("https://json-schema.org/keyword/draft-2020-12/format", "iso-date", isoDateFormatUri);
+setFormatHandler("https://json-schema.org/keyword/draft-2020-12/format-assertion", "iso-date", isoDateFormatUri);
+
+// Optional: Add the "iso-date" format to other dialects
+setFormatHandler("https://json-schema.org/keyword/draft-2019-09/format", "iso-date", isoDateFormatUri);
+setFormatHandler("https://json-schema.org/keyword/draft-2019-09/format-assertion", "iso-date", isoDateFormatUri);
+setFormatHandler("https://json-schema.org/keyword/draft-07/format", "iso-date", isoDateFormatUri);
+setFormatHandler("https://json-schema.org/keyword/draft-06/format", "iso-date", isoDateFormatUri);
+setFormatHandler("https://json-schema.org/keyword/draft-04/format", "iso-date", isoDateFormatUri);
 
 const schemaUri = "https://example.com/main";
 registerSchema({
-  "$schema": "https://json-schema.org/draft/2002-12/schema",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
 
   "type": "string",
   "format": "iso-date"

draft-2020-12/format.js

@@ -0,0 +1,44 @@
+import * as Browser from "@hyperjump/browser";
+import * as Instance from "../lib/instance.js";
+import { getShouldValidateFormat } from "../lib/configuration.js";
+import { getFormatHandler } from "../lib/keywords.js";
+
+
+const id = "https://json-schema.org/keyword/draft-2020-12/format";
+
+const compile = (schema) => Browser.value(schema);
+
+const interpret = (format, instance) => {
+  if (!getShouldValidateFormat()) {
+    return true;
+  }
+
+  const handler = getFormatHandler(formats[format]);
+  return handler?.(Instance.value(instance)) ?? true;
+};
+
+const annotation = (format) => format;
+
+const formats = {
+  "date-time": "https://json-schema.org/format/date-time",
+  "date": "https://json-schema.org/format/date",
+  "time": "https://json-schema.org/format/time",
+  "duration": "https://json-schema.org/format/duration",
+  "email": "https://json-schema.org/format/email",
+  "idn-email": "https://json-schema.org/format/idn-email",
+  "hostname": "https://json-schema.org/format/hostname",
+  "idn-hostname": "https://json-schema.org/format/idn-hostname",
+  "ipv4": "https://json-schema.org/format/ipv4",
+  "ipv6": "https://json-schema.org/format/ipv6",
+  "uri": "https://json-schema.org/format/uri",
+  "uri-reference": "https://json-schema.org/format/uri-reference",
+  "iri": "https://json-schema.org/format/iri",
+  "iri-reference": "https://json-schema.org/format/iri-reference",
+  "uuid": "https://json-schema.org/format/uuid",
+  "uri-template": "https://json-schema.org/format/uri-template",
+  "json-pointer": "https://json-schema.org/format/json-pointer",
+  "relative-json-pointer": "https://json-schema.org/format/relative-json-pointer",
+  "regex": "https://json-schema.org/format/regex"
+};
+
+export default { id, compile, interpret, annotation, formats };

draft-2020-12/index.js

@@ -13,7 +13,7 @@ import unevaluatedMetaSchema from "./meta/unevaluated.js";
 
 import dynamicAnchor from "./dynamicAnchor.js";
 import dynamicRef from "./dynamicRef.js";
-import format from "../draft-2019-09/format.js";
+import format from "./format.js";
 import formatAssertion from "./format-assertion.js";
 
 
@@ -85,7 +85,7 @@ defineVocabulary("https://json-schema.org/draft/2020-12/vocab/meta-data", {
 });
 
 defineVocabulary("https://json-schema.org/draft/2020-12/vocab/format-annotation", {
-  "format": "https://json-schema.org/keyword/draft-2019-09/format"
+  "format": "https://json-schema.org/keyword/draft-2020-12/format"
 });
 
 defineVocabulary("https://json-schema.org/draft/2020-12/vocab/format-assertion", {

formats/formats-test-suite.spec.ts

@@ -1,12 +1,12 @@
 import fs from "node:fs";
 import { describe, it, expect, beforeAll, afterAll } from "vitest";
-import { registerSchema, unregisterSchema, validate } from "../lib/index.js";
+import { registerSchema, setShouldValidateFormat, unregisterSchema, validate } from "../lib/index.js";
+import "./index.js";
 import "../draft-2020-12/index.js";
 import "../draft-2019-09/index.js";
 import "../draft-07/index.js";
 import "../draft-06/index.js";
 import "../draft-04/index.js";
-import { setShouldValidateFormat } from "./index.js";
 
 import type { Json } from "@hyperjump/json-pointer";
 import type { SchemaObject, Validator } from "../lib/index.js";

formats/index.js

@@ -1,4 +1,5 @@
 import { addFormat } from "../lib/keywords.js";
+import "./lite.js";
 
 import idnEmail from "./handlers/idn-email.js";
 import hostname from "./handlers/hostname.js";
@@ -8,5 +9,3 @@ import idnHostname from "./handlers/idn-hostname.js";
 addFormat(idnEmail);
 addFormat(hostname);
 addFormat(idnHostname);
-
-export * from "./lite.js";

formats/lite.js

@@ -36,8 +36,3 @@ addFormat(uriTemplate);
 addFormat(jsonPointer);
 addFormat(relativeJsonPointer);
 addFormat(regex);
-
-export {
-  getShouldValidateFormat,
-  setShouldValidateFormat
-} from "../lib/configuration.js";

lib/index.d.ts

@@ -54,6 +54,8 @@ export const setMetaSchemaOutputFormat: (format: OutputFormat) => void;
 export const getMetaSchemaOutputFormat: () => OutputFormat;
 export const setShouldValidateSchema: (isEnabled: boolean) => void;
 export const getShouldValidateSchema: () => boolean;
+export const setShouldValidateFormat: (isEnabled: boolean) => void;
+export const getShouldValidateFormat: () => boolean;
 
 export class InvalidSchemaError extends Error {
   public output: Output & { valid: false };

lib/index.js

@@ -135,6 +135,8 @@ export {
   getMetaSchemaOutputFormat,
   setMetaSchemaOutputFormat,
   getShouldValidateSchema,
-  setShouldValidateSchema
+  setShouldValidateSchema,
+  getShouldValidateFormat,
+  setShouldValidateFormat
 } from "./configuration.js";
 export { InvalidSchemaError } from "./invalid-schema-error.js";