Skip to content
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

fix: add Sveltekit snippet for Svelte 5 #2548

Merged
merged 3 commits into from
Oct 28, 2024
Merged

fix: add Sveltekit snippet for Svelte 5 #2548

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eafb082
fix: add svelte-kit snippet for svelte-5
Oct 28, 2024
ab57c7b
fixes
dummdidumm Oct 28, 2024
00227bc
format
Oct 28, 2024
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
8 changes: 6 additions & 2 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 @@ -3,7 +3,7 @@ import { commands, ExtensionContext, ProgressLocation, Uri, window, workspace }
import { addResourceCommandMap } from './commands';
import { generateResources } from './generate';
import { resourcesMap } from './resources';
import { FileType, ResourceType, GenerateConfig, CommandType } from './types';
import { FileType, ResourceType, GenerateConfig, CommandType, ProjectType } from './types';
import { checkProjectType } from '../utils';

class GenerateError extends Error {}
Expand Down Expand Up @@ -126,14 +126,18 @@ async function getCommonConfig(uri: Uri | undefined) {
}

const type = await checkProjectType(rootPath);
const scriptExtension = type === 'js' ? 'js' : 'ts';
const scriptExtension = getScriptExtension(type);
return {
type,
scriptExtension,
rootPath
} as const;
}

function getScriptExtension(type: ProjectType) {
return type === ProjectType.JS || type === ProjectType.JS_SV5 ? 'js' : 'ts';
}

