avyvar's picture
Add files using upload-large-folder tool
94786da verified
Raw
History Blame Contribute Delete
6.47 kB
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([
+ {},
+ ])
+ })
+})