fix: Create container data before adding content-type

CommunitySolidServer · Dec 2, 2020 · c2b1891 · c2b1891
1 parent 82393ed
commit c2b1891
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/storage/DataAccessorBasedStore.ts b/src/storage/DataAccessorBasedStore.ts
@@ -1,4 +1,3 @@
-import type { Readable } from 'stream';
 import { DataFactory } from 'n3';
 import type { Quad } from 'rdf-js';
 import { v4 as uuid } from 'uuid';
@@ -11,7 +10,6 @@ import { ConflictHttpError } from '../util/errors/ConflictHttpError';
 import { MethodNotAllowedHttpError } from '../util/errors/MethodNotAllowedHttpError';
 import { NotFoundHttpError } from '../util/errors/NotFoundHttpError';
 import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError';
-import type { Guarded } from '../util/GuardedStream';
 import {
   ensureTrailingSlash,
   getParentContainer,
@@ -68,13 +66,12 @@ export class DataAccessorBasedStore implements ResourceStore {
 
     // Create the representation of a container
     if (this.isExistingContainer(metadata)) {
+      // Generate the data stream before setting the content-type to prevent unnecessary triples
+      const data = guardedStreamFrom(metadata.quads());
       metadata.contentType = INTERNAL_QUADS;
       result = {
         binary: false,
-        get data(): Guarded<Readable> {
-          // This allows other modules to still add metadata before the output data is written
-          return guardedStreamFrom(result.metadata.quads());
-        },
+        data,
         metadata,
       };
 

diff --git a/test/unit/storage/DataAccessorBasedStore.test.ts b/test/unit/storage/DataAccessorBasedStore.test.ts
@@ -108,9 +108,10 @@ describe('A DataAccessorBasedStore', (): void => {
     it('will return a data stream that matches the metadata for containers.', async(): Promise<void> => {
       const resourceID = { path: `${root}container/` };
       accessor.data[resourceID.path] = { metadata: containerMetadata } as Representation;
+      const metaQuads = containerMetadata.quads();
       const result = await store.getRepresentation(resourceID);
       expect(result).toMatchObject({ binary: false });
-      expect(await arrayifyStream(result.data)).toBeRdfIsomorphic(containerMetadata.quads());
+      expect(await arrayifyStream(result.data)).toBeRdfIsomorphic(metaQuads);
       expect(result.metadata.contentType).toEqual(INTERNAL_QUADS);
     });
   });