Merge branch 'elliott/resources' of github.com:sveltejs/svelte into elliott/resources

Author: elliott-with-the-longest-name-on-github

packages/svelte/scripts/generate-types.js

@@ -42,7 +42,7 @@ await createBundle({
 		[`${pkg.name}/easing`]: `${dir}/src/easing/index.js`,
 		[`${pkg.name}/legacy`]: `${dir}/src/legacy/legacy-client.js`,
 		[`${pkg.name}/motion`]: `${dir}/src/motion/public.d.ts`,
-		[`${pkg.name}/reactivity`]: `${dir}/src/reactivity/index-client.js`,
+		[`${pkg.name}/reactivity`]: `${dir}/src/reactivity/public.d.ts`,
 		[`${pkg.name}/reactivity/window`]: `${dir}/src/reactivity/window/index.js`,
 		[`${pkg.name}/server`]: `${dir}/src/server/index.d.ts`,
 		[`${pkg.name}/store`]: `${dir}/src/store/public.d.ts`,

packages/svelte/src/reactivity/index-client.js

@@ -1,4 +1,3 @@
-/** @import { Resource as ResourceType } from '#shared' */
 export { SvelteDate } from './date.js';
 export { SvelteSet } from './set.js';
 export { SvelteMap } from './map.js';
@@ -9,8 +8,3 @@ export { createSubscriber } from './create-subscriber.js';
 export { resource } from '../internal/client/reactivity/resource.js';
 export { ReactiveCache } from '../internal/client/reactivity/cache.js';
 export { fetcher } from '../internal/client/reactivity/fetcher.js';
-
-/**
- * @template T
- * @typedef {ResourceType<T>} Resource
- */

packages/svelte/src/reactivity/public.d.ts

@@ -0,0 +1,2 @@
+export { Resource } from '../internal/shared/types';
+export * from './index-client';

packages/svelte/types/index.d.ts

@@ -2195,7 +2195,28 @@ declare module 'svelte/motion' {
 }
 
 declare module 'svelte/reactivity' {
-	export type Resource<T> = Resource_1<T>;
+	export type Resource<T> = {
+		then: Promise<Awaited<T>>['then'];
+		catch: Promise<Awaited<T>>['catch'];
+		finally: Promise<Awaited<T>>['finally'];
+		refresh: () => Promise<void>;
+		set: (value: Awaited<T>) => void;
+		loading: boolean;
+		error: any;
+	} & (
+		| {
+				ready: false;
+				current: undefined;
+		  }
+		| {
+				ready: true;
+				current: Awaited<T>;
+		  }
+	);
+
+	type GetRequestInit = Omit<RequestInit, 'method' | 'body'> & { method?: 'GET' };
+
+	type CacheEntry = { count: number; item: any };
 	/**
 	 * A reactive version of the built-in [`Date`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date) object.
 	 * Reading the date (whether with methods like `date.getTime()` or `date.toString()`, or via things like [`Intl.DateTimeFormat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat))
@@ -2459,30 +2480,8 @@ declare module 'svelte/reactivity' {
 	 * @since 5.7.0
 	 */
 	export function createSubscriber(start: (update: () => void) => (() => void) | void): () => void;
-	export function resource<T>(fn: () => T): Resource_1<T>;
-	export function fetcher<TReturn>(url: string | URL, init?: GetRequestInit | undefined): Resource_1<TReturn>;
-	type Resource_1<T> = {
-		then: Promise<Awaited<T>>['then'];
-		catch: Promise<Awaited<T>>['catch'];
-		finally: Promise<Awaited<T>>['finally'];
-		refresh: () => Promise<void>;
-		set: (value: Awaited<T>) => void;
-		loading: boolean;
-		error: any;
-	} & (
-		| {
-				ready: false;
-				current: undefined;
-		  }
-		| {
-				ready: true;
-				current: Awaited<T>;
-		  }
-	);
-
-	type GetRequestInit = Omit<RequestInit, 'method' | 'body'> & { method?: 'GET' };
-
-	type CacheEntry = { count: number; item: any };
+	export function resource<T>(fn: () => T): Resource<T>;
+	export function fetcher<TReturn>(url: string | URL, init?: GetRequestInit | undefined): Resource<TReturn>;
 	export function cache<TFn extends (...args: any[]) => any>(key: string, fn: TFn): ReturnType<TFn>;
 
 	export class CacheObserver<T> extends BaseCacheObserver<T> {