From 961662b69201faf1c99e73713c4c100d7bb8f9ad Mon Sep 17 00:00:00 2001
From: Ruben Verborgh <ruben@verborgh.org>
Date: Mon, 30 Nov 2020 09:40:05 +0100
Subject: [PATCH] refactor: Components.js supports Record now.

---
 src/ldp/http/metadata/LinkRelMetadataWriter.ts    |  4 +---
 src/ldp/http/metadata/MappedMetadataWriter.ts     |  4 +---
 src/server/middleware/HeaderHandler.ts            |  4 +---
 src/storage/routing/RegexRouterRule.ts            |  3 +--
 test/unit/server/middleware/HeaderHandler.test.ts | 10 ----------
 5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/ldp/http/metadata/LinkRelMetadataWriter.ts b/src/ldp/http/metadata/LinkRelMetadataWriter.ts
index 8ea42656b..a87d86e74 100644
--- a/src/ldp/http/metadata/LinkRelMetadataWriter.ts
+++ b/src/ldp/http/metadata/LinkRelMetadataWriter.ts
@@ -10,9 +10,7 @@ import { MetadataWriter } from './MetadataWriter';
 export class LinkRelMetadataWriter extends MetadataWriter {
   private readonly linkRelMap: Record<string, string>;
 
-  // Not supported by Components.js yet
-  // eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style
-  public constructor(linkRelMap: { [predicate: string]: string }) {
+  public constructor(linkRelMap: Record<string, string>) {
     super();
     this.linkRelMap = linkRelMap;
   }
diff --git a/src/ldp/http/metadata/MappedMetadataWriter.ts b/src/ldp/http/metadata/MappedMetadataWriter.ts
index 9a445b8b1..af4efb84a 100644
--- a/src/ldp/http/metadata/MappedMetadataWriter.ts
+++ b/src/ldp/http/metadata/MappedMetadataWriter.ts
@@ -10,9 +10,7 @@ import { MetadataWriter } from './MetadataWriter';
 export class MappedMetadataWriter extends MetadataWriter {
   private readonly headerMap: Record<string, string>;
 
-  // Not supported by Components.js yet
-  // eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style
-  public constructor(headerMap: { [predicate: string]: string }) {
+  public constructor(headerMap: Record<string, string>) {
     super();
     this.headerMap = headerMap;
   }
diff --git a/src/server/middleware/HeaderHandler.ts b/src/server/middleware/HeaderHandler.ts
index f41ced109..95d39af88 100644
--- a/src/server/middleware/HeaderHandler.ts
+++ b/src/server/middleware/HeaderHandler.ts
@@ -7,9 +7,7 @@ import type { HttpResponse } from '../HttpResponse';
 export class HeaderHandler extends HttpHandler {
   private readonly headers: Record<string, string>;
 
-  // Not supported by Components.js yet
-  // eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style
-  public constructor(headers: { [header: string]: string } = {}) {
+  public constructor(headers: Record<string, string>) {
     super();
     this.headers = { ...headers };
   }
diff --git a/src/storage/routing/RegexRouterRule.ts b/src/storage/routing/RegexRouterRule.ts
index 1494e14b1..bd2499b34 100644
--- a/src/storage/routing/RegexRouterRule.ts
+++ b/src/storage/routing/RegexRouterRule.ts
@@ -21,8 +21,7 @@ export class RegexRouterRule extends RouterRule {
   /**
    * The keys of the `storeMap` will be converted into actual RegExp objects that will be used for testing.
    */
-  // eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style
-  public constructor(base: string, storeMap: { [ regex: string ]: ResourceStore }) {
+  public constructor(base: string, storeMap: Record<string, ResourceStore>) {
     super();
     this.base = trimTrailingSlashes(base);
     this.regexes = new Map(Object.keys(storeMap).map((regex): [ RegExp, ResourceStore ] =>
diff --git a/test/unit/server/middleware/HeaderHandler.test.ts b/test/unit/server/middleware/HeaderHandler.test.ts
index 582cc9a9f..46b426624 100644
--- a/test/unit/server/middleware/HeaderHandler.test.ts
+++ b/test/unit/server/middleware/HeaderHandler.test.ts
@@ -3,16 +3,6 @@ import { HeaderHandler } from '../../../../src/server/middleware/HeaderHandler';
 import { guardStream } from '../../../../src/util/GuardedStream';
 
 describe('a HeaderHandler', (): void => {
-  it('adds no headers when none are configured.', async(): Promise<void> => {
-    const handler = new HeaderHandler();
-
-    const request = guardStream(createRequest());
-    const response = createResponse();
-    await handler.handleSafe({ request, response });
-
-    expect(response.getHeaders()).toEqual({});
-  });
-
   it('adds all configured headers.', async(): Promise<void> => {
     const headers = { custom: 'Custom', other: 'Other' };
     const handler = new HeaderHandler(headers);