@vue-jsx-vapor/compiler 2.6.1 → 2.6.3

package/dist/index.cjs

@@ -1412,12 +1412,13 @@ function genTemplates(templates, rootIndex, { helper }) {
 }
 function genSelf(dynamic, context) {
 	const [frag, push] = buildCodeFragment();
-	const { id, template, operation } = dynamic;
+	const { id, template, operation, hasDynamicChild } = dynamic;
 	if (id !== void 0 && template !== void 0) {
 		push(NEWLINE, `const n${id} = t${template}()`);
 		push(...genDirectivesForElement(id, context));
 	}
 	if (operation) push(...genOperationWithInsertionState(operation, context));
+	if (hasDynamicChild) push(...genChildren(dynamic, context, push, `n${id}`));
 	return frag;
 }
 function genChildren(dynamic, context, pushBlock, from = `n${dynamic.id}`) {
@@ -1426,7 +1427,6 @@ function genChildren(dynamic, context, pushBlock, from = `n${dynamic.id}`) {
 	const { children } = dynamic;
 	let offset = 0;
 	let prev;
-	const childrenToGen = [];
 	for (const [index, child] of children.entries()) {
 		if (child.flags & DynamicFlag.NON_TEMPLATE) offset--;
 		const id = child.flags & DynamicFlag.REFERENCED ? child.flags & DynamicFlag.INSERT ? child.anchor : child.id : void 0;
@@ -1446,12 +1446,11 @@ function genChildren(dynamic, context, pushBlock, from = `n${dynamic.id}`) {
 			else if (elementIndex > 1) init = genCall(helper("nthChild"), from, String(elementIndex));
 			pushBlock(...init);
 		}
-		if (id === child.anchor) push(...genSelf(child, context));
+		if (id === child.anchor && !child.hasDynamicChild) push(...genSelf(child, context));
 		if (id !== void 0) push(...genDirectivesForElement(id, context));
 		prev = [variable, elementIndex];
-		childrenToGen.push([child, variable]);
+		push(...genChildren(child, context, pushBlock, variable));
 	}
-	if (childrenToGen.length) for (const [child, from$1] of childrenToGen) push(...genChildren(child, context, pushBlock, from$1));
 	return frag;
 }
 
@@ -1483,7 +1482,7 @@ function genBlockContent(block, context, root, genEffectsExtraFrag) {
 		genResolveAssets("directive", "resolveDirective");
 	}
 	for (const child of dynamic.children) push(...genSelf(child, context));
-	for (const child of dynamic.children) push(...genChildren(child, context, push, `n${child.id}`));
+	for (const child of dynamic.children) if (!child.hasDynamicChild) push(...genChildren(child, context, push, `n${child.id}`));
 	push(...genOperations(operation, context));
 	push(...genEffects(effect, context, genEffectsExtraFrag));
 	push(NEWLINE, `return `);
@@ -1573,6 +1572,7 @@ function generate(ir, options = {}) {
 //#endregion
 //#region src/transform.ts
 const defaultOptions = {
+	source: "",
 	filename: "",
 	hoistStatic: false,
 	hmr: false,
@@ -1590,6 +1590,7 @@ const defaultOptions = {
 	inSSR: false,
 	ssrCssVars: ``,
 	isTS: false,
+	withFallback: false,
 	onError: __vue_compiler_dom.defaultOnError,
 	onWarn: __vue_compiler_dom.defaultOnWarn
 };
@@ -1807,20 +1808,13 @@ const transformElement = (node, context) => {
 	};
 };
 function transformComponentElement(tag, propsResult, singleRoot, context) {
-	let asset = true;
-	const fromSetup = tag;
-	if (fromSetup) {
-		tag = fromSetup;
-		asset = false;
-	}
+	let asset = context.options.withFallback;
 	const dotIndex = tag.indexOf(".");
 	if (dotIndex > 0) {
 		const ns = tag.slice(0, dotIndex);
-		if (ns) {
-			tag = ns + tag.slice(dotIndex);
-			asset = false;
-		}
+		if (ns) tag = ns + tag.slice(dotIndex);
 	}
+	if (tag.includes("-")) asset = true;
 	if (asset) context.component.add(tag);
 	context.dynamic.flags |= DynamicFlag.NON_TEMPLATE | DynamicFlag.INSERT;
 	context.dynamic.operation = {

package/dist/index.d.cts

@@ -17,7 +17,13 @@ interface DirectiveTransformResult {
 }
 type StructuralDirectiveTransform = (node: JSXElement, dir: JSXAttribute, context: TransformContext) => void | (() => void);
 type TransformOptions = HackOptions<TransformOptions$1> & {
+  source?: string;
   templates?: string[];
+  /**
+   * Compile JSX Component to createComponentWithFallback.
+   * @default false
+   */
+  withFallback?: boolean;
 };
 declare class TransformContext<T extends BlockIRNode['node'] = BlockIRNode['node']> {
   ir: RootIRNode;
@@ -370,10 +376,7 @@ declare function generate(ir: RootIRNode, options?: CodegenOptions): VaporCodege
 //#endregion
 //#region src/compile.d.ts
 declare function compile(source: JSXElement | JSXFragment | string, options?: CompilerOptions): VaporCodegenResult;
-type CompilerOptions = HackOptions<CompilerOptions$1> & {
-  source?: string;
-  templates?: string[];
-};
+type CompilerOptions = HackOptions<CompilerOptions$1> & TransformOptions;
 type TransformPreset = [NodeTransform[], Record<string, DirectiveTransform>];
 //#endregion
 //#region src/transforms/transformText.d.ts

package/dist/index.d.ts

@@ -17,7 +17,13 @@ interface DirectiveTransformResult {
 }
 type StructuralDirectiveTransform = (node: JSXElement, dir: JSXAttribute, context: TransformContext) => void | (() => void);
 type TransformOptions = HackOptions<TransformOptions$1> & {
+  source?: string;
   templates?: string[];
+  /**
+   * Compile JSX Component to createComponentWithFallback.
+   * @default false
+   */
+  withFallback?: boolean;
 };
 declare class TransformContext<T extends BlockIRNode['node'] = BlockIRNode['node']> {
   ir: RootIRNode;
@@ -370,10 +376,7 @@ declare function generate(ir: RootIRNode, options?: CodegenOptions): VaporCodege
 //#endregion
 //#region src/compile.d.ts
 declare function compile(source: JSXElement | JSXFragment | string, options?: CompilerOptions): VaporCodegenResult;
-type CompilerOptions = HackOptions<CompilerOptions$1> & {
-  source?: string;
-  templates?: string[];
-};
+type CompilerOptions = HackOptions<CompilerOptions$1> & TransformOptions;
 type TransformPreset = [NodeTransform[], Record<string, DirectiveTransform>];
 //#endregion
 //#region src/transforms/transformText.d.ts

package/dist/index.js

@@ -1389,12 +1389,13 @@ function genTemplates(templates, rootIndex, { helper }) {
 }
 function genSelf(dynamic, context) {
 	const [frag, push] = buildCodeFragment();
-	const { id, template, operation } = dynamic;
+	const { id, template, operation, hasDynamicChild } = dynamic;
 	if (id !== void 0 && template !== void 0) {
 		push(NEWLINE, `const n${id} = t${template}()`);
 		push(...genDirectivesForElement(id, context));
 	}
 	if (operation) push(...genOperationWithInsertionState(operation, context));
+	if (hasDynamicChild) push(...genChildren(dynamic, context, push, `n${id}`));
 	return frag;
 }
 function genChildren(dynamic, context, pushBlock, from = `n${dynamic.id}`) {
@@ -1403,7 +1404,6 @@ function genChildren(dynamic, context, pushBlock, from = `n${dynamic.id}`) {
 	const { children } = dynamic;
 	let offset = 0;
 	let prev;
-	const childrenToGen = [];
 	for (const [index, child] of children.entries()) {
 		if (child.flags & DynamicFlag.NON_TEMPLATE) offset--;
 		const id = child.flags & DynamicFlag.REFERENCED ? child.flags & DynamicFlag.INSERT ? child.anchor : child.id : void 0;
@@ -1423,12 +1423,11 @@ function genChildren(dynamic, context, pushBlock, from = `n${dynamic.id}`) {
 			else if (elementIndex > 1) init = genCall(helper("nthChild"), from, String(elementIndex));
 			pushBlock(...init);
 		}
-		if (id === child.anchor) push(...genSelf(child, context));
+		if (id === child.anchor && !child.hasDynamicChild) push(...genSelf(child, context));
 		if (id !== void 0) push(...genDirectivesForElement(id, context));
 		prev = [variable, elementIndex];
-		childrenToGen.push([child, variable]);
+		push(...genChildren(child, context, pushBlock, variable));
 	}
-	if (childrenToGen.length) for (const [child, from$1] of childrenToGen) push(...genChildren(child, context, pushBlock, from$1));
 	return frag;
 }
 
@@ -1460,7 +1459,7 @@ function genBlockContent(block, context, root, genEffectsExtraFrag) {
 		genResolveAssets("directive", "resolveDirective");
 	}
 	for (const child of dynamic.children) push(...genSelf(child, context));
-	for (const child of dynamic.children) push(...genChildren(child, context, push, `n${child.id}`));
+	for (const child of dynamic.children) if (!child.hasDynamicChild) push(...genChildren(child, context, push, `n${child.id}`));
 	push(...genOperations(operation, context));
 	push(...genEffects(effect, context, genEffectsExtraFrag));
 	push(NEWLINE, `return `);
@@ -1550,6 +1549,7 @@ function generate(ir, options = {}) {
 //#endregion
 //#region src/transform.ts
 const defaultOptions = {
+	source: "",
 	filename: "",
 	hoistStatic: false,
 	hmr: false,
@@ -1567,6 +1567,7 @@ const defaultOptions = {
 	inSSR: false,
 	ssrCssVars: ``,
 	isTS: false,
+	withFallback: false,
 	onError: defaultOnError,
 	onWarn: defaultOnWarn
 };
@@ -1784,20 +1785,13 @@ const transformElement = (node, context) => {
 	};
 };
 function transformComponentElement(tag, propsResult, singleRoot, context) {
-	let asset = true;
-	const fromSetup = tag;
-	if (fromSetup) {
-		tag = fromSetup;
-		asset = false;
-	}
+	let asset = context.options.withFallback;
 	const dotIndex = tag.indexOf(".");
 	if (dotIndex > 0) {
 		const ns = tag.slice(0, dotIndex);
-		if (ns) {
-			tag = ns + tag.slice(dotIndex);
-			asset = false;
-		}
+		if (ns) tag = ns + tag.slice(dotIndex);
 	}
+	if (tag.includes("-")) asset = true;
 	if (asset) context.component.add(tag);
 	context.dynamic.flags |= DynamicFlag.NON_TEMPLATE | DynamicFlag.INSERT;
 	context.dynamic.operation = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/compiler",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "Vue JSX Vapor Compiler",
   "type": "module",
   "keywords": [
@@ -34,11 +34,11 @@
     "./*": "./*"
   },
   "dependencies": {
-    "@babel/parser": "^7.28.0",
-    "@babel/types": "^7.28.0",
+    "@babel/parser": "^7.28.4",
+    "@babel/types": "^7.28.4",
     "@vue/compiler-dom": "3.6.0-alpha.2",
     "@vue/shared": "3.6.0-alpha.2",
-    "ast-kit": "^2.1.1",
+    "ast-kit": "^2.1.2",
     "source-map-js": "^1.2.1"
   },
   "scripts": {