@geajs/vite-plugin 1.2.1 → 1.2.3

package/dist/index.mjs

@@ -3,7 +3,7 @@ import _generate from "@babel/generator";
 import * as t from "@babel/types";
 import { parse } from "@babel/parser";
 import { appendToBody, id, js, jsAll, jsBlockBody, jsClassProp, jsExpr, jsImport, jsMethod, jsObjectExpr, jsPrivateProp, num, str, tpl } from "eszter";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { dirname, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 //#region src/utils/babel-interop.ts
@@ -281,6 +281,9 @@ const GEA_COMPILER_SYMBOL_IMPORTS = [
 	"GEA_MAP_CONFIG_COUNT",
 	"GEA_CLONE_ITEM",
 	"GEA_CLONE_TEMPLATE",
+	"GEA_COMPILED",
+	"GEA_EVENTS_CACHE",
+	"GEA_LIFECYCLE_CALLED",
 	"GEA_ON_PROP_CHANGE",
 	"GEA_SETUP_LOCAL_STATE_OBSERVERS",
 	"GEA_SETUP_REFS",
@@ -4490,7 +4493,7 @@ function wrapEventsGetterWithCache(getter) {
 	const body = getter.body.body;
 	const returnStmt = body.find((s) => t.isReturnStatement(s) && s.argument !== null);
 	if (!returnStmt?.argument) return;
-	const cachedProp = t.memberExpression(t.thisExpression(), t.identifier("__evts"));
+	const cachedProp = t.memberExpression(t.thisExpression(), t.identifier("GEA_EVENTS_CACHE"), true);
 	const elementProp = t.memberExpression(t.thisExpression(), id("GEA_ELEMENT"), true);
 	const tmpId = t.identifier("__geaEvtsResult");
 	const objectExpr = returnStmt.argument;
@@ -9618,6 +9621,9 @@ function transformComponentFile(ast, imports, storeImports, className, sourceFil
 			if (name === "events" && member.kind === "get") wrapEventsGetterWithCache(member);
 			if (member.computed && name === "GEA_ON_PROP_CHANGE") wrapSubpathCacheGuards(member, subpathPcCounter, path.node.body);
 		}
+		const compiledProp = t.classProperty(t.identifier("GEA_COMPILED"), t.booleanLiteral(true), void 0, void 0, true, true);
+		path.node.body.body.push(compiledProp);
+		injectLifecycleCallsIntoConstructor(path.node.body);
 		path.stop();
 	} });
 	return transformed;
@@ -9712,6 +9718,36 @@ function transformRemainingJSX(ast, imports) {
 		}
 	});
 }
+function injectLifecycleCallsIntoConstructor(classBody) {
+	const createdCall = js`this.created(this.props);`;
+	const createdHooksCall = js`this.createdHooks(this.props);`;
+	const setupObserversAccess = t.memberExpression(t.thisExpression(), t.identifier("GEA_SETUP_LOCAL_STATE_OBSERVERS"), true);
+	const setupObserversCall = t.ifStatement(t.binaryExpression("===", t.unaryExpression("typeof", setupObserversAccess), t.stringLiteral("function")), t.expressionStatement(t.callExpression(setupObserversAccess, [])));
+	const lifecycleCalledAccess = t.memberExpression(t.thisExpression(), t.identifier("GEA_LIFECYCLE_CALLED"), true);
+	const setLifecycleCalled = t.expressionStatement(t.assignmentExpression("=", t.cloneNode(lifecycleCalledAccess), t.booleanLiteral(true)));
+	const guardedBlock = t.ifStatement(t.unaryExpression("!", lifecycleCalledAccess), t.blockStatement([
+		setLifecycleCalled,
+		createdCall,
+		createdHooksCall,
+		setupObserversCall
+	]));
+	const ctor = classBody.body.find((m) => t.isClassMethod(m) && (m.kind === "constructor" || t.isIdentifier(m.key) && m.key.name === "constructor"));
+	if (ctor) {
+		let superIdx = -1;
+		for (let i = 0; i < ctor.body.body.length; i++) {
+			const s = ctor.body.body[i];
+			if (t.isExpressionStatement(s) && t.isCallExpression(s.expression) && t.isSuper(s.expression.callee)) {
+				superIdx = i;
+				break;
+			}
+		}
+		if (superIdx >= 0) ctor.body.body.splice(superIdx + 1, 0, guardedBlock);
+		else ctor.body.body.unshift(guardedBlock);
+	} else {
+		const newCtor = appendToBody(jsMethod`${id("constructor")}(...args) {}`, js`super(...args);`, guardedBlock);
+		classBody.body.unshift(newCtor);
+	}
+}
 //#endregion
 //#region src/postprocess/hmr.ts
 const hot = () => t.memberExpression(t.metaProperty(t.identifier("import"), t.identifier("meta")), t.identifier("hot"));
