Simplify configuration schemas (#852)

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

collections/self/v1/schemas/configuration/collection.json

@@ -25,7 +25,7 @@
       "type": "boolean"
     },
     "x-sourcemeta-one:path": {
-      "$ref": "./path.json"
+      "type": "string"
     },
     "baseUri": {
       "$comment": "TODO: Use Format Assertion when supported on Blaze",
@@ -46,7 +46,7 @@
       "type": "string"
     },
     "path": {
-      "$ref": "./path.json"
+      "type": "string"
     },
     "resolve": {
       "type": "object",
@@ -71,7 +71,7 @@
         "rules": {
           "type": "array",
           "items": {
-            "$ref": "./path.json"
+            "type": "string"
           }
         }
       },
@@ -80,7 +80,7 @@
     "ignore": {
       "type": "array",
       "items": {
-        "$ref": "./path.json"
+        "type": "string"
       }
     }
   },

collections/self/v1/schemas/configuration/configuration.json

@@ -11,7 +11,11 @@
   "required": [ "url" ],
   "properties": {
     "extends": {
-      "$ref": "./extends.json"
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "type": "string"
+      }
     },
     "contents": {
       "$ref": "./contents.json"

collections/self/v1/schemas/configuration/contents.json

@@ -17,7 +17,7 @@
         "required": [ "include" ],
         "properties": {
           "include": {
-            "$ref": "./path.json"
+            "type": "string"
           }
         },
         "additionalProperties": false

collections/self/v1/schemas/configuration/extends.json

@@ -12,14 +12,14 @@ header "Last-Modified" exists
 jsonpath "$.path" == "/"
 jsonpath "$.url" == "{{base}}"
 jsonpath "$.breadcrumb" count == 0
-jsonpath "$.schemas" == 20
+jsonpath "$.schemas" == 18
 jsonpath "$.entries" count == 2
 jsonpath "$.entries[0].name" == "self"
 jsonpath "$.entries[0].title" == "Self"
 jsonpath "$.entries[0].description" == "The schemas that define the current version of this instance"
 jsonpath "$.entries[0].type" == "directory"
 jsonpath "$.entries[0].health" == 100
-jsonpath "$.entries[0].schemas" == 19
+jsonpath "$.entries[0].schemas" == 17
 jsonpath "$.entries[0].path" == "/self/"
 jsonpath "$.entries[1].name" == "test"
 jsonpath "$.entries[1].type" == "directory"

collections/self/v1/schemas/configuration/path.json

@@ -13,9 +13,7 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/template.h"
     "${ONE_SCHEMAS}/configuration/configuration.json"
     "${ONE_SCHEMAS}/configuration/collection.json"
     "${ONE_SCHEMAS}/configuration/contents.json"
-    "${ONE_SCHEMAS}/configuration/extends.json"
-    "${ONE_SCHEMAS}/configuration/page.json"
-    "${ONE_SCHEMAS}/configuration/path.json")
+    "${ONE_SCHEMAS}/configuration/page.json")
 
 target_include_directories(sourcemeta_one_configuration PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 

enterprise/e2e/html/hurl/list.hurl

@@ -146,15 +146,9 @@ cat << 'EOF' > "$TMP/expected.txt"
 ./explorer/self/v1/schemas/configuration/contents
 ./explorer/self/v1/schemas/configuration/contents/%
 ./explorer/self/v1/schemas/configuration/contents/%/schema.metapack
-./explorer/self/v1/schemas/configuration/extends
-./explorer/self/v1/schemas/configuration/extends/%
-./explorer/self/v1/schemas/configuration/extends/%/schema.metapack
 ./explorer/self/v1/schemas/configuration/page
 ./explorer/self/v1/schemas/configuration/page/%
 ./explorer/self/v1/schemas/configuration/page/%/schema.metapack
-./explorer/self/v1/schemas/configuration/path
-./explorer/self/v1/schemas/configuration/path/%
-./explorer/self/v1/schemas/configuration/path/%/schema.metapack
 ./routes.bin
 ./schemas
 ./schemas/example
@@ -396,19 +390,6 @@ cat << 'EOF' > "$TMP/expected.txt"
 ./schemas/self/v1/schemas/configuration/contents/%/positions.metapack
 ./schemas/self/v1/schemas/configuration/contents/%/schema.metapack
 ./schemas/self/v1/schemas/configuration/contents/%/stats.metapack
-./schemas/self/v1/schemas/configuration/extends
-./schemas/self/v1/schemas/configuration/extends/%
-./schemas/self/v1/schemas/configuration/extends/%/blaze-exhaustive.metapack
-./schemas/self/v1/schemas/configuration/extends/%/blaze-fast.metapack
-./schemas/self/v1/schemas/configuration/extends/%/bundle.metapack
-./schemas/self/v1/schemas/configuration/extends/%/dependencies.metapack
-./schemas/self/v1/schemas/configuration/extends/%/dependents.metapack
-./schemas/self/v1/schemas/configuration/extends/%/editor.metapack
-./schemas/self/v1/schemas/configuration/extends/%/health.metapack
-./schemas/self/v1/schemas/configuration/extends/%/locations.metapack
-./schemas/self/v1/schemas/configuration/extends/%/positions.metapack
-./schemas/self/v1/schemas/configuration/extends/%/schema.metapack
-./schemas/self/v1/schemas/configuration/extends/%/stats.metapack
 ./schemas/self/v1/schemas/configuration/page
 ./schemas/self/v1/schemas/configuration/page/%
 ./schemas/self/v1/schemas/configuration/page/%/blaze-exhaustive.metapack
@@ -422,19 +403,6 @@ cat << 'EOF' > "$TMP/expected.txt"
 ./schemas/self/v1/schemas/configuration/page/%/positions.metapack
 ./schemas/self/v1/schemas/configuration/page/%/schema.metapack
 ./schemas/self/v1/schemas/configuration/page/%/stats.metapack
-./schemas/self/v1/schemas/configuration/path
-./schemas/self/v1/schemas/configuration/path/%
-./schemas/self/v1/schemas/configuration/path/%/blaze-exhaustive.metapack
-./schemas/self/v1/schemas/configuration/path/%/blaze-fast.metapack
-./schemas/self/v1/schemas/configuration/path/%/bundle.metapack
-./schemas/self/v1/schemas/configuration/path/%/dependencies.metapack
-./schemas/self/v1/schemas/configuration/path/%/dependents.metapack
-./schemas/self/v1/schemas/configuration/path/%/editor.metapack
-./schemas/self/v1/schemas/configuration/path/%/health.metapack
-./schemas/self/v1/schemas/configuration/path/%/locations.metapack
-./schemas/self/v1/schemas/configuration/path/%/positions.metapack
-./schemas/self/v1/schemas/configuration/path/%/schema.metapack
-./schemas/self/v1/schemas/configuration/path/%/stats.metapack
 ./state.bin
 ./version.json
 EOF