Skip to content

(fix) SvelteKit create route tweaks #1655

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
merged 1 commit into from
Sep 22, 2022
Merged

(fix) SvelteKit create route tweaks #1655

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
18 changes: 9 additions & 9 deletions packages/svelte-vscode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,39 +541,39 @@
},
{
"command": "svelte.kit.generateMultipleFiles",
"title": "SvelteKit: Generate files"
"title": "SvelteKit: Create route"
},
{
"command": "svelte.kit.generatePage",
"title": "SvelteKit: Generate Page"
"title": "SvelteKit: Create +page.svelte"
},
{
"command": "svelte.kit.generatePageLoad",
"title": "SvelteKit: Generate Page load"
"title": "SvelteKit: Create +page.js/ts"
},
{
"command": "svelte.kit.generatePageServerLoad",
"title": "SvelteKit: Generate Page server load"
"title": "SvelteKit: Create +page.server.js/ts"
},
{
"command": "svelte.kit.generateLayout",
"title": "SvelteKit: Generate Layout"
"title": "SvelteKit: Create +layout.svelte"
},
{
"command": "svelte.kit.generateLayoutLoad",
"title": "SvelteKit: Generate Layout load"
"title": "SvelteKit: Create +layout.js/ts"
},
{
"command": "svelte.kit.generateLayoutServerLoad",
"title": "SvelteKit: Generate Layout server load"
"title": "SvelteKit: Create +layout.server.js/ts"
},
{
"command": "svelte.kit.generateServer",
"title": "SvelteKit: Generate Endpoint"
"title": "SvelteKit: Create +server.js/ts"
},
{
"command": "svelte.kit.generateError",
"title": "SvelteKit: Generate Error"
"title": "SvelteKit: Create +error.svelte"
}
],
"menus": {
Expand Down
18 changes: 8 additions & 10 deletions packages/svelte-vscode/src/sveltekit/generateFiles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ async function handleSingle(uri: Uri | undefined, resourceType: ResourceType) {

async function handleMultiple(uri: Uri | undefined) {
const { isTs, rootPath, scriptExtension } = await getCommonConfig(uri);
const itemPath = await promptResourcePath();

if (!itemPath) {
return;
}

// Add multiple files
const opts = [
Expand All @@ -73,22 +78,15 @@ async function handleMultiple(uri: Uri | undefined) {
// const iconName = resource.type === FileType.PAGE ? 'svelte' : isTs ? 'typescript' : 'javascript';
const extension = resource.type === FileType.PAGE ? 'svelte' : scriptExtension;
return {
label: resource.title,
// TODO: maybe add icons (ts,js,svelte - but it doesn´t work like this)
// description: `$(${iconName}) ${resource.filename}.${extension}`,
description: `${resource.filename}.${extension}`,
label: `${resource.filename}.${extension}`,
value: resource
};
});
const result = await window.showQuickPick(opts, { canPickMany: true });
if (!result) {
return;
}
const resources = result.map((res) => res.value);

const itemPath = await promptResourcePath();

if (!itemPath) {
if (!result) {
return;
}

Expand All @@ -97,7 +95,7 @@ async function handleMultiple(uri: Uri | undefined) {
typescript: isTs,
pageExtension: 'svelte',
scriptExtension,
resources
resources: result.map((res) => res.value)
});
}

Expand Down
26 changes: 6 additions & 20 deletions packages/svelte-vscode/src/sveltekit/generateFiles/resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,29 @@ import error from './templates/error';
import server from './templates/server';

export const resourcesMap = new Map<ResourceType, Resource>([
[ResourceType.PAGE, { type: FileType.PAGE, filename: '+page', title: 'Page', generate: page }],
[
ResourceType.PAGE_LOAD,
{ type: FileType.SCRIPT, filename: '+page', title: 'Page load', generate: pageLoad }
],
[ResourceType.PAGE, { type: FileType.PAGE, filename: '+page', generate: page }],
[ResourceType.PAGE_LOAD, { type: FileType.SCRIPT, filename: '+page', generate: pageLoad }],
[
ResourceType.PAGE_SERVER,
{
type: FileType.SCRIPT,
filename: '+page.server',
title: 'Page server load',
generate: pageServer
}
],
[
ResourceType.LAYOUT,
{ type: FileType.PAGE, filename: '+layout', title: 'Layout', generate: layout }
],
[ResourceType.LAYOUT, { type: FileType.PAGE, filename: '+layout', generate: layout }],
[
ResourceType.LAYOUT_LOAD,
{ type: FileType.SCRIPT, filename: '+layout', title: 'Layout load', generate: layoutLoad }
{ type: FileType.SCRIPT, filename: '+layout', generate: layoutLoad }
],
[
ResourceType.LAYOUT_SERVER,
{
type: FileType.SCRIPT,
filename: '+layout.server',
title: 'Layout server load',
generate: layoutServer
}
],
[
ResourceType.SERVER,
{ type: FileType.SCRIPT, filename: '+server', title: 'Server', generate: server }
],
[
ResourceType.ERROR,
{ type: FileType.PAGE, filename: '+error', title: 'Error', generate: error }
]
[ResourceType.SERVER, { type: FileType.SCRIPT, filename: '+server', generate: server }],
[ResourceType.ERROR, { type: FileType.PAGE, filename: '+error', generate: error }]
]);
2 changes: 1 addition & 1 deletion packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default async function (config: GenerateConfig) {
import { page } from '$app/stores';
</script>

<h1>{$page.status}: {$page.error.message}</h1>
<h1>{$page.status}: {$page.error?.message}</h1>
`.trim();

const js = `
Expand Down
1 change: 0 additions & 1 deletion packages/svelte-vscode/src/sveltekit/generateFiles/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export enum ResourceType {
export type Resource = {
type: FileType;
filename: string;
title: string;
generate: (config: GenerateConfig) => Promise<string>;
};

Expand Down