Merge remote-tracking branch 'origin/main' into targets-limits

zazuko · Sep 30, 2024 · a3575ad · a3575ad
2 parents ab75afa + 2a93676
commit a3575ad
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
-FROM docker.io/library/node:20 as respec
+FROM docker.io/library/node:22 AS respec
 
-# install some required dependencies to run Puppeteer (for ReSpec)
+# Install some required dependencies to run Puppeteer (for ReSpec)
 RUN apt-get update && apt-get install -y \
   chromium \
   fonts-liberation \
@@ -39,19 +39,19 @@ WORKDIR /app
 COPY package.json package-lock.json ./
 RUN npm install
 COPY . .
-# start a server locally, and generate the ReSpec HTML file
+# Start a server locally, and generate the ReSpec HTML file
 RUN npm run build
 
 # Final Docker image
-FROM docker.io/library/node:20-alpine
+FROM docker.io/library/node:22-alpine
 
 EXPOSE 8080
 
 WORKDIR /app
 
 RUN apk add --no-cache tini
 
-# install Trifid
+# Install Trifid
 ENV NODE_ENV=production
 COPY package.json package-lock.json ./
 RUN npm install

diff --git a/test/standalone-constraint-constraint/invalid.annotation-keyDimensions.ttl.approved.txt b/test/standalone-constraint-constraint/invalid.annotation-keyDimensions.ttl.approved.txt
@@ -19,7 +19,7 @@ _:report a sh:ValidationReport ;
 		sh:resultSeverity sh:Violation ;
 		sh:sourceConstraintComponent sh:XoneConstraintComponent ;
 		sh:sourceShape [
-			sh:path _:b706 ;
+			sh:path _:b710 ;
 			sh:xone (
 				[
 					sh:class <https://cube.link/meta/KeyDimension> ;
@@ -36,11 +36,11 @@ _:report a sh:ValidationReport ;
 		] ;
 		sh:focusNode _:b7 ;
 		sh:value _:b9 ;
-		sh:resultPath _:b706 ;
+		sh:resultPath _:b710 ;
 	] ;
 	sh:conforms false .
 
-_:b706 rdf:first sh:path ;
+_:b710 rdf:first sh:path ;
 	rdf:rest (
 		[
 			sh:inversePath sh:path ;

diff --git a/test/standalone-constraint-constraint/invalid.dimensionRelation-multipleDcType.ttl b/test/standalone-constraint-constraint/invalid.dimensionRelation-multipleDcType.ttl
@@ -40,6 +40,7 @@ PREFIX dcterms: <http://purl.org/dc/terms/>
         ] ;
     sh:property
         [
+            a cube:MeasureDimension ;
             sh:datatype xsd:decimal ;
             sh:path <dimension> ;
             schema:name "dimension" ;

diff --git a/test/standalone-constraint-constraint/invalid.malformedList.ttl.approved.txt b/test/standalone-constraint-constraint/invalid.malformedList.ttl.approved.txt
@@ -10,7 +10,7 @@ _:report a sh:ValidationReport ;
 		rdf:type sh:ValidationResult ;
 		sh:resultSeverity sh:Violation ;
 		sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
-		sh:sourceShape _:b743 ;
+		sh:sourceShape _:b747 ;
 		sh:focusNode _:b6 ;
 		sh:resultPath rdf:rest ;
 		sh:resultMessage "list node needs exactly one rdf:rest" ;
@@ -41,7 +41,7 @@ _:report a sh:ValidationReport ;
 				rdf:type sh:ValidationResult ;
 				sh:resultSeverity sh:Violation ;
 				sh:sourceConstraintComponent sh:MinCountConstraintComponent ;
-				sh:sourceShape _:b743 ;
+				sh:sourceShape _:b747 ;
 				sh:focusNode _:b6 ;
 				sh:resultPath rdf:rest ;
 				sh:resultMessage "list node needs exactly one rdf:rest" ;
@@ -60,7 +60,7 @@ _:report a sh:ValidationReport ;
 	] ;
 	sh:conforms false .
 
-_:b743 sh:path rdf:rest ;
+_:b747 sh:path rdf:rest ;
 	sh:maxCount 1 ;
 	sh:minCount 1 ;
 	sh:message "list node needs exactly one rdf:rest" .
diff --git a/test/standalone-constraint-constraint/valid.dimensionRelation.ttl b/test/standalone-constraint-constraint/valid.dimensionRelation.ttl
@@ -41,6 +41,7 @@ PREFIX dcterms: <http://purl.org/dc/terms/>
         ] ;
     sh:property
         [
+            a cube:MeasureDimension ;
             sh:datatype xsd:decimal ;
             sh:path <dimension> ;
             schema:name "dimension" ;

diff --git a/validation/standalone-constraint-constraint.ttl b/validation/standalone-constraint-constraint.ttl
@@ -202,6 +202,15 @@
                     sh:minCount 1 ;
                     sh:class cube:Constraint ;
                     sh:message "value of meta:relatesTo must be a cube dimension" ;
+                ],
+                [
+                    sh:path
+                        (
+                            meta:relatesTo
+                            [ sh:inversePath sh:path ]
+                        ) ;
+                    sh:class cube:MeasureDimension ;
+                    sh:message "value of meta:relatesTo must point to measure dimension " ;
                 ] ;
     ] ;
 .