From af37ee9b27fd668518129852cc393b4ff29cb4c0 Mon Sep 17 00:00:00 2001 From: Toni Ruottu Date: Wed, 13 Sep 2023 11:12:55 +0300 Subject: [PATCH 1/4] Rename example schema files --- .../schemas/{array.json => eg-array.json} | 0 .../schemas/{combinator.json => eg-combinator.json} | 0 .../schemas/{comment.json => eg-comment.json} | 0 maasglobal-reference-schemas/schemas/{enum.json => eg-enum.json} | 0 .../schemas/{hyper.json => eg-hyper.json} | 0 .../schemas/{literal.json => eg-literal.json} | 0 .../schemas/{nominal.json => eg-nominal.json} | 0 .../schemas/{number.json => eg-number.json} | 0 .../schemas/{record.json => eg-record.json} | 0 maasglobal-reference-schemas/schemas/{set.json => eg-set.json} | 0 .../schemas/{string.json => eg-string.json} | 0 .../schemas/{struct.json => eg-struct.json} | 0 .../schemas/{tuple.json => eg-tuple.json} | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename maasglobal-reference-schemas/schemas/{array.json => eg-array.json} (100%) rename maasglobal-reference-schemas/schemas/{combinator.json => eg-combinator.json} (100%) rename maasglobal-reference-schemas/schemas/{comment.json => eg-comment.json} (100%) rename maasglobal-reference-schemas/schemas/{enum.json => eg-enum.json} (100%) rename maasglobal-reference-schemas/schemas/{hyper.json => eg-hyper.json} (100%) rename maasglobal-reference-schemas/schemas/{literal.json => eg-literal.json} (100%) rename maasglobal-reference-schemas/schemas/{nominal.json => eg-nominal.json} (100%) rename maasglobal-reference-schemas/schemas/{number.json => eg-number.json} (100%) rename maasglobal-reference-schemas/schemas/{record.json => eg-record.json} (100%) rename maasglobal-reference-schemas/schemas/{set.json => eg-set.json} (100%) rename maasglobal-reference-schemas/schemas/{string.json => eg-string.json} (100%) rename maasglobal-reference-schemas/schemas/{struct.json => eg-struct.json} (100%) rename maasglobal-reference-schemas/schemas/{tuple.json => eg-tuple.json} (100%) diff --git a/maasglobal-reference-schemas/schemas/array.json b/maasglobal-reference-schemas/schemas/eg-array.json similarity index 100% rename from maasglobal-reference-schemas/schemas/array.json rename to maasglobal-reference-schemas/schemas/eg-array.json diff --git a/maasglobal-reference-schemas/schemas/combinator.json b/maasglobal-reference-schemas/schemas/eg-combinator.json similarity index 100% rename from maasglobal-reference-schemas/schemas/combinator.json rename to maasglobal-reference-schemas/schemas/eg-combinator.json diff --git a/maasglobal-reference-schemas/schemas/comment.json b/maasglobal-reference-schemas/schemas/eg-comment.json similarity index 100% rename from maasglobal-reference-schemas/schemas/comment.json rename to maasglobal-reference-schemas/schemas/eg-comment.json diff --git a/maasglobal-reference-schemas/schemas/enum.json b/maasglobal-reference-schemas/schemas/eg-enum.json similarity index 100% rename from maasglobal-reference-schemas/schemas/enum.json rename to maasglobal-reference-schemas/schemas/eg-enum.json diff --git a/maasglobal-reference-schemas/schemas/hyper.json b/maasglobal-reference-schemas/schemas/eg-hyper.json similarity index 100% rename from maasglobal-reference-schemas/schemas/hyper.json rename to maasglobal-reference-schemas/schemas/eg-hyper.json diff --git a/maasglobal-reference-schemas/schemas/literal.json b/maasglobal-reference-schemas/schemas/eg-literal.json similarity index 100% rename from maasglobal-reference-schemas/schemas/literal.json rename to maasglobal-reference-schemas/schemas/eg-literal.json diff --git a/maasglobal-reference-schemas/schemas/nominal.json b/maasglobal-reference-schemas/schemas/eg-nominal.json similarity index 100% rename from maasglobal-reference-schemas/schemas/nominal.json rename to maasglobal-reference-schemas/schemas/eg-nominal.json diff --git a/maasglobal-reference-schemas/schemas/number.json b/maasglobal-reference-schemas/schemas/eg-number.json similarity index 100% rename from maasglobal-reference-schemas/schemas/number.json rename to maasglobal-reference-schemas/schemas/eg-number.json diff --git a/maasglobal-reference-schemas/schemas/record.json b/maasglobal-reference-schemas/schemas/eg-record.json similarity index 100% rename from maasglobal-reference-schemas/schemas/record.json rename to maasglobal-reference-schemas/schemas/eg-record.json diff --git a/maasglobal-reference-schemas/schemas/set.json b/maasglobal-reference-schemas/schemas/eg-set.json similarity index 100% rename from maasglobal-reference-schemas/schemas/set.json rename to maasglobal-reference-schemas/schemas/eg-set.json diff --git a/maasglobal-reference-schemas/schemas/string.json b/maasglobal-reference-schemas/schemas/eg-string.json similarity index 100% rename from maasglobal-reference-schemas/schemas/string.json rename to maasglobal-reference-schemas/schemas/eg-string.json diff --git a/maasglobal-reference-schemas/schemas/struct.json b/maasglobal-reference-schemas/schemas/eg-struct.json similarity index 100% rename from maasglobal-reference-schemas/schemas/struct.json rename to maasglobal-reference-schemas/schemas/eg-struct.json diff --git a/maasglobal-reference-schemas/schemas/tuple.json b/maasglobal-reference-schemas/schemas/eg-tuple.json similarity index 100% rename from maasglobal-reference-schemas/schemas/tuple.json rename to maasglobal-reference-schemas/schemas/eg-tuple.json From 34821e5c6b34590cc0fca4fffdb109071364eee0 Mon Sep 17 00:00:00 2001 From: Toni Ruottu Date: Wed, 30 Aug 2023 16:45:46 +0300 Subject: [PATCH 2/4] Fix broken references --- maasglobal-reference-schemas/schemas/eg-struct.json | 8 ++++---- maasglobal-reference-schemas/schemas/eg-tuple.json | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/maasglobal-reference-schemas/schemas/eg-struct.json b/maasglobal-reference-schemas/schemas/eg-struct.json index ece200d24..cc75a662c 100644 --- a/maasglobal-reference-schemas/schemas/eg-struct.json +++ b/maasglobal-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/maasglobal-reference-schemas/schemas/eg-tuple.json b/maasglobal-reference-schemas/schemas/eg-tuple.json index 8ea608270..e38194109 100644 --- a/maasglobal-reference-schemas/schemas/eg-tuple.json +++ b/maasglobal-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]] } From 5c9975abcc01098e90db285d55f68db8f5a5040e Mon Sep 17 00:00:00 2001 From: Toni Ruottu Date: Wed, 30 Aug 2023 16:56:29 +0300 Subject: [PATCH 3/4] Fix typo --- maasglobal-reference-schemas/schemas/eg-set.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maasglobal-reference-schemas/schemas/eg-set.json b/maasglobal-reference-schemas/schemas/eg-set.json index 7c737ff08..59c1dfed9 100644 --- a/maasglobal-reference-schemas/schemas/eg-set.json +++ b/maasglobal-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]], From 8bad30d9fcbb498ad7bb07dda86cf5cd19f3b615 Mon Sep 17 00:00:00 2001 From: Toni Ruottu Date: Wed, 30 Aug 2023 16:46:01 +0300 Subject: [PATCH 4/4] reference-schemas 0.0.2 --- maasglobal-reference-schemas/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maasglobal-reference-schemas/package.json b/maasglobal-reference-schemas/package.json index 0a4d0a637..76a954429 100644 --- 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": {