Issue 163 path

shacl12-core/images/Makefile

@@ -0,0 +1,4 @@
+all: SHACL-UML.svg
+
+%.svg: %.puml
+	plantuml -Tsvg $^

shacl12-core/images/SHACL-UML.puml

@@ -0,0 +1,66 @@
+@startuml
+hide circles
+hide empty members
+skinparam pathHoverColor red ' on cover, highlight blue links as red
+' skinparam topurl https://raw.githack.com/w3c/data-shapes/master/shacl12-core/index.html ' links resolve to anchors in current HTML page, when the SVG is embedded
+
+class "<color:blue><u>sh:Shape" as Shape [[#shapes]] {
+  [[#targetClass sh:targetClass]] : rdfs:Class
+  [[#targetNode sh:targetNode]] : any
+  [[#targetSubjectsOf sh:targetSubjectsOf]] : rdf:Property
+  [[#targetObjectsOf sh:targetObjectsOf]] : rdf:Property
+  [[#targetWhere sh:targetWhere]] : sh:NodeShape
+  ....
+  [[#deactivated sh:deactivated]] : xsd:boolean
+  [[#message sh:message]] : xsd:string or rdf:langString
+  [[#severity sh:severity]] : sh:Severity
+}
+
+class "<color:blue><u>sh:NodeShape" as NodeShape [[#node-shapes]] {
+  [[#constraints Constraint parameters]], for example:
+  [[#NodeKindConstraintComponent sh:nodeKind]] a sh:NodeKind
+  [[#ClosedConstraintComponent sh:closed]] : xsd:boolean or [[#syntax-rule-closed-datatype sh:ByTypes]]
+  [[#ClosedConstraintComponent sh:ignoredProperties]] : list
+  [[#OrConstraintComponent sh:or]], [[#AndConstraintComponent sh:and]], [[#XoneConstraintComponent sh:xone]] : list of Shape
+  [[#NotConstraintComponent sh:not]] : [[#shapes sh:Shape]]
+  ...
+}
+
+class "<color:blue><u>sh:PropertyShape" as PropertyShape [[#property-shapes]] {
+  [[#property-paths sh:path]] : predicate or list or blank node
+  ....
+  [[#constraints Constraint parameters]], for example:
+  [[#MinCountConstraintComponent sh:minCount]], [[#MaxCountConstraintComponent sh:maxCount]] : xsd:integer
+  [[#MinLengthConstraintComponent sh:minLength]], [[#MaxLengthConstraintComponent sh:maxLength]] : xsd:integer
+  [[#ClassConstraintComponent sh:class]] or [[#DatatypeConstraintComponent sh:datatype]] : IRI or list of IRIs
+  [[#NodeConstraintComponent sh:node]] : [[#node-shapes sh:NodeShape]]
+  ...
+  ....
+  [[#core-components-list List constraints]]
+  [[#MemberShapeConstraintComponent sh:memberShape]] : [[#node-shapes sh:NodeShape]]
+  [[#MinListLengthConstraintComponent sh:minListLength]], [[#MaxListLengthConstraintComponent sh:maxListLength]]: xsd:integer
+  [[#UniqueMembersConstraintComponent sh:uniqueMembers]] : xsd:boolean
+  ....
+  [[#name sh:name]] : xsd:string or rdf:langString
+  [[#description sh:description]] : xsd:string or rdf:langString
+  [[#syntax-rule-path-defaultValue sh:defaultValue]] : any
+  [[#syntax-rule-path-defaultValue sh:values]] : any
+  [[#codeIdentifier sh:codeIdentifier]] : xsd:string 
+  [[#order sh:order]] : xsd:integer or xsd:decimal
+}
+
+class "<color:blue><u>sh:PropertyGroup" as PropertyGroup [[#group sh:group]] {
+  [[#group sh:order]] : xsd:integer or xsd:decimal
+  ... eg rdfs:label
+}
+
+Shape <|-- NodeShape
+Shape <|-- PropertyShape
+NodeShape -> PropertyShape : [[#property-shapes sh:property]] *
+PropertyShape --> PropertyGroup : [[#group sh:group]]
+
+' These links make the diagram too busy, so omit them for now. They are listed as fields
+' PropertyShape -> NodeShape : [[#NodeConstraintComponent sh:node]]
+' PropertyShape -> NodeShape : [[#MemberShapeConstraintComponent sh:memberShape]]
+' Shape -> NodeShape : [[#targetWhere sh:targetWhere]]
+@enduml

shacl12-core/index.html

@@ -864,7 +864,7 @@ <h2>Shapes and Constraints</h2>
 
 			<p><em>The following introduction is non-normative.</em></p>
 			<p>
-				The following informal diagram provides an overview of some of the key classes in the SHACL vocabulary.
+				The following UML diagram provides an overview of some of the key classes and properties in the SHACL vocabulary.
 				Each box represents a class.
 				The boxes under the class name list a small subset of the frequently used properties
 				that instances of these classes may have, together with their value types.
@@ -927,11 +927,16 @@ <h2>Shapes and Constraints</h2>
 				</div>
 				<div style="clear: both"></div>
 				</div>
-				<p>
-					The <a href="http://www.w3.org/ns/shacl.ttl">Turtle serialization of the SHACL vocabulary</a> contains the complete SHACL vocabulary.
-				</p>
 			</div>
-
+			<p>
+				The content of the boxes under the class name lists some of the properties that instances of these classes may have, together with their value types.
+				Empty arrowheads indicate inheritance (<code>rdfs:subClassOf</code>) and normal arrowheads indicate RDF relations.
+			</p>
+			<div id="SHACL-UML.svg"></div>
+			<p>
+				The <a href="http://www.w3.org/ns/shacl.ttl">Turtle serialization of the SHACL vocabulary</a> contains the complete SHACL vocabulary.
+			</p>
+
 			<section id="shapes">
 
 				<h3>Shapes</h3>
@@ -2335,6 +2340,38 @@ <h3>Validation Report</h3>
 	]
 ] .
 						</div>
+						<div class="jsonld">
+							<pre class="jsonld">{
+	"@type": "sh:ValidationReport",
+	"sh:conformanceDisallows": {
+		"@id": "sh:Violation"
+	},
+	"sh:conforms": {
+		"@type": "xsd:boolean",
+		"@value": "true"
+	},
+	"sh:result": {
+		"@type": "sh:ValidationResult",
+		"sh:focusNode": {
+			"@id": "ex:Bob"
+		},
+		"sh:resultMessage": "ex:age expects a literal of datatype xsd:integer.",
+		"sh:resultPath": {
+			"@id": "ex:age"
+		},
+		"sh:resultSeverity": {
+			"@id": "sh:Warning"
+		},
+		"sh:sourceConstraintComponent": {
+			"@id": "sh:DatatypeConstraintComponent"
+		},
+		"sh:sourceShape": {
+			"@id": "ex:PersonShape-age"
+		},
+		"sh:value": "twenty two"
+	}
+}</pre>
+						</div>
 					</div>
 				</aside>
 				<p>
@@ -2359,6 +2396,38 @@ <h3>Validation Report</h3>
 	]
 ] .
 						</div>
+						<div class="jsonld">
+							<pre class="jsonld">{
+	"@type": "sh:ValidationReport",
+	"sh:conformanceDisallows": {
+		"@id": "sh:Violation"
+	},
+	"sh:conforms": {
+		"@type": "xsd:boolean",
+		"@value": "false"
+	},
+	"sh:result": {
+		"@type": "sh:ValidationResult",
+		"sh:focusNode": {
+			"@id": "ex:Bob"
+		},
+		"sh:resultMessage": "ex:age expects a literal of datatype xsd:integer.",
+		"sh:resultPath": {
+			"@id": "ex:age"
+		},
+		"sh:resultSeverity": {
+			"@id": "sh:Violation"
+		},
+		"sh:sourceConstraintComponent": {
+			"@id": "sh:DatatypeConstraintComponent"
+		},
+		"sh:sourceShape": {
+			"@id": "ex:PersonShape-age"
+		},
+		"sh:value": "twenty two"
+	}
+}</pre>
+						</div>
 					</div>
 				</aside>
 
@@ -5788,5 +5857,27 @@ <h2>Changes between the original SHACL Core and SHACL 1.2 Core</h2>
 				<li>Added support for `rdf:dirLangString` to <a href="#UniqueLangConstraintComponent"></a>, see <a href="https://github.com/w3c/data-shapes/issues/737">Issue 737</a></li>
 			</ul>
 		</section>
-  </body>
-</html>
+
+
+	<script type="text/javascript">
+
+		// tooltip = "Targets are not the only way to initiate validation, SHACL also allows specific nodes to be validated against specific shapes.";
+		// var t = document.getElementsByClassName("target-can-be-skipped");
+		// for (var i = 0; i < t.length; i++) {
+		// 	t[i].title = tooltip;
+		// };
+
+    // Load and inline SVG diagram
+    // TODO: add desc="UML class diagram for SHACL showing Shape, NodeShape, PropertyShape, PropertyGroup" for accessibility
+    fetch('images/SHACL-UML.svg')
+      .then(response => response.text())
+      .then(svgText => {
+        const container = document.getElementById('SHACL-UML.svg');
+        container.innerHTML = svgText;
+      });
+	</script>
+
+
+
+
+</body></html>

shacl12-profiling/index.html

@@ -69,11 +69,16 @@
               graph.append(tabs)
           }
 
-          // Generate buttons for the selection logic
-          for (const tabs of document.querySelectorAll(".ds-selector-tabs")) {
-              const selectors = document.createElement("div");
-              selectors.classList.add("selectors");
-              selectors.innerHTML = `
+				// Generate buttons for the selection logic
+				for (const tabs of document.querySelectorAll(".ds-selector-tabs")) {
+					const selectors = document.createElement("div");
+					selectors.classList.add("selectors");
+
+					// Check if JSON-LD or shaclc div exists in this tab group
+					const hasJsonld = tabs.querySelector(".jsonld");
+					const hasShaclc = tabs.querySelector(".shaclc");
+
+					selectors.innerHTML = `
 						<button class="selected" data-selects="turtle">Turtle</button>
 						${hasJsonld ? '<button data-selects="jsonld">JSON-LD</button>' : ''}
 						${hasShaclc ? '<button data-selects="shaclc">SHACL-C</button>' : ''}
@@ -1251,4 +1256,4 @@ <h3>Specification Profiles Listing</h3>
       When a set of SHACL information is contained within an <code>owl:Ontology</code>, it may be useful to identify the
       graph used to package the content within a graph using the same IRI as the ontology.
     </p>
--->
+-->

shacl12-sparql/index.html

@@ -665,7 +665,7 @@ <h3>Syntax of SPARQL-based Constraints</h3>
 					and this value is either <code>true</code> or <code>false</code>.
 				</p>
 				<p>
-					SELECT queries used in the context of <a>property shapes</a> use a special variable named <code>PATH</code> as a placeholder for the path used by the shape.
+					SELECT queries used in the context of <a>property shapes</a> use a special variable named <code>PATH</code> (spelled in UPPERCASE) as a placeholder for the path used by the shape.
 				</p>
 				<p class="syntax">
 					<span data-syntax-rule="PATH-position">The only legal use of the variable <code>PATH</code> in the SPARQL queries of <a>SPARQL-based constraints</a>
@@ -1284,10 +1284,8 @@ <h3>Validation with SPARQL-based Constraint Components</h3>
 					<li>
 						For <a>SELECT-based validators</a>:
 						If the <a>shape</a> is a <a>property shape</a>, then prior to execution
-						<a>substitute</a> the variable <code>PATH</code> where it appears in the <a>predicate</a>
-						position of a <a data-cite="sparql12-query/#QSynTriples">triple pattern</a>
-						with a valid SPARQL surface syntax string of the <a>SHACL property path</a>
-						specified via <code>sh:path</code> at the <a>property shape</a>.
+						<a>substitute</a> the variable <code>PATH</code> with a valid SPARQL surface syntax string of the <a>SHACL property path</a>
+            (see the reference "<a>substitute</a>" for details).
 						Let <code>QS</code> be the <a>solutions</a> produced by executing the SPARQL query.
 					</li>
 				</ul>