revert some unnecessary changes, to reduce diff size

sveltejs · mnrx · Nov 15, 2023 · Nov 15, 2023 · Nov 15, 2023 · Jan 31, 2024
commit a06a4e609fda7edea2674c4638c878f1b904a4d7
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
@@ -1,5 +1,5 @@
-import { subscribe_to_store } from '../../store/index.js';
 import { DEV } from 'esm-env';
+import { subscribe_to_store } from '../../store/utils.js';
 import { noop, run_all } from '../common.js';
 import {
 	array_prototype,

diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
@@ -1,7 +1,7 @@
 import * as $ from '../client/runtime.js';
 import { set_is_ssr } from '../client/runtime.js';
 import { is_promise, noop } from '../common.js';
-import { subscribe_to_store } from '../../store/index.js';
+import { subscribe_to_store } from '../../store/utils.js';
 import { DOMBooleanAttributes } from '../../constants.js';
 
 export * from '../client/validate.js';

diff --git a/packages/svelte/src/motion/spring.js b/packages/svelte/src/motion/spring.js
@@ -48,10 +48,7 @@ function tick_spring(ctx, last_value, current_value, target_value) {
 }
 
 /**
- * The spring function in Svelte creates a store whose value is animated, with a motion that
- * simulates the behavior of a spring. This means when the value changes, instead of transitioning
- * at a steady rate, it "bounces" like a spring would, depending on the physics parameters provided.
- * This adds a level of realism to the transitions and can enhance the user experience.
+ * The spring function in Svelte creates a store whose value is animated, with a motion that simulates the behavior of a spring. This means when the value changes, instead of transitioning at a steady rate, it "bounces" like a spring would, depending on the physics parameters provided. This adds a level of realism to the transitions and can enhance the user experience.
  *
  * https://svelte.dev/docs/svelte-motion#spring
  * @template [T=any]

diff --git a/packages/svelte/src/motion/tweened.js b/packages/svelte/src/motion/tweened.js
@@ -71,8 +71,7 @@ function get_interpolator(a, b) {
 }
 
 /**
- * A tweened store in Svelte is a special type of store that provides smooth transitions between
- * state values over time.
+ * A tweened store in Svelte is a special type of store that provides smooth transitions between state values over time.
  *
  * https://svelte.dev/docs/svelte-motion#tweened
  * @template T
@@ -125,9 +124,9 @@ export function tweened(value, defaults = {}) {
 			if (now < start) return true;
 			if (!started) {
 				fn = interpolate(/** @type {any} */ (value), new_value);
-				if (typeof duration === 'function') {
+				if (typeof duration === 'function')
 					duration = duration(/** @type {any} */ (value), new_value);
-				}
+
 				started = true;
 			}
 			if (previous_task) {

diff --git a/packages/svelte/src/store/index.js b/packages/svelte/src/store/index.js
@@ -501,27 +501,3 @@ export function get_store_value(store, allow_stale = false) {
 }
 
 export { get_store_value as get };
-
-/**
- * @template T
- * @param {import('./public.js').Readable<T> | import('./public.js').ExternalReadable<T> | null | undefined} store
- * @param {(value: T) => void} run
- * @param {(value: T) => void} [invalidate]
- * @returns {() => void}
- */
-export function subscribe_to_store(store, run, invalidate) {
-	if (store == null) {
-		// @ts-expect-error
-		run(undefined);
-
-		// @ts-expect-error
-		if (invalidate) invalidate(undefined);
-
-		return noop;
-	}
-
-	// @ts-expect-error `SubscriberInvalidator<T>` is not public.
-	const unsubscribe = store.subscribe([run, invalidate]);
-	const is_rxjs = typeof unsubscribe !== 'function';
-	return is_rxjs ? unsubscribe.unsubscribe : unsubscribe;
-}
diff --git a/packages/svelte/src/store/utils.js b/packages/svelte/src/store/utils.js
@@ -0,0 +1,31 @@
+import { noop } from '../internal/common.js';
+
+/**
+ * @template T
+ * @param {import('./public').Readable<T> | null | undefined} store
+ * @param {(value: T) => void} run
+ * @param {(value: T) => void} [invalidate]
+ * @returns {() => void}
+ */
+export function subscribe_to_store(store, run, invalidate) {
+	if (store == null) {
+		// @ts-expect-error
+		run(undefined);
+
+		// @ts-expect-error
+		if (invalidate) invalidate(undefined);
+
+		return noop;
+	}
+
+	// Svelte store takes a private second argument
+	const unsub = store.subscribe(
+		run,
+		// @ts-expect-error
+		invalidate
+	);
+
+	// Also support RxJS
+	// @ts-expect-error TODO fix this in the types?
+	return unsub.unsubscribe ? () => unsub.unsubscribe() : unsub;
+}