Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
9f4dc00
chore(frameworks/sveltekit): Add `@sveltejs/kit` as peer/dev
xeho91 May 1, 2025
c1e6a35
add `state.svelte.ts` with mocks for SvelteKit `$app/state`
xeho91 May 3, 2025
f6aba2b
add testing stories file for SveltKit `$app/state`
xeho91 May 3, 2025
8b52a44
Merge branch 'next' into feat/support-mocking-sveltekit-app-state
xeho91 May 3, 2025
f30d13c
wip
xeho91 May 3, 2025
7860caa
chore - remove kit from peers
xeho91 May 3, 2025
ebde853
thanks greptile
xeho91 May 5, 2025
515b043
update documentation
xeho91 May 5, 2025
cb2457b
remove `@sveltejs/kit` due to build issues & copy types
xeho91 May 5, 2025
acd137a
refactor sveltekit mocks to use package references
JReinhold May 5, 2025
11f812e
change example.com to location.origin
JReinhold May 5, 2025
277dcbc
fix mjs reference
JReinhold May 5, 2025
82f287e
fix parameters in stories
xeho91 May 5, 2025
7af29a2
cleanup unused
xeho91 May 5, 2025
99f5109
Apply suggestions from code review
xeho91 May 5, 2025
58dadc8
Apply suggestions from code review
xeho91 May 6, 2025
5f9bc5f
Improve stories example
xeho91 May 6, 2025
2a9c6f5
simplify - create setters function & defaults
xeho91 May 6, 2025
2c95bb4
cleanup - remove type assertion for setters/getters (they're automati…
xeho91 May 6, 2025
f909bf7
fix invalid mocking of `updated` from `$app/state`
xeho91 May 6, 2025
1062424
fix `navigating` values not being set to defaults when moving between…
xeho91 May 6, 2025
b3cf465
fix `setStateUpdated` logic
xeho91 May 6, 2025
19ebc0c
move `$app/state` set fns to `beforeEach`
xeho91 May 6, 2025
b800518
improve fn naming
xeho91 May 6, 2025
a6ac560
Merge branch 'next' into feat/support-mocking-sveltekit-app-state
xeho91 May 6, 2025
038fb8e
oops
xeho91 May 6, 2025
25c6d70
Merge branch 'next' of github.com:storybookjs/storybook into feat/sup…
JReinhold Sep 23, 2025
9d316ee
Merge branch 'next' of github.com:storybookjs/storybook into feat/sup…
JReinhold Sep 23, 2025
210036e
fix store mock imports
JReinhold Sep 23, 2025
e043fa8
cleanup
JReinhold Sep 24, 2025
91017dc
make url mock static in stories
JReinhold Sep 24, 2025
5ef0ff8
update updated docs
JReinhold Sep 24, 2025
e873a2f
optimizeDeps app state mock to ensure vitest doesn't reload
JReinhold Sep 24, 2025
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
1 change: 1 addition & 0 deletions code/frameworks/sveltekit/build-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ const config: BuildEntries = {
],
},
extraOutputs: {
'./internal/mocks/app/state.svelte.js': './static/app-state-mock.svelte.js',
'./internal/MockProvider.svelte': './static/MockProvider.svelte',
},
};
Expand Down
1 change: 1 addition & 0 deletions code/frameworks/sveltekit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"./internal/MockProvider.svelte": "./static/MockProvider.svelte",
"./internal/mocks/app/forms": "./dist/mocks/app/forms.js",
"./internal/mocks/app/navigation": "./dist/mocks/app/navigation.js",
"./internal/mocks/app/state.svelte.js": "./static/app-state-mock.svelte.js",
"./internal/mocks/app/stores": "./dist/mocks/app/stores.js",
"./node": {
"types": "./dist/node/index.d.ts",
Expand Down
8 changes: 4 additions & 4 deletions code/frameworks/sveltekit/src/mocks/app/stores.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ function createMockedStore(contextName: string) {
] as const;
}

export const [page, setPage] = createMockedStore('page-ctx');
export const [navigating, setNavigating] = createMockedStore('navigating-ctx');
const [updated, setUpdated] = createMockedStore('updated-ctx');
export const [page, setAppStoresPage] = createMockedStore('page-ctx');
export const [navigating, setAppStoresNavigating] = createMockedStore('navigating-ctx');
const [updated, setAppStoresUpdated] = createMockedStore('updated-ctx');

(updated as any).check = () => {};

export { updated, setUpdated };
export { updated, setAppStoresUpdated };

