Revert "chore: move internals out of JSXNode"

packages/docs/src/routes/api/qwik/api.json

@@ -1256,7 +1256,7 @@
         }
       ],
       "kind": "Interface",
-      "content": "A JSX Node, an internal structure. You probably want to use `JSXOutput` instead.\n\n\n```typescript\nexport interface JSXNode<T extends string | FunctionComponent | unknown = unknown> \n```\n\n\n<table><thead><tr><th>\n\nProperty\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[children](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[JSXChildren](#jsxchildren) \\| null\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[dev?](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[DevJSX](#devjsx)\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[key](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring \\| null\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[props](#)\n\n\n</td><td>\n\n\n</td><td>\n\nT extends [FunctionComponent](#functioncomponent)<!-- -->&lt;infer P&gt; ? P : Record&lt;any, unknown&gt;\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[type](#)\n\n\n</td><td>\n\n\n</td><td>\n\nT\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>",
+      "content": "A JSX Node, an internal structure. You probably want to use `JSXOutput` instead.\n\n\n```typescript\nexport interface JSXNode<T extends string | FunctionComponent | unknown = unknown> \n```\n\n\n<table><thead><tr><th>\n\nProperty\n\n\n</th><th>\n\nModifiers\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\n[children](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[JSXChildren](#jsxchildren) \\| null\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[dev?](#)\n\n\n</td><td>\n\n\n</td><td>\n\n[DevJSX](#devjsx)\n\n\n</td><td>\n\n_(Optional)_\n\n\n</td></tr>\n<tr><td>\n\n[flags](#)\n\n\n</td><td>\n\n\n</td><td>\n\nnumber\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[immutableProps](#)\n\n\n</td><td>\n\n\n</td><td>\n\nRecord&lt;any, unknown&gt; \\| null\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[key](#)\n\n\n</td><td>\n\n\n</td><td>\n\nstring \\| null\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[props](#)\n\n\n</td><td>\n\n\n</td><td>\n\nT extends [FunctionComponent](#functioncomponent)<!-- -->&lt;infer P&gt; ? P : Record&lt;any, unknown&gt;\n\n\n</td><td>\n\n\n</td></tr>\n<tr><td>\n\n[type](#)\n\n\n</td><td>\n\n\n</td><td>\n\nT\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/core/render/jsx/types/jsx-node.ts",
       "mdFile": "qwik.jsxnode.md"
     },
@@ -1760,7 +1760,7 @@
         }
       ],
       "kind": "Function",
-      "content": "> This API is provided as an alpha preview for developers and may change based on feedback that we receive. Do not use this API in a production environment.\n> \n\nLoad the prefetch graph for the container.\n\nEach Qwik container needs to include its own prefetch graph.\n\n\n```typescript\nPrefetchGraph: (opts?: {\n    base?: string;\n    manifestHash?: string;\n    manifestURL?: string;\n    nonce?: string;\n}) => JSXOutput\n```\n\n\n<table><thead><tr><th>\n\nParameter\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\nopts\n\n\n</td><td>\n\n{ base?: string; manifestHash?: string; manifestURL?: string; nonce?: string; }\n\n\n</td><td>\n\n_(Optional)_ Options for the loading prefetch graph.\n\n- `base` - Base of the graph. For a default installation this will default to the q:base value `/build/`<!-- -->. But if more than one MFE is installed on the page, then each MFE needs to have its own base. - `manifestHash` - Hash of the manifest file to load. If not provided the hash will be extracted from the container attribute `q:manifest-hash` and assume the default build file `${base}/q-bundle-graph-${manifestHash}.json`<!-- -->. - `manifestURL` - URL of the manifest file to load if non-standard bundle graph location name.\n\n\n</td></tr>\n</tbody></table>\n**Returns:**\n\n[JSXOutput](#jsxoutput)",
+      "content": "> This API is provided as an alpha preview for developers and may change based on feedback that we receive. Do not use this API in a production environment.\n> \n\nLoad the prefetch graph for the container.\n\nEach Qwik container needs to include its own prefetch graph.\n\n\n```typescript\nPrefetchGraph: (opts?: {\n    base?: string;\n    manifestHash?: string;\n    manifestURL?: string;\n    nonce?: string;\n}) => JSXNode<\"script\">\n```\n\n\n<table><thead><tr><th>\n\nParameter\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\nopts\n\n\n</td><td>\n\n{ base?: string; manifestHash?: string; manifestURL?: string; nonce?: string; }\n\n\n</td><td>\n\n_(Optional)_ Options for the loading prefetch graph.\n\n- `base` - Base of the graph. For a default installation this will default to the q:base value `/build/`<!-- -->. But if more than one MFE is installed on the page, then each MFE needs to have its own base. - `manifestHash` - Hash of the manifest file to load. If not provided the hash will be extracted from the container attribute `q:manifest-hash` and assume the default build file `${base}/q-bundle-graph-${manifestHash}.json`<!-- -->. - `manifestURL` - URL of the manifest file to load if non-standard bundle graph location name.\n\n\n</td></tr>\n</tbody></table>\n**Returns:**\n\nJSXNode&lt;\"script\"&gt;",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/core/components/prefetch.ts",
       "mdFile": "qwik.prefetchgraph.md"
     },

