json-schema-library 11.1.0 → 11.2.0

package/src/formats/formats.ts

@@ -1,16 +1,14 @@
 /* eslint-disable no-control-regex */
-import { getTypeOf } from "../utils/getTypeOf";
+import { isAsciiIdn, isUri, isIdnEmail, isIri, isIriReference, isIdn } from "@hyperjump/json-schema-formats";
 import validUrl from "valid-url";
+import { getTypeOf } from "../utils/getTypeOf";
 import { JsonSchemaValidatorParams, ValidationReturnType } from "../Keyword";
-import { parse as parseIdnEmail } from "smtp-address-parser";
 import settings from "../settings";
 
 const { REGEX_FLAGS } = settings;
 const isValidIPV4 = /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/;
 const isValidIPV6 =
     /^((([0-9a-f]{1,4}:){7}([0-9a-f]{1,4}|:))|(([0-9a-f]{1,4}:){6}(:[0-9a-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){5}(((:[0-9a-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){4}(((:[0-9a-f]{1,4}){1,3})|((:[0-9a-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){3}(((:[0-9a-f]{1,4}){1,4})|((:[0-9a-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){2}(((:[0-9a-f]{1,4}){1,5})|((:[0-9a-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){1}(((:[0-9a-f]{1,4}){1,6})|((:[0-9a-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9a-f]{1,4}){1,7})|((:[0-9a-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))$/i;
-const isValidHostname =
-    /^(?=.{1,255}$)[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?(?:\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?)*\.?$/;
 const matchDate = /^(\d\d\d\d)-(\d\d)-(\d\d)$/;
 const matchTime =
     /^(?<time>(?:([0-1]\d|2[0-3]):[0-5]\d:(?<second>[0-5]\d|60)))(?:\.\d+)?(?<offset>(?:z|[+-]([0-1]\d|2[0-3])(?::?[0-5]\d)?))$/i;
@@ -129,33 +127,30 @@ export const formats: Record<string, (options: JsonSchemaValidatorParams) => Val
         return undefined;
     },
 
-    /**
-     * @draft 7
-     * [RFC6531] https://json-schema.org/draft-07/json-schema-validation.html#RFC6531
-     */
-    "idn-email": ({ node, pointer, data }) => {
+    hostname: ({ node, pointer, data }) => {
         const { schema } = node;
-        if (typeof data !== "string" || data === "") {
+        if (typeof data !== "string" || isAsciiIdn(data)) {
             return undefined;
         }
-        try {
-            parseIdnEmail(data);
-            return undefined;
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        } catch (e) {
-            return node.createError("format-email-error", { value: data, pointer, schema });
-        }
+        return node.createError("format-hostname-error", { value: data, pointer, schema });
     },
 
-    hostname: ({ node, pointer, data }) => {
-        const { schema } = node;
-        if (typeof data !== "string") {
+    "idn-hostname": ({ node, pointer, data }) => {
+        if (typeof data !== "string" || isIdn(data)) {
             return undefined;
         }
-        if (isValidHostname.test(data)) {
+        return node.createError("format-idn-hostname-error", { value: data, pointer, schema: node.schema });
+    },
+
+    /**
+     * @draft 7
+     * [RFC6531] https://json-schema.org/draft-07/json-schema-validation.html#RFC6531
+     */
+    "idn-email": ({ node, pointer, data }) => {
+        if (typeof data !== "string" || data === "" || isIdnEmail(data)) {
             return undefined;
         }
-        return node.createError("format-hostname-error", { value: data, pointer, schema });
+        return node.createError("format-email-error", { value: data, pointer, schema: node.schema });
     },
 
     ipv4: ({ node, pointer, data }) => {
@@ -188,6 +183,22 @@ export const formats: Record<string, (options: JsonSchemaValidatorParams) => Val
         return node.createError("format-ipv6-error", { value: data, pointer, schema });
     },
 
+    iri: ({ node, pointer, data }) => {
+        const { schema } = node;
+        if (typeof data !== "string" || data === "" || isIri(data)) {
+            return undefined;
+        }
+        return node.createError("format-iri-error", { value: data, pointer, schema });
+    },
+
+    "iri-reference": ({ node, pointer, data }) => {
+        const { schema } = node;
+        if (typeof data !== "string" || data === "" || isIriReference(data)) {
+            return undefined;
+        }
+        return node.createError("format-iri-reference-error", { value: data, pointer, schema });
+    },
+
     "json-pointer": ({ node, pointer, data }) => {
         const { schema } = node;
         if (typeof data !== "string" || data === "") {
@@ -281,14 +292,10 @@ export const formats: Record<string, (options: JsonSchemaValidatorParams) => Val
     },
 
     uri: ({ node, pointer, data }) => {
-        const { schema } = node;
-        if (typeof data !== "string" || data === "") {
-            return undefined;
-        }
-        if (validUrl.isUri(data)) {
+        if (typeof data !== "string" || data === "" || isUri(data)) {
             return undefined;
         }
-        return node.createError("format-uri-error", { value: data, pointer, schema });
+        return node.createError("format-uri-error", { value: data, pointer, schema: node.schema });
     },
 
     "uri-reference": ({ node, pointer, data }) => {

package/src/formats/hyperjump.d.ts

@@ -0,0 +1,172 @@
+declare module "@hyperjump/json-schema-formats" {
+    /**
+     * The 'date' format. Validates that a string represents a date according to
+     * [RFC 3339, section 5.6](https://www.rfc-editor.org/rfc/rfc3339.html#section-5.6).
+     *
+     * @see [JSON Schema Core, section 7.3.1](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.1)
+     */
+    export const isDate: (date: string) => boolean;
+
+    /**
+     * The 'time' format. Validates that a string represents a time according to
+     * [RFC 3339, section 5.6](https://www.rfc-editor.org/rfc/rfc3339.html#section-5.6).
+     *
+     * **NOTE**: Leap seconds are only allowed on specific dates. Since there is no date
+     * in this context, leap seconds are never allowed.
+     *
+     * @see [JSON Schema Core, section 7.3.1](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.1)
+     */
+    export const isTime: (time: string) => boolean;
+
+    /**
+     * The 'date-time' format. Validates that a string represents a date-time
+     * according to [RFC 3339, section 5.6](https://www.rfc-editor.org/rfc/rfc3339.html#section-5.6).
+     *
+     * @see [JSON Schema Core, section 7.3.1](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.1)
+     */
+    export const isDateTime: (dateTime: string) => boolean;
+
+    /**
+     * The 'duration' format. Validates that a string represents a duration
+     * according to [RFC 3339, Appendix A](https://www.rfc-editor.org/rfc/rfc3339.html#appendix-A).
+     *
+     * @see [JSON Schema Core, section 7.3.1](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.1)
+     */
+    export const isDuration: (duration: string) => boolean;
+
+    /**
+     * The 'email' format. Validates that a string represents an email as defined by
+     * the "Mailbox" ABNF rule in [RFC 5321, section 4.1.2](https://www.rfc-editor.org/rfc/rfc5321.html#section-4.1.2).
+     *
+     * @see [JSON Schema Core, section 7.3.2](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.2)
+     */
+    export const isEmail: (email: string) => boolean;
+
+    /**
+     * The 'idn-email' format. Validates that a string represents an email as
+     * defined by the "Mailbox" ABNF rule in [RFC 6531, section 3.3](https://www.rfc-editor.org/rfc/rfc6531.html#section-3.3).
+     *
+     * @see [JSON Schema Core, section 7.3.2](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.2)
+     */
+    export const isIdnEmail: (email: string) => boolean;
+
+    /**
+     * The 'hostname' format in draft-04 - draft-06. Validates that a string
+     * represents a hostname as defined by [RFC 1123, section 2.1](https://www.rfc-editor.org/rfc/rfc1123.html#section-2.1).
+     *
+     * **NOTE**: The 'hostname' format changed in draft-07. Use {@link isAsciiIdn} for
+     * draft-07 and later.
+     *
+     * @see [JSON Schema Core, section 7.3.3](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.3)
+     */
+    export const isHostname: (hostname: string) => boolean;
+
+    /**
+     * The 'hostname' format since draft-07. Validates that a string represents an
+     * IDNA2008 internationalized domain name consiting of only A-labels and NR-LDH
+     * labels as defined by [RFC 5890, section 2.3.2.1](https://www.rfc-editor.org/rfc/rfc5890.html#section-2.3.2.3).
+     *
+     * **NOTE**: The 'hostname' format changed in draft-07. Use {@link isHostname}
+     * for draft-06 and earlier.
+     *
+     * @see [JSON Schema Core, section 7.3.3](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.3)
+     */
+    export const isAsciiIdn: (hostname: string) => boolean;
+
+    /**
+     * The 'idn-hostname' format. Validates that a string represents an IDNA2008
+     * internationalized domain name as defined by [RFC 5890, section 2.3.2.1](https://www.rfc-editor.org/rfc/rfc5890.html#section-2.3.2.1).
+     *
+     * @see [JSON Schema Core, section 7.3.3](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.3)
+     */
+    export const isIdn: (hostname: string) => boolean;
+
+    /**
+     * The 'ipv4' format. Validates that a string represents an IPv4 address
+     * according to the "dotted-quad" ABNF syntax as defined in
+     * [RFC 2673, section 3.2](https://www.rfc-editor.org/rfc/rfc2673.html#section-3.2).
+     *
+     * @see [JSON Schema Core, section 7.3.4](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.4)
+     */
+    export const isIPv4: (ip: string) => boolean;
+
+    /**
+     * The 'ipv6' format. Validates that a string represents an IPv6 address as
+     * defined in [RFC 4291, section 2.2](https://www.rfc-editor.org/rfc/rfc4291.html#section-2.2).
+     *
+     * @see [JSON Schema Core, section 7.3.4](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.4)
+     */
+    export const isIPv6: (ip: string) => boolean;
+
+    /**
+     * The 'uri' format. Validates that a string represents a URI as defined by [RFC
+     * 3986](https://www.rfc-editor.org/rfc/rfc3986.html).
+     *
+     * @see [JSON Schema Core, section 7.3.5](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.5)
+     */
+    export const isUri: (uri: string) => boolean;
+
+    /**
+     * The 'uri-reference' format. Validates that a string represents a URI
+     * Reference as defined by [RFC 3986](https://www.rfc-editor.org/rfc/rfc3986.html).
+     *
+     * @see [JSON Schema Core, section 7.3.5](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.5)
+     */
+    export const isUriReference: (uri: string) => boolean;
+
+    /**
+     * The 'iri' format. Validates that a string represents an IRI as defined by
+     * [RFC 3987](https://www.rfc-editor.org/rfc/rfc3987.html).
+     *
+     * @see [JSON Schema Core, section 7.3.5](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.5)
+     */
+    export const isIri: (iri: string) => boolean;
+
+    /**
+     * The 'iri-reference' format. Validates that a string represents an IRI
+     * Reference as defined by [RFC 3987](https://www.rfc-editor.org/rfc/rfc3987.html).
+     *
+     * @see [JSON Schema Core, section 7.3.5](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.5)
+     */
+    export const isIriReference: (iri: string) => boolean;
+
+    /**
+     * The 'uuid' format. Validates that a string represents a UUID address as
+     * defined by [RFC 4122](https://www.rfc-editor.org/rfc/rfc4122.html).
+     *
+     * @see [JSON Schema Core, section 7.3.5](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.5)
+     */
+    export const isUuid: (uuid: string) => boolean;
+
+    /**
+     * The 'uri-template' format. Validates that a string represents a URI Template
+     * as defined by [RFC 6570](https://www.rfc-editor.org/rfc/rfc6570.html).
+     *
+     * @see [JSON Schema Core, section 7.3.6](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.6)
+     */
+    export const isUriTemplate: (uriTemplate: string) => boolean;
+
+    /**
+     * The 'json-pointer' format. Validates that a string represents a JSON Pointer
+     * as defined by [RFC 6901](https://www.rfc-editor.org/rfc/rfc6901.html).
+     *
+     * @see [JSON Schema Core, section 7.3.7](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.7)
+     */
+    export const isJsonPointer: (pointer: string) => boolean;
+
+    /**
+     * The 'relative-json-pointer' format. Validates that a string represents an IRI
+     * Reference as defined by [draft-bhutton-relative-json-pointer-00](https://datatracker.ietf.org/doc/html/draft-bhutton-relative-json-pointer-00).
+     *
+     * @see [JSON Schema Core, section 7.3.5](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.5)
+     */
+    export const isRelativeJsonPointer: (pointer: string) => boolean;
+
+    /**
+     * The 'regex' format. Validates that a string represents a regular expression
+     * as defined by [ECMA-262](https://262.ecma-international.org/5.1/).
+     *
+     * @see [JSON Schema Core, section 7.3.8](https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-7.3.8)
+     */
+    export const isRegex: (regex: string) => boolean;
+}

package/src/keywords/$ref.ts

@@ -1,4 +1,4 @@
-import { SchemaNode } from "../types";
+import { isJsonError, isSchemaNode, JsonError, SchemaNode } from "../types";
 import { Keyword, JsonSchemaValidatorParams, ValidationPath, JsonSchemaReducerParams } from "../Keyword";
 import { resolveUri } from "../utils/resolveUri";
 import splitRef from "../utils/splitRef";
@@ -93,7 +93,12 @@ export function reduceRef({ node, data, key, pointer, path }: JsonSchemaReducerP
 
     const resolvedNode = node.resolveRef({ pointer, path });
     if (resolvedNode == null) {
-        return;
+        return node.createError("ref-error", {
+            ref: node.schema.$ref ?? node.schema.$dynamicRef,
+            pointer,
+            schema: node.schema,
+            value: data
+        });
     }
 
     if (resolvedNode.schemaLocation === node.schemaLocation) {
@@ -107,6 +112,9 @@ export function reduceRef({ node, data, key, pointer, path }: JsonSchemaReducerP
 export function resolveRef(this: SchemaNode, { pointer, path = [] }: { pointer?: string; path?: ValidationPath } = {}) {
     if (this.schema.$dynamicRef) {
         const nextNode = resolveRecursiveRef(this, path);
+        if (isJsonError(nextNode)) {
+            return nextNode;
+        }
         path.push({ pointer: pointer!, node: nextNode! });
         return nextNode;
     }
@@ -116,7 +124,7 @@ export function resolveRef(this: SchemaNode, { pointer, path = [] }: { pointer?:
     }
 
     const resolvedNode = getRef(this);
-    if (resolvedNode != null) {
+    if (isSchemaNode(resolvedNode)) {
         path.push({ pointer: pointer!, node: resolvedNode });
     }
 
@@ -129,10 +137,16 @@ function validateRef({ node, data, pointer = "#", path }: JsonSchemaValidatorPar
         // recursively resolveRef and validate
         return validateNode(nextNode, data, pointer, path);
     }
+    return node.createError("ref-error", {
+        ref: node.schema.$ref ?? node.schema.$dynamicRef,
+        pointer,
+        schema: node.schema,
+        value: data
+    });
 }
 
 // 1. https://json-schema.org/draft/2019-09/json-schema-core#scopes
-function resolveRecursiveRef(node: SchemaNode, path: ValidationPath): SchemaNode | undefined {
+function resolveRecursiveRef(node: SchemaNode, path: ValidationPath): SchemaNode | JsonError {
     const history = path;
     const refInCurrentScope = resolveUri(node.$id, node.schema.$dynamicRef);
 
@@ -180,7 +194,7 @@ function compileNext(referencedNode: SchemaNode, sourceNode: SchemaNode) {
     );
 }
 
-export function getRef(node: SchemaNode, $ref = node?.$ref): SchemaNode | undefined {
+export function getRef(node: SchemaNode, $ref = node?.$ref): SchemaNode | JsonError {
     if ($ref == null) {
         return node;
     }
@@ -202,7 +216,12 @@ export function getRef(node: SchemaNode, $ref = node?.$ref): SchemaNode | undefi
     // check for remote-host + pointer pair to switch rootSchema
     const fragments = splitRef($ref);
     if (fragments.length === 0) {
-        return undefined;
+        return node.createError("ref-error", {
+            ref: $ref,
+            pointer: node.evaluationPath,
+            schema: node.schema,
+            value: undefined
+        });
     }
 
     // resolve $ref as remote-host
@@ -212,6 +231,7 @@ export function getRef(node: SchemaNode, $ref = node?.$ref): SchemaNode | undefi
         if (node.context.remotes[$ref]) {
             return compileNext(node.context.remotes[$ref], node);
         }
+
         if ($ref[0] === "#") {
             // support refOfUnknownKeyword
             const rootSchema = node.context.rootNode.schema;
@@ -221,7 +241,12 @@ export function getRef(node: SchemaNode, $ref = node?.$ref): SchemaNode | undefi
             }
         }
         // console.error("REF: UNFOUND 1", $ref);
-        return undefined;
+        return node.createError("ref-error", {
+            ref: $ref,
+            pointer: node.evaluationPath,
+            schema: node.schema,
+            value: undefined
+        });
     }
 
     if (fragments.length === 2) {
@@ -252,16 +277,25 @@ export function getRef(node: SchemaNode, $ref = node?.$ref): SchemaNode | undefi
                 // @ts-expect-error random path
                 currentNode = currentNode[property];
                 if (currentNode == null) {
-                    console.error("REF: FAILED RESOLVING ref json-pointer", fragments[1]);
-                    return undefined;
+                    // console.error("REF: FAILED RESOLVING ref json-pointer", fragments[1]);
+                    return node.createError("ref-error", {
+                        ref: $ref,
+                        pointer: node.evaluationPath,
+                        schema: node.schema,
+                        value: undefined,
+                        host: fragments[0],
+                        local: fragments[1]
+                    });
                 }
             }
             return currentNode;
         }
-
-        console.error("REF: UNFOUND 2", $ref);
-        return undefined;
     }
 
-    console.error("REF: UNHANDLED", $ref);
+    return node.createError("ref-error", {
+        ref: $ref,
+        pointer: node.evaluationPath,
+        schema: node.schema,
+        value: undefined
+    });
 }

package/src/keywords/properties.ts

@@ -1,5 +1,5 @@
 import { getValue } from "../utils/getValue";
-import { JsonError, SchemaNode } from "../types";
+import { SchemaNode } from "../types";
 import {
     Keyword,
     JsonSchemaResolverParams,

package/src/keywords/propertyDependencies.ts

@@ -5,7 +5,7 @@ import {
     ValidationReturnType,
     ValidationAnnotation
 } from "../Keyword";
-import { isBooleanSchema, isJsonSchema, JsonSchema, SchemaNode } from "../types";
+import { isBooleanSchema, isJsonSchema, SchemaNode } from "../types";
 import { hasProperty } from "../utils/hasProperty";
 import { isObject } from "../utils/isObject";
 import { mergeSchema } from "../utils/mergeSchema";

package/src/methods/getData.ts

@@ -159,7 +159,7 @@ export function getData(node: SchemaNode, data?: unknown, opts?: TemplateOptions
         return defaultData;
     }
 
-    if (resolvedNode && resolvedNode !== currentNode) {
+    if (isSchemaNode(resolvedNode)) {
         defaultData = resolvedNode.getData(defaultData, opts) ?? defaultData;
         currentNode = resolvedNode;
     }

package/src/validateNode.ts

@@ -1,8 +1,11 @@
-import { BooleanSchema, JsonSchema, SchemaNode } from "./types";
+import { BooleanSchema, isJsonError, JsonSchema, SchemaNode } from "./types";
 import { SchemaNodeWithRequired, ValidationPath, ValidationReturnType } from "./Keyword";
 import sanitizeErrors from "./utils/sanitizeErrors";
 
 export function validateNode(node: SchemaNode, data: unknown, pointer: string, path: ValidationPath) {
+    if (isJsonError(node)) {
+        return [node];
+    }
     path.push({ pointer, node });
     const schema = node.schema as BooleanSchema | JsonSchema;
     if (schema === true) {

package/tsconfig.json

@@ -7,10 +7,17 @@
         "module": "ESNext",
         "resolveJsonModule": true,
         "allowSyntheticDefaultImports": true,
-        "moduleResolution": "node",
+        "moduleResolution": "bundler",
         "lib": ["DOM", "ES2018"],
-        "exactOptionalPropertyTypes": true
+        "exactOptionalPropertyTypes": true,
+        "baseUrl": ".",
+        "paths": {
+            "json-schema-library": ["./index.ts"],
+            "json-schema-library/remotes": ["./remotes/index.ts"],
+            "json-schema-library/package.json": ["./package.json"]
+        },
+        "types": ["node", "mocha"]
     },
-    "exclude": ["src/**/*.test.ts"],
-    "include": ["index.ts", "src/**/*"]
+    "exclude": ["src/**/*.test.ts", "src/**/*.spec.ts", "bowtie/**/*.test.ts"],
+    "include": ["index.ts", "src/**/*", "remotes/**/*", "bowtie/**/*"]
 }

package/tsconfig.test.json

@@ -5,11 +5,18 @@
         "incremental": false /* Enable incremental compilation */,
         "target": "ESNEXT" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */,
         "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
+        "moduleResolution": "node10",
         "sourceMap": false /* Generates corresponding '.map' file. */,
         "strict": false /* Enable all strict type-checking options. */,
         "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
-        "types": ["mocha", "node"]
+        "types": ["mocha", "node"],
+        "baseUrl": ".",
+        "paths": {
+            "json-schema-library": ["./index.ts"],
+            "json-schema-library/remotes": ["./remotes/index.ts"],
+            "json-schema-library/package.json": ["./package.json"]
+        }
     },
     "exclude": [],
-    "include": ["src/**/*.test.ts"]
+    "include": ["src/**/*.test.ts", "bowtie/**/*.test.ts"]
 }

package/tsdown.config.ts

@@ -2,7 +2,7 @@ import { defineConfig } from "tsdown";
 
 export default defineConfig({
     dts: true,
-    entry: ["./index.ts"],
+    entry: ["./index.ts", "./remotes/index.ts"],
     exports: true,
     globalName: "jlib"
 });

package/Dockerfile

@@ -1,6 +0,0 @@
-FROM node:23-alpine
-COPY . /usr/app
-WORKDIR /usr/app
-#ENV NODE_ENV=production
-#RUN npm install --omit=dev
-CMD ["node", "bowtie_jlib.js"]

package/bowtie_jlib.js

@@ -1,140 +0,0 @@
-/**
- * test file for bowtie integration
- *
- * - Tutorial: https://docs.bowtie.report/en/stable/implementers/
- *
- * Build Dockerfile:
- *
- * ```
- * docker build -t localhost/jlib .
- * ````
- *
- * Test setup:
- *
- * ```
-bowtie run -i localhost/jlib -V <<EOF
-{"description": "test case 1", "schema": {}, "tests": [{"description": "a test", "instance": {}}] }
-{"description": "test case 2", "schema": {"const": 37}, "tests": [{"description": "not 37", "instance": {}}, {"description": "is 37", "instance": 37}] }
-EOF
- *
- * Test draft
- *
- * ```
- * bowtie suite -i localhost/jlib draft7 | bowtie summary --show failures
- * ```
- *
- */
-const readline = require("readline/promises");
-const process = require("process");
-const os = require("os");
-const packageJson = require("./package.json");
-const jlib = require("./dist/jsonSchemaLibrary.js");
-
-const compileSchema = jlib.compileSchema;
-
-const stdio = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-    terminal: false
-});
-
-// const schemaIds: { [id: string]: SchemaDraft } = {
-//     "https://json-schema.org/draft/2020-12/schema": SchemaDraft.v2020_12,
-//     "https://json-schema.org/draft/2019-09/schema": SchemaDraft.v2019_09,
-//     "http://json-schema.org/draft-07/schema#": SchemaDraft.v7,
-//     "http://json-schema.org/draft-06/schema#": SchemaDraft.v6,
-//     "http://json-schema.org/draft-04/schema#": SchemaDraft.v4
-// };
-
-function send(data) {
-    console.log(JSON.stringify(data));
-}
-
-let started = false;
-// let dialect;
-
-const cmds = {
-    start: async (args) => {
-        console.assert(args.version === 1, { args });
-        started = true;
-        return {
-            version: 1,
-            implementation: {
-                language: "javascript",
-                name: "json-schema-library",
-                version: packageJson.version,
-                homepage: "https://github.com/sagold/json-schema-library",
-                issues: "https://github.com/sagold/json-schema-library/issues",
-                source: "https://github.com/sagold/json-schema-library",
-
-                dialects: [
-                    "https://json-schema.org/draft/2020-12/schema",
-                    "https://json-schema.org/draft/2019-09/schema",
-                    "http://json-schema.org/draft-07/schema#",
-                    "http://json-schema.org/draft-06/schema#",
-                    "http://json-schema.org/draft-04/schema#"
-                ],
-                os: os.platform(),
-                os_version: os.release(),
-                language_version: process.version
-            }
-        };
-    },
-
-    dialect: async (args) => {
-        console.assert(started, "Not started!");
-        // dialect = schemaIds[args.dialect];
-        return { ok: true };
-    },
-
-    run: async (args) => {
-        console.assert(started, "Not started!");
-
-        // for (const id in testCase.registry) {
-        //         ajv.addSchema(testCase.registry[id], id);
-        // }
-
-        const testCase = args.case;
-        //  as {
-        //     registry: Recors<sring, string>;
-        //     schema: Record<string, any>;
-        //     tests: {
-        //         /** testdata */
-        //         instance: unknown;
-        //     }[];
-        // };
-
-        const node = compileSchema(testCase.schema);
-        const results = testCase.tests.map((test) => {
-            try {
-                const errors = node.validate(test.instance);
-                return { valid: errors.length === 0 };
-            } catch (error) {
-                return {
-                    errored: true,
-                    context: {
-                        traceback: error.stack,
-                        message: error.message
-                    }
-                };
-            }
-        });
-
-        return { seq: args.seq, results: results };
-    },
-
-    stop: async (_) => {
-        console.assert(started, "Not started!");
-        process.exit(0);
-    }
-};
-
-async function main() {
-    for await (const line of stdio) {
-        const request = JSON.parse(line);
-        const response = await cmds[request.cmd](request);
-        send(response);
-    }
-}
-
-main();