Infer default rdfContext from rdfsClass

NoelDeMartin · Mar 1, 2024 · 7283e11 · 7283e11
1 parent 161e468
commit 7283e11
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 
 - `SolidTypeRegistration.forClass` is now declared as an array.
+- Default `rdfContext` resolution changed to prioritize the vocab used in `rdfsClass` if present.
 
 ## [v0.5.2](https://github.com/NoelDeMartin/soukai-solid/releases/tag/v0.5.2) - 2023-11-03
 

diff --git a/src/models/SolidModel.test.ts b/src/models/SolidModel.test.ts
@@ -193,6 +193,18 @@ describe('SolidModel', () => {
         expect(fields.title?.rdfPropertyAliases).toEqual([]);
     });
 
+    it('defaults to rdfsClass context if default rdfContext is missing', () => {
+        class StubModel extends SolidModel {
+
+            public static rdfsClass = 'http://xmlns.com/foaf/0.1/Stub';
+
+        }
+
+        bootModels({ StubModel });
+
+        expect(StubModel.rdfContexts.default).toEqual('http://xmlns.com/foaf/0.1/');
+    });
+
     it('defaults to first context if rdfProperty is missing', () => {
         class StubModel extends SolidModel {
 

diff --git a/src/models/SolidModel.ts b/src/models/SolidModel.ts
@@ -19,6 +19,7 @@ import {
     shortId,
     stringToSlug,
     tap,
+    toString,
     urlClean,
     urlParentDirectory,
     urlParse,
@@ -483,19 +484,30 @@ export class SolidModel extends SolidModelBase {
             ...initialRdfContexts,
             ...Object.getOwnPropertyDescriptor(modelClass, 'rdfContexts')?.value ?? {} as Record<string, string>,
         };
+        const buildInRdfContexts = {
+            crdt: 'https://vocab.noeldemartin.com/crdt/',
+            foaf: 'http://xmlns.com/foaf/0.1/',
+            ldp: 'http://www.w3.org/ns/ldp#',
+            pim: 'http://www.w3.org/ns/pim/space#',
+            posix: 'http://www.w3.org/ns/posix/stat#',
+            purl: 'http://purl.org/dc/terms/',
+            rdf: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+            rdfs: 'http://www.w3.org/2000/01/rdf-schema#',
+            schema: 'https://schema.org/',
+            solid: 'http://www.w3.org/ns/solid/terms#',
+            xsd: 'http://www.w3.org/2001/XMLSchema#',
+        };
+        const rdfContextFromClass = () => Object.values({ ...rdfContexts, ...buildInRdfContexts }).find(
+            rdfContext => modelClass.rdfsClass?.startsWith(toString(rdfContext)),
+        );
 
-        rdfContexts.default ??= rdfContext ?? Object.values(rdfContexts).find(url => !!url);
+        rdfContexts.default ??= rdfContext ?? rdfContextFromClass() ?? Object.values(rdfContexts).find(url => !!url);
 
         if (!parentModelClass) {
             return {
                 ...rdfContexts,
                 default: rdfContexts.default ?? 'http://www.w3.org/ns/solid/terms#',
-                solid: 'http://www.w3.org/ns/solid/terms#',
-                crdt: 'https://vocab.noeldemartin.com/crdt/',
-                ldp: 'http://www.w3.org/ns/ldp#',
-                purl: 'http://purl.org/dc/terms/',
-                rdf: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
-                rdfs: 'http://www.w3.org/2000/01/rdf-schema#',
+                ...buildInRdfContexts,
             };
         }