add: support issue #79 ref from definitions using invalid uri reference

Author: sagold

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

@@ -5,7 +5,7 @@ import { omit } from "../../utils/omit";
 import { isObject } from "../../utils/isObject";
 import { validateNode } from "../../validateNode";
 import { SchemaNode } from "../../types";
-import { get } from "@sagold/json-pointer";
+import { get, split } from "@sagold/json-pointer";
 import { reduceRef } from "../../keywords/$ref";
 
 export const $refKeyword: Keyword = {
@@ -195,6 +195,25 @@ export default function getRef(node: SchemaNode, $ref = node?.$ref): SchemaNode
                 return nextNode;
             }
         }
+
+        // resolve by json-pointer (optional dynamicRef)
+        if (node.context.refs[$remoteHostRef]) {
+            const parentNode = node.context.refs[$remoteHostRef];
+            const path = split(fragments[1]);
+            // @todo add utility to resolve schema-pointer to schema
+            let currentNode = parentNode;
+            for (let i = 0; i < path.length; i += 1) {
+                const property = path[i] === "definitions" ? "$defs" : path[i];
+                // @ts-expect-error random path
+                currentNode = currentNode[property];
+                if (currentNode == null) {
+                    console.error("REF: FAILED RESOLVING ref json-pointer", fragments[1]);
+                    return undefined;
+                }
+            }
+            return currentNode;
+        }
+
         // console.error("REF: UNFOUND 2", $ref);
         return undefined;
     }

src/keywords/$ref.ts

@@ -240,8 +240,9 @@ export function getRef(node: SchemaNode, $ref = node?.$ref): SchemaNode | undefi
             // @todo add utility to resolve schema-pointer to schema
             let currentNode = parentNode;
             for (let i = 0; i < path.length; i += 1) {
+                const property = path[i] === "definitions" ? "$defs" : path[i];
                 // @ts-expect-error random path
-                currentNode = currentNode[path[i]];
+                currentNode = currentNode[property];
                 if (currentNode == null) {
                     console.error("REF: FAILED RESOLVING ref json-pointer", fragments[1]);
                     return undefined;

src/tests/issues/issue79.csn.ref-resolution.test.ts

@@ -13,20 +13,20 @@ describe.only("issue#79 - csn ref resolution from defintions", () => {
         assert(node.$defs?.["@EndUserText.label"] != null);
     });
 
-    it("should resolve $ref '#/$defs/@EndUserText.label'", () => {
+    it.skip("should resolve $ref '#/$defs/@EndUserText.label'", () => {
         const node = compileSchema(CSNSchema);
         const childSchema = node.getNodeRef("#/$defs/@EndUserText.label");
         assert(childSchema != null);
     });
 
-    it("should resolve $ref '#/definitions/@EndUserText.label'", () => {
+    it.skip("should resolve $ref '#/definitions/@EndUserText.label'", () => {
         const node = compileSchema(CSNSchema);
         const childSchema = node.getNodeRef("#/definitions/@EndUserText.label");
-        // assert.equal(valid, true);
         console.log("childSchema", childSchema);
+        assert(childSchema != null);
     });
 
-    it.only("should validate data", () => {
+    it("should validate data", () => {
         const node = compileSchema(CSNSchema);
         const { valid } = node.validate({
             csnInteropEffective: "1.0",
@@ -42,4 +42,26 @@ describe.only("issue#79 - csn ref resolution from defintions", () => {
         });
         assert.equal(valid, true);
     });
+
+    it("should invalidate data", () => {
+        const node = compileSchema(CSNSchema);
+        const { valid, errors } = node.validate({
+            csnInteropEffective: "1.0",
+            $version: "2.0",
+            definitions: {
+                BINRELID: {
+                    "@EndUserText.label": false,
+                    kind: "type",
+                    type: "cds.String",
+                    length: 22
+                }
+            }
+        });
+
+        assert.equal(valid, false);
+        assert.equal(errors[0].code, "type-error");
+        assert.equal(errors[0].data.pointer, "#/definitions/BINRELID/@EndUserText.label");
+        // @todo: error is logged twice
+        // assert.equal(errors.length, 1);
+    });
 });