more consolidation

Author: dummdidumm

packages/svelte/src/motion/private.d.ts

@@ -24,6 +24,14 @@ export interface SpringUpdateOpts {
 	 * @deprecated Only use this for the spring store; does nothing when set on the Spring class
 	 */
 	soft?: string | number | boolean;
+	/**
+	 * Only use this for the Spring class; does nothing when set on the spring store
+	 */
+	instant?: boolean;
+	/**
+	 * Only use this for the Spring class; does nothing when set on the spring store
+	 */
+	preserveMomentum?: number;
 }
 
 export type Updater<T> = (target_value: T, value: T) => T;

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

@@ -58,7 +58,7 @@ export class Spring<T> {
 	 * If `options.preserveMomentum` is provided, the spring will continue on its current trajectory for
 	 * the specified number of milliseconds. This is useful for things like 'fling' gestures.
 	 */
-	set(value: T, options?: { instant?: boolean; preserveMomentum?: number }): Promise<void>;
+	set(value: T, options?: SpringUpdateOpts): Promise<void>;
 
 	damping: number;
 	precision: number;

packages/svelte/src/motion/spring.js

@@ -133,6 +133,7 @@ export function spring(value, opts = {}) {
 		});
 	}
 	/** @type {SpringStore<T>} */
+	// @ts-expect-error - class-only properties are missing
 	const spring = {
 		set,
 		update: (fn, opts) => set(fn(/** @type {T} */ (target_value), /** @type {T} */ (value)), opts),
@@ -271,7 +272,7 @@ export class Spring {
 	 * the specified number of milliseconds. This is useful for things like 'fling' gestures.
 	 *
 	 * @param {T} value
-	 * @param {{ instant?: boolean; preserveMomentum?: number }} [options]
+	 * @param {SpringUpdateOpts} [options]
 	 */
 	set(value, options) {
 		this.#deferred?.reject(new Error('Aborted'));

packages/svelte/types/index.d.ts

@@ -1694,7 +1694,7 @@ declare module 'svelte/motion' {
 		 * If `options.preserveMomentum` is provided, the spring will continue on its current trajectory for
 		 * the specified number of milliseconds. This is useful for things like 'fling' gestures.
 		 */
-		set(value: T, options?: { instant?: boolean; preserveMomentum?: number }): Promise<void>;
+		set(value: T, options?: SpringUpdateOpts): Promise<void>;
 
 		damping: number;
 		precision: number;
@@ -1745,6 +1745,14 @@ declare module 'svelte/motion' {
 		 * @deprecated Only use this for the spring store; does nothing when set on the Spring class
 		 */
 		soft?: string | number | boolean;
+		/**
+		 * Only use this for the Spring class; does nothing when set on the spring store
+		 */
+		instant?: boolean;
+		/**
+		 * Only use this for the Spring class; does nothing when set on the spring store
+		 */
+		preserveMomentum?: number;
 	}
 
 	type Updater<T> = (target_value: T, value: T) => T;