File size: 6,471 Bytes
94786da | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 | diff --git a/test/e2e/app-dir/generate-static-params-invalid/fixtures/empty-object/app/[[...slug]]/page.js b/test/e2e/app-dir/generate-static-params-invalid/fixtures/empty-object/app/[[...slug]]/page.js
new file mode 100644
index 00000000..425b4fe5
--- /dev/null
+++ b/test/e2e/app-dir/generate-static-params-invalid/fixtures/empty-object/app/[[...slug]]/page.js
@@ -0,0 +1,7 @@
+export function generateStaticParams() {
+ return [{}]
+}
+
+export default function Page() {
+ return <p>empty object</p>
+}
diff --git a/test/e2e/app-dir/generate-static-params-invalid/fixtures/empty-object/app/layout.js b/test/e2e/app-dir/generate-static-params-invalid/fixtures/empty-object/app/layout.js
new file mode 100644
index 00000000..750eb927
--- /dev/null
+++ b/test/e2e/app-dir/generate-static-params-invalid/fixtures/empty-object/app/layout.js
@@ -0,0 +1,7 @@
+export default function Layout({ children }) {
+ return (
+ <html>
+ <body>{children}</body>
+ </html>
+ )
+}
diff --git a/test/e2e/app-dir/generate-static-params-invalid/fixtures/non-array/app/[slug]/page.js b/test/e2e/app-dir/generate-static-params-invalid/fixtures/non-array/app/[slug]/page.js
new file mode 100644
index 00000000..7cbbd64c
--- /dev/null
+++ b/test/e2e/app-dir/generate-static-params-invalid/fixtures/non-array/app/[slug]/page.js
@@ -0,0 +1,7 @@
+export function generateStaticParams() {
+ return { slug: 'first' }
+}
+
+export default function Page() {
+ return <p>non-array</p>
+}
diff --git a/test/e2e/app-dir/generate-static-params-invalid/fixtures/non-array/app/layout.js b/test/e2e/app-dir/generate-static-params-invalid/fixtures/non-array/app/layout.js
new file mode 100644
index 00000000..750eb927
--- /dev/null
+++ b/test/e2e/app-dir/generate-static-params-invalid/fixtures/non-array/app/layout.js
@@ -0,0 +1,7 @@
+export default function Layout({ children }) {
+ return (
+ <html>
+ <body>{children}</body>
+ </html>
+ )
+}
diff --git a/test/e2e/app-dir/generate-static-params-invalid/fixtures/non-object-entry/app/[slug]/page.js b/test/e2e/app-dir/generate-static-params-invalid/fixtures/non-object-entry/app/[slug]/page.js
new file mode 100644
index 00000000..26be227b
--- /dev/null
+++ b/test/e2e/app-dir/generate-static-params-invalid/fixtures/non-object-entry/app/[slug]/page.js
@@ -0,0 +1,7 @@
+export function generateStaticParams() {
+ return [null]
+}
+
+export default function Page() {
+ return <p>non-object entry</p>
+}
diff --git a/test/e2e/app-dir/generate-static-params-invalid/fixtures/non-object-entry/app/layout.js b/test/e2e/app-dir/generate-static-params-invalid/fixtures/non-object-entry/app/layout.js
new file mode 100644
index 00000000..750eb927
--- /dev/null
+++ b/test/e2e/app-dir/generate-static-params-invalid/fixtures/non-object-entry/app/layout.js
@@ -0,0 +1,7 @@
+export default function Layout({ children }) {
+ return (
+ <html>
+ <body>{children}</body>
+ </html>
+ )
+}
diff --git a/test/e2e/app-dir/generate-static-params-invalid/fixtures/primitive-entry/app/[slug]/page.js b/test/e2e/app-dir/generate-static-params-invalid/fixtures/primitive-entry/app/[slug]/page.js
new file mode 100644
index 00000000..f9ef3566
--- /dev/null
+++ b/test/e2e/app-dir/generate-static-params-invalid/fixtures/primitive-entry/app/[slug]/page.js
@@ -0,0 +1,7 @@
+export function generateStaticParams() {
+ return ['first']
+}
+
+export default function Page() {
+ return <p>primitive entry</p>
+}
diff --git a/test/e2e/app-dir/generate-static-params-invalid/fixtures/primitive-entry/app/layout.js b/test/e2e/app-dir/generate-static-params-invalid/fixtures/primitive-entry/app/layout.js
new file mode 100644
index 00000000..750eb927
--- /dev/null
+++ b/test/e2e/app-dir/generate-static-params-invalid/fixtures/primitive-entry/app/layout.js
@@ -0,0 +1,7 @@
+export default function Layout({ children }) {
+ return (
+ <html>
+ <body>{children}</body>
+ </html>
+ )
+}
diff --git a/test/e2e/app-dir/generate-static-params-invalid/generate-static-params-invalid.test.ts b/test/e2e/app-dir/generate-static-params-invalid/generate-static-params-invalid.test.ts
new file mode 100644
index 00000000..90dc0f1d
--- /dev/null
+++ b/test/e2e/app-dir/generate-static-params-invalid/generate-static-params-invalid.test.ts
@@ -0,0 +1,64 @@
+import { generateRouteStaticParams } from '../../../../packages/next/src/build/static-paths/app'
+import { generateStaticParams as emptyObjectParams } from './fixtures/empty-object/app/[[...slug]]/page'
+import { generateStaticParams as nonArrayParams } from './fixtures/non-array/app/[slug]/page'
+import { generateStaticParams as nonObjectEntryParams } from './fixtures/non-object-entry/app/[slug]/page'
+import { generateStaticParams as primitiveEntryParams } from './fixtures/primitive-entry/app/[slug]/page'
+
+async function callGenerateStaticParams(generateStaticParams: () => unknown) {
+ return generateRouteStaticParams(
+ [
+ {
+ config: undefined,
+ generateStaticParams: generateStaticParams as never,
+ createEmptyParamsError: undefined,
+ },
+ ],
+ { fetchCache: undefined, page: '/[slug]' },
+ false,
+ []
+ )
+}
+
+async function expectInvalidShape(
+ generateStaticParams: () => unknown,
+ expectedShape: 'array' | 'object'
+) {
+ try {
+ await callGenerateStaticParams(generateStaticParams)
+ } catch (error) {
+ expect(error).toBeInstanceOf(Error)
+ expect((error as Error).message).toMatch(/generateStaticParams/i)
+ expect((error as Error).message).toMatch(new RegExp(expectedShape, 'i'))
+ return
+ }
+
+ throw new Error(
+ `Expected generateStaticParams to reject a non-${expectedShape}`
+ )
+}
+
+describe('generateStaticParams return value validation', () => {
+ it.each([
+ ['object', nonArrayParams],
+ ['null', () => null],
+ ['primitive', () => 'slug'],
+ ])(
+ 'rejects the %s return value instead of an array',
+ async (_description, generateStaticParams) => {
+ await expectInvalidShape(generateStaticParams, 'array')
+ }
+ )
+
+ it.each([
+ ['null', nonObjectEntryParams],
+ ['primitive', primitiveEntryParams],
+ ])('rejects a %s array entry', async (_description, generateStaticParams) => {
+ await expectInvalidShape(generateStaticParams, 'object')
+ })
+
+ it('continues to accept an empty parameter object', async () => {
+ await expect(callGenerateStaticParams(emptyObjectParams)).resolves.toEqual([
+ {},
+ ])
+ })
+})
|