diff --git a/packages/docs/src/routes/api/qwik-city-middleware-cloudflare-pages/api.json b/packages/docs/src/routes/api/qwik-city-middleware-cloudflare-pages/api.json index b041aa6d954..c678e6a2217 100644 --- a/packages/docs/src/routes/api/qwik-city-middleware-cloudflare-pages/api.json +++ b/packages/docs/src/routes/api/qwik-city-middleware-cloudflare-pages/api.json @@ -12,7 +12,7 @@ } ], "kind": "Function", - "content": "```typescript\nexport declare function createQwikCity(opts: QwikCityCloudflarePagesOptions): (request: PlatformCloudflarePages['request'], env: Record & {\n ASSETS: {\n fetch: (req: Request) => Response;\n };\n}, ctx: PlatformCloudflarePages['ctx']) => Promise;\n```\n\n\n\n\n
\n\nParameter\n\n\n\n\nType\n\n\n\n\nDescription\n\n\n
\n\nopts\n\n\n\n\n[QwikCityCloudflarePagesOptions](#qwikcitycloudflarepagesoptions)\n\n\n\n\n\n
\n**Returns:**\n\n(request: [PlatformCloudflarePages](#platformcloudflarepages)\\['request'\\], env: Record<string, any> & { ASSETS: { fetch: (req: Request) => Response; }; }, ctx: [PlatformCloudflarePages](#platformcloudflarepages)\\['ctx'\\]) => Promise<Response>", + "content": "```typescript\nexport declare function createQwikCity(opts: QwikCityCloudflarePagesOptions): (request: PlatformCloudflarePages['request'], env: PlatformCloudflarePages['env'] & {\n ASSETS: {\n fetch: (req: Request) => Response;\n };\n}, ctx: PlatformCloudflarePages['ctx']) => Promise;\n```\n\n\n\n\n
\n\nParameter\n\n\n\n\nType\n\n\n\n\nDescription\n\n\n
\n\nopts\n\n\n\n\n[QwikCityCloudflarePagesOptions](#qwikcitycloudflarepagesoptions)\n\n\n\n\n\n
\n**Returns:**\n\n(request: [PlatformCloudflarePages](#platformcloudflarepages)\\['request'\\], env: [PlatformCloudflarePages](#platformcloudflarepages)\\['env'\\] & { ASSETS: { fetch: (req: Request) => Response; }; }, ctx: [PlatformCloudflarePages](#platformcloudflarepages)\\['ctx'\\]) => Promise<Response>", "editUrl": "https://github.com/BuilderIO/qwik/tree/main/packages/qwik-city/middleware/cloudflare-pages/index.ts", "mdFile": "qwik-city.createqwikcity.md" }, diff --git a/packages/docs/src/routes/api/qwik-city-middleware-cloudflare-pages/index.md b/packages/docs/src/routes/api/qwik-city-middleware-cloudflare-pages/index.md index 016620121c9..f154ec32c47 100644 --- a/packages/docs/src/routes/api/qwik-city-middleware-cloudflare-pages/index.md +++ b/packages/docs/src/routes/api/qwik-city-middleware-cloudflare-pages/index.md @@ -9,7 +9,7 @@ title: \@builder.io/qwik-city/middleware/cloudflare-pages API Reference ```typescript export declare function createQwikCity(opts: QwikCityCloudflarePagesOptions): ( request: PlatformCloudflarePages["request"], - env: Record & { + env: PlatformCloudflarePages["env"] & { ASSETS: { fetch: (req: Request) => Response; }; @@ -45,7 +45,7 @@ opts **Returns:** -(request: [PlatformCloudflarePages](#platformcloudflarepages)['request'], env: Record<string, any> & { ASSETS: { fetch: (req: Request) => Response; }; }, ctx: [PlatformCloudflarePages](#platformcloudflarepages)['ctx']) => Promise<Response> +(request: [PlatformCloudflarePages](#platformcloudflarepages)['request'], env: [PlatformCloudflarePages](#platformcloudflarepages)['env'] & { ASSETS: { fetch: (req: Request) => Response; }; }, ctx: [PlatformCloudflarePages](#platformcloudflarepages)['ctx']) => Promise<Response> [Edit this section](https://github.com/BuilderIO/qwik/tree/main/packages/qwik-city/middleware/cloudflare-pages/index.ts) diff --git a/packages/docs/src/routes/api/qwik-city/api.json b/packages/docs/src/routes/api/qwik-city/api.json index fea25617e7c..8ac21b165a3 100644 --- a/packages/docs/src/routes/api/qwik-city/api.json +++ b/packages/docs/src/routes/api/qwik-city/api.json @@ -796,7 +796,7 @@ } ], "kind": "Function", - "content": "Returns the document head for the current page. The generic type describes the front matter.\n\n\n```typescript\nuseDocumentHead: = Record>() => Required>>\n```\n**Returns:**\n\nRequired<Required<import(\"./types\").[DocumentHeadValue](#documentheadvalue)<FrontMatter>>>", + "content": "Returns the document head for the current page. The generic type describes the front matter.\n\n\n```typescript\nuseDocumentHead: = Record>() => Required>\n```\n**Returns:**\n\nRequired<[ResolvedDocumentHead](#resolveddocumenthead)<FrontMatter>>", "editUrl": "https://github.com/BuilderIO/qwik/tree/main/packages/qwik-city/runtime/src/use-functions.ts", "mdFile": "qwik-city.usedocumenthead.md" }, diff --git a/packages/docs/src/routes/api/qwik-city/index.md b/packages/docs/src/routes/api/qwik-city/index.md index af6e3b25808..3ffe0f9d93d 100644 --- a/packages/docs/src/routes/api/qwik-city/index.md +++ b/packages/docs/src/routes/api/qwik-city/index.md @@ -2328,12 +2328,12 @@ Returns the document head for the current page. The generic type describes the f ```typescript useDocumentHead: < FrontMatter extends Record = Record, ->() => Required>>; +>() => Required>; ``` **Returns:** -Required<Required<import("./types").[DocumentHeadValue](#documentheadvalue)<FrontMatter>>> +Required<[ResolvedDocumentHead](#resolveddocumenthead)<FrontMatter>> [Edit this section](https://github.com/BuilderIO/qwik/tree/main/packages/qwik-city/runtime/src/use-functions.ts) diff --git a/packages/docs/src/routes/api/qwik-testing/api.json b/packages/docs/src/routes/api/qwik-testing/api.json index 001705bf179..38bdc5aef36 100644 --- a/packages/docs/src/routes/api/qwik-testing/api.json +++ b/packages/docs/src/routes/api/qwik-testing/api.json @@ -12,7 +12,7 @@ } ], "kind": "Function", - "content": "CreatePlatform and CreateDocument\n\n\n```typescript\ncreateDOM: ({ html }?: {\n html?: string | undefined;\n}) => Promise<{\n render: (jsxElement: JSXOutput) => Promise;\n screen: HTMLElement;\n userEvent: (queryOrElement: string | Element | keyof HTMLElementTagNameMap | null, eventNameCamel: string | keyof WindowEventMap, eventPayload?: any) => Promise;\n}>\n```\n\n\n\n\n
\n\nParameter\n\n\n\n\nType\n\n\n\n\nDescription\n\n\n
\n\n{ html }\n\n\n\n\n{ html?: string \\| undefined; }\n\n\n\n\n_(Optional)_\n\n\n
\n**Returns:**\n\nPromise<{ render: (jsxElement: JSXOutput) => Promise<import(\"@builder.io/qwik\").RenderResult>; screen: HTMLElement; userEvent: (queryOrElement: string \\| Element \\| keyof HTMLElementTagNameMap \\| null, eventNameCamel: string \\| keyof WindowEventMap, eventPayload?: any) => Promise<void>; }>", + "content": "CreatePlatform and CreateDocument\n\n\n```typescript\ncreateDOM: ({ html }?: {\n html?: string;\n}) => Promise<{\n render: (jsxElement: JSXOutput) => Promise;\n screen: HTMLElement;\n userEvent: (queryOrElement: string | Element | keyof HTMLElementTagNameMap | null, eventNameCamel: string | keyof WindowEventMap, eventPayload?: any) => Promise;\n}>\n```\n\n\n\n\n
\n\nParameter\n\n\n\n\nType\n\n\n\n\nDescription\n\n\n
\n\n{ html }\n\n\n\n\n{ html?: string; }\n\n\n\n\n_(Optional)_\n\n\n
\n**Returns:**\n\nPromise<{ render: (jsxElement: JSXOutput) => Promise<import(\"@builder.io/qwik\").RenderResult>; screen: HTMLElement; userEvent: (queryOrElement: string \\| Element \\| keyof HTMLElementTagNameMap \\| null, eventNameCamel: string \\| keyof WindowEventMap, eventPayload?: any) => Promise<void>; }>", "editUrl": "https://github.com/BuilderIO/qwik/tree/main/packages/qwik/src/testing/library.ts", "mdFile": "qwik.createdom.md" } diff --git a/packages/docs/src/routes/api/qwik-testing/index.md b/packages/docs/src/routes/api/qwik-testing/index.md index 33e2a635336..114e32b4fb0 100644 --- a/packages/docs/src/routes/api/qwik-testing/index.md +++ b/packages/docs/src/routes/api/qwik-testing/index.md @@ -9,7 +9,7 @@ title: \@builder.io/qwik/testing API Reference CreatePlatform and CreateDocument ```typescript -createDOM: ({ html }?: { html?: string | undefined }) => +createDOM: ({ html }?: { html?: string }) => Promise<{ render: ( jsxElement: JSXOutput, @@ -42,7 +42,7 @@ Description -{ html?: string \| undefined; } +{ html?: string; } diff --git a/packages/docs/src/routes/api/qwik/api.json b/packages/docs/src/routes/api/qwik/api.json index 4719fcc4ab3..a36036d061d 100644 --- a/packages/docs/src/routes/api/qwik/api.json +++ b/packages/docs/src/routes/api/qwik/api.json @@ -889,22 +889,8 @@ } ], "kind": "Function", - "content": "```typescript\nexport declare namespace h \n```\n\n\n\n\n\n\n\n\n\n\n
\n\nFunction\n\n\n\n\nDescription\n\n\n
\n\n[h(type)](#)\n\n\n\n\n\n
\n\n[h(type, data)](#)\n\n\n\n\n\n
\n\n[h(type, text)](#)\n\n\n\n\n\n
\n\n[h(type, children)](#)\n\n\n\n\n\n
\n\n[h(type, data, text)](#)\n\n\n\n\n\n
\n\n[h(type, data, children)](#)\n\n\n\n\n\n
\n\n[h(sel, data, children)](#)\n\n\n\n\n\n
", - "editUrl": "https://github.com/BuilderIO/qwik/tree/main/packages/qwik/src/core/render/jsx/factory.ts", - "mdFile": "qwik.h.md" - }, - { - "name": "h", - "id": "h", - "hierarchy": [ - { - "name": "h", - "id": "h" - } - ], - "kind": "Namespace", - "content": "```typescript\nexport declare namespace h \n```\n\n\n\n\n\n\n\n\n\n\n
\n\nFunction\n\n\n\n\nDescription\n\n\n
\n\n[h(type)](#)\n\n\n\n\n\n
\n\n[h(type, data)](#)\n\n\n\n\n\n
\n\n[h(type, text)](#)\n\n\n\n\n\n
\n\n[h(type, children)](#)\n\n\n\n\n\n
\n\n[h(type, data, text)](#)\n\n\n\n\n\n
\n\n[h(type, data, children)](#)\n\n\n\n\n\n
\n\n[h(sel, data, children)](#)\n\n\n\n\n\n
", - "editUrl": "https://github.com/BuilderIO/qwik/tree/main/packages/qwik/src/core/render/jsx/factory.ts", + "content": "The legacy transform, used in special cases like `
`. Note that the children are spread arguments, instead of a prop like in jsx() calls.\n\nAlso note that this disables optimizations.\n\n\n```typescript\nexport declare function h, PROPS extends {} = {}>(type: TYPE, props?: PROPS | null, ...children: any[]): JSXNode;\n```\n\n\n\n\n\n\n
\n\nParameter\n\n\n\n\nType\n\n\n\n\nDescription\n\n\n
\n\ntype\n\n\n\n\nTYPE\n\n\n\n\n\n
\n\nprops\n\n\n\n\nPROPS \\| null\n\n\n\n\n_(Optional)_\n\n\n
\n\nchildren\n\n\n\n\nany\\[\\]\n\n\n\n\n\n
\n**Returns:**\n\n[JSXNode](#jsxnode)<TYPE>", + "editUrl": "https://github.com/BuilderIO/qwik/tree/main/packages/qwik/src/core/render/jsx/jsx-runtime.ts", "mdFile": "qwik.h.md" }, { @@ -1085,7 +1071,7 @@ } ], "kind": "Function", - "content": "Create a `____$(...)` convenience method from `___(...)`.\n\nIt is very common for functions to take a lazy-loadable resource as a first argument. For this reason, the Qwik Optimizer automatically extracts the first argument from any function which ends in `$`.\n\nThis means that `foo$(arg0)` and `foo($(arg0))` are equivalent with respect to Qwik Optimizer. The former is just a shorthand for the latter.\n\nFor example, these function calls are equivalent:\n\n- `component$(() => {...})` is same as `component($(() => {...}))`\n\n```tsx\nexport function myApi(callback: QRL<() => void>): void {\n // ...\n}\n\nexport const myApi$ = implicit$FirstArg(myApi);\n// type of myApi$: (callback: () => void): void\n\n// can be used as:\nmyApi$(() => console.log('callback'));\n\n// will be transpiled to:\n// FILE: \nmyApi(qrl('./chunk-abc.js', 'callback'));\n\n// FILE: chunk-abc.js\nexport const callback = () => console.log('callback');\n```\n\n\n```typescript\nimplicit$FirstArg: (fn: (first: QRL, ...rest: REST) => RET) => (first: FIRST, ...rest: REST) => RET\n```\n\n\n\n\n
\n\nParameter\n\n\n\n\nType\n\n\n\n\nDescription\n\n\n
\n\nfn\n\n\n\n\n(first: [QRL](#qrl)<FIRST>, ...rest: REST) => RET\n\n\n\n\nA function that should have its first argument automatically `$`.\n\n\n
\n**Returns:**\n\n(first: FIRST, ...rest: REST) => RET", + "content": "Create a `____$(...)` convenience method from `___(...)`.\n\nIt is very common for functions to take a lazy-loadable resource as a first argument. For this reason, the Qwik Optimizer automatically extracts the first argument from any function which ends in `$`.\n\nThis means that `foo$(arg0)` and `foo($(arg0))` are equivalent with respect to Qwik Optimizer. The former is just a shorthand for the latter.\n\nFor example, these function calls are equivalent:\n\n- `component$(() => {...})` is same as `component($(() => {...}))`\n\n```tsx\nexport function myApi(callback: QRL<() => void>): void {\n // ...\n}\n\nexport const myApi$ = implicit$FirstArg(myApi);\n// type of myApi$: (callback: () => void): void\n\n// can be used as:\nmyApi$(() => console.log('callback'));\n\n// will be transpiled to:\n// FILE: \nmyApi(qrl('./chunk-abc.js', 'callback'));\n\n// FILE: chunk-abc.js\nexport const callback = () => console.log('callback');\n```\n\n\n```typescript\nimplicit$FirstArg: (fn: (first: QRL, ...rest: REST) => RET) => ((first: FIRST, ...rest: REST) => RET)\n```\n\n\n\n\n
\n\nParameter\n\n\n\n\nType\n\n\n\n\nDescription\n\n\n
\n\nfn\n\n\n\n\n(first: [QRL](#qrl)<FIRST>, ...rest: REST) => RET\n\n\n\n\nA function that should have its first argument automatically `$`.\n\n\n
\n**Returns:**\n\n((first: FIRST, ...rest: REST) => RET)", "editUrl": "https://github.com/BuilderIO/qwik/tree/main/packages/qwik/src/core/util/implicit_dollar.ts", "mdFile": "qwik.implicit_firstarg.md" }, diff --git a/packages/docs/src/routes/api/qwik/index.md b/packages/docs/src/routes/api/qwik/index.md index 73569e6c4b0..60984b902e6 100644 --- a/packages/docs/src/routes/api/qwik/index.md +++ b/packages/docs/src/routes/api/qwik/index.md @@ -2253,81 +2253,24 @@ getPlatform: () => CorePlatform; ## h +The legacy transform, used in special cases like `
`. Note that the children are spread arguments, instead of a prop like in jsx() calls. + +Also note that this disables optimizations. + ```typescript -export declare namespace h +export declare function h< + TYPE extends string | FunctionComponent, + PROPS extends {} = {}, +>(type: TYPE, props?: PROPS | null, ...children: any[]): JSXNode; ``` - - - - - - - -
-Function +Parameter -Description - -
- -[h(type)](#) - - - -
- -[h(type, data)](#) - - - -
- -[h(type, text)](#) - - - -
- -[h(type, children)](#) - - - -
- -[h(type, data, text)](#) - - - -
- -[h(type, data, children)](#) - - - -
- -[h(sel, data, children)](#) - - - -
- -[Edit this section](https://github.com/BuilderIO/qwik/tree/main/packages/qwik/src/core/render/jsx/factory.ts) - -## h - -```typescript -export declare namespace h -``` - - - - - -
- -Function +Type @@ -2336,56 +2279,45 @@ Description
-[h(type)](#) +type -
- -[h(type, data)](#) +TYPE
-[h(type, text)](#) +props -
- -[h(type, children)](#) +PROPS \| null -
- -[h(type, data, text)](#) - - +_(Optional)_
-[h(type, data, children)](#) +children -
- -[h(sel, data, children)](#) +any[]
+**Returns:** -[Edit this section](https://github.com/BuilderIO/qwik/tree/main/packages/qwik/src/core/render/jsx/factory.ts) +[JSXNode](#jsxnode)<TYPE> + +[Edit this section](https://github.com/BuilderIO/qwik/tree/main/packages/qwik/src/core/render/jsx/jsx-runtime.ts) ## HrHTMLAttributes @@ -2645,7 +2577,7 @@ A function that should have its first argument automatically `$`. **Returns:** -(first: FIRST, ...rest: REST) => RET +((first: FIRST, ...rest: REST) => RET) [Edit this section](https://github.com/BuilderIO/qwik/tree/main/packages/qwik/src/core/util/implicit_dollar.ts) diff --git a/packages/qwik-city/middleware/cloudflare-pages/api.md b/packages/qwik-city/middleware/cloudflare-pages/api.md index d30e9b02fb7..008f6373ebd 100644 --- a/packages/qwik-city/middleware/cloudflare-pages/api.md +++ b/packages/qwik-city/middleware/cloudflare-pages/api.md @@ -7,7 +7,7 @@ import type { ServerRenderOptions } from '@builder.io/qwik-city/middleware/request-handler'; // @public (undocumented) -export function createQwikCity(opts: QwikCityCloudflarePagesOptions): (request: PlatformCloudflarePages['request'], env: Record & { +export function createQwikCity(opts: QwikCityCloudflarePagesOptions): (request: PlatformCloudflarePages['request'], env: PlatformCloudflarePages['env'] & { ASSETS: { fetch: (req: Request) => Response; }; diff --git a/packages/qwik-city/runtime/src/api.md b/packages/qwik-city/runtime/src/api.md index 3a0d9523383..7c727751205 100644 --- a/packages/qwik-city/runtime/src/api.md +++ b/packages/qwik-city/runtime/src/api.md @@ -455,7 +455,7 @@ export type TypedDataValidator = { export const useContent: () => ContentState; // @public -export const useDocumentHead: = Record>() => Required>>; +export const useDocumentHead: = Record>() => Required>; // @public (undocumented) export const useLocation: () => RouteLocation; diff --git a/packages/qwik/src/core/api.md b/packages/qwik/src/core/api.md index b44a0c7f8fc..ed040cb8650 100644 --- a/packages/qwik/src/core/api.md +++ b/packages/qwik/src/core/api.md @@ -274,27 +274,8 @@ export function getLocale(defaultLocale?: string): string; // @public export const getPlatform: () => CorePlatform; -// @public (undocumented) -function h, PROPS extends {} = {}>(type: TYPE, props: PROPS | null, ...children: any[]): JSXNode; - -// @public (undocumented) -namespace h { - // (undocumented) - function h(type: any): JSXNode; - // (undocumented) - function h(type: Node, data: any): JSXNode; - // (undocumented) - function h(type: any, text: string): JSXNode; - // (undocumented) - function h(type: any, children: Array): JSXNode; - // (undocumented) - function h(type: any, data: any, text: string): JSXNode; - // (undocumented) - function h(type: any, data: any, children: Array | undefined | null>): JSXNode; - // (undocumented) - function h(sel: any, data: any | null, children: JSXNode): JSXNode; - { JSX }; -} +// @public +function h, PROPS extends {} = {}>(type: TYPE, props?: PROPS | null, ...children: any[]): JSXNode; export { h as createElement } export { h } @@ -349,7 +330,7 @@ export interface ImgHTMLAttributes extends Attrs<'img', T> { } // @public -export const implicit$FirstArg: (fn: (first: QRL, ...rest: REST) => RET) => (first: FIRST, ...rest: REST) => RET; +export const implicit$FirstArg: (fn: (first: QRL, ...rest: REST) => RET) => ((first: FIRST, ...rest: REST) => RET); // Warning: (ae-internal-missing-underscore) The name "inlinedQrl" should be prefixed with an underscore because the declaration is marked as @internal // @@ -410,7 +391,7 @@ export { jsx } export { jsx as jsxs } // @internal (undocumented) -export const _jsxBranch: (input?: T | undefined) => T | undefined; +export const _jsxBranch: (input?: T) => T | undefined; // @internal export const _jsxC: >(type: T, varProps: Props | null, constProps: Props | null, flags: number, key: string | number | null, dev?: DevJSX) => JSXNode; @@ -447,7 +428,7 @@ export interface JSXNode(type: T, varProps: Props | null, constProps: Props | null, children: JSXChildren | null, flags: number, key: string | number | null, dev?: DevJSX) => JSXNode; +export const _jsxQ: (type: T, varProps: Props | null, constProps: Props | null, children: JSXChildren | null, flags: number, key: string | number | null | undefined, dev?: DevJSX) => JSXNode; // @public (undocumented) export type JSXTagName = keyof HTMLElementTagNameMap | Omit; diff --git a/packages/qwik/src/core/index.ts b/packages/qwik/src/core/index.ts index 2f1a599e69a..1c5c51bc25f 100644 --- a/packages/qwik/src/core/index.ts +++ b/packages/qwik/src/core/index.ts @@ -43,7 +43,6 @@ export type { CorePlatform } from './platform/types'; ////////////////////////////////////////////////////////////////////////////////////////// // JSX Runtime ////////////////////////////////////////////////////////////////////////////////////////// -export { h, h as createElement } from './render/jsx/factory'; export { SSRStreamBlock, SSRRaw, @@ -54,7 +53,16 @@ export { } from './render/jsx/utils.public'; export type { SSRStreamProps, SSRHintProps } from './render/jsx/utils.public'; export { Slot } from './render/jsx/slot.public'; -export { Fragment, HTMLFragment, RenderOnce, jsx, jsxDEV, jsxs } from './render/jsx/jsx-runtime'; +export { + Fragment, + HTMLFragment, + RenderOnce, + jsx, + jsxDEV, + jsxs, + h, + h as createElement, +} from './render/jsx/jsx-runtime'; export type * from './render/jsx/types/jsx-generated'; export type { DOMAttributes, diff --git a/packages/qwik/src/core/render/jsx/factory.ts b/packages/qwik/src/core/render/jsx/factory.ts deleted file mode 100644 index 625da492413..00000000000 --- a/packages/qwik/src/core/render/jsx/factory.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* eslint-disable */ -import { jsx } from './jsx-runtime'; -import type { QwikJSX as JSX } from './types/jsx-qwik'; -import type { FunctionComponent, JSXNode } from './types/jsx-node'; -import { isArray } from '../../util/types'; - -export const flattenArray = (array: (T | T[])[], dst?: T[]): T[] => { - // Yes this function is just Array.flat, but we need to run on old versions of Node. - if (!dst) dst = []; - for (const item of array) { - if (isArray(item)) { - flattenArray(item, dst); - } else { - dst.push(item); - } - } - return dst; -}; - -/** @public */ -export function h, PROPS extends {} = {}>( - type: TYPE, - props: PROPS | null, - ...children: any[] -): JSXNode { - // Using legacy h() jsx transform and morphing it - // so it can use the modern vdom structure - // https://reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html - // https://www.typescriptlang.org/tsconfig#jsxImportSource - - const normalizedProps: any = { - children: arguments.length > 2 ? flattenArray(children) : undefined, - }; - - let key: any; - let i: any; - - for (i in props) { - if (i == 'key') key = (props as Record)[i]; - else normalizedProps[i] = (props as Record)[i]; - } - - if (typeof type === 'string' && !key && 'dangerouslySetInnerHTML' in normalizedProps) { - key = 'innerhtml'; - } - return jsx(type, normalizedProps, key); -} - -/** @public */ -export declare namespace h { - export function h(type: any): JSXNode; - export function h(type: Node, data: any): JSXNode; - export function h(type: any, text: string): JSXNode; - export function h(type: any, children: Array): JSXNode; - export function h(type: any, data: any, text: string): JSXNode; - export function h( - type: any, - data: any, - children: Array | undefined | null> - ): JSXNode; - export function h(sel: any, data: any | null, children: JSXNode): JSXNode; - - export { JSX }; -} diff --git a/packages/qwik/src/core/render/jsx/factory.unit.ts b/packages/qwik/src/core/render/jsx/factory.unit.ts index 035cb317a46..8796991fa52 100644 --- a/packages/qwik/src/core/render/jsx/factory.unit.ts +++ b/packages/qwik/src/core/render/jsx/factory.unit.ts @@ -1,5 +1,4 @@ -import { h } from './factory'; -import { isJSXNode, Fragment } from './jsx-runtime'; +import { h, isJSXNode, Fragment } from './jsx-runtime'; import type { FunctionComponent } from './types/jsx-node'; import { type ProcessedJSXNode, processNode } from '../dom/render-dom'; import { test, assert } from 'vitest'; diff --git a/packages/qwik/src/core/render/jsx/jsx-runtime.ts b/packages/qwik/src/core/render/jsx/jsx-runtime.ts index f641820c1ff..aae3f66bfb3 100644 --- a/packages/qwik/src/core/render/jsx/jsx-runtime.ts +++ b/packages/qwik/src/core/render/jsx/jsx-runtime.ts @@ -37,7 +37,7 @@ export const _jsxQ = ( constProps: Props | null, children: JSXChildren | null, flags: number, - key: string | number | null, + key: string | number | null | undefined, dev?: DevJSX ): JSXNode => { const processed = key == null ? null : String(key); @@ -104,6 +104,40 @@ export const jsx = >( return _jsxQ(type, props, null, children, 0, processed); }; +/** + * The legacy transform, used in special cases like `
`. Note that the + * children are spread arguments, instead of a prop like in jsx() calls. + * + * Also note that this disables optimizations. + * + * @public + */ +export function h, PROPS extends {} = {}>( + type: TYPE, + props?: PROPS | null, + ...children: any[] +): JSXNode { + const varProps: Record = {}; + + let key: string | undefined; + let k: any; + + for (k in props) { + if (k === 'key') { + key = String((props as any)[k]); + } else if (k === 'children') { + // only allow overriding if the JSX had no children + if (arguments.length <= 2) { + children = (props as any)[k]; + } + } else { + varProps[k] = (props as any)[k]; + } + } + + return _jsxQ(type, varProps, null, children, 0, key); +} + export const SKIP_RENDER_TYPE = ':skipRender'; export const isPropsProxy = ( diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_class_name.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_class_name.snap index 0f4c3c382ed..b18aef00131 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_class_name.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_class_name.snap @@ -38,47 +38,44 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; import { _fnSignal } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; export const App2_component_3yveMqbQ3Fs = ()=>{ const signal = useSignal(); const computed = signal.value + 'foo'; - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("div", null, { - className: "hola" - }, null, 3, null), - /*#__PURE__*/ _jsxQ("div", null, { - className: _fnSignal((p0)=>p0.value, [ - signal - ], "p0.value") - }, null, 3, null), - /*#__PURE__*/ _jsxQ("div", null, { - className: signal - }, null, 3, null), - /*#__PURE__*/ _jsxQ("div", { - className: computed - }, null, null, 3, null), - /*#__PURE__*/ _jsxC(Foo, null, { - className: "hola" - }, 3, "u6_0"), - /*#__PURE__*/ _jsxC(Foo, null, { - className: _fnSignal((p0)=>p0.value, [ - signal - ], "p0.value") - }, 3, "u6_1"), - /*#__PURE__*/ _jsxC(Foo, null, { - className: signal - }, 3, "u6_2"), - /*#__PURE__*/ _jsxC(Foo, { - className: computed - }, null, 3, "u6_3") - ] - }, null, 1, "u6_4"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("div", null, { + className: "hola" + }, null, 3, null), + /*#__PURE__*/ _jsxQ("div", null, { + className: _fnSignal((p0)=>p0.value, [ + signal + ], "p0.value") + }, null, 3, null), + /*#__PURE__*/ _jsxQ("div", null, { + className: signal + }, null, 3, null), + /*#__PURE__*/ _jsxQ("div", { + className: computed + }, null, null, 3, null), + /*#__PURE__*/ _jsxQ(Foo, null, { + className: "hola" + }, null, 3, "u6_0"), + /*#__PURE__*/ _jsxQ(Foo, null, { + className: _fnSignal((p0)=>p0.value, [ + signal + ], "p0.value") + }, null, 3, "u6_1"), + /*#__PURE__*/ _jsxQ(Foo, null, { + className: signal + }, null, 3, "u6_2"), + /*#__PURE__*/ _jsxQ(Foo, { + className: computed + }, null, null, 3, "u6_3") + ], 1, "u6_4"); }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;0CAG+B,IAAM;IACjC,MAAM,SAAS;IACf,MAAM,WAAW,OAAO,KAAK,GAAG;IAChC,qBACI;;0BACI,MAAC;gBAAI,WAAU;;0BACf,MAAC;gBAAI,SAAS,kBAAE,GAAO,KAAK;;;;0BAC5B,MAAC;gBAAI,WAAW;;0BAChB,MAAC;gBAAI,WAAW;;0BAEhB,MAAC;gBAAI,WAAU;;0BACf,MAAC;gBAAI,SAAS,kBAAE,GAAO,KAAK;;;;0BAC5B,MAAC;gBAAI,WAAW;;0BAChB,MAAC;gBAAI,WAAW;;;;AAG5B\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;0CAG+B,IAAM;IACjC,MAAM,SAAS;IACf,MAAM,WAAW,OAAO,KAAK,GAAG;IAChC,qBACI;sBACI,MAAC;YAAI,WAAU;;sBACf,MAAC;YAAI,SAAS,kBAAE,GAAO,KAAK;;;;sBAC5B,MAAC;YAAI,WAAW;;sBAChB,MAAC;YAAI,WAAW;;sBAEhB,MAAC;YAAI,WAAU;;sBACf,MAAC;YAAI,SAAS,kBAAE,GAAO,KAAK;;;;sBAC5B,MAAC;YAAI,WAAW;;sBAChB,MAAC;YAAI,WAAW;;;AAG5B\"}") /* { "origin": "test.tsx", diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_children.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_children.snap index 888c54d5a26..4a4eaaf82ed 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_children.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_children.snap @@ -54,72 +54,67 @@ export const App = component$(() => { import { componentQrl } from "@builder.io/qwik"; import { _fnSignal } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; import { inlinedQrl } from "@builder.io/qwik"; import { _wrapProp } from "@builder.io/qwik"; import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; import { useStore, mutable } from '@builder.io/qwik'; import { dep } from './file'; const TextContent_component_puSwpKXO7Kg = (props)=>{ - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("div", null, null, [ - "data-nu: ", - _fnSignal((p0)=>p0['data-nu'], [ - props - ], 'p0["data-nu"]') - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "class: ", - _fnSignal((p0)=>p0.class, [ - props - ], "p0.class") - ], 3, null) - ] - }, null, 3, "u6_0"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("div", null, null, [ + "data-nu: ", + _fnSignal((p0)=>p0['data-nu'], [ + props + ], 'p0["data-nu"]') + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "class: ", + _fnSignal((p0)=>p0.class, [ + props + ], "p0.class") + ], 3, null) + ], 3, "u6_0"); }; export const TextContent = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(TextContent_component_puSwpKXO7Kg, "TextContent_component_puSwpKXO7Kg")); const App_component_ckEPmXZlub0 = ()=>{ const signal = useSignal(0); const store = useStore({}); - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("div", null, null, "text", 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, `text`, 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, 1, 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, true, 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, `text${12}`, 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, typeof `text${12}` === 'string' ? 12 : 43, 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, signal, 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, _fnSignal((p0)=>p0.value, [ - signal - ], "p0.value"), 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, _fnSignal((p0)=>12 + p0.value, [ - signal - ], "12+p0.value"), 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, _fnSignal((p0)=>p0.address.city.name, [ - store - ], "p0.address.city.name"), 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, _fnSignal((p0)=>p0.address.city.name ? 'true' : 'false', [ - store - ], 'p0.address.city.name?"true":"false"'), 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, dep, 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, dep.thing, 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, dep.thing + 'stuff', 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, globalThing, 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, _wrapProp(globalThing, "thing"), 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, globalThing.thing + 'stuff', 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, signal.value(), 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, signal.value + unknown(), 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, mutable(signal), 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, signal.value + dep, 1, null) - ] - }, null, 1, "u6_1"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("div", null, null, "text", 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, `text`, 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, 1, 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, true, 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, `text${12}`, 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, typeof `text${12}` === 'string' ? 12 : 43, 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, signal, 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, _fnSignal((p0)=>p0.value, [ + signal + ], "p0.value"), 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, _fnSignal((p0)=>12 + p0.value, [ + signal + ], "12+p0.value"), 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, _fnSignal((p0)=>p0.address.city.name, [ + store + ], "p0.address.city.name"), 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, _fnSignal((p0)=>p0.address.city.name ? 'true' : 'false', [ + store + ], 'p0.address.city.name?"true":"false"'), 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, dep, 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, dep.thing, 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, dep.thing + 'stuff', 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, globalThing, 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, _wrapProp(globalThing, "thing"), 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, globalThing.thing + 'stuff', 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, signal.value(), 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, signal.value + unknown(), 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, mutable(signal), 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, signal.value + dep, 1, null) + ], 1, "u6_1"); }; export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(App_component_ckEPmXZlub0, "App_component_ckEPmXZlub0")); -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;;AACA,SAAqB,QAAQ,EAAE,OAAO,QAAQ,mBAAmB;AAEjE,SAAQ,GAAG,QAAO,SAAS;0CAEW,CAAC,QAAU;IAC7C,qBACI;;0BACI,MAAC;gBAAI;gCAAU,EAAK,CAAC,UAAU;;;;0BAC/B,MAAC;gBAAI;gCAAQ,GAAM,KAAK;;;;;;AAGpC;AAPA,OAAO,MAAM,4BAAc,+GAOxB;kCAE2B,IAAM;IAChC,MAAM,SAAS,UAAU;IACzB,MAAM,QAAQ,SAAS,CAAC;IACxB,qBACI;;0BACI,MAAC,mBAAI;0BACL,MAAC,mBAAK,CAAC,IAAI,CAAC;0BACZ,MAAC,mBAAK;0BACN,MAAC,mBAAK,IAAI;0BACV,MAAC,mBAAK,CAAC,IAAI,EAAE,GAAG,CAAC;0BACjB,MAAC,mBAAK,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,WAAW,KAAK,EAAE;0BAC/C,MAAC,mBAAK;0BACN,MAAC,mCAAK,GAAO,KAAK;;;0BAClB,MAAC,mCAAK,KAAK,GAAO,KAAK;;;0BACvB,MAAC,mCAAK,GAAM,OAAO,CAAC,IAAI,CAAC,IAAI;;;0BAC7B,MAAC,mCAAK,GAAM,OAAO,CAAC,IAAI,CAAC,IAAI,GAAG,SAAS,OAAO;;;0BAChD,MAAC,mBAAK;0BACN,MAAC,mBAAK,IAAI,KAAK;0BACf,MAAC,mBAAK,IAAI,KAAK,GAAG;0BAClB,MAAC,mBAAK;0BACN,MAAC,6BAAK;0BACN,MAAC,mBAAK,YAAY,KAAK,GAAG;0BAC1B,MAAC,mBAAK,OAAO,KAAK;0BAClB,MAAC,mBAAK,OAAO,KAAK,GAAG;0BACrB,MAAC,mBAAK,QAAQ;0BACd,MAAC,mBAAK,OAAO,KAAK,GAAG;;;AAGjC;AA5BA,OAAO,MAAM,oBAAM,+FA4BhB\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;AACA,SAAqB,QAAQ,EAAE,OAAO,QAAQ,mBAAmB;AAEjE,SAAQ,GAAG,QAAO,SAAS;0CAEW,CAAC,QAAU;IAC7C,qBACI;sBACI,MAAC;YAAI;4BAAU,EAAK,CAAC,UAAU;;;;sBAC/B,MAAC;YAAI;4BAAQ,GAAM,KAAK;;;;;AAGpC;AAPA,OAAO,MAAM,4BAAc,+GAOxB;kCAE2B,IAAM;IAChC,MAAM,SAAS,UAAU;IACzB,MAAM,QAAQ,SAAS,CAAC;IACxB,qBACI;sBACI,MAAC,mBAAI;sBACL,MAAC,mBAAK,CAAC,IAAI,CAAC;sBACZ,MAAC,mBAAK;sBACN,MAAC,mBAAK,IAAI;sBACV,MAAC,mBAAK,CAAC,IAAI,EAAE,GAAG,CAAC;sBACjB,MAAC,mBAAK,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,WAAW,KAAK,EAAE;sBAC/C,MAAC,mBAAK;sBACN,MAAC,mCAAK,GAAO,KAAK;;;sBAClB,MAAC,mCAAK,KAAK,GAAO,KAAK;;;sBACvB,MAAC,mCAAK,GAAM,OAAO,CAAC,IAAI,CAAC,IAAI;;;sBAC7B,MAAC,mCAAK,GAAM,OAAO,CAAC,IAAI,CAAC,IAAI,GAAG,SAAS,OAAO;;;sBAChD,MAAC,mBAAK;sBACN,MAAC,mBAAK,IAAI,KAAK;sBACf,MAAC,mBAAK,IAAI,KAAK,GAAG;sBAClB,MAAC,mBAAK;sBACN,MAAC,6BAAK;sBACN,MAAC,mBAAK,YAAY,KAAK,GAAG;sBAC1B,MAAC,mBAAK,OAAO,KAAK;sBAClB,MAAC,mBAAK,OAAO,KAAK,GAAG;sBACrB,MAAC,mBAAK,QAAQ;sBACd,MAAC,mBAAK,OAAO,KAAK,GAAG;;AAGjC;AA5BA,OAAO,MAAM,oBAAM,+FA4BhB\"}") == DIAGNOSTICS == [] diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_cmp.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_cmp.snap index 764d95ee847..095fdbfd6ea 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_cmp.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_cmp.snap @@ -52,7 +52,7 @@ export const App = component$(() => { import { componentQrl } from "@builder.io/qwik"; import { _fnSignal } from "@builder.io/qwik"; import { _wrapProp } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; +import { _jsxQ } from "@builder.io/qwik"; import { inlinedQrl } from "@builder.io/qwik"; import { useStore, mutable } from '@builder.io/qwik'; import { dep } from './file'; @@ -60,7 +60,7 @@ import { Cmp } from './cmp'; const App_component_ckEPmXZlub0 = ()=>{ const signal = useSignal(0); const store = useStore({}); - return /*#__PURE__*/ _jsxC(Cmp, { + return /*#__PURE__*/ _jsxQ(Cmp, { global: globalThing, globalComputed: globalThing.thing + 'stuff', noInline2: signal.value + unknown(), @@ -93,7 +93,7 @@ const App_component_ckEPmXZlub0 = ()=>{ noInline: _fnSignal((p0)=>p0.value(), [ signal ], "p0.value()") - }, 3, "u6_0"); + }, null, 3, "u6_0"); }; export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(App_component_ckEPmXZlub0, "App_component_ckEPmXZlub0")); diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_complext_children.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_complext_children.snap index 456a1eb2900..263c068f775 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_complext_children.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_complext_children.snap @@ -30,27 +30,24 @@ export const App = component$(() => { import { componentQrl } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; import { inlinedQrl } from "@builder.io/qwik"; import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; import { useStore } from '@builder.io/qwik'; const App_component_ckEPmXZlub0 = ()=>{ useSignal(0); const store = useStore({}); - return /*#__PURE__*/ _jsxC(_Fragment, { - children: /*#__PURE__*/ _jsxQ("ul", null, { - id: "issue-2800-result" - }, Object.entries(store).map(([key, value])=>/*#__PURE__*/ _jsxQ("li", null, null, [ - key, - " - ", - value - ], 1, "u6_0")), 1, null) - }, null, 1, "u6_1"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, /*#__PURE__*/ _jsxQ("ul", null, { + id: "issue-2800-result" + }, Object.entries(store).map(([key, value])=>/*#__PURE__*/ _jsxQ("li", null, null, [ + key, + " - ", + value + ], 1, "u6_0")), 1, null), 1, "u6_1"); }; export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(App_component_ckEPmXZlub0, "App_component_ckEPmXZlub0")); -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;AACA,SAAqB,QAAQ,QAAiB,mBAAmB;kCAInC,IAAM;IACjB,UAAU;IACzB,MAAM,QAAQ,SAAS,CAAC;IACxB,qBACI;kBACI,cAAA,MAAC;YAAG,IAAG;WACF,OAAO,OAAO,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,MAAM,iBACxC,MAAC;gBACI;gBAAI;gBAAI;;;AAM7B;AAdA,OAAO,MAAM,oBAAM,+FAchB\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;AACA,SAAqB,QAAQ,QAAiB,mBAAmB;kCAInC,IAAM;IACjB,UAAU;IACzB,MAAM,QAAQ,SAAS,CAAC;IACxB,qBACI,2CACI,MAAC;QAAG,IAAG;OACF,OAAO,OAAO,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,MAAM,iBACxC,MAAC;YACI;YAAI;YAAI;;AAM7B;AAdA,OAAO,MAAM,oBAAM,+FAchB\"}") == DIAGNOSTICS == [] diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_multiple_children.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_multiple_children.snap index 35484364c21..7766913ebf5 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_multiple_children.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_derived_signals_multiple_children.snap @@ -46,7 +46,6 @@ import { componentQrl } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; import { _fnSignal } from "@builder.io/qwik"; import { _wrapProp } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; import { inlinedQrl } from "@builder.io/qwik"; import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; import { useStore, mutable } from '@builder.io/qwik'; @@ -54,104 +53,102 @@ import { dep } from './file'; const App_component_ckEPmXZlub0 = ()=>{ const signal = useSignal(0); const store = useStore({}); - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("div", null, null, "First text", 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - `text` - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - 1 - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - true - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - `text${12}` - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - typeof `text${12}` === 'string' ? 12 : 43 - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("div", null, null, "First text", 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + `text` + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + 1 + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + true + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + `text${12}` + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + typeof `text${12}` === 'string' ? 12 : 43 + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + signal + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + _fnSignal((p0)=>p0.value, [ signal - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - _fnSignal((p0)=>p0.value, [ - signal - ], "p0.value") - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - _fnSignal((p0)=>12 + p0.value, [ - signal - ], "12+p0.value") - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - _fnSignal((p0)=>p0.address.city.name, [ - store - ], "p0.address.city.name") - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - _fnSignal((p0)=>p0.address.city.name ? 'true' : 'false', [ - store - ], 'p0.address.city.name?"true":"false"') - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - dep - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - dep.thing - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - dep.thing + 'stuff' - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - globalThing - ], 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - _wrapProp(globalThing, "thing") - ], 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - globalThing.thing + 'stuff' - ], 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - signal.value() - ], 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - signal.value + unknown() - ], 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - mutable(signal) - ], 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "First ", - signal.value + dep - ], 1, null) - ] - }, null, 1, "u6_0"); + ], "p0.value") + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + _fnSignal((p0)=>12 + p0.value, [ + signal + ], "12+p0.value") + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + _fnSignal((p0)=>p0.address.city.name, [ + store + ], "p0.address.city.name") + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + _fnSignal((p0)=>p0.address.city.name ? 'true' : 'false', [ + store + ], 'p0.address.city.name?"true":"false"') + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + dep + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + dep.thing + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + dep.thing + 'stuff' + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + globalThing + ], 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + _wrapProp(globalThing, "thing") + ], 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + globalThing.thing + 'stuff' + ], 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + signal.value() + ], 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + signal.value + unknown() + ], 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + mutable(signal) + ], 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "First ", + signal.value + dep + ], 1, null) + ], 1, "u6_0"); }; export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(App_component_ckEPmXZlub0, "App_component_ckEPmXZlub0")); -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;;AACA,SAAqB,QAAQ,EAAE,OAAO,QAAQ,mBAAmB;AAEjE,SAAQ,GAAG,QAAO,SAAS;kCAEG,IAAM;IAChC,MAAM,SAAS,UAAU;IACzB,MAAM,QAAQ,SAAS,CAAC;IACxB,qBACI;;0BACI,MAAC,mBAAI;0BACL,MAAC;gBAAI;gBAAO,CAAC,IAAI,CAAC;;0BAClB,MAAC;gBAAI;gBAAO;;0BACZ,MAAC;gBAAI;gBAAO,IAAI;;0BAChB,MAAC;gBAAI;gBAAO,CAAC,IAAI,EAAE,GAAG,CAAC;;0BACvB,MAAC;gBAAI;gBAAO,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,WAAW,KAAK,EAAE;;0BACrD,MAAC;gBAAI;gBAAO;;0BACZ,MAAC;gBAAI;gCAAO,GAAO,KAAK;;;;0BACxB,MAAC;gBAAI;gCAAO,KAAK,GAAO,KAAK;;;;0BAC7B,MAAC;gBAAI;gCAAO,GAAM,OAAO,CAAC,IAAI,CAAC,IAAI;;;;0BACnC,MAAC;gBAAI;gCAAO,GAAM,OAAO,CAAC,IAAI,CAAC,IAAI,GAAG,SAAS,OAAO;;;;0BACtD,MAAC;gBAAI;gBAAO;;0BACZ,MAAC;gBAAI;gBAAO,IAAI,KAAK;;0BACrB,MAAC;gBAAI;gBAAO,IAAI,KAAK,GAAG;;0BACxB,MAAC;gBAAI;gBAAO;;0BACZ,MAAC;gBAAI;0BAAO;;0BACZ,MAAC;gBAAI;gBAAO,YAAY,KAAK,GAAG;;0BAChC,MAAC;gBAAI;gBAAO,OAAO,KAAK;;0BACxB,MAAC;gBAAI;gBAAO,OAAO,KAAK,GAAG;;0BAC3B,MAAC;gBAAI;gBAAO,QAAQ;;0BACpB,MAAC;gBAAI;gBAAO,OAAO,KAAK,GAAG;;;;AAGvC;AA5BA,OAAO,MAAM,oBAAM,+FA4BhB\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;AACA,SAAqB,QAAQ,EAAE,OAAO,QAAQ,mBAAmB;AAEjE,SAAQ,GAAG,QAAO,SAAS;kCAEG,IAAM;IAChC,MAAM,SAAS,UAAU;IACzB,MAAM,QAAQ,SAAS,CAAC;IACxB,qBACI;sBACI,MAAC,mBAAI;sBACL,MAAC;YAAI;YAAO,CAAC,IAAI,CAAC;;sBAClB,MAAC;YAAI;YAAO;;sBACZ,MAAC;YAAI;YAAO,IAAI;;sBAChB,MAAC;YAAI;YAAO,CAAC,IAAI,EAAE,GAAG,CAAC;;sBACvB,MAAC;YAAI;YAAO,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,WAAW,KAAK,EAAE;;sBACrD,MAAC;YAAI;YAAO;;sBACZ,MAAC;YAAI;4BAAO,GAAO,KAAK;;;;sBACxB,MAAC;YAAI;4BAAO,KAAK,GAAO,KAAK;;;;sBAC7B,MAAC;YAAI;4BAAO,GAAM,OAAO,CAAC,IAAI,CAAC,IAAI;;;;sBACnC,MAAC;YAAI;4BAAO,GAAM,OAAO,CAAC,IAAI,CAAC,IAAI,GAAG,SAAS,OAAO;;;;sBACtD,MAAC;YAAI;YAAO;;sBACZ,MAAC;YAAI;YAAO,IAAI,KAAK;;sBACrB,MAAC;YAAI;YAAO,IAAI,KAAK,GAAG;;sBACxB,MAAC;YAAI;YAAO;;sBACZ,MAAC;YAAI;sBAAO;;sBACZ,MAAC;YAAI;YAAO,YAAY,KAAK,GAAG;;sBAChC,MAAC;YAAI;YAAO,OAAO,KAAK;;sBACxB,MAAC;YAAI;YAAO,OAAO,KAAK,GAAG;;sBAC3B,MAAC;YAAI;YAAO,QAAQ;;sBACpB,MAAC;YAAI;YAAO,OAAO,KAAK,GAAG;;;AAGvC;AA5BA,OAAO,MAAM,oBAAM,+FA4BhB\"}") == DIAGNOSTICS == [] diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode.snap index 7a3d68220fd..126311b55e8 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode.snap @@ -31,25 +31,22 @@ export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ qrlDEV(()=>import(". Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;AAGA,OAAO,MAAM,oBAAM;;;;;IAMhB\"}") ============================= app_component_ckepmxzlub0.js (ENTRY POINT)== -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; import { qrlDEV } from "@builder.io/qwik"; export const App_component_ckEPmXZlub0 = ()=>{ - return /*#__PURE__*/ _jsxC(Cmp, { - children: /*#__PURE__*/ _jsxQ("p", null, { - class: "stuff", - onClick$: /*#__PURE__*/ qrlDEV(()=>import("./app_component_cmp_p_onclick_vuxzfutkpto"), "App_component_Cmp_p_onClick_vuXzfUTkpto", { - file: "/user/qwik/src/test.tsx", - lo: 164, - hi: 189, - displayName: "App_component_Cmp_p_onClick" - }) - }, "Hello Qwik", 3, null, { - fileName: "test.tsx", - lineNumber: 7, - columnNumber: 13 + return /*#__PURE__*/ _jsxQ(Cmp, null, null, /*#__PURE__*/ _jsxQ("p", null, { + class: "stuff", + onClick$: /*#__PURE__*/ qrlDEV(()=>import("./app_component_cmp_p_onclick_vuxzfutkpto"), "App_component_Cmp_p_onClick_vuXzfUTkpto", { + file: "/user/qwik/src/test.tsx", + lo: 164, + hi: 189, + displayName: "App_component_Cmp_p_onClick" }) - }, null, 3, "u6_0", { + }, "Hello Qwik", 3, null, { + fileName: "test.tsx", + lineNumber: 7, + columnNumber: 13 + }), 3, "u6_0", { fileName: "test.tsx", lineNumber: 6, columnNumber: 9 @@ -57,7 +54,7 @@ export const App_component_ckEPmXZlub0 = ()=>{ }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;yCAG8B,IAAM;IAChC,qBACI,MAAC;kBACG,cAAA,MAAC;YAAE,OAAM;YAAQ,QAAQ;;;;;;WAA6B;;;;;;;;;;AAGlE\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;yCAG8B,IAAM;IAChC,qBACI,MAAC,+BACG,MAAC;QAAE,OAAM;QAAQ,QAAQ;;;;;;OAA6B;;;;;;;;;AAGlE\"}") /* { "origin": "test.tsx", diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode_inlined.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode_inlined.snap index 5e1b857ac99..356506aafe7 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode_inlined.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_dev_mode_inlined.snap @@ -21,23 +21,20 @@ export const App = component$(() => { import { componentQrl } from "@builder.io/qwik"; import { inlinedQrlDEV } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrlDEV(()=>{ - return /*#__PURE__*/ _jsxC(Cmp, { - children: /*#__PURE__*/ _jsxQ("p", null, { - class: "stuff", - onClick$: /*#__PURE__*/ inlinedQrlDEV(()=>console.log('warn'), "App_component_Cmp_p_onClick_vuXzfUTkpto", { - file: "/user/qwik/src/test.tsx", - lo: 164, - hi: 189, - displayName: "App_component_Cmp_p_onClick" - }) - }, "Hello Qwik", 3, null, { - fileName: "test.tsx", - lineNumber: 7, - columnNumber: 13 + return /*#__PURE__*/ _jsxQ(Cmp, null, null, /*#__PURE__*/ _jsxQ("p", null, { + class: "stuff", + onClick$: /*#__PURE__*/ inlinedQrlDEV(()=>console.log('warn'), "App_component_Cmp_p_onClick_vuXzfUTkpto", { + file: "/user/qwik/src/test.tsx", + lo: 164, + hi: 189, + displayName: "App_component_Cmp_p_onClick" }) - }, null, 3, "u6_0", { + }, "Hello Qwik", 3, null, { + fileName: "test.tsx", + lineNumber: 7, + columnNumber: 13 + }), 3, "u6_0", { fileName: "test.tsx", lineNumber: 6, columnNumber: 9 @@ -50,7 +47,7 @@ export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrlDEV(()=>{ })); -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;AAGA,OAAO,MAAM,oBAAM,yCAAW,IAAM;IAChC,qBACI,MAAC;kBACG,cAAA,MAAC;YAAE,OAAM;YAAQ,QAAQ,8BAAE,IAAM,QAAQ,GAAG,CAAC;;;;;;WAAS;;;;;;;;;;AAGlE;;;;;IAAG\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;AAGA,OAAO,MAAM,oBAAM,yCAAW,IAAM;IAChC,qBACI,MAAC,+BACG,MAAC;QAAE,OAAM;QAAQ,QAAQ,8BAAE,IAAM,QAAQ,GAAG,CAAC;;;;;;OAAS;;;;;;;;;AAGlE;;;;;IAAG\"}") == DIAGNOSTICS == [] diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_export_issue.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_export_issue.snap index d4848bd421d..0c347471f8f 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_export_issue.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_export_issue.snap @@ -42,9 +42,9 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma ============================= root_component_royhjyacbye.js (ENTRY POINT)== import { _auto_App as App } from "./test"; -import { _jsxC } from "@builder.io/qwik"; +import { _jsxQ } from "@builder.io/qwik"; export const Root_component_royhjYaCbYE = (props)=>{ - return /*#__PURE__*/ _jsxC(App, null, null, 3, "u6_1"); + return /*#__PURE__*/ _jsxQ(App, null, null, null, 3, "u6_1"); }; diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_getter_generation.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_getter_generation.snap index b28e38ea5ea..f8765730442 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_getter_generation.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_getter_generation.snap @@ -52,31 +52,28 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; import { _fnSignal } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; export const Cmp_component_4ryKJTOKjWE = (props)=>{ - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("p", null, { - "data-value": _fnSignal((p0)=>p0.count, [ - props - ], "p0.count") - }, _fnSignal((p0)=>p0.nested.count, [ + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("p", null, { + "data-value": _fnSignal((p0)=>p0.count, [ props - ], "p0.nested.count"), 3, null), - /*#__PURE__*/ _jsxQ("p", null, null, [ - "Value ", - _fnSignal((p0)=>p0.count, [ - props - ], "p0.count"), - /*#__PURE__*/ _jsxQ("span", null, null, null, 3, null) - ], 3, null) - ] - }, null, 3, "u6_1"); + ], "p0.count") + }, _fnSignal((p0)=>p0.nested.count, [ + props + ], "p0.nested.count"), 3, null), + /*#__PURE__*/ _jsxQ("p", null, null, [ + "Value ", + _fnSignal((p0)=>p0.count, [ + props + ], "p0.count"), + /*#__PURE__*/ _jsxQ("span", null, null, null, 3, null) + ], 3, null) + ], 3, "u6_1"); }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;yCAyB8B,CAAC,QAAU;IACrC,qBACI;;0BACI,MAAC;gBAAE,YAAU,kBAAE,GAAM,KAAK;;;+BAAG,GAAM,MAAM,CAAC,KAAK;;;0BAC/C,MAAC;gBAAE;gCAAO,GAAM,KAAK;;;8BAAC,MAAC;;;;AAGnC\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;yCAyB8B,CAAC,QAAU;IACrC,qBACI;sBACI,MAAC;YAAE,YAAU,kBAAE,GAAM,KAAK;;;2BAAG,GAAM,MAAM,CAAC,KAAK;;;sBAC/C,MAAC;YAAE;4BAAO,GAAM,KAAK;;;0BAAC,MAAC;;;AAGnC\"}") /* { "origin": "test.tsx", @@ -100,7 +97,7 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma import { Cmp } from "./test"; import { _fnSignal } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; +import { _jsxQ } from "@builder.io/qwik"; import { useStore } from "@builder.io/qwik"; export const App_component_ckEPmXZlub0 = ()=>{ const store = useStore({ @@ -111,7 +108,7 @@ export const App_component_ckEPmXZlub0 = ()=>{ } }); const signal = useSignal(0); - return /*#__PURE__*/ _jsxC(Cmp, null, { + return /*#__PURE__*/ _jsxQ(Cmp, null, { prop: 'true', count: _fnSignal((p0)=>p0.count, [ store @@ -126,7 +123,7 @@ export const App_component_ckEPmXZlub0 = ()=>{ value: _fnSignal((p0)=>p0.formData?.get('username'), [ signal ], 'p0.formData?.get("username")') - }, 3, "u6_0"); + }, null, 3, "u6_0"); }; diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_analysis.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_analysis.snap index ca69aea69d8..e73ce086778 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_analysis.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_analysis.snap @@ -122,7 +122,6 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; import { _fnSignal } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; import { _wrapProp } from "@builder.io/qwik"; import importedValue from "v"; @@ -136,65 +135,62 @@ export const App_component_ckEPmXZlub0 = (props)=>{ const remove = /*#__PURE__*/ qrl(()=>import("./app_component_remove_pu6yoc5p6sy"), "App_component_remove_pU6yOC5P6sY", [ state ]); - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("p", { - onClick$: props.onClick$ - }, { - class: "stuff" - }, "Hello Qwik", 2, null), - /*#__PURE__*/ _jsxC(Div, { - onClick$: props.onClick$, - children: /*#__PURE__*/ _jsxQ("p", null, null, "Hello Qwik", 3, null) - }, { - class: styles.foo, - document: _wrapProp(window, "document"), - onEvent$: /*#__PURE__*/ qrl(()=>import("./app_component__fragment_div_onevent_p0vwsfvwp1k"), "App_component__Fragment_Div_onEvent_p0vWsfvWP1k"), - transparent$: /*#__PURE__*/ qrl(()=>import("./app_component__fragment_div_transparent_jtd8sctndsg"), "App_component__Fragment_Div_transparent_jTD8SCTNDsg"), - immutable1: "stuff", - immutable2: { + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("p", { + onClick$: props.onClick$ + }, { + class: "stuff" + }, "Hello Qwik", 2, null), + /*#__PURE__*/ _jsxQ(Div, { + onClick$: props.onClick$ + }, { + class: styles.foo, + document: _wrapProp(window, "document"), + onEvent$: /*#__PURE__*/ qrl(()=>import("./app_component__fragment_div_onevent_p0vwsfvwp1k"), "App_component__Fragment_Div_onEvent_p0vWsfvWP1k"), + transparent$: /*#__PURE__*/ qrl(()=>import("./app_component__fragment_div_transparent_jtd8sctndsg"), "App_component__Fragment_Div_transparent_jTD8SCTNDsg"), + immutable1: "stuff", + immutable2: { + foo: 'bar', + baz: importedValue ? true : false + }, + immutable3: 2, + immutable4$: /*#__PURE__*/ qrl(()=>import("./app_component__fragment_div_immutable4_qt1dno4izxo"), "App_component__Fragment_Div_immutable4_QT1DNo4IZXo", [ + state + ]), + immutable5: [ + 1, + 2, + importedValue, + null, + {} + ] + }, /*#__PURE__*/ _jsxQ("p", null, null, "Hello Qwik", 3, null), 2, "u6_0"), + "[].map(() => (", + /*#__PURE__*/ _jsxQ(props.Model, { + mutable2: (()=>console.log(state.count))() + }, { + class: state, + remove$: remove, + mutable1: _fnSignal((p0)=>({ foo: 'bar', - baz: importedValue ? true : false - }, - immutable3: 2, - immutable4$: /*#__PURE__*/ qrl(()=>import("./app_component__fragment_div_immutable4_qt1dno4izxo"), "App_component__Fragment_Div_immutable4_QT1DNo4IZXo", [ - state - ]), - immutable5: [ - 1, - 2, - importedValue, - null, - {} - ] - }, 2, "u6_0"), - "[].map(() => (", - /*#__PURE__*/ _jsxC(props.Model, { - mutable2: (()=>console.log(state.count))() - }, { - class: state, - remove$: remove, - mutable1: _fnSignal((p0)=>({ - foo: 'bar', - baz: p0.count ? true : false - }), [ - state - ], '{foo:"bar",baz:p0.count?true:false}'), - mutable3: [ - 1, - 2, - state, - null, - {} - ] - }, 3, "u6_1"), - "));" - ] - }, null, 1, "u6_2"); + baz: p0.count ? true : false + }), [ + state + ], '{foo:"bar",baz:p0.count?true:false}'), + mutable3: [ + 1, + 2, + state, + null, + {} + ] + }, null, 3, "u6_1"), + "));" + ], 1, "u6_2"); }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;;;;yCAK8B,CAAC,QAAU;IAErC,MAAM,QAAQ,SAAS;QAAC,OAAO;IAAC;IAChC,MAAM;;;IAON,qBACI;;0BACI,MAAC;gBAAgB,UAAU,MAAM,QAAQ;;gBAAtC,OAAM;eAAkC;0BAC3C,MAAC;gBAGG,UAAU,MAAM,QAAQ;0BAYxB,cAAA,MAAC,iBAAE;;gBAdH,OAAO,OAAO,GAAG;gBACjB,QAAQ,YAAE;gBAEV,QAAQ;gBACR,YAAY;gBACZ,YAAW;gBACX,YAAY;oBACR,KAAK;oBACL,KAAK,gBAAgB,IAAI,GAAG,KAAK;gBACrC;gBACA,YAAY;gBACZ,WAAW;;;gBACX,YAAY;oBAAC;oBAAG;oBAAG;oBAAe,IAAI;oBAAE,CAAC;iBAAE;;YAGzC;0BAEF,MA9BI,MAAT;gBAqCS,UAAU,AAAC,CAAA,IAAM,QAAQ,GAAG,CAAC,MAAM,KAAK,CAAA;;gBANxC,OAAO;gBACP,SAAS;gBACT,QAAQ,kBAAE,CAAA;wBACN,KAAK;wBACL,KAAK,GAAM,KAAK,GAAG,IAAI,GAAG,KAAK;oBACnC,CAAA;;;gBAEA,UAAU;oBAAC;oBAAG;oBAAG;oBAAO,IAAI;oBAAE,CAAC;iBAAE;;YACnC;;;AAIlB\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;;;yCAK8B,CAAC,QAAU;IAErC,MAAM,QAAQ,SAAS;QAAC,OAAO;IAAC;IAChC,MAAM;;;IAON,qBACI;sBACI,MAAC;YAAgB,UAAU,MAAM,QAAQ;;YAAtC,OAAM;WAAkC;sBAC3C,MAAC;YAGG,UAAU,MAAM,QAAQ;;YAFxB,OAAO,OAAO,GAAG;YACjB,QAAQ,YAAE;YAEV,QAAQ;YACR,YAAY;YACZ,YAAW;YACX,YAAY;gBACR,KAAK;gBACL,KAAK,gBAAgB,IAAI,GAAG,KAAK;YACrC;YACA,YAAY;YACZ,WAAW;;;YACX,YAAY;gBAAC;gBAAG;gBAAG;gBAAe,IAAI;gBAAE,CAAC;aAAE;yBAE3C,MAAC,iBAAE;QACD;sBAEF,MA9BI,MAAT;YAqCS,UAAU,AAAC,CAAA,IAAM,QAAQ,GAAG,CAAC,MAAM,KAAK,CAAA;;YANxC,OAAO;YACP,SAAS;YACT,QAAQ,kBAAE,CAAA;oBACN,KAAK;oBACL,KAAK,GAAM,KAAK,GAAG,IAAI,GAAG,KAAK;gBACnC,CAAA;;;YAEA,UAAU;gBAAC;gBAAG;gBAAG;gBAAO,IAAI;gBAAE,CAAC;aAAE;;QACnC;;AAIlB\"}") /* { "origin": "test.tsx", diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_function_components.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_function_components.snap index 4a9b05b7b2e..52aa2ab0b15 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_function_components.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_immutable_function_components.snap @@ -19,17 +19,16 @@ export const App = component$((props: Stuff) => { ============================= test.js == import { componentQrl } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; import { inlinedQrl } from "@builder.io/qwik"; import { Slot } from '@builder.io/qwik'; const App_component_ckEPmXZlub0 = (props)=>{ - return /*#__PURE__*/ _jsxQ("div", null, null, /*#__PURE__*/ _jsxC(Slot, null, null, 3, "u6_0"), 1, "u6_1"); + return /*#__PURE__*/ _jsxQ("div", null, null, /*#__PURE__*/ _jsxQ(Slot, null, null, null, 3, "u6_0"), 1, "u6_1"); }; export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(App_component_ckEPmXZlub0, "App_component_ckEPmXZlub0")); -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;AACA,SAA+B,IAAI,QAAQ,mBAAmB;kCAEhC,CAAC,QAAiB;IAC5C,qBACI,MAAC,iCACG,MAAC;AAGb;AANA,OAAO,MAAM,oBAAM,+FAMhB\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;AACA,SAA+B,IAAI,QAAQ,mBAAmB;kCAEhC,CAAC,QAAiB;IAC5C,qBACI,MAAC,iCACG,MAAC;AAGb;AANA,OAAO,MAAM,oBAAM,+FAMhB\"}") == DIAGNOSTICS == [] diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_input_bind.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_input_bind.snap index 077eb7cded9..4efdca4a762 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_input_bind.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_input_bind.snap @@ -31,51 +31,48 @@ import { useLexicalScope } from "@builder.io/qwik"; import { inlinedQrl } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; import { _fnSignal } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; export const Greeter = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(()=>{ const value = useSignal(0); const checked = useSignal(false); const stuff = useSignal(); - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("input", null, { - "value": value, - "onInput$": /*#__PURE__*/ inlinedQrl((_, elm)=>{ - const [value] = useLexicalScope(); - return value.value = elm.value; - }, "s_SO0WIOE0Sqc", [ - value - ]) - }, null, 3, null), - /*#__PURE__*/ _jsxQ("input", null, { - "checked": checked, - "onInput$": /*#__PURE__*/ inlinedQrl((_, elm)=>{ - const [checked] = useLexicalScope(); - return checked.value = elm.checked; - }, "s_VKebOylP0Dk", [ - checked - ]) - }, null, 3, null), - /*#__PURE__*/ _jsxQ("input", null, { - "stuff": stuff, - "onChange$": /*#__PURE__*/ inlinedQrl((_, elm)=>{ - const [stuff] = useLexicalScope(); - return stuff.value = elm.stuff; - }, "s_HplsUb3Bodg", [ - stuff - ]) - }, null, 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, value, 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, _fnSignal((p0)=>p0.value, [ + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("input", null, { + "value": value, + "onInput$": /*#__PURE__*/ inlinedQrl((_, elm)=>{ + const [value] = useLexicalScope(); + return value.value = elm.value; + }, "s_SO0WIOE0Sqc", [ value - ], "p0.value"), 3, null) - ] - }, null, 3, "u6_0"); + ]) + }, null, 3, null), + /*#__PURE__*/ _jsxQ("input", null, { + "checked": checked, + "onInput$": /*#__PURE__*/ inlinedQrl((_, elm)=>{ + const [checked] = useLexicalScope(); + return checked.value = elm.checked; + }, "s_VKebOylP0Dk", [ + checked + ]) + }, null, 3, null), + /*#__PURE__*/ _jsxQ("input", null, { + "stuff": stuff, + "onChange$": /*#__PURE__*/ inlinedQrl((_, elm)=>{ + const [stuff] = useLexicalScope(); + return stuff.value = elm.stuff; + }, "s_HplsUb3Bodg", [ + stuff + ]) + }, null, 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, value, 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, _fnSignal((p0)=>p0.value, [ + value + ], "p0.value"), 3, null) + ], 3, "u6_0"); }, "s_n7HuG2hhU0Q")); -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;;AAGA,OAAO,MAAM,wBAAU,sCAAW,IAAM;IACpC,MAAM,QAAQ,UAAU;IACxB,MAAM,UAAU,UAAU,KAAK;IAC/B,MAAM,QAAQ;IACd,qBACI;;0BACI,MAAC;yBAAkB;;;2BAAA;;;;;0BACnB,MAAC;2BAAoB;;;2BAAA;;;;;0BACrB,MAAC;yBAAkB;;;2BAAA;;;;;0BACnB,MAAC,mBAAK;0BACN,MAAC,mCAAK,GAAM,KAAK;;;;;AAI7B,qBAAG\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;AAGA,OAAO,MAAM,wBAAU,sCAAW,IAAM;IACpC,MAAM,QAAQ,UAAU;IACxB,MAAM,UAAU,UAAU,KAAK;IAC/B,MAAM,QAAQ;IACd,qBACI;sBACI,MAAC;qBAAkB;;;uBAAA;;;;;sBACnB,MAAC;uBAAoB;;;uBAAA;;;;;sBACrB,MAAC;qBAAkB;;;uBAAA;;;;;sBACnB,MAAC,mBAAK;sBACN,MAAC,mCAAK,GAAM,KAAK;;;;AAI7B,qBAAG\"}") == DIAGNOSTICS == [] diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_invalid_references.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_invalid_references.snap index a3f331ebc34..50e683a041b 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_invalid_references.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_invalid_references.snap @@ -88,9 +88,9 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma ============================= app_component_1_w0t0o3qmovu.js (ENTRY POINT)== import { _auto_I10 as I10 } from "./test"; -import { _jsxC } from "@builder.io/qwik"; +import { _jsxQ } from "@builder.io/qwik"; export const App_component_1_w0t0o3QMovU = ()=>{ - return /*#__PURE__*/ _jsxC(I10, null, null, 3, "u6_0"); + return /*#__PURE__*/ _jsxQ(I10, null, null, null, 3, "u6_0"); }; export { _hW } from "@builder.io/qwik"; diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_issue_4438.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_issue_4438.snap index 08fa621fd61..a166456be03 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_issue_4438.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_issue_4438.snap @@ -22,25 +22,22 @@ export const App = component$(() => { import { componentQrl } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; import { inlinedQrl } from "@builder.io/qwik"; import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; import { useSignal } from '@builder.io/qwik'; const App_component_ckEPmXZlub0 = ()=>{ const toggle = useSignal(false); - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("div", { - "data-nu": toggle.value ? $localize`singular` : 'plural' - }, null, null, 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, toggle.value ? $localize`singular` : $localize`plural`, 1, null) - ] - }, null, 1, "u6_0"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("div", { + "data-nu": toggle.value ? $localize`singular` : 'plural' + }, null, null, 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, toggle.value ? $localize`singular` : $localize`plural`, 1, null) + ], 1, "u6_0"); }; export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(App_component_ckEPmXZlub0, "App_component_ckEPmXZlub0")); -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;AACA,SAAqB,SAAS,QAAQ,mBAAmB;kCAE3B,IAAM;IAChC,MAAM,SAAS,UAAU,KAAK;IAC9B,qBACI;;0BACI,MAAC;gBAAI,WAAS,OAAO,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,QAAQ;;0BAC3D,MAAC,mBAAK,OAAO,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;;;AAGxE;AARA,OAAO,MAAM,oBAAM,+FAQhB\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;AACA,SAAqB,SAAS,QAAQ,mBAAmB;kCAE3B,IAAM;IAChC,MAAM,SAAS,UAAU,KAAK;IAC9B,qBACI;sBACI,MAAC;YAAI,WAAS,OAAO,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,QAAQ;;sBAC3D,MAAC,mBAAK,OAAO,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;;AAGxE;AARA,OAAO,MAAM,oBAAM,+FAQhB\"}") == DIAGNOSTICS == [] diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx.snap index ea8c06990ee..32fc9a74710 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx.snap @@ -54,21 +54,19 @@ import { componentQrl } from "@builder.io/qwik"; import { qrl } from "@builder.io/qwik"; import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; export const Lightweight = (props)=>{ - return /*#__PURE__*/ _jsxQ("div", null, null, /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("div", null, null, null, 3, null), - /*#__PURE__*/ _jsxC("button", { - ...props - }, null, 0, null) - ] - }, null, 1, "u6_0"), 1, "u6_1"); + return /*#__PURE__*/ _jsxQ("div", null, null, /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("div", null, null, null, 3, null), + /*#__PURE__*/ _jsxC("button", { + ...props + }, null, 0, null) + ], 1, "u6_0"), 1, "u6_1"); }; export const Foo = /*#__PURE__*/ componentQrl(/*#__PURE__*/ qrl(()=>import("./foo_component_htdrsvublie"), "Foo_component_HTDRsvUbLiE"), { tagName: "my-foo" }); -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;AAGA,OAAO,MAAM,cAAc,CAAC,QAAU;IAClC,qBACI,MAAC,iCACG;;0BACI,MAAC;0BACD,MAAC;gBAAQ,GAAG,KAAK;;;;AAIjC,EAAE;AAEF,OAAO,MAAM,oBAAM,wGAuBhB;IACC,SAAS;AACb,GAAG\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;AAGA,OAAO,MAAM,cAAc,CAAC,QAAU;IAClC,qBACI,MAAC,iCACG;sBACI,MAAC;sBACD,MAAC;YAAQ,GAAG,KAAK;;;AAIjC,EAAE;AAEF,OAAO,MAAM,oBAAM,wGAuBhB;IACC,SAAS;AACb,GAAG\"}") ============================= foo_component_htdrsvublie.js (ENTRY POINT)== import { qrl } from "@builder.io/qwik"; @@ -109,19 +107,17 @@ import { _jsxQ } from "@builder.io/qwik"; export const Foo_component_1_DvU6FitWglY = ()=>{ const [props] = useLexicalScope(); return /*#__PURE__*/ _jsxQ("div", null, null, [ - /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("div", null, { - class: "class" - }, null, 3, null), - /*#__PURE__*/ _jsxQ("div", null, { - class: "class" - }, null, 3, null), - /*#__PURE__*/ _jsxQ("div", null, { - class: "class" - }, "12", 3, null) - ] - }, null, 3, "u6_2"), + /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("div", null, { + class: "class" + }, null, 3, null), + /*#__PURE__*/ _jsxQ("div", null, { + class: "class" + }, null, 3, null), + /*#__PURE__*/ _jsxQ("div", null, { + class: "class" + }, "12", 3, null) + ], 3, "u6_2"), /*#__PURE__*/ _jsxQ("div", null, { class: "class" }, /*#__PURE__*/ _jsxC(Lightweight, { @@ -142,7 +138,7 @@ export const Foo_component_1_DvU6FitWglY = ()=>{ export { _hW } from "@builder.io/qwik"; -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;2CAea;;IACL,qBACI,MAAC;sBACG;;8BACI,MAAC;oBAAI,OAAM;;8BACX,MAAC;oBAAI,OAAM;;8BACX,MAAC;oBAAI,OAAM;mBAAQ;;;sBAEvB,MAAC;YAAI,OAAM;yBACP,MAAC;YAAa,GAAG,KAAK;;sBAE1B,MAAC;YAAI,OAAM;;0BACP,MAAC;0BACD,MAAC;0BACD,MAAC;;sBAEL,MAAC;YAAI,OAAM;WACN\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;2CAea;;IACL,qBACI,MAAC;sBACG;0BACI,MAAC;gBAAI,OAAM;;0BACX,MAAC;gBAAI,OAAM;;0BACX,MAAC;gBAAI,OAAM;eAAQ;;sBAEvB,MAAC;YAAI,OAAM;yBACP,MAAC;YAAa,GAAG,KAAK;;sBAE1B,MAAC;YAAI,OAAM;;0BACP,MAAC;0BACD,MAAC;0BACD,MAAC;;sBAEL,MAAC;YAAI,OAAM;WACN\"}") /* { "origin": "test.tsx", diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed.snap index 340d8912277..fb379889674 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed.snap @@ -31,26 +31,23 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma ============================= app_component_ckepmxzlub0.js (ENTRY POINT)== import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; export const App_component_ckEPmXZlub0 = (props)=>{ - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxC(Cmp, null, null, 3, "stuff"), - /*#__PURE__*/ _jsxC(Cmp, null, null, 3, "u6_0"), - /*#__PURE__*/ _jsxC(Cmp, null, { - prop: "23" - }, 3, "u6_1"), - /*#__PURE__*/ _jsxC(Cmp, null, { - prop: "23" - }, 3, props.stuff), - /*#__PURE__*/ _jsxQ("p", null, null, "Hello Qwik", 3, props.stuff) - ] - }, null, 1, "u6_2"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ(Cmp, null, null, null, 3, "stuff"), + /*#__PURE__*/ _jsxQ(Cmp, null, null, null, 3, "u6_0"), + /*#__PURE__*/ _jsxQ(Cmp, null, { + prop: "23" + }, null, 3, "u6_1"), + /*#__PURE__*/ _jsxQ(Cmp, null, { + prop: "23" + }, null, 3, props.stuff), + /*#__PURE__*/ _jsxQ("p", null, null, "Hello Qwik", 3, props.stuff) + ], 1, "u6_2"); }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;yCAG8B,CAAC,QAAiB;IAC5C,qBACI;;0BACI,MAAC,oBAAQ;0BACT,MAAC;0BACD,MAAC;gBAAI,MAAK;;0BACV,MAAC;gBAAI,MAAK;kBAAU,MAAM,KAAK;0BAC/B,MAAC,iBAAoB,iBAAb,MAAM,KAAK;;;AAG/B\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;yCAG8B,CAAC,QAAiB;IAC5C,qBACI;sBACI,MAAC,0BAAQ;sBACT,MAAC;sBACD,MAAC;YAAI,MAAK;;sBACV,MAAC;YAAI,MAAK;oBAAU,MAAM,KAAK;sBAC/B,MAAC,iBAAoB,iBAAb,MAAM,KAAK;;AAG/B\"}") /* { "origin": "test.tsx", diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed_dev.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed_dev.snap index ba542fa2180..d6a9c6581fa 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed_dev.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_jsx_keyed_dev.snap @@ -36,42 +36,39 @@ Some("{\"version\":3,\"sources\":[\"/src/project/project/index.tsx\"],\"names\": ============================= app_component_kglyfbhvjc0.js (ENTRY POINT)== import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; export const App_component_KGLYFBhvJc0 = (props)=>{ - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxC(Cmp, null, null, 3, "stuff", { - fileName: "project/index.tsx", - lineNumber: 7, - columnNumber: 13 - }), - /*#__PURE__*/ _jsxC(Cmp, null, null, 3, "Q6_0", { - fileName: "project/index.tsx", - lineNumber: 8, - columnNumber: 13 - }), - /*#__PURE__*/ _jsxC(Cmp, null, { - prop: "23" - }, 3, "Q6_1", { - fileName: "project/index.tsx", - lineNumber: 9, - columnNumber: 13 - }), - /*#__PURE__*/ _jsxC(Cmp, null, { - prop: "23" - }, 3, props.stuff, { - fileName: "project/index.tsx", - lineNumber: 10, - columnNumber: 13 - }), - /*#__PURE__*/ _jsxQ("p", null, null, "Hello Qwik", 3, props.stuff, { - fileName: "project/index.tsx", - lineNumber: 11, - columnNumber: 13 - }) - ] - }, null, 1, "Q6_2", { + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ(Cmp, null, null, null, 3, "stuff", { + fileName: "project/index.tsx", + lineNumber: 7, + columnNumber: 13 + }), + /*#__PURE__*/ _jsxQ(Cmp, null, null, null, 3, "Q6_0", { + fileName: "project/index.tsx", + lineNumber: 8, + columnNumber: 13 + }), + /*#__PURE__*/ _jsxQ(Cmp, null, { + prop: "23" + }, null, 3, "Q6_1", { + fileName: "project/index.tsx", + lineNumber: 9, + columnNumber: 13 + }), + /*#__PURE__*/ _jsxQ(Cmp, null, { + prop: "23" + }, null, 3, props.stuff, { + fileName: "project/index.tsx", + lineNumber: 10, + columnNumber: 13 + }), + /*#__PURE__*/ _jsxQ("p", null, null, "Hello Qwik", 3, props.stuff, { + fileName: "project/index.tsx", + lineNumber: 11, + columnNumber: 13 + }) + ], 1, "Q6_2", { fileName: "project/index.tsx", lineNumber: 6, columnNumber: 9 @@ -79,7 +76,7 @@ export const App_component_KGLYFBhvJc0 = (props)=>{ }; -Some("{\"version\":3,\"sources\":[\"/src/project/project/index.tsx\"],\"names\":[],\"mappings\":\";;;yCAG8B,CAAC,QAAiB;IAC5C,qBACI;;0BACI,MAAC,oBAAQ;;;;;0BACT,MAAC;;;;;0BACD,MAAC;gBAAI,MAAK;;;;;;0BACV,MAAC;gBAAI,MAAK;kBAAU,MAAM,KAAK;;;;;0BAC/B,MAAC,iBAAoB,iBAAb,MAAM,KAAK;;;;;;;;;;;AAG/B\"}") +Some("{\"version\":3,\"sources\":[\"/src/project/project/index.tsx\"],\"names\":[],\"mappings\":\";;yCAG8B,CAAC,QAAiB;IAC5C,qBACI;sBACI,MAAC,0BAAQ;;;;;sBACT,MAAC;;;;;sBACD,MAAC;YAAI,MAAK;;;;;;sBACV,MAAC;YAAI,MAAK;oBAAU,MAAM,KAAK;;;;;sBAC/B,MAAC,iBAAoB,iBAAb,MAAM,KAAK;;;;;;;;;;AAG/B\"}") /* { "origin": "project/index.tsx", diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_mutable_children.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_mutable_children.snap index a21bedadb54..79e437c930f 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_mutable_children.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_mutable_children.snap @@ -104,7 +104,6 @@ export const AppStatic = component$((props: Stuff) => { ============================= test.js == import { _jsxQ } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; import { _jsxBranch } from "@builder.io/qwik"; import { componentQrl } from "@builder.io/qwik"; import { inlinedQrl } from "@builder.io/qwik"; @@ -114,104 +113,88 @@ import { Slot, Fragment } from '@builder.io/qwik'; import Image from './image.jpg?jsx'; export function Fn1(props) { _jsxBranch(); - return /*#__PURE__*/ _jsxC(_Fragment, { - children: /*#__PURE__*/ _jsxQ("div", null, null, prop < 2 ? /*#__PURE__*/ _jsxQ("p", null, null, "1", 3, "u6_0") : /*#__PURE__*/ _jsxC(Stuff, { - children: "2" - }, null, 3, "u6_1"), 1, null) - }, null, 1, "u6_2"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, /*#__PURE__*/ _jsxQ("div", null, null, prop < 2 ? /*#__PURE__*/ _jsxQ("p", null, null, "1", 3, "u6_0") : /*#__PURE__*/ _jsxQ(Stuff, null, null, "2", 3, "u6_1"), 1, null), 1, "u6_2"); } export function Fn2(props) { _jsxBranch(); return /*#__PURE__*/ _jsxQ("div", null, null, [ - prop.value && /*#__PURE__*/ _jsxC(Stuff, null, null, 3, "u6_3"), + prop.value && /*#__PURE__*/ _jsxQ(Stuff, null, null, null, 3, "u6_3"), /*#__PURE__*/ _jsxQ("div", null, null, null, 3, null) ], 1, "u6_4"); } export function Fn3(props) { _jsxBranch(); - if (prop.value) return /*#__PURE__*/ _jsxC(Stuff, null, null, 3, "u6_5"); + if (prop.value) return /*#__PURE__*/ _jsxQ(Stuff, null, null, null, 3, "u6_5"); return /*#__PURE__*/ _jsxQ("div", null, null, null, 3, "u6_6"); } export function Fn4(props) { _jsxBranch(); if (prop.value) return /*#__PURE__*/ _jsxQ("div", null, null, null, 3, "u6_7"); - return /*#__PURE__*/ _jsxC(Stuff, null, null, 3, "u6_8"); + return /*#__PURE__*/ _jsxQ(Stuff, null, null, null, 3, "u6_8"); } -export const Arrow = (props)=>/*#__PURE__*/ _jsxBranch(/*#__PURE__*/ _jsxQ("div", null, null, prop < 2 ? /*#__PURE__*/ _jsxQ("p", null, null, "1", 3, "u6_9") : /*#__PURE__*/ _jsxC(Stuff, { - children: "2" - }, null, 3, "u6_10"), 1, "u6_11")); +export const Arrow = (props)=>/*#__PURE__*/ _jsxBranch(/*#__PURE__*/ _jsxQ("div", null, null, prop < 2 ? /*#__PURE__*/ _jsxQ("p", null, null, "1", 3, "u6_9") : /*#__PURE__*/ _jsxQ(Stuff, null, null, "2", 3, "u6_10"), 1, "u6_11")); const AppDynamic1_component_R00UJ05gbes = (props)=>{ _jsxBranch(); - return /*#__PURE__*/ _jsxC(_Fragment, { - children: /*#__PURE__*/ _jsxQ("div", null, null, prop < 2 ? /*#__PURE__*/ _jsxQ("p", null, null, "1", 3, "u6_12") : /*#__PURE__*/ _jsxC(Stuff, { - children: "2" - }, null, 3, "u6_13"), 1, null) - }, null, 1, "u6_14"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, /*#__PURE__*/ _jsxQ("div", null, null, prop < 2 ? /*#__PURE__*/ _jsxQ("p", null, null, "1", 3, "u6_12") : /*#__PURE__*/ _jsxQ(Stuff, null, null, "2", 3, "u6_13"), 1, null), 1, "u6_14"); }; export const AppDynamic1 = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(AppDynamic1_component_R00UJ05gbes, "AppDynamic1_component_R00UJ05gbes")); const AppDynamic2_component_3EY2zm0v00A = (props)=>{ _jsxBranch(); return /*#__PURE__*/ _jsxQ("div", null, null, [ - prop.value && /*#__PURE__*/ _jsxC(Stuff, null, null, 3, "u6_15"), + prop.value && /*#__PURE__*/ _jsxQ(Stuff, null, null, null, 3, "u6_15"), /*#__PURE__*/ _jsxQ("div", null, null, null, 3, null) ], 1, "u6_16"); }; export const AppDynamic2 = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(AppDynamic2_component_3EY2zm0v00A, "AppDynamic2_component_3EY2zm0v00A")); const AppDynamic3_component_FVq83NlbTDQ = (props)=>{ _jsxBranch(); - if (prop.value) return /*#__PURE__*/ _jsxC(Stuff, null, null, 3, "u6_17"); + if (prop.value) return /*#__PURE__*/ _jsxQ(Stuff, null, null, null, 3, "u6_17"); return /*#__PURE__*/ _jsxQ("div", null, null, null, 3, "u6_18"); }; export const AppDynamic3 = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(AppDynamic3_component_FVq83NlbTDQ, "AppDynamic3_component_FVq83NlbTDQ")); const AppDynamic4_component_IO0yr8UvWEI = (props)=>{ _jsxBranch(); if (prop.value) return /*#__PURE__*/ _jsxQ("div", null, null, null, 3, "u6_19"); - return /*#__PURE__*/ _jsxC(Stuff, null, null, 3, "u6_20"); + return /*#__PURE__*/ _jsxQ(Stuff, null, null, null, 3, "u6_20"); }; export const AppDynamic4 = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(AppDynamic4_component_IO0yr8UvWEI, "AppDynamic4_component_IO0yr8UvWEI")); const AppStatic_component_gYRXqF3G5nE = (props)=>{ _jsxBranch(); - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("div", null, null, [ - "Static ", - f ? 1 : 3 - ], 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, prop < 2 ? /*#__PURE__*/ _jsxQ("p", null, null, "1", 3, "u6_21") : /*#__PURE__*/ _jsxQ("p", null, null, "2", 3, null), 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, prop.value && /*#__PURE__*/ _jsxQ("div", null, null, null, 3, "u6_22"), 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, prop.value && /*#__PURE__*/ _jsxC(Fragment, { - children: /*#__PURE__*/ _jsxC(Slot, null, null, 3, "u6_23") - }, null, 1, "u6_24"), 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, prop.value && /*#__PURE__*/ _jsxC(_Fragment, { - children: /*#__PURE__*/ _jsxQ("div", null, null, null, 3, null) - }, null, 3, "u6_25"), 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, prop.value && /*#__PURE__*/ _jsxC(Image, null, null, 3, "u6_26"), 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "Static ", - f ? 1 : 3 - ], 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, "Static", 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "Static ", - _fnSignal((p0)=>p0.value, [ - props - ], "p0.value") - ], 3, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "Static ", - stuff() - ], 1, null), - /*#__PURE__*/ _jsxQ("div", null, null, [ - "Static ", - stuff() - ], 1, null) - ] - }, null, 1, "u6_27"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("div", null, null, [ + "Static ", + f ? 1 : 3 + ], 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, prop < 2 ? /*#__PURE__*/ _jsxQ("p", null, null, "1", 3, "u6_21") : /*#__PURE__*/ _jsxQ("p", null, null, "2", 3, null), 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, prop.value && /*#__PURE__*/ _jsxQ("div", null, null, null, 3, "u6_22"), 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, prop.value && /*#__PURE__*/ _jsxQ(Fragment, null, null, /*#__PURE__*/ _jsxQ(Slot, null, null, null, 3, "u6_23"), 1, "u6_24"), 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, prop.value && /*#__PURE__*/ _jsxQ(_Fragment, null, null, /*#__PURE__*/ _jsxQ("div", null, null, null, 3, null), 3, "u6_25"), 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, prop.value && /*#__PURE__*/ _jsxQ(Image, null, null, null, 3, "u6_26"), 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "Static ", + f ? 1 : 3 + ], 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, "Static", 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "Static ", + _fnSignal((p0)=>p0.value, [ + props + ], "p0.value") + ], 3, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "Static ", + stuff() + ], 1, null), + /*#__PURE__*/ _jsxQ("div", null, null, [ + "Static ", + stuff() + ], 1, null) + ], 1, "u6_27"); }; export const AppStatic = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(AppStatic_component_gYRXqF3G5nE, "AppStatic_component_gYRXqF3G5nE")); -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;;AACA,SAA+B,IAAI,EAAE,QAAQ,QAAQ,mBAAmB;AACxE,OAAO,WAAW,kBAAkB;AAEpC,OAAO,SAAS,IAAI,KAAY,EAAE;;IAC9B,qBACI;kBACI,cAAA,MAAC,mBAAK,OAAO,kBAAI,MAAC,iBAAE,gCAAQ,MAAC;sBAAM;2BAAS;;AAGxD,CAAC;AAED,OAAO,SAAS,IAAI,KAAY,EAAE;;IAC9B,qBACI,MAAC;QAAK,KAAK,KAAK,kBAAI,MAAC;sBAAe,MAAC;;AAE7C,CAAC;AAED,OAAO,SAAS,IAAI,KAAY,EAAE;;IAC9B,IAAI,KAAK,KAAK,EACV,qBACI,MAAC;IAGT,qBACI,MAAC;AAET,CAAC;AAED,OAAO,SAAS,IAAI,KAAY,EAAE;;IAC9B,IAAI,KAAK,KAAK,EACV,qBACI,MAAC;IAGT,qBACI,MAAC;AAET,CAAC;AAED,OAAO,MAAM,QAAQ,CAAC,+CAAiB,MAAC,mBAAK,OAAO,kBAAI,MAAC,iBAAE,gCAAQ,MAAC;kBAAM;wBAAS,eAAQ;0CAErD,CAAC,QAAiB;;IACpD,qBACI;kBACI,cAAA,MAAC,mBAAK,OAAO,kBAAI,MAAC,iBAAE,iCAAQ,MAAC;sBAAM;4BAAS;;AAGxD;AANA,OAAO,MAAM,4BAAc,+GAMxB;0CACmC,CAAC,QAAiB;;IACpD,qBACI,MAAC;QAAK,KAAK,KAAK,kBAAI,MAAC;sBAAe,MAAC;;AAE7C;AAJA,OAAO,MAAM,4BAAc,+GAIxB;0CAEmC,CAAC,QAAiB;;IACpD,IAAI,KAAK,KAAK,EACV,qBACI,MAAC;IAGT,qBACI,MAAC;AAET;AATA,OAAO,MAAM,4BAAc,+GASxB;0CAEmC,CAAC,QAAiB;;IACpD,IAAI,KAAK,KAAK,EACV,qBACI,MAAC;IAGT,qBACI,MAAC;AAET;AATA,OAAO,MAAM,4BAAc,+GASxB;wCAEiC,CAAC,QAAiB;;IAClD,qBACI;;0BACI,MAAC;gBAAI;gBAAQ,IAAI,IAAI,CAAC;;0BACtB,MAAC,mBAAK,OAAO,kBAAI,MAAC,iBAAE,iCAAQ,MAAC,iBAAE,aAAK;0BAEpC,MAAC,mBAAK,KAAK,KAAK,kBAAI,MAAC;0BACrB,MAAC,mBAAK,KAAK,KAAK,kBAAI,MAAC;0BAAS,cAAA,MAAC;;0BAC/B,MAAC,mBAAK,KAAK,KAAK,kBAAI;0BAAE,cAAA,MAAC;;0BACvB,MAAC,mBAAK,KAAK,KAAK,kBAAI,MAAC;0BACrB,MAAC;gBAAI;gBAAQ,IAAI,IAAI,CAAC;;0BACtB,MAAC,mBAAI;0BACL,MAAC;gBAAI;gCAAQ,GAAM,KAAK;;;;0BACxB,MAAC;gBAAI;gBAAQ;;0BACb,MAAC;gBAAI;gBAAQ;;;;AAGzB;AAjBA,OAAO,MAAM,0BAAY,2GAiBtB\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;AACA,SAA+B,IAAI,EAAE,QAAQ,QAAQ,mBAAmB;AACxE,OAAO,WAAW,kBAAkB;AAEpC,OAAO,SAAS,IAAI,KAAY,EAAE;;IAC9B,qBACI,2CACI,MAAC,mBAAK,OAAO,kBAAI,MAAC,iBAAE,gCAAQ,MAAC,mBAAM,eAAS;AAGxD,CAAC;AAED,OAAO,SAAS,IAAI,KAAY,EAAE;;IAC9B,qBACI,MAAC;QAAK,KAAK,KAAK,kBAAI,MAAC;sBAAe,MAAC;;AAE7C,CAAC;AAED,OAAO,SAAS,IAAI,KAAY,EAAE;;IAC9B,IAAI,KAAK,KAAK,EACV,qBACI,MAAC;IAGT,qBACI,MAAC;AAET,CAAC;AAED,OAAO,SAAS,IAAI,KAAY,EAAE;;IAC9B,IAAI,KAAK,KAAK,EACV,qBACI,MAAC;IAGT,qBACI,MAAC;AAET,CAAC;AAED,OAAO,MAAM,QAAQ,CAAC,+CAAiB,MAAC,mBAAK,OAAO,kBAAI,MAAC,iBAAE,gCAAQ,MAAC,mBAAM,gBAAS,eAAQ;0CAErD,CAAC,QAAiB;;IACpD,qBACI,2CACI,MAAC,mBAAK,OAAO,kBAAI,MAAC,iBAAE,iCAAQ,MAAC,mBAAM,gBAAS;AAGxD;AANA,OAAO,MAAM,4BAAc,+GAMxB;0CACmC,CAAC,QAAiB;;IACpD,qBACI,MAAC;QAAK,KAAK,KAAK,kBAAI,MAAC;sBAAe,MAAC;;AAE7C;AAJA,OAAO,MAAM,4BAAc,+GAIxB;0CAEmC,CAAC,QAAiB;;IACpD,IAAI,KAAK,KAAK,EACV,qBACI,MAAC;IAGT,qBACI,MAAC;AAET;AATA,OAAO,MAAM,4BAAc,+GASxB;0CAEmC,CAAC,QAAiB;;IACpD,IAAI,KAAK,KAAK,EACV,qBACI,MAAC;IAGT,qBACI,MAAC;AAET;AATA,OAAO,MAAM,4BAAc,+GASxB;wCAEiC,CAAC,QAAiB;;IAClD,qBACI;sBACI,MAAC;YAAI;YAAQ,IAAI,IAAI,CAAC;;sBACtB,MAAC,mBAAK,OAAO,kBAAI,MAAC,iBAAE,iCAAQ,MAAC,iBAAE,aAAK;sBAEpC,MAAC,mBAAK,KAAK,KAAK,kBAAI,MAAC;sBACrB,MAAC,mBAAK,KAAK,KAAK,kBAAI,MAAC,oCAAS,MAAC;sBAC/B,MAAC,mBAAK,KAAK,KAAK,kBAAI,2CAAE,MAAC;sBACvB,MAAC,mBAAK,KAAK,KAAK,kBAAI,MAAC;sBACrB,MAAC;YAAI;YAAQ,IAAI,IAAI,CAAC;;sBACtB,MAAC,mBAAI;sBACL,MAAC;YAAI;4BAAQ,GAAM,KAAK;;;;sBACxB,MAAC;YAAI;YAAQ;;sBACb,MAAC;YAAI;YAAQ;;;AAGzB;AAjBA,OAAO,MAAM,0BAAY,2GAiBtB\"}") == DIAGNOSTICS == [] diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_of_synchronous_qrl.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_of_synchronous_qrl.snap index 63f2cfa5e3a..994c880a9e2 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_of_synchronous_qrl.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_of_synchronous_qrl.snap @@ -34,32 +34,29 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma ============================= test_component_luxexe0dqrg.js (ENTRY POINT)== import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; import { _qrlSync } from "@builder.io/qwik"; export const test_component_LUXeXe0DQrg = ()=>{ - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("input", { - onClick$: _qrlSync(function(event, target) { - // comment should be removed - event.preventDefault(); - }, "function(event,target){event.preventDefault();}") - }, null, null, 2, null), - /*#__PURE__*/ _jsxQ("input", { - onClick$: _qrlSync((event, target)=>{ - event.preventDefault(); - }, "(event,target)=>{event.preventDefault();}") - }, null, null, 2, null), - /*#__PURE__*/ _jsxQ("input", { - onClick$: _qrlSync((event, target)=>event.preventDefault(), "(event,target)=>event.preventDefault()") - }, null, null, 2, null) - ] - }, null, 1, "u6_0"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("input", { + onClick$: _qrlSync(function(event, target) { + // comment should be removed + event.preventDefault(); + }, "function(event,target){event.preventDefault();}") + }, null, null, 2, null), + /*#__PURE__*/ _jsxQ("input", { + onClick$: _qrlSync((event, target)=>{ + event.preventDefault(); + }, "(event,target)=>{event.preventDefault();}") + }, null, null, 2, null), + /*#__PURE__*/ _jsxQ("input", { + onClick$: _qrlSync((event, target)=>event.preventDefault(), "(event,target)=>event.preventDefault()") + }, null, null, 2, null) + ], 1, "u6_0"); }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;0CAGkC,IAAM;IAChC,qBACI;;0BACI,MAAC;gBAAM,QAAQ,WAAQ,SAAS,KAAK,EAAE,MAAM,EAAE;oBAC3C,4BAA4B;oBAC5B,MAAM,cAAc;gBACxB;;0BACA,MAAC;gBAAM,QAAQ,WAAQ,CAAC,OAAO,SAAW;oBACtC,MAAM,cAAc;gBACxB;;0BACA,MAAC;gBAAM,QAAQ,WAAQ,CAAC,OAAO,SAAW,MAAM,cAAc;;;;AAGtE\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;0CAGkC,IAAM;IAChC,qBACI;sBACI,MAAC;YAAM,QAAQ,WAAQ,SAAS,KAAK,EAAE,MAAM,EAAE;gBAC3C,4BAA4B;gBAC5B,MAAM,cAAc;YACxB;;sBACA,MAAC;YAAM,QAAQ,WAAQ,CAAC,OAAO,SAAW;gBACtC,MAAM,cAAc;YACxB;;sBACA,MAAC;YAAM,QAAQ,WAAQ,CAAC,OAAO,SAAW,MAAM,cAAc;;;AAGtE\"}") /* { "origin": "test.tsx", diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames.snap index cdde5f8f3c2..face68ec093 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames.snap @@ -21,18 +21,15 @@ export const App = component$((props: Stuff) => { import { componentQrl } from "@builder.io/qwik"; import { inlinedQrl } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props: Stuff)=>{ - return /*#__PURE__*/ _jsxC(Cmp, { - children: /*#__PURE__*/ _jsxQ("p", null, { - class: "stuff", - onClick$: /*#__PURE__*/ inlinedQrl(()=>console.log('warn'), "App_component_Cmp_p_onClick_vuXzfUTkpto") - }, "Hello Qwik", 3, null) - }, null, 3, "u6_0"); + return /*#__PURE__*/ _jsxQ(Cmp, null, null, /*#__PURE__*/ _jsxQ("p", null, { + class: "stuff", + onClick$: /*#__PURE__*/ inlinedQrl(()=>console.log('warn'), "App_component_Cmp_p_onClick_vuXzfUTkpto") + }, "Hello Qwik", 3, null), 3, "u6_0"); }, "App_component_ckEPmXZlub0")); -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;AAGA,OAAO,MAAM,oBAAM,sCAAW,CAAC,OAAO,QAAU;IAC5C,qBACI,MAAC;kBACG,cAAA,MAAC;YAAE,OAAM;YAAQ,QAAQ,2BAAE,IAAM,QAAQ,GAAG,CAAC;WAAS;;AAGlE,iCAAG\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;AAGA,OAAO,MAAM,oBAAM,sCAAW,CAAC,OAAO,QAAU;IAC5C,qBACI,MAAC,+BACG,MAAC;QAAE,OAAM;QAAQ,QAAQ,2BAAE,IAAM,QAAQ,GAAG,CAAC;OAAS;AAGlE,iCAAG\"}") == DIAGNOSTICS == [] diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames_hooks.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames_hooks.snap index 08db08eaa8e..c845999e94e 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames_hooks.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_preserve_filenames_hooks.snap @@ -30,22 +30,19 @@ export const foo = ()=>console.log('foo'); Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;AAGA,OAAO,MAAM,oBAAM,2GAOhB;AAEH,OAAO,MAAM,MAAM,IAAM,QAAQ,GAAG,CAAC,OAAO\"}") ============================= app_component_ckepmxzlub0.js (ENTRY POINT)== -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; import { foo } from "./test.tsx"; import { qrl } from "@builder.io/qwik"; export const App_component_ckEPmXZlub0 = (props)=>{ foo(); - return /*#__PURE__*/ _jsxC(Cmp, { - children: /*#__PURE__*/ _jsxQ("p", null, { - class: "stuff", - onClick$: /*#__PURE__*/ qrl(()=>import("./app_component_cmp_p_onclick_vuxzfutkpto.js"), "App_component_Cmp_p_onClick_vuXzfUTkpto") - }, "Hello Qwik", 3, null) - }, null, 3, "u6_0"); + return /*#__PURE__*/ _jsxQ(Cmp, null, null, /*#__PURE__*/ _jsxQ("p", null, { + class: "stuff", + onClick$: /*#__PURE__*/ qrl(()=>import("./app_component_cmp_p_onclick_vuxzfutkpto.js"), "App_component_Cmp_p_onClick_vuXzfUTkpto") + }, "Hello Qwik", 3, null), 3, "u6_0"); }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;yCAG8B,CAAC,QAAiB;IAC5C;IACA,qBACI,MAAC;kBACG,cAAA,MAAC;YAAE,OAAM;YAAQ,QAAQ;WAA6B;;AAGlE\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;yCAG8B,CAAC,QAAiB;IAC5C;IACA,qBACI,MAAC,+BACG,MAAC;QAAE,OAAM;QAAQ,QAAQ;OAA6B;AAGlE\"}") /* { "origin": "test.tsx", diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_optimization.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_optimization.snap index 6cff671c27d..92f4e405d16 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_optimization.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_props_optimization.snap @@ -55,7 +55,6 @@ import { useTaskQrl } from "@builder.io/qwik"; import { useLexicalScope } from "@builder.io/qwik"; import { inlinedQrl } from "@builder.io/qwik"; import { _wrapProp } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; export const Works = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props)=>{ const rest = _restProps(props, [ @@ -74,7 +73,7 @@ export const Works = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) props, rest ])); - return /*#__PURE__*/ _jsxC("div", { + return /*#__PURE__*/ _jsxQ("div", { some: props.some ?? 3, params: { some: props.some ?? 3 @@ -83,7 +82,7 @@ export const Works = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props) ...rest }, { override: true - }, 0, "u6_0"); + }, _wrapProp(props, "count"), 0, "u6_0"); }, "Works_component_t45qL4vNGv0")); export const NoWorks2 = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(({ count , stuff: { hey } })=>{ console.log(hey); @@ -113,7 +112,7 @@ export const NoWorks3 = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(({ c }, "NoWorks3_component_fc13h5yYn14")); -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;;;AAGA,OAAO,MAAM,sBAAQ,sCAAW,SAMf;;;;;;;;IACb,QAAQ,GAAG,OAHX,aAFA,QAAO;IAMP,oCAAS,CAAC,EAAC,MAAK,EAAC;;QACb,MAAM,UARV;QASI,QAAQ,GAAG,OATf,OASuB,YANvB,aAFA,QAAO,SAGP,gBAAqB;;;;;IAOrB,qBACI,MAAC;QAAI,IAAI,QAXb,QAAO;QAWc,QAAQ;YAAE,IAAI,QAXnC,QAAO;QAW6B;QAAG,KAAK;QAAU,GAAG,IAAI;;QAAE,QAAQ;;AAE3E,mCAAG;AAEH,OAAO,MAAM,yBAAW,sCAAW,CAAC,EAAC,MAAK,EAAE,OAAO,EAAC,IAAG,EAAC,CAAA,EAAC,GAAK;IAC1D,QAAQ,GAAG,CAAC;IACZ,oCAAS,CAAC,EAAC,MAAK,EAAC;;QACb,MAAM,IAAM;QACZ,QAAQ,GAAG,CAAC;;;;IAEhB,qBACI,MAAC;QAAI,OAAO;aAAQ;AAE5B,sCAAG;AAEH,OAAO,MAAM,yBAAW,sCAAW,CAAC,EAAC,MAAK,EAAE,OAAQ,OAAM,EAAC,GAAK;IAC5D,QAAQ,GAAG,CAAC;IACZ,oCAAS,CAAC,EAAC,MAAK,EAAC;;QACb,MAAM,IAAM;QACZ,QAAQ,GAAG,CAAC;;;;IAEhB,qBACI,MAAC;QAAI,OAAO;aAAQ;AAE5B,sCAAG\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;;AAGA,OAAO,MAAM,sBAAQ,sCAAW,SAMf;;;;;;;;IACb,QAAQ,GAAG,OAHX,aAFA,QAAO;IAMP,oCAAS,CAAC,EAAC,MAAK,EAAC;;QACb,MAAM,UARV;QASI,QAAQ,GAAG,OATf,OASuB,YANvB,aAFA,QAAO,SAGP,gBAAqB;;;;;IAOrB,qBACI,MAAC;QAAI,IAAI,QAXb,QAAO;QAWc,QAAQ;YAAE,IAAI,QAXnC,QAAO;QAW6B;QAAG,KAAK;QAAU,GAAG,IAAI;;QAAE,QAAQ;;AAE3E,mCAAG;AAEH,OAAO,MAAM,yBAAW,sCAAW,CAAC,EAAC,MAAK,EAAE,OAAO,EAAC,IAAG,EAAC,CAAA,EAAC,GAAK;IAC1D,QAAQ,GAAG,CAAC;IACZ,oCAAS,CAAC,EAAC,MAAK,EAAC;;QACb,MAAM,IAAM;QACZ,QAAQ,GAAG,CAAC;;;;IAEhB,qBACI,MAAC;QAAI,OAAO;aAAQ;AAE5B,sCAAG;AAEH,OAAO,MAAM,yBAAW,sCAAW,CAAC,EAAC,MAAK,EAAE,OAAQ,OAAM,EAAC,GAAK;IAC5D,QAAQ,GAAG,CAAC;IACZ,oCAAS,CAAC,EAAC,MAAK,EAAC;;QACb,MAAM,IAAM;QACZ,QAAQ,GAAG,CAAC;;;;IAEhB,qBACI,MAAC;QAAI,OAAO;aAAQ;AAE5B,sCAAG\"}") == DIAGNOSTICS == [] diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react.snap index 235a1c6113b..0116d259cef 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react.snap @@ -155,7 +155,7 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/node_modules/@builder.io/qwik-rea import { Fragment } from "@builder.io/qwik/jsx-runtime"; import { SkipRerender } from "@builder.io/qwik"; import { _jsxBranch } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; +import { _jsxQ } from "@builder.io/qwik"; import { _auto_filterProps as filterProps } from "../node_modules/@builder.io/qwik-react/index.qwik.mjs"; import { isServer } from "@builder.io/qwik/build"; import { qrl } from "@builder.io/qwik"; @@ -185,24 +185,20 @@ export const qwikifyQrl_component_zH94hIe0Ick = (props)=>{ import("../node_modules/@builder.io/qwik-react/server-9ac6caad.js") ]).then(([Cmp, server])=>{ const html = server.render(Cmp, filterProps(props)); - return /*#__PURE__*/ _jsxC(Host, { + return /*#__PURE__*/ _jsxQ(Host, { dangerouslySetInnerHTML: html, [_IMMUTABLE]: [ "dangerouslySetInnerHTML" ] - }, null, 3, "mR_0"); + }, null, null, 3, "mR_0"); }); - return /*#__PURE__*/ _jsxC(Fragment, { - children: jsx$1 - }, null, 1, "mR_1"); + return /*#__PURE__*/ _jsxQ(Fragment, null, null, jsx$1, 1, "mR_1"); } - return /*#__PURE__*/ _jsxC(Host, { - children: /*#__PURE__*/ _jsxC(SkipRerender, null, null, 3, "mR_2") - }, null, 1, "mR_3"); + return /*#__PURE__*/ _jsxQ(Host, null, null, /*#__PURE__*/ _jsxQ(SkipRerender, null, null, null, 3, "mR_2"), 1, "mR_3"); }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/node_modules/@builder.io/qwik-react/index.qwik.mjs\"],\"names\":[],\"mappings\":\";;;;;;;;;;;gDAMiD,CAAC,QAAQ;;IAClD,MAAM,CAAC,YAAY,GAAG;IACtB,MAAM,cAAc;IACpB,MAAM,QAAQ,SAAS,CAAC;IACxB,IAAI;IACJ,IAAI,KAAK,CAAC,iBAAiB,EAAE,MAAM;SAC9B,IAAI,KAAK,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc,EAAE,MAAM;IAC7D;;;;;QA4BI;QACA;IACJ;IACA,IAAI,YAAY,CAAC,KAAK,CAAC,cAAc,EAAE;QACnC,MAAM,QAAQ,QAAQ,GAAG,CAAC;YACtB,YAAY,OAAO;YACnB,MAAM,CAAC;SACV,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,GAAG;YACrB,MAAM,OAAO,OAAO,MAAM,CAAC,KAAK,YAAY;YAC5C,OAAO,WAAW,GAAG,MAAI;gBACrB,yBAAyB;gBACzB,CAAC,WAAW,EAAE;oBACV;iBACH;;QAET;QACA,OAAO,WAAW,GAAG,MAAI;YACrB,UAAU;;IAElB,CAAC;IACD,OAAO,WAAW,GAAG,MAAI;QACrB,UAAU,WAAW,GAAG,MAAI;;AAEpC\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/node_modules/@builder.io/qwik-react/index.qwik.mjs\"],\"names\":[],\"mappings\":\";;;;;;;;;;;gDAMiD,CAAC,QAAQ;;IAClD,MAAM,CAAC,YAAY,GAAG;IACtB,MAAM,cAAc;IACpB,MAAM,QAAQ,SAAS,CAAC;IACxB,IAAI;IACJ,IAAI,KAAK,CAAC,iBAAiB,EAAE,MAAM;SAC9B,IAAI,KAAK,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc,EAAE,MAAM;IAC7D;;;;;QA4BI;QACA;IACJ;IACA,IAAI,YAAY,CAAC,KAAK,CAAC,cAAc,EAAE;QACnC,MAAM,QAAQ,QAAQ,GAAG,CAAC;YACtB,YAAY,OAAO;YACnB,MAAM,CAAC;SACV,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,GAAG;YACrB,MAAM,OAAO,OAAO,MAAM,CAAC,KAAK,YAAY;YAC5C,OAAO,WAAW,GAAG,MAAI;gBACrB,yBAAyB;gBACzB,CAAC,WAAW,EAAE;oBACV;iBACH;;QAET;QACA,OAAO,WAAW,GAAG,MAAI,sBACX;IAElB,CAAC;IACD,OAAO,WAAW,GAAG,MAAI,kBACX,WAAW,GAAG,MAAI;AAEpC\"}") /* { "origin": "../node_modules/@builder.io/qwik-react/index.qwik.mjs", diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react_inline.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react_inline.snap index d9475ea45e7..73dc1d3e3dd 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react_inline.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_qwik_react_inline.snap @@ -99,7 +99,7 @@ export { qwikify$, qwikifyQrl, renderToString }; ============================= ../node_modules/@builder.io/qwik-react/index.qwik.mjs == -import { _jsxC } from "@builder.io/qwik"; +import { _jsxQ } from "@builder.io/qwik"; import { _jsxBranch } from "@builder.io/qwik"; import { componentQrl, inlinedQrl, useLexicalScope, useHostElement, useStore, useTaskQrl, noSerialize, SkipRerender, implicit$FirstArg } from '@builder.io/qwik'; import { Fragment } from '@builder.io/qwik/jsx-runtime'; @@ -150,20 +150,16 @@ function qwikifyQrl(reactCmpQrl) { import('./server-9ac6caad.js') ]).then(([Cmp, server])=>{ const html = server.render(Cmp, filterProps(props)); - return /*#__PURE__*/ _jsxC(Host, { + return /*#__PURE__*/ _jsxQ(Host, { dangerouslySetInnerHTML: html, [_IMMUTABLE]: [ "dangerouslySetInnerHTML" ] - }, null, 3, "mR_0"); + }, null, null, 3, "mR_0"); }); - return /*#__PURE__*/ _jsxC(Fragment, { - children: jsx$1 - }, null, 1, "mR_1"); + return /*#__PURE__*/ _jsxQ(Fragment, null, null, jsx$1, 1, "mR_1"); } - return /*#__PURE__*/ _jsxC(Host, { - children: /*#__PURE__*/ _jsxC(SkipRerender, null, null, 3, "mR_2") - }, null, 1, "mR_3"); + return /*#__PURE__*/ _jsxQ(Host, null, null, /*#__PURE__*/ _jsxQ(SkipRerender, null, null, null, 3, "mR_2"), 1, "mR_3"); }, "qwikifyQrl_component_zH94hIe0Ick", [ reactCmpQrl ]), { @@ -192,7 +188,7 @@ export { qwikify$, qwikifyQrl, renderToString }; export { filterProps as _auto_filterProps }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/node_modules/@builder.io/qwik-react/index.qwik.mjs\"],\"names\":[],\"mappings\":\";;AACA,SAAS,YAAY,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,iBAAiB,QAAQ,mBAAmB;AACjK,SAAc,QAAQ,QAAQ,+BAA+B;AAC7D,SAAS,SAAS,EAAE,QAAQ,QAAQ,yBAAyB;AAE7D,SAAS,WAAW,WAAW,EAAE;IAC7B,OAAO,WAAW,GAAG,sCAAwB,CAAC,QAAQ;;QAClD,MAAM,CAAC,YAAY,GAAG;QACtB,MAAM,cAAc;QACpB,MAAM,QAAQ,SAAS,CAAC;QACxB,IAAI;QACJ,IAAI,KAAK,CAAC,iBAAiB,EAAE,MAAM;aAC9B,IAAI,KAAK,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc,EAAE,MAAM;QAC7D,oCAAsB,OAAO,QAAQ;YACjC,MAAM,CAAC,aAAa,OAAO,aAAa,MAAM,GAAG;YACjD,MAAM;YACN,IAAI;gBACA,IAAI,MAAM,IAAI,EAAE,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,YAAY;qBACrF;oBACD,MAAM,CAAC,KAAK,OAAO,GAAG,MAAM,QAAQ,GAAG,CAAC;wBACpC,YAAY,OAAO;wBACnB,MAAM,CAAC;qBACV;oBACD,IAAI;oBACJ,IAAI,YAAY,iBAAiB,GAAG,GAAG,OAAO,OAAO,WAAW,CAAC,aAAa,OAAO,IAAI,CAAC,KAAK,YAAY,QAAQ,MAAM,KAAK;yBACzH;wBACD,OAAO,OAAO,UAAU,CAAC;wBACzB,KAAK,MAAM,CAAC,OAAO,IAAI,CAAC,KAAK,YAAY;oBAC7C,CAAC;oBACD,MAAM,IAAI,GAAG,YAAY;wBACrB;wBACA,KAAK;wBACL;oBACJ;gBACJ,CAAC;aACJ;QACL;;;;;YAKI;YACA;QACJ;QACA,IAAI,YAAY,CAAC,KAAK,CAAC,cAAc,EAAE;YACnC,MAAM,QAAQ,QAAQ,GAAG,CAAC;gBACtB,YAAY,OAAO;gBACnB,MAAM,CAAC;aACV,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,GAAG;gBACrB,MAAM,OAAO,OAAO,MAAM,CAAC,KAAK,YAAY;gBAC5C,OAAO,WAAW,GAAG,MAAI;oBACrB,yBAAyB;oBACzB,CAAC,WAAW,EAAE;wBACV;qBACH;;YAET;YACA,OAAO,WAAW,GAAG,MAAI;gBACrB,UAAU;;QAElB,CAAC;QACD,OAAO,WAAW,GAAG,MAAI;YACrB,UAAU,WAAW,GAAG,MAAI;;IAEpC;;QAEI;QACA,SAAS;IACb;AACJ;AACA,MAAM,cAAc,CAAC,QAAQ;IACzB,MAAM,MAAM,CAAC;IACb,OAAO,IAAI,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM;QAC9B,IAAI,CAAC,IAAI,UAAU,CAAC,YAAY,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI;IACzD;IACA,OAAO;AACX;AACA,MAAM,WAAW,kBAAkB;AAEnC,eAAe,eAAe,QAAQ,EAAE,IAAI,EAAE;IAC1C,MAAM,MAAM,MAAM,MAAM,CAAC;IACzB,MAAM,SAAS,MAAM,IAAI,cAAc,CAAC,UAAU;IAClD,MAAM,SAAS,IAAI,iBAAiB,CAAC,OAAO,IAAI;IAChD,MAAM,YAAY,SAAS,OAAO,IAAI;IACtC,OAAO;QACH,GAAG,MAAM;QACT,MAAM;IACV;AACJ;AAEA,SAAS,QAAQ,EAAE,UAAU,EAAE,cAAc,GAAG\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/node_modules/@builder.io/qwik-react/index.qwik.mjs\"],\"names\":[],\"mappings\":\";;AACA,SAAS,YAAY,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,iBAAiB,QAAQ,mBAAmB;AACjK,SAAc,QAAQ,QAAQ,+BAA+B;AAC7D,SAAS,SAAS,EAAE,QAAQ,QAAQ,yBAAyB;AAE7D,SAAS,WAAW,WAAW,EAAE;IAC7B,OAAO,WAAW,GAAG,sCAAwB,CAAC,QAAQ;;QAClD,MAAM,CAAC,YAAY,GAAG;QACtB,MAAM,cAAc;QACpB,MAAM,QAAQ,SAAS,CAAC;QACxB,IAAI;QACJ,IAAI,KAAK,CAAC,iBAAiB,EAAE,MAAM;aAC9B,IAAI,KAAK,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc,EAAE,MAAM;QAC7D,oCAAsB,OAAO,QAAQ;YACjC,MAAM,CAAC,aAAa,OAAO,aAAa,MAAM,GAAG;YACjD,MAAM;YACN,IAAI;gBACA,IAAI,MAAM,IAAI,EAAE,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,YAAY;qBACrF;oBACD,MAAM,CAAC,KAAK,OAAO,GAAG,MAAM,QAAQ,GAAG,CAAC;wBACpC,YAAY,OAAO;wBACnB,MAAM,CAAC;qBACV;oBACD,IAAI;oBACJ,IAAI,YAAY,iBAAiB,GAAG,GAAG,OAAO,OAAO,WAAW,CAAC,aAAa,OAAO,IAAI,CAAC,KAAK,YAAY,QAAQ,MAAM,KAAK;yBACzH;wBACD,OAAO,OAAO,UAAU,CAAC;wBACzB,KAAK,MAAM,CAAC,OAAO,IAAI,CAAC,KAAK,YAAY;oBAC7C,CAAC;oBACD,MAAM,IAAI,GAAG,YAAY;wBACrB;wBACA,KAAK;wBACL;oBACJ;gBACJ,CAAC;aACJ;QACL;;;;;YAKI;YACA;QACJ;QACA,IAAI,YAAY,CAAC,KAAK,CAAC,cAAc,EAAE;YACnC,MAAM,QAAQ,QAAQ,GAAG,CAAC;gBACtB,YAAY,OAAO;gBACnB,MAAM,CAAC;aACV,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,GAAG;gBACrB,MAAM,OAAO,OAAO,MAAM,CAAC,KAAK,YAAY;gBAC5C,OAAO,WAAW,GAAG,MAAI;oBACrB,yBAAyB;oBACzB,CAAC,WAAW,EAAE;wBACV;qBACH;;YAET;YACA,OAAO,WAAW,GAAG,MAAI,sBACX;QAElB,CAAC;QACD,OAAO,WAAW,GAAG,MAAI,kBACX,WAAW,GAAG,MAAI;IAEpC;;QAEI;QACA,SAAS;IACb;AACJ;AACA,MAAM,cAAc,CAAC,QAAQ;IACzB,MAAM,MAAM,CAAC;IACb,OAAO,IAAI,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM;QAC9B,IAAI,CAAC,IAAI,UAAU,CAAC,YAAY,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI;IACzD;IACA,OAAO;AACX;AACA,MAAM,WAAW,kBAAkB;AAEnC,eAAe,eAAe,QAAQ,EAAE,IAAI,EAAE;IAC1C,MAAM,MAAM,MAAM,MAAM,CAAC;IACzB,MAAM,SAAS,MAAM,IAAI,cAAc,CAAC,UAAU;IAClD,MAAM,SAAS,IAAI,iBAAiB,CAAC,OAAO,IAAI;IAChD,MAAM,YAAY,SAAS,OAAO,IAAI;IACtC,OAAO;QACH,GAAG,MAAM;QACT,MAAM;IACV;AACJ;AAEA,SAAS,QAAQ,EAAE,UAAU,EAAE,cAAc,GAAG\"}") == DIAGNOSTICS == [] diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_reg_ctx_name_hooks.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_reg_ctx_name_hooks.snap index 08fdb4af783..88a07f85899 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_reg_ctx_name_hooks.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_reg_ctx_name_hooks.snap @@ -27,23 +27,20 @@ import { _regSymbol } from "@builder.io/qwik"; import { inlinedQrl } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; import { _noopQrl } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; export const Works = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl((props)=>{ - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("div", { - onClick$: serverQrl(/*#__PURE__*/ inlinedQrl(/*#__PURE__*/ _regSymbol(()=>console.log('in server', 'hola'), "07DGQ0fITXs"), "Works_component__Fragment_div_onClick_server_07DGQ0fITXs")) - }, null, null, 2, null), - /*#__PURE__*/ _jsxQ("div", null, { - onClick$: /*#__PURE__*/ _noopQrl("Works_component__Fragment_div_onClick_YhOCqfqU0Rc") - }, null, 3, null) - ] - }, null, 1, "u6_0"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("div", { + onClick$: serverQrl(/*#__PURE__*/ inlinedQrl(/*#__PURE__*/ _regSymbol(()=>console.log('in server', 'hola'), "07DGQ0fITXs"), "Works_component__Fragment_div_onClick_server_07DGQ0fITXs")) + }, null, null, 2, null), + /*#__PURE__*/ _jsxQ("div", null, { + onClick$: /*#__PURE__*/ _noopQrl("Works_component__Fragment_div_onClick_YhOCqfqU0Rc") + }, null, 3, null) + ], 1, "u6_0"); }, "Works_component_t45qL4vNGv0")); -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;;;;AAGA,OAAO,MAAM,sBAAQ,sCAAW,CAAC,QAAU;IAEvC,qBACI;;0BACA,MAAC;gBAAI,UAAU,4DAAQ,IAAM,QAAQ,GAAG,CAAC,aAHhC;;0BAIT,MAAC;gBAAI,QAAQ;;;;AAGrB,mCAAG\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;;;AAGA,OAAO,MAAM,sBAAQ,sCAAW,CAAC,QAAU;IAEvC,qBACI;sBACA,MAAC;YAAI,UAAU,4DAAQ,IAAM,QAAQ,GAAG,CAAC,aAHhC;;sBAIT,MAAC;YAAI,QAAQ;;;AAGrB,mCAAG\"}") == DIAGNOSTICS == [] diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_spread_jsx.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_spread_jsx.snap index b6b6bffbd4c..d7dc2d5b316 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_spread_jsx.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_spread_jsx.snap @@ -60,42 +60,40 @@ import { useLocation } from "@builder.io/qwik-city"; export const RouterHead_component_DPA76mgIou0 = ()=>{ const head = useDocumentHead(); const loc = useLocation(); - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("title", null, null, head.title, 1, null), - /*#__PURE__*/ _jsxQ("link", null, { - rel: "canonical", - href: _fnSignal((p0)=>p0.href, [ - loc - ], "p0.href") - }, null, 3, null), - /*#__PURE__*/ _jsxQ("meta", null, { - name: "viewport", - content: "width=device-width, initial-scale=1.0" - }, null, 3, null), - /*#__PURE__*/ _jsxQ("link", null, { - rel: "icon", - type: "image/svg+xml", - href: "/favicon.svg" - }, null, 3, null), - head.meta.map((m)=>/*#__PURE__*/ _jsxC("meta", { - ...m - }, null, 0, "u6_0")), - head.links.map((l)=>/*#__PURE__*/ _createElement("link", { - ...l, - key: l.key - })), - head.styles.map((s)=>/*#__PURE__*/ _createElement("style", { - ...s.props, - dangerouslySetInnerHTML: s.style, - key: s.key - })) - ] - }, null, 1, "u6_1"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("title", null, null, head.title, 1, null), + /*#__PURE__*/ _jsxQ("link", null, { + rel: "canonical", + href: _fnSignal((p0)=>p0.href, [ + loc + ], "p0.href") + }, null, 3, null), + /*#__PURE__*/ _jsxQ("meta", null, { + name: "viewport", + content: "width=device-width, initial-scale=1.0" + }, null, 3, null), + /*#__PURE__*/ _jsxQ("link", null, { + rel: "icon", + type: "image/svg+xml", + href: "/favicon.svg" + }, null, 3, null), + head.meta.map((m)=>/*#__PURE__*/ _jsxC("meta", { + ...m + }, null, 0, "u6_0")), + head.links.map((l)=>/*#__PURE__*/ _createElement("link", { + ...l, + key: l.key + })), + head.styles.map((s)=>/*#__PURE__*/ _createElement("style", { + ...s.props, + dangerouslySetInnerHTML: s.style, + key: s.key + })) + ], 1, "u6_1"); }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;;gDAOqC,IAAM;IACzC,MAAM,OAAO;IACb,MAAM,MAAM;IAEZ,qBACE;;0BACE,MAAC,qBAAO,KAAK,KAAK;0BAElB,MAAC;gBAAK,KAAI;gBAAY,IAAI,kBAAE,GAAI,IAAI;;;;0BACpC,MAAC;gBAAK,MAAK;gBAAW,SAAQ;;0BAC9B,MAAC;gBAAK,KAAI;gBAAO,MAAK;gBAAgB,MAAK;;YAE1C,KAAK,IAAI,CAAC,GAAG,CAAC,CAAC,kBACd,MAAC;oBAAM,GAAG,CAAC;;YAGZ,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,kBACf,eAAC;oBAAM,GAAG,CAAC;oBAAE,KAAK,EAAE,GAAG;;YAGxB,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,kBAChB,eAAC;oBAAO,GAAG,EAAE,KAAK;oBAAE,yBAAyB,EAAE,KAAK;oBAAE,KAAK,EAAE,GAAG;;;;AAIxE\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;;gDAOqC,IAAM;IACzC,MAAM,OAAO;IACb,MAAM,MAAM;IAEZ,qBACE;sBACE,MAAC,qBAAO,KAAK,KAAK;sBAElB,MAAC;YAAK,KAAI;YAAY,IAAI,kBAAE,GAAI,IAAI;;;;sBACpC,MAAC;YAAK,MAAK;YAAW,SAAQ;;sBAC9B,MAAC;YAAK,KAAI;YAAO,MAAK;YAAgB,MAAK;;QAE1C,KAAK,IAAI,CAAC,GAAG,CAAC,CAAC,kBACd,MAAC;gBAAM,GAAG,CAAC;;QAGZ,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,kBACf,eAAC;gBAAM,GAAG,CAAC;gBAAE,KAAK,EAAE,GAAG;;QAGxB,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,kBAChB,eAAC;gBAAO,GAAG,EAAE,KAAK;gBAAE,yBAAyB,EAAE,KAAK;gBAAE,KAAK,EAAE,GAAG;;;AAIxE\"}") /* { "origin": "test.tsx", diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_client_code.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_client_code.snap index 5903cdc8992..b81918d9c35 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_client_code.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_strip_client_code.snap @@ -54,7 +54,6 @@ import { useTaskQrl } from "@builder.io/qwik"; import { inlinedQrl } from "@builder.io/qwik"; import { _fnSignal } from "@builder.io/qwik"; import { useLexicalScope } from "@builder.io/qwik"; -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; import { useStore } from '@builder.io/qwik'; export const Parent = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(()=>{ @@ -76,7 +75,7 @@ export const Parent = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(()=>{ state ]) }, [ - /*#__PURE__*/ _jsxC(Div, null, { + /*#__PURE__*/ _jsxQ(Div, null, { onClick$: /*#__PURE__*/ inlinedQrl(()=>console.log('keep'), "Parent_component_div_Div_onClick_kgowuto5dR0"), render$: /*#__PURE__*/ inlinedQrl(()=>{ const [state] = useLexicalScope(); @@ -84,7 +83,7 @@ export const Parent = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(()=>{ }, "Parent_component_div_Div_render_CkMybN6xzQk", [ state ]) - }, 3, "7R_0"), + }, null, 3, "7R_0"), _fnSignal((p0)=>p0.text, [ state ], "p0.text") @@ -92,7 +91,7 @@ export const Parent = /*#__PURE__*/ componentQrl(/*#__PURE__*/ inlinedQrl(()=>{ }, "Parent_component_t6Wy3C0Q0XM")); -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/components/component.tsx\"],\"names\":[],\"mappings\":\";;;;;;;;;;;AACA,SAAsC,QAAQ,QAAkB,mBAAmB;AAQnF,OAAO,MAAM,uBAAS,sCAAW,IAAM;IACnC,MAAM,QAAQ,SAAS;QACnB,MAAM;IACV;IAEA,qBAAqB;IACrB;;;IAKA,oCAAS,IAAM;IACX,OAAO;IACX;IAEA,qBACI,MAAC;QACG,aAAa;;;QACb,QAAQ;;;;sBAER,MAAC;YACG,QAAQ,2BAAE,IAAM,QAAQ,GAAG,CAAC;YAC5B,OAAO,2BAAE;;uBAAM,MAAM,IAAI;;;;;wBAE5B,GAAM,IAAI;;;;AAGvB,oCAAG\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/components/component.tsx\"],\"names\":[],\"mappings\":\";;;;;;;;;;AACA,SAAsC,QAAQ,QAAkB,mBAAmB;AAQnF,OAAO,MAAM,uBAAS,sCAAW,IAAM;IACnC,MAAM,QAAQ,SAAS;QACnB,MAAM;IACV;IAEA,qBAAqB;IACrB;;;IAKA,oCAAS,IAAM;IACX,OAAO;IACX;IAEA,qBACI,MAAC;QACG,aAAa;;;QACb,QAAQ;;;;sBAER,MAAC;YACG,QAAQ,2BAAE,IAAM,QAAQ,GAAG,CAAC;YAC5B,OAAO,2BAAE;;uBAAM,MAAM,IAAI;;;;;wBAE5B,GAAM,IAAI;;;;AAGvB,oCAAG\"}") == DIAGNOSTICS == [] diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_transpile_jsx_only.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_transpile_jsx_only.snap index efa1cdf3b88..bca466d0b27 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_transpile_jsx_only.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_transpile_jsx_only.snap @@ -18,20 +18,17 @@ export const App = component$((props: Stuff) => { ============================= app_component_ckepmxzlub0.ts (ENTRY POINT)== -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; import { qrl } from "@builder.io/qwik"; export const App_component_ckEPmXZlub0 = (props: Stuff)=>{ - return /*#__PURE__*/ _jsxC(Cmp, { - children: /*#__PURE__*/ _jsxQ("p", null, { - class: "stuff", - onClick$: /*#__PURE__*/ qrl(()=>import("./app_component_cmp_p_onclick_vuxzfutkpto.ts"), "App_component_Cmp_p_onClick_vuXzfUTkpto") - }, "Hello Qwik", 3, null) - }, null, 3, "u6_0"); + return /*#__PURE__*/ _jsxQ(Cmp, null, null, /*#__PURE__*/ _jsxQ("p", null, { + class: "stuff", + onClick$: /*#__PURE__*/ qrl(()=>import("./app_component_cmp_p_onclick_vuxzfutkpto.ts"), "App_component_Cmp_p_onClick_vuXzfUTkpto") + }, "Hello Qwik", 3, null), 3, "u6_0"); }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;yCAG8B,CAAC,OAAO,QAAU;IAC5C,qBACI,MAAC;kBACG,cAAA,MAAC;YAAE,OAAM;YAAQ,QAAQ;WAA6B;;AAGlE\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;yCAG8B,CAAC,OAAO,QAAU;IAC5C,qBACI,MAAC,+BACG,MAAC;QAAE,OAAM;QAAQ,QAAQ;OAA6B;AAGlE\"}") /* { "origin": "test.tsx", diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums.snap index 2d6b26623bd..fafea444388 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums.snap @@ -39,19 +39,16 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma import { Thing } from "./test"; import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; export const App_component_ckEPmXZlub0 = ()=>{ console.log(Thing.A); - return /*#__PURE__*/ _jsxC(_Fragment, { - children: /*#__PURE__*/ _jsxQ("p", null, { - class: "stuff" - }, "Hello Qwik", 3, null) - }, null, 3, "u6_0"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, /*#__PURE__*/ _jsxQ("p", null, { + class: "stuff" + }, "Hello Qwik", 3, null), 3, "u6_0"); }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;yCAQ8B,IAAM;IAChC,QAAQ,GAAG,CAAC,MAAM,CAAC;IACnB,qBACI;kBACI,cAAA,MAAC;YAAE,OAAM;WAAQ;;AAG7B\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;yCAQ8B,IAAM;IAChC,QAAQ,GAAG,CAAC,MAAM,CAAC;IACnB,qBACI,2CACI,MAAC;QAAE,OAAM;OAAQ;AAG7B\"}") /* { "origin": "test.tsx", diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums_issue_1341.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums_issue_1341.snap index f8f8358b868..99624aa9b84 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums_issue_1341.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_ts_enums_issue_1341.snap @@ -40,19 +40,16 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma import { _auto_Thing as Thing } from "./test"; import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; export const App_component_ckEPmXZlub0 = ()=>{ console.log(Thing.A); - return /*#__PURE__*/ _jsxC(_Fragment, { - children: /*#__PURE__*/ _jsxQ("p", null, { - class: "stuff" - }, "Hello Qwik", 3, null) - }, null, 3, "u6_0"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, /*#__PURE__*/ _jsxQ("p", null, { + class: "stuff" + }, "Hello Qwik", 3, null), 3, "u6_0"); }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;yCAQ8B,IAAM;IAChC,QAAQ,GAAG,CAAC,MAAM,CAAC;IACnB,qBACI;kBACI,cAAA,MAAC;YAAE,OAAM;WAAQ;;AAG7B\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;yCAQ8B,IAAM;IAChC,QAAQ,GAAG,CAAC,MAAM,CAAC;IACnB,qBACI,2CACI,MAAC;QAAE,OAAM;OAAQ;AAG7B\"}") /* { "origin": "test.tsx", diff --git a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_5008.snap b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_5008.snap index b9d9d97283d..fafe8cfafd4 100644 --- a/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_5008.snap +++ b/packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__issue_5008.snap @@ -34,7 +34,6 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma ============================= test_component_luxexe0dqrg.js (ENTRY POINT)== import { Fragment as _Fragment } from "@builder.io/qwik/jsx-runtime"; -import { _jsxC } from "@builder.io/qwik"; import { _jsxQ } from "@builder.io/qwik"; import { _wrapProp } from "@builder.io/qwik"; import { qrl } from "@builder.io/qwik"; @@ -45,29 +44,27 @@ export const test_component_LUXeXe0DQrg = ()=>{ value: 0 } ]); - return /*#__PURE__*/ _jsxC(_Fragment, { - children: [ - /*#__PURE__*/ _jsxQ("button", null, { - onClick$: /*#__PURE__*/ qrl(()=>import("./test_component__fragment_button_onclick_p2zpf6rl1l8"), "test_component__Fragment_button_onClick_p2zPf6rl1L8", [ - store - ]) - }, "+1", 3, null), - store.map(function(v, idx) { - return /*#__PURE__*/ _jsxQ("div", null, null, [ - "Function: ", - _wrapProp(v, "value") - ], 1, "fn_" + idx); - }), - store.map((v, idx)=>/*#__PURE__*/ _jsxQ("div", null, null, [ - "Arrow: ", - _wrapProp(v, "value") - ], 1, "arrow_" + idx)) - ] - }, null, 1, "u6_0"); + return /*#__PURE__*/ _jsxQ(_Fragment, null, null, [ + /*#__PURE__*/ _jsxQ("button", null, { + onClick$: /*#__PURE__*/ qrl(()=>import("./test_component__fragment_button_onclick_p2zpf6rl1l8"), "test_component__Fragment_button_onClick_p2zPf6rl1L8", [ + store + ]) + }, "+1", 3, null), + store.map(function(v, idx) { + return /*#__PURE__*/ _jsxQ("div", null, null, [ + "Function: ", + _wrapProp(v, "value") + ], 1, "fn_" + idx); + }), + store.map((v, idx)=>/*#__PURE__*/ _jsxQ("div", null, null, [ + "Arrow: ", + _wrapProp(v, "value") + ], 1, "arrow_" + idx)) + ], 1, "u6_0"); }; -Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;;0CAGkC,IAAM;IAChC,MAAM,QAAQ,SAAS;QAAC;YAAE,OAAO;QAAE;KAAE;IACrC,qBACI;;0BACA,MAAC;gBAAO,QAAQ;;;eAA0B;YACzC,MAAM,GAAG,CAAC,SAAU,CAAC,EAAE,GAAG,EAAE;gBACzB,qBAAO,MAAC;oBAAsB;8BAAW;sBAAxB,QAAQ;YAC7B;YACC,MAAM,GAAG,CAAC,CAAC,GAAG,oBACX,MAAC;oBAAyB;8BAAQ;sBAAxB,WAAW;;;AAI7B\"}") +Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;;;;0CAGkC,IAAM;IAChC,MAAM,QAAQ,SAAS;QAAC;YAAE,OAAO;QAAE;KAAE;IACrC,qBACI;sBACA,MAAC;YAAO,QAAQ;;;WAA0B;QACzC,MAAM,GAAG,CAAC,SAAU,CAAC,EAAE,GAAG,EAAE;YACzB,qBAAO,MAAC;gBAAsB;0BAAW;kBAAxB,QAAQ;QAC7B;QACC,MAAM,GAAG,CAAC,CAAC,GAAG,oBACX,MAAC;gBAAyB;0BAAQ;kBAAxB,WAAW;;AAI7B\"}") /* { "origin": "test.tsx", diff --git a/packages/qwik/src/optimizer/core/src/transform.rs b/packages/qwik/src/optimizer/core/src/transform.rs index 2537ec1ba27..e4340e85fa9 100644 --- a/packages/qwik/src/optimizer/core/src/transform.rs +++ b/packages/qwik/src/optimizer/core/src/transform.rs @@ -795,6 +795,7 @@ impl<'a> QwikTransform<'a> { o } + // swc react creates `h(type, propsWithOptionalChildren, key)` and we transform that here fn handle_jsx(&mut self, mut node: ast::CallExpr) -> ast::CallExpr { let node_type = node.args.remove(0); let node_props = node.args.remove(0); @@ -818,7 +819,7 @@ impl<'a> QwikTransform<'a> { let should_emit_key = is_fn || self.root_jsx_mode; self.root_jsx_mode = false; - let (has_spread_props, var_props, const_props, children, flags) = + let (has_dynamic_children, var_props, const_props, children, flags) = self.handle_jsx_props_obj(node_props, is_fn, is_text_only); let key = if node.args.len() == 1 { @@ -839,7 +840,7 @@ impl<'a> QwikTransform<'a> { }; // TODO use _restProps or similar to remove const props from spread props - let (jsx_func, mut args) = if is_fn || has_spread_props { + let (jsx_func, mut args) = if has_dynamic_children { ( self.ensure_core_import(&_JSX_C), vec![node_type, var_props, const_props, flags, key], @@ -1118,6 +1119,7 @@ impl<'a> QwikTransform<'a> { node } + /// Splits the props object into variable and constant props fn handle_jsx_props_obj( &mut self, expr: ast::ExprOrSpread, @@ -1130,7 +1132,7 @@ impl<'a> QwikTransform<'a> { ast::ExprOrSpread, ast::ExprOrSpread, ) { - let (has_spread_props, var_props_raw, const_props_raw, children, flags) = + let (has_dynamic_children, var_props_raw, const_props_raw, children, flags) = self.internal_handle_jsx_props_obj(expr, is_fn, is_text_only); let var_props = if var_props_raw.is_empty() { @@ -1174,7 +1176,13 @@ impl<'a> QwikTransform<'a> { raw: None, }))), }; - (has_spread_props, var_props, const_props, children, flags) + ( + has_dynamic_children, + var_props, + const_props, + children, + flags, + ) } #[allow(clippy::cognitive_complexity)] @@ -1215,13 +1223,14 @@ impl<'a> QwikTransform<'a> { .filter(|prop| !matches!(prop, ast::PropOrSpread::Prop(_))) .count(); let has_spread_props = spread_props_count > 0; + let mut has_dynamic_children = has_spread_props; let mut static_listeners = !has_spread_props; let mut static_subtree = !has_spread_props; for prop in object.props { let mut name_token = false; // If we have spread props, all the props that come before it are variable even if they're static - let maybe_static_props = if spread_props_count > 0 { + let maybe_const_props = if spread_props_count > 0 { &mut var_props } else { &mut const_props @@ -1247,6 +1256,7 @@ impl<'a> QwikTransform<'a> { let transformed_children = if let Some(new_children) = self.convert_children(&folded, &const_idents) { + // input, textarea etc if is_text_only { self.jsx_mutable = true; folded.fold_with(self) @@ -1261,7 +1271,8 @@ impl<'a> QwikTransform<'a> { } else { self.jsx_mutable = prev; } - if is_fn || spread_props_count > 0 { + if spread_props_count > 0 { + // e.g.
} {...props} /> // self.jsx_mutable = true; // static_subtree = false; var_props.push(ast::PropOrSpread::Prop(Box::new( @@ -1271,13 +1282,15 @@ impl<'a> QwikTransform<'a> { }), ))); } else { + has_dynamic_children = false; children = Some(transformed_children); } } else if !is_fn && key_word.starts_with("bind:") { - // + // TODO: move this into jsx runtime with an inline QRL + // right now we can't do it because qwik doesn't get checked for QRLs let folded = node.value.clone().fold_with(self); let prop_name: JsWord = key_word[5..].into(); - maybe_static_props.push(ast::PropOrSpread::Prop(Box::new( + maybe_const_props.push(ast::PropOrSpread::Prop(Box::new( ast::Prop::KeyValue(ast::KeyValueProp { key: ast::PropName::Str(ast::Str { span: DUMMY_SP, @@ -1379,7 +1392,7 @@ impl<'a> QwikTransform<'a> { )); if is_fn { if is_const { - maybe_static_props + maybe_const_props .push(converted_prop.fold_with(self)); } else { var_props.push(converted_prop.fold_with(self)); @@ -1389,7 +1402,7 @@ impl<'a> QwikTransform<'a> { event_handlers.push(converted_prop.fold_with(self)); } else { static_listeners = false; - maybe_static_props + maybe_const_props .push(converted_prop.fold_with(self)); } } @@ -1405,7 +1418,7 @@ impl<'a> QwikTransform<'a> { if is_fn || spread_props_count > 0 { if const_prop { - maybe_static_props.push(prop.fold_with(self)); + maybe_const_props.push(prop.fold_with(self)); } else { var_props.push(prop.fold_with(self)); } @@ -1418,7 +1431,7 @@ impl<'a> QwikTransform<'a> { &self.options.global_collect, Some(&const_idents), ) { - maybe_static_props.push(prop.fold_with(self)); + maybe_const_props.push(prop.fold_with(self)); } else if let Some((getter, is_const)) = self.convert_to_getter(&node.value) { @@ -1430,7 +1443,7 @@ impl<'a> QwikTransform<'a> { }), )); if is_fn || is_const { - maybe_static_props.push(entry); + maybe_const_props.push(entry); } else { var_props.push(entry); } @@ -1462,7 +1475,13 @@ impl<'a> QwikTransform<'a> { if static_subtree { flags |= 1 << 1; } - (has_spread_props, var_props, const_props, children, flags) + ( + has_dynamic_children, + var_props, + const_props, + children, + flags, + ) } _ => (true, vec![], vec![], None, 0), } diff --git a/packages/qwik/src/testing/api.md b/packages/qwik/src/testing/api.md index 63e78fc8599..75ed52705b3 100644 --- a/packages/qwik/src/testing/api.md +++ b/packages/qwik/src/testing/api.md @@ -9,7 +9,7 @@ import { RenderResult } from '@builder.io/qwik'; // @public export const createDOM: ({ html }?: { - html?: string | undefined; + html?: string; }) => Promise<{ render: (jsxElement: JSXOutput) => Promise; screen: HTMLElement;