From e0f3a275aec3203c7e0b8ea8731f0f4bda8f2a32 Mon Sep 17 00:00:00 2001 From: Nicholas Car Date: Tue, 23 Sep 2025 13:01:13 +1000 Subject: [PATCH 1/3] apply new short IRIs --- README.md | 7 +- shacl12-common/specifications.html | 18 ++-- .../SHACLC.g4 | 0 .../index.html | 0 .../tests/valid/array-in.shaclc | 0 .../tests/valid/array-in.ttl | 0 .../tests/valid/basic-shape-iri.shaclc | 0 .../tests/valid/basic-shape-iri.ttl | 0 .../valid/basic-shape-with-target.shaclc | 0 .../tests/valid/basic-shape-with-target.ttl | 0 .../valid/basic-shape-with-targets.shaclc | 0 .../tests/valid/basic-shape-with-targets.ttl | 0 .../tests/valid/basic-shape.shaclc | 0 .../tests/valid/basic-shape.ttl | 30 +++--- .../tests/valid/class.shaclc | 0 .../tests/valid/class.ttl | 0 .../tests/valid/comment.shaclc | 0 .../tests/valid/comment.ttl | 30 +++--- .../tests/valid/complex1.shaclc | 28 +++--- .../tests/valid/complex1.ttl | 94 +++++++++---------- .../tests/valid/complex2.shaclc | 30 +++--- .../tests/valid/complex2.ttl | 92 +++++++++--------- .../tests/valid/count-0-1.shaclc | 0 .../tests/valid/count-0-1.ttl | 38 ++++---- .../tests/valid/count-0-unlimited.shaclc | 0 .../tests/valid/count-0-unlimited.ttl | 36 +++---- .../tests/valid/count-1-2.shaclc | 0 .../tests/valid/count-1-2.ttl | 40 ++++---- .../tests/valid/count-1-unlimited.shaclc | 0 .../tests/valid/count-1-unlimited.ttl | 38 ++++---- .../tests/valid/datatype.shaclc | 0 .../tests/valid/datatype.ttl | 0 .../tests/valid/directives.shaclc | 0 .../tests/valid/directives.ttl | 26 ++--- .../tests/valid/empty.shaclc | 0 .../tests/valid/empty.ttl | 16 ++-- .../tests/valid/nestedShape.shaclc | 0 .../tests/valid/nestedShape.ttl | 52 +++++----- .../tests/valid/node-or-2.shaclc | 0 .../tests/valid/node-or-2.ttl | 32 +++---- .../tests/valid/node-or-3-not.shaclc | 0 .../tests/valid/node-or-3-not.ttl | 40 ++++---- .../tests/valid/nodeKind.shaclc | 0 .../tests/valid/nodeKind.ttl | 0 .../tests/valid/path-alternative.shaclc | 0 .../tests/valid/path-alternative.ttl | 0 .../tests/valid/path-complex.shaclc | 0 .../tests/valid/path-complex.ttl | 0 .../tests/valid/path-inverse.shaclc | 0 .../tests/valid/path-inverse.ttl | 0 .../tests/valid/path-oneOrMore.shaclc | 0 .../tests/valid/path-oneOrMore.ttl | 0 .../tests/valid/path-sequence.shaclc | 0 .../tests/valid/path-sequence.ttl | 0 .../tests/valid/path-zeroOrMore.shaclc | 0 .../tests/valid/path-zeroOrMore.ttl | 0 .../tests/valid/path-zeroOrOne.shaclc | 0 .../tests/valid/path-zeroOrOne.ttl | 0 .../tests/valid/property-empty.shaclc | 0 .../tests/valid/property-empty.ttl | 36 +++---- .../tests/valid/property-not.shaclc | 0 .../tests/valid/property-not.ttl | 0 .../tests/valid/property-or-2.shaclc | 0 .../tests/valid/property-or-2.ttl | 0 .../tests/valid/property-or-3.shaclc | 0 .../tests/valid/property-or-3.ttl | 0 .../tests/valid/shapeRef.shaclc | 0 .../tests/valid/shapeRef.ttl | 0 shacl12-overview/index.html | 4 +- 69 files changed, 344 insertions(+), 343 deletions(-) rename {shacl12-compact-syntax => shacl12-cs}/SHACLC.g4 (100%) rename {shacl12-compact-syntax => shacl12-cs}/index.html (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/array-in.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/array-in.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/basic-shape-iri.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/basic-shape-iri.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/basic-shape-with-target.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/basic-shape-with-target.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/basic-shape-with-targets.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/basic-shape-with-targets.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/basic-shape.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/basic-shape.ttl (96%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/class.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/class.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/comment.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/comment.ttl (96%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/complex1.shaclc (96%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/complex1.ttl (96%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/complex2.shaclc (96%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/complex2.ttl (96%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/count-0-1.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/count-0-1.ttl (96%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/count-0-unlimited.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/count-0-unlimited.ttl (96%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/count-1-2.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/count-1-2.ttl (95%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/count-1-unlimited.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/count-1-unlimited.ttl (96%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/datatype.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/datatype.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/directives.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/directives.ttl (97%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/empty.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/empty.ttl (97%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/nestedShape.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/nestedShape.ttl (95%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/node-or-2.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/node-or-2.ttl (96%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/node-or-3-not.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/node-or-3-not.ttl (96%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/nodeKind.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/nodeKind.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-alternative.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-alternative.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-complex.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-complex.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-inverse.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-inverse.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-oneOrMore.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-oneOrMore.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-sequence.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-sequence.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-zeroOrMore.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-zeroOrMore.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-zeroOrOne.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/path-zeroOrOne.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/property-empty.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/property-empty.ttl (96%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/property-not.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/property-not.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/property-or-2.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/property-or-2.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/property-or-3.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/property-or-3.ttl (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/shapeRef.shaclc (100%) rename {shacl12-compact-syntax => shacl12-cs}/tests/valid/shapeRef.ttl (100%) diff --git a/README.md b/README.md index 5a52818f..14263623 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,14 @@ The WG is currently working on updated and new [SHACL](https://www.w3.org/TR/sha * [SHACL 1.2 Node Expressions](https://w3c.github.io/data-shapes/shacl12-node-expr/) -#### Phase 2, after July 2025: +#### Phase 2, now in progress since July 2025: ##### Editor's drafts -* [SHACL 1.2 Inference Rules](https://w3c.github.io/data-shapes/shacl12-inf-rules/) -* [SHACL 1.2 SHACL-SHACL](https://w3c.github.io/data-shapes/shacl12-shacl-shacl) +* [SHACL 1.2 Overview](https://w3c.github.io/data-shapes/shacl12-overview/) +* [SHACL 1.2 Rules](https://w3c.github.io/data-shapes/shacl12-rules/) * [SHACL 1.2 UI](https://w3c.github.io/data-shapes/shacl12-ui/) +* [SHACL 1.2 Compact Syntax](https://w3c.github.io/data-shapes/shacl12-cs/) * [SHACL 1.2 Profiling](https://w3c.github.io/data-shapes/shacl12-profiling/) All of the above specifications are drafts that are automatically rebuilt on pushes to this repository. diff --git a/shacl12-common/specifications.html b/shacl12-common/specifications.html index a441955b..835527ba 100644 --- a/shacl12-common/specifications.html +++ b/shacl12-common/specifications.html @@ -14,7 +14,7 @@

SHACL Specifications

defines SPARQL-related extensions of the SHACL
SHACL 1.2 Node Expressions
defines graph expressions used to determine focus nodes in SHACL
-
SHACL 1.2 Inference Rules
+
SHACL 1.2 Rules
defines SHACL's methods of rule-based inference
SHACL 1.2 UI
defines SHACL's use for User Interface generation
@@ -26,21 +26,21 @@

SHACL Specifications

\ No newline at end of file diff --git a/shacl12-compact-syntax/SHACLC.g4 b/shacl12-cs/SHACLC.g4 similarity index 100% rename from shacl12-compact-syntax/SHACLC.g4 rename to shacl12-cs/SHACLC.g4 diff --git a/shacl12-compact-syntax/index.html b/shacl12-cs/index.html similarity index 100% rename from shacl12-compact-syntax/index.html rename to shacl12-cs/index.html diff --git a/shacl12-compact-syntax/tests/valid/array-in.shaclc b/shacl12-cs/tests/valid/array-in.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/array-in.shaclc rename to shacl12-cs/tests/valid/array-in.shaclc diff --git a/shacl12-compact-syntax/tests/valid/array-in.ttl b/shacl12-cs/tests/valid/array-in.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/array-in.ttl rename to shacl12-cs/tests/valid/array-in.ttl diff --git a/shacl12-compact-syntax/tests/valid/basic-shape-iri.shaclc b/shacl12-cs/tests/valid/basic-shape-iri.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/basic-shape-iri.shaclc rename to shacl12-cs/tests/valid/basic-shape-iri.shaclc diff --git a/shacl12-compact-syntax/tests/valid/basic-shape-iri.ttl b/shacl12-cs/tests/valid/basic-shape-iri.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/basic-shape-iri.ttl rename to shacl12-cs/tests/valid/basic-shape-iri.ttl diff --git a/shacl12-compact-syntax/tests/valid/basic-shape-with-target.shaclc b/shacl12-cs/tests/valid/basic-shape-with-target.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/basic-shape-with-target.shaclc rename to shacl12-cs/tests/valid/basic-shape-with-target.shaclc diff --git a/shacl12-compact-syntax/tests/valid/basic-shape-with-target.ttl b/shacl12-cs/tests/valid/basic-shape-with-target.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/basic-shape-with-target.ttl rename to shacl12-cs/tests/valid/basic-shape-with-target.ttl diff --git a/shacl12-compact-syntax/tests/valid/basic-shape-with-targets.shaclc b/shacl12-cs/tests/valid/basic-shape-with-targets.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/basic-shape-with-targets.shaclc rename to shacl12-cs/tests/valid/basic-shape-with-targets.shaclc diff --git a/shacl12-compact-syntax/tests/valid/basic-shape-with-targets.ttl b/shacl12-cs/tests/valid/basic-shape-with-targets.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/basic-shape-with-targets.ttl rename to shacl12-cs/tests/valid/basic-shape-with-targets.ttl diff --git a/shacl12-compact-syntax/tests/valid/basic-shape.shaclc b/shacl12-cs/tests/valid/basic-shape.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/basic-shape.shaclc rename to shacl12-cs/tests/valid/basic-shape.shaclc diff --git a/shacl12-compact-syntax/tests/valid/basic-shape.ttl b/shacl12-cs/tests/valid/basic-shape.ttl similarity index 96% rename from shacl12-compact-syntax/tests/valid/basic-shape.ttl rename to shacl12-cs/tests/valid/basic-shape.ttl index 277db18c..3781d987 100644 --- a/shacl12-compact-syntax/tests/valid/basic-shape.ttl +++ b/shacl12-cs/tests/valid/basic-shape.ttl @@ -1,15 +1,15 @@ -@base . -@prefix ex: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - - - a owl:Ontology ; -. - -ex:TestShape - a sh:NodeShape ; -. +@base . +@prefix ex: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + + + a owl:Ontology ; +. + +ex:TestShape + a sh:NodeShape ; +. diff --git a/shacl12-compact-syntax/tests/valid/class.shaclc b/shacl12-cs/tests/valid/class.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/class.shaclc rename to shacl12-cs/tests/valid/class.shaclc diff --git a/shacl12-compact-syntax/tests/valid/class.ttl b/shacl12-cs/tests/valid/class.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/class.ttl rename to shacl12-cs/tests/valid/class.ttl diff --git a/shacl12-compact-syntax/tests/valid/comment.shaclc b/shacl12-cs/tests/valid/comment.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/comment.shaclc rename to shacl12-cs/tests/valid/comment.shaclc diff --git a/shacl12-compact-syntax/tests/valid/comment.ttl b/shacl12-cs/tests/valid/comment.ttl similarity index 96% rename from shacl12-compact-syntax/tests/valid/comment.ttl rename to shacl12-cs/tests/valid/comment.ttl index 157b77a3..659097bb 100644 --- a/shacl12-compact-syntax/tests/valid/comment.ttl +++ b/shacl12-cs/tests/valid/comment.ttl @@ -1,15 +1,15 @@ -@base . -@prefix ex: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - -<> - a owl:Ontology ; -. - -ex:TestShape - a sh:NodeShape ; -. +@base . +@prefix ex: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + +<> + a owl:Ontology ; +. + +ex:TestShape + a sh:NodeShape ; +. diff --git a/shacl12-compact-syntax/tests/valid/complex1.shaclc b/shacl12-cs/tests/valid/complex1.shaclc similarity index 96% rename from shacl12-compact-syntax/tests/valid/complex1.shaclc rename to shacl12-cs/tests/valid/complex1.shaclc index 6e17c7dd..2c520f72 100644 --- a/shacl12-compact-syntax/tests/valid/complex1.shaclc +++ b/shacl12-cs/tests/valid/complex1.shaclc @@ -1,15 +1,15 @@ -BASE - -IMPORTS - -PREFIX ex: - -shape ex:PersonShape -> ex:Person { - closed=true ignoredProperties=[rdf:type] . - ex:ssn xsd:string [0..1] pattern="^\\d{3}-\\d{2}-\\d{4}$" . - ex:worksFor IRI ex:Company [0..*] . - ex:address BlankNode [0..1] { - ex:city xsd:string [1..1] . - ex:postalCode xsd:integer|xsd:string [1..1] maxLength=5 . - } . +BASE + +IMPORTS + +PREFIX ex: + +shape ex:PersonShape -> ex:Person { + closed=true ignoredProperties=[rdf:type] . + ex:ssn xsd:string [0..1] pattern="^\\d{3}-\\d{2}-\\d{4}$" . + ex:worksFor IRI ex:Company [0..*] . + ex:address BlankNode [0..1] { + ex:city xsd:string [1..1] . + ex:postalCode xsd:integer|xsd:string [1..1] maxLength=5 . + } . } \ No newline at end of file diff --git a/shacl12-compact-syntax/tests/valid/complex1.ttl b/shacl12-cs/tests/valid/complex1.ttl similarity index 96% rename from shacl12-compact-syntax/tests/valid/complex1.ttl rename to shacl12-cs/tests/valid/complex1.ttl index 420f08db..7f9926e1 100644 --- a/shacl12-compact-syntax/tests/valid/complex1.ttl +++ b/shacl12-cs/tests/valid/complex1.ttl @@ -1,48 +1,48 @@ -@base . -@prefix ex: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - - - rdf:type owl:Ontology ; - owl:imports . - -ex:PersonShape - a sh:NodeShape ; - sh:targetClass ex:Person ; - sh:closed true ; - sh:ignoredProperties ( rdf:type ) ; - sh:property [ - sh:path ex:ssn ; - sh:maxCount 1 ; - sh:datatype xsd:string ; - sh:pattern "^\\d{3}-\\d{2}-\\d{4}$" ; - ] ; - sh:property [ - sh:path ex:worksFor ; - sh:class ex:Company ; - sh:nodeKind sh:IRI ; - ] ; - sh:property [ - sh:path ex:address ; - sh:maxCount 1 ; - sh:nodeKind sh:BlankNode ; - sh:node [ - sh:property [ - sh:path ex:city ; - sh:datatype xsd:string ; - sh:minCount 1 ; - sh:maxCount 1 ; - ] ; - sh:property [ - sh:path ex:postalCode ; - sh:or ( [ sh:datatype xsd:integer ] [ sh:datatype xsd:string ] ) ; - sh:minCount 1 ; - sh:maxCount 1 ; - sh:maxLength 5 ; - ] ; - ] ; +@base . +@prefix ex: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + + + rdf:type owl:Ontology ; + owl:imports . + +ex:PersonShape + a sh:NodeShape ; + sh:targetClass ex:Person ; + sh:closed true ; + sh:ignoredProperties ( rdf:type ) ; + sh:property [ + sh:path ex:ssn ; + sh:maxCount 1 ; + sh:datatype xsd:string ; + sh:pattern "^\\d{3}-\\d{2}-\\d{4}$" ; + ] ; + sh:property [ + sh:path ex:worksFor ; + sh:class ex:Company ; + sh:nodeKind sh:IRI ; + ] ; + sh:property [ + sh:path ex:address ; + sh:maxCount 1 ; + sh:nodeKind sh:BlankNode ; + sh:node [ + sh:property [ + sh:path ex:city ; + sh:datatype xsd:string ; + sh:minCount 1 ; + sh:maxCount 1 ; + ] ; + sh:property [ + sh:path ex:postalCode ; + sh:or ( [ sh:datatype xsd:integer ] [ sh:datatype xsd:string ] ) ; + sh:minCount 1 ; + sh:maxCount 1 ; + sh:maxLength 5 ; + ] ; + ] ; ] . \ No newline at end of file diff --git a/shacl12-compact-syntax/tests/valid/complex2.shaclc b/shacl12-cs/tests/valid/complex2.shaclc similarity index 96% rename from shacl12-compact-syntax/tests/valid/complex2.shaclc rename to shacl12-cs/tests/valid/complex2.shaclc index dc7941cc..b517e056 100644 --- a/shacl12-compact-syntax/tests/valid/complex2.shaclc +++ b/shacl12-cs/tests/valid/complex2.shaclc @@ -1,15 +1,15 @@ -BASE - -IMPORTS - -PREFIX ex: - -shapeClass ex:Person { - closed=true ignoredProperties=[rdf:type] . - ex:ssn xsd:string [0..1] pattern="^\\d{3}-\\d{2}-\\d{4}$" . - ex:worksFor IRI ex:Company [0..*] . - ex:address BlankNode [0..1] { - ex:city xsd:string [1..1] . - ex:postalCode xsd:integer|xsd:string [1..1] maxLength=5 . - } . -} +BASE + +IMPORTS + +PREFIX ex: + +shapeClass ex:Person { + closed=true ignoredProperties=[rdf:type] . + ex:ssn xsd:string [0..1] pattern="^\\d{3}-\\d{2}-\\d{4}$" . + ex:worksFor IRI ex:Company [0..*] . + ex:address BlankNode [0..1] { + ex:city xsd:string [1..1] . + ex:postalCode xsd:integer|xsd:string [1..1] maxLength=5 . + } . +} diff --git a/shacl12-compact-syntax/tests/valid/complex2.ttl b/shacl12-cs/tests/valid/complex2.ttl similarity index 96% rename from shacl12-compact-syntax/tests/valid/complex2.ttl rename to shacl12-cs/tests/valid/complex2.ttl index 2df281aa..6958a343 100644 --- a/shacl12-compact-syntax/tests/valid/complex2.ttl +++ b/shacl12-cs/tests/valid/complex2.ttl @@ -1,47 +1,47 @@ -@base . -@prefix ex: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - - - rdf:type owl:Ontology ; - owl:imports . - -ex:Person - a sh:NodeShape, rdfs:Class ; - sh:closed true ; - sh:ignoredProperties ( rdf:type ) ; - sh:property [ - sh:path ex:ssn ; - sh:maxCount 1 ; - sh:datatype xsd:string ; - sh:pattern "^\\d{3}-\\d{2}-\\d{4}$" ; - ] ; - sh:property [ - sh:path ex:worksFor ; - sh:class ex:Company ; - sh:nodeKind sh:IRI ; - ] ; - sh:property [ - sh:path ex:address ; - sh:maxCount 1 ; - sh:nodeKind sh:BlankNode ; - sh:node [ - sh:property [ - sh:path ex:city ; - sh:datatype xsd:string ; - sh:minCount 1 ; - sh:maxCount 1 ; - ] ; - sh:property [ - sh:path ex:postalCode ; - sh:or ( [ sh:datatype xsd:integer ] [ sh:datatype xsd:string ] ) ; - sh:minCount 1 ; - sh:maxCount 1 ; - sh:maxLength 5 ; - ] ; - ] ; +@base . +@prefix ex: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + + + rdf:type owl:Ontology ; + owl:imports . + +ex:Person + a sh:NodeShape, rdfs:Class ; + sh:closed true ; + sh:ignoredProperties ( rdf:type ) ; + sh:property [ + sh:path ex:ssn ; + sh:maxCount 1 ; + sh:datatype xsd:string ; + sh:pattern "^\\d{3}-\\d{2}-\\d{4}$" ; + ] ; + sh:property [ + sh:path ex:worksFor ; + sh:class ex:Company ; + sh:nodeKind sh:IRI ; + ] ; + sh:property [ + sh:path ex:address ; + sh:maxCount 1 ; + sh:nodeKind sh:BlankNode ; + sh:node [ + sh:property [ + sh:path ex:city ; + sh:datatype xsd:string ; + sh:minCount 1 ; + sh:maxCount 1 ; + ] ; + sh:property [ + sh:path ex:postalCode ; + sh:or ( [ sh:datatype xsd:integer ] [ sh:datatype xsd:string ] ) ; + sh:minCount 1 ; + sh:maxCount 1 ; + sh:maxLength 5 ; + ] ; + ] ; ] . \ No newline at end of file diff --git a/shacl12-compact-syntax/tests/valid/count-0-1.shaclc b/shacl12-cs/tests/valid/count-0-1.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/count-0-1.shaclc rename to shacl12-cs/tests/valid/count-0-1.shaclc diff --git a/shacl12-compact-syntax/tests/valid/count-0-1.ttl b/shacl12-cs/tests/valid/count-0-1.ttl similarity index 96% rename from shacl12-compact-syntax/tests/valid/count-0-1.ttl rename to shacl12-cs/tests/valid/count-0-1.ttl index 7edf0be3..ced109e7 100644 --- a/shacl12-compact-syntax/tests/valid/count-0-1.ttl +++ b/shacl12-cs/tests/valid/count-0-1.ttl @@ -1,19 +1,19 @@ -@base . -@prefix ex: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - -<> - a owl:Ontology ; -. - -ex:TestShape - a sh:NodeShape ; - sh:property [ - sh:path ex:property ; - sh:maxCount 1 ; - ] ; -. +@base . +@prefix ex: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + +<> + a owl:Ontology ; +. + +ex:TestShape + a sh:NodeShape ; + sh:property [ + sh:path ex:property ; + sh:maxCount 1 ; + ] ; +. diff --git a/shacl12-compact-syntax/tests/valid/count-0-unlimited.shaclc b/shacl12-cs/tests/valid/count-0-unlimited.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/count-0-unlimited.shaclc rename to shacl12-cs/tests/valid/count-0-unlimited.shaclc diff --git a/shacl12-compact-syntax/tests/valid/count-0-unlimited.ttl b/shacl12-cs/tests/valid/count-0-unlimited.ttl similarity index 96% rename from shacl12-compact-syntax/tests/valid/count-0-unlimited.ttl rename to shacl12-cs/tests/valid/count-0-unlimited.ttl index cf5243ee..79be0297 100644 --- a/shacl12-compact-syntax/tests/valid/count-0-unlimited.ttl +++ b/shacl12-cs/tests/valid/count-0-unlimited.ttl @@ -1,18 +1,18 @@ -@base . -@prefix ex: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - -<> - a owl:Ontology ; -. - -ex:TestShape - a sh:NodeShape ; - sh:property [ - sh:path ex:property ; - ] ; -. +@base . +@prefix ex: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + +<> + a owl:Ontology ; +. + +ex:TestShape + a sh:NodeShape ; + sh:property [ + sh:path ex:property ; + ] ; +. diff --git a/shacl12-compact-syntax/tests/valid/count-1-2.shaclc b/shacl12-cs/tests/valid/count-1-2.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/count-1-2.shaclc rename to shacl12-cs/tests/valid/count-1-2.shaclc diff --git a/shacl12-compact-syntax/tests/valid/count-1-2.ttl b/shacl12-cs/tests/valid/count-1-2.ttl similarity index 95% rename from shacl12-compact-syntax/tests/valid/count-1-2.ttl rename to shacl12-cs/tests/valid/count-1-2.ttl index 97be52d2..4e67e627 100644 --- a/shacl12-compact-syntax/tests/valid/count-1-2.ttl +++ b/shacl12-cs/tests/valid/count-1-2.ttl @@ -1,20 +1,20 @@ -@base . -@prefix ex: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - -<> - a owl:Ontology ; -. - -ex:TestShape - a sh:NodeShape ; - sh:property [ - sh:path ex:property ; - sh:minCount 1 ; - sh:maxCount 2 ; - ] ; -. +@base . +@prefix ex: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + +<> + a owl:Ontology ; +. + +ex:TestShape + a sh:NodeShape ; + sh:property [ + sh:path ex:property ; + sh:minCount 1 ; + sh:maxCount 2 ; + ] ; +. diff --git a/shacl12-compact-syntax/tests/valid/count-1-unlimited.shaclc b/shacl12-cs/tests/valid/count-1-unlimited.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/count-1-unlimited.shaclc rename to shacl12-cs/tests/valid/count-1-unlimited.shaclc diff --git a/shacl12-compact-syntax/tests/valid/count-1-unlimited.ttl b/shacl12-cs/tests/valid/count-1-unlimited.ttl similarity index 96% rename from shacl12-compact-syntax/tests/valid/count-1-unlimited.ttl rename to shacl12-cs/tests/valid/count-1-unlimited.ttl index 917d1dfe..7afc1a4a 100644 --- a/shacl12-compact-syntax/tests/valid/count-1-unlimited.ttl +++ b/shacl12-cs/tests/valid/count-1-unlimited.ttl @@ -1,19 +1,19 @@ -@base . -@prefix ex: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - -<> - a owl:Ontology ; -. - -ex:TestShape - a sh:NodeShape ; - sh:property [ - sh:path ex:property ; - sh:minCount 1 ; - ] ; -. +@base . +@prefix ex: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + +<> + a owl:Ontology ; +. + +ex:TestShape + a sh:NodeShape ; + sh:property [ + sh:path ex:property ; + sh:minCount 1 ; + ] ; +. diff --git a/shacl12-compact-syntax/tests/valid/datatype.shaclc b/shacl12-cs/tests/valid/datatype.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/datatype.shaclc rename to shacl12-cs/tests/valid/datatype.shaclc diff --git a/shacl12-compact-syntax/tests/valid/datatype.ttl b/shacl12-cs/tests/valid/datatype.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/datatype.ttl rename to shacl12-cs/tests/valid/datatype.ttl diff --git a/shacl12-compact-syntax/tests/valid/directives.shaclc b/shacl12-cs/tests/valid/directives.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/directives.shaclc rename to shacl12-cs/tests/valid/directives.shaclc diff --git a/shacl12-compact-syntax/tests/valid/directives.ttl b/shacl12-cs/tests/valid/directives.ttl similarity index 97% rename from shacl12-compact-syntax/tests/valid/directives.ttl rename to shacl12-cs/tests/valid/directives.ttl index 0c1218f4..083e7790 100644 --- a/shacl12-compact-syntax/tests/valid/directives.ttl +++ b/shacl12-cs/tests/valid/directives.ttl @@ -1,13 +1,13 @@ -@base . -@prefix ex: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - - - a owl:Ontology ; - owl:imports ; - owl:imports ; -. +@base . +@prefix ex: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + + + a owl:Ontology ; + owl:imports ; + owl:imports ; +. diff --git a/shacl12-compact-syntax/tests/valid/empty.shaclc b/shacl12-cs/tests/valid/empty.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/empty.shaclc rename to shacl12-cs/tests/valid/empty.shaclc diff --git a/shacl12-compact-syntax/tests/valid/empty.ttl b/shacl12-cs/tests/valid/empty.ttl similarity index 97% rename from shacl12-compact-syntax/tests/valid/empty.ttl rename to shacl12-cs/tests/valid/empty.ttl index cf239ff1..aef36610 100644 --- a/shacl12-compact-syntax/tests/valid/empty.ttl +++ b/shacl12-cs/tests/valid/empty.ttl @@ -1,9 +1,9 @@ -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - - - a owl:Ontology ; +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + + + a owl:Ontology ; . \ No newline at end of file diff --git a/shacl12-compact-syntax/tests/valid/nestedShape.shaclc b/shacl12-cs/tests/valid/nestedShape.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/nestedShape.shaclc rename to shacl12-cs/tests/valid/nestedShape.shaclc diff --git a/shacl12-compact-syntax/tests/valid/nestedShape.ttl b/shacl12-cs/tests/valid/nestedShape.ttl similarity index 95% rename from shacl12-compact-syntax/tests/valid/nestedShape.ttl rename to shacl12-cs/tests/valid/nestedShape.ttl index 31a73432..0ec47073 100644 --- a/shacl12-compact-syntax/tests/valid/nestedShape.ttl +++ b/shacl12-cs/tests/valid/nestedShape.ttl @@ -1,26 +1,26 @@ -@base . -@prefix ex: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - -<> - a owl:Ontology ; -. - -ex:TestShape - a sh:NodeShape ; - sh:property [ - sh:path ex:property ; - sh:nodeKind sh:IRI ; - sh:node [ - sh:property [ - sh:path ex:nestedProperty ; - sh:minCount 1 ; - sh:maxCount 1 ; - ] ; - ] ; - ] ; -. +@base . +@prefix ex: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + +<> + a owl:Ontology ; +. + +ex:TestShape + a sh:NodeShape ; + sh:property [ + sh:path ex:property ; + sh:nodeKind sh:IRI ; + sh:node [ + sh:property [ + sh:path ex:nestedProperty ; + sh:minCount 1 ; + sh:maxCount 1 ; + ] ; + ] ; + ] ; +. diff --git a/shacl12-compact-syntax/tests/valid/node-or-2.shaclc b/shacl12-cs/tests/valid/node-or-2.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/node-or-2.shaclc rename to shacl12-cs/tests/valid/node-or-2.shaclc diff --git a/shacl12-compact-syntax/tests/valid/node-or-2.ttl b/shacl12-cs/tests/valid/node-or-2.ttl similarity index 96% rename from shacl12-compact-syntax/tests/valid/node-or-2.ttl rename to shacl12-cs/tests/valid/node-or-2.ttl index c7d2ac16..2d2ded75 100644 --- a/shacl12-compact-syntax/tests/valid/node-or-2.ttl +++ b/shacl12-cs/tests/valid/node-or-2.ttl @@ -1,16 +1,16 @@ -@base . -@prefix ex: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - -<> - a owl:Ontology ; -. - -ex:TestShape - a sh:NodeShape ; - sh:or ( [ sh:datatype xsd:string ] [ sh:datatype rdf:langString ] ) ; -. +@base . +@prefix ex: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + +<> + a owl:Ontology ; +. + +ex:TestShape + a sh:NodeShape ; + sh:or ( [ sh:datatype xsd:string ] [ sh:datatype rdf:langString ] ) ; +. diff --git a/shacl12-compact-syntax/tests/valid/node-or-3-not.shaclc b/shacl12-cs/tests/valid/node-or-3-not.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/node-or-3-not.shaclc rename to shacl12-cs/tests/valid/node-or-3-not.shaclc diff --git a/shacl12-compact-syntax/tests/valid/node-or-3-not.ttl b/shacl12-cs/tests/valid/node-or-3-not.ttl similarity index 96% rename from shacl12-compact-syntax/tests/valid/node-or-3-not.ttl rename to shacl12-cs/tests/valid/node-or-3-not.ttl index 63714eac..ad15c36e 100644 --- a/shacl12-compact-syntax/tests/valid/node-or-3-not.ttl +++ b/shacl12-cs/tests/valid/node-or-3-not.ttl @@ -1,20 +1,20 @@ -@base . -@prefix ex: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - -<> - a owl:Ontology ; -. - -ex:TestShape - a sh:NodeShape ; - sh:or ( - [ sh:datatype xsd:string ] - [ sh:not [ sh:datatype rdf:langString ] ] - [ sh:class ex:TestClass ] - ) ; -. +@base . +@prefix ex: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + +<> + a owl:Ontology ; +. + +ex:TestShape + a sh:NodeShape ; + sh:or ( + [ sh:datatype xsd:string ] + [ sh:not [ sh:datatype rdf:langString ] ] + [ sh:class ex:TestClass ] + ) ; +. diff --git a/shacl12-compact-syntax/tests/valid/nodeKind.shaclc b/shacl12-cs/tests/valid/nodeKind.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/nodeKind.shaclc rename to shacl12-cs/tests/valid/nodeKind.shaclc diff --git a/shacl12-compact-syntax/tests/valid/nodeKind.ttl b/shacl12-cs/tests/valid/nodeKind.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/nodeKind.ttl rename to shacl12-cs/tests/valid/nodeKind.ttl diff --git a/shacl12-compact-syntax/tests/valid/path-alternative.shaclc b/shacl12-cs/tests/valid/path-alternative.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-alternative.shaclc rename to shacl12-cs/tests/valid/path-alternative.shaclc diff --git a/shacl12-compact-syntax/tests/valid/path-alternative.ttl b/shacl12-cs/tests/valid/path-alternative.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-alternative.ttl rename to shacl12-cs/tests/valid/path-alternative.ttl diff --git a/shacl12-compact-syntax/tests/valid/path-complex.shaclc b/shacl12-cs/tests/valid/path-complex.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-complex.shaclc rename to shacl12-cs/tests/valid/path-complex.shaclc diff --git a/shacl12-compact-syntax/tests/valid/path-complex.ttl b/shacl12-cs/tests/valid/path-complex.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-complex.ttl rename to shacl12-cs/tests/valid/path-complex.ttl diff --git a/shacl12-compact-syntax/tests/valid/path-inverse.shaclc b/shacl12-cs/tests/valid/path-inverse.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-inverse.shaclc rename to shacl12-cs/tests/valid/path-inverse.shaclc diff --git a/shacl12-compact-syntax/tests/valid/path-inverse.ttl b/shacl12-cs/tests/valid/path-inverse.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-inverse.ttl rename to shacl12-cs/tests/valid/path-inverse.ttl diff --git a/shacl12-compact-syntax/tests/valid/path-oneOrMore.shaclc b/shacl12-cs/tests/valid/path-oneOrMore.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-oneOrMore.shaclc rename to shacl12-cs/tests/valid/path-oneOrMore.shaclc diff --git a/shacl12-compact-syntax/tests/valid/path-oneOrMore.ttl b/shacl12-cs/tests/valid/path-oneOrMore.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-oneOrMore.ttl rename to shacl12-cs/tests/valid/path-oneOrMore.ttl diff --git a/shacl12-compact-syntax/tests/valid/path-sequence.shaclc b/shacl12-cs/tests/valid/path-sequence.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-sequence.shaclc rename to shacl12-cs/tests/valid/path-sequence.shaclc diff --git a/shacl12-compact-syntax/tests/valid/path-sequence.ttl b/shacl12-cs/tests/valid/path-sequence.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-sequence.ttl rename to shacl12-cs/tests/valid/path-sequence.ttl diff --git a/shacl12-compact-syntax/tests/valid/path-zeroOrMore.shaclc b/shacl12-cs/tests/valid/path-zeroOrMore.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-zeroOrMore.shaclc rename to shacl12-cs/tests/valid/path-zeroOrMore.shaclc diff --git a/shacl12-compact-syntax/tests/valid/path-zeroOrMore.ttl b/shacl12-cs/tests/valid/path-zeroOrMore.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-zeroOrMore.ttl rename to shacl12-cs/tests/valid/path-zeroOrMore.ttl diff --git a/shacl12-compact-syntax/tests/valid/path-zeroOrOne.shaclc b/shacl12-cs/tests/valid/path-zeroOrOne.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-zeroOrOne.shaclc rename to shacl12-cs/tests/valid/path-zeroOrOne.shaclc diff --git a/shacl12-compact-syntax/tests/valid/path-zeroOrOne.ttl b/shacl12-cs/tests/valid/path-zeroOrOne.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/path-zeroOrOne.ttl rename to shacl12-cs/tests/valid/path-zeroOrOne.ttl diff --git a/shacl12-compact-syntax/tests/valid/property-empty.shaclc b/shacl12-cs/tests/valid/property-empty.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/property-empty.shaclc rename to shacl12-cs/tests/valid/property-empty.shaclc diff --git a/shacl12-compact-syntax/tests/valid/property-empty.ttl b/shacl12-cs/tests/valid/property-empty.ttl similarity index 96% rename from shacl12-compact-syntax/tests/valid/property-empty.ttl rename to shacl12-cs/tests/valid/property-empty.ttl index 335e73fe..076922a6 100644 --- a/shacl12-compact-syntax/tests/valid/property-empty.ttl +++ b/shacl12-cs/tests/valid/property-empty.ttl @@ -1,18 +1,18 @@ -@base . -@prefix ex: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix sh: . -@prefix xsd: . - - - a owl:Ontology ; -. - -ex:TestShape - a sh:NodeShape ; - sh:property [ - sh:path ex:property ; - ] ; -. +@base . +@prefix ex: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix sh: . +@prefix xsd: . + + + a owl:Ontology ; +. + +ex:TestShape + a sh:NodeShape ; + sh:property [ + sh:path ex:property ; + ] ; +. diff --git a/shacl12-compact-syntax/tests/valid/property-not.shaclc b/shacl12-cs/tests/valid/property-not.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/property-not.shaclc rename to shacl12-cs/tests/valid/property-not.shaclc diff --git a/shacl12-compact-syntax/tests/valid/property-not.ttl b/shacl12-cs/tests/valid/property-not.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/property-not.ttl rename to shacl12-cs/tests/valid/property-not.ttl diff --git a/shacl12-compact-syntax/tests/valid/property-or-2.shaclc b/shacl12-cs/tests/valid/property-or-2.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/property-or-2.shaclc rename to shacl12-cs/tests/valid/property-or-2.shaclc diff --git a/shacl12-compact-syntax/tests/valid/property-or-2.ttl b/shacl12-cs/tests/valid/property-or-2.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/property-or-2.ttl rename to shacl12-cs/tests/valid/property-or-2.ttl diff --git a/shacl12-compact-syntax/tests/valid/property-or-3.shaclc b/shacl12-cs/tests/valid/property-or-3.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/property-or-3.shaclc rename to shacl12-cs/tests/valid/property-or-3.shaclc diff --git a/shacl12-compact-syntax/tests/valid/property-or-3.ttl b/shacl12-cs/tests/valid/property-or-3.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/property-or-3.ttl rename to shacl12-cs/tests/valid/property-or-3.ttl diff --git a/shacl12-compact-syntax/tests/valid/shapeRef.shaclc b/shacl12-cs/tests/valid/shapeRef.shaclc similarity index 100% rename from shacl12-compact-syntax/tests/valid/shapeRef.shaclc rename to shacl12-cs/tests/valid/shapeRef.shaclc diff --git a/shacl12-compact-syntax/tests/valid/shapeRef.ttl b/shacl12-cs/tests/valid/shapeRef.ttl similarity index 100% rename from shacl12-compact-syntax/tests/valid/shapeRef.ttl rename to shacl12-cs/tests/valid/shapeRef.ttl diff --git a/shacl12-overview/index.html b/shacl12-overview/index.html index 06876e98..488bdfaf 100644 --- a/shacl12-overview/index.html +++ b/shacl12-overview/index.html @@ -431,7 +431,7 @@

What's New in SHACL 1.2

- Inf Rules + Inf Rules @@ -550,7 +550,7 @@

defines SPARQL-related extensions of the SHACL
SHACL 1.2 Node Expressions
defines graph expressions used to determine focus nodes in SHACL
-
SHACL 1.2 Inference Rules
+
SHACL 1.2 Inference Rules
defines SHACL's methods of rule-based inference
SHACL 1.2 User Interfaces
defines SHACL's use for User Interface generation
From 0501859f1a94226668c4969994144218dd0ab092 Mon Sep 17 00:00:00 2001 From: Nicholas Car Date: Thu, 9 Oct 2025 21:57:36 +1000 Subject: [PATCH 2/3] minor updates to show use of definitions --- shacl12-profiling/index.html | 58 ++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/shacl12-profiling/index.html b/shacl12-profiling/index.html index 328693e6..b75e1276 100644 --- a/shacl12-profiling/index.html +++ b/shacl12-profiling/index.html @@ -174,7 +174,7 @@

Document Outline

- The introduction provides background concepts of profiling and states this specification's scope. + The introduction provides background concepts of profiling and states this specification's scope. It also provides term definitions and describes document conventions.

Sections 2 & 3 cover the two main elements within the stated scope. @@ -196,16 +196,16 @@

What is profiling?



- Oxford English dictionary, use of the word "profile" since the 17th century

- Within the world of data, a derived definition of "profile" consistent with the above is — + Within the world of data, a derived definition of "profile" consistent with the above is:

-

+

A summary or an extraction

In this definition, the essence of the English word is retained, since a summary or extraction of or from a data object may be an outline of it; for example, a 2D representation of a 3D spatial object. or a statistical summary of a dataset having lots of parts.

- By definition, SHACL constrains (RDF) data. Therefore, any data that is valid according to a shapes graph will be a profile of the data graph that was validated. If a shapes graph validates all elements of a data graph, the resulting valid data will be a "null" profile of the data graph, meaning it is identical to the original data graph. + By definition, SHACL constrains RDF data. Therefore, any data that is valid according to a shapes graph will be a profile of the data graph that was validated. If a shapes graph validates all elements of a data graph, the resulting valid data will be a "null" profile of the data graph, meaning it is identical to the original data graph.

The W3C's Profiles Vocabulary [[dx-prof]] has defined "data profiling" in the context of specifications or data specifications: @@ -230,14 +230,31 @@

Scope

Terminology

- Terminology used throughout this specification is taken from several sources: + Terminology used throughout this specification is either defined here or taken from one of several sources:

-
SHACL 1.2 Core specification
-
technical terms for SHACL and RDF, the latter from [[rdf12-concepts]]
Profiles Vocabulary [[dx-prof]]
defines general terms to do with profiling including the terms "profiling" & "profile"
+
SHACL 1.2 Core specification [shacl12-core]
+
technical terms for SHACL and RDF, the latter from [[rdf12-concepts]]
+
defined here
+
terms specialised for SHACL profiling
+

+ The general profiling terms include: + + specification + + , + + [data] profile + + , + + metadata + + . +

The SHACL & RDF terms include: @@ -391,21 +408,16 @@

Terminology

.

-

- The general profiling terms include: - - specification - - , - - [data] profile - - , - - metadata - - . -

+

+ The terms defined here: +

+
+
null profile
+
a profile of a specification in which implements some, and likely all the specification's rules, but no other rules
+
+

+ Warning: The definition of null profile may be up-streamed to an updated version of [[dx-prof]]. +

Document Conventions

@@ -596,7 +608,7 @@

Profile Hierarchies

Creating Null Profiles

- A "null" profile of a specification, created using SHACL, is a profile of that specification in which SHACL is used to implement some, and potentially all the specification's rules, but no other rules, in SHACL. + A null profile of a specification, created using SHACL, is a profile of that specification in which SHACL is used to implement some, and likely all the specification's rules, but no other rules, in SHACL.

The main purpose of creating a null profile of a specification using SHACL is to enable the testing of conformance to that specification by SHACL validation. This purpose exists because many RDF data models exist that have a model specification, perhaps an OWL model or only a natural-language document of a model, but do not provide a mechanism for data validation, such as a SHACL validator. From e0000386eeb100096e0b8d11aa27eef3c4941a14 Mon Sep 17 00:00:00 2001 From: Nicholas Car Date: Mon, 13 Oct 2025 13:33:45 +1000 Subject: [PATCH 3/3] update W3C logo --- README.md | 2 +- w3c-no-bars.svg | 18 ---------------- w3c.svg | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 19 deletions(-) delete mode 100644 w3c-no-bars.svg create mode 100644 w3c.svg diff --git a/README.md b/README.md index 14263623..5bdd0faf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![](w3c-no-bars.svg) +![](w3c.svg) # Data Shapes WG Repository diff --git a/w3c-no-bars.svg b/w3c-no-bars.svg deleted file mode 100644 index 7ff1b4c9..00000000 --- a/w3c-no-bars.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - image/svg+xml - - W3C - - - - - - - - - - \ No newline at end of file diff --git a/w3c.svg b/w3c.svg new file mode 100644 index 00000000..cbee95fc --- /dev/null +++ b/w3c.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file