Skip to content

🐛 FIX: actions with or without satisfies are now detected well #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jycouet merged 1 commit into from
Nov 25, 2023
Merged

🐛 FIX: actions with or without satisfies are now detected well #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/flat-olives-ring.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'vite-plugin-kit-routes': patch
---

fix: actions with or without satisfies are now detected well
7 changes: 7 additions & 0 deletions packages/vite-plugin-kit-routes/src/lib/ROUTES.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ export const ACTIONS = {
) => {
return `${params?.lang ? `/${params?.lang}` : ''}/site?/${action}`
},
lang_site_contract: (
action: 'noSatisfies',
params: { lang?: 'fr' | 'en' | 'hu' | 'at' | string } = {},
) => {
return `${params?.lang ? `/${params?.lang}` : ''}/site_contract?/${action}`
},
lang_site_contract_siteId_contractId: (
action: 'sendSomething',
params: {
Expand Down Expand Up @@ -172,6 +178,7 @@ export type KIT_ROUTES = {
ACTIONS: {
lang_contract_id: 'lang' | 'id'
lang_site: 'lang'
lang_site_contract: 'lang'
lang_site_contract_siteId_contractId: 'lang' | 'siteId' | 'contractId'
}
LINKS: { twitter: never; twitter_post: 'name' | 'id'; gravatar: 'str' }
Expand Down
1 change: 1 addition & 0 deletions packages/vite-plugin-kit-routes/src/lib/fs.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ describe('fs', () => {
"[[lang]]/site/+page.svelte",
"[[lang]]/site/+server.ts",
"[[lang]]/site/[id]/+page.svelte",
"[[lang]]/site_contract/+page.server.ts",
"[[lang]]/site_contract/[siteId]-[contractId]/+page.server.ts",
"[[lang]]/site_contract/[siteId]-[contractId]/+page.svelte",
"a/[...rest]/z/+page.svelte",
Expand Down
7 changes: 6 additions & 1 deletion packages/vite-plugin-kit-routes/src/lib/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,12 @@ const getActionsOfServerPages = (pathFile: string) => {
if (declarations) {
declarations.forEach((declaration: any) => {
if (declaration.id.name === 'actions') {
const properties = declaration.init.expression?.properties
const properties =
// if } satisfies Actions
declaration.init.expression?.properties ??
// if no satisfies Actions
declaration.init.properties

if (properties) {
properties.forEach((property: any) => {
actions.push(property.key.name)
Expand Down
20 changes: 16 additions & 4 deletions packages/vite-plugin-kit-routes/src/lib/plugins.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,9 @@ describe('run()', () => {
\\"lang_site\\": (action: 'action1' | 'action2', params: {lang?: ('fr' | 'en' | 'hu' | 'at' | string)}= {}) => {
return \`\${params?.lang ? \`/\${params?.lang}\`: ''}/site?/\${action}\`
},
\\"lang_site_contract\\": (action: 'noSatisfies', params: {lang?: ('fr' | 'en' | 'hu' | 'at' | string)}= {}) => {
return \`\${params?.lang ? \`/\${params?.lang}\`: ''}/site_contract?/\${action}\`
},
\\"lang_site_contract_siteId_contractId\\": (action: 'sendSomething', params: {lang?: ('fr' | 'en' | 'hu' | 'at' | string), siteId: (string | number), contractId: (string | number), extra?: ('A' | 'B')}) => {
params.extra = params.extra ?? \\"A\\";
return \`\${params?.lang ? \`/\${params?.lang}\`: ''}/site_contract/\${params.siteId}-\${params.contractId}?/\${action}\${appendSp({ extra: params.extra })}\`
Expand Down Expand Up @@ -376,7 +379,7 @@ describe('run()', () => {
export type KIT_ROUTES = {
PAGES: { '_ROOT': never, 'subGroup': never, 'subGroup2': never, 'lang_contract': 'lang', 'lang_contract_id': 'lang' | 'id', 'lang_gp_one': 'lang', 'lang_gp_two': 'lang', 'lang_main': 'lang', 'lang_match_id_int': 'lang' | 'id', 'lang_site': 'lang', 'lang_site_id': 'lang' | 'id', 'lang_site_contract_siteId_contractId': 'lang' | 'siteId' | 'contractId', 'a_rest_z': 'rest', 'lay_normal': never, 'lay_root_layout': never, 'lay_skip': never }
SERVERS: { 'lang_contract': 'lang', 'lang_site': 'lang', 'api_graphql': never }
ACTIONS: { 'lang_contract_id': 'lang' | 'id', 'lang_site': 'lang', 'lang_site_contract_siteId_contractId': 'lang' | 'siteId' | 'contractId' }
ACTIONS: { 'lang_contract_id': 'lang' | 'id', 'lang_site': 'lang', 'lang_site_contract': 'lang', 'lang_site_contract_siteId_contractId': 'lang' | 'siteId' | 'contractId' }
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 }
}
Expand Down Expand Up @@ -456,6 +459,9 @@ describe('run()', () => {
\\"/[[lang]]/site\\": (action: 'action1' | 'action2', params: {lang?: ('fr' | 'en' | 'hu' | 'at' | string)}= {}) => {
return \`\${params?.lang ? \`/\${params?.lang}\`: ''}/site?/\${action}\`
},
\\"/[[lang]]/site_contract\\": (action: 'noSatisfies', params: {lang?: ('fr' | 'en' | 'hu' | 'at' | string)}= {}) => {
return \`\${params?.lang ? \`/\${params?.lang}\`: ''}/site_contract?/\${action}\`
},
\\"/[[lang]]/site_contract/[siteId]-[contractId]\\": (action: 'sendSomething', params: {lang?: ('fr' | 'en' | 'hu' | 'at' | string), siteId: (string | number), contractId: (string | number)}) => {
return \`\${params?.lang ? \`/\${params?.lang}\`: ''}/site_contract/\${params.siteId}-\${params.contractId}?/\${action}\`
}
Expand Down Expand Up @@ -505,7 +511,7 @@ describe('run()', () => {
export type KIT_ROUTES = {
PAGES: { '/': never, '/subGroup': never, '/subGroup2': never, '/[[lang]]/contract': 'lang', '/[[lang]]/contract/[id]': 'lang' | 'id', '/[[lang]]/gp/one': 'lang', '/[[lang]]/gp/two': 'lang', '/[[lang]]/main': 'lang', '/[[lang]]/match/[id=int]': 'lang' | 'id', '/[[lang]]/site': 'lang', '/[[lang]]/site/[id]': 'lang' | 'id', '/[[lang]]/site_contract/[siteId]-[contractId]': 'lang' | 'siteId' | 'contractId', '/a/[...rest]/z': 'rest', '/lay/normal': never, '/lay/root-layout': never, '/lay/skip': never }
SERVERS: { '/[[lang]]/contract': 'lang', '/[[lang]]/site': 'lang', '/api/graphql': never }
ACTIONS: { '/[[lang]]/contract/[id]': 'lang' | 'id', '/[[lang]]/site': 'lang', '/[[lang]]/site_contract/[siteId]-[contractId]': 'lang' | 'siteId' | 'contractId' }
ACTIONS: { '/[[lang]]/contract/[id]': 'lang' | 'id', '/[[lang]]/site': 'lang', '/[[lang]]/site_contract': 'lang', '/[[lang]]/site_contract/[siteId]-[contractId]': 'lang' | 'siteId' | 'contractId' }
LINKS: { 'twitter': never, 'twitter_post': 'name' | 'id', 'gravatar': 'str' }
Params: { lang: never, id: never, siteId: never, contractId: never, rest: never, name: never, str: never, s: never, d: never }
}
Expand Down Expand Up @@ -628,6 +634,9 @@ describe('run()', () => {
export const ACTIONS_lang_site = (action: 'action1' | 'action2', params: {lang?: ('fr' | 'en' | 'hu' | 'at' | string)}= {}) => {
return \`\${params?.lang ? \`/\${params?.lang}\`: ''}/site?/\${action}\`
}
export const ACTIONS_lang_site_contract = (action: 'noSatisfies', params: {lang?: ('fr' | 'en' | 'hu' | 'at' | string)}= {}) => {
return \`\${params?.lang ? \`/\${params?.lang}\`: ''}/site_contract?/\${action}\`
}
export const ACTIONS_lang_site_contract_siteId_contractId = (action: 'sendSomething', params: {lang?: ('fr' | 'en' | 'hu' | 'at' | string), siteId: (string | number), contractId: (string | number), extra?: ('A' | 'B')}) => {
params.extra = params.extra ?? \\"A\\";
return \`\${params?.lang ? \`/\${params?.lang}\`: ''}/site_contract/\${params.siteId}-\${params.contractId}?/\${action}\${appendSp({ extra: params.extra })}\`
Expand Down Expand Up @@ -675,7 +684,7 @@ describe('run()', () => {
export type KIT_ROUTES = {
PAGES: { '_ROOT': never, 'subGroup': never, 'subGroup2': never, 'lang_contract': 'lang', 'lang_contract_id': 'lang' | 'id', 'lang_gp_one': 'lang', 'lang_gp_two': 'lang', 'lang_main': 'lang', 'lang_match_id_int': 'lang' | 'id', 'lang_site': 'lang', 'lang_site_id': 'lang' | 'id', 'lang_site_contract_siteId_contractId': 'lang' | 'siteId' | 'contractId', 'a_rest_z': 'rest', 'lay_normal': never, 'lay_root_layout': never, 'lay_skip': never }
SERVERS: { 'lang_contract': 'lang', 'lang_site': 'lang', 'api_graphql': never }
ACTIONS: { 'lang_contract_id': 'lang' | 'id', 'lang_site': 'lang', 'lang_site_contract_siteId_contractId': 'lang' | 'siteId' | 'contractId' }
ACTIONS: { 'lang_contract_id': 'lang' | 'id', 'lang_site': 'lang', 'lang_site_contract': 'lang', 'lang_site_contract_siteId_contractId': 'lang' | 'siteId' | 'contractId' }
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 }
}
Expand Down Expand Up @@ -813,6 +822,9 @@ describe('run()', () => {
\\"lang_site\\": (action: 'action1' | 'action2', params: {lang?: ('fr' | 'en' | 'hu' | 'at' | string)}= {}) => {
return \`\${base}\${params?.lang ? \`/\${params?.lang}\`: ''}/site?/\${action}\`
},
\\"lang_site_contract\\": (action: 'noSatisfies', params: {lang?: ('fr' | 'en' | 'hu' | 'at' | string)}= {}) => {
return \`\${base}\${params?.lang ? \`/\${params?.lang}\`: ''}/site_contract?/\${action}\`
},
\\"lang_site_contract_siteId_contractId\\": (action: 'sendSomething', params: {lang?: ('fr' | 'en' | 'hu' | 'at' | string), siteId: (string | number), contractId: (string | number), extra?: ('A' | 'B')}) => {
params.extra = params.extra ?? \\"A\\";
return \`\${base}\${params?.lang ? \`/\${params?.lang}\`: ''}/site_contract/\${params.siteId}-\${params.contractId}?/\${action}\${appendSp({ extra: params.extra })}\`
Expand Down Expand Up @@ -863,7 +875,7 @@ describe('run()', () => {
export type KIT_ROUTES = {
PAGES: { '_ROOT': never, 'subGroup': never, 'subGroup2': never, 'lang_contract': 'lang', 'lang_contract_id': 'lang' | 'id', 'lang_gp_one': 'lang', 'lang_gp_two': 'lang', 'lang_main': 'lang', 'lang_match_id_int': 'lang' | 'id', 'lang_site': 'lang', 'lang_site_id': 'lang' | 'id', 'lang_site_contract_siteId_contractId': 'lang' | 'siteId' | 'contractId', 'a_rest_z': 'rest', 'lay_normal': never, 'lay_root_layout': never, 'lay_skip': never }
SERVERS: { 'lang_contract': 'lang', 'lang_site': 'lang', 'api_graphql': never }
ACTIONS: { 'lang_contract_id': 'lang' | 'id', 'lang_site': 'lang', 'lang_site_contract_siteId_contractId': 'lang' | 'siteId' | 'contractId' }
ACTIONS: { 'lang_contract_id': 'lang' | 'id', 'lang_site': 'lang', 'lang_site_contract': 'lang', 'lang_site_contract_siteId_contractId': 'lang' | 'siteId' | 'contractId' }
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 }
}
Expand Down
11 changes: 11 additions & 0 deletions packages/vite-plugin-kit-routes/src/routes/[[lang]]/site_contract/+page.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export const actions = {
noSatisfies: async data => {
console.log(`sendSomething`)

return {
body: {
message: `Yes, you sent me something (${data.params.lang}! ✨ Thank you!`,
},
}
},
}