export function getStores() {
return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export function mockSveltekitStores() {
alias: {
'$app/forms': '@storybook/sveltekit/internal/mocks/app/forms',
'$app/navigation': '@storybook/sveltekit/internal/mocks/app/navigation',
'$app/state': '@storybook/sveltekit/internal/mocks/app/state.svelte.js',
'$app/stores': '@storybook/sveltekit/internal/mocks/app/stores',
},
},
Expand Down
1 change: 1 addition & 0 deletions code/frameworks/sveltekit/src/preset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ export const optimizeViteDeps = [
'@storybook/sveltekit/internal/mocks/app/forms',
'@storybook/sveltekit/internal/mocks/app/navigation',
'@storybook/sveltekit/internal/mocks/app/stores',
'@storybook/sveltekit/internal/mocks/app/state.svelte.js',
];
15 changes: 14 additions & 1 deletion code/frameworks/sveltekit/src/preview.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import type { Decorator } from '@storybook/svelte';
import type { Decorator, Preview } from '@storybook/svelte';
import MockProvider from '@storybook/sveltekit/internal/MockProvider.svelte';
import {
setAppStateNavigating,
setAppStatePage,
setAppStateUpdated, // @ts-expect-error no declaration file for this JS module
} from '@storybook/sveltekit/internal/mocks/app/state.svelte.js';
Comment on lines +3 to +7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix @ts-expect-error placement; TypeScript ignores inline trailing annotations

// @ts-expect-error must be on the preceding line of the failing statement. As written, it won’t suppress the error for this import.

Apply:

-import {
-  setAppStateNavigating,
-  setAppStatePage,
-  setAppStateUpdated, // @ts-expect-error no declaration file for this JS module
-} from '@storybook/sveltekit/internal/mocks/app/state.svelte.js';
+// @ts-expect-error no declaration file for this JS module
+import {
+  setAppStateNavigating,
+  setAppStatePage,
+  setAppStateUpdated,
+} from '@storybook/sveltekit/internal/mocks/app/state.svelte.js';

Optional (preferred): add a declaration file to remove the need for ts-expect-error:

// code/frameworks/sveltekit/src/mocks/app/state.svelte.d.ts
declare module '@storybook/sveltekit/internal/mocks/app/state.svelte.js' {
  import type { Page, Navigation } from '../../types'; // adjust path if needed

  export function setAppStatePage(page?: Partial<Page> | undefined): void;
  export function setAppStateNavigating(navigating?: Partial<Navigation> | undefined): void;
  export function setAppStateUpdated(updated?: { current: boolean } | undefined): void;
}
🤖 Prompt for AI Agents
In code/frameworks/sveltekit/src/preview.ts around lines 3 to 7, the trailing
"// @ts-expect-error" on the import does not suppress the TypeScript error
because the annotation must be on the line immediately before the failing
statement; move the "// @ts-expect-error no declaration file for this JS module"
to its own line immediately above the import statement so TS recognizes it, and
optionally add a declaration file at
code/frameworks/sveltekit/src/mocks/app/state.svelte.d.ts declaring the module
and exported functions to remove the need for the ts-expect-error.


import type { SvelteKitParameters } from './types';

Expand All @@ -15,3 +20,11 @@ const svelteKitMocksDecorator: Decorator = (Story, ctx) => {
};

export const decorators: Decorator[] = [svelteKitMocksDecorator];

export const beforeEach: Preview['beforeEach'] = async (ctx) => {
const svelteKitParameters: SvelteKitParameters = ctx.parameters?.sveltekit_experimental ?? {};

setAppStatePage(svelteKitParameters?.state?.page);
setAppStateNavigating(svelteKitParameters?.state?.navigating);
setAppStateUpdated(svelteKitParameters?.state?.updated);
};
60 changes: 60 additions & 0 deletions code/frameworks/sveltekit/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,68 @@ export type NormalizedHrefConfig = {

export type HrefConfig = NormalizedHrefConfig | NormalizedHrefConfig['callback'];

/**
* Copied from:
* {@link https://github.com/sveltejs/kit/blob/7bb41aa4263b057a8912f4cdd35db03755d37342/packages/kit/types/index.d.ts#L1102-L1143}
*/
interface Page<
Params extends Record<string, string> = Record<string, string>,
RouteId extends string | null = string | null,
> {
url: URL;
params: Params;
route: {
id: RouteId;
};
status: number;
error: Error | null;
data: Record<string, any>;
state: Record<string, any>;
form: any;
}

/**
* Copied from:
* {@link https://github.com/sveltejs/kit/blob/7bb41aa4263b057a8912f4cdd35db03755d37342/packages/kit/types/index.d.ts#L988}
*/
interface NavigationTarget {
params: Record<string, string> | null;
route: {
id: string | null;
};
url: URL;
}

/**
* Copied from:
* {@link https://github.com/sveltejs/kit/blob/7bb41aa4263b057a8912f4cdd35db03755d37342/packages/kit/types/index.d.ts#L1017C9-L1017C89}
*/
type NavigationType = 'enter' | 'form' | 'leave' | 'link' | 'goto' | 'popstate';

/**
* Copied from:
* {@link https://github.com/sveltejs/kit/blob/7bb41aa4263b057a8912f4cdd35db03755d37342/packages/kit/types/index.d.ts#L1017C9-L1017C89}
*/
interface Navigation {
from: NavigationTarget | null;
to: NavigationTarget | null;
type: Exclude<NavigationType, 'enter'>;
willUnload: boolean;
delta?: number;
complete: Promise<void>;
}

export type SvelteKitParameters = Partial<{
hrefs: Record<string, HrefConfig>;
state: {
page: Partial<Page>;
navigating: Partial<Navigation>;
updated: { current: boolean };
};
/**
* @deprecated
* @see {@link https://svelte.dev/docs/kit/$app-stores}
*/
stores: {
page: Record<string, any>;
navigating: Record<string, any>;
Expand Down
12 changes: 5 additions & 7 deletions code/frameworks/sveltekit/static/MockProvider.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
import { action } from 'storybook/actions';
import { setAfterNavigateArgument } from '@storybook/sveltekit/internal/mocks/app/navigation';
import { setNavigating, setPage, setUpdated } from '@storybook/sveltekit/internal/mocks/app/stores';
import { setAppStoresNavigating, setAppStoresPage, setAppStoresUpdated } from '@storybook/sveltekit/internal/mocks/app/stores';
const{ svelteKitParameters = {}, children } = $props();
const { svelteKitParameters = {}, children } = $props();
// Set context during component initialization - this happens before any child components
setPage(svelteKitParameters?.stores?.page);
setNavigating(svelteKitParameters?.stores?.navigating);
setUpdated(svelteKitParameters?.stores?.updated);
setAppStoresPage(svelteKitParameters?.stores?.page);
setAppStoresNavigating(svelteKitParameters?.stores?.navigating);
setAppStoresUpdated(svelteKitParameters?.stores?.updated);
setAfterNavigateArgument(svelteKitParameters?.navigation?.afterNavigate);
const normalizeHrefConfig = (hrefConfig) => {
Expand Down
234 changes: 234 additions & 0 deletions code/frameworks/sveltekit/static/app-state-mock.svelte.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,234 @@
/**
* Inspired by the the code:
* {@link https://github.com/sveltejs/kit/blob/main/packages/kit/src/runtime/client/state.svelte.js}
*
* The differences:
*
* - Legacy Svelte support is not included
* - Not using classes (internal coding style preference)
*
* @module
*/
import { fn } from 'storybook/test';

/**
* @typedef {Object} App
* @property {Object} Error
* @property {string} Error.message
* @property {Object} Locals
* @property {Object} PageData
* @property {Object} PageState
* @property {Object} Platform
*/

/**
* @typedef {Object} Page
* @property {URL} url
* @property {Record<string, string>} params
* @property {Object} route
* @property {string | null} route.id
* @property {number} status
* @property {App.Error | null} error
* @property {App.PageData & Record<string, any>} data
* @property {App.PageState} state
* @property {any} form
*/

const defaultStatePageValues = {
data: {},
form: null,
error: null,
params: {},
route: { id: null },
state: {},
status: -1,
url: new URL(location.origin),
};

/** @type {Page['data']} */
let pageData = $state.raw(defaultStatePageValues.data);
/** @type {Page['form']} */
let pageForm = $state.raw(defaultStatePageValues.form);
/** @type {Page['error']} */
let pageError = $state.raw(defaultStatePageValues.error);
/** @type {Page['params']} */
let pageParams = $state.raw(defaultStatePageValues.params);
/** @type {Page['route']} */
let pageRoute = $state.raw(defaultStatePageValues.route);
/** @type {Page['state']} */
let pageState = $state.raw(defaultStatePageValues.state);
/** @type {Page['status']} */
let pageStatus = $state.raw(defaultStatePageValues.status);
/** @type {Page['url']} */
let pageUrl = $state.raw(defaultStatePageValues.url);

/** @type {Page} */
export let page = {
get data() {
return pageData;
},
set data(newPageData) {
pageData = newPageData;
},
get form() {
return pageForm;
},
set form(newPageForm) {
pageForm = newPageForm;
},
get error() {
return pageError;
},
set error(newPageError) {
pageError = newPageError;
},
get params() {
return pageParams;
},
set params(newPageParams) {
pageParams = newPageParams;
},
get route() {
return pageRoute;
},
set route(newPageRoute) {
pageRoute = newPageRoute;
},
get state() {
return pageState;
},
set state(newPageState) {
pageState = newPageState;
},
get status() {
return pageStatus;
},
set status(newPageStatus) {
pageStatus = newPageStatus;
},
get url() {
return pageUrl;
},
set url(newPageUrl) {
pageUrl = newPageUrl;
},
};

export function setAppStatePage(params = {}) {
page.data = params.data ?? defaultStatePageValues.data;
page.form = params.form ?? defaultStatePageValues.form;
page.error = params.error ?? defaultStatePageValues.error;
page.params = params.params ?? defaultStatePageValues.params;
page.route = params.route ?? defaultStatePageValues.route;
page.state = params.state ?? defaultStatePageValues.state;
page.status = params.status ?? defaultStatePageValues.status;
page.url = params.url ?? defaultStatePageValues.url;
}

/**
* @typedef {Object} NavigationTarget
* @property {Record<string, string> | null} params
* @property {Object} route
* @property {string | null} route.id
* @property {URL} url
*/

/** @typedef {'enter' | 'form' | 'leave' | 'link' | 'goto' | 'popstate'} NavigationType */

/**
* @typedef {Object} Navigation
* @property {NavigationTarget | null} from
* @property {NavigationTarget | null} to
* @property {Exclude<NavigationType, 'enter'>} type
* @property {boolean} willUnload
* @property {number} [delta]
* @property {Promise<void>} complete
*/

const defaultStateNavigatingValues = {
from: null,
to: null,
type: null,
willUnload: null,
delta: null,
complete: null,
};

/** @type {Navigation['from'] | null} */
let navigatingFrom = $state.raw(defaultStateNavigatingValues.from);
/** @type {Navigation['to'] | null} */
let navigatingTo = $state.raw(defaultStateNavigatingValues.to);
/** @type {Navigation['type'] | null} */
let navigatingType = $state.raw(defaultStateNavigatingValues.type);
/** @type {Navigation['willUnload'] | null} */
let navigatingWillUnload = $state.raw(defaultStateNavigatingValues.willUnload);
/** @type {Navigation['delta'] | null} */
let navigatingDelta = $state.raw(defaultStateNavigatingValues.delta);
/** @type {Navigation['complete'] | null} */
let navigatingComplete = $state.raw(defaultStateNavigatingValues.complete);

/** @type {Navigation} */
export let navigating = {
get from() {
return navigatingFrom;
},
set from(newNavigatingFrom) {
navigatingFrom = newNavigatingFrom;
},
get to() {
return navigatingTo;
},
set to(newNavigatingTo) {
navigatingTo = newNavigatingTo;
},
get type() {
return navigatingType;
},
set type(newNavigatingType) {
navigatingType = newNavigatingType;
},
get willUnload() {
return navigatingWillUnload;
},
set willUnload(newNavigatingWillUnload) {
navigatingWillUnload = newNavigatingWillUnload;
},
get delta() {
return navigatingDelta;
},
set delta(newNavigatingDelta) {
navigatingDelta = newNavigatingDelta;
},
get complete() {
return navigatingComplete;
},
set complete(newNavigatingComplete) {
navigatingComplete = newNavigatingComplete;
},
};

export function setAppStateNavigating(params = {}) {
navigating.from = params.from ?? defaultStateNavigatingValues.from;
navigating.to = params.to ?? defaultStateNavigatingValues.to;
navigating.type = params.type ?? defaultStateNavigatingValues.type;
navigating.willUnload = params.willUnload ?? defaultStateNavigatingValues.willUnload;
navigating.delta = params.delta ?? defaultStateNavigatingValues.delta;
navigating.complete = params.complete ?? defaultStateNavigatingValues.complete;
}

/** @type {boolean} */
let updatedCurrent = $state.raw(false);

export let updated = {
get current() {
return updatedCurrent;
},
set current(newCurrent) {
updatedCurrent = newCurrent;
},
check: fn(() => Promise.resolve(updatedCurrent)),
};

export function setAppStateUpdated(params = {}) {
updated.current = params.current ?? false;
}
Loading