chore: move more code (#15133)

* move more code

* lint

Author: Rich-Harris

packages/svelte/src/index-client.js

@@ -8,6 +8,41 @@ import * as e from './internal/client/errors.js';
 import { lifecycle_outside_component } from './internal/shared/errors.js';
 import { legacy_mode_flag } from './internal/flags/index.js';
 import { component_context } from './internal/client/context.js';
+import { DEV } from 'esm-env';
+
+if (DEV) {
+	/**
+	 * @param {string} rune
+	 */
+	function throw_rune_error(rune) {
+		if (!(rune in globalThis)) {
+			// TODO if people start adjusting the "this can contain runes" config through v-p-s more, adjust this message
+			/** @type {any} */
+			let value; // let's hope noone modifies this global, but belts and braces
+			Object.defineProperty(globalThis, rune, {
+				configurable: true,
+				// eslint-disable-next-line getter-return
+				get: () => {
+					if (value !== undefined) {
+						return value;
+					}
+
+					e.rune_outside_svelte(rune);
+				},
+				set: (v) => {
+					value = v;
+				}
+			});
+		}
+	}
+
+	throw_rune_error('$state');
+	throw_rune_error('$effect');
+	throw_rune_error('$derived');
+	throw_rune_error('$inspect');
+	throw_rune_error('$props');
+	throw_rune_error('$bindable');
+}
 
 /**
  * The `onMount` function schedules a callback to run as soon as the component has been mounted to the DOM.

packages/svelte/src/internal/client/context.js

@@ -185,6 +185,11 @@ export function pop(component) {
 	return component || /** @type {T} */ ({});
 }
 