function getRootPath(uri: Uri | undefined) {
let rootPath!: string;
if (uri) {
Expand Down
34 changes: 22 additions & 12 deletions packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
import { GenerateConfig } from '../types';
import { GenerateConfig, ProjectType, Resource } from '../types';

export default async function (config: GenerateConfig) {
const ts = `
<script lang="ts">
const defaultScriptTemplate = `
<script>
import { page } from '$app/stores';
</script>

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

const js = `
<script>

const tsScriptTemplate = `
<script lang="ts">
import { page } from '$app/stores';
</script>

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

const scriptTemplate: ReadonlyMap<ProjectType, string> = new Map([
[ProjectType.TS_SV5, tsScriptTemplate],
[ProjectType.TS_SATISFIES_SV5, tsScriptTemplate],
[ProjectType.JS_SV5, defaultScriptTemplate],
[ProjectType.TS, tsScriptTemplate],
[ProjectType.TS_SATISFIES, tsScriptTemplate],
[ProjectType.JS, defaultScriptTemplate]
])

return config.type === 'js' ? js : ts;
}
export default async function (config: GenerateConfig): ReturnType<Resource['generate']> {
return (scriptTemplate.get(config.type) ?? defaultScriptTemplate).trim();
}
36 changes: 23 additions & 13 deletions packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout-load.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,38 @@
import { GenerateConfig } from '../types';
import { GenerateConfig, ProjectType, Resource } from '../types';

export default async function (config: GenerateConfig) {
const ts = `
const defaultScriptTemplate = `
/** @type {import('./$types').LayoutLoad} */
export async function load() {
return {};
}
`;


const tsScriptTemplate = `
import type { LayoutLoad } from './$types';

export const load: LayoutLoad = async () => {
return {};
};
`.trim();
`;

const tsSatisfies = `
const tsSatisfiesScriptTemplate = `
import type { LayoutLoad } from './$types';

export const load = (async () => {
return {};
}) satisfies LayoutLoad;
`.trim();
`;

const js = `
/** @type {import('./$types').LayoutLoad} */
export async function load() {
return {};
}
`.trim();
const scriptTemplate: ReadonlyMap<ProjectType, string> = new Map([
[ProjectType.TS_SV5, tsScriptTemplate],
[ProjectType.TS_SATISFIES_SV5, tsSatisfiesScriptTemplate],
[ProjectType.JS_SV5, defaultScriptTemplate],
[ProjectType.TS, tsScriptTemplate],
[ProjectType.TS_SATISFIES, tsSatisfiesScriptTemplate],
[ProjectType.JS, defaultScriptTemplate]
])

return config.type === 'js' ? js : config.type === 'ts' ? ts : tsSatisfies;
export default async function (config: GenerateConfig): ReturnType<Resource['generate']> {
return (scriptTemplate.get(config.type) ?? defaultScriptTemplate).trim();
}
36 changes: 23 additions & 13 deletions packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,38 @@
import { GenerateConfig } from '../types';
import { GenerateConfig, ProjectType, Resource } from '../types';

export default async function (config: GenerateConfig) {
const ts = `
const defaultScriptTemplate = `
/** @type {import('./$types').LayoutServerLoad} */
export async function load() {
return {};
}
`;


const tsScriptTemplate = `
import type { LayoutServerLoad } from './$types';

export const load: LayoutServerLoad = async () => {
return {};
};
`.trim();
`;

const tsSatisfies = `
const tsSatisfiesScriptTemplate = `
import type { LayoutServerLoad } from './$types';

export const load = (async () => {
return {};
}) satisfies LayoutServerLoad;
`.trim();
`;

const js = `
/** @type {import('./$types').LayoutServerLoad} */
export async function load() {
return {};
}
`.trim();
const scriptTemplate: ReadonlyMap<ProjectType, string> = new Map([
[ProjectType.TS_SV5, tsScriptTemplate],
[ProjectType.TS_SATISFIES_SV5, tsSatisfiesScriptTemplate],
[ProjectType.JS_SV5, defaultScriptTemplate],
[ProjectType.TS, tsScriptTemplate],
[ProjectType.TS_SATISFIES, tsSatisfiesScriptTemplate],
[ProjectType.JS, defaultScriptTemplate]
])

return config.type === 'js' ? js : config.type === 'ts' ? ts : tsSatisfies;
export default async function (config: GenerateConfig): ReturnType<Resource['generate']> {
return (scriptTemplate.get(config.type) ?? defaultScriptTemplate).trim();
}
40 changes: 32 additions & 8 deletions packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,44 @@
import { GenerateConfig } from '../types';
import { GenerateConfig, ProjectType, Resource } from '../types';

export default async function (config: GenerateConfig) {
const ts = `
const defaultScriptTemplate = `
<script>
/** @type {import('./$types').LayoutData} */
export let data;
</script>
`;

const tsSv5ScriptTemplate = `
<script lang="ts">
import type { LayoutData } from './$types';

let { data }: LayoutData = $props();
</script>
`;

const tsScriptTemplate = `
<script lang="ts">
import type { LayoutData } from './$types';

export let data: LayoutData;
</script>
`.trim();
`;

const js = `
const jsSv5ScriptTemplate = `
<script>
/** @type {import('./$types').LayoutData} */
export let data;
let { data } = $props();
</script>
`.trim();
`;

const scriptTemplate: ReadonlyMap<ProjectType, string> = new Map([
[ProjectType.TS_SV5, tsSv5ScriptTemplate],
[ProjectType.TS_SATISFIES_SV5, tsSv5ScriptTemplate],
[ProjectType.JS_SV5, jsSv5ScriptTemplate],
[ProjectType.TS, tsScriptTemplate],
[ProjectType.TS_SATISFIES, tsScriptTemplate],
[ProjectType.JS, defaultScriptTemplate]
])

return config.type === 'js' ? js : ts;
export default async function (config: GenerateConfig): ReturnType<Resource['generate']> {
return (scriptTemplate.get(config.type) ?? defaultScriptTemplate).trim();
}
36 changes: 23 additions & 13 deletions packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-load.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,38 @@
import { GenerateConfig } from '../types';
import { GenerateConfig, ProjectType, Resource } from '../types';

export default async function (config: GenerateConfig) {
const ts = `
const defaultScriptTemplate = `
/** @type {import('./$types').PageLoad} */
export async function load() {
return {};
};
`;


const tsScriptTemplate = `
import type { PageLoad } from './$types';

export const load: PageLoad = async () => {
return {};
};
`.trim();
`;

const tsSatisfies = `
const tsSatisfiesScriptTemplate = `
import type { PageLoad } from './$types';

export const load = (async () => {
return {};
}) satisfies PageLoad;
`.trim();
`;

const js = `
/** @type {import('./$types').PageLoad} */
export async function load() {
return {};
};
`.trim();
const scriptTemplate: ReadonlyMap<ProjectType, string> = new Map([
[ProjectType.TS_SV5, tsScriptTemplate],
[ProjectType.TS_SATISFIES_SV5, tsSatisfiesScriptTemplate],
[ProjectType.JS_SV5, defaultScriptTemplate],
[ProjectType.TS, tsScriptTemplate],
[ProjectType.TS_SATISFIES, tsSatisfiesScriptTemplate],
[ProjectType.JS, defaultScriptTemplate]
])

return config.type === 'js' ? js : config.type === 'ts' ? ts : tsSatisfies;
export default async function (config: GenerateConfig): ReturnType<Resource['generate']> {
return (scriptTemplate.get(config.type) ?? defaultScriptTemplate).trim();
}
36 changes: 23 additions & 13 deletions packages/svelte-vscode/src/sveltekit/generateFiles/templates/page-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,38 @@
import { GenerateConfig } from '../types';
import { GenerateConfig, ProjectType, Resource } from '../types';

export default async function (config: GenerateConfig) {
const ts = `
const defaultScriptTemplate = `
/** @type {import('./$types').PageServerLoad} */
export async function load() {
return {};
};
`;


const tsScriptTemplate = `
import type { PageServerLoad } from './$types';

export const load: PageServerLoad = async () => {
return {};
};
`.trim();
`;

const tsSatisfies = `
const tsSatisfiesScriptTemplate = `
import type { PageServerLoad } from './$types';

export const load = (async () => {
return {};
}) satisfies PageServerLoad;
`.trim();
`;

const js = `
/** @type {import('./$types').PageServerLoad} */
export async function load() {
return {};
};
`.trim();
const scriptTemplate: ReadonlyMap<ProjectType, string> = new Map([
[ProjectType.TS_SV5, tsScriptTemplate],
[ProjectType.TS_SATISFIES_SV5, tsSatisfiesScriptTemplate],
[ProjectType.JS_SV5, defaultScriptTemplate],
[ProjectType.TS, tsScriptTemplate],
[ProjectType.TS_SATISFIES, tsSatisfiesScriptTemplate],
[ProjectType.JS, defaultScriptTemplate]
])

return config.type === 'js' ? js : config.type === 'ts' ? ts : tsSatisfies;
export default async function (config: GenerateConfig): ReturnType<Resource['generate']> {
return (scriptTemplate.get(config.type) ?? defaultScriptTemplate).trim();
}
40 changes: 32 additions & 8 deletions packages/svelte-vscode/src/sveltekit/generateFiles/templates/page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,44 @@
import { GenerateConfig } from '../types';
import { GenerateConfig, ProjectType, Resource } from '../types';

export default async function (config: GenerateConfig) {
const ts = `
const defaultScriptTemplate = `
<script>
/** @type {import('./$types').PageData} */
export let data;
</script>
`;

const tsSv5ScriptTemplate = `
<script lang="ts">
import type { PageData } from './$types';

let { data }: PageData = $props();
</script>
`;

const tsScriptTemplate = `
<script lang="ts">
import type { PageData } from './$types';

export let data: PageData;
</script>
`.trim();
`;

const js = `
const jsSv5ScriptTemplate = `
<script>
/** @type {import('./$types').PageData} */
export let data;
let { data } = $props();
</script>
`.trim();
`;

const scriptTemplate: ReadonlyMap<ProjectType, string> = new Map([
[ProjectType.TS_SV5, tsSv5ScriptTemplate],
[ProjectType.TS_SATISFIES_SV5, tsSv5ScriptTemplate],
[ProjectType.JS_SV5, jsSv5ScriptTemplate],
[ProjectType.TS, tsScriptTemplate],
[ProjectType.TS_SATISFIES, tsScriptTemplate],
[ProjectType.JS, defaultScriptTemplate]
])

return config.type === 'js' ? js : ts;
export default async function (config: GenerateConfig): ReturnType<Resource['generate']> {
return (scriptTemplate.get(config.type) ?? defaultScriptTemplate).trim();
}
Loading
Loading