chore: move signal types to separate file

Author: Varixo

packages/qwik/src/core/client/vnode-diff.ts

@@ -91,7 +91,7 @@ import {
 import { mapApp_findIndx } from './util-mapArray';
 import { mapArray_set } from './util-mapArray';
 import { getNewElementNamespaceData } from './vnode-namespace';
-import { WrappedSignal, EffectProperty, isSignal, SubscriptionData } from '../signal/signal';
+import { WrappedSignal, isSignal } from '../signal/signal';
 import type { Signal } from '../signal/signal.public';
 import { executeComponent } from '../shared/component-execution';
 import { isSlotProp } from '../shared/utils/prop';
@@ -100,6 +100,8 @@ import { clearAllEffects } from '../signal/signal-cleanup';
 import { serializeAttribute } from '../shared/utils/styles';
 import { QError, qError } from '../shared/error/error';
 import { getFileLocationFromJsx } from '../shared/utils/jsx-filename';
+import { EffectProperty } from '../signal/types';
+import { SubscriptionData } from '../signal/subscription-data';
 
 export const vnode_diff = (
   container: ClientContainer,

packages/qwik/src/core/index.ts

@@ -142,7 +142,6 @@ export {
   createSerializerQrl,
   createSerializer$,
 } from './signal/signal.public';
-export { SubscriptionData as _EffectData } from './signal/signal';
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Developer Low-Level API

packages/qwik/src/core/internal.ts

@@ -38,3 +38,4 @@ export { EMPTY_ARRAY as _EMPTY_ARRAY } from './shared/utils/flyweight';
 export { _serialize, _deserialize } from './shared/shared-serialization';
 export { _jsxQ, _jsxC, _jsxS } from './shared/jsx/jsx-runtime';
 export { _EFFECT_BACK_REF } from './signal/flags';
+export { SubscriptionData as _SubscriptionData } from './signal/subscription-data';

packages/qwik/src/core/shared/component-execution.ts

@@ -1,7 +1,7 @@
 import { isDev } from '@qwik.dev/core/build';
 import { vnode_isVNode } from '../client/vnode';
 import { Slot } from '../shared/jsx/slot.public';
-import { EffectProperty, isSignal } from '../signal/signal';
+import { isSignal } from '../signal/signal';
 import { clearAllEffects } from '../signal/signal-cleanup';
 import { invokeApply, newInvokeContext, untrack } from '../use/use-core';
 import { type EventQRL, type UseOnMap } from '../use/use-on';
@@ -26,6 +26,7 @@ import {
 import { MAX_RETRY_ON_PROMISE_COUNT, isPromise, maybeThen, safeCall } from './utils/promises';
 import type { ValueOrPromise } from './utils/types';
 import { getSubscriber } from '../signal/subscriber';
+import { EffectProperty } from '../signal/types';
 
 /**
  * Use `executeComponent` to execute a component.

packages/qwik/src/core/shared/jsx/jsx-runtime.ts

@@ -8,7 +8,8 @@ import { logOnceWarn, logWarn } from '../utils/log';
 import { ELEMENT_ID, OnRenderProp, QScopedStyle, QSlot, QSlotS } from '../utils/markers';
 import { qDev, seal } from '../utils/qdev';
 import { isArray, isObject, isString } from '../utils/types';
-import { WrappedSignal, WrappedSignalFlags } from '../../signal/signal';
+import { WrappedSignal } from '../../signal/signal';
+import { WrappedSignalFlags } from '../../signal/types';
 import type { DevJSX, FunctionComponent, JSXNode, JSXNodeInternal } from './types/jsx-node';
 import type { QwikJSX } from './types/jsx-qwik';
 import type { JSXChildren } from './types/jsx-qwik-attributes';

packages/qwik/src/core/shared/scheduler.ts

@@ -119,6 +119,7 @@ import { isPromise, retryOnPromise, safeCall } from './utils/promises';
 import { addComponentStylePrefix } from './utils/scoped-styles';
 import { serializeAttribute } from './utils/styles';
 import type { ValueOrPromise } from './utils/types';
+import type { NodePropPayload } from '../signal/subscription-data';
 
 // Turn this on to get debug output of what the scheduler is doing.
 const DEBUG: boolean = false;
@@ -135,15 +136,6 @@ export interface Chore {
   $executed$: boolean;
 }
 
-export interface NodePropData {
-  $scopedStyleIdPrefix$: string | null;
-  $isConst$: boolean;
-}
-
-export interface NodePropPayload extends NodePropData {
-  $value$: Signal<unknown>;
-}
-
 export type Scheduler = ReturnType<typeof createScheduler>;
 
 type ChoreTarget = HostElement | QRLInternal<(...args: unknown[]) => unknown> | Signal | TargetType;

packages/qwik/src/core/shared/shared-container.ts

@@ -1,7 +1,7 @@
 import type { ContextId } from '../use/use-context';
 import { trackSignalAndAssignHost } from '../use/use-core';
 import { version } from '../version';
-import type { SubscriptionData } from '../signal/signal';
+import type { SubscriptionData } from '../signal/subscription-data';
 import type { Signal } from '../signal/signal.public';
 import type { ISsrNode, StreamWriter, SymbolToChunkResolver } from '../ssr/ssr-types';
 import type { Scheduler } from './scheduler';

packages/qwik/src/core/shared/shared-serialization.ts

@@ -10,16 +10,10 @@ import { vnode_getNode, vnode_isVNode, vnode_locate, vnode_toString } from '../c
 import { _EFFECT_BACK_REF, NEEDS_COMPUTATION } from '../signal/flags';
 import {
   ComputedSignalImpl,
-  type EffectProperty,
-  type EffectSubscription,
-  EffectSubscriptionProp,
   SerializerSignalImpl,
   SignalImpl,
-  SubscriptionData,
   WrappedSignal,
   isSerializerObj,
-  SignalFlags,
-  type AllSignalFlags,
   type SerializerArg,
 } from '../signal/signal';
 import {
@@ -48,7 +42,6 @@ import { getPlatform } from './platform/platform';
 import { createQRL, type QRLInternal, type SyncQRLInternal } from './qrl/qrl-class';
 import { isQrl, isSyncQrl } from './qrl/qrl-utils';
 import type { QRL } from './qrl/qrl.public';
-import { type NodePropData } from './scheduler';
 import { ChoreType } from './util-chore-type';
 import type { DeserializeContainer, HostElement, ObjToProxyMap } from './types';
 import { _CONST_PROPS, _VAR_PROPS } from './utils/constants';
@@ -58,6 +51,14 @@ import { ELEMENT_ID } from './utils/markers';
 import { isPromise } from './utils/promises';
 import { SerializerSymbol, fastSkipSerialize } from './utils/serialize-utils';
 import { type ValueOrPromise } from './utils/types';
+import {
+  EffectSubscriptionProp,
+  SignalFlags,
+  type AllSignalFlags,
+  type EffectProperty,
+  type EffectSubscription,
+} from '../signal/types';
+import { SubscriptionData, type NodePropData } from '../signal/subscription-data';
 
 const deserializedProxyMap = new WeakMap<object, unknown[]>();
 

packages/qwik/src/core/shared/shared-serialization.unit.ts

@@ -1,7 +1,7 @@
 import { $, component$, noSerialize } from '@qwik.dev/core';
 import { describe, expect, it, vi } from 'vitest';
 import { _fnSignal, _wrapProp } from '../internal';
-import { SubscriptionData, type SignalImpl } from '../signal/signal';
+import { type SignalImpl } from '../signal/signal';
 import {
   createComputed$,
   createSerializer$,
@@ -24,6 +24,7 @@ import {
 import { EMPTY_ARRAY, EMPTY_OBJ } from './utils/flyweight';
 import { isQrl } from './qrl/qrl-utils';
 import { NoSerializeSymbol, SerializerSymbol } from './utils/serialize-utils';
+import { SubscriptionData } from '../signal/subscription-data';
 
 const DEBUG = false;
 

packages/qwik/src/core/signal/signal-cleanup.ts

@@ -1,15 +1,14 @@
-import {
-  EffectSubscriptionProp,
-  WrappedSignal,
-  type EffectSubscription,
-  SignalImpl,
-  type EffectProperty,
-  type Consumer,
-} from './signal';
+import { WrappedSignal, SignalImpl } from './signal';
 import { StoreHandler, getStoreHandler } from './store';
 import type { Container } from '../shared/types';
 import { ensureMaterialized, vnode_isElementVNode, vnode_isVNode } from '../client/vnode';
 import { _EFFECT_BACK_REF } from './flags';
+import {
+  EffectSubscriptionProp,
+  type Consumer,
+  type EffectProperty,
+  type EffectSubscription,
+} from './types';
 
 /** Class for back reference to the EffectSubscription */
 export abstract class BackRef {