Skip to content

Commit

Permalink
chore: update $path.ts
Browse files Browse the repository at this point in the history
  • Loading branch information
@solufa
solufa committed Jul 29, 2023
1 parent 2fedb76 commit bed2cad
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 42 deletions.
30 changes: 19 additions & 11 deletions projects/nextjs-stable-appdir/lib/$path.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,50 +4,58 @@ import type { Query as Query2 } from '../app/(group1)/blog/[...slug]/page'
import type { OptionalQuery as OptionalQuery3 } from '../pages/children/[pid]'
import type { Query as Query4 } from '../pages/children/blog/[...slug]'

const buildSuffix = (url?: {query?: Record<string, string>, hash?: string}) => {
const query = url?.query
const hash = url?.hash
if (!query && !hash) return ''
const search = query ? `?${new URLSearchParams(query)}` : ''
return `${search}${hash ? `#${hash}` : ''}`
}

export const pagesPath = {
"%E6%97%A5%E6%9C%AC%E8%AA%9E": {
$url: (url?: { hash?: string }) => ({ pathname: '/%E6%97%A5%E6%9C%AC%E8%AA%9E' as const, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/%E6%97%A5%E6%9C%AC%E8%AA%9E' as const, hash: url?.hash, path: `/%E6%97%A5%E6%9C%AC%E8%AA%9E${buildSuffix(url)}` })
},
_pid: (pid: string | number) => ({
$url: (url?: { query?: OptionalQuery1, hash?: string }) => ({ pathname: '/[pid]' as const, query: { pid, ...url?.query }, hash: url?.hash })
$url: (url?: { query?: OptionalQuery1, hash?: string }) => ({ pathname: '/[pid]' as const, query: { pid, ...url?.query }, hash: url?.hash, path: `/${pid}${buildSuffix(url)}` })
}),
"blog": {
_slug: (slug: string[]) => ({
$url: (url: { query: Query2, hash?: string }) => ({ pathname: '/blog/[...slug]' as const, query: { slug, ...url.query }, hash: url.hash })
$url: (url: { query: Query2, hash?: string }) => ({ pathname: '/blog/[...slug]' as const, query: { slug, ...url.query }, hash: url.hash, path: `/blog/${slug?.join('/')}${buildSuffix(url)}` })
}),
"hoge": {
_fuga: (fuga?: string[]) => ({
$url: (url?: { hash?: string }) => ({ pathname: '/blog/hoge/[[...fuga]]' as const, query: { fuga }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/blog/hoge/[[...fuga]]' as const, query: { fuga }, hash: url?.hash, path: `/blog/hoge/${fuga?.join('/')}${buildSuffix(url)}` })
})
}
},
"aaa": {
_bbb: (bbb: string[]) => ({
"ccc": {
$url: (url?: { hash?: string }) => ({ pathname: '/aaa/[...bbb]/ccc' as const, query: { bbb }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/aaa/[...bbb]/ccc' as const, query: { bbb }, hash: url?.hash, path: `/aaa/${bbb?.join('/')}/ccc${buildSuffix(url)}` })
}
}),
},
"x": {
_y: (y: string | number) => ({
"z": {
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]/z' as const, query: { y }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]/z' as const, query: { y }, hash: url?.hash, path: `/x/${y}/z${buildSuffix(url)}` })
},
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]' as const, query: { y }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]' as const, query: { y }, hash: url?.hash, path: `/x/${y}${buildSuffix(url)}` })
}),
$url: (url?: { hash?: string }) => ({ pathname: '/x' as const, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/x' as const, hash: url?.hash, path: `/x${buildSuffix(url)}` })
},
"_ignore": {
$url: (url?: { hash?: string }) => ({ pathname: '/.ignore' as const, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/.ignore' as const, hash: url?.hash, path: `/.ignore${buildSuffix(url)}` })
},
_a: (a: string | number) => ({
"b": {
_c: (c: string[]) => ({
$url: (url?: { hash?: string }) => ({ pathname: '/[a]/b/[...c]' as const, query: { a, c }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/[a]/b/[...c]' as const, query: { a, c }, hash: url?.hash, path: `/${a}/b/${c?.join('/')}${buildSuffix(url)}` })
})
}
}),
$url: (url: { query: Query0, hash?: string }) => ({ pathname: '/' as const, query: url.query, hash: url.hash }),
$url: (url: { query: Query0, hash?: string }) => ({ pathname: '/' as const, query: url.query, hash: url.hash, path: `/${buildSuffix(url)}` }),
"children": {
"%E6%97%A5%E6%9C%AC%E8%AA%9E": {
$url: (url?: { hash?: string }) => ({ pathname: '/children/%E6%97%A5%E6%9C%AC%E8%AA%9E' as const, hash: url?.hash })
Expand Down
28 changes: 18 additions & 10 deletions projects/nextjs-stable-appdir/out/lib/basic/$path.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,55 @@ import type { Query as Query2 } from '../../../app/(group1)/blog/[...slug]/page'
import type { OptionalQuery as OptionalQuery3 } from '../../../pages/children/[pid]'
import type { Query as Query4 } from '../../../pages/children/blog/[...slug]'

const buildSuffix = (url?: {query?: Record<string, string>, hash?: string}) => {
const query = url?.query
const hash = url?.hash
if (!query && !hash) return ''
const search = query ? `?${new URLSearchParams(query)}` : ''
return `${search}${hash ? `#${hash}` : ''}`
}

export const pagesPath = {
"%E6%97%A5%E6%9C%AC%E8%AA%9E": {
$url: (url?: { hash?: string }) => ({ pathname: '/%E6%97%A5%E6%9C%AC%E8%AA%9E' as const, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/%E6%97%A5%E6%9C%AC%E8%AA%9E' as const, hash: url?.hash, path: `/%E6%97%A5%E6%9C%AC%E8%AA%9E${buildSuffix(url)}` })
},
_pid: (pid: string | number) => ({
$url: (url?: { query?: OptionalQuery1, hash?: string }) => ({ pathname: '/[pid]' as const, query: { pid, ...url?.query }, hash: url?.hash })
$url: (url?: { query?: OptionalQuery1, hash?: string }) => ({ pathname: '/[pid]' as const, query: { pid, ...url?.query }, hash: url?.hash, path: `/${pid}${buildSuffix(url)}` })
}),
"blog": {
_slug: (slug: string[]) => ({
$url: (url: { query: Query2, hash?: string }) => ({ pathname: '/blog/[...slug]' as const, query: { slug, ...url.query }, hash: url.hash })
$url: (url: { query: Query2, hash?: string }) => ({ pathname: '/blog/[...slug]' as const, query: { slug, ...url.query }, hash: url.hash, path: `/blog/${slug?.join('/')}${buildSuffix(url)}` })
}),
"hoge": {
_fuga: (fuga?: string[]) => ({
$url: (url?: { hash?: string }) => ({ pathname: '/blog/hoge/[[...fuga]]' as const, query: { fuga }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/blog/hoge/[[...fuga]]' as const, query: { fuga }, hash: url?.hash, path: `/blog/hoge/${fuga?.join('/')}${buildSuffix(url)}` })
})
}
},
"aaa": {
_bbb: (bbb: string[]) => ({
"ccc": {
$url: (url?: { hash?: string }) => ({ pathname: '/aaa/[...bbb]/ccc' as const, query: { bbb }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/aaa/[...bbb]/ccc' as const, query: { bbb }, hash: url?.hash, path: `/aaa/${bbb?.join('/')}/ccc${buildSuffix(url)}` })
}
}),
},
"x": {
_y: (y: string | number) => ({
"z": {
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]/z' as const, query: { y }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]/z' as const, query: { y }, hash: url?.hash, path: `/x/${y}/z${buildSuffix(url)}` })
},
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]' as const, query: { y }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]' as const, query: { y }, hash: url?.hash, path: `/x/${y}${buildSuffix(url)}` })
}),
$url: (url?: { hash?: string }) => ({ pathname: '/x' as const, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/x' as const, hash: url?.hash, path: `/x${buildSuffix(url)}` })
},
_a: (a: string | number) => ({
"b": {
_c: (c: string[]) => ({
$url: (url?: { hash?: string }) => ({ pathname: '/[a]/b/[...c]' as const, query: { a, c }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/[a]/b/[...c]' as const, query: { a, c }, hash: url?.hash, path: `/${a}/b/${c?.join('/')}${buildSuffix(url)}` })
})
}
}),
$url: (url: { query: Query0, hash?: string }) => ({ pathname: '/' as const, query: url.query, hash: url.hash }),
$url: (url: { query: Query0, hash?: string }) => ({ pathname: '/' as const, query: url.query, hash: url.hash, path: `/${buildSuffix(url)}` }),
"children": {
"%E6%97%A5%E6%9C%AC%E8%AA%9E": {
$url: (url?: { hash?: string }) => ({ pathname: '/children/%E6%97%A5%E6%9C%AC%E8%AA%9E' as const, hash: url?.hash })
Expand Down
28 changes: 18 additions & 10 deletions projects/nextjs-stable-appdir/out/lib/ignore/$path.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,55 @@ import type { Query as Query2 } from '../../../app/(group1)/blog/[...slug]/page'
import type { OptionalQuery as OptionalQuery3 } from '../../../pages/children/[pid]'
import type { Query as Query4 } from '../../../pages/children/blog/[...slug]'

const buildSuffix = (url?: {query?: Record<string, string>, hash?: string}) => {
const query = url?.query
const hash = url?.hash
if (!query && !hash) return ''
const search = query ? `?${new URLSearchParams(query)}` : ''
return `${search}${hash ? `#${hash}` : ''}`
}

export const pagesPath = {
"%E6%97%A5%E6%9C%AC%E8%AA%9E": {
$url: (url?: { hash?: string }) => ({ pathname: '/%E6%97%A5%E6%9C%AC%E8%AA%9E' as const, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/%E6%97%A5%E6%9C%AC%E8%AA%9E' as const, hash: url?.hash, path: `/%E6%97%A5%E6%9C%AC%E8%AA%9E${buildSuffix(url)}` })
},
_pid: (pid: string | number) => ({
$url: (url?: { query?: OptionalQuery1, hash?: string }) => ({ pathname: '/[pid]' as const, query: { pid, ...url?.query }, hash: url?.hash })
$url: (url?: { query?: OptionalQuery1, hash?: string }) => ({ pathname: '/[pid]' as const, query: { pid, ...url?.query }, hash: url?.hash, path: `/${pid}${buildSuffix(url)}` })
}),
"blog": {
_slug: (slug: string[]) => ({
$url: (url: { query: Query2, hash?: string }) => ({ pathname: '/blog/[...slug]' as const, query: { slug, ...url.query }, hash: url.hash })
$url: (url: { query: Query2, hash?: string }) => ({ pathname: '/blog/[...slug]' as const, query: { slug, ...url.query }, hash: url.hash, path: `/blog/${slug?.join('/')}${buildSuffix(url)}` })
}),
"hoge": {
_fuga: (fuga?: string[]) => ({
$url: (url?: { hash?: string }) => ({ pathname: '/blog/hoge/[[...fuga]]' as const, query: { fuga }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/blog/hoge/[[...fuga]]' as const, query: { fuga }, hash: url?.hash, path: `/blog/hoge/${fuga?.join('/')}${buildSuffix(url)}` })
})
}
},
"aaa": {
_bbb: (bbb: string[]) => ({
"ccc": {
$url: (url?: { hash?: string }) => ({ pathname: '/aaa/[...bbb]/ccc' as const, query: { bbb }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/aaa/[...bbb]/ccc' as const, query: { bbb }, hash: url?.hash, path: `/aaa/${bbb?.join('/')}/ccc${buildSuffix(url)}` })
}
}),
},
"x": {
_y: (y: string | number) => ({
"z": {
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]/z' as const, query: { y }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]/z' as const, query: { y }, hash: url?.hash, path: `/x/${y}/z${buildSuffix(url)}` })
},
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]' as const, query: { y }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]' as const, query: { y }, hash: url?.hash, path: `/x/${y}${buildSuffix(url)}` })
}),
$url: (url?: { hash?: string }) => ({ pathname: '/x' as const, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/x' as const, hash: url?.hash, path: `/x${buildSuffix(url)}` })
},
_a: (a: string | number) => ({
"b": {
_c: (c: string[]) => ({
$url: (url?: { hash?: string }) => ({ pathname: '/[a]/b/[...c]' as const, query: { a, c }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/[a]/b/[...c]' as const, query: { a, c }, hash: url?.hash, path: `/${a}/b/${c?.join('/')}${buildSuffix(url)}` })
})
}
}),
$url: (url: { query: Query0, hash?: string }) => ({ pathname: '/' as const, query: url.query, hash: url.hash }),
$url: (url: { query: Query0, hash?: string }) => ({ pathname: '/' as const, query: url.query, hash: url.hash, path: `/${buildSuffix(url)}` }),
"children": {
"%E6%97%A5%E6%9C%AC%E8%AA%9E": {
$url: (url?: { hash?: string }) => ({ pathname: '/children/%E6%97%A5%E6%9C%AC%E8%AA%9E' as const, hash: url?.hash })
Expand Down
30 changes: 19 additions & 11 deletions projects/nextjs-stable-appdir/out/lib/static/$path.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,50 +4,58 @@ import type { Query as Query2 } from '../../../app/(group1)/blog/[...slug]/page'
import type { OptionalQuery as OptionalQuery3 } from '../../../pages/children/[pid]'
import type { Query as Query4 } from '../../../pages/children/blog/[...slug]'

const buildSuffix = (url?: {query?: Record<string, string>, hash?: string}) => {
const query = url?.query
const hash = url?.hash
if (!query && !hash) return ''
const search = query ? `?${new URLSearchParams(query)}` : ''
return `${search}${hash ? `#${hash}` : ''}`
}

export const pagesPath = {
"%E6%97%A5%E6%9C%AC%E8%AA%9E": {
$url: (url?: { hash?: string }) => ({ pathname: '/%E6%97%A5%E6%9C%AC%E8%AA%9E' as const, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/%E6%97%A5%E6%9C%AC%E8%AA%9E' as const, hash: url?.hash, path: `/%E6%97%A5%E6%9C%AC%E8%AA%9E${buildSuffix(url)}` })
},
_pid: (pid: string | number) => ({
$url: (url?: { query?: OptionalQuery1, hash?: string }) => ({ pathname: '/[pid]' as const, query: { pid, ...url?.query }, hash: url?.hash })
$url: (url?: { query?: OptionalQuery1, hash?: string }) => ({ pathname: '/[pid]' as const, query: { pid, ...url?.query }, hash: url?.hash, path: `/${pid}${buildSuffix(url)}` })
}),
"blog": {
_slug: (slug: string[]) => ({
$url: (url: { query: Query2, hash?: string }) => ({ pathname: '/blog/[...slug]' as const, query: { slug, ...url.query }, hash: url.hash })
$url: (url: { query: Query2, hash?: string }) => ({ pathname: '/blog/[...slug]' as const, query: { slug, ...url.query }, hash: url.hash, path: `/blog/${slug?.join('/')}${buildSuffix(url)}` })
}),
"hoge": {
_fuga: (fuga?: string[]) => ({
$url: (url?: { hash?: string }) => ({ pathname: '/blog/hoge/[[...fuga]]' as const, query: { fuga }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/blog/hoge/[[...fuga]]' as const, query: { fuga }, hash: url?.hash, path: `/blog/hoge/${fuga?.join('/')}${buildSuffix(url)}` })
})
}
},
"aaa": {
_bbb: (bbb: string[]) => ({
"ccc": {
$url: (url?: { hash?: string }) => ({ pathname: '/aaa/[...bbb]/ccc' as const, query: { bbb }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/aaa/[...bbb]/ccc' as const, query: { bbb }, hash: url?.hash, path: `/aaa/${bbb?.join('/')}/ccc${buildSuffix(url)}` })
}
}),
},
"x": {
_y: (y: string | number) => ({
"z": {
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]/z' as const, query: { y }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]/z' as const, query: { y }, hash: url?.hash, path: `/x/${y}/z${buildSuffix(url)}` })
},
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]' as const, query: { y }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/x/[y]' as const, query: { y }, hash: url?.hash, path: `/x/${y}${buildSuffix(url)}` })
}),
$url: (url?: { hash?: string }) => ({ pathname: '/x' as const, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/x' as const, hash: url?.hash, path: `/x${buildSuffix(url)}` })
},
"_ignore": {
$url: (url?: { hash?: string }) => ({ pathname: '/.ignore' as const, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/.ignore' as const, hash: url?.hash, path: `/.ignore${buildSuffix(url)}` })
},
_a: (a: string | number) => ({
"b": {
_c: (c: string[]) => ({
$url: (url?: { hash?: string }) => ({ pathname: '/[a]/b/[...c]' as const, query: { a, c }, hash: url?.hash })
$url: (url?: { hash?: string }) => ({ pathname: '/[a]/b/[...c]' as const, query: { a, c }, hash: url?.hash, path: `/${a}/b/${c?.join('/')}${buildSuffix(url)}` })
})
}
}),
$url: (url: { query: Query0, hash?: string }) => ({ pathname: '/' as const, query: url.query, hash: url.hash }),
$url: (url: { query: Query0, hash?: string }) => ({ pathname: '/' as const, query: url.query, hash: url.hash, path: `/${buildSuffix(url)}` }),
"children": {
"%E6%97%A5%E6%9C%AC%E8%AA%9E": {
$url: (url?: { hash?: string }) => ({ pathname: '/children/%E6%97%A5%E6%9C%AC%E8%AA%9E' as const, hash: url?.hash })
Expand Down

0 comments on commit bed2cad

Please sign in to comment.