@pyreon/compiler 0.12.5 → 0.12.7

package/lib/analysis/index.js.html

@@ -5386,7 +5386,7 @@ var drawChart = (function (exports) {
   </script>
   <script>
     /*<!--*/
-    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.js","children":[{"name":"src","children":[{"uid":"c92f44a6-1","name":"jsx.ts"},{"uid":"c92f44a6-3","name":"project-scanner.ts"},{"uid":"c92f44a6-5","name":"react-intercept.ts"},{"uid":"c92f44a6-7","name":"index.ts"}]}]}],"isRoot":true},"nodeParts":{"c92f44a6-1":{"renderedLength":28290,"gzipLength":7871,"brotliLength":0,"metaUid":"c92f44a6-0"},"c92f44a6-3":{"renderedLength":4762,"gzipLength":1730,"brotliLength":0,"metaUid":"c92f44a6-2"},"c92f44a6-5":{"renderedLength":27692,"gzipLength":6920,"brotliLength":0,"metaUid":"c92f44a6-4"},"c92f44a6-7":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"metaUid":"c92f44a6-6"}},"nodeMetas":{"c92f44a6-0":{"id":"/src/jsx.ts","moduleParts":{"index.js":"c92f44a6-1"},"imported":[{"uid":"c92f44a6-8"}],"importedBy":[{"uid":"c92f44a6-6"}]},"c92f44a6-2":{"id":"/src/project-scanner.ts","moduleParts":{"index.js":"c92f44a6-3"},"imported":[{"uid":"c92f44a6-9"},{"uid":"c92f44a6-10"}],"importedBy":[{"uid":"c92f44a6-6"}]},"c92f44a6-4":{"id":"/src/react-intercept.ts","moduleParts":{"index.js":"c92f44a6-5"},"imported":[{"uid":"c92f44a6-8"}],"importedBy":[{"uid":"c92f44a6-6"}]},"c92f44a6-6":{"id":"/src/index.ts","moduleParts":{"index.js":"c92f44a6-7"},"imported":[{"uid":"c92f44a6-0"},{"uid":"c92f44a6-2"},{"uid":"c92f44a6-4"}],"importedBy":[],"isEntry":true},"c92f44a6-8":{"id":"typescript","moduleParts":{},"imported":[],"importedBy":[{"uid":"c92f44a6-0"},{"uid":"c92f44a6-4"}]},"c92f44a6-9":{"id":"node:fs","moduleParts":{},"imported":[],"importedBy":[{"uid":"c92f44a6-2"}]},"c92f44a6-10":{"id":"node:path","moduleParts":{},"imported":[],"importedBy":[{"uid":"c92f44a6-2"}]}},"env":{"rollup":"4.23.0"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
+    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.js","children":[{"name":"src","children":[{"uid":"5e8656db-1","name":"jsx.ts"},{"uid":"5e8656db-3","name":"project-scanner.ts"},{"uid":"5e8656db-5","name":"react-intercept.ts"},{"uid":"5e8656db-7","name":"index.ts"}]}]}],"isRoot":true},"nodeParts":{"5e8656db-1":{"renderedLength":34317,"gzipLength":9205,"brotliLength":0,"metaUid":"5e8656db-0"},"5e8656db-3":{"renderedLength":4762,"gzipLength":1730,"brotliLength":0,"metaUid":"5e8656db-2"},"5e8656db-5":{"renderedLength":27692,"gzipLength":6920,"brotliLength":0,"metaUid":"5e8656db-4"},"5e8656db-7":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"metaUid":"5e8656db-6"}},"nodeMetas":{"5e8656db-0":{"id":"/src/jsx.ts","moduleParts":{"index.js":"5e8656db-1"},"imported":[{"uid":"5e8656db-8"}],"importedBy":[{"uid":"5e8656db-6"}]},"5e8656db-2":{"id":"/src/project-scanner.ts","moduleParts":{"index.js":"5e8656db-3"},"imported":[{"uid":"5e8656db-9"},{"uid":"5e8656db-10"}],"importedBy":[{"uid":"5e8656db-6"}]},"5e8656db-4":{"id":"/src/react-intercept.ts","moduleParts":{"index.js":"5e8656db-5"},"imported":[{"uid":"5e8656db-8"}],"importedBy":[{"uid":"5e8656db-6"}]},"5e8656db-6":{"id":"/src/index.ts","moduleParts":{"index.js":"5e8656db-7"},"imported":[{"uid":"5e8656db-0"},{"uid":"5e8656db-2"},{"uid":"5e8656db-4"}],"importedBy":[],"isEntry":true},"5e8656db-8":{"id":"typescript","moduleParts":{},"imported":[],"importedBy":[{"uid":"5e8656db-0"},{"uid":"5e8656db-4"}]},"5e8656db-9":{"id":"node:fs","moduleParts":{},"imported":[],"importedBy":[{"uid":"5e8656db-2"}]},"5e8656db-10":{"id":"node:path","moduleParts":{},"imported":[],"importedBy":[{"uid":"5e8656db-2"}]}},"env":{"rollup":"4.23.0"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;

package/lib/index.js

@@ -105,10 +105,11 @@ function transformJSX(code, filename = "input.tsx") {
 	function wrap(expr) {
 		const start = expr.getStart(sf);
 		const end = expr.getEnd();
+		const exprText = inlineVarsInText(code.slice(start, end));
 		replacements.push({
 			start,
 			end,
-			text: `() => ${code.slice(start, end)}`
+			text: `() => ${exprText}`
 		});
 	}
 	/** Try to hoist or wrap an expression, pushing a replacement if needed. */
@@ -179,7 +180,7 @@ function transformJSX(code, filename = "input.tsx") {
 				replacements.push({
 					start,
 					end,
-					text: `_rp(() => ${code.slice(start, end)})`
+					text: `_rp(() => ${inlineVarsInText(code.slice(start, end))})`
 				});
 				needsRpImport = true;
 			}
@@ -204,6 +205,161 @@ function transformJSX(code, filename = "input.tsx") {
 		}
 		ts.forEachChild(expr, walk);
 	}
+	/** Names that refer to the props object or splitProps results. */
+	const propsNames = /* @__PURE__ */ new Set();
+	/** Map of variable name → source text of the original expression. */
+	const propDerivedVars = /* @__PURE__ */ new Map();
+	/** Check if an expression reads from a tracked props-like object. */
+	function readsFromProps(node) {
+		if (ts.isPropertyAccessExpression(node) && ts.isIdentifier(node.expression)) return propsNames.has(node.expression.text);
+		if (ts.isElementAccessExpression(node) && ts.isIdentifier(node.expression)) return propsNames.has(node.expression.text);
+		let found = false;
+		ts.forEachChild(node, (child) => {
+			if (found) return;
+			if (readsFromProps(child)) found = true;
+		});
+		return found;
+	}
+	/** Pre-pass: scan a function body for prop-derived variable declarations.
+	*  callbackDepth tracks nesting inside callback arguments (map, filter, etc.)
+	*  to avoid tracking variables declared inside callbacks as prop-derived. */
+	let _callbackDepth = 0;
+	function scanForPropDerivedVars(node) {
+		if (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) {
+			const parent = node.parent;
+			if (parent && ts.isCallExpression(parent) && parent.arguments.includes(node)) {
+				_callbackDepth++;
+				ts.forEachChild(node, scanForPropDerivedVars);
+				_callbackDepth--;
+				return;
+			}
+		}
+		if ((ts.isFunctionDeclaration(node) || ts.isArrowFunction(node) || ts.isFunctionExpression(node)) && node.parameters.length > 0) {
+			const parent = node.parent;
+			if (parent && ts.isCallExpression(parent) && parent.arguments.includes(node)) {
+				ts.forEachChild(node, scanForPropDerivedVars);
+				return;
+			}
+			const firstParam = node.parameters[0];
+			if (ts.isIdentifier(firstParam.name)) {
+				let hasJSX = false;
+				ts.forEachChild(node, function checkJSX(n) {
+					if (hasJSX) return;
+					if (ts.isJsxElement(n) || ts.isJsxSelfClosingElement(n) || ts.isJsxFragment(n)) {
+						hasJSX = true;
+						return;
+					}
+					ts.forEachChild(n, checkJSX);
+				});
+				if (hasJSX) propsNames.add(firstParam.name.text);
+			}
+		}
+		if (ts.isVariableStatement(node)) for (const decl of node.declarationList.declarations) {
+			if (ts.isArrayBindingPattern(decl.name) && decl.initializer && ts.isCallExpression(decl.initializer)) {
+				const callee = decl.initializer.expression;
+				if (ts.isIdentifier(callee) && callee.text === "splitProps") {
+					for (const el of decl.name.elements) if (ts.isBindingElement(el) && ts.isIdentifier(el.name)) propsNames.add(el.name.text);
+				}
+			}
+			if (!(node.declarationList.flags & ts.NodeFlags.Const)) continue;
+			if (_callbackDepth > 0) continue;
+			if (ts.isIdentifier(decl.name) && decl.initializer) {
+				if (readsFromProps(decl.initializer)) {
+					const varName = decl.name.text;
+					const exprText = code.slice(decl.initializer.getStart(sf), decl.initializer.getEnd());
+					propDerivedVars.set(varName, exprText);
+				}
+			}
+		}
+		ts.forEachChild(node, scanForPropDerivedVars);
+	}
+	scanForPropDerivedVars(sf);
+	let changed = true;
+	while (changed) {
+		changed = false;
+		sf.forEachChild(function scanTransitive(node) {
+			if (!ts.isVariableStatement(node)) {
+				ts.forEachChild(node, scanTransitive);
+				return;
+			}
+			for (const decl of node.declarationList.declarations) {
+				if (!ts.isIdentifier(decl.name) || !decl.initializer) continue;
+				const varName = decl.name.text;
+				if (propDerivedVars.has(varName)) continue;
+				if (node.declarationList.flags & ts.NodeFlags.Let) continue;
+				let usesPropVar = false;
+				ts.forEachChild(decl.initializer, function check(n) {
+					if (usesPropVar) return;
+					if (ts.isIdentifier(n) && propDerivedVars.has(n.text)) {
+						const parent = n.parent;
+						if (parent && ts.isPropertyAccessExpression(parent) && parent.name === n) return;
+						usesPropVar = true;
+					}
+					ts.forEachChild(n, check);
+				});
+				if (usesPropVar) {
+					const exprText = code.slice(decl.initializer.getStart(sf), decl.initializer.getEnd());
+					propDerivedVars.set(varName, exprText);
+					changed = true;
+				}
+			}
+		});
+	}
+	for (const [varName, expr] of propDerivedVars) {
+		let resolved = expr;
+		for (const [depName, depExpr] of propDerivedVars) {
+			if (depName === varName) continue;
+			const re = new RegExp(`(?<![.\\w])${depName}(?![\\w:=])`, "g");
+			if (re.test(resolved)) resolved = resolved.replace(re, `(${depExpr})`);
+		}
+		if (resolved !== expr) propDerivedVars.set(varName, resolved);
+	}
+	/**
+	* Enhanced dynamic check — combines containsCall with props awareness.
+	* Returns true if an expression is reactive (contains signal calls,
+	* accesses props members, or references prop-derived variables).
+	*/
+	/**
+	* Replace prop-derived variable names in a source text with their original expressions.
+	* Simple regex-based replacement — safe because variable names are identifiers.
+	*/
+	function inlineVarsInText(text) {
+		if (propDerivedVars.size === 0) return text;
+		let result = text;
+		for (const [varName, expr] of propDerivedVars) {
+			const re = new RegExp(`(?<![.\\w])${varName}(?![\\w:=])`, "g");
+			result = result.replace(re, `(${expr})`);
+		}
+		return result;
+	}
+	function isDynamic(node) {
+		if (containsCall(node)) return true;
+		return accessesProps(node);
+	}
+	/** Check if an expression accesses a tracked props object or a prop-derived variable. */
+	function accessesProps(node) {
+		if (ts.isPropertyAccessExpression(node) && ts.isIdentifier(node.expression)) {
+			if (propsNames.has(node.expression.text)) return true;
+		}
+		if (ts.isIdentifier(node) && propDerivedVars.has(node.text)) {
+			const parent = node.parent;
+			if (parent && ts.isPropertyAccessExpression(parent) && parent.name === node) return false;
+			return true;
+		}
+		let found = false;
+		ts.forEachChild(node, (child) => {
+			if (found) return;
+			if (ts.isArrowFunction(child) || ts.isFunctionExpression(child)) return;
+			if (accessesProps(child)) found = true;
+		});
+		return found;
+	}
+	function shouldWrap(node) {
+		if (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) return false;
+		if (isStatic(node)) return false;
+		if (ts.isCallExpression(node) && isPureStaticCall(node)) return false;
+		return isDynamic(node);
+	}
 	function walk(node) {
 		if (ts.isJsxElement(node) && tryTemplateEmit(node)) return;
 		if (ts.isJsxSelfClosingElement(node) || ts.isJsxElement(node)) checkForWarnings(node);
@@ -387,7 +543,7 @@ function transformJSX(code, filename = "input.tsx") {
 			};
 			return {
 				expr: sliceExpr(exprNode),
-				isReactive: containsCall(exprNode)
+				isReactive: isDynamic(exprNode)
 			};
 		}
 		/** Build a setter expression for an attribute. */
@@ -448,7 +604,7 @@ function transformJSX(code, filename = "input.tsx") {
 			if (ts.isJsxSpreadAttribute(attr)) {
 				const expr = sliceExpr(attr.expression);
 				needsApplyPropsImport = true;
-				if (containsCall(attr.expression)) reactiveBindExprs.push(`_applyProps(${varName}, ${expr})`);
+				if (isDynamic(attr.expression)) reactiveBindExprs.push(`_applyProps(${varName}, ${expr})`);
 				else bindLines.push(`_applyProps(${varName}, ${expr})`);
 				return "";
 			}
@@ -478,7 +634,7 @@ function transformJSX(code, filename = "input.tsx") {
 			} else {
 				needsBindImportGlobal = true;
 				const d = nextDisp();
-				bindLines.push(`const ${d} = _bind(() => { ${tVar}.data = ${expr} })`);
+				bindLines.push(`const ${d} = _bind(() => { ${tVar}.data = ${inlineVarsInText(expr)} })`);
 			}
 			return needsPlaceholder ? "<!>" : "";
 		}
@@ -543,7 +699,7 @@ function transformJSX(code, filename = "input.tsx") {
 		if (reactiveBindExprs.length > 0) {
 			needsBindImportGlobal = true;
 			const combinedName = nextDisp();
-			const combinedBody = reactiveBindExprs.join("; ");
+			const combinedBody = reactiveBindExprs.map(inlineVarsInText).join("; ");
 			bindLines.push(`const ${combinedName} = _bind(() => { ${combinedBody} })`);
 		}
 		if (bindLines.length === 0 && disposerNames.length === 0) return `_tpl("${escaped}", () => null)`;
@@ -740,12 +896,6 @@ function isPureStaticCall(node) {
 	if (!PURE_CALLS.has(name)) return false;
 	return node.arguments.every((arg) => !ts.isSpreadElement(arg) && isStatic(arg));
 }
-function shouldWrap(node) {
-	if (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) return false;
-	if (isStatic(node)) return false;
-	if (ts.isCallExpression(node) && isPureStaticCall(node)) return false;
-	return containsCall(node);
-}
 function containsCall(node) {
 	if (ts.isCallExpression(node)) {
 		if (isPureStaticCall(node)) return false;