+/** @returns {boolean} */
+export function is_runes() {
+	return !legacy_mode_flag || (component_context !== null && component_context.l === null);
+}
+
 /**
  * @param {string} name
  * @returns {Map<unknown, unknown>}

packages/svelte/src/internal/client/dom/blocks/await.js

@@ -3,12 +3,13 @@ import { DEV } from 'esm-env';
 import { is_promise } from '../../../shared/utils.js';
 import { block, branch, pause_effect, resume_effect } from '../../reactivity/effects.js';
 import { internal_set, mutable_source, source } from '../../reactivity/sources.js';
-import { flush_sync, is_runes, set_active_effect, set_active_reaction } from '../../runtime.js';
+import { flush_sync, set_active_effect, set_active_reaction } from '../../runtime.js';
 import { hydrate_next, hydrate_node, hydrating } from '../hydration.js';
 import { queue_micro_task } from '../task.js';
 import { UNINITIALIZED } from '../../../../constants.js';
 import {
 	component_context,
+	is_runes,
 	set_component_context,
 	set_dev_current_component_function
 } from '../../context.js';

packages/svelte/src/internal/client/dom/blocks/key.js

@@ -2,7 +2,7 @@
 import { UNINITIALIZED } from '../../../../constants.js';
 import { block, branch, pause_effect } from '../../reactivity/effects.js';
 import { not_equal, safe_not_equal } from '../../reactivity/equality.js';
-import { is_runes } from '../../runtime.js';
+import { is_runes } from '../../context.js';
 import { hydrate_next, hydrate_node, hydrating } from '../hydration.js';
 
 /**

packages/svelte/src/internal/client/dom/elements/bindings/input.js

@@ -5,7 +5,8 @@ import * as e from '../../../errors.js';
 import { is } from '../../../proxy.js';
 import { queue_micro_task } from '../../task.js';
 import { hydrating } from '../../hydration.js';
-import { is_runes, untrack } from '../../../runtime.js';
+import { untrack } from '../../../runtime.js';
+import { is_runes } from '../../../context.js';
 
 /**
  * @param {HTMLInputElement} input

packages/svelte/src/internal/client/index.js

@@ -110,7 +110,7 @@ export {
 	user_effect,
 	user_pre_effect
 } from './reactivity/effects.js';
-export { mutable_state, mutate, set, state } from './reactivity/sources.js';
+export { mutable_state, mutate, set, state, update, update_pre } from './reactivity/sources.js';
 export {
 	prop,
 	rest_props,
@@ -139,8 +139,6 @@ export {
 	flush_sync,
 	tick,
 	untrack,
-	update,
-	update_pre,
 	exclude_from_object,
 	deep_read,
 	deep_read_state

packages/svelte/src/internal/client/reactivity/props.js

@@ -8,16 +8,9 @@ import {
 	PROPS_IS_UPDATED
 } from '../../../constants.js';
 import { get_descriptor, is_function } from '../../shared/utils.js';
-import { mutable_source, set, source } from './sources.js';
+import { mutable_source, set, source, update } from './sources.js';
 import { derived, derived_safe_equal } from './deriveds.js';
-import {
-	active_effect,
-	get,
-	captured_signals,
-	set_active_effect,
-	untrack,
-	update
-} from '../runtime.js';
+import { active_effect, get, captured_signals, set_active_effect, untrack } from '../runtime.js';
 import { safe_equals } from './equality.js';
 import * as e from '../errors.js';
 import {

packages/svelte/src/internal/client/reactivity/sources.js

@@ -5,7 +5,6 @@ import {
 	active_effect,
 	untracked_writes,
 	get,
-	is_runes,
 	schedule_effect,
 	set_untracked_writes,
 	set_signal_status,
@@ -34,7 +33,7 @@ import {
 import * as e from '../errors.js';
 import { legacy_mode_flag, tracing_mode_flag } from '../../flags/index.js';
 import { get_stack } from '../dev/tracing.js';
-import { component_context } from '../context.js';
+import { component_context, is_runes } from '../context.js';
 
 export let inspect_effects = new Set();
 
@@ -226,6 +225,35 @@ export function internal_set(source, value) {
 	return value;
 }
 
+/**
+ * @template {number | bigint} T
+ * @param {Source<T>} source
+ * @param {1 | -1} [d]
+ * @returns {T}
+ */
+export function update(source, d = 1) {
+	var value = get(source);
+	var result = d === 1 ? value++ : value--;
+
+	set(source, value);
+
+	// @ts-expect-error
+	return result;
+}
+
+/**
+ * @template {number | bigint} T
+ * @param {Source<T>} source
+ * @param {1 | -1} [d]
+ * @returns {T}
+ */
+export function update_pre(source, d = 1) {
+	var value = get(source);
+
+	// @ts-expect-error
+	return set(source, d === 1 ? ++value : --value);
+}
+
 /**
  * @param {Value} signal
  * @param {number} status should be DIRTY or MAYBE_DIRTY

packages/svelte/src/internal/client/runtime.js

@@ -26,7 +26,7 @@ import {
 	BOUNDARY_EFFECT
 } from './constants.js';
 import { flush_tasks } from './dom/task.js';
-import { internal_set, set } from './reactivity/sources.js';
+import { internal_set } from './reactivity/sources.js';
 import {
 	destroy_derived,
 	destroy_derived_effects,
@@ -35,11 +35,12 @@ import {
 } from './reactivity/deriveds.js';
 import * as e from './errors.js';
 import { FILENAME } from '../../constants.js';
-import { legacy_mode_flag, tracing_mode_flag } from '../flags/index.js';
+import { tracing_mode_flag } from '../flags/index.js';
 import { tracing_expressions, get_stack } from './dev/tracing.js';
 import {
 	component_context,
 	dev_current_component_function,
+	is_runes,
 	set_component_context,
 	set_dev_current_component_function
 } from './context.js';
@@ -161,11 +162,6 @@ export function increment_write_version() {
 	return ++write_version;
 }
 
-/** @returns {boolean} */
-export function is_runes() {
-	return !legacy_mode_flag || (component_context !== null && component_context.l === null);
-}
-
 /**
  * Determines whether a derived or effect is dirty.
  * If it is MAYBE_DIRTY, will set the status to CLEAN
@@ -1095,35 +1091,6 @@ export function set_signal_status(signal, status) {
 	signal.f = (signal.f & STATUS_MASK) | status;
 }
 
-/**
- * @template {number | bigint} T
- * @param {Value<T>} signal
- * @param {1 | -1} [d]
- * @returns {T}
- */
-export function update(signal, d = 1) {
-	var value = get(signal);
-	var result = d === 1 ? value++ : value--;
-
-	set(signal, value);
-
-	// @ts-expect-error
-	return result;
-}
-
-/**
- * @template {number | bigint} T
- * @param {Value<T>} signal
- * @param {1 | -1} [d]
- * @returns {T}
- */
-export function update_pre(signal, d = 1) {
-	var value = get(signal);
-
-	// @ts-expect-error
-	return set(signal, d === 1 ? ++value : --value);
-}
-
 /**
  * @param {Record<string, unknown>} obj
  * @param {string[]} keys
@@ -1215,37 +1182,3 @@ export function deep_read(value, visited = new Set()) {
 		}
 	}
 }
-
-if (DEV) {
-	/**
-	 * @param {string} rune
-	 */
-	function throw_rune_error(rune) {
-		if (!(rune in globalThis)) {
-			// TODO if people start adjusting the "this can contain runes" config through v-p-s more, adjust this message
-			/** @type {any} */
-			let value; // let's hope noone modifies this global, but belts and braces
-			Object.defineProperty(globalThis, rune, {
-				configurable: true,
-				// eslint-disable-next-line getter-return
-				get: () => {
-					if (value !== undefined) {
-						return value;
-					}
-
-					e.rune_outside_svelte(rune);
-				},
-				set: (v) => {
-					value = v;
-				}
-			});
-		}
-	}
-
-	throw_rune_error('$state');
-	throw_rune_error('$effect');
-	throw_rune_error('$derived');
-	throw_rune_error('$inspect');
-	throw_rune_error('$props');
-	throw_rune_error('$bindable');
-}

packages/svelte/tests/signals/test.ts

@@ -8,7 +8,7 @@ import {
 	render_effect,
 	user_effect
 } from '../../src/internal/client/reactivity/effects';
-import { state, set } from '../../src/internal/client/reactivity/sources';
+import { state, set, update, update_pre } from '../../src/internal/client/reactivity/sources';
 import type { Derived, Effect, Value } from '../../src/internal/client/types';
 import { proxy } from '../../src/internal/client/proxy';
 import { derived } from '../../src/internal/client/reactivity/deriveds';
@@ -968,14 +968,14 @@ describe('signals', () => {
 		return () => {
 			const count = state(0n);
 
-			assert.doesNotThrow(() => $.update(count));
+			assert.doesNotThrow(() => update(count));
 			assert.equal($.get(count), 1n);
-			assert.doesNotThrow(() => $.update(count, -1));
+			assert.doesNotThrow(() => update(count, -1));
 			assert.equal($.get(count), 0n);
 
-			assert.doesNotThrow(() => $.update_pre(count));
+			assert.doesNotThrow(() => update_pre(count));
 			assert.equal($.get(count), 1n);
-			assert.doesNotThrow(() => $.update_pre(count, -1));
+			assert.doesNotThrow(() => update_pre(count, -1));
 			assert.equal($.get(count), 0n);
 		};
 	});