packages/docs/src/routes/api/qwik/index.md

@@ -3043,6 +3043,32 @@ _(Optional)_
 </td></tr>
 <tr><td>
 
+[flags](#)
+
+</td><td>
+
+</td><td>
+
+number
+
+</td><td>
+
+</td></tr>
+<tr><td>
+
+[immutableProps](#)
+
+</td><td>
+
+</td><td>
+
+Record&lt;any, unknown&gt; \| null
+
+</td><td>
+
+</td></tr>
+<tr><td>
+
 [key](#)
 
 </td><td>
@@ -3565,7 +3591,7 @@ PrefetchGraph: (opts?: {
   manifestHash?: string;
   manifestURL?: string;
   nonce?: string;
-}) => JSXOutput;
+}) => JSXNode<"script">;
 ```
 
 <table><thead><tr><th>
@@ -3599,7 +3625,7 @@ _(Optional)_ Options for the loading prefetch graph.
 </tbody></table>
 **Returns:**
 
-[JSXOutput](#jsxoutput)
+JSXNode&lt;"script"&gt;
 
 [Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik/src/core/components/prefetch.ts)
 

packages/qwik/src/core/api.md

@@ -422,10 +422,9 @@ export { jsx as jsxs }
 export const _jsxBranch: <T>(input?: T) => T | undefined;
 
 // Warning: (ae-forgotten-export) The symbol "JsxDevOpts" needs to be exported by the entry point index.d.ts
-// Warning: (ae-forgotten-export) The symbol "JSXNodeInternal" needs to be exported by the entry point index.d.ts
 //
 // @internal
-export const _jsxC: <T extends string | FunctionComponent<Record<any, unknown>>>(type: T, mutableProps: (T extends FunctionComponent<infer PROPS> ? PROPS : Record<any, unknown>) | null, flags: number, key: string | number | null, dev?: JsxDevOpts) => JSXNodeInternal<T>;
+export const _jsxC: <T extends string | FunctionComponent<Record<any, unknown>>>(type: T, mutableProps: (T extends FunctionComponent<infer PROPS> ? PROPS : Record<any, unknown>) | null, flags: number, key: string | number | null, dev?: JsxDevOpts) => JSXNode<T>;
 
 // @public (undocumented)
 export type JSXChildren = string | number | boolean | null | undefined | Function | RegExp | JSXChildren[] | Promise<JSXChildren> | Signal<JSXChildren> | JSXNode;
@@ -440,6 +439,10 @@ export interface JSXNode<T extends string | FunctionComponent | unknown = unknow
     // (undocumented)
     dev?: DevJSX;
     // (undocumented)
+    flags: number;
+    // (undocumented)
+    immutableProps: Record<any, unknown> | null;
+    // (undocumented)
     key: string | null;
     // (undocumented)
     props: T extends FunctionComponent<infer P> ? P : Record<any, unknown>;
@@ -451,10 +454,10 @@ export interface JSXNode<T extends string | FunctionComponent | unknown = unknow
 export type JSXOutput = JSXNode | string | number | boolean | null | undefined | JSXOutput[];
 
 // @internal
-export const _jsxQ: <T extends string>(type: T, mutableProps: Record<any, unknown> | null, immutableProps: Record<any, unknown> | null, children: JSXChildren | null, flags: number, key: string | number | null, dev?: DevJSX) => JSXNodeInternal<T>;
+export const _jsxQ: <T extends string>(type: T, mutableProps: Record<any, unknown> | null, immutableProps: Record<any, unknown> | null, children: JSXChildren | null, flags: number, key: string | number | null, dev?: DevJSX) => JSXNode<T>;
 
 // @internal
-export const _jsxS: <T extends string>(type: T, mutableProps: Record<any, unknown> | null, immutableProps: Record<any, unknown> | null, flags: number, key: string | number | null, dev?: DevJSX) => JSXNodeInternal<T>;
+export const _jsxS: <T extends string>(type: T, mutableProps: Record<any, unknown> | null, immutableProps: Record<any, unknown> | null, flags: number, key: string | number | null, dev?: DevJSX) => JSXNode<T>;
 
 // @public (undocumented)
 export type JSXTagName = keyof HTMLElementTagNameMap | Omit<string, keyof HTMLElementTagNameMap>;
@@ -612,7 +615,7 @@ export const PrefetchGraph: (opts?: {
     manifestHash?: string;
     manifestURL?: string;
     nonce?: string;
-}) => JSXOutput;
+}) => JSXNode_2<"script">;
 
 // @alpha
 export const PrefetchServiceWorker: (opts: {

packages/qwik/src/core/components/prefetch.ts

@@ -3,7 +3,6 @@ import { isDev } from '@builder.io/qwik/build';
 import { _jsxC } from '../internal';
 import type { JSXNode } from '@builder.io/qwik/jsx-runtime';
 import { useServerData } from '../use/use-env-data';
-import type { JSXOutput } from '../render/jsx/types/jsx-node';
 
 /**
  * Install a service worker which will prefetch the bundles.
@@ -126,7 +125,7 @@ const PREFETCH_CODE = /*#__PURE__*/ ((
  */
 export const PrefetchGraph = (
   opts: { base?: string; manifestHash?: string; manifestURL?: string; nonce?: string } = {}
-): JSXOutput => {
+) => {
   const isTest = import.meta.env.TEST;
   if (isDev && !isTest) {
     const props = {

packages/qwik/src/core/container/serializers.ts

@@ -37,8 +37,8 @@ import { serializeDerivedSignalFunc } from '../qrl/inlined-fn';
 import type { QwikElement } from '../render/dom/virtual-element';
 import { assertString, assertTrue } from '../error/assert';
 import { Fragment, JSXNodeImpl, isJSXNode } from '../render/jsx/jsx-runtime';
+import type { JSXNode } from '@builder.io/qwik/jsx-runtime';
 import { Slot } from '../render/jsx/slot.public';
-import type { JSXNodeInternal } from '../render/jsx/types/jsx-node';
 
 /**
  * - 0, 8, 9, A, B, C, D
@@ -383,7 +383,7 @@ const FormDataSerializer = /*#__PURE__*/ serializer<FormData>({
   },
 });
 
-const JSXNodeSerializer = /*#__PURE__*/ serializer<JSXNodeInternal>({
+const JSXNodeSerializer = /*#__PURE__*/ serializer<JSXNode>({
   $prefix$: '\u0017',
   $test$: (v) => isJSXNode(v),
   $collect$: (node, collector, leaks) => {

packages/qwik/src/core/render/dom/render-dom.ts

@@ -8,7 +8,7 @@ import { isArray, isFunction, isObject, isString, type ValueOrPromise } from '..
 import { domToVnode, smartUpdateChildren } from './visitor';
 import { SkipRender } from '../jsx/utils.public';
 import { isJSXNode, SKIP_RENDER_TYPE, _jsxC, Virtual } from '../jsx/jsx-runtime';
-import type { DevJSX, JSXNodeInternal } from '../jsx/types/jsx-node';
+import type { DevJSX, JSXNode } from '../jsx/types/jsx-node';
 import { executeComponent, shouldWrapFunctional } from '../execute-component';
 import type { RenderContext } from '../types';
 import { type QwikElement, VIRTUAL, type VirtualElement } from './virtual-element';
@@ -88,7 +88,7 @@ export class ProcessedJSXNodeImpl implements ProcessedJSXNode {
 }
 
 export const processNode = (
-  node: JSXNodeInternal,
+  node: JSXNode,
   invocationContext?: InvokeContext
 ): ValueOrPromise<ProcessedJSXNode | ProcessedJSXNode[] | undefined> => {
   const { key, type, props, children, flags, immutableProps } = node;

packages/qwik/src/core/render/jsx/factory.unit.ts

@@ -1,6 +1,6 @@
 import { h } from './factory';
 import { isJSXNode, Fragment } from './jsx-runtime';
-import type { FunctionComponent, JSXNodeInternal } from './types/jsx-node';
+import type { FunctionComponent } from './types/jsx-node';
 import { type ProcessedJSXNode, processNode } from '../dom/render-dom';
 import { test, assert } from 'vitest';
 
@@ -19,7 +19,7 @@ test('map multiple nodes, flatten', () => {
       'a',
       [1, 2].map((n) => h('child', null, n)),
       'b'
-    ) as JSXNodeInternal
+    )
   ) as ProcessedJSXNode;
   assert.deepEqual(v.$children$.length, 4);
   assert.deepEqual(v.$children$[0].$text$, 'a');
@@ -32,7 +32,7 @@ test('map multiple nodes, flatten', () => {
 
 test('one child node', () => {
   // <parent><child></child></parent>
-  const v = processNode(h('parent', null, h('child', null)) as JSXNodeInternal) as ProcessedJSXNode;
+  const v = processNode(h('parent', null, h('child', null))) as ProcessedJSXNode;
   assert.deepEqual(v.$children$.length, 1);
   assert.deepEqual(v.$children$[0].$type$, 'child');
   assert.deepEqual(v.$children$[0].$props$, {});
@@ -41,7 +41,7 @@ test('one child node', () => {
 
 test('text w/ expression', () => {
   // <div>1 {2} 3</div>
-  const v = processNode(h('div', null, '1 ', 2, ' 3') as JSXNodeInternal) as ProcessedJSXNode;
+  const v = processNode(h('div', null, '1 ', 2, ' 3')) as ProcessedJSXNode;
   assert.deepEqual(v.$children$[0].$type$, '#text');
   assert.deepEqual(v.$children$[0].$text$, '1 ');
   assert.deepEqual(v.$children$[0].$key$, null);
@@ -57,15 +57,15 @@ test('text w/ expression', () => {
 
 test('text child', () => {
   // <div>text</div>
-  const v = processNode(h('div', null, 'text') as JSXNodeInternal) as ProcessedJSXNode;
+  const v = processNode(h('div', null, 'text')) as ProcessedJSXNode;
   assert.deepEqual(v.$children$[0].$type$, '#text');
   assert.deepEqual(v.$children$[0].$text$, 'text');
   assert.deepEqual(v.$children$[0].$key$, null);
 });
 
 test('no children', () => {
   // <div/>
-  const v = processNode(h('div', null) as JSXNodeInternal) as ProcessedJSXNode;
+  const v = processNode(h('div', null)) as ProcessedJSXNode;
   assert.deepEqual(v.$children$, []);
 });
 

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

@@ -1,4 +1,4 @@
-import type { DevJSX, FunctionComponent, JSXNode, JSXNodeInternal } from './types/jsx-node';
+import type { DevJSX, FunctionComponent, JSXNode } from './types/jsx-node';
 import type { QwikJSX } from './types/jsx-qwik';
 import { qDev, qRuntimeQrl, seal } from '../../util/qdev';
 import { logError, logOnceWarn, logWarn } from '../../util/log';
@@ -34,7 +34,7 @@ export const _jsxQ = <T extends string>(
   flags: number,
   key: string | number | null,
   dev?: DevJSX
-): JSXNodeInternal<T> => {
+): JSXNode<T> => {
   assertString(type, 'jsx type must be a string');
   const processed = key == null ? null : String(key);
   const node = new JSXNodeImpl<T>(
@@ -68,7 +68,7 @@ export const _jsxS = <T extends string>(
   flags: number,
   key: string | number | null,
   dev?: DevJSX
-): JSXNodeInternal<T> => {
+): JSXNode<T> => {
   let children: JSXChildren = null;
   if (mutableProps && 'children' in mutableProps) {
     children = mutableProps.children as JSXChildren;
@@ -88,7 +88,7 @@ export const _jsxC = <T extends string | FunctionComponent<Record<any, unknown>>
   flags: number,
   key: string | number | null,
   dev?: JsxDevOpts
-): JSXNodeInternal<T> => {
+): JSXNode<T> => {
   const processed = key == null ? null : String(key);
   const props = mutableProps ?? ({} as NonNullable<typeof mutableProps>);
   // In dynamic components, type could be a string
@@ -196,7 +196,7 @@ export const RenderOnce: FunctionComponent<{
   return new JSXNodeImpl(Virtual, EMPTY_OBJ, null, props.children, static_subtree, key);
 };
 
-const validateJSXNode = (node: JSXNodeInternal) => {
+const validateJSXNode = (node: JSXNode) => {
   if (qDev) {
     const { type, props, immutableProps, children } = node;
     invoke(undefined, () => {
@@ -321,7 +321,7 @@ const printObjectLiteral = (obj: Record<string, unknown>) => {
     .join(', ')} }`;
 };
 
