🐛 FIX: hash url with param & without searchParam (#840)

jycouet · Jan 19, 2025 · a84566e · a84566e
1 parent 89f6ede
commit a84566e
Show file tree

Hide file tree

Showing 26 changed files with 146 additions and 49 deletions.
diff --git a/.changeset/gold-houses-mix.md b/.changeset/gold-houses-mix.md
@@ -0,0 +1,5 @@
+---
+'vite-plugin-kit-routes': patch
+---
+
+fix hash url with param & without searchParam
diff --git a/packages/vite-plugin-kit-routes/src/lib/ROUTES.ts b/packages/vite-plugin-kit-routes/src/lib/ROUTES.ts
@@ -77,6 +77,12 @@ const PAGES = {
     params['hash'] = params['hash'] ?? 'section0'
     return `/anchors${appendSp({ anotherOne: params['anotherOne'], __KIT_ROUTES_ANCHOR__: params['hash'] })}`
   },
+  '/anchors/[id]': (params: {
+    id: string | number
+    hash: 'section0' | 'section1' | 'section2' | 'section3'
+  }) => {
+    return `/anchors/${params['id']}${appendSp({ __KIT_ROUTES_ANCHOR__: params['hash'] })}`
+  },
   '/lay/normal': `/lay/normal`,
   '/lay/root-layout': `/lay/root-layout`,
   '/lay/skip': `/lay/skip`,
@@ -207,7 +213,7 @@ export const appendSp = (
 
   const formatted = params.toString()
   if (formatted || anchor) {
-    return `${prefix}${formatted}${anchor}`
+    return `${prefix}${formatted}${anchor}`.replace('?#', '#')
   }
   return ''
 }
@@ -299,6 +305,7 @@ export type KIT_ROUTES = {
     '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang'
     '/a/[...rest]/z': 'rest'
     '/anchors': never
+    '/anchors/[id]': 'id'
     '/lay/normal': never
     '/lay/root-layout': never
     '/lay/skip': never

diff --git a/packages/vite-plugin-kit-routes/src/lib/format.ts b/packages/vite-plugin-kit-routes/src/lib/format.ts
@@ -54,7 +54,7 @@ export const appendSp = (
 
   const formatted = params.toString()
   if (formatted || anchor) {
-    return \`\${prefix}\${formatted}\${anchor}\`
+    return \`\${prefix}\${formatted}\${anchor}\`.replace('?#', '#')
   }
   return ''
 }

diff --git a/packages/vite-plugin-kit-routes/src/lib/plugins.spec.ts b/packages/vite-plugin-kit-routes/src/lib/plugins.spec.ts
@@ -373,6 +373,9 @@ describe('run()', async () => {
           required: true,
         },
       },
+      anchors_id: {
+        hash: { type: '"section0" | "section1" | "section2" | "section3"', required: true },
+      },
     },
     SERVERS: {},
     ACTIONS: {
@@ -399,6 +402,7 @@ describe('run()', async () => {
       '/site_contract/[siteId]-[contractId]':
         commonConfig_variables.PAGES?.site_contract_siteId_contractId,
       '/anchors': commonConfig_variables.PAGES?.anchors,
+      '/anchors/[id]': commonConfig_variables.PAGES?.anchors_id,
     },
     SERVERS: {},
     ACTIONS: {
@@ -418,6 +422,7 @@ describe('run()', async () => {
       '/[[lang]]/site_contract/[siteId]-[contractId]':
         commonConfig_variables.PAGES?.site_contract_siteId_contractId,
       '/anchors': commonConfig_variables.PAGES?.anchors,
+      '/anchors/[id]': commonConfig_variables.PAGES?.anchors_id,
     },
     SERVERS: {},
     ACTIONS: {
@@ -436,6 +441,8 @@ describe('run()', async () => {
       match_id_int: commonConfig_variables.PAGES?.match_id_int,
       site_contract_siteId_contractId:
         commonConfig_variables.PAGES?.site_contract_siteId_contractId,
+      anchors: commonConfig_variables.PAGES?.anchors,
+      anchors_id: commonConfig_variables.PAGES?.anchors_id,
     },
     SERVERS: {},
     ACTIONS: {
@@ -928,6 +935,7 @@ describe('rmv Helper', () => {
         "/site_contract/[siteId]-[contractId]/+page.svelte",
         "a/[...rest]/z/+page.svelte",
         "anchors/+page.svelte",
+        "anchors/[id]/+page.svelte",
         "api/graphql/+server.ts",
         "data/errors/[locale].json/+server.ts",
         "lay/(layVerySpecial)/+layout.svelte",
@@ -978,6 +986,7 @@ describe('rmv Helper', () => {
         "[[lang]]/site_contract/[siteId]-[contractId]/+page.svelte",
         "a/[...rest]/z/+page.svelte",
         "anchors/+page.svelte",
+        "anchors/[id]/+page.svelte",
         "api/graphql/+server.ts",
         "data/errors/[locale].json/+server.ts",
         "lay/(layVerySpecial)/+layout.svelte",
@@ -1021,6 +1030,7 @@ describe('rmv Helper', () => {
         "[[lang]]/site_contract/[siteId]-[contractId]/+page.svelte",
         "a/[...rest]/z/+page.svelte",
         "anchors/+page.svelte",
+        "anchors/[id]/+page.svelte",
         "api/graphql/+server.ts",
         "data/errors/[locale].json/+server.ts",
         "lay/+layout.svelte",
@@ -1067,6 +1077,7 @@ describe('rmv Helper', () => {
         "/site_contract/[siteId]-[contractId]/+page.svelte",
         "a/[...rest]/z/+page.svelte",
         "anchors/+page.svelte",
+        "anchors/[id]/+page.svelte",
         "api/graphql/+server.ts",
         "data/errors/[locale].json/+server.ts",
         "lay/+layout.svelte",

diff --git a/packages/vite-plugin-kit-routes/src/routes/+layout.svelte b/packages/vite-plugin-kit-routes/src/routes/+layout.svelte
@@ -103,7 +103,12 @@
     <a href="/COUCOU-Yop">Unsafe Link</a>
   </li>
   <li>
-    <a href={route('/anchors', { hash: 'section0', anotherOne: 'coucou' })}>Anchors</a>
+    <a href={route('/anchors', { hash: 'section0' })}>Anchors</a> |
+    <a href={route('/anchors', { hash: 'section0', anotherOne: 'coucou' })}
+      >Anchors with second param</a
+    >
+    |
+    <a href={route('/anchors/[id]', { hash: 'section2', id: '123' })}>Anchors with second param</a>
   </li>
 </ul>
 

diff --git a/packages/vite-plugin-kit-routes/src/routes/anchors/[id]/+page.svelte b/packages/vite-plugin-kit-routes/src/routes/anchors/[id]/+page.svelte
@@ -0,0 +1 @@
+Plop from Anchors/[id]
diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_base.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_base.ts
@@ -48,6 +48,9 @@ const PAGES = {
     return `${base}/a/${params['rest']?.join('/')}/z`
   },
   "/anchors": `${base}/anchors`,
+  "/anchors/[id]": (params: { id: (string | number) }) => {
+    return `${base}/anchors/${params['id']}`
+  },
   "/lay/normal": `${base}/lay/normal`,
   "/lay/root-layout": `${base}/lay/root-layout`,
   "/lay/skip": `${base}/lay/skip`,
@@ -145,7 +148,7 @@ export const appendSp = (
 
   const formatted = params.toString()
   if (formatted || anchor) {
-    return `${prefix}${formatted}${anchor}`
+    return `${prefix}${formatted}${anchor}`.replace('?#', '#')
   }
   return ''
 }
@@ -215,7 +218,7 @@ export function route<T extends keyof AllTypes>(key: T, ...params: any[]): strin
 * ```
 */
 export type KIT_ROUTES = {
-  PAGES: { '/': never, '/subGroup': never, '/subGroup/user': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'id' | 'lang', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=ab]': 'id' | 'lang', '/match/[id=int]': 'id' | 'lang', '/site': 'lang', '/site/[id]': 'id' | 'lang', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/anchors': never, '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never, '/spArray': never, '/spArrayComma': never }
+  PAGES: { '/': never, '/subGroup': never, '/subGroup/user': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'id' | 'lang', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=ab]': 'id' | 'lang', '/match/[id=int]': 'id' | 'lang', '/site': 'lang', '/site/[id]': 'id' | 'lang', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/anchors': never, '/anchors/[id]': 'id', '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never, '/spArray': never, '/spArrayComma': never }
   SERVERS: { 'GET /server_func_get': never, 'GET /server_func_get_and_': never, 'POST /server_func_post': never, 'GET /contract': 'lang', 'POST /contract': 'lang', 'GET /site': 'lang', 'GET /api/graphql': never, 'POST /api/graphql': never, 'GET /data/errors/[locale].json': 'locale' }
   ACTIONS: { 'default /contract/[id]': 'id' | 'lang', 'create /site': 'lang', 'update /site/[id]': 'id' | 'lang', 'delete /site/[id]': 'id' | 'lang', 'noSatisfies /site_contract': 'lang', 'send /site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang' }
   LINKS: Record<string, never>

diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-object-path.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-object-path.ts
@@ -54,6 +54,9 @@ export const PAGES = {
   "/anchors": (params: { hash: ("section0" | "section1" | "section2" | "section3") }) => {
     return `/anchors${appendSp({ '__KIT_ROUTES_ANCHOR__': params['hash'] })}`
   },
+  "/anchors/[id]": (params: { id: (string | number), hash: ("section0" | "section1" | "section2" | "section3") }) => {
+    return `/anchors/${params['id']}${appendSp({ '__KIT_ROUTES_ANCHOR__': params['hash'] })}`
+  },
   "/lay/normal": `/lay/normal`,
   "/lay/root-layout": `/lay/root-layout`,
   "/lay/skip": `/lay/skip`,
@@ -160,7 +163,7 @@ export const appendSp = (
 
   const formatted = params.toString()
   if (formatted || anchor) {
-    return `${prefix}${formatted}${anchor}`
+    return `${prefix}${formatted}${anchor}`.replace('?#', '#')
   }
   return ''
 }
@@ -198,7 +201,7 @@ export const currentSp = () => {
 * ```
 */
 export type KIT_ROUTES = {
-  PAGES: { '/': never, '/subGroup': never, '/subGroup/user': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'id' | 'lang', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=ab]': 'id' | 'lang', '/match/[id=int]': 'id' | 'lang', '/site': 'lang', '/site/[id]': 'lang' | 'id', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/anchors': never, '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never, '/spArray': never, '/spArrayComma': never }
+  PAGES: { '/': never, '/subGroup': never, '/subGroup/user': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'id' | 'lang', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=ab]': 'id' | 'lang', '/match/[id=int]': 'id' | 'lang', '/site': 'lang', '/site/[id]': 'lang' | 'id', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/anchors': never, '/anchors/[id]': 'id', '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never, '/spArray': never, '/spArrayComma': never }
   SERVERS: { 'GET /server_func_get': never, 'GET /server_func_get_and_': never, 'POST /server_func_post': never, 'GET /contract': 'lang', 'POST /contract': 'lang', 'GET /site': 'lang', 'GET /api/graphql': never, 'POST /api/graphql': never, 'GET /data/errors/[locale].json': 'locale' }
   ACTIONS: { 'default /contract/[id]': 'id' | 'lang', 'create /site': 'lang', 'update /site/[id]': 'id' | 'lang', 'delete /site/[id]': 'id' | 'lang', 'noSatisfies /site_contract': 'lang', 'send /site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang' }
   LINKS: { 'twitter': never, 'twitter_post': 'name' | 'id', 'gravatar': 'str' }

diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-object-path_shortened.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-object-path_shortened.ts
@@ -54,6 +54,9 @@ export const PAGES = {
   "/anchors": (hash: ("section0" | "section1" | "section2" | "section3"), params?: {  }) => {
     return `/anchors${appendSp({ '__KIT_ROUTES_ANCHOR__': hash })}`
   },
+  "/anchors/[id]": (params: { id: (string | number), hash: ("section0" | "section1" | "section2" | "section3") }) => {
+    return `/anchors/${params['id']}${appendSp({ '__KIT_ROUTES_ANCHOR__': params['hash'] })}`
+  },
   "/lay/normal": `/lay/normal`,
   "/lay/root-layout": `/lay/root-layout`,
   "/lay/skip": `/lay/skip`,
@@ -161,7 +164,7 @@ export const appendSp = (
 
   const formatted = params.toString()
   if (formatted || anchor) {
-    return `${prefix}${formatted}${anchor}`
+    return `${prefix}${formatted}${anchor}`.replace('?#', '#')
   }
   return ''
 }
@@ -199,7 +202,7 @@ export const currentSp = () => {
 * ```
 */
 export type KIT_ROUTES = {
-  PAGES: { '/': never, '/subGroup': never, '/subGroup/user': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'lang' | 'id', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=ab]': 'lang' | 'id', '/match/[id=int]': 'lang' | 'id', '/site': 'lang', '/site/[id]': 'lang' | 'id', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/anchors': never, '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never, '/spArray': never, '/spArrayComma': never }
+  PAGES: { '/': never, '/subGroup': never, '/subGroup/user': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'lang' | 'id', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=ab]': 'lang' | 'id', '/match/[id=int]': 'lang' | 'id', '/site': 'lang', '/site/[id]': 'lang' | 'id', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/anchors': never, '/anchors/[id]': 'id', '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never, '/spArray': never, '/spArrayComma': never }
   SERVERS: { 'GET /server_func_get': never, 'GET /server_func_get_and_': never, 'POST /server_func_post': never, 'GET /contract': 'lang', 'POST /contract': 'lang', 'GET /site': 'lang', 'GET /api/graphql': never, 'POST /api/graphql': never, 'GET /data/errors/[locale].json': 'locale' }
   ACTIONS: { 'default /contract/[id]': 'lang' | 'id', 'create /site': 'lang', 'update /site/[id]': 'lang' | 'id', 'delete /site/[id]': 'lang' | 'id', 'noSatisfies /site_contract': 'lang', 'send /site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang' }
   LINKS: { 'twitter': never, 'twitter_post': 'name' | 'id', 'gravatar': 'str' }

diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-object-symbol.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-object-symbol.ts
@@ -54,6 +54,9 @@ export const PAGES = {
   "anchors": (params: { hash: ("section0" | "section1" | "section2" | "section3") }) => {
     return `/anchors${appendSp({ '__KIT_ROUTES_ANCHOR__': params['hash'] })}`
   },
+  "anchors_id": (params: { id: (string | number), hash: ("section0" | "section1" | "section2" | "section3") }) => {
+    return `/anchors/${params['id']}${appendSp({ '__KIT_ROUTES_ANCHOR__': params['hash'] })}`
+  },
   "lay_normal": `/lay/normal`,
   "lay_root_layout": `/lay/root-layout`,
   "lay_skip": `/lay/skip`,
@@ -164,7 +167,7 @@ export const appendSp = (
 
   const formatted = params.toString()
   if (formatted || anchor) {
-    return `${prefix}${formatted}${anchor}`
+    return `${prefix}${formatted}${anchor}`.replace('?#', '#')
   }
   return ''
 }
@@ -202,7 +205,7 @@ export const currentSp = () => {
 * ```
 */
 export type KIT_ROUTES = {
-  PAGES: { '_ROOT': never, 'subGroup': never, 'subGroup_user': never, 'subGroup2': never, 'contract': 'lang', 'contract_id': 'id' | 'lang', 'gp_one': 'lang', 'gp_two': 'lang', 'main': 'lang', 'match_id_ab': 'id' | 'lang', 'match_id_int': 'id' | 'lang', 'site': 'lang', 'site_id': 'lang' | 'id', 'site_contract_siteId_contractId': 'siteId' | 'contractId' | 'lang', 'a_rest_z': 'rest', 'anchors': never, 'lay_normal': never, 'lay_root_layout': never, 'lay_skip': never, 'sp': never, 'spArray': never, 'spArrayComma': never }
+  PAGES: { '_ROOT': never, 'subGroup': never, 'subGroup_user': never, 'subGroup2': never, 'contract': 'lang', 'contract_id': 'id' | 'lang', 'gp_one': 'lang', 'gp_two': 'lang', 'main': 'lang', 'match_id_ab': 'id' | 'lang', 'match_id_int': 'id' | 'lang', 'site': 'lang', 'site_id': 'lang' | 'id', 'site_contract_siteId_contractId': 'siteId' | 'contractId' | 'lang', 'a_rest_z': 'rest', 'anchors': never, 'anchors_id': 'id', 'lay_normal': never, 'lay_root_layout': never, 'lay_skip': never, 'sp': never, 'spArray': never, 'spArrayComma': never }
   SERVERS: { 'GET_server_func_get': never, 'GET_server_func_get_and': never, 'POST_server_func_post': never, 'GET_contract': 'lang', 'POST_contract': 'lang', 'GET_site': 'lang', 'GET_api_graphql': never, 'POST_api_graphql': never, 'GET_data_errors_locale_json': 'locale' }
   ACTIONS: { 'default_contract_id': 'id' | 'lang', 'create_site': 'lang', 'update_site_id': 'id' | 'lang', 'delete_site_id': 'id' | 'lang', 'noSatisfies_site_contract': 'lang', 'send_site_contract_siteId_contractId': 'siteId' | 'contractId' | 'lang' }
   LINKS: { 'twitter': never, 'twitter_post': 'name' | 'id', 'gravatar': 'str' }

diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-object-symbol_shortened.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-object-symbol_shortened.ts
@@ -54,6 +54,9 @@ export const PAGES = {
   "anchors": (hash: ("section0" | "section1" | "section2" | "section3"), params?: {  }) => {
     return `/anchors${appendSp({ '__KIT_ROUTES_ANCHOR__': hash })}`
   },
+  "anchors_id": (params: { id: (string | number), hash: ("section0" | "section1" | "section2" | "section3") }) => {
+    return `/anchors/${params['id']}${appendSp({ '__KIT_ROUTES_ANCHOR__': params['hash'] })}`
+  },
   "lay_normal": `/lay/normal`,
   "lay_root_layout": `/lay/root-layout`,
   "lay_skip": `/lay/skip`,
@@ -165,7 +168,7 @@ export const appendSp = (
 
   const formatted = params.toString()
   if (formatted || anchor) {
-    return `${prefix}${formatted}${anchor}`
+    return `${prefix}${formatted}${anchor}`.replace('?#', '#')
   }
   return ''
 }
@@ -203,7 +206,7 @@ export const currentSp = () => {
 * ```
 */
 export type KIT_ROUTES = {
-  PAGES: { '_ROOT': never, 'subGroup': never, 'subGroup_user': never, 'subGroup2': never, 'contract': 'lang', 'contract_id': 'lang' | 'id', 'gp_one': 'lang', 'gp_two': 'lang', 'main': 'lang', 'match_id_ab': 'lang' | 'id', 'match_id_int': 'lang' | 'id', 'site': 'lang', 'site_id': 'lang' | 'id', 'site_contract_siteId_contractId': 'siteId' | 'contractId' | 'lang', 'a_rest_z': 'rest', 'anchors': never, 'lay_normal': never, 'lay_root_layout': never, 'lay_skip': never, 'sp': never, 'spArray': never, 'spArrayComma': never }
+  PAGES: { '_ROOT': never, 'subGroup': never, 'subGroup_user': never, 'subGroup2': never, 'contract': 'lang', 'contract_id': 'lang' | 'id', 'gp_one': 'lang', 'gp_two': 'lang', 'main': 'lang', 'match_id_ab': 'lang' | 'id', 'match_id_int': 'lang' | 'id', 'site': 'lang', 'site_id': 'lang' | 'id', 'site_contract_siteId_contractId': 'siteId' | 'contractId' | 'lang', 'a_rest_z': 'rest', 'anchors': never, 'anchors_id': 'id', 'lay_normal': never, 'lay_root_layout': never, 'lay_skip': never, 'sp': never, 'spArray': never, 'spArrayComma': never }
   SERVERS: { 'GET_server_func_get': never, 'GET_server_func_get_and': never, 'POST_server_func_post': never, 'GET_contract': 'lang', 'POST_contract': 'lang', 'GET_site': 'lang', 'GET_api_graphql': never, 'POST_api_graphql': never, 'GET_data_errors_locale_json': 'locale' }
   ACTIONS: { 'default_contract_id': 'lang' | 'id', 'create_site': 'lang', 'update_site_id': 'lang' | 'id', 'delete_site_id': 'lang' | 'id', 'noSatisfies_site_contract': 'lang', 'send_site_contract_siteId_contractId': 'siteId' | 'contractId' | 'lang' }
   LINKS: { 'twitter': never, 'twitter_post': 'name' | 'id', 'gravatar': 'str' }

diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-and-object-path.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-and-object-path.ts
@@ -54,6 +54,9 @@ export const PAGES = {
   "/anchors": (params: { hash: ("section0" | "section1" | "section2" | "section3") }) => {
     return `/anchors${appendSp({ '__KIT_ROUTES_ANCHOR__': params['hash'] })}`
   },
+  "/anchors/[id]": (params: { id: (string | number), hash: ("section0" | "section1" | "section2" | "section3") }) => {
+    return `/anchors/${params['id']}${appendSp({ '__KIT_ROUTES_ANCHOR__': params['hash'] })}`
+  },
   "/lay/normal": `/lay/normal`,
   "/lay/root-layout": `/lay/root-layout`,
   "/lay/skip": `/lay/skip`,
@@ -160,7 +163,7 @@ export const appendSp = (
 
   const formatted = params.toString()
   if (formatted || anchor) {
-    return `${prefix}${formatted}${anchor}`
+    return `${prefix}${formatted}${anchor}`.replace('?#', '#')
   }
   return ''
 }
@@ -230,7 +233,7 @@ export function route<T extends keyof AllTypes>(key: T, ...params: any[]): strin
 * ```
 */
 export type KIT_ROUTES = {
-  PAGES: { '/': never, '/subGroup': never, '/subGroup/user': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'id' | 'lang', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=ab]': 'id' | 'lang', '/match/[id=int]': 'id' | 'lang', '/site': 'lang', '/site/[id]': 'lang' | 'id', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/anchors': never, '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never, '/spArray': never, '/spArrayComma': never }
+  PAGES: { '/': never, '/subGroup': never, '/subGroup/user': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'id' | 'lang', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=ab]': 'id' | 'lang', '/match/[id=int]': 'id' | 'lang', '/site': 'lang', '/site/[id]': 'lang' | 'id', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/anchors': never, '/anchors/[id]': 'id', '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never, '/spArray': never, '/spArrayComma': never }
   SERVERS: { 'GET /server_func_get': never, 'GET /server_func_get_and_': never, 'POST /server_func_post': never, 'GET /contract': 'lang', 'POST /contract': 'lang', 'GET /site': 'lang', 'GET /api/graphql': never, 'POST /api/graphql': never, 'GET /data/errors/[locale].json': 'locale' }
   ACTIONS: { 'default /contract/[id]': 'id' | 'lang', 'create /site': 'lang', 'update /site/[id]': 'id' | 'lang', 'delete /site/[id]': 'id' | 'lang', 'noSatisfies /site_contract': 'lang', 'send /site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang' }
   LINKS: { 'twitter': never, 'twitter_post': 'name' | 'id', 'gravatar': 'str' }