feat(cursors): fix import cycles

Author: Varixo

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

@@ -7,10 +7,9 @@ import {
   type VNodeJournal,
 } from './vnode';
 import type { ChoreArray } from './chore-array';
-import { _EFFECT_BACK_REF } from '../reactive-primitives/types';
-import { BackRef } from '../reactive-primitives/cleanup';
 import { isDev } from '@qwik.dev/core/build';
 import type { QElement } from '../shared/types';
+import { BackRef } from '../reactive-primitives/backref';
 
 /** @internal */
 export abstract class VNode extends BackRef {

packages/qwik/src/core/reactive-primitives/backref.ts

@@ -0,0 +1,7 @@
+/** @internal */
+export const _EFFECT_BACK_REF = Symbol('backRef');
+
+/** Class for back reference to the EffectSubscription */
+export abstract class BackRef {
+  [_EFFECT_BACK_REF]: Map<any, any> | undefined = undefined;
+}

packages/qwik/src/core/reactive-primitives/cleanup.ts

@@ -1,24 +1,14 @@
-// import { ensureMaterialized, vnode_isElementVNode, vnode_isVNode } from '../client/vnode';
-// import type { Container } from '../shared/types';
-// import { SignalImpl } from './impl/signal-impl';
-// import { WrappedSignalImpl } from './impl/wrapped-signal-impl';
-// import { StoreHandler, getStoreHandler } from './impl/store';
-// import { AsyncComputedSignalImpl } from './impl/async-computed-signal-impl';
-// import { _PROPS_HANDLER } from '../shared/utils/constants';
-import {
-  EffectSubscriptionProp,
-  _EFFECT_BACK_REF,
-  type Consumer,
-  type EffectProperty,
-  type EffectSubscription,
-} from './types';
+import { ensureMaterialized, vnode_isElementVNode, vnode_isVNode } from '../client/vnode';
+import type { Container } from '../shared/types';
+import { SignalImpl } from './impl/signal-impl';
+import { WrappedSignalImpl } from './impl/wrapped-signal-impl';
+import { StoreHandler, getStoreHandler } from './impl/store';
+import { AsyncComputedSignalImpl } from './impl/async-computed-signal-impl';
+import { _PROPS_HANDLER } from '../shared/utils/constants';
+import { BackRef, _EFFECT_BACK_REF } from './backref';
+import { EffectSubscriptionProp, type Consumer, type EffectSubscription } from './types';
 import { isPropsProxy, type PropsProxyHandler } from '../shared/jsx/props-proxy';
 
-/** Class for back reference to the EffectSubscription */
-export abstract class BackRef {
-  [_EFFECT_BACK_REF]: Map<EffectProperty | string, EffectSubscription> | undefined = undefined;
-}
-
 export function clearAllEffects(container: Container, consumer: Consumer): void {
   if (vnode_isVNode(consumer) && vnode_isElementVNode(consumer)) {
     ensureMaterialized(consumer);

packages/qwik/src/core/reactive-primitives/impl/async-computed-signal-impl.ts

@@ -4,9 +4,8 @@ import type { Container } from '../../shared/types';
 import { isPromise, retryOnPromise } from '../../shared/utils/promises';
 import { cleanupDestroyable } from '../../use/utils/destroyable';
 import { cleanupFn, trackFn } from '../../use/utils/tracker';
-import type { BackRef } from '../cleanup';
+import { _EFFECT_BACK_REF, type BackRef } from '../backref';
 import {
-  _EFFECT_BACK_REF,
   AsyncComputeQRL,
   EffectProperty,
   EffectSubscription,

packages/qwik/src/core/reactive-primitives/impl/computed-signal-impl.ts

@@ -5,12 +5,12 @@ import type { Container } from '../../shared/types';
 import { isPromise } from '../../shared/utils/promises';
 import { tryGetInvokeContext } from '../../use/use-core';
 import { scheduleEffects, throwIfQRLNotResolved } from '../utils';
-import type { BackRef } from '../cleanup';
 import { getSubscriber } from '../subscriber';
 import { SerializationSignalFlags, ComputeQRL, EffectSubscription } from '../types';
-import { _EFFECT_BACK_REF, EffectProperty, NEEDS_COMPUTATION, SignalFlags } from '../types';
+import { EffectProperty, NEEDS_COMPUTATION, SignalFlags } from '../types';
 import { SignalImpl } from './signal-impl';
 import type { QRLInternal } from '../../shared/qrl/qrl-class';
+import { _EFFECT_BACK_REF, type BackRef } from '../backref';
 
 const DEBUG = false;
 // eslint-disable-next-line no-console

packages/qwik/src/core/reactive-primitives/impl/wrapped-signal-impl.ts

@@ -5,19 +5,13 @@ import type { Container, HostElement } from '../../shared/types';
 import { HOST_EFFECTS } from '../../shared/utils/markers';
 import { ChoreBits } from '../../shared/vnode/enums/chore-bits.enum';
 import { trackSignal } from '../../use/use-core';
-import type { BackRef } from '../cleanup';
 import { getValueProp } from '../internal-api';
 import type { AllSignalFlags, EffectSubscription } from '../types';
-import {
-  _EFFECT_BACK_REF,
-  EffectProperty,
-  NEEDS_COMPUTATION,
-  SignalFlags,
-  WrappedSignalFlags,
-} from '../types';
+import { EffectProperty, NEEDS_COMPUTATION, SignalFlags, WrappedSignalFlags } from '../types';
 import { isSignal, scheduleEffects } from '../utils';
 import { SignalImpl } from './signal-impl';
 import { markVNodeDirty } from '../../shared/vnode/vnode-dirty';
+import { _EFFECT_BACK_REF, type BackRef } from '../backref';
 
 export class WrappedSignalImpl<T> extends SignalImpl<T> implements BackRef {
   $args$: any[];

packages/qwik/src/core/reactive-primitives/subscriber.ts

@@ -1,9 +1,9 @@
 import { isServer } from '@qwik.dev/core/build';
 import { QBackRefs } from '../shared/utils/markers';
 import type { ISsrNode } from '../ssr/ssr-types';
-import { BackRef } from './cleanup';
 import type { Consumer, EffectProperty, EffectSubscription } from './types';
-import { _EFFECT_BACK_REF, EffectSubscriptionProp } from './types';
+import { EffectSubscriptionProp } from './types';
+import { _EFFECT_BACK_REF, type BackRef } from './backref';
 
 export function getSubscriber(
   effect: Consumer,

packages/qwik/src/core/reactive-primitives/types.ts

@@ -23,9 +23,6 @@ import type { VNode } from '../shared/vnode/vnode';
  */
 export const NEEDS_COMPUTATION: any = Symbol('invalid');
 
-/** @internal */
-export const _EFFECT_BACK_REF = Symbol('backRef');
-
 export interface InternalReadonlySignal<T = unknown> extends ReadonlySignal<T> {
   readonly untrackedValue: T;
 }

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

@@ -30,7 +30,7 @@ export let isDomRef = (obj: unknown): obj is DomRef => false;
  * A back reference to a previously serialized object. Before deserialization, all backrefs are
  * swapped with their original locations.
  */
-export class BackRef {
+export class SerializationBackRef {
   constructor(
     /** The path from root to the original object */
     public $path$: string
@@ -156,7 +156,7 @@ export const createSerializationContext = (
     if (index === undefined) {
       index = roots.length;
     }
-    roots[index] = new BackRef(path);
+    roots[index] = new SerializationBackRef(path);
     ref.$parent$ = null;
     ref.$index$ = index;
   };

packages/qwik/src/core/shared/serdes/serialize.ts

@@ -38,7 +38,11 @@ import { isPromise, maybeThen } from '../utils/promises';
 import { fastSkipSerialize, SerializerSymbol } from './verify';
 import { Constants, TypeIds } from './constants';
 import { qrlToString } from './qrl-to-string';
-import { BackRef, type SeenRef, type SerializationContext } from './serialization-context';
+import {
+  SerializationBackRef,
+  type SeenRef,
+  type SerializationContext,
+} from './serialization-context';
 
 /**
  * Format:
@@ -169,7 +173,7 @@ export async function serialize(serializationContext: SerializationContext): Pro
     }
 
     // Now we know it's a root and we should output a RootRef
-    const rootIdx = value instanceof BackRef ? value.$path$ : seen.$index$;
+    const rootIdx = value instanceof SerializationBackRef ? value.$path$ : seen.$index$;
 
     // But make sure we do output ourselves
     if (!parent && rootIdx === index) {
@@ -280,7 +284,7 @@ export async function serialize(serializationContext: SerializationContext): Pro
             output(TypeIds.Constant, Constants.EMPTY_OBJ);
           } else if (value === null) {
             output(TypeIds.Constant, Constants.Null);
-          } else if (value instanceof BackRef) {
+          } else if (value instanceof SerializationBackRef) {
             output(TypeIds.RootRef, value.$path$);
           } else {
             const newSeenRef = getSeenRefOrOutput(value, index);