@hyperjump/json-schema 1.16.5 → 1.17.1

package/README.md

@@ -4,18 +4,19 @@ A collection of modules for working with JSON Schemas.
 
 * Validate JSON-compatible values against a JSON Schemas
   * Dialects: draft-2020-12, draft-2019-09, draft-07, draft-06, draft-04
+  * Complete validation support for all formats defined for the `format` keyword
   * Schemas can reference other schemas using a different dialect
   * Work directly with schemas on the filesystem or HTTP
 * OpenAPI
   * Versions: 3.0, 3.1, 3.2 
   * Validate an OpenAPI document
   * Validate values against a schema from an OpenAPI document
-* Create custom keywords, vocabularies, and dialects
+* Create custom keywords, formats, vocabularies, and dialects
 * Bundle multiple schemas into one document
   * Uses the process defined in the 2020-12 specification but works with any
     dialect.
-* Utilities for building non-validation JSON Schema tooling
-* Utilities for working with annotations
+* API for building non-validation JSON Schema tooling
+* API for working with annotations
 
 ## Install
 
@@ -68,8 +69,8 @@ import { registerSchema, validate } from "@hyperjump/json-schema/draft-2020-12";
 import "@hyperjump/json-schema/draft-07";
 ```
 
-**Note**: The default export (`@hyperjump/json-schema`) is reserved for the
-stable version of JSON Schema that will hopefully be released in near future.
+**Note**: The default export (`@hyperjump/json-schema`) is reserved for v1 of
+JSON Schema that will hopefully be released in near future.
 
 **Validate schema from JavaScript**
 
@@ -98,7 +99,7 @@ const output1 = isString("foo");
 const output2 = isString(42);
 ```
 
-**Fetching schemas**
+**File-based and web-based schemas**
 
 Schemas that are available on the web can be loaded automatically without
 needing to load them manually.
