Merge pull request #1537 from zazuko/shape-version

shape version specified only once
zazuko · Sep 27, 2024 · cd26d53 · cd26d53
2 parents e63ee83 + 805f370
commit cd26d53
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 6 deletions.
diff --git a/cli/lib/replaceShapesVersion.ts b/cli/lib/replaceShapesVersion.ts
@@ -0,0 +1,19 @@
+import type { Quad } from '@rdfjs/types'
+import { Context } from 'barnard59-core'
+
+export default function replaceShapesVersion(this: Context, version = 'v0.2.2') {
+  const prefix = 'https://cube.link/latest/'
+  const replacement = `https://cube.link/${version}/`
+  const { env } = this
+
+  return async function * (stream: AsyncIterable<Quad>) {
+    for await (const quad of stream) {
+      if (quad.predicate.equals(env.ns.code.imports) && quad.object.value.startsWith(prefix)) {
+        const replaced = quad.object.value.replace(prefix, replacement)
+        yield env.quad(quad.subject, quad.predicate, env.namedNode(replaced))
+      } else {
+        yield quad
+      }
+    }
+  }
+}
diff --git a/cli/lib/variables.ts b/cli/lib/variables.ts
@@ -28,6 +28,7 @@ declare module 'barnard59-core' {
     bnodeUuid: string
     metadata: DatasetExt
     shapesPath: string
+    shapesVersion: string
     sourceCube: NamedNode
     sourceEndpoint: NamedNode
     sourceGraph: NamedNode | undefined

diff --git a/cli/package.json b/cli/package.json
@@ -43,6 +43,7 @@
     "alcaeus": "^2",
     "aws-sdk": "^2.559.0",
     "barnard59": "^5.0.4",
+    "barnard59-core": "^6.0.0",
     "barnard59-base": "^2.4.2",
     "barnard59-cube": "^1.4.8",
     "barnard59-formats": "^4.0.0",
@@ -112,7 +113,6 @@
     "@types/sinon-chai": "^3.2.4",
     "@types/sparql-http-client": "^2",
     "@types/through2": "^2.0.36",
-    "barnard59-core": "^6.0.0",
     "chai": "^4.3.4",
     "dotenv": "^16.0.0",
     "dotenv-cli": "^5.0.0",

diff --git a/cli/pipelines/publish.ttl b/cli/pipelines/publish.ttl
@@ -21,6 +21,11 @@
           :name "executionUrl" ;
           :required false
         ] ;
+      :variable
+        [
+          :name "shapesVersion" ;
+          :required false
+        ] ;
     ] ;
   :steps
     [
@@ -94,6 +99,7 @@
       :stepList
         (
           <#open>
+          <#replace>
           <#imports>
         )
     ] .
@@ -107,6 +113,15 @@
   code:arguments ( 'shapesPath'^^:VariableName )
 .
 
+<#replace> a :Step ;
+  code:implementedBy
+    [
+      a code:EcmaScript ;
+      code:link <file:../lib/replaceShapesVersion#default>
+    ] ;
+  code:arguments ( 'shapesVersion'^^:VariableName )
+.
+
 <#imports> a :Step ;
   code:implementedBy
     [

diff --git a/cli/shapes-all.ttl b/cli/shapes-all.ttl
@@ -6,11 +6,11 @@ prefix code: <https://code.described.at/>
 ] .
 
 [
-    code:imports <https://cube.link/v0.2.2/shape/profile-opendataswiss-lindas> ;
+    code:imports <https://cube.link/latest/shape/profile-opendataswiss-lindas> ;
     code:extension "ttl" ;
 ] .
 
 [
-    code:imports <https://cube.link/v0.2.2/shape/profile-visualize> ;
+    code:imports <https://cube.link/latest/shape/profile-visualize> ;
     code:extension "ttl" ;
 ] .
diff --git a/cli/shapes-default.ttl b/cli/shapes-default.ttl
@@ -6,6 +6,6 @@ prefix code: <https://code.described.at/>
 ] .
 
 [
-    code:imports <https://cube.link/v0.2.2/shape/standalone-constraint-constraint> ;
+    code:imports <https://cube.link/latest/shape/standalone-constraint-constraint> ;
     code:extension "ttl" ;
 ] .
diff --git a/cli/shapes-opendataswiss.ttl b/cli/shapes-opendataswiss.ttl
@@ -6,6 +6,6 @@ prefix code: <https://code.described.at/>
 ] .
 
 [
-    code:imports <https://cube.link/v0.2.2/shape/profile-opendataswiss-lindas> ;
+    code:imports <https://cube.link/latest/shape/profile-opendataswiss-lindas> ;
     code:extension "ttl" ;
 ] .
diff --git a/cli/shapes-visualize.ttl b/cli/shapes-visualize.ttl
@@ -6,6 +6,6 @@ prefix code: <https://code.described.at/>
 ] .
 
 [
-    code:imports <https://cube.link/v0.2.2/shape/profile-visualize> ;
+    code:imports <https://cube.link/latest/shape/profile-visualize> ;
     code:extension "ttl" ;
 ] .