Merge pull request #7381 from QwikDev/v2-small-cleanup

chore: cleanup and fix types

Author: Varixo

packages/qwik/src/core/client/types.ts

@@ -53,10 +53,6 @@ export interface QDocument extends Document {
   qVNodeData: WeakMap<Element, string>;
 }
 
-export interface QNode extends Node {
-  qVNode?: VNode;
-}
-
 /**
  * Flags for VNode.
  *

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

@@ -26,7 +26,6 @@ import {
   QDefaultSlot,
   QSlot,
   QSlotParent,
-  QStyle,
   QBackRefs,
   QTemplate,
   Q_PREFIX,
@@ -59,7 +58,6 @@ import {
 } from './types';
 import {
   vnode_ensureElementInflated,
-  vnode_getAttr,
   vnode_getDomParentVNode,
   vnode_getElementName,
   vnode_getFirstChild,
@@ -102,8 +100,6 @@ import { serializeAttribute } from '../shared/utils/styles';
 import { QError, qError } from '../shared/error/error';
 import { getFileLocationFromJsx } from '../shared/utils/jsx-filename';
 
-export type ComponentQueue = Array<VNode>;
-
 export const vnode_diff = (
   container: ClientContainer,
   jsxNode: JSXOutput,
@@ -806,7 +802,7 @@ export const vnode_diff = (
     }
   }
 
-  /** @param tag Returns true if `qDispatchEvent` needs patching */
+  /** @returns True if `qDispatchEvent` needs patching */
   function setBulkProps(
     vnode: ElementVNode,
     srcAttrs: ClientAttrs,
@@ -974,6 +970,7 @@ export const vnode_diff = (
    * By retrieving the child with the given key we are effectively removing it from the list (hence
    * we need to splice the `vSiblings` array).
    *
+   * @param nodeName
    * @param key
    * @returns Array where: (see: `SiblingsArray`)
    *
@@ -1202,14 +1199,6 @@ export const vnode_diff = (
   }
 };
 
-export const isQStyleVNode = (vNode: VNode): boolean => {
-  return (
-    vnode_isElementVNode(vNode) &&
-    vnode_getElementName(vNode) === 'style' &&
-    vnode_getAttr(vNode, QStyle) !== null
-  );
-};
-
 /**
  * Retrieve the key from the VNode.
  *

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

@@ -124,12 +124,14 @@ import { QError, qError } from '../shared/error/error';
 import { DEBUG_TYPE, QContainerValue, VirtualType, VirtualTypeName } from '../shared/types';
 import { isText } from '../shared/utils/element';
 import {
+  dangerouslySetInnerHTML,
   ELEMENT_ID,
   ELEMENT_KEY,
   ELEMENT_PROPS,
   ELEMENT_SEQ,
   ELEMENT_SEQ_IDX,
   OnRenderProp,
+  Q_PROPS_SEPARATOR,
   QContainerAttr,
   QContainerAttrEnd,
   QContainerIsland,
@@ -142,27 +144,25 @@ import {
   QSlotParent,
   QStyle,
   QStylesAllSelector,
-  Q_PROPS_SEPARATOR,
-  dangerouslySetInnerHTML,
 } from '../shared/utils/markers';
 import { isHtmlElement } from '../shared/utils/types';
 import { VNodeDataChar } from '../shared/vnode-data-types';
 import { getDomContainer } from './dom-container';
 import { mapApp_findIndx, mapArray_get, mapArray_set } from './util-mapArray';
 import {
-  ElementVNodeProps,
-  TextVNodeProps,
-  VNodeFlags,
-  VNodeFlagsIndex,
-  VNodeProps,
-  VirtualVNodeProps,
   type ClientContainer,
   type ContainerElement,
   type ElementVNode,
+  ElementVNodeProps,
   type QDocument,
   type TextVNode,
-  type VNode,
+  TextVNodeProps,
   type VirtualVNode,
+  VirtualVNodeProps,
+  type VNode,
+  VNodeFlags,
+  VNodeFlagsIndex,
+  VNodeProps,
 } from './types';
 import {
   vnode_getDomChildrenWithCorrectNamespacesToInsert,
@@ -1131,17 +1131,6 @@ export const vnode_truncate = (
   vParent[ElementVNodeProps.lastChild] = vPrevious;
 };
 
-export const vnode_isChildOf = (vParent: VNode, vChild: VNode): boolean => {
-  let vNode = vChild;
-  while (vNode) {
-    if (vNode === vParent) {
-      return true;
-    }
-    vNode = vnode_getParent(vNode)!;
-  }
-  return false;
-};
-
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 export const vnode_getElementName = (vnode: ElementVNode): string => {
@@ -1888,7 +1877,7 @@ const isElement = (node: any): node is Element =>
  * parents.
  *
  * However, if during traversal we encounter a projection, than we have to follow the projection,
- * and nod weth the projection component is further away (it is the parent's parent of the
+ * and node with the projection component is further away (it is the parent's parent of the
  * projection's)
  *
  * So in general we have to go up as many parent components as there are projections nestings.
@@ -1899,7 +1888,7 @@ const isElement = (node: any): node is Element =>
  * - And so on.
  *
  * @param vHost
- * @param getObjectById
+ * @param rootVNode
  * @returns
  */
 export const vnode_getProjectionParentComponent = (
@@ -1929,7 +1918,7 @@ export const vnode_getProjectionParentComponent = (
   return vHost as VirtualVNode | null;
 };
 
-const VNodeArray = class VNode extends Array {
+const VNodeArray = class VNode extends Array<any> {
   static createElement(
     flags: VNodeFlags,
     parent: VNode | null,
@@ -1940,7 +1929,7 @@ const VNodeArray = class VNode extends Array {
     element: Element,
     elementName: string | undefined
   ) {
-    const vnode = new VNode(
+    return new VNode(
       flags,
       parent,
       previousSibling,
@@ -1950,8 +1939,7 @@ const VNodeArray = class VNode extends Array {
       element,
       elementName,
       []
-    ) as any;
-    return vnode;
+    ) as ElementVNode;
   }
 
   static createText(
@@ -1962,8 +1950,7 @@ const VNodeArray = class VNode extends Array {
     textNode: Text | null,
     text: string | undefined
   ) {
-    const vnode = new VNode(flags, parent, previousSibling, nextSibling, textNode, text) as any;
-    return vnode;
+    return new VNode(flags, parent, previousSibling, nextSibling, textNode, text) as TextVNode;
   }
 
   static createVirtual(
@@ -1974,16 +1961,15 @@ const VNodeArray = class VNode extends Array {
     firstChild: VNode | null,
     lastChild: VNode | null
   ) {
-    const vnode = new VNode(
+    return new VNode(
       flags,
       parent,
       previousSibling,
       nextSibling,
       firstChild,
       lastChild,
       []
-    ) as any;
-    return vnode;
+    ) as VirtualVNode;
   }
 
   constructor(
@@ -1993,7 +1979,6 @@ const VNodeArray = class VNode extends Array {
     nextSibling: VNode | null | undefined,
     ...rest: (VNode | Element | Text | string | null | undefined)[]
   ) {
-    // @ts-expect-error
     super(flags, parent, previousSibling, nextSibling, ...rest);
     if (isDev) {
       this.toString = vnode_toString;

packages/qwik/src/core/debug.ts

@@ -64,10 +64,6 @@ export const pad = (text: string, prefix: string) => {
 
 export const jsxToString = (value: any): string => {
   if (isJSXNode(value)) {
-    let type = value.type;
-    if (typeof type === 'function') {
-      type = type.name || 'Component';
-    }
     let str = '<' + value.type;
     if (value.props) {
       for (const [key, val] of Object.entries(value.props)) {

packages/qwik/src/core/shared/component.public.ts

@@ -7,7 +7,7 @@ import type {
   QRLEventHandlerMulti,
 } from './jsx/types/jsx-qwik-attributes';
 import type { FunctionComponent } from './jsx/types/jsx-node';
-import { _CONST_PROPS, _VAR_PROPS, _jsxSorted, _jsxSplit } from '../internal';
+import { _jsxSplit } from '../internal';
 import type { QwikIntrinsicElements } from './jsx/types/jsx-qwik-elements';
 import { assertNumber } from './error/assert';
 import { qTest } from './utils/qdev';
@@ -212,8 +212,3 @@ export const component$ = <PROPS = unknown>(onMount: OnRenderFn<PROPS>): Compone
 
 /** @public */
 export type OnRenderFn<PROPS> = (props: PROPS) => JSXOutput;
-
-export interface RenderFactoryOutput<PROPS> {
-  renderQRL: QRL<OnRenderFn<PROPS>>;
-  waitOn: any[];
-}

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

@@ -197,8 +197,6 @@ export function h<TYPE extends string | FunctionComponent<PROPS>, PROPS extends
   return _jsxSplit(type, props!, null, normalizedProps.children, 0, key);
 }
 
-export const SKIP_RENDER_TYPE = ':skipRender';
-
 export const isPropsProxy = (obj: any): obj is PropsProxy => {
   return obj && obj[_VAR_PROPS] !== undefined;
 };
@@ -317,19 +315,6 @@ export const jsxDEV = <T extends string | FunctionComponent<Props>>(
 
 export type { QwikJSX as JSX };
 
-export const createJSXError = (message: string, node: JSXNodeInternal) => {
-  const error = new Error(message);
-  if (!node.dev) {
-    return error;
-  }
-  error.stack = `JSXError: ${message}\n${filterStack(node.dev.stack!, 1)}`;
-  return error;
-};
-
-const filterStack = (stack: string, offset: number = 0) => {
-  return stack.split('\n').slice(offset).join('\n');
-};
-
 export function createPropsProxy(
   varProps: Props,
   constProps: Props | null,
@@ -402,7 +387,7 @@ class PropsProxyHandler implements ProxyHandler<any> {
       (this.$constProps$ ? prop in this.$constProps$ : false);
     return hasProp;
   }
-  getOwnPropertyDescriptor(target: any, p: string | symbol): PropertyDescriptor | undefined {
+  getOwnPropertyDescriptor(_: any, p: string | symbol): PropertyDescriptor | undefined {
     const value =
       p === 'children' && this.$children$ != null
         ? this.$children$

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

@@ -1441,7 +1441,7 @@ export function _deserialize(rawStateData: string | null, element?: unknown): un
     return [];
   }
 
-  let container: DeserializeContainer | undefined = undefined;
+  let container: DeserializeContainer | undefined;
   if (isNode(element) && isElement(element)) {
     container = _createDeserializeContainer(stateData, element as HTMLElement);
   } else {

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

@@ -67,10 +67,6 @@ export type qWindow = Window & {
 
 export type QwikLoaderEventScope = '-document' | '-window' | '';
 
-export const isContainer = (container: any): container is Container => {
-  return container && typeof container === 'object' && typeof container.setHostProp === 'function';
-};
-
 /**
  * A friendly name tag for a VirtualVNode.
  *

packages/qwik/src/core/shared/utils/promises.ts

@@ -3,8 +3,6 @@ import type { ValueOrPromise } from './types';
 
 export const MAX_RETRY_ON_PROMISE_COUNT = 100;
 
-export type PromiseTree<T> = T | Promise<T> | Promise<T[]> | Array<PromiseTree<T>>;
-
 export const isPromise = (value: any): value is Promise<any> => {
   // not using "value instanceof Promise" to have zone.js support
   return !!value && typeof value == 'object' && typeof value.then === 'function';
@@ -36,15 +34,6 @@ export const maybeThen = <T, B>(
     : thenFn(valueOrPromise as any);
 };
 
-export const maybeThenPassError = <T, B>(
-  valueOrPromise: ValueOrPromise<T>,
-  thenFn: (arg: Awaited<T>) => ValueOrPromise<B>
-): ValueOrPromise<B> => {
-  return isPromise(valueOrPromise)
-    ? valueOrPromise.then(thenFn as any)
-    : thenFn(valueOrPromise as any);
-};
-
 export const shouldNotError = (reason: any): any => {
   throwErrorAndStop(reason);
 };

packages/qwik/src/core/shared/utils/serialize-utils.ts

@@ -68,7 +68,7 @@ const _verifySerializable = <T>(
       case 'number':
         return value;
     }
-    let message = '';
+    let message: string;
     if (preMessage) {
       message = preMessage;
     } else {