removes embedded json-ld context

tpluscode · tpluscode · commit 592ea1a5c1e4 · 2019-05-19T16:24:17.000+02:00
diff --git a/src/Constants.ts b/src/Constants.ts
@@ -47,59 +47,8 @@ export type HydraTerm = 'apiDocumentation' |
     'object';
 
 export namespace Core {
-    export const Context = {
-        hydra: 'http://www.w3.org/ns/hydra/core#',
-        apiDocumentation: 'hydra:apiDocumentation',
-        ApiDocumentation: 'hydra:ApiDocumentation',
-        title: 'hydra:title',
-        description: 'hydra:description',
-        entrypoint: {'@id': 'hydra:entrypoint', '@type': '@id'},
-        supportedClass: {'@id': 'hydra:supportedClass', '@type': '@vocab'},
-        Class: 'hydra:Class',
-        supportedProperty: {'@id': 'hydra:supportedProperty', '@type': '@id'},
-        SupportedProperty: 'hydra:SupportedProperty',
-        property: {'@id': 'hydra:property', '@type': '@vocab'},
-        required: 'hydra:required',
-        readonly: 'hydra:readonly',
-        writeonly: 'hydra:writeonly',
-        supportedOperation: {'@id': 'hydra:supportedOperation', '@type': '@id'},
-        Operation: 'hydra:SupportedOperation',
-        CreateResourceOperation: 'hydra:CreateResourceOperation',
-        ReplaceResourceOperation: 'hydra:ReplaceResourceOperation',
-        DeleteResourceOperation: 'hydra:DeleteResourceOperation',
-        method: 'hydra:method',
-        expects: {'@id': 'hydra:expects', '@type': '@vocab'},
-        returns: {'@id': 'hydra:returns', '@type': '@vocab'},
-        statusCodes: {'@id': 'hydra:statusCodes', '@type': '@id'},
-        StatusCodeDescription: 'hydra:StatusCodeDescription',
-        statusCode: 'hydra:statusCode',
-        Error: 'hydra:Error',
-        Resource: 'hydra:Resource',
-        operation: 'hydra:operation',
-        Collection: 'hydra:Collection',
-        member: {'@id': 'hydra:member', '@type': '@id'},
-        search: 'hydra:search',
-        freetextQuery: 'hydra:freetextQuery',
-        PagedCollection: 'hydra:PagedCollection',
-        totalItems: 'hydra:totalItems',
-        itemsPerPage: 'hydra:itemsPerPage',
-        firstPage: {'@id': 'hydra:firstPage', '@type': '@id'},
-        lastPage: {'@id': 'hydra:lastPage', '@type': '@id'},
-        nextPage: {'@id': 'hydra:nextPage', '@type': '@id'},
-        previousPage: {'@id': 'hydra:previousPage', '@type': '@id'},
-        Link: 'hydra:Link',
-        TemplatedLink: 'hydra:TemplatedLink',
-        IriTemplate: 'hydra:IriTemplate',
-        template: 'hydra:template',
-        mapping: 'hydra:mapping',
-        IriTemplateMapping: 'hydra:IriTemplateMapping',
-        variable: 'hydra:variable',
-        collection: 'hydra:collection',
-        manages: 'hydra:manages',
-    };
-
     export function Vocab(term: HydraTerm) {
-        return Core.Context.hydra + term;
+        return 'http://www.w3.org/ns/hydra/core#' + term;
     }
 }
 
diff --git a/src/Resources/Resource.ts b/src/Resources/Resource.ts
@@ -36,8 +36,8 @@ export default class implements IResource {
         isProcessed.set(this, val);
     }
 
