Return host property from the origin variable decoder

herp-inc · Jun 5, 2023 · 1572cb1 · 1572cb1
1 parent 9acc268
commit 1572cb1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/VariableDecoder/origin.test.ts b/src/VariableDecoder/origin.test.ts
@@ -21,8 +21,8 @@ describe(origin, () => {
                 (str) => {
                     const variable = new Variable('KEY', str);
 
-                    const { protocol, hostname, port } = new URL(str);
-                    const expected = { protocol, hostname, port };
+                    const { protocol, host, hostname, port } = new URL(str);
+                    const expected = { protocol, host, hostname, port };
 
                     expect(decoder(variable)).toStrictEqual(E.right(expected));
                 },

diff --git a/src/VariableDecoder/origin.ts b/src/VariableDecoder/origin.ts
@@ -4,7 +4,7 @@ import * as RE from 'fp-ts/ReaderEither';
 
 import { ask, decodeFailed, validate, VariableDecoder } from './VariableDecoder';
 
-type Origin = Pick<URL, 'protocol' | 'hostname' | 'port'>;
+type Origin = Pick<URL, 'protocol' | 'host' | 'hostname' | 'port'>;
 
 /**
  * Decodes a URL origin (scheme + hostname + port).
@@ -21,8 +21,9 @@ const origin = (): VariableDecoder<Origin> =>
         ),
         RE.chain(validate(({ url }) => url.pathname !== '', 'must not have a pathname')),
         RE.chain(validate(({ value, url }) => url.origin === value, 'must be a valid URL origin')),
-        RE.map(({ url: { protocol, hostname, port } }) => ({
+        RE.map(({ url: { protocol, host, hostname, port } }) => ({
             protocol,
+            host,
             hostname,
             port,
         })),