Fix shorthand default rdfContext inference

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

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/models/SolidModel.test.ts b/src/models/SolidModel.test.ts
@@ -194,15 +194,22 @@ describe('SolidModel', () => {
     });
 
     it('defaults to rdfsClass context if default rdfContext is missing', () => {
-        class StubModel extends SolidModel {
+        class A extends SolidModel {
 
-            public static rdfsClass = 'http://xmlns.com/foaf/0.1/Stub';
+            public static rdfsClass = 'http://xmlns.com/foaf/0.1/A';
 
         }
 
-        bootModels({ StubModel });
+        class B extends SolidModel {
+
+            public static rdfsClass = 'foaf:B';
+
+        }
+
+        bootModels({ A, B });
 
-        expect(StubModel.rdfContexts.default).toEqual('http://xmlns.com/foaf/0.1/');
+        expect(A.rdfContexts.default).toEqual('http://xmlns.com/foaf/0.1/');
+        expect(B.rdfContexts.default).toEqual('http://xmlns.com/foaf/0.1/');
     });
 
     it('defaults to first context if rdfProperty is missing', () => {

diff --git a/src/models/SolidModel.ts b/src/models/SolidModel.ts
@@ -497,17 +497,19 @@ export class SolidModel extends SolidModelBase {
             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)),
-        );
+        const rdfContextFromClass = () => Object.entries({ ...rdfContexts, ...buildInRdfContexts }).find(
+            ([shorthand, url]) =>
+                modelClass.rdfsClass?.startsWith(`${shorthand}:`) ||
+                modelClass.rdfsClass?.startsWith(toString(url)),
+        )?.[1];
 
         rdfContexts.default ??= rdfContext ?? rdfContextFromClass() ?? Object.values(rdfContexts).find(url => !!url);
 
         if (!parentModelClass) {
             return {
                 ...rdfContexts,
-                default: rdfContexts.default ?? 'http://www.w3.org/ns/solid/terms#',
                 ...buildInRdfContexts,
+                default: rdfContexts.default ?? 'http://www.w3.org/ns/solid/terms#',
             };
         }