Skip to content

[fix] Generate types when Svelte file missing #6066

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
Aug 19, 2022
Merged

[fix] Generate types when Svelte file missing #6066

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/ninety-vans-talk.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

Generate types when Svelte file missing, fix layout params
7 changes: 4 additions & 3 deletions packages/kit/src/core/sync/write_types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,11 @@ function get_groups(manifest_data, routes_dir) {
/** @type {Node} */
const node = { ...nodes[i] }; // shallow copy so we don't mutate the original when setting parent

const file_path = /** @type {string} */ (node.component ?? node.shared ?? node.server);
// skip default layout/error
if (!node?.component?.startsWith(routes_dir)) continue;
if (!file_path.startsWith(routes_dir)) continue;

const parts = /** @type {string} */ (node.component ?? node.shared ?? node.server).split('/');
const parts = file_path.split('/');

const file = /** @type {string} */ (parts.pop());
const dir = parts.join('/').slice(routes_dir.length + 1);
Expand Down Expand Up @@ -284,7 +285,7 @@ function write_types_for_dir(config, manifest_data, routes_dir, dir, groups, ts)
manifest_data.routes.forEach((route) => {
if (route.type === 'page' && route.id.startsWith(dir + '/')) {
// TODO this is O(n^2), see if we need to speed it up
for (const name of parse_route_id(route.id).names) {
for (const name of parse_route_id(route.id.slice(dir.length + 1)).names) {
layout_params.add(name);
}
}
Expand Down