From 987d5e9f6f8ac48b08eadbc7a9d1bf4678892da6 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 23 Feb 2024 19:21:52 -0500 Subject: [PATCH] more --- .../src/internal/client/reactivity/computations.js | 4 ++-- .../src/internal/client/reactivity/sources.js | 2 +- .../src/internal/client/reactivity/types.d.ts | 12 +++++++++++- packages/svelte/src/internal/client/types.d.ts | 14 ++------------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/svelte/src/internal/client/reactivity/computations.js b/packages/svelte/src/internal/client/reactivity/computations.js index 3eab02bf91..5f76643416 100644 --- a/packages/svelte/src/internal/client/reactivity/computations.js +++ b/packages/svelte/src/internal/client/reactivity/computations.js @@ -26,7 +26,7 @@ import { /** * @template V - * @param {import('../types.js').SignalFlags} flags + * @param {import('./types.js').SignalFlags} flags * @param {V} value */ function create_computation_signal(flags, value) { @@ -69,7 +69,7 @@ export function push_reference(target_signal, ref_signal) { } /** - * @param {import('../types.js').EffectType} type + * @param {import('./types.js').EffectType} type * @param {(() => void | (() => void))} fn * @param {boolean} sync * @param {boolean} schedule diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js index f2012e7065..f4f739a558 100644 --- a/packages/svelte/src/internal/client/reactivity/sources.js +++ b/packages/svelte/src/internal/client/reactivity/sources.js @@ -34,7 +34,7 @@ export function mutable_source(initial_value) { /** * @template V - * @param {import('../types.js').SignalFlags} flags + * @param {import('./types.js').SignalFlags} flags * @param {V} value * @returns {import('./types.js').Source | import('./types.js').Source & import('./types.js').SourceDebug} */ diff --git a/packages/svelte/src/internal/client/reactivity/types.d.ts b/packages/svelte/src/internal/client/reactivity/types.d.ts index 80f3eb756a..14eca836d7 100644 --- a/packages/svelte/src/internal/client/reactivity/types.d.ts +++ b/packages/svelte/src/internal/client/reactivity/types.d.ts @@ -1,4 +1,14 @@ -import type { Computation, EqualsFunctions, SignalFlags } from '../types'; +import type { DERIVED, EFFECT, PRE_EFFECT, RENDER_EFFECT, SOURCE } from '../constants'; +import type { Computation, EqualsFunctions } from '../types'; + +export type SignalFlags = + | typeof SOURCE + | typeof DERIVED + | typeof EFFECT + | typeof PRE_EFFECT + | typeof RENDER_EFFECT; + +export type EffectType = typeof EFFECT | typeof PRE_EFFECT | typeof RENDER_EFFECT; export type Source = { /** consumers: Signals that read from the current signal */ diff --git a/packages/svelte/src/internal/client/types.d.ts b/packages/svelte/src/internal/client/types.d.ts index 5130c7a2f6..105f3cabec 100644 --- a/packages/svelte/src/internal/client/types.d.ts +++ b/packages/svelte/src/internal/client/types.d.ts @@ -1,15 +1,5 @@ -import { DERIVED, EFFECT, RENDER_EFFECT, SOURCE, PRE_EFFECT, STATE_SYMBOL } from './constants.js'; -import type { Source, SourceDebug } from './reactivity/types.js'; - -// Put all internal types in this file. Once we convert to JSDoc, we can make this a d.ts file - -export type SignalFlags = - | typeof SOURCE - | typeof DERIVED - | typeof EFFECT - | typeof PRE_EFFECT - | typeof RENDER_EFFECT; -export type EffectType = typeof EFFECT | typeof PRE_EFFECT | typeof RENDER_EFFECT; +import { STATE_SYMBOL } from './constants.js'; +import type { SignalFlags, Source, SourceDebug } from './reactivity/types.js'; type EventCallback = (event: Event) => boolean; export type EventCallbackMap = Record;