diff --git a/.changeset/quick-moles-sin.md b/.changeset/quick-moles-sin.md new file mode 100644 index 000000000..093d43d03 --- /dev/null +++ b/.changeset/quick-moles-sin.md @@ -0,0 +1,5 @@ +--- +'vite-plugin-kit-routes': patch +--- + +fix: symbol format with a path having a "." is now handle diff --git a/packages/vite-plugin-kit-routes/src/lib/ROUTES.ts b/packages/vite-plugin-kit-routes/src/lib/ROUTES.ts index 0e3013462..844428cf0 100644 --- a/packages/vite-plugin-kit-routes/src/lib/ROUTES.ts +++ b/packages/vite-plugin-kit-routes/src/lib/ROUTES.ts @@ -93,6 +93,9 @@ const SERVERS = { }, 'GET /api/graphql': `/api/graphql`, 'POST /api/graphql': `/api/graphql`, + 'GET /data/errors/[locale].json': (params: { locale: string | number }) => { + return `/data/errors/${params.locale}.json` + }, } /** @@ -267,6 +270,7 @@ export type KIT_ROUTES = { 'GET /site': 'lang' 'GET /api/graphql': never 'POST /api/graphql': never + 'GET /data/errors/[locale].json': 'locale' } ACTIONS: { 'default /contract/[id]': 'id' | 'lang' @@ -286,6 +290,7 @@ export type KIT_ROUTES = { siteId: never contractId: never rest: never + locale: never redirectTo: never extra: never name: never diff --git a/packages/vite-plugin-kit-routes/src/lib/fs.spec.ts b/packages/vite-plugin-kit-routes/src/lib/fs.spec.ts index 4c239d02b..039733a6a 100644 --- a/packages/vite-plugin-kit-routes/src/lib/fs.spec.ts +++ b/packages/vite-plugin-kit-routes/src/lib/fs.spec.ts @@ -30,6 +30,7 @@ describe('fs', () => { "[[lang]]/site_contract/[siteId]-[contractId]/+page.svelte", "a/[...rest]/z/+page.svelte", "api/graphql/+server.ts", + "data/errors/[locale].json/+server.ts", "lay/(layVerySpecial)/+layout.svelte", "lay/(layVerySpecial)/normal/+page.svelte", "lay/(layVerySpecial)/root-layout/+page@.svelte", @@ -69,6 +70,7 @@ describe('rmv Helper', () => { "/site_contract/[siteId]-[contractId]/+page.svelte", "a/[...rest]/z/+page.svelte", "api/graphql/+server.ts", + "data/errors/[locale].json/+server.ts", "lay/(layVerySpecial)/+layout.svelte", "lay/(layVerySpecial)/normal/+page.svelte", "lay/(layVerySpecial)/root-layout/+page@.svelte", @@ -106,6 +108,7 @@ describe('rmv Helper', () => { "[[lang]]/site_contract/[siteId]-[contractId]/+page.svelte", "a/[...rest]/z/+page.svelte", "api/graphql/+server.ts", + "data/errors/[locale].json/+server.ts", "lay/+layout.svelte", "lay/normal/+page.svelte", "lay/root-layout/+page@.svelte", @@ -143,6 +146,7 @@ describe('rmv Helper', () => { "/site_contract/[siteId]-[contractId]/+page.svelte", "a/[...rest]/z/+page.svelte", "api/graphql/+server.ts", + "data/errors/[locale].json/+server.ts", "lay/+layout.svelte", "lay/normal/+page.svelte", "lay/root-layout/+page@.svelte", diff --git a/packages/vite-plugin-kit-routes/src/lib/plugin.ts b/packages/vite-plugin-kit-routes/src/lib/plugin.ts index 370649cd1..8b7590a37 100644 --- a/packages/vite-plugin-kit-routes/src/lib/plugin.ts +++ b/packages/vite-plugin-kit-routes/src/lib/plugin.ts @@ -260,7 +260,7 @@ export function formatKey(key: string, o: Options) { return toRet } - const toReplace = ['/', '[', ']', '(', ')', '-', '='] + const toReplace = ['/', '[', ']', '(', ')', '-', '=', '.'] toRet = toRet .split('') .map(c => (toReplace.includes(c) ? '_' : c)) diff --git a/packages/vite-plugin-kit-routes/src/routes/data/errors/[locale].json/+server.ts b/packages/vite-plugin-kit-routes/src/routes/data/errors/[locale].json/+server.ts new file mode 100644 index 000000000..33e04b1ee --- /dev/null +++ b/packages/vite-plugin-kit-routes/src/routes/data/errors/[locale].json/+server.ts @@ -0,0 +1,3 @@ +export const GET = async () => { + return new Response() +} diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_base.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_base.ts index 516cd569c..8b138b3bb 100644 --- a/packages/vite-plugin-kit-routes/src/test/ROUTES_base.ts +++ b/packages/vite-plugin-kit-routes/src/test/ROUTES_base.ts @@ -62,7 +62,10 @@ const SERVERS = { return `${base}${params?.lang ? `/${params?.lang}`: ''}/site` }, "GET /api/graphql": `${base}/api/graphql`, - "POST /api/graphql": `${base}/api/graphql` + "POST /api/graphql": `${base}/api/graphql`, + "GET /data/errors/[locale].json": (params: { locale: (string | number) }) => { + return `${base}/data/errors/${params.locale}.json` + } } /** @@ -173,8 +176,8 @@ export function route(key: T, ...params: any[]): strin */ export type KIT_ROUTES = { PAGES: { '/': never, '/subGroup': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'id' | 'lang', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=int]': 'id' | 'lang', '/site': 'lang', '/site/[id]': 'id' | 'lang', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never } - SERVERS: { 'GET /contract': 'lang', 'POST /contract': 'lang', 'GET /site': 'lang', 'GET /api/graphql': never, 'POST /api/graphql': never } + SERVERS: { '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 - Params: { lang: never, id: never, siteId: never, contractId: never, rest: never } + Params: { lang: never, id: never, siteId: never, contractId: never, rest: never, locale: never } } diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-format-variables.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-format-variables.ts index 037e8c522..07596cbfe 100644 --- a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-format-variables.ts +++ b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-format-variables.ts @@ -64,6 +64,9 @@ export const SERVER_GET_site = (params?: { lang?: ('fr' | 'en' | 'hu' | 'at' | s } export const SERVER_GET_api_graphql = `/api/graphql` export const SERVER_POST_api_graphql = `/api/graphql` +export const SERVER_GET_data_errors_locale_json = (params: { locale: (string | number) }) => { + return `/data/errors/${params.locale}.json` +} /** * ACTIONS @@ -151,8 +154,8 @@ export const currentSp = () => { */ export type KIT_ROUTES = { PAGES: { '_ROOT': never, 'subGroup': never, 'subGroup2': never, 'contract': 'lang', 'contract_id': 'id' | 'lang', 'gp_one': 'lang', 'gp_two': 'lang', 'main': 'lang', 'match_id_int': 'id' | 'lang', 'site': 'lang', 'site_id': 'lang' | 'id', 'site_contract_siteId_contractId': 'siteId' | 'contractId' | 'lang', 'a_rest_z': 'rest', 'lay_normal': never, 'lay_root_layout': never, 'lay_skip': never, 'sp': never } - SERVERS: { 'GET_contract': 'lang', 'POST_contract': 'lang', 'GET_site': 'lang', 'GET_api_graphql': never, 'POST_api_graphql': never } + SERVERS: { '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' } - Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, extra: never, name: never, str: never, s: never, d: never } + Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, locale: never, extra: never, name: never, str: never, s: never, d: never } } diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-format-variables_shortened.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-format-variables_shortened.ts index e6c18e1bd..76d9d2fb3 100644 --- a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-format-variables_shortened.ts +++ b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-format-variables_shortened.ts @@ -64,6 +64,9 @@ export const SERVER_GET_site = (params?: { lang?: ('fr' | 'en' | 'hu' | 'at' | s } export const SERVER_GET_api_graphql = `/api/graphql` export const SERVER_POST_api_graphql = `/api/graphql` +export const SERVER_GET_data_errors_locale_json = (locale: (string | number), params?: { }) => { + return `/data/errors/${locale}.json` +} /** * ACTIONS @@ -152,8 +155,8 @@ export const currentSp = () => { */ export type KIT_ROUTES = { PAGES: { '_ROOT': never, 'subGroup': never, 'subGroup2': never, 'contract': 'lang', 'contract_id': 'lang' | 'id', 'gp_one': 'lang', 'gp_two': 'lang', 'main': 'lang', 'match_id_int': 'lang' | 'id', 'site': 'lang', 'site_id': 'lang' | 'id', 'site_contract_siteId_contractId': 'siteId' | 'contractId' | 'lang', 'a_rest_z': 'rest', 'lay_normal': never, 'lay_root_layout': never, 'lay_skip': never, 'sp': never } - SERVERS: { 'GET_contract': 'lang', 'POST_contract': 'lang', 'GET_site': 'lang', 'GET_api_graphql': never, 'POST_api_graphql': never } + SERVERS: { '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' } - Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, extra: never, name: never, str: never, s: never, d: never } + Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, locale: never, extra: never, name: never, str: never, s: never, d: 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 index 3f68a1812..c206336c2 100644 --- 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 @@ -66,7 +66,10 @@ export const SERVERS = { return `${params?.lang ? `/${params?.lang}`: ''}/site` }, "GET /api/graphql": `/api/graphql`, - "POST /api/graphql": `/api/graphql` + "POST /api/graphql": `/api/graphql`, + "GET /data/errors/[locale].json": (params: { locale: (string | number) }) => { + return `/data/errors/${params.locale}.json` + } } /** @@ -159,8 +162,8 @@ export const currentSp = () => { */ export type KIT_ROUTES = { PAGES: { '/': never, '/subGroup': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'id' | 'lang', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=int]': 'id' | 'lang', '/site': 'lang', '/site/[id]': 'lang' | 'id', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never } - SERVERS: { 'GET /contract': 'lang', 'POST /contract': 'lang', 'GET /site': 'lang', 'GET /api/graphql': never, 'POST /api/graphql': never } + SERVERS: { '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' } - Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, extra: never, name: never, str: never, s: never, d: never } + Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, locale: never, extra: never, name: never, str: never, s: never, d: never } } 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 index 91fca4326..168231045 100644 --- 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 @@ -66,7 +66,10 @@ export const SERVERS = { return `${params?.lang ? `/${params?.lang}`: ''}/site` }, "GET /api/graphql": `/api/graphql`, - "POST /api/graphql": `/api/graphql` + "POST /api/graphql": `/api/graphql`, + "GET /data/errors/[locale].json": (locale: (string | number), params?: { }) => { + return `/data/errors/${locale}.json` + } } /** @@ -160,8 +163,8 @@ export const currentSp = () => { */ export type KIT_ROUTES = { PAGES: { '/': never, '/subGroup': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'lang' | 'id', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=int]': 'lang' | 'id', '/site': 'lang', '/site/[id]': 'lang' | 'id', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never } - SERVERS: { 'GET /contract': 'lang', 'POST /contract': 'lang', 'GET /site': 'lang', 'GET /api/graphql': never, 'POST /api/graphql': never } + SERVERS: { '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' } - Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, extra: never, name: never, str: never, s: never, d: never } + Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, locale: never, extra: never, name: never, str: never, s: never, d: never } } 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 index 1cd19eee5..54b6ca9fa 100644 --- 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 @@ -66,7 +66,10 @@ export const SERVERS = { return `${params?.lang ? `/${params?.lang}`: ''}/site` }, "GET_api_graphql": `/api/graphql`, - "POST_api_graphql": `/api/graphql` + "POST_api_graphql": `/api/graphql`, + "GET_data_errors_locale_json": (params: { locale: (string | number) }) => { + return `/data/errors/${params.locale}.json` + } } /** @@ -159,8 +162,8 @@ export const currentSp = () => { */ export type KIT_ROUTES = { PAGES: { '_ROOT': never, 'subGroup': never, 'subGroup2': never, 'contract': 'lang', 'contract_id': 'id' | 'lang', 'gp_one': 'lang', 'gp_two': 'lang', 'main': 'lang', 'match_id_int': 'id' | 'lang', 'site': 'lang', 'site_id': 'lang' | 'id', 'site_contract_siteId_contractId': 'siteId' | 'contractId' | 'lang', 'a_rest_z': 'rest', 'lay_normal': never, 'lay_root_layout': never, 'lay_skip': never, 'sp': never } - SERVERS: { 'GET_contract': 'lang', 'POST_contract': 'lang', 'GET_site': 'lang', 'GET_api_graphql': never, 'POST_api_graphql': never } + SERVERS: { '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' } - Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, extra: never, name: never, str: never, s: never, d: never } + Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, locale: never, extra: never, name: never, str: never, s: never, d: never } } 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 index 4d52e7672..4ba34e08f 100644 --- 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 @@ -66,7 +66,10 @@ export const SERVERS = { return `${params?.lang ? `/${params?.lang}`: ''}/site` }, "GET_api_graphql": `/api/graphql`, - "POST_api_graphql": `/api/graphql` + "POST_api_graphql": `/api/graphql`, + "GET_data_errors_locale_json": (locale: (string | number), params?: { }) => { + return `/data/errors/${locale}.json` + } } /** @@ -160,8 +163,8 @@ export const currentSp = () => { */ export type KIT_ROUTES = { PAGES: { '_ROOT': never, 'subGroup': never, 'subGroup2': never, 'contract': 'lang', 'contract_id': 'lang' | 'id', 'gp_one': 'lang', 'gp_two': 'lang', 'main': 'lang', 'match_id_int': 'lang' | 'id', 'site': 'lang', 'site_id': 'lang' | 'id', 'site_contract_siteId_contractId': 'siteId' | 'contractId' | 'lang', 'a_rest_z': 'rest', 'lay_normal': never, 'lay_root_layout': never, 'lay_skip': never, 'sp': never } - SERVERS: { 'GET_contract': 'lang', 'POST_contract': 'lang', 'GET_site': 'lang', 'GET_api_graphql': never, 'POST_api_graphql': never } + SERVERS: { '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' } - Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, extra: never, name: never, str: never, s: never, d: never } + Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, locale: never, extra: never, name: never, str: never, s: never, d: never } } diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-path.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-path.ts index ed44ec5e1..f6b39bf61 100644 --- a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-path.ts +++ b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-path.ts @@ -66,7 +66,10 @@ const SERVERS = { return `${params?.lang ? `/${params?.lang}`: ''}/site` }, "GET /api/graphql": `/api/graphql`, - "POST /api/graphql": `/api/graphql` + "POST /api/graphql": `/api/graphql`, + "GET /data/errors/[locale].json": (params: { locale: (string | number) }) => { + return `/data/errors/${params.locale}.json` + } } /** @@ -186,8 +189,8 @@ export function route(key: T, ...params: any[]): strin */ export type KIT_ROUTES = { PAGES: { '/': never, '/subGroup': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'id' | 'lang', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=int]': 'id' | 'lang', '/site': 'lang', '/site/[id]': 'lang' | 'id', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never } - SERVERS: { 'GET /contract': 'lang', 'POST /contract': 'lang', 'GET /site': 'lang', 'GET /api/graphql': never, 'POST /api/graphql': never } + SERVERS: { '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' } - Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, extra: never, name: never, str: never, s: never, d: never } + Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, locale: never, extra: never, name: never, str: never, s: never, d: never } } diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-path_shortened.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-path_shortened.ts index a6dfbf795..640197c77 100644 --- a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-path_shortened.ts +++ b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-path_shortened.ts @@ -66,7 +66,10 @@ const SERVERS = { return `${params?.lang ? `/${params?.lang}`: ''}/site` }, "GET /api/graphql": `/api/graphql`, - "POST /api/graphql": `/api/graphql` + "POST /api/graphql": `/api/graphql`, + "GET /data/errors/[locale].json": (locale: (string | number), params?: { }) => { + return `/data/errors/${locale}.json` + } } /** @@ -187,8 +190,8 @@ export function route(key: T, ...params: any[]): strin */ export type KIT_ROUTES = { PAGES: { '/': never, '/subGroup': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'lang' | 'id', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=int]': 'lang' | 'id', '/site': 'lang', '/site/[id]': 'lang' | 'id', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never } - SERVERS: { 'GET /contract': 'lang', 'POST /contract': 'lang', 'GET /site': 'lang', 'GET /api/graphql': never, 'POST /api/graphql': never } + SERVERS: { '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' } - Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, extra: never, name: never, str: never, s: never, d: never } + Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, locale: never, extra: never, name: never, str: never, s: never, d: never } } diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-symbol.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-symbol.ts index b82e4bb1a..830d37c80 100644 --- a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-symbol.ts +++ b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-symbol.ts @@ -66,7 +66,10 @@ const SERVERS = { return `${params?.lang ? `/${params?.lang}`: ''}/site` }, "GET api_graphql": `/api/graphql`, - "POST api_graphql": `/api/graphql` + "POST api_graphql": `/api/graphql`, + "GET data_errors_locale_json": (params: { locale: (string | number) }) => { + return `/data/errors/${params.locale}.json` + } } /** @@ -186,8 +189,8 @@ export function route(key: T, ...params: any[]): strin */ export type KIT_ROUTES = { PAGES: { '_ROOT': never, 'subGroup': never, 'subGroup2': never, 'contract': 'lang', 'contract_id': 'id' | 'lang', 'gp_one': 'lang', 'gp_two': 'lang', 'main': 'lang', 'match_id_int': 'id' | 'lang', 'site': 'lang', 'site_id': 'lang' | 'id', 'site_contract_siteId_contractId': 'siteId' | 'contractId' | 'lang', 'a_rest_z': 'rest', 'lay_normal': never, 'lay_root_layout': never, 'lay_skip': never, 'sp': never } - SERVERS: { 'GET contract': 'lang', 'POST contract': 'lang', 'GET site': 'lang', 'GET api_graphql': never, 'POST api_graphql': never } + SERVERS: { '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' } - Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, extra: never, name: never, str: never, s: never, d: never } + Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, locale: never, extra: never, name: never, str: never, s: never, d: never } } diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-symbol_shortened.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-symbol_shortened.ts index 0f46a98c9..d16b50fb5 100644 --- a/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-symbol_shortened.ts +++ b/packages/vite-plugin-kit-routes/src/test/ROUTES_format-route-symbol_shortened.ts @@ -66,7 +66,10 @@ const SERVERS = { return `${params?.lang ? `/${params?.lang}`: ''}/site` }, "GET api_graphql": `/api/graphql`, - "POST api_graphql": `/api/graphql` + "POST api_graphql": `/api/graphql`, + "GET data_errors_locale_json": (locale: (string | number), params?: { }) => { + return `/data/errors/${locale}.json` + } } /** @@ -187,8 +190,8 @@ export function route(key: T, ...params: any[]): strin */ export type KIT_ROUTES = { PAGES: { '_ROOT': never, 'subGroup': never, 'subGroup2': never, 'contract': 'lang', 'contract_id': 'lang' | 'id', 'gp_one': 'lang', 'gp_two': 'lang', 'main': 'lang', 'match_id_int': 'lang' | 'id', 'site': 'lang', 'site_id': 'lang' | 'id', 'site_contract_siteId_contractId': 'siteId' | 'contractId' | 'lang', 'a_rest_z': 'rest', 'lay_normal': never, 'lay_root_layout': never, 'lay_skip': never, 'sp': never } - SERVERS: { 'GET contract': 'lang', 'POST contract': 'lang', 'GET site': 'lang', 'GET api_graphql': never, 'POST api_graphql': never } + SERVERS: { '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' } - Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, extra: never, name: never, str: never, s: never, d: never } + Params: { first: never, lang: never, id: never, limit: never, demo: never, siteId: never, contractId: never, rest: never, locale: never, extra: never, name: never, str: never, s: never, d: never } } diff --git a/packages/vite-plugin-kit-routes/src/test/ROUTES_post-update.ts b/packages/vite-plugin-kit-routes/src/test/ROUTES_post-update.ts index f68ea6316..7ae3d41a6 100644 --- a/packages/vite-plugin-kit-routes/src/test/ROUTES_post-update.ts +++ b/packages/vite-plugin-kit-routes/src/test/ROUTES_post-update.ts @@ -61,7 +61,10 @@ const SERVERS = { return `${params?.lang ? `/${params?.lang}`: ''}/site` }, "GET /api/graphql": `/api/graphql`, - "POST /api/graphql": `/api/graphql` + "POST /api/graphql": `/api/graphql`, + "GET /data/errors/[locale].json": (params: { locale: (string | number) }) => { + return `/data/errors/${params.locale}.json` + } } /** @@ -172,8 +175,8 @@ export function route(key: T, ...params: any[]): strin */ export type KIT_ROUTES = { PAGES: { '/': never, '/subGroup': never, '/subGroup2': never, '/contract': 'lang', '/contract/[id]': 'id' | 'lang', '/gp/one': 'lang', '/gp/two': 'lang', '/main': 'lang', '/match/[id=int]': 'id' | 'lang', '/site': 'lang', '/site/[id]': 'id' | 'lang', '/site_contract/[siteId]-[contractId]': 'siteId' | 'contractId' | 'lang', '/a/[...rest]/z': 'rest', '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never, '/sp': never } - SERVERS: { 'GET /contract': 'lang', 'POST /contract': 'lang', 'GET /site': 'lang', 'GET /api/graphql': never, 'POST /api/graphql': never } + SERVERS: { '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 - Params: { lang: never, id: never, siteId: never, contractId: never, rest: never } + Params: { lang: never, id: never, siteId: never, contractId: never, rest: never, locale: never } }