Merge commit 'eb56578c253ff39b20986aabf48f34193be15457'

* commit 'eb56578c253ff39b20986aabf48f34193be15457': Squashed 'json/' changes from b069ac352..5cc9214e8
python-jsonschema · Aug 3, 2023 · 8a55721 · 8a55721
2 parents 4e999e0 + eb56578
commit 8a55721
Show file tree

Hide file tree

Showing 14 changed files with 342 additions and 56 deletions.
diff --git a/json/remotes/draft-next/detached-dynamicref.json b/json/remotes/draft-next/detached-dynamicref.json
@@ -0,0 +1,13 @@
+{
+  "$id": "http://localhost:1234/draft-next/detached-dynamicref.json",
+  "$schema": "https://json-schema.org/draft/next/schema",
+  "$defs": {
+    "foo": {
+      "$dynamicRef": "#detached"
+    },
+    "detached": {
+      "$dynamicAnchor": "detached",
+      "type": "integer"
+    }
+  }
+}
diff --git a/json/remotes/draft-next/detached-ref.json b/json/remotes/draft-next/detached-ref.json
@@ -0,0 +1,13 @@
+{
+  "$id": "http://localhost:1234/draft-next/detached-ref.json",
+  "$schema": "https://json-schema.org/draft/next/schema",
+  "$defs": {
+    "foo": {
+      "$ref": "#detached"
+    },
+    "detached": {
+      "$anchor": "detached",
+      "type": "integer"
+    }
+  }
+}
diff --git a/json/remotes/draft2019-09/detached-ref.json b/json/remotes/draft2019-09/detached-ref.json
@@ -0,0 +1,13 @@
+{
+  "$id": "http://localhost:1234/draft2019-09/detached-ref.json",
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
+  "$defs": {
+    "foo": {
+      "$ref": "#detached"
+    },
+    "detached": {
+      "$anchor": "detached",
+      "type": "integer"
+    }
+  }
+}
diff --git a/json/remotes/draft2020-12/detached-dynamicref.json b/json/remotes/draft2020-12/detached-dynamicref.json
@@ -0,0 +1,13 @@
+{
+  "$id": "http://localhost:1234/draft2020-12/detached-dynamicref.json",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$defs": {
+    "foo": {
+      "$dynamicRef": "#detached"
+    },
+    "detached": {
+      "$dynamicAnchor": "detached",
+      "type": "integer"
+    }
+  }
+}
diff --git a/json/remotes/draft2020-12/detached-ref.json b/json/remotes/draft2020-12/detached-ref.json
@@ -0,0 +1,13 @@
+{
+  "$id": "http://localhost:1234/draft2020-12/detached-ref.json",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$defs": {
+    "foo": {
+      "$ref": "#detached"
+    },
+    "detached": {
+      "$anchor": "detached",
+      "type": "integer"
+    }
+  }
+}
diff --git a/json/remotes/draft6/detached-ref.json b/json/remotes/draft6/detached-ref.json
@@ -0,0 +1,13 @@
+{
+  "$id": "http://localhost:1234/draft6/detached-ref.json",
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "definitions": {
+    "foo": {
+      "$ref": "#detached"
+    },
+    "detached": {
+      "$id": "#detached",
+      "type": "integer"
+    }
+  }
+}
diff --git a/json/remotes/draft7/detached-ref.json b/json/remotes/draft7/detached-ref.json
@@ -0,0 +1,13 @@
+{
+  "$id": "http://localhost:1234/draft7/detached-ref.json",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "foo": {
+      "$ref": "#detached"
+    },
+    "detached": {
+      "$id": "#detached",
+      "type": "integer"
+    }
+  }
+}
diff --git a/json/tests/draft-next/dynamicRef.json b/json/tests/draft-next/dynamicRef.json
@@ -207,45 +207,75 @@
         "schema": {
             "$schema": "https://json-schema.org/draft/next/schema",
             "$id": "https://test.json-schema.org/dynamic-ref-with-multiple-paths/main",
-            "$defs": {
-                "inner": {
-                    "$id": "inner",
-                    "$dynamicAnchor": "foo",
-                    "title": "inner",
-                    "additionalProperties": {
-                        "$dynamicRef": "#foo"
-                    }
+            "propertyDependencies": {
+                "kindOfList": {
+                    "numbers": { "$ref": "numberList" },
+                    "strings": { "$ref": "stringList" }
                 }
             },
-            "if": {
-                "propertyNames": {
-                    "pattern": "^[a-m]"
+            "$defs": {
+                "genericList": {
+                    "$id": "genericList",
+                    "properties": {
+                        "list": {
+                            "items": { "$dynamicRef": "#itemType" }
+                        }
+                    }
+                },
+                "numberList": {
+                    "$id": "numberList",
+                    "$defs": {
+                        "itemType": {
+                            "$dynamicAnchor": "itemType",
+                            "type": "number"
+                        }
+                    },
+                    "$ref": "genericList"
+                },
+                "stringList": {
+                    "$id": "stringList",
+                    "$defs": {
+                        "itemType": {
+                            "$dynamicAnchor": "itemType",
+                            "type": "string"
+                        }
+                    },
+                    "$ref": "genericList"
                 }
-            },
-            "then": {
-                "title": "any type of node",
-                "$id": "anyLeafNode",
-                "$dynamicAnchor": "foo",
-                "$ref": "inner"
-            },
-            "else": {
-                "title": "integer node",
-                "$id": "integerNode",
-                "$dynamicAnchor": "foo",
-                "type": [ "object", "integer" ],
-                "$ref": "inner"
             }
         },
         "tests": [
             {
-                "description": "recurse to anyLeafNode - floats are allowed",
-                "data": { "alpha": 1.1 },
+                "description": "number list with number values",
+                "data": {
+                    "kindOfList": "numbers",
+                    "list": [1.1]
+                },
                 "valid": true
             },
             {
-                "description": "recurse to integerNode - floats are not allowed",
-                "data": { "november": 1.1 },
+                "description": "number list with string values",
+                "data": {
+                    "kindOfList": "numbers",
+                    "list": ["foo"]
+                },
                 "valid": false
+            },
+            {
+                "description": "string list with number values",
+                "data": {
+                    "kindOfList": "strings",
+                    "list": [1.1]
+                },
+                "valid": false
+            },
+            {
+                "description": "string list with string values",
+                "data": {
+                    "kindOfList": "strings",
+                    "list": ["foo"]
+                },
+                "valid": true
             }
         ]
     },
@@ -564,5 +594,23 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "$ref to $dynamicRef finds detached $dynamicAnchor",
+        "schema": {
+            "$ref": "http://localhost:1234/draft-next/detached-dynamicref.json#/$defs/foo"
+        },
+        "tests": [
+            {
+                "description": "number is valid",
+                "data": 1,
+                "valid": true
+            },
+            {
+                "description": "non-number is invalid",
+                "data": "a",
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/json/tests/draft-next/refRemote.json b/json/tests/draft-next/refRemote.json
@@ -310,5 +310,23 @@
                 "valid": true
             }
         ]
+    },
+    {
+       "description": "$ref to $ref finds detached $anchor",
+        "schema": {
+            "$ref": "http://localhost:1234/draft-next/detached-ref.json#/$defs/foo"
+        },
+        "tests": [
+            {
+                "description": "number is valid",
+                "data": 1,
+                "valid": true
+            },
+            {
+                "description": "non-number is invalid",
+                "data": "a",
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/json/tests/draft2019-09/refRemote.json b/json/tests/draft2019-09/refRemote.json
@@ -310,5 +310,23 @@
                 "valid": true
             }
         ]
+    },
+    {
+       "description": "$ref to $ref finds detached $anchor",
+        "schema": {
+            "$ref": "http://localhost:1234/draft2019-09/detached-ref.json#/$defs/foo"
+        },
+        "tests": [
+            {
+                "description": "number is valid",
+                "data": 1,
+                "valid": true
+            },
+            {
+                "description": "non-number is invalid",
+                "data": "a",
+                "valid": false
+            }
+        ]
     }
 ]