Merge pull request #106 from Adityakumar37/fix#91

Author: sagold

src/SchemaNode.ts

@@ -94,6 +94,7 @@ export type Context = {
     getDataDefaultOptions?: TemplateOptions;
     /** [SHARED USING ADD REMOTE] collect unknown keywords in schemaAnnotations */
     withSchemaAnnotations?: boolean;
+    strictRefs?: boolean;
 };
 
 export interface SchemaNode extends SchemaNodeMethodsType {

src/compileSchema.ts

@@ -33,6 +33,8 @@ export type CompileOptions = {
     throwOnInvalidSchema?: boolean;
     /** set to true to collect unknown keywords of input schema in `node.schemaAnnotations`. Defaults to false */
     withSchemaAnnotations?: boolean;
+    strictRefs?: boolean;
+
 };
 
 const defaultDrafts: Draft[] = [draft04, draft06, draft07, draft2019, draft2020];
@@ -69,6 +71,7 @@ export function compileSchema(schema: JsonSchema | BooleanSchema, options: Compi
             ...copy(pick(draft, "methods", "keywords", "version", "formats", "errors")),
             getDataDefaultOptions: options.getDataDefaultOptions,
             withSchemaAnnotations: options.withSchemaAnnotations ?? false,
+            strictRefs: options.strictRefs ?? false,
             drafts
         },
         ...SchemaNodeMethods

src/draft06/keywords/$ref.ts

@@ -52,6 +52,14 @@ function parseRef(node: SchemaNode) {
 function validateRef({ node, data, pointer = "#", path }: JsonSchemaValidatorParams) {
     const nextNode = resolveAllRefs(node, pointer, path);
     if (nextNode == null) {
+        if (node.context.strictRefs) {
+            return node.createError("unknown-ref-target-error", {
+                ref: node.schema.$ref,
+                pointer,
+                schema: node.schema,
+                value: data
+            });
+        }
         return undefined;
     }
     return validateNode(nextNode, data, pointer, path);

src/draft2019-09/keywords/$ref.ts

@@ -93,9 +93,16 @@ export function resolveRef(this: SchemaNode, { pointer, path }: { pointer?: stri
 function validateRef({ node, data, pointer = "#", path }: JsonSchemaValidatorParams) {
     const nextNode = node.resolveRef({ pointer, path });
     if (nextNode != null) {
-        // recursively resolveRef and validate
         return validateNode(nextNode, data, pointer, path);
     }
+    if (node.context.strictRefs) {
+        return node.createError("unknown-ref-target-error", {
+            ref: node.schema.$ref ?? node.schema.$recursiveRef,
+            pointer,
+            schema: node.schema,
+            value: data
+        });
+    }
 }
 
 // 1. https://json-schema.org/draft/2019-09/json-schema-core#scopes

src/errors/errors.ts

@@ -77,5 +77,6 @@ export const errors = {
     "deprecated-warning": "Value at `{{pointer}}` is deprecated",
     // schema validation
     "schema-error": "Invalid schema found at {{pointer}}: {{message}}",
-    "unknown-keyword-warning": "Keyword '{{value}}' is not a valid keyword to draft '{{draft}}'"
+    "unknown-keyword-warning": "Keyword '{{value}}' is not a valid keyword to draft '{{draft}}'",
+    "unknown-ref-target-error": "Could not resolve $ref '{{ref}}' from '{{pointer}}'",
 };

src/keywords/$ref.ts

@@ -90,9 +90,18 @@ export function reduceRef({ node, data, key, pointer, path }: JsonSchemaReducerP
     if (node == null) {
         return;
     }
+    
 
     const resolvedNode = node.resolveRef({ pointer, path });
     if (resolvedNode == null) {
+        if (node.context.strictRefs) {
+            return node.createError("unknown-ref-target-error", {
+                ref: node.schema.$ref ?? node.schema.$dynamicRef,
+                pointer,
+                schema: node.schema,
+                value: data
+            });
+        }
         return;
     }
 
@@ -129,6 +138,14 @@ function validateRef({ node, data, pointer = "#", path }: JsonSchemaValidatorPar
         // recursively resolveRef and validate
         return validateNode(nextNode, data, pointer, path);
     }
+        if (node.context.strictRefs) {
+        return node.createError("unknown-ref-target-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

src/tests/issues/issue82.test.ts

@@ -68,4 +68,30 @@ describe("issue#82", () => {
 
         assert.equal(valid, false);
     });
+    it("should return an error when $ref cannot be resolved and strictRefs is true", () => {
+        const schema = compileSchema({
+            $schema: "https://json-schema.org/draft/2020-12/schema",
+            type: "object",
+            properties: {
+                value: { $ref: "#/$defs/nonexistent" }
+            }
+        }, { strictRefs: true });
+
+        const { valid, errors } = schema.validate({ value: 123 });
+        assert.equal(valid, false);
+        assert.equal(errors[0].code, "unknown-ref-target-error");
+    });
+
+    it("should silently pass when $ref cannot be resolved and strictRefs is false (default)", () => {
+        const schema = compileSchema({
+            type: "object",
+            properties: {
+                value: { $ref: "#/$defs/nonexistent" }
+            }
+        });
+
+        const { valid } = schema.validate({ value: 123 });
+        assert.equal(valid, true);
+    });
+
 });