Building blocks postprocessing

ogcincubator · Jun 6, 2024 · d35b241 · d35b241
1 parent 80b66ed
commit d35b241
Show file tree

Hide file tree

Showing 18 changed files with 99 additions and 1,326 deletions.
diff --git a/build/annotated/ogc-utils/prov/schema-oas3.0.json b/build/annotated/ogc-utils/prov/schema-oas3.0.json
@@ -297,7 +297,7 @@
           "x-jsonld-id": "@type",
           "allOf": [
             {
-              "$ref": "https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.json#/$defs/EntityTypes"
+              "$ref": "https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.json#/$defs/oneOrMoreObjectref"
             }
           ]
         },
@@ -515,8 +515,12 @@
         {
           "properties": {
             "provType": {
-              "$comment": "#/$defs/EntityTypes",
-              "x-jsonld-id": "@type"
+              "x-jsonld-id": "@type",
+              "allOf": [
+                {
+                  "$ref": "https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.json#/$defs/EntityTypes"
+                }
+              ]
             }
           },
           "required": [
@@ -526,7 +530,7 @@
         {
           "properties": {
             "prov:type": {
-              "$comment": "#/$defs/EntityTypes"
+              "$ref": "https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.json#/$defs/EntityTypes"
             }
           },
           "required": [
@@ -536,7 +540,7 @@
         {
           "properties": {
             "type": {
-              "$comment": "#/$defs/EntityTypes"
+              "$ref": "https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.json#/$defs/EntityTypes"
             }
           },
           "required": [
@@ -669,7 +673,7 @@
           "x-jsonld-id": "@type",
           "allOf": [
             {
-              "$ref": "https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.json#/$defs/ActivityTypes"
+              "$ref": "https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.json#/$defs/oneOrMoreObjectref"
             }
           ]
         },

diff --git a/build/annotated/ogc-utils/prov/schema-oas3.0.yaml b/build/annotated/ogc-utils/prov/schema-oas3.0.yaml
@@ -160,7 +160,7 @@ $defs:
       entityType:
         x-jsonld-id: '@type'
         allOf:
-        - $ref: https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.yaml#/$defs/EntityTypes
+        - $ref: https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.yaml#/$defs/oneOrMoreObjectref
       has_provenance:
         x-jsonld-id: http://purl.org/dc/terms/provenance
         x-jsonld-type: '@id'
@@ -270,18 +270,19 @@ $defs:
     anyOf:
     - properties:
         provType:
-          $comment: '#/$defs/EntityTypes'
           x-jsonld-id: '@type'
+          allOf:
+          - $ref: https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.yaml#/$defs/EntityTypes
       required:
       - provType
     - properties:
         prov:type:
-          $comment: '#/$defs/EntityTypes'
+          $ref: https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.yaml#/$defs/EntityTypes
       required:
       - prov:type
     - properties:
         type:
-          $comment: '#/$defs/EntityTypes'
+          $ref: https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.yaml#/$defs/EntityTypes
       required:
       - type
     - required:
@@ -355,7 +356,7 @@ $defs:
       activityType:
         x-jsonld-id: '@type'
         allOf:
-        - $ref: https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.yaml#/$defs/ActivityTypes
+        - $ref: https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.yaml#/$defs/oneOrMoreObjectref
       prov:type:
         $ref: https://ogcincubator.github.io/bblock-prov-schema/build/annotated/ogc-utils/prov/schema-oas3.0.yaml#/$defs/ActivityTypes
       endedAtTime:

diff --git a/build/annotated/ogc-utils/prov/schema.json b/build/annotated/ogc-utils/prov/schema.json
@@ -165,7 +165,7 @@
           "x-jsonld-id": "@type"
         },
         "entityType": {
-          "$ref": "#/$defs/EntityTypes",
+          "$ref": "#/$defs/oneOrMoreObjectref",
           "x-jsonld-id": "@type"
         },
         "has_provenance": {
@@ -338,7 +338,7 @@
         {
           "properties": {
             "provType": {
-              "$comment": "#/$defs/EntityTypes",
+              "$ref": "#/$defs/EntityTypes",
               "x-jsonld-id": "@type"
             }
           },
@@ -349,7 +349,7 @@
         {
           "properties": {
             "prov:type": {
-              "$comment": "#/$defs/EntityTypes"
+              "$ref": "#/$defs/EntityTypes"
             }
           },
           "required": [
@@ -359,7 +359,7 @@
         {
           "properties": {
             "type": {
-              "$comment": "#/$defs/EntityTypes"
+              "$ref": "#/$defs/EntityTypes"
             }
           },
           "required": [
@@ -481,7 +481,7 @@
           "$ref": "#/$defs/ActivityTypes"
         },
         "activityType": {
-          "$ref": "#/$defs/ActivityTypes",
+          "$ref": "#/$defs/oneOrMoreObjectref",
           "x-jsonld-id": "@type"
         },
         "prov:type": {

diff --git a/build/annotated/ogc-utils/prov/schema.yaml b/build/annotated/ogc-utils/prov/schema.yaml
@@ -83,7 +83,7 @@ $defs:
         $ref: '#/$defs/oneOrMoreObjectref'
         x-jsonld-id: '@type'
       entityType:
-        $ref: '#/$defs/EntityTypes'
+        $ref: '#/$defs/oneOrMoreObjectref'
         x-jsonld-id: '@type'
       has_provenance:
         $ref: '#/$defs/Prov'
@@ -183,18 +183,18 @@ $defs:
     anyOf:
     - properties:
         provType:
-          $comment: '#/$defs/EntityTypes'
+          $ref: '#/$defs/EntityTypes'
           x-jsonld-id: '@type'
       required:
       - provType
     - properties:
         prov:type:
-          $comment: '#/$defs/EntityTypes'
+          $ref: '#/$defs/EntityTypes'
       required:
       - prov:type
     - properties:
         type:
-          $comment: '#/$defs/EntityTypes'
+          $ref: '#/$defs/EntityTypes'
       required:
       - type
     - required:
@@ -263,7 +263,7 @@ $defs:
       type:
         $ref: '#/$defs/ActivityTypes'
       activityType:
-        $ref: '#/$defs/ActivityTypes'
+        $ref: '#/$defs/oneOrMoreObjectref'
         x-jsonld-id: '@type'
       prov:type:
         $ref: '#/$defs/ActivityTypes'

diff --git a/build/bblocks.jsonld b/build/bblocks.jsonld
@@ -106,12 +106,12 @@
   "name": "Building Blocks - JSON schema for W3C PROV model",
   "abstract": "Defines a standardised JSON schema for PROV ontology elements - supporting a graph structure based on an array of objects implementing PROV defined classes with object cross references.",
   "description": "Provenance defined using the [W3C PROV-O model](https://www.w3.org/TR/prov-o/) is a DAG (non-cyclic graph) based on three main object types: Entity, Activity and Agent.\n\nThis repository defines a JSON schema and matching JSON-LD context for this model, using the canonical terminology used in the PROV ontology as element names.\n\nIt also defines a context for an optional schema property \"has_provenance\" that can be used to wrap a provenance graph as an array of such objects, to extend the property prov:wasGeneratedBy (whose range is one or more Entity objects) with an explicit schema.\n\n![](https://www.w3.org/TR/prov-o/diagrams/starting-points.svg)\n",
-  "modified": "2024-06-06T05:08:28.979671",
+  "modified": "2024-06-06T08:38:05.257116",
   "tooling": {
     "bblocks-postprocess": {
-      "commitId": "\"6509bb249db8feab3e8bc6394d64b8e7d197ff9f",
-      "shortCommitId": "\"6509bb",
-      "date": "2024-06-05T21:34:00+00:00\""
+      "commitId": "\"4f88cb1c96833f8205a6efc8aaee31c2f3eafbad",
+      "shortCommitId": "\"4f88cb",
+      "date": "2024-06-06T07:29:55+00:00\""
     }
   },
   "gitRepository": "https://github.com/ogcincubator/bblock-prov-schema",
@@ -163,7 +163,7 @@
       "sourceSchema": "https://ogcincubator.github.io/bblock-prov-schema/_sources/schema.json",
       "sourceLdContext": "https://ogcincubator.github.io/bblock-prov-schema/_sources/context.jsonld",
       "sourceFiles": "https://ogcincubator.github.io/bblock-prov-schema/_sources/",
-      "validationPassed": false,
+      "validationPassed": true,
       "testOutputs": "https://github.com/ogcincubator/bblock-prov-schema/blob/master/build/tests/ogc-utils/prov/",
       "documentation": {
         "markdown": {

diff --git a/build/bblocks.ttl b/build/bblocks.ttl
@@ -13,10 +13,10 @@
     rdfs:label "Provenance Chain" ;
     dct:abstract "Schema for a provenance chain based on PROV vocabulary semantics, Agents, Activities and Entities. This schema is designed as a mix-in that can be used to add properties to other objects in a polymorphic way." ;
     dct:created "2023-07-10T00:00:00+00:00"^^xsd:dateTime ;
-    dct:description [ dct:format "text/html" ;
-            rdfs:isDefinedBy "https://ogcincubator.github.io/bblock-prov-schema/build/generateddocs/slate-build/ogc-utils/prov/" ],
-        [ dct:format "text/markdown" ;
+    dct:description [ dct:format "text/markdown" ;
             rdfs:isDefinedBy "https://ogcincubator.github.io/bblock-prov-schema/build/generateddocs/markdown/ogc-utils/prov/index.md" ],
+        [ dct:format "text/html" ;
+            rdfs:isDefinedBy "https://ogcincubator.github.io/bblock-prov-schema/build/generateddocs/slate-build/ogc-utils/prov/" ],
         [ dct:format "application/json" ;
             rdfs:isDefinedBy "https://ogcincubator.github.io/bblock-prov-schema/build/generateddocs/json-full/ogc-utils/prov/index.json" ],
         [ dct:format "text/html" ;
@@ -55,14 +55,14 @@ It also defines a context for an optional schema property "has_provenance" that
 <https://www.w3.org/TR/prov-o/> rdfs:label "The PROV-O vocabulary" .
 
 [] a prov:Activity ;
-    prov:endedAtTime "2024-06-06T05:08:42.146838"^^xsd:dateTime ;
-    prov:startedAtTime "2024-06-06T05:08:42.092223"^^xsd:dateTime ;
+    prov:endedAtTime "2024-06-06T08:38:18.607575"^^xsd:dateTime ;
+    prov:startedAtTime "2024-06-06T08:38:18.553293"^^xsd:dateTime ;
     prov:used [ a prov:Entity ;
             dct:format "application/yaml" ;
             rdfs:seeAlso <file:///src/ogc/bblocks/register-context.yaml> ],
         [ a prov:Entity ;
             dct:format "application/json" ;
-            dct:hasVersion "git:d096b38de2204ab353f8ca5a80bb0e4304864ade" ;
+            dct:hasVersion "git:80b66ed29dcb79548bbb661ae30045526112eb64" ;
             rdfs:seeAlso <https://ogcincubator.github.io/bblock-prov-schema/build/register.json> ] ;
     prov:wasAssociatedWith [ a prov:Agent,
                 schema:SoftwareApplication ;

diff --git a/build/generateddocs/json-full/ogc-utils/prov/index.json b/build/generateddocs/json-full/ogc-utils/prov/index.json
diff --git a/build/generateddocs/markdown/ogc-utils/prov/index.md b/build/generateddocs/markdown/ogc-utils/prov/index.md
@@ -541,7 +541,7 @@ $defs:
         $ref: '#/$defs/oneOrMoreObjectref'
         x-jsonld-id: '@type'
       entityType:
-        $ref: '#/$defs/EntityTypes'
+        $ref: '#/$defs/oneOrMoreObjectref'
         x-jsonld-id: '@type'
       has_provenance:
         $ref: '#/$defs/Prov'
@@ -641,18 +641,18 @@ $defs:
     anyOf:
     - properties:
         provType:
-          $comment: '#/$defs/EntityTypes'
+          $ref: '#/$defs/EntityTypes'
           x-jsonld-id: '@type'
       required:
       - provType
     - properties:
         prov:type:
-          $comment: '#/$defs/EntityTypes'
+          $ref: '#/$defs/EntityTypes'
       required:
       - prov:type
     - properties:
         type:
-          $comment: '#/$defs/EntityTypes'
+          $ref: '#/$defs/EntityTypes'
       required:
       - type
     - required:
@@ -721,7 +721,7 @@ $defs:
       type:
         $ref: '#/$defs/ActivityTypes'
       activityType:
-        $ref: '#/$defs/ActivityTypes'
+        $ref: '#/$defs/oneOrMoreObjectref'
         x-jsonld-id: '@type'
       prov:type:
         $ref: '#/$defs/ActivityTypes'

diff --git a/build/generateddocs/slate-build/ogc-utils/prov/index.html b/build/generateddocs/slate-build/ogc-utils/prov/index.html
@@ -374,8 +374,8 @@ <h1 id='provenance-chain-ogc-ogc-utils-prov'>Provenance Chain <code>ogc.ogc-util
     <a href="http://www.opengis.net/def/status/under-development" target="_blank" data-rainbow-uri>Under development</a>
 </p>
 
-<aside class="warning">
-Validation for this building block has <strong><a href="https://github.com/ogcincubator/bblock-prov-schema/blob/master/build/tests/ogc-utils/prov/" target="_blank">failed</a></strong>
+<aside class="success">
+This building block is <strong><a href="https://github.com/ogcincubator/bblock-prov-schema/blob/master/build/tests/ogc-utils/prov/" target="_blank">valid</a></strong>
 </aside>
 <h1 id='description'>Description</h1><h2 id='provenance-chain'>Provenance chain</h2>
 <p>A JSON schema defining objects that may be referenced or nested as a chain of Activities, Entities or Agents (or subclasses thereof)</p>
@@ -913,7 +913,7 @@ <h1 id='json-schema'>JSON Schema</h1><div class="highlight"><pre class="highligh
         <span class="na">$ref</span><span class="pi">:</span> <span class="s1">'</span><span class="s">#/$defs/oneOrMoreObjectref'</span>
         <span class="na">x-jsonld-id</span><span class="pi">:</span> <span class="s1">'</span><span class="s">@type'</span>
       <span class="na">entityType</span><span class="pi">:</span>
-        <span class="na">$ref</span><span class="pi">:</span> <span class="s1">'</span><span class="s">#/$defs/EntityTypes'</span>
+        <span class="na">$ref</span><span class="pi">:</span> <span class="s1">'</span><span class="s">#/$defs/oneOrMoreObjectref'</span>
         <span class="na">x-jsonld-id</span><span class="pi">:</span> <span class="s1">'</span><span class="s">@type'</span>
       <span class="na">has_provenance</span><span class="pi">:</span>
         <span class="na">$ref</span><span class="pi">:</span> <span class="s1">'</span><span class="s">#/$defs/Prov'</span>
@@ -1013,18 +1013,18 @@ <h1 id='json-schema'>JSON Schema</h1><div class="highlight"><pre class="highligh
     <span class="na">anyOf</span><span class="pi">:</span>
     <span class="pi">-</span> <span class="na">properties</span><span class="pi">:</span>
         <span class="na">provType</span><span class="pi">:</span>
-          <span class="na">$comment</span><span class="pi">:</span> <span class="s1">'</span><span class="s">#/$defs/EntityTypes'</span>
+          <span class="na">$ref</span><span class="pi">:</span> <span class="s1">'</span><span class="s">#/$defs/EntityTypes'</span>
           <span class="na">x-jsonld-id</span><span class="pi">:</span> <span class="s1">'</span><span class="s">@type'</span>
       <span class="na">required</span><span class="pi">:</span>
       <span class="pi">-</span> <span class="s">provType</span>
     <span class="pi">-</span> <span class="na">properties</span><span class="pi">:</span>
         <span class="s">prov:type:</span>
-          <span class="s">$comment</span><span class="err">:</span> <span class="s1">'</span><span class="s">#/$defs/EntityTypes'</span>
+          <span class="s">$ref</span><span class="err">:</span> <span class="s1">'</span><span class="s">#/$defs/EntityTypes'</span>
       <span class="na">required</span><span class="pi">:</span>
       <span class="pi">-</span> <span class="s">prov:type</span>
     <span class="pi">-</span> <span class="na">properties</span><span class="pi">:</span>
         <span class="na">type</span><span class="pi">:</span>
-          <span class="na">$comment</span><span class="pi">:</span> <span class="s1">'</span><span class="s">#/$defs/EntityTypes'</span>
+          <span class="na">$ref</span><span class="pi">:</span> <span class="s1">'</span><span class="s">#/$defs/EntityTypes'</span>
       <span class="na">required</span><span class="pi">:</span>
       <span class="pi">-</span> <span class="s">type</span>
     <span class="pi">-</span> <span class="na">required</span><span class="pi">:</span>
@@ -1093,7 +1093,7 @@ <h1 id='json-schema'>JSON Schema</h1><div class="highlight"><pre class="highligh
       <span class="na">type</span><span class="pi">:</span>
         <span class="na">$ref</span><span class="pi">:</span> <span class="s1">'</span><span class="s">#/$defs/ActivityTypes'</span>
       <span class="na">activityType</span><span class="pi">:</span>
-        <span class="na">$ref</span><span class="pi">:</span> <span class="s1">'</span><span class="s">#/$defs/ActivityTypes'</span>
+        <span class="na">$ref</span><span class="pi">:</span> <span class="s1">'</span><span class="s">#/$defs/oneOrMoreObjectref'</span>
         <span class="na">x-jsonld-id</span><span class="pi">:</span> <span class="s1">'</span><span class="s">@type'</span>
       <span class="s">prov:type:</span>
         <span class="s">$ref</span><span class="err">:</span> <span class="s1">'</span><span class="s">#/$defs/ActivityTypes'</span>

diff --git a/build/generateddocs/slate/ogc-utils/prov/index.html.md b/build/generateddocs/slate/ogc-utils/prov/index.html.md
@@ -29,8 +29,8 @@ Schema for a provenance chain based on PROV vocabulary semantics, Agents, Activi
     <a href="http://www.opengis.net/def/status/under-development" target="_blank" data-rainbow-uri>Under development</a>
 </p>
 
-<aside class="warning">
-Validation for this building block has <strong><a href="https://github.com/ogcincubator/bblock-prov-schema/blob/master/build/tests/ogc-utils/prov/" target="_blank">failed</a></strong>
+<aside class="success">
+This building block is <strong><a href="https://github.com/ogcincubator/bblock-prov-schema/blob/master/build/tests/ogc-utils/prov/" target="_blank">valid</a></strong>
 </aside>
 
 # Description
@@ -667,7 +667,7 @@ $defs:
         $ref: '#/$defs/oneOrMoreObjectref'
         x-jsonld-id: '@type'
       entityType:
-        $ref: '#/$defs/EntityTypes'
+        $ref: '#/$defs/oneOrMoreObjectref'
         x-jsonld-id: '@type'
       has_provenance:
         $ref: '#/$defs/Prov'
@@ -767,18 +767,18 @@ $defs:
     anyOf:
     - properties:
         provType:
-          $comment: '#/$defs/EntityTypes'
+          $ref: '#/$defs/EntityTypes'
           x-jsonld-id: '@type'
       required:
       - provType
     - properties:
         prov:type:
-          $comment: '#/$defs/EntityTypes'
+          $ref: '#/$defs/EntityTypes'
       required:
       - prov:type
     - properties:
         type:
-          $comment: '#/$defs/EntityTypes'
+          $ref: '#/$defs/EntityTypes'
       required:
       - type
     - required:
@@ -847,7 +847,7 @@ $defs:
       type:
         $ref: '#/$defs/ActivityTypes'
       activityType:
-        $ref: '#/$defs/ActivityTypes'
+        $ref: '#/$defs/oneOrMoreObjectref'
         x-jsonld-id: '@type'
       prov:type:
         $ref: '#/$defs/ActivityTypes'