Merge pull request #692 from json-schema-org/ether/fix-subSchemas-refs

karenetheridge · web-flow · commit 349c5a8210be · 2023-10-23T14:21:51.000-07:00
fix subschema locations and their $refs
diff --git a/remotes/draft-next/subSchemas.json b/remotes/draft-next/subSchemas.json
@@ -1,9 +1,11 @@
 {
     "$schema": "https://json-schema.org/draft/next/schema",
-    "integer": {
-        "type": "integer"
-    },
-    "refToInteger": {
-        "$ref": "#/integer"
+    "$defs": {
+        "integer": {
+            "type": "integer"
+        },
+        "refToInteger": {
+            "$ref": "#/$defs/integer"
+        }
     }
 }
diff --git a/remotes/draft2019-09/subSchemas.json b/remotes/draft2019-09/subSchemas.json
@@ -1,9 +1,11 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "integer": {
-        "type": "integer"
-    },
-    "refToInteger": {
-        "$ref": "#/integer"
+    "$defs": {
+        "integer": {
+            "type": "integer"
+        },
+        "refToInteger": {
+            "$ref": "#/$defs/integer"
+        }
     }
 }
diff --git a/remotes/draft2020-12/subSchemas.json b/remotes/draft2020-12/subSchemas.json
@@ -1,9 +1,11 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "integer": {
-        "type": "integer"
-    },
-    "refToInteger": {
-        "$ref": "#/integer"
+    "$defs": {
+        "integer": {
+            "type": "integer"
+        },
+        "refToInteger": {
+            "$ref": "#/$defs/integer"
+        }
     }
 }
diff --git a/remotes/subSchemas.json b/remotes/subSchemas.json
@@ -1,8 +1,10 @@
 {
-    "integer": {
-        "type": "integer"
-    },
-    "refToInteger": {
-        "$ref": "#/integer"
+    "definitions": {
+        "integer": {
+            "type": "integer"
+        },
+        "refToInteger": {
+            "$ref": "#/definitions/integer"
+        }
     }
 }
diff --git a/tests/draft3/refRemote.json b/tests/draft3/refRemote.json
@@ -17,7 +17,7 @@
     },
     {
         "description": "fragment within remote ref",
-        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/integer"},
+        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/definitions/integer"},
         "tests": [
             {
                 "description": "remote fragment valid",
@@ -34,7 +34,7 @@
     {
         "description": "ref within remote ref",
         "schema": {
-            "$ref": "http://localhost:1234/subSchemas.json#/refToInteger"
+            "$ref": "http://localhost:1234/subSchemas.json#/definitions/refToInteger"
         },
         "tests": [
             {
diff --git a/tests/draft4/refRemote.json b/tests/draft4/refRemote.json
@@ -17,7 +17,7 @@
     },
     {
         "description": "fragment within remote ref",
-        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/integer"},
+        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/definitions/integer"},
         "tests": [
             {
                 "description": "remote fragment valid",
@@ -34,7 +34,7 @@
     {
         "description": "ref within remote ref",
         "schema": {
-            "$ref": "http://localhost:1234/subSchemas.json#/refToInteger"
+            "$ref": "http://localhost:1234/subSchemas.json#/definitions/refToInteger"
         },
         "tests": [
             {
diff --git a/tests/draft6/refRemote.json b/tests/draft6/refRemote.json
@@ -17,7 +17,7 @@
     },
     {
         "description": "fragment within remote ref",
-        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/integer"},
+        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/definitions/integer"},
         "tests": [
             {
                 "description": "remote fragment valid",
@@ -34,7 +34,7 @@
     {
         "description": "ref within remote ref",
         "schema": {
-            "$ref": "http://localhost:1234/subSchemas.json#/refToInteger"
+            "$ref": "http://localhost:1234/subSchemas.json#/definitions/refToInteger"
         },
         "tests": [
             {
diff --git a/tests/draft7/refRemote.json b/tests/draft7/refRemote.json
@@ -17,7 +17,7 @@
     },
     {
         "description": "fragment within remote ref",
-        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/integer"},
+        "schema": {"$ref": "http://localhost:1234/subSchemas.json#/definitions/integer"},
         "tests": [
             {
                 "description": "remote fragment valid",
@@ -34,7 +34,7 @@
     {
         "description": "ref within remote ref",
         "schema": {
-            "$ref": "http://localhost:1234/subSchemas.json#/refToInteger"
+            "$ref": "http://localhost:1234/subSchemas.json#/definitions/refToInteger"
         },
         "tests": [
             {

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://json-schema.org/draft/next/schema",`
`3`		`- "integer": {`
`4`		`- "type": "integer"`
`5`		`- },`
`6`		`- "refToInteger": {`
`7`		`- "$ref": "#/integer"`
	`3`	`+ "$defs": {`
	`4`	`+ "integer": {`
	`5`	`+ "type": "integer"`
	`6`	`+ },`
	`7`	`+ "refToInteger": {`
	`8`	`+ "$ref": "#/$defs/integer"`
	`9`	`+ }`
`8`	`10`	`}`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`{`
`2`		`- "integer": {`
`3`		`- "type": "integer"`
`4`		`- },`
`5`		`- "refToInteger": {`
`6`		`- "$ref": "#/integer"`
	`2`	`+ "definitions": {`
	`3`	`+ "integer": {`
	`4`	`+ "type": "integer"`
	`5`	`+ },`
	`6`	`+ "refToInteger": {`
	`7`	`+ "$ref": "#/definitions/integer"`
	`8`	`+ }`
`7`	`9`	`}`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`},`
`18`	`18`	`{`
`19`	`19`	`"description": "fragment within remote ref",`
`20`		`- "schema": {"$ref": "http://localhost:1234/subSchemas.json#/integer"},`
	`20`	`+ "schema": {"$ref": "http://localhost:1234/subSchemas.json#/definitions/integer"},`
`21`	`21`	`"tests": [`
`22`	`22`	`{`
`23`	`23`	`"description": "remote fragment valid",`
`@@ -34,7 +34,7 @@`
`34`	`34`	`{`
`35`	`35`	`"description": "ref within remote ref",`
`36`	`36`	`"schema": {`
`37`		`- "$ref": "http://localhost:1234/subSchemas.json#/refToInteger"`
	`37`	`+ "$ref": "http://localhost:1234/subSchemas.json#/definitions/refToInteger"`
`38`	`38`	`},`
`39`	`39`	`"tests": [`
`40`	`40`	`{`