Merge pull request #761 from cyberixae/fix_reference_schema_problems

Fix reference schema problems
maasglobal · Sep 13, 2023 · db7eeb8 · db7eeb8
2 parents 4373557 + 8bad30d
commit db7eeb8
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 10 deletions.
diff --git a/maasglobal-reference-schemas/package.json b/maasglobal-reference-schemas/package.json
@@ -1,6 +1,6 @@
 {
  "name": "maasglobal-reference-schemas",
- "version": "0.0.1",
+ "version": "0.0.2",
  "description": "Test suite for JSON schema features used by MaaS Global",
  "license": "MIT",
  "repository": {

diff --git a/...obal-reference-schemas/schemas/array.json → ...l-reference-schemas/schemas/eg-array.json b/...obal-reference-schemas/schemas/array.json → ...l-reference-schemas/schemas/eg-array.json
diff --git a/...reference-schemas/schemas/combinator.json → ...erence-schemas/schemas/eg-combinator.json b/...reference-schemas/schemas/combinator.json → ...erence-schemas/schemas/eg-combinator.json
diff --git a/...al-reference-schemas/schemas/comment.json → ...reference-schemas/schemas/eg-comment.json b/...al-reference-schemas/schemas/comment.json → ...reference-schemas/schemas/eg-comment.json
diff --git a/...lobal-reference-schemas/schemas/enum.json → ...al-reference-schemas/schemas/eg-enum.json b/...lobal-reference-schemas/schemas/enum.json → ...al-reference-schemas/schemas/eg-enum.json
diff --git a/...obal-reference-schemas/schemas/hyper.json → ...l-reference-schemas/schemas/eg-hyper.json b/...obal-reference-schemas/schemas/hyper.json → ...l-reference-schemas/schemas/eg-hyper.json
diff --git a/...al-reference-schemas/schemas/literal.json → ...reference-schemas/schemas/eg-literal.json b/...al-reference-schemas/schemas/literal.json → ...reference-schemas/schemas/eg-literal.json
diff --git a/...al-reference-schemas/schemas/nominal.json → ...reference-schemas/schemas/eg-nominal.json b/...al-reference-schemas/schemas/nominal.json → ...reference-schemas/schemas/eg-nominal.json
diff --git a/...bal-reference-schemas/schemas/number.json → ...-reference-schemas/schemas/eg-number.json b/...bal-reference-schemas/schemas/number.json → ...-reference-schemas/schemas/eg-number.json
diff --git a/...bal-reference-schemas/schemas/record.json → ...-reference-schemas/schemas/eg-record.json b/...bal-reference-schemas/schemas/record.json → ...-reference-schemas/schemas/eg-record.json
diff --git a/...global-reference-schemas/schemas/set.json → ...bal-reference-schemas/schemas/eg-set.json b/...global-reference-schemas/schemas/set.json → ...bal-reference-schemas/schemas/eg-set.json
@@ -4,7 +4,7 @@
  "title": "Set Reference schemas",
  "description": "Collection of unique items",
  "definitions": {
- "exmapleSet": {
+ "exampleSet": {
  "type": "array",
  "uniqueItems": true,
  "examples": [[1, 2, 3]],

diff --git a/...bal-reference-schemas/schemas/string.json → ...-reference-schemas/schemas/eg-string.json b/...bal-reference-schemas/schemas/string.json → ...-reference-schemas/schemas/eg-string.json
diff --git a/...bal-reference-schemas/schemas/struct.json → ...-reference-schemas/schemas/eg-struct.json b/...bal-reference-schemas/schemas/struct.json → ...-reference-schemas/schemas/eg-struct.json
@@ -8,10 +8,10 @@
  "type": "object",
  "properties": {
  "foo": {
- "$ref": "https://reference-schemas.maas.global/foo.json#/definitions/string"
+ "type": "string"
  },
  "bar": {
- "$ref": "https://reference-schemas.maas.global/foo.json#/definitions/number"
+ "type": "number"
  }
  },
  "required": ["foo", "bar"],
@@ -27,10 +27,10 @@
  "type": "object",
  "patternProperties": {
  "^s": {
- "$ref": "https://reference-schemas.maas.global/foo.json#/definitions/string"
+ "type": "string"
  },
  "^n": {
- "$ref": "https://reference-schemas.maas.global/foo.json#/definitions/number"
+ "type": "number"
  }
  },
  "additionalProperties": false,

diff --git a/...obal-reference-schemas/schemas/tuple.json → ...l-reference-schemas/schemas/eg-tuple.json b/...obal-reference-schemas/schemas/tuple.json → ...l-reference-schemas/schemas/eg-tuple.json
@@ -6,10 +6,7 @@
  "definitions": {
  "tuple": {
  "type": "array",
- "items": [
- { "$ref": "https://reference-schemas.maas.global/foo.json#/definitions/string" },
- { "$ref": "https://reference-schemas.maas.global/foo.json#/definitions/number" }
- ],
+ "items": [{ "type": "string" }, { "type": "number" }],
  "additionalItems": false,
  "examples": [["asdf", 2]]
  }