updates to latest Artifact Generator, new common vocabs, updated JS V…

…ocabTerm dependency (#170)
inrupt · Oct 26, 2023 · bf425f0 · bf425f0
1 parent de4de00
commit bf425f0
Show file tree

Hide file tree

Showing 42 changed files with 248 additions and 220 deletions.
diff --git a/common-rdf/vocab-common-rdf.yml b/common-rdf/vocab-common-rdf.yml
@@ -18,7 +18,7 @@
 #
 
 artifactName: vocab-common-rdf
-artifactGeneratorVersion: 3.0.0
+artifactGeneratorVersion: 3.1.1
 
 versioning:
   type: git
@@ -307,7 +307,7 @@ artifactToGenerate:
     artifactDirectoryName: TypeScript-SolidCommonVocab
     sourceFileExtension: ts
 
-    solidCommonVocabVersion: "^1.0.0"
+    solidCommonVocabVersion: "^1.4.0"
     rdfjsTypesVersion: "^1.0.1"
     rdfjsImplVersion: "^1.1.0"
     templateInternal: solidCommonVocabDependent/typescript/rdfjsRdfDataFactory/vocab.hbs
@@ -348,7 +348,7 @@ artifactToGenerate:
     artifactDirectoryName: TypeScript-SolidCommonVocab-RdfDataFactory
     sourceFileExtension: ts
 
-    solidCommonVocabVersion: "^1.0.0"
+    solidCommonVocabVersion: "^1.4.0"
     rdfjsTypesVersion: "^1.0.1"
     rdfjsImplVersion: "^1.1.0"
     templateInternal: solidCommonVocabDependent/typescript/rdfjsRdfDataFactory/vocab.hbs
@@ -646,6 +646,10 @@ vocabList:
       # Alternative URL for this vocab...
 #      - http://dublincore.org/2012/06/14/dcterms.ttl
 
+  - nameAndPrefixOverride: dcam
+    inputResources:
+      - http://purl.org/dc/dcam/
+
   #
   # Activity Streams 2.0 seems a little bit strange - i.e., it's namespace IRI
   # does not resolve to RDF (see below), and the best RDF definition (that we
@@ -844,13 +848,13 @@ vocabList:
 #      - https://w3id.org/security#
 
 
-  - inputResources:
+  - nameAndPrefixOverride: jsonld
+    inputResources:
       - http://www.w3.org/ns/json-ld#
-    nameAndPrefixOverride: jsonld
 
-  - inputResources:
+  - nameAndPrefixOverride: earl
+    inputResources:
       - http://www.w3.org/ns/earl#
-    nameAndPrefixOverride: earl
 
   - inputResources:
       - http://www.w3.org/2003/06/sw-vocab-status/ns#
@@ -878,9 +882,9 @@ vocabList:
     inputResources:
       - https://raw.githubusercontent.com/UKGovLD/publishing-statistical-data/master/specs/src/main/vocab/sdmx-dimension.ttl
 
-  - inputResources:
+  - nameAndPrefixOverride: sioc
+    inputResources:
       - http://rdfs.org/sioc/ns#
-    nameAndPrefixOverride: sioc
     ignoreNonVocabTerms: true
 
   - inputResources:
@@ -890,9 +894,9 @@ vocabList:
     vocabAcceptHeaderOverride: text/turtle
     ignoreNonVocabTerms: true
 
-  - nameAndPrefixOverride: time
-    inputResources:
+  - inputResources:
       - http://www.w3.org/2006/time#
+    nameAndPrefixOverride: time
 
   - inputResources:
       - http://www.w3.org/ns/locn#
@@ -913,9 +917,9 @@ vocabList:
     ignoreNonVocabTerms: true
 
   - descriptionFallback: Creative Commons (licensing vocabulary)
+    nameAndPrefixOverride: cc
     inputResources:
       - http://creativecommons.org/ns#
-    nameAndPrefixOverride: cc
 
   # GeoNames seems to still be serving the v3.1 version from their namespace
   # URI, even though they've moved to v3.3 (although resolving their v3.3 vocab
@@ -924,26 +928,26 @@ vocabList:
   # updated (as of v3.2) namespace os 'https://'.
   # So, as an experiment, I've overridden the prefix from 'gn' to include the
   # version number.
-  - inputResources:
+  - nameAndPrefixOverride: gn_v3_1
+    inputResources:
       - https://www.geonames.org/ontology#
-    nameAndPrefixOverride: gn_v3_1
     ignoreNonVocabTerms: true
 
   # Here we try and provide the latest version of GeoNames (but although the
   # URI states v3.3, it seems to still (as of April 2022) be serving v3.2).
-  - inputResources:
+  - nameAndPrefixOverride: gn_v3_2
+    inputResources:
       - https://www.geonames.org/ontology/ontology_v3.3.rdf
-    nameAndPrefixOverride: gn_v3_2
     ignoreNonVocabTerms: true
 
   # This NeoGeo vocab is pulled in by GeoNames via 'owl:import'.
-  - inputResources:
+  - nameAndPrefixOverride: neogeo
+    inputResources:
       - http://geovocab.org/spatial
-    nameAndPrefixOverride: neogeo
 
-  - inputResources:
+  - nameAndPrefixOverride: qudt
+    inputResources:
       - http://qudt.org/schema/qudt/
-    nameAndPrefixOverride: qudt
     ignoreNonVocabTerms: true
 
   - inputResources:
@@ -953,58 +957,70 @@ vocabList:
       - https://w3id.org/dpv/dpv-pd#
 
   - inputResources:
+      - https://w3id.org/dpv/dpv-tech#
+
+  - inputResources:
+      - https://w3id.org/oac#
+
+  - inputResources:
+      - https://w3id.org/plasma#
+
+  - nameAndPrefixOverride: bibo
+    inputResources:
       - http://purl.org/ontology/bibo/
-    nameAndPrefixOverride: bibo
     ignoreNonVocabTerms: true
     vocabContentTypeHeaderOverride: "application/rdf+xml"
 
   - inputResources:
-      - https://ontologies.semanticarts.com/o/gistCore11.1.0
+      - https://w3id.org/semanticarts/ontology/gistCore
 
-  - inputResources:
+  - nameAndPrefixOverride: auto_vc
+    inputResources:
       - https://spec.edmcouncil.org/auto/ontology/VC/VehicleCore/
-    nameAndPrefixOverride: auto_vc
     vocabAcceptHeaderOverride: text/turtle
     ignoreNonVocabTerms: true
 
-  - inputResources:
+  - nameAndPrefixOverride: auto_vs
+    inputResources:
       - https://spec.edmcouncil.org/auto/ontology/VS/VehicleSignals/
-    nameAndPrefixOverride: auto_vs
     vocabAcceptHeaderOverride: text/turtle
     ignoreNonVocabTerms: true
 
-  - inputResources:
+  - nameAndPrefixOverride: sm
+    inputResources:
       - http://www.omg.org/techprocess/ab/SpecificationMetadata/
-    nameAndPrefixOverride: sm
     ignoreNonVocabTerms: true
 
-  - inputResources:
-      - http://www.w3.org/ns/adms#
     # Changes noticed in May 2023 where the VANN triples were removed for some
     # reason - meaning we now need to provide a preferred prefix for this
     # vocab (which is a shame!).
-    nameAndPrefixOverride: adms
+  - nameAndPrefixOverride: adms
+    inputResources:
+      - http://www.w3.org/ns/adms#
 
-  - inputResources:
+  - nameAndPrefixOverride: ore
+    inputResources:
       - http://www.openarchives.org/ore/terms/
-    nameAndPrefixOverride: ore
 
-  - inputResources:
+  - nameAndPrefixOverride: wfprov
+    inputResources:
       - http://purl.org/wf4ever/wfprov#
-    nameAndPrefixOverride: wfprov
 
-  - inputResources:
+
+  - nameAndPrefixOverride: wfdesc
+    inputResources:
       - http://purl.org/wf4ever/wfdesc#
-    nameAndPrefixOverride: wfdesc
 
-  - inputResources:
+
+  - nameAndPrefixOverride: ro
+    inputResources:
       - http://purl.org/wf4ever/ro#
-    nameAndPrefixOverride: ro
+
 
   #
   #  This vocab still (2023-04) has the known bug that it uses relative IRIs,
   # which blows up because its actual namespace IRI is HTTP-based, yet when
-  # dereferenced the server redirects all lookups to HTTPS IRIs...
+  # de-referenced the server redirects all lookups to HTTPS IRIs...
   #  But the real problem is actually in the version of 'fetch-lite' (v2.1.2)
   # the Artifact Generator currently uses, specifically the code here:
   #   @rdfjs/fetch-lite/lib/attachQuadStream.js
@@ -1019,3 +1035,15 @@ vocabList:
 #  - inputResources:
 #      - https://www.w3.org/ns/spec
 #    namespaceIriOverride: http://www.w3.org/ns/spec
+
+  - inputResources:
+      - http://rdf-vocabulary.ddialliance.org/xkos#
+
+  #
+  # The Profiles Vocabulary namespace 'http://www.w3.org/ns/dx/prof/' only
+  # resolves to an HTML page (which points to the Turtle).
+  #
+  - nameAndPrefixOverride: prof
+    inputResources:
+      - https://www.w3.org/TR/dx-prof/rdf/prof.ttl
+    ignoreNonVocabTerms: true
diff --git a/inrupt-rdf/ClientApplication/CopyOfVocab/inrupt-sample-client-app.ttl b/inrupt-rdf/ClientApplication/CopyOfVocab/inrupt-sample-client-app.ttl
@@ -9,7 +9,7 @@ prefix dalicc:   <http://dalicc.net/licenselibrary/>
 
 prefix inrupt_gen: <https://w3id.org/inrupt/namespace/vocab/tool/artifact_generator/>
 
-prefix inrupt_client_app: <https://inrupt.com/vocab/sample/client-app#>
+prefix inrupt_client_app: <https://w3id.org/inrupt/namespace/vocab/sample/client-app/>
 
 #
 # By marking our vocabulary as an Inrupt Artifact Generator ontology (i.e., inrupt_gen:Ontology)
@@ -18,14 +18,14 @@ prefix inrupt_client_app: <https://inrupt.com/vocab/sample/client-app#>
 #
 inrupt_client_app: a owl:Ontology , inrupt_gen:Ontology ;
     owl:versionInfo "0.0.1" ;
-    owl:versionIRI <https://inrupt.com/vocab/sample/client-app/0.0.1> ;
+    owl:versionIRI <https://w3id.org/inrupt/namespace/vocab/sample/client-app/0.0.1> ;
     dcterms:title "Sample Inrupt client application vocabulary"@en ;
     dcterms:description "Just a sample of what a client application vocabulary might look like."@en ;
     dcterms:creator <https://w3id.org/inrupt/namespace/webid/inrupt> ;
     dcterms:issued "2019/11/08"^^xsd:date ;
     dcterms:license dalicc:MIT ;
     vann:preferredNamespacePrefix "inrupt_client_app" ;
-    vann:preferredNamespaceUri "https://inrupt.com/vocab/sample/client-app#" .
+    vann:preferredNamespaceUri "https://w3id.org/inrupt/namespace/vocab/sample/client-app/" .
 
 
 inrupt_client_app:sampleProperty a rdf:Property ;

diff --git a/inrupt-rdf/ClientApplication/vocab-inrupt-client-application.yml b/inrupt-rdf/ClientApplication/vocab-inrupt-client-application.yml
@@ -11,7 +11,7 @@
 # list file.
 #
 artifactName: vocab-inrupt-client-application
-artifactGeneratorVersion: 3.0.0
+artifactGeneratorVersion: 3.1.1
 
 versioning:
   type: git
@@ -78,7 +78,7 @@ artifactToGenerate:
     artifactDirectoryName: TypeScript-SolidCommonVocab
     sourceFileExtension: ts
 
-    solidCommonVocabVersion: "^1.0.0"
+    solidCommonVocabVersion: "^1.4.0"
     rdfjsTypesVersion: "^1.0.1"
     rdfjsImplVersion: "^1.1.0"
     templateInternal: solidCommonVocabDependent/typescript/rdfjsRdfDataFactory/vocab.hbs
@@ -119,7 +119,7 @@ artifactToGenerate:
     artifactDirectoryName: TypeScript-SolidCommonVocab-RdfDataFactory
     sourceFileExtension: ts
 
-    solidCommonVocabVersion: "^1.0.0"
+    solidCommonVocabVersion: "^1.4.0"
     rdfjsTypesVersion: "^1.0.1"
     rdfjsImplVersion: "^1.1.0"
     templateInternal: solidCommonVocabDependent/typescript/rdfjsRdfDataFactory/vocab.hbs

diff --git a/inrupt-rdf/Core/CopyOfVocab/inrupt-best-practice-core.ttl b/inrupt-rdf/Core/CopyOfVocab/inrupt-best-practice-core.ttl
@@ -26,7 +26,7 @@ inrupt_bp_core:_Ontology a owl:Ontology , inrupt_gen:Ontology ;
 
 inrupt_bp_core:_PrefixDeclaration a sh:PrefixDeclaration ;
     sh:prefix "inrupt_bp_core" ;
-    sh:namespace "https://w3id.org/inrupt/vocab/tool/bestPractice/core/" .
+    sh:namespace "https://w3id.org/inrupt/vocab/tool/bestPractice/core/"^^xsd:anyURI .
 
 #
 # Terms...

diff --git a/inrupt-rdf/Core/CopyOfVocab/inrupt-best-practice-vocab.ttl b/inrupt-rdf/Core/CopyOfVocab/inrupt-best-practice-vocab.ttl
@@ -28,7 +28,7 @@ inrupt_bp_vocab:vocabulary a owl:Ontology , inrupt_gen:Ontology ;
 
 inrupt_bp_vocab:_PrefixDeclaration a sh:PrefixDeclaration ;
     sh:prefix "inrupt_bp_vocab" ;
-    sh:namespace "https://w3id.org/inrupt/vocab/tool/bestPractice/vocab/" .
+    sh:namespace "https://w3id.org/inrupt/vocab/tool/bestPractice/vocab/"^^xsd:anyURI .
 
 #
 # Categories of Best Practices...

diff --git a/inrupt-rdf/Core/CopyOfVocab/inrupt-common.ttl b/inrupt-rdf/Core/CopyOfVocab/inrupt-common.ttl
@@ -70,7 +70,7 @@ inrupt_common:acronym rdfs:subPropertyOf skosxl:labelRelation ;
     schema:domainIncludes skosxl:Label ;
     schema:rangeIncludes skosxl:Label .
 
-inrupt_common:acronymExpandedForm a rdfs:Property ;
+inrupt_common:acronymExpandedForm a rdf:Property ;
     rdfs:isDefinedBy inrupt_common: ;
     rdfs:label "Acronym expanded form"@en ;
     rdfs:label "Forma expandida de siglas"@es ;

diff --git a/inrupt-rdf/Core/CopyOfVocab/inrupt-consent.ttl b/inrupt-rdf/Core/CopyOfVocab/inrupt-consent.ttl
@@ -13,9 +13,9 @@ prefix dalicc:   <http://dalicc.net/licenselibrary/>
 prefix gconsent:       <https://w3id.org/GConsent#>
 prefix inrupt_gen:     <https://w3id.org/inrupt/namespace/vocab/tool/artifact_generator/>
 
-prefix inrupt_consent: <https://inrupt.com/vocab/consent#>
+prefix inrupt_consent: <https://w3id.org/inrupt/namespace/vocab/consent/>
 
-prefix project:        <https://data.company.com/vocab/apps/project#>
+prefix project:        <https://data.company.com/vocab/apps/project/>
 
 #
 # This vocab doesn't exist yet, but I've requested an update to the WebID draft spec (from Henry Story on the Solid
@@ -29,13 +29,13 @@ prefix webid: <https://www.w3.org/ns/webid#>
 #
 inrupt_consent: a owl:Ontology , inrupt_gen:Ontology ;
 	owl:versionInfo "0.0.1" ;
-    owl:versionIRI <https://inrupt.com/vocab/consent/0.0.1> ;
+    owl:versionIRI <https://w3id.org/inrupt/namespace/vocab/consent/0.0.1> ;
 	dcterms:creator <https://w3id.org/inrupt/namespace/webid/inrupt> ;
 	dcterms:issued "2019/01/01"^^xsd:date ;
  	dcterms:title "Inrupt Consent vocabulary"@en ;
 	dcterms:description "Consent vocabulary defining Inrupt-specific terms, especially terms that provide context"@en ;
 	vann:preferredNamespacePrefix "inrupt_consent" ;
-	vann:preferredNamespaceUri "https://inrupt.com/vocab/consent#" ;
+	vann:preferredNamespaceUri "https://w3id.org/inrupt/namespace/vocab/consent/" ;
 	dcterms:license dalicc:MIT .
 
 

diff --git a/inrupt-rdf/Core/CopyOfVocab/inrupt-fair-principle.ttl b/inrupt-rdf/Core/CopyOfVocab/inrupt-fair-principle.ttl
@@ -28,7 +28,7 @@ inrupt_fair:_Ontology a owl:Ontology , inrupt_gen:Ontology ;
 
 inrupt_fair:_PrefixDeclaration a sh:PrefixDeclaration ;
     sh:prefix "inrupt_fair" ;
-    sh:namespace "https://w3id.org/inrupt/vocab/tool/bestPractice/fair/" .
+    sh:namespace "https://w3id.org/inrupt/vocab/tool/bestPractice/fair/"^^xsd:anyURI .
 
 #
 # Terms...

diff --git a/inrupt-rdf/Core/CopyOfVocab/inrupt-meta-client.ttl b/inrupt-rdf/Core/CopyOfVocab/inrupt-meta-client.ttl
@@ -11,21 +11,21 @@ prefix prov:     <http://www.w3.org/ns/prov#>
 prefix dalicc:   <http://dalicc.net/licenselibrary/>
 
 prefix inrupt_gen:         <https://w3id.org/inrupt/namespace/vocab/tool/artifact_generator/>
-prefix inrupt_meta_client: <https://inrupt.com/vocab/meta/client#>
+prefix inrupt_meta_client: <https://w3id.org/inrupt/namespace/vocab/meta/client/>
 
 #
 # Describe our vocabulary - i.e., an English description, its version, who created it, its
 # suggested prefix, its license, etc.
 #
 inrupt_meta_client: a owl:Ontology , inrupt_gen:Ontology ;
 	owl:versionInfo "0.0.1" ;
-	owl:versionIRI <https://inrupt.com/vocab/meta/client/0.0.1> ;
+	owl:versionIRI <https://w3id.org/inrupt/namespace/vocab/meta/client/0.0.1> ;
 	dcterms:title "Metadata Client Vocabulary"@en ;
 	dcterms:description "This vocabulary provides client metadata terms (e.g., classes, properties and text strings (e.g., informative labels or error messages)) used by clients at runtime."@en ;
 	dcterms:creator <https://w3id.org/inrupt/namespace/webid/inrupt> ;
 	dcterms:issued "2019/08/19"^^xsd:date ;
 	vann:preferredNamespacePrefix "inrupt_meta_client" ;
-	vann:preferredNamespaceUri "https://inrupt.com/vocab/meta/client#" ;
+	vann:preferredNamespaceUri "https://w3id.org/inrupt/namespace/vocab/meta/client/" ;
 	dcterms:license dalicc:MIT .