@nordcraft/core 1.0.9 → 1.0.10

package/dist/utils/url.d.ts

@@ -1,5 +1,8 @@
 export declare const isLocalhostUrl: (hrefOrOrigin: string) => boolean;
 export declare const isLocalhostHostname: (hostname: string) => hostname is "localhost" | "127.0.0.1";
-export declare const validateUrl: (url?: string | null, base?: string) => false | URL;
+export declare const validateUrl: ({ path, origin, }: {
+    path: string | null | undefined;
+    origin: string | undefined;
+}) => false | URL;
 export declare const PROXY_URL_HEADER = "x-toddle-url";
 export declare const REWRITE_HEADER = "x-toddle-rewrite";

package/dist/utils/url.js

@@ -1,12 +1,12 @@
 const LOCALHOSTS = ['http://localhost:54404', 'http://preview.localhost:54404'];
 export const isLocalhostUrl = (hrefOrOrigin) => LOCALHOSTS.some((host) => hrefOrOrigin.startsWith(host));
 export const isLocalhostHostname = (hostname) => hostname === 'localhost' || hostname === '127.0.0.1';
-export const validateUrl = (url, base) => {
-    if (typeof url !== 'string') {
+export const validateUrl = ({ path, origin, }) => {
+    if (typeof path !== 'string') {
         return false;
     }
     try {
-        const urlObject = new URL(url, base);
+        const urlObject = new URL(path, origin);
         // Creating a new URL object will not correctly encode the search params
         // So we need to iterate over them to make sure they are encoded as that happens when setting them explicitly
         const searchCopy = new URLSearchParams(urlObject.searchParams);

package/dist/utils/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,GAAG,CAAC,wBAAwB,EAAE,gCAAgC,CAAC,CAAA;AAE/E,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,YAAoB,EAAE,EAAE,CACrD,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;AAE1D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,QAAgB,EAAE,EAAE,CACtD,QAAQ,KAAK,WAAW,IAAI,QAAQ,KAAK,WAAW,CAAA;AAEtD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAmB,EAAE,IAAa,EAAE,EAAE;IAChE,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACpC,wEAAwE;QACxE,6GAA6G;QAC7G,MAAM,UAAU,GAAG,IAAI,eAAe,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAC9D,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAChC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAC3C,CAAC,CAAC,CAAA;QACF,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAChC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAC3C,CAAC,CAAC,CAAA;QACF,OAAO,SAAS,CAAA;IAClB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,cAAc,CAAA;AAE9C,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAA"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,GAAG,CAAC,wBAAwB,EAAE,gCAAgC,CAAC,CAAA;AAE/E,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,YAAoB,EAAE,EAAE,CACrD,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;AAE1D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,QAAgB,EAAE,EAAE,CACtD,QAAQ,KAAK,WAAW,IAAI,QAAQ,KAAK,WAAW,CAAA;AAEtD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAC1B,IAAI,EACJ,MAAM,GAIP,EAAE,EAAE;IACH,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACvC,wEAAwE;QACxE,6GAA6G;QAC7G,MAAM,UAAU,GAAG,IAAI,eAAe,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAC9D,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAChC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAC3C,CAAC,CAAC,CAAA;QACF,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAChC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAC3C,CAAC,CAAC,CAAA;QACF,OAAO,SAAS,CAAA;IAClB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,cAAc,CAAA;AAE9C,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAA"}

package/package.json

@@ -14,5 +14,5 @@
 },
 "files": ["dist", "src"],
 "main": "dist/index.js",
-"version": "1.0.9"
+"version": "1.0.10"
 }

package/src/utils/url.test.ts

@@ -3,15 +3,34 @@ import { validateUrl } from './url'
 
 describe('validateUrl()', () => {
   test('it validates urls correctly', () => {
-    expect(validateUrl('https://toddle.dev')).toBeInstanceOf(URL)
-    expect(validateUrl('not-a-url')).toBe(false)
+    expect(
+      validateUrl({ path: 'https://nordcraft.com', origin: undefined }),
+    ).toBeInstanceOf(URL)
+    expect(validateUrl({ path: 'not-a-url', origin: undefined })).toBe(false)
   })
 
   test('it validates urls arrays in query params correctly', async () => {
-    const url = validateUrl('https://toddle.dev?test=1&test=2')
+    const url = validateUrl({
+      path: 'https://nordcraft.com?test=1&test=2',
+      origin: undefined,
+    })
     expect(url).toBeInstanceOf(URL)
     if (url instanceof URL) {
       expect(url.searchParams.getAll('test')).toEqual(['1', '2'])
     }
   })
+
+  test('it validates relative urls when a base is provided', () => {
+    const url = validateUrl({
+      path: '/my-path',
+      origin: 'https://nordcraft.com',
+    })
+    expect(url).toBeInstanceOf(URL)
+    expect((url as URL).href).toBe('https://nordcraft.com/my-path')
+  })
+
+  test("it doesn't accept relative urls when no base is provided", () => {
+    const url = validateUrl({ path: '/my-path', origin: undefined })
+    expect(url).toBe(false)
+  })
 })

package/src/utils/url.ts

@@ -6,13 +6,18 @@ export const isLocalhostUrl = (hrefOrOrigin: string) =>
 export const isLocalhostHostname = (hostname: string) =>
   hostname === 'localhost' || hostname === '127.0.0.1'
 
-export const validateUrl = (url?: string | null, base?: string) => {
-  if (typeof url !== 'string') {
+export const validateUrl = ({
+  path,
+  origin,
+}: {
+  path: string | null | undefined
+  origin: string | undefined
+}) => {
+  if (typeof path !== 'string') {
     return false
   }
-
   try {
-    const urlObject = new URL(url, base)
+    const urlObject = new URL(path, origin)
     // Creating a new URL object will not correctly encode the search params
     // So we need to iterate over them to make sure they are encoded as that happens when setting them explicitly
     const searchCopy = new URLSearchParams(urlObject.searchParams)