Updated object and geometry data types #4 #5

### Added

- `patternProperties` for the `object` data type
- `geometryTypes` for the `geometry` data type

### Changed

- Data type `object` requires any of `properties`, `patternProperties` or `additionalProperties` instead of requiring always `properties`

Author: m-mohr

.github/workflows/validate.yaml

@@ -11,4 +11,4 @@ jobs:
           node-version: "lts/*"
       - uses: actions/checkout@v4
       - run: npm install -g ajv-cli
-      - run: ajv compile -s schema/schema.json --spec=draft2020 --validate-formats=false --strict=true
+      - run: ajv compile -s schema/schema.json --spec=draft2020 --validate-formats=false --strict=true --strict-required=false

CHANGELOG.md

@@ -9,11 +9,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-- ...
+- `patternProperties` for the `object` data type
+- `geometryTypes` for the `geometry` data type
 
 ### Changed
 
-- ...
+- Data type `object` requires any of `properties`, `patternProperties` or `additionalProperties` instead of requiring always `properties`
 
 ### Deprecated
 

README.md

@@ -20,38 +20,49 @@ At the top-level, you can also indicate the schema language and version:
 
 - `$schema`: The schema identifier, see above.
 
-Additionally, the following validation vocabulary is defined by JSON Schema:
+Additionally, the following validation vocabulary per data type is defined by JSON Schema.
 
-For strings:
+In principle any keywords available in JSON Schema 2020-12 can be used,
+but it is likely unsupported by the fiboa tooling.
+
+### String data type
 
 - `format` (values: `email`, `idn-email`, `iri`, `uri`, `uuid`)
 - `pattern`
 - `minLength`
 - `maxLength`
 - `enum`
 
-For numerical data types:
+### Numerical data type
 
 - `minimum`
 - `maximum`
 - `exclusiveMinimum`
 - `exclusiveMaximum`
 - `enum` (for integer data types only)
 
-For arrays:
+### Array data type
 
 - `items` (required, object only, sub-schema must be compliant to fiboa Schema)
 - `minItems`
 - `maxItems`
 - `uniqueItems`
 
-For objects:
+### Object data type
 
 - `required`
-- `properties` (required, sub-schemas must be compliant to fiboa Schema)
+- `properties` (sub-schemas must be compliant to fiboa Schema)
 - `additionalProperties`
   (Note: In objects additional properties are disallowed by default, i.e. the default value is `false`.
   In JSON Schema the default value is `true`.)
+- `patternProperties`
+  (Note: In objects additional properties are disallowed by default, i.e. the default value is `false`.
+  In JSON Schema the default value is `true`.)
 
-In principle any keywords available in JSON Schema 2020-12 can be used,
-but it is likely unsupported by the fiboa tooling.
+Either `properties`, `additionalProperties` or `patternProperties` must be provided.
+
+### Geometry data type
+
+- `geometryTypes` (not part of JSON Schema):
+  A list of allowed geometry types.
+  Any of: `Point`, `MultiPoint`, `LineString`, `MultiLineString`, `Polygon`, `MultiPolygon`

schema/schema.json

@@ -75,6 +75,9 @@
         },
         {
           "$ref": "#/$defs/object"
+        },
+        {
+          "$ref": "#/$defs/geometry"
         }
       ]
     },
@@ -91,7 +94,17 @@
       },
       "then": {
         "type": "object",
-        "required": ["properties"],
+        "anyOf": [
+          {
+            "required": ["properties"]
+          },
+          {
+            "required": ["additionalProperties"]
+          },
+          {
+            "required": ["patternProperties"]
+          }
+        ],
         "properties": {
           "required": {
             "type": "array",
@@ -105,6 +118,17 @@
               "$ref": "#/$defs/schema"
             }
           },
+          "patternProperties": {
+            "type": "object",
+            "additionalProperties": {
+              "$ref": "#/$defs/schema"
+            },
+            "propertyNames": {
+              "type": "string",
+              "format": "regex"
+            },
+            "default": {}
+          },
           "additionalProperties": {
             "oneOf": [
               {
@@ -247,6 +271,37 @@
         ]
       }
     },
+    "geometry": {
+      "if": {
+        "type": "object",
+        "required": ["type"],
+        "properties": {
+          "type": {
+            "type": "string",
+            "const": "geometry"
+          }
+        }
+      },
+      "then": {
+        "type": "object",
+        "properties": {
+          "geometryTypes": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "Point",
+                "LineString",
+                "Polygon",
+                "MultiPoint",
+                "MultiLineString",
+                "MultiPolygon"
+              ]
+            }
+          }
+        }
+      }
+    },
     "_numerical": {
       "type": "object",
       "properties": {