-export const isJSXNode = (n: unknown): n is JSXNodeInternal => {
+export const isJSXNode = (n: unknown): n is JSXNode => {
   if (qDev) {
     if (n instanceof JSXNodeImpl) {
       return true;

packages/qwik/src/core/render/jsx/jsx-runtime.unit.ts

@@ -1,7 +1,7 @@
 import { assert, test } from 'vitest';
 import { type ProcessedJSXNode, processNode } from '../dom/render-dom';
 import { jsx, isJSXNode, Fragment } from './jsx-runtime';
-import type { FunctionComponent, JSXNodeInternal } from './types/jsx-node';
+import type { FunctionComponent } from './types/jsx-node';
 
 test('map multiple nodes', () => {
   // <parent>
@@ -10,7 +10,7 @@ test('map multiple nodes', () => {
   const v = processNode(
     jsx('parent', {
       children: [1, 2].map((n) => jsx('child', { children: n })),
-    }) as JSXNodeInternal
+    })
   ) as ProcessedJSXNode;
   assert.deepEqual(v.$children$.length, 2);
   assert.deepEqual(v.$children$[0].$type$, 'child');
@@ -19,9 +19,7 @@ test('map multiple nodes', () => {
 
 test('one child node', () => {
   // <parent><child></child></parent>
-  const v = processNode(
-    jsx('parent', { children: jsx('child', {}) }) as JSXNodeInternal
-  ) as ProcessedJSXNode;
+  const v = processNode(jsx('parent', { children: jsx('child', {}) })) as ProcessedJSXNode;
   assert.deepEqual(v.$children$.length, 1);
   assert.deepEqual(v.$children$[0].$type$, 'child');
   assert.deepEqual(v.$children$[0].$props$, {});
@@ -30,9 +28,7 @@ test('one child node', () => {
 
 test('text w/ expression', () => {
   // <div>1 {2} 3</div>
-  const v = processNode(
-    jsx('div', { children: ['1 ', 2, ' 3'] }) as JSXNodeInternal
-  ) as ProcessedJSXNode;
+  const v = processNode(jsx('div', { children: ['1 ', 2, ' 3'] })) as ProcessedJSXNode;
   assert.deepEqual(v.$children$[0].$type$, '#text');
   assert.deepEqual(v.$children$[0].$text$, '1 ');
   assert.deepEqual(v.$children$[0].$key$, null);
@@ -48,15 +44,15 @@ test('text w/ expression', () => {
 
 test('text child', () => {
   // <div>text</div>
-  const v = processNode(jsx('div', { children: 'text' }) as JSXNodeInternal) as ProcessedJSXNode;
+  const v = processNode(jsx('div', { children: 'text' })) as ProcessedJSXNode;
   assert.deepEqual(v.$children$[0].$type$, '#text');
   assert.deepEqual(v.$children$[0].$text$, 'text');
   assert.deepEqual(v.$children$[0].$key$, null);
 });
 
 test('no children', () => {
   // <div/>
-  const v = processNode(jsx('div', {}) as JSXNodeInternal) as ProcessedJSXNode;
+  const v = processNode(jsx('div', {})) as ProcessedJSXNode;
   assert.deepEqual(v.$children$, []);
 });
 test('key', () => {

packages/qwik/src/core/render/jsx/types/jsx-node.ts

@@ -34,18 +34,9 @@ export interface DevJSX {
 export interface JSXNode<T extends string | FunctionComponent | unknown = unknown> {
   type: T;
   props: T extends FunctionComponent<infer P> ? P : Record<any, unknown>;
+  immutableProps: Record<any, unknown> | null;
   children: JSXChildren | null;
+  flags: number;
   key: string | null;
   dev?: DevJSX;
 }
-
-/**
- * The internal representation of a JSX node.
- *
- * @internal
- */
-export interface JSXNodeInternal<T extends string | FunctionComponent | unknown = unknown>
-  extends JSXNode<T> {
-  immutableProps: Record<any, unknown> | null;
-  flags: number;
-}