@@ -9726,39 +9762,41 @@ const legacyShouldProxyDep = (p) => /\.(js|ts)$/.test(p) && !p.match(/(store|sta
 * Returns `true` when HMR code was added, `false` otherwise (no component
 * class, or the file contains a `gea-auto-register plugin` comment).
 */
-function injectHMR(ast, componentClassName, componentImports, componentImportsUsedAsTags, isDefaultExport, hmrImportSource = "virtual:gea-hmr", shouldProxyDep) {
+function injectHMR(ast, componentClassNames, defaultExportClassName, componentImports, componentImportsUsedAsTags, hmrImportSource = "virtual:gea-hmr", shouldProxyDep, shouldSkipDepAccept) {
 	if (hasAutoRegisterComment(ast)) return false;
+	if (componentClassNames.length === 0) return false;
 	const hmrStmts = [];
-	if (componentClassName) {
-		ensureImport(ast, hmrImportSource, "handleComponentUpdate");
-		ensureImport(ast, hmrImportSource, "registerHotModule");
-		ensureImport(ast, hmrImportSource, "registerComponentInstance");
-		ensureImport(ast, hmrImportSource, "unregisterComponentInstance");
-		const proxyDep = shouldProxyDep ?? legacyShouldProxyDep;
-		if (rewriteComponentDeps(ast, componentImports, proxyDep).length > 0) ensureImport(ast, hmrImportSource, "createHotComponentProxy");
-		const modExports = isDefaultExport ? t.objectExpression([t.objectProperty(t.identifier("default"), t.identifier(componentClassName))]) : t.objectExpression([t.objectProperty(t.identifier(componentClassName), t.identifier(componentClassName), false, true)]);
-		hmrStmts.push(js`const __moduleExports = ${modExports};`);
-		hmrStmts.push(js`registerHotModule(${jsExpr`${importMeta()}.url`}, __moduleExports);`);
-		hmrStmts.push(js`
-      ${hot()}.accept((newModule) => {
-        const __updatedModule = newModule || __moduleExports;
-        registerHotModule(${jsExpr`${importMeta()}.url`}, __updatedModule);
-        handleComponentUpdate(${jsExpr`${importMeta()}.url`}, __updatedModule);
-      });
-    `);
-		hmrStmts.push(...createAccepts(componentImports, proxyDep));
-		hmrStmts.push(js`const __origCreated = ${id(componentClassName)}.prototype.created;`);
-		hmrStmts.push(js`${id(componentClassName)}.prototype.created = function(__geaProps) {
+	ensureImport(ast, hmrImportSource, "handleComponentUpdate");
+	ensureImport(ast, hmrImportSource, "registerHotModule");
+	ensureImport(ast, hmrImportSource, "registerComponentInstance");
+	ensureImport(ast, hmrImportSource, "unregisterComponentInstance");
+	const proxyDep = shouldProxyDep ?? legacyShouldProxyDep;
+	if (rewriteComponentDeps(ast, componentImports, proxyDep).length > 0) ensureImport(ast, hmrImportSource, "createHotComponentProxy");
+	const exportProperties = [];
+	for (const cn of componentClassNames) if (cn === defaultExportClassName) exportProperties.push(t.objectProperty(t.identifier("default"), t.identifier(cn)));
+	else exportProperties.push(t.objectProperty(t.identifier(cn), t.identifier(cn), false, true));
+	hmrStmts.push(js`const __moduleExports = ${t.objectExpression(exportProperties)};`);
+	hmrStmts.push(js`registerHotModule(${jsExpr`${importMeta()}.url`}, __moduleExports);`);
+	const acceptBody = [t.variableDeclaration("const", [t.variableDeclarator(t.identifier("__updatedModule"), t.logicalExpression("||", t.identifier("newModule"), t.identifier("__moduleExports")))]), t.expressionStatement(t.callExpression(t.identifier("registerHotModule"), [t.memberExpression(importMeta(), t.identifier("url")), t.identifier("__updatedModule")]))];
+	for (const cn of componentClassNames) {
+		const key = cn === defaultExportClassName ? "default" : cn;
+		acceptBody.push(t.expressionStatement(t.callExpression(t.identifier("handleComponentUpdate"), [t.memberExpression(importMeta(), t.identifier("url")), t.objectExpression([t.objectProperty(t.identifier("default"), t.memberExpression(t.identifier("__updatedModule"), t.identifier(key)))])])));
+	}
+	hmrStmts.push(t.expressionStatement(t.callExpression(t.memberExpression(hot(), t.identifier("accept")), [t.arrowFunctionExpression([t.identifier("newModule")], t.blockStatement(acceptBody))])));
+	hmrStmts.push(...createAccepts(componentImports, proxyDep, shouldSkipDepAccept));
+	for (const cn of componentClassNames) {
+		const suffix = componentClassNames.length > 1 ? `_${cn}` : "";
+		hmrStmts.push(js`const ${id("__origCreated" + suffix)} = ${id(cn)}.prototype.created;`);
+		hmrStmts.push(js`${id(cn)}.prototype.created = function(__geaProps) {
         registerComponentInstance(this.constructor.name, this);
-        return __origCreated.call(this, __geaProps);
+        return ${id("__origCreated" + suffix)}.call(this, __geaProps);
       };`);
-		hmrStmts.push(js`const __origDispose = ${id(componentClassName)}.prototype.dispose;`);
-		hmrStmts.push(js`${id(componentClassName)}.prototype.dispose = function() {
+		hmrStmts.push(js`const ${id("__origDispose" + suffix)} = ${id(cn)}.prototype.dispose;`);
+		hmrStmts.push(js`${id(cn)}.prototype.dispose = function() {
         unregisterComponentInstance(this.constructor.name, this);
-        return __origDispose.call(this);
+        return ${id("__origDispose" + suffix)}.call(this);
       };`);
 	}
-	if (hmrStmts.length === 0) return false;
 	ast.program.body.push(t.ifStatement(hot(), t.blockStatement(hmrStmts)));
 	return true;
 }
@@ -9800,10 +9838,11 @@ function rewriteComponentDeps(ast, imports, proxyDep) {
 * add `hot.accept(dep, () => hot.invalidate())` so the page reloads when
 * stores/utils change.
 */
-function createAccepts(imports, proxyDep) {
+function createAccepts(imports, proxyDep, shouldSkip) {
 	const stmts = [];
 	for (const p of imports) {
 		if (!isRelative(p)) continue;
+		if (shouldSkip?.(p)) continue;
 		if (!proxyDep(p)) stmts.push(js`${hot()}.accept(${p}, ${invalidateCb()});`);
 	}
 	return stmts;
@@ -9864,6 +9903,14 @@ function isComponentImportSource(source) {
 	if (source.startsWith("node:")) return false;
 	return true;
 }
+/**
+* In dev mode, convert relative store imports (e.g. `import { router } from '../router'`)
+* to `const { router } = await import('../router')` placed after all class declarations.
+*
+* This breaks circular-dependency TDZ during HMR: classes are fully initialized
+* before the store module is loaded, so the store can safely import the component
+* classes back without hitting the temporal dead zone.
+*/
 function transform(ctx) {
 	const { sourceFile, code, isServe, isSSR, hmrImportSource } = ctx;
 	if (!(code.includes("<") && code.includes(">"))) return null;
@@ -9889,7 +9936,6 @@ function transform(ctx) {
 		let transformed = false;
 		const componentImportSet = /* @__PURE__ */ new Set();
 		const componentImportsUsedAsTags = /* @__PURE__ */ new Set();
-		let isDefaultExport = false;
 		imports.forEach((source) => {
 			if (!isComponentImportSource(source)) return;
 			componentImportSet.add(source);
@@ -9899,9 +9945,6 @@ function transform(ctx) {
 		const knownComponentImports = /* @__PURE__ */ new Set();
 		const namedImportSources = /* @__PURE__ */ new Map();
 		traverse(ast, {
-			ExportDefaultDeclaration() {
-				isDefaultExport = true;
-			},
 			ImportDeclaration(path) {
 				const source = path.node.source.value;
 				if (!isComponentImportSource(source)) return;
@@ -9950,7 +9993,9 @@ function transform(ctx) {
 				}
 			} else transformed = transformNonComponentJSX(ast, imports);
 		}
-		if (isServe && componentClassName) {
+		if (isServe && componentClassNames.length > 0) {
+			let defaultExportClassName = null;
+			for (const node of ast.program.body) if (t.isExportDefaultDeclaration(node) && t.isClassDeclaration(node.declaration) && node.declaration.id) defaultExportClassName = node.declaration.id.name;
 			const shouldProxyDep = (source) => {
 				if (!source.startsWith(".")) return false;
 				const resolved = ctx.resolveImportPath(sourceFile, source);
@@ -9959,7 +10004,13 @@ function transform(ctx) {
 				if (ctx.isComponentModule(resolved)) return true;
 				return false;
 			};
-			if (injectHMR(ast, componentClassName, componentImports, componentImportsUsedAsTags, isDefaultExport, hmrImportSource, shouldProxyDep)) transformed = true;
+			const shouldSkipDepAccept = (source) => {
+				if (!source.startsWith(".")) return false;
+				const resolved = ctx.resolveImportPath(sourceFile, source);
+				if (!resolved) return false;
+				return ctx.isStoreModule(resolved);
+			};
+			if (injectHMR(ast, componentClassNames, defaultExportClassName, componentImports, componentImportsUsedAsTags, hmrImportSource, shouldProxyDep, shouldSkipDepAccept)) transformed = true;
 		}
 		if (!transformed) return null;
 		ensureGeaCompilerSymbolImports(ast);
@@ -10038,6 +10089,13 @@ export function reconcile(oldC, newC) {
 }
 `;
 const HMR_RUNTIME_SOURCE = `
+var GEA_ELEMENT = Symbol.for('gea.element');
+var GEA_RENDERED = Symbol.for('gea.rendered');
+var GEA_CLEANUP_BINDINGS = Symbol.for('gea.component.cleanupBindings');
+var GEA_TEARDOWN_SELF_LISTENERS = Symbol.for('gea.component.teardownSelfListeners');
+var GEA_CHILD_COMPONENTS = Symbol.for('gea.childComponents');
+var GEA_BINDINGS = Symbol.for('gea.bindings');
+var GEA_SELF_LISTENERS = Symbol.for('gea.selfListeners');
 var hot = import.meta.hot;
 var componentInstances = hot && hot.data && hot.data.componentInstances || new Map();
 if (hot) hot.data.componentInstances = componentInstances;
@@ -10349,7 +10407,7 @@ function geaPlugin() {
 				}
 			}
 			if (/\bclass\s+Component\s+extends\s+Store\b/.test(code)) return null;
-			return transform({
+			const result = transform({
 				sourceFile: cleanId,
 				code,
 				isServe: isServeCommand,
@@ -10361,8 +10419,50 @@ function geaPlugin() {
 				registerStoreModule: (fp) => storeModules.add(fp),
 				registerComponentModule: (fp) => componentModules.add(fp)
 			});
+			if (result) return result;
+			if (isServeCommand && !isSSR) {
+				const componentDeps = findComponentDeps(code, cleanId);
+				if (componentDeps.length > 0) return {
+					code: code + `\nif (import.meta.hot) {\n${componentDeps.map((dep) => `  import.meta.hot.accept('${dep}', () => {});`).join("\n")}\n}\n`,
+					map: null
+				};
+			}
+			return null;
 		}
 	};
 }
+function resolveToFile(base) {
+	const exts = [
+		".ts",
+		".tsx",
+		".js",
+		".jsx"
+	];
+	const indexFiles = exts.map((ext) => resolve(base, "index" + ext));
+	const candidates = [
+		base,
+		...exts.map((ext) => base + ext),
+		...indexFiles
+	];
+	for (const c of candidates) try {
+		if (existsSync(c) && statSync(c).isFile()) return c;
+	} catch {}
+	return null;
+}
+function findComponentDeps(code, filePath) {
+	const deps = [];
+	const importRegex = /import\s+(?:[\w{},\s*]+)\s+from\s+['"](\.[^'"]+)['"]/g;
+	let match;
+	while ((match = importRegex.exec(code)) !== null) {
+		const source = match[1];
+		const resolved = resolveToFile(resolve(dirname(filePath), source));
+		if (!resolved) continue;
+		try {
+			const depCode = readFileSync(resolved, "utf8");
+			if (/class\s+\w+\s+extends\s+Component\b/.test(depCode) && depCode.includes("<") && depCode.includes(">")) deps.push(source);
+		} catch {}
+	}
+	return deps;
+}
 //#endregion
 export { geaPlugin };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geajs/vite-plugin",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Vite plugin for Gea framework - JSX/TSX transform, reactivity, HMR",
   "type": "module",
   "main": "./dist/index.mjs",