-    public compact(context: any = null) {
-        return jsonld.compact(this, context || Core.Context);
+    public compact(context: any = 'https://www.w3.org/ns/hydra/core') {
+        return jsonld.compact(this, context);
     }
 
     public _get(property: string) {
diff --git a/tests/Resources/Class-spec.ts b/tests/Resources/Class-spec.ts
@@ -1,14 +1,14 @@
 import {promises as jsonld} from 'jsonld';
-import {Core} from '../../src/Constants';
 import {Mixin} from '../../src/Resources/Mixins/Class';
 import Resource from '../../src/Resources/Resource';
+import Context from '../test-objects/Context';
 
 class Class extends Mixin(Resource) {}
 
 describe('Class', () => {
 
     const hydraClass = {
-        '@context': Core.Context,
+        '@context': Context,
         '@id': 'http://example.com/vocab#SomeClass',
         'supportedOperation': [{}],
         'supportedProperty': [{}],
diff --git a/tests/Resources/DocumentedResource-spec.ts b/tests/Resources/DocumentedResource-spec.ts
@@ -1,14 +1,14 @@
 import {promises as jsonld} from 'jsonld';
-import {Core} from '../../src/Constants';
 import {Mixin} from '../../src/Resources/Mixins/DocumentedResource';
 import Resource from '../../src/Resources/Resource';
+import Context from '../test-objects/Context';
 
 class DocumentedResource extends Mixin(Resource) {}
 
 describe('DocumentedResource', () => {
 
     const hydraDescriptionJsonLd = {
-        '@context': Core.Context,
+        '@context': Context,
         'description': 'The longer description',
         'http://some/custom/property': 'The value',
         'title': 'The title',
diff --git a/tests/Resources/RdfProperty-spec.ts b/tests/Resources/RdfProperty-spec.ts
@@ -3,6 +3,7 @@ import {Core} from '../../src/Constants';
 import {Mixin} from '../../src/Resources/Mixins/RdfProperty';
 import Resource from '../../src/Resources/Resource';
 import {owl, rdf, rdfs, xsd} from '../../src/Vocabs';
+import Context from '../test-objects/Context';
 
 class RdfProperty extends Mixin(Resource) {}
 
@@ -13,7 +14,7 @@ describe('RdfProperty', () => {
     beforeEach(() => {
         testProperty = {
             '@context': [
-                Core.Context,
+                Context,
                 {
                     rdfs: rdfs(),
                 },
diff --git a/tests/Resources/SupportedOperation-spec.ts b/tests/Resources/SupportedOperation-spec.ts
@@ -3,6 +3,7 @@ import {Core} from '../../src/Constants';
 import {Mixin} from '../../src/Resources/Mixins/SupportedOperation';
 import Resource from '../../src/Resources/Resource';
 import {owl} from '../../src/Vocabs';
+import Context from '../test-objects/Context';
 
 class SupportedOperation extends Mixin(Resource) {}
 
@@ -11,7 +12,7 @@ describe('SupportedOperation', () => {
     let operationJsonLd;
 
     beforeEach(() => operationJsonLd = {
-        '@context': Core.Context,
+        '@context': Context,
         'description': 'The operation description',
         'expects': owl.Nothing,
         'method': 'TRACE',
@@ -57,7 +58,7 @@ describe('SupportedOperation', () => {
         it('should return false for GET operation', async () => {
             // given
             const operation = {
-                '@context': Core.Context,
+                '@context': Context,
                 'method': 'GET',
             };
 
@@ -73,7 +74,7 @@ describe('SupportedOperation', () => {
         it('should return false for DELETE operation', async () => {
             // given
             const operation = {
-                '@context': Core.Context,
+                '@context': Context,
                 'method': 'DELETE',
             };
 
@@ -89,7 +90,7 @@ describe('SupportedOperation', () => {
         it('should return true if operation expects a body', async () => {
             // given
             const operation = {
-                '@context': Core.Context,
+                '@context': Context,
                 'method': 'POST',
             };
 
@@ -105,7 +106,7 @@ describe('SupportedOperation', () => {
         it('should return true if operation expects nothing', async () => {
             // given
             const operation = {
-                '@context': Core.Context,
+                '@context': Context,
                 'method': 'POST',
             };
 
diff --git a/tests/test-objects/Context.ts b/tests/test-objects/Context.ts
@@ -0,0 +1,51 @@
+/* tslint:disable:object-literal-sort-keys */
+export default {
+    hydra: 'http://www.w3.org/ns/hydra/core#',
+    apiDocumentation: 'hydra:apiDocumentation',
+    ApiDocumentation: 'hydra:ApiDocumentation',
+    title: 'hydra:title',
+    description: 'hydra:description',
+    entrypoint: {'@id': 'hydra:entrypoint', '@type': '@id'},
+    supportedClass: {'@id': 'hydra:supportedClass', '@type': '@vocab'},
+    Class: 'hydra:Class',
+    supportedProperty: {'@id': 'hydra:supportedProperty', '@type': '@id'},
+    SupportedProperty: 'hydra:SupportedProperty',
+    property: {'@id': 'hydra:property', '@type': '@vocab'},
+    required: 'hydra:required',
+    readonly: 'hydra:readonly',
+    writeonly: 'hydra:writeonly',
+    supportedOperation: {'@id': 'hydra:supportedOperation', '@type': '@id'},
+    Operation: 'hydra:SupportedOperation',
+    CreateResourceOperation: 'hydra:CreateResourceOperation',
+    ReplaceResourceOperation: 'hydra:ReplaceResourceOperation',
+    DeleteResourceOperation: 'hydra:DeleteResourceOperation',
+    method: 'hydra:method',
+    expects: {'@id': 'hydra:expects', '@type': '@vocab'},
+    returns: {'@id': 'hydra:returns', '@type': '@vocab'},
+    statusCodes: {'@id': 'hydra:statusCodes', '@type': '@id'},
+    StatusCodeDescription: 'hydra:StatusCodeDescription',
+    statusCode: 'hydra:statusCode',
+    Error: 'hydra:Error',
+    Resource: 'hydra:Resource',
+    operation: 'hydra:operation',
+    Collection: 'hydra:Collection',
+    member: {'@id': 'hydra:member', '@type': '@id'},
+    search: 'hydra:search',
+    freetextQuery: 'hydra:freetextQuery',
+    PagedCollection: 'hydra:PagedCollection',
+    totalItems: 'hydra:totalItems',
+    itemsPerPage: 'hydra:itemsPerPage',
+    firstPage: {'@id': 'hydra:firstPage', '@type': '@id'},
+    lastPage: {'@id': 'hydra:lastPage', '@type': '@id'},
+    nextPage: {'@id': 'hydra:nextPage', '@type': '@id'},
+    previousPage: {'@id': 'hydra:previousPage', '@type': '@id'},
+    Link: 'hydra:Link',
+    TemplatedLink: 'hydra:TemplatedLink',
+    IriTemplate: 'hydra:IriTemplate',
+    template: 'hydra:template',
+    mapping: 'hydra:mapping',
+    IriTemplateMapping: 'hydra:IriTemplateMapping',
+    variable: 'hydra:variable',
+    collection: 'hydra:collection',
+    manages: 'hydra:manages',
+};
diff --git a/tests/test-objects/index.ts b/tests/test-objects/index.ts
@@ -2,6 +2,7 @@
 
 import {Core} from '../../src/Constants';
 import {owl, rdf, xsd} from '../../src/Vocabs';
+import Context from '../test-objects/Context';
 
 export namespace Bodies {
     export let someJsonLd = {
@@ -120,7 +121,7 @@ export namespace Bodies {
 
     export let hydraCollection = {
         '@id': 'http://example.com/resource',
-        '@context': Core.Context,
+        '@context': Context,
         'hydra:member': [
             {'@id': 'http://example.com/element/1'},
             {'@id': 'http://example.com/element/2'},
@@ -135,7 +136,7 @@ export namespace Bodies {
 
     export let hydraCollectionWithView = {
         '@id': 'http://example.com/resource',
-        '@context': Core.Context,
+        '@context': Context,
         'member': [
             {'@id': 'http://example.com/element/1'},
             {'@id': 'http://example.com/element/2'},
@@ -162,7 +163,7 @@ export namespace Documentations {
     export let classWithOperation = {
         '@id': 'http://api.example.com/doc/',
         '@type': Core.Vocab('ApiDocumentation'),
-        '@context': Core.Context,
+        '@context': Context,
         'entrypoint': 'http://example.com/home',
         'supportedClass': [
             {
@@ -215,7 +216,7 @@ export namespace Documentations {
     };
 
     export let untyped = {
-        '@context': Core.Context,
+        '@context': Context,
         '@id': 'http://api.example.com/doc/',
         'entrypoint': 'http://example.com/home',
     };

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ export default class implements IResource {`
`36`	`36`	`isProcessed.set(this, val);`
`37`	`37`	`}`
`38`	`38`
`39`		`- public compact(context: any = null) {`
`40`		`- return jsonld.compact(this, context \|\| Core.Context);`
	`39`	`+ public compact(context: any = 'https://www.w3.org/ns/hydra/core') {`
	`40`	`+ return jsonld.compact(this, context);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public _get(property: string) {`