Merge branch 'main' into client-file

packages/core/src/app/prepare/prepareRoutes.ts

@@ -27,20 +27,15 @@ const resolvePageRedirects = ({ path, pathInferred }: Page): string[] => {
   // paths that should redirect to this page, use set to dedupe
   const redirectsSet = new Set<string>()
 
-  // add redirect to the set when the redirect could not be normalized & encoded to the page path
-  const addRedirect = (redirect: string): void => {
-    const normalizedPath = normalizeRoutePath(redirect)
-    if (normalizedPath === path) return
-
-    const encodedPath = encodeURI(normalizedPath)
-    if (encodedPath === path) return
-
-    redirectsSet.add(redirect)
-  }
-
   // redirect from inferred path, notice that the inferred path is not uri-encoded
   if (pathInferred !== null) {
-    addRedirect(encodeURI(pathInferred))
+    const normalizedPathInferred = normalizeRoutePath(pathInferred)
+    const encodedPathInferred = encodeURI(normalizedPathInferred)
+
+    // add redirect to the set when the redirect could not be normalized & encoded to the page path
+    if (normalizedPathInferred !== path && encodedPathInferred !== path) {
+      redirectsSet.add(encodedPathInferred)
+    }
   }
 
   return Array.from(redirectsSet)

packages/shared/src/utils/index.ts

@@ -1,18 +1,12 @@
+export * from './links/index.js'
+export * from './routes/index.js'
+
 export * from './dedupeHead.js'
 export * from './ensureLeadingSlash.js'
 export * from './ensureEndingSlash.js'
 export * from './formatDateString.js'
-export * from './inferRoutePath.js'
-export * from './isLinkExternal.js'
-export * from './isLinkHttp.js'
-export * from './isLinkWithProtocol.js'
-export * from './isPlainObject.js'
-export * from './inferRoutePath.js'
-export * from './normalizeRoutePath.js'
 export * from './omit.js'
 export * from './removeEndingSlash.js'
 export * from './removeLeadingSlash.js'
 export * from './resolveHeadIdentifier.js'
-export * from './resolveLocalePath.js'
-export * from './resolveRoutePathFromUrl.js'
 export * from './typeGuards.js'

packages/shared/src/utils/links/index.ts

@@ -0,0 +1,3 @@
+export * from './isLinkExternal.js'
+export * from './isLinkHttp.js'
+export * from './isLinkWithProtocol.js'

packages/shared/src/utils/routes/index.ts

@@ -0,0 +1,4 @@
+export * from './inferRoutePath'
+export * from './normalizeRoutePath.js'
+export * from './resolveLocalePath.js'
+export * from './resolveRoutePathFromUrl.js'

packages/shared/src/utils/resolveLocalePath.ts → packages/shared/src/utils/routes/resolveLocalePath.ts

@@ -1,4 +1,4 @@
-import type { LocaleConfig } from '../types/index.js'
+import type { LocaleConfig } from '../../types/index.js'
 
 /**
  * Resolve the matched locale path of route path

packages/shared/src/utils/resolveRoutePathFromUrl.ts → packages/shared/src/utils/routes/resolveRoutePathFromUrl.ts

@@ -1,3 +1,6 @@
+/**
+ * For a give URL, remove the origin and the site base to get the route path
+ */
 export const resolveRoutePathFromUrl = (url: string, base = '/'): string => {
   const pathname = url
     // remove url origin

packages/shared/src/utils/typeGuards.ts

@@ -5,6 +5,13 @@
 export const isFunction = (val: unknown): val is Function =>
   typeof val === 'function'
 
+/**
+ * Check if a value is plain object, with generic type support
+ */
+export const isPlainObject = <T extends Record<any, any> = Record<any, any>>(
+  val: unknown,
+): val is T => Object.prototype.toString.call(val) === '[object Object]'
+
 /**
  * Check if a value is a string
  */

packages/shared/tests/isLinkExternal.spec.ts → packages/shared/tests/links/isLinkExternal.spec.ts

@@ -1,5 +1,5 @@
 import { expect, it } from 'vitest'
-import { isLinkExternal } from '../src/index.js'
+import { isLinkExternal } from '../../src/index.js'
 
 const testCases: [
   Parameters<typeof isLinkExternal>,

packages/shared/tests/isLinkHttp.spec.ts → packages/shared/tests/links/isLinkHttp.spec.ts

@@ -1,5 +1,5 @@
 import { expect, it } from 'vitest'
-import { isLinkHttp } from '../src/index.js'
+import { isLinkHttp } from '../../src/index.js'
 
 const testCases: [string, ReturnType<typeof isLinkHttp>][] = [
   ['https://foobar.com', true],

packages/shared/tests/isLinkWithProtocol.spec.ts → packages/shared/tests/links/isLinkWithProtocol.spec.ts

@@ -1,5 +1,5 @@
 import { expect, it } from 'vitest'
-import { isLinkWithProtocol } from '../src/index.js'
+import { isLinkWithProtocol } from '../../src/index.js'
 
 const testCases: [string, ReturnType<typeof isLinkWithProtocol>][] = [
   // with protocol

packages/shared/tests/inferRoutePath.spec.ts → packages/shared/tests/routes/inferRoutePath.spec.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { inferRoutePath } from '../src/index.js'
+import { inferRoutePath } from '../../src/index.js'
 
 const testCases = [
   // absolute index

packages/shared/tests/normalizeRoutePath.spec.ts → packages/shared/tests/routes/normalizeRoutePath.spec.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { normalizeRoutePath } from '../src/index.js'
+import { normalizeRoutePath } from '../../src/index.js'
 
 const testCases = [
   // absolute index

packages/shared/tests/resolveLocalePath.spec.ts → packages/shared/tests/routes/resolveLocalePath.spec.ts

@@ -1,6 +1,6 @@
 import { expect, it } from 'vitest'
-import { resolveLocalePath } from '../src/index.js'
-import type { LocaleConfig } from '../src/index.js'
+import type { LocaleConfig } from '../../src/index.js'
+import { resolveLocalePath } from '../../src/index.js'
 
 const locales: LocaleConfig = {
   '/': {

packages/shared/tests/resolveRoutePathFromUrl.spec.ts → packages/shared/tests/routes/resolveRoutePathFromUrl.spec.ts

@@ -1,5 +1,5 @@
 import { expect, it } from 'vitest'
-import { resolveRoutePathFromUrl } from '../src/index.js'
+import { resolveRoutePathFromUrl } from '../../src/index.js'
 
 const testCases: [
   Parameters<typeof resolveRoutePathFromUrl>,

packages/shared/tests/typeGuards.spec.ts

@@ -0,0 +1,23 @@
+import { describe, expect, it } from 'vitest'
+import { isPlainObject } from '../src/index.js'
+
+describe('isPlainObject', () => {
+  const testCases: [unknown, boolean][] = [
+    [true, false],
+    [false, false],
+    ['', false],
+    ['foobar', false],
+    [0, false],
+    [1, false],
+    [[], false],
+    [{}, true],
+    [{ foo: 'bar' }, true],
+    [Object.create(null), true],
+  ]
+
+  it('should determine plain object correctly', () => {
+    testCases.forEach(([source, expected]) => {
+      expect(isPlainObject(source)).toBe(expected)
+    })
+  })
+})