@@ -130,15 +131,42 @@ You can add/modify/remove support for any URI scheme using the [plugin
 system](https://github.com/hyperjump-io/browser/#uri-schemes) provided by
 `@hyperjump/browser`.
 
+**Format**
+
+Format validation support needs to be explicitly loaded by importing
+`@hyperjump/json-schema/formats`. Once loaded, it depends on the dialect whether
+validation is enabled by default or not. You should explicitly enable/disable it
+with the `setShouldValidateFormat` function.
+
+The `hostname`, `idn-hostname`, and `idn-email` validators are fairly large. If
+you don't need support for those formats and bundle size is a concern, you can
+use `@hyperjump/json-schema/formats-lite` instead to leave out support for those
+formats.
+
+```javascript
+import { registerSchema, validate } from "@hyperjump/json-schema/draft-2020-12";
+import { setShouldValidateFormat } from "@hyperjump/json-schema/formats";
+
+const schemaUri = "https://example.com/number";
+registerSchema({
+  "type": "string",
+  "format": "date"
+}, schemaUri);
+
+setShouldValidateFormat(true);
+const output = await validate(schemaUri, "Feb 29, 2031"); // { valid: false }
+```
+
 **OpenAPI**
 
-The OpenAPI 3.0 and 3.1 and 3.2 meta-schemas are pre-loaded and the OpenAPI JSON Schema
-dialects for each of those versions is supported. A document with a Content-Type
-of `application/openapi+json` (web) or a file extension of `openapi.json`
-(filesystem) is understood as an OpenAPI document.
+The OpenAPI 3.0 and 3.1 and 3.2 meta-schemas are pre-loaded and the OpenAPI JSON
+Schema dialects for each of those versions is supported. A document with a
+Content-Type of `application/openapi+json` (web) or a file extension of
+`openapi.json` (filesystem) is understood as an OpenAPI document.
 
 Use the pattern `@hyperjump/json-schema/*` to import the version you need. The
-available versions are `openapi-3-0` for 3.0, `openapi-3-1` for 3.1, and `openapi-3-2` for 3.2.
+available versions are `openapi-3-0` for 3.0, `openapi-3-1` for 3.1, and
+`openapi-3-2` for 3.2.
 
 ```javascript
 import { validate } from "@hyperjump/json-schema/openapi-3-2";
@@ -472,6 +500,47 @@ registerSchema({
 const output = await validate("https://example.com/schema1", 42);
 ```
 
+### Custom Formats
+
+Custom formats work similarly to keywords. You define a format handler and then
+associate that format handler with the format keyword that applies to the
+dialects you're targeting.
+
+```JavaScript
+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";
+
+// Add the iso-date format handler
+addFormat({
+  id: isoDateFormatUri,
+  handler: (date) => new Date(date).toISOString() === date
+});
+
+// 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/2020-12/schema",
+
+  "type": "string",
+  "format": "iso-date"
+}, schemaUri);
+
+setShouldValidateFormat(true);
+const output = await validate(schemaUri, "Feb 28, 2031"); // { valid: false }
+```
+
 ### Custom Meta Schema
 
 You can use a custom meta-schema to restrict users to a subset of JSON Schema
@@ -605,6 +674,25 @@ These are available from the `@hyperjump/json-schema/experimental` export.
     * **ValidationContext**: object
       * ast: AST
       * plugins: EvaluationPlugins[]
+* **addFormat**: (formatHandler: Format) => void
+
+    Add a format handler.
+
+    * **Format**: object
+      * id: string
+
+          A URI that uniquely identifies the format. It should use a domain you
+          own to avoid conflict with keywords defined by others.
+      * handler: (value: any) => boolean
+
+          A function that takes the value and returns a boolean determining if
+          it passes validation for the format.
+* **setFormatHandler**: (keywordUri: string, formatName: string, formatUri: string) => void
+
+    Add support for a format to the specified keyword.
+* **removeFormatHandler**: (keywordUri, formatName) => void
+
+    Remove support for a format from the specified keyword.
 * **defineVocabulary**: (id: string, keywords: { [keyword: string]: string }) => void
 
     Define a vocabulary that maps keyword name to keyword URIs defined using

package/annotations/annotated-instance.js

@@ -2,7 +2,7 @@ import * as Instance from "../lib/instance.js";
 import { getKeywordId } from "../lib/keywords.js";
 
 
-const defaultDialectId = "https://json-schema.org/validation";
+const defaultDialectId = "https://json-schema.org/v1";
 
 export const annotation = (node, keyword, dialect = defaultDialectId) => {
   const keywordUri = getKeywordId(keyword, dialect);

package/draft-04/format.js

@@ -0,0 +1,31 @@
+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-04/format";
+
+const compile = (schema) => Browser.value(schema);
+
+const interpret = (format, instance) => {
+  if (getShouldValidateFormat() === false) {
+    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",
+  "email": "https://json-schema.org/format/email",
+  "hostname": "https://json-schema.org/format/draft-04/hostname",
+  "ipv4": "https://json-schema.org/format/ipv4",
+  "ipv6": "https://json-schema.org/format/ipv6",
+  "uri": "https://json-schema.org/format/uri"
+};
+
+export default { id, compile, interpret, annotation, formats };

package/draft-04/index.js

@@ -7,6 +7,7 @@ import exclusiveMaximum from "./exclusiveMaximum.js";
 import exclusiveMinimum from "./exclusiveMinimum.js";
 import id from "./id.js";
 import items from "./items.js";
+import format from "./format.js";
 import maximum from "./maximum.js";
 import minimum from "./minimum.js";
 import ref from "./ref.js";
@@ -20,6 +21,7 @@ addKeyword(maximum);
 addKeyword(minimum);
 addKeyword(id);
 addKeyword(items);
+addKeyword(format);
 addKeyword(ref);
 
 const jsonSchemaVersion = "http://json-schema.org/draft-04/schema";
@@ -38,7 +40,7 @@ defineVocabulary(jsonSchemaVersion, {
   "enum": "https://json-schema.org/keyword/enum",
   "exclusiveMaximum": "https://json-schema.org/keyword/draft-04/exclusiveMaximum",
   "exclusiveMinimum": "https://json-schema.org/keyword/draft-04/exclusiveMinimum",
-  "format": "https://json-schema.org/keyword/format",
+  "format": "https://json-schema.org/keyword/draft-04/format",
   "items": "https://json-schema.org/keyword/draft-04/items",
   "maxItems": "https://json-schema.org/keyword/maxItems",
   "maxLength": "https://json-schema.org/keyword/maxLength",

package/draft-06/format.js

@@ -0,0 +1,34 @@
+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-06/format";
+
+const compile = (schema) => Browser.value(schema);
+
+const interpret = (format, instance) => {
+  if (getShouldValidateFormat() === false) {
+    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",
+  "email": "https://json-schema.org/format/email",
+  "hostname": "https://json-schema.org/format/draft-04/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",
+  "uri-template": "https://json-schema.org/format/uri-template",
+  "json-pointer": "https://json-schema.org/format/json-pointer"
+};
+
+export default { id, compile, interpret, annotation, formats };

package/draft-06/index.js

@@ -7,6 +7,7 @@ import contains from "./contains.js";
 import dependencies from "../draft-04/dependencies.js";
 import id from "../draft-04/id.js";
 import items from "../draft-04/items.js";
+import format from "./format.js";
 import ref from "../draft-04/ref.js";
 
 
@@ -15,6 +16,7 @@ addKeyword(dependencies);
 addKeyword(contains);
 addKeyword(id);
 addKeyword(items);
+addKeyword(format);
 addKeyword(ref);
 
 const jsonSchemaVersion = "http://json-schema.org/draft-06/schema";
@@ -36,7 +38,7 @@ defineVocabulary(jsonSchemaVersion, {
   "examples": "https://json-schema.org/keyword/examples",
   "exclusiveMaximum": "https://json-schema.org/keyword/exclusiveMaximum",
   "exclusiveMinimum": "https://json-schema.org/keyword/exclusiveMinimum",
-  "format": "https://json-schema.org/keyword/format",
+  "format": "https://json-schema.org/keyword/draft-06/format",
   "items": "https://json-schema.org/keyword/draft-04/items",
   "maxItems": "https://json-schema.org/keyword/maxItems",
   "maxLength": "https://json-schema.org/keyword/maxLength",

package/draft-07/format.js

@@ -0,0 +1,42 @@
+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-07/format";
+
+const compile = (schema) => Browser.value(schema);
+
+const interpret = (format, instance) => {
+  if (getShouldValidateFormat() === false) {
+    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",
+  "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",
+  "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 };

package/draft-07/index.js

@@ -7,6 +7,7 @@ import contains from "../draft-06/contains.js";
 import dependencies from "../draft-04/dependencies.js";
 import items from "../draft-04/items.js";
 import id from "../draft-04/id.js";
+import format from "./format.js";
 import ref from "../draft-04/ref.js";
 
 
@@ -15,6 +16,7 @@ addKeyword(contains);
 addKeyword(dependencies);
 addKeyword(id);
 addKeyword(items);
+addKeyword(format);
 addKeyword(ref);
 
 const jsonSchemaVersion = "http://json-schema.org/draft-07/schema";
@@ -39,7 +41,7 @@ defineVocabulary(jsonSchemaVersion, {
   "examples": "https://json-schema.org/keyword/examples",
   "exclusiveMaximum": "https://json-schema.org/keyword/exclusiveMaximum",
   "exclusiveMinimum": "https://json-schema.org/keyword/exclusiveMinimum",
-  "format": "https://json-schema.org/keyword/format",
+  "format": "https://json-schema.org/keyword/draft-07/format",
   "if": "https://json-schema.org/keyword/if",
   "then": "https://json-schema.org/keyword/then",
   "else": "https://json-schema.org/keyword/else",

package/draft-2019-09/format-assertion.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-2019-09/format-assertion";
+
+const compile = (schema) => Browser.value(schema);
+
+const interpret = (format, instance) => {
+  if (getShouldValidateFormat() === false) {
+    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 };

package/draft-2019-09/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-2019-09/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 };

package/draft-2019-09/index.js

@@ -11,12 +11,16 @@ import contentMetaSchema from "./meta/content.js";
 
 import additionalItems from "../draft-04/additionalItems.js";
 import items from "../draft-04/items.js";
+import formatAssertion from "./format-assertion.js";
+import format from "./format.js";
 import recursiveAnchor from "./recursiveAnchor.js";
 import recursiveRef from "../draft-2020-12/dynamicRef.js";
 
 
 addKeyword(additionalItems);
 addKeyword(items);
+addKeyword(formatAssertion);
+addKeyword(format);
 addKeyword(recursiveAnchor);
 addKeyword(recursiveRef);
 
@@ -85,7 +89,7 @@ defineVocabulary("https://json-schema.org/draft/2019-09/vocab/meta-data", {
 });
 
 defineVocabulary("https://json-schema.org/draft/2019-09/vocab/format", {
-  "format": "https://json-schema.org/keyword/format"
+  "format": "https://json-schema.org/keyword/draft-2019-09/format-assertion"
 });
 
 defineVocabulary("https://json-schema.org/draft/2019-09/vocab/content", {

package/draft-2020-12/format-assertion.js

@@ -0,0 +1,43 @@
+import * as Browser from "@hyperjump/browser";
+import * as Instance from "../lib/instance.js";
+import { getFormatHandler } from "../lib/keywords.js";
+
+
+const id = "https://json-schema.org/keyword/draft-2020-12/format-assertion";
+
+const compile = (schema) => Browser.value(schema);
+
+const interpret = (format, instance) => {
+  const handler = getFormatHandler(formats[format]);
+  if (!handler) {
+    throw Error(`The '${format}' format is not supported.`);
+  }
+
+  return handler(Instance.value(instance));
+};
+
+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 };

package/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 };

package/draft-2020-12/index.js

@@ -13,10 +13,14 @@ import unevaluatedMetaSchema from "./meta/unevaluated.js";
 
 import dynamicAnchor from "./dynamicAnchor.js";
 import dynamicRef from "./dynamicRef.js";
+import format from "./format.js";
+import formatAssertion from "./format-assertion.js";
 
 
 addKeyword(dynamicRef);
 addKeyword(dynamicAnchor);
+addKeyword(format);
+addKeyword(formatAssertion);
 
 defineVocabulary("https://json-schema.org/draft/2020-12/vocab/core", {
   "$anchor": "https://json-schema.org/keyword/anchor",
@@ -81,11 +85,11 @@ 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/format"
+  "format": "https://json-schema.org/keyword/draft-2020-12/format"
 });
 
 defineVocabulary("https://json-schema.org/draft/2020-12/vocab/format-assertion", {
-  "format": "https://json-schema.org/keyword/format-assertion"
+  "format": "https://json-schema.org/keyword/draft-2020-12/format-assertion"
 });
 
 defineVocabulary("https://json-schema.org/draft/2020-12/vocab/content", {

package/formats/handlers/date-time.js

@@ -0,0 +1,7 @@
+import { isDateTime } from "@hyperjump/json-schema-formats";
+
+
+export default {
+  id: "https://json-schema.org/format/date-time",
+  handler: (dateTime) => typeof dateTime !== "string" || isDateTime(dateTime)
+};

package/formats/handlers/date.js

@@ -0,0 +1,7 @@
+import { isDate } from "@hyperjump/json-schema-formats";
+
+
+export default {
+  id: "https://json-schema.org/format/date",
+  handler: (date) => typeof date !== "string" || isDate(date)
+};

package/formats/handlers/draft-04/hostname.js

@@ -0,0 +1,7 @@
+import { isAsciiIdn } from "@hyperjump/json-schema-formats";
+
+
+export default {
+  id: "https://json-schema.org/format/draft-04/hostname",
+  handler: (hostname) => typeof hostname !== "string" || isAsciiIdn(hostname)
+};

package/formats/handlers/duration.js

@@ -0,0 +1,7 @@
+import { isDuration } from "@hyperjump/json-schema-formats";
+
+
+export default {
+  id: "https://json-schema.org/format/duration",
+  handler: (duration) => typeof duration !== "string" || isDuration(duration)
+};

package/formats/handlers/email.js

@@ -0,0 +1,7 @@
+import { isEmail } from "@hyperjump/json-schema-formats";
+
+
+export default {
+  id: "https://json-schema.org/format/email",
+  handler: (email) => typeof email !== "string" || isEmail(email)
+};

package/formats/handlers/hostname.js

@@ -0,0 +1,7 @@
+import { isAsciiIdn } from "@hyperjump/json-schema-formats";
+
+
+export default {
+  id: "https://json-schema.org/format/hostname",
+  handler: (hostname) => typeof hostname !== "string" || isAsciiIdn(hostname)
+};