unplugin-zed-gpui 0.0.5 → 0.0.6

package/dist/index.cjs

@@ -50,7 +50,9 @@ const factoryElementTypes = {
 	input: "HTMLInputElement",
 	textarea: "HTMLTextAreaElement",
 	btn: "HTMLButtonElement",
-	select: "HTMLSelectElement"
+	select: "HTMLSelectElement",
+	svg: "SVGElement",
+	mathml: "MathMLElement"
 };
 const tagElementTypes = {
 	a: "HTMLAnchorElement",
@@ -85,7 +87,11 @@ const zedGpuiPlugin = (0, unplugin.createUnplugin)((options = {}) => {
 	return {
 		name: "unplugin-zed-gpui",
 		transform(code, id) {
-			if (shouldProcessFile(id)) analyzeUsage(code, usedMethods, opts);
+			if (shouldProcessFile(id)) {
+				analyzeUsage(code, usedMethods, opts);
+				const result = transformForbiddenHCalls(code, opts);
+				if (result) return result;
+			}
 			if (hasPrototypeEnhancement(code)) {
 				if (opts.debug) {
 					console.log(`[zed-gpui] Processing element file: ${id}`);
@@ -108,6 +114,44 @@ function shouldProcessFile(id) {
 	if (id.includes("node_modules") || id.includes("dist")) return false;
 	return /\.(ts|js|tsx|jsx)$/.test(id);
 }
+function transformForbiddenHCalls(code, options) {
+	if (!hasZedGpuiImport(code, options) || !/\bh\s*\(\s*(['"])(svg|mathml)\1/.test(code)) return null;
+	try {
+		const ast = (0, _babel_parser.parse)(code, {
+			sourceType: "module",
+			plugins: ["typescript", "jsx"]
+		});
+		let modified = false;
+		visitAst(ast.program, (node) => {
+			if (!_babel_types.isCallExpression(node) || !_babel_types.isIdentifier(node.callee, { name: "h" })) return;
+			const arg = node.arguments[0];
+			if (!_babel_types.isStringLiteral(arg) || arg.value !== "svg" && arg.value !== "mathml") return;
+			node.callee = _babel_types.identifier("throws_");
+			node.arguments = [_babel_types.stringLiteral(arg.value === "svg" ? "Cannot use h('svg') to create SVGElement" : "Cannot use h('mathml') to create MathMLElement")];
+			node.typeArguments = void 0;
+			modified = true;
+		});
+		if (!modified) return null;
+		ast.program.body.push(_babel_types.functionDeclaration(_babel_types.identifier("throws_"), [_babel_types.identifier("message")], _babel_types.blockStatement([_babel_types.throwStatement(_babel_types.newExpression(_babel_types.identifier("Error"), [_babel_types.identifier("message")]))])));
+		return { code: (0, _babel_generator.default)(ast, {}, code).code };
+	} catch (error) {
+		if (options.debug) console.warn(`[zed-gpui] Failed to transform forbidden h() calls:`, error);
+		return null;
+	}
+}
+function hasZedGpuiImport(code, options) {
+	const packageName = options.zedGpuiPackageName.replace(/[.*+?^\${}()|[\]\\]/g, "\\$&");
+	return new RegExp(`from\\s+['"]${packageName}(?:\\/[^'"]*)?['"]|import\\s+['"]${packageName}(?:\\/[^'"]*)?['"]`).test(code);
+}
+function visitAst(node, visitor) {
+	visitor(node);
+	for (const key in node) {
+		if (!Object.prototype.hasOwnProperty.call(node, key)) continue;
+		const child = node[key];
+		if (Array.isArray(child)) child.forEach((item) => item?.type && visitAst(item, visitor));
+		else if (child?.type) visitAst(child, visitor);
+	}
+}
 /**
 * Analyze code to find zed-gpui method usage
 */
@@ -140,7 +184,7 @@ function hasZedGpuiUsage(code) {
 	return /\.\s*([a-z_][a-zA-Z0-9_]*)\s*\(/.test(code);
 }
 function hasPrototypeEnhancement(code) {
-	return code.includes("$_(") && /HTML[A-Za-z]*Element/.test(code);
+	return code.includes("$_(") && /(HTML[A-Za-z]*Element|SVGElement|MathMLElement)/.test(code);
 }
 /**
 * Recursively scan AST nodes for method calls
@@ -226,7 +270,7 @@ function getElementTypeFromTsType(node) {
 	return _babel_types.isTSTypeReference(node) && _babel_types.isIdentifier(node.typeName) && isElementType(node.typeName.name) ? node.typeName.name : void 0;
 }
 function isElementType(name) {
-	return name === "HTMLElement" || /^HTML[A-Za-z]*Element$/.test(name);
+	return name === "HTMLElement" || /^HTML[A-Za-z]*Element$/.test(name) || name === "SVGElement" || name === "MathMLElement";
 }
 /**
 * Transform element.ts to remove unused methods
@@ -238,21 +282,36 @@ function transformElementFile(code, usedMethods, options) {
 			plugins: ["typescript"]
 		});
 		let modified = false;
+		const objectBindings = /* @__PURE__ */ new Map();
 		const prototypeMethods = /* @__PURE__ */ new Map();
 		const assignments = [];
+		for (const node of ast.program.body) {
+			if (!_babel_types.isVariableDeclaration(node)) continue;
+			for (const declaration of node.declarations) {
+				const init = declaration.init && unwrapExpression(declaration.init);
+				if (_babel_types.isIdentifier(declaration.id) && init && _babel_types.isObjectExpression(init)) objectBindings.set(declaration.id.name, init);
+			}
+		}
 		for (const node of ast.program.body) {
 			if (!_babel_types.isExpressionStatement(node)) continue;
 			for (const expression of _babel_types.isSequenceExpression(node.expression) ? node.expression.expressions : [node.expression]) {
 				if (!_babel_types.isCallExpression(expression) || !_babel_types.isIdentifier(expression.callee, { name: "$_" }) || expression.arguments.length < 2) continue;
 				const targetPrototype = getEnhancedPrototype(expression.arguments[0]);
-				const sourceArg = unwrapExpression(expression.arguments[1]);
-				if (targetPrototype && _babel_types.isObjectExpression(sourceArg)) {
+				if (!targetPrototype) continue;
+				for (const arg of expression.arguments.slice(1)) {
+					const sourceArg = getObjectArgument(arg, objectBindings);
+					if (!sourceArg) continue;
 					assignments.push({
 						targetPrototype,
 						sourceArg,
 						call: expression
 					});
-					prototypeMethods.set(targetPrototype, new Set(sourceArg.properties.map((prop) => _babel_types.isObjectProperty(prop) || _babel_types.isObjectMethod(prop) ? getPropertyName(prop.key) : void 0).filter((methodName) => !!methodName)));
+					const methods = prototypeMethods.get(targetPrototype) ?? /* @__PURE__ */ new Set();
+					for (const prop of sourceArg.properties) {
+						const methodName = _babel_types.isObjectProperty(prop) || _babel_types.isObjectMethod(prop) ? getPropertyName(prop.key) : void 0;
+						if (methodName) methods.add(methodName);
+					}
+					prototypeMethods.set(targetPrototype, methods);
 				}
 			}
 		}
@@ -271,15 +330,26 @@ function transformElementFile(code, usedMethods, options) {
 			}
 		}
 		ast.program.body = ast.program.body.filter((node) => {
+			if (_babel_types.isVariableDeclaration(node)) {
+				const declarations = node.declarations.filter((declaration) => {
+					if (!_babel_types.isIdentifier(declaration.id)) return true;
+					const sourceArg = objectBindings.get(declaration.id.name);
+					if (!sourceArg || sourceArg.properties.length > 0) return true;
+					modified = true;
+					return false;
+				});
+				node.declarations = declarations;
+				return declarations.length > 0;
+			}
 			if (!_babel_types.isExpressionStatement(node)) return true;
 			if (_babel_types.isSequenceExpression(node.expression)) {
-				const expressions = node.expression.expressions.filter((expression) => !assignments.some(({ call, sourceArg }) => call === expression && sourceArg.properties.length === 0));
+				const expressions = node.expression.expressions.filter((expression) => !isEmptyEnhancementCall(expression, assignments));
 				if (expressions.length !== node.expression.expressions.length) modified = true;
 				if (expressions.length === 0) return false;
 				node.expression = expressions.length === 1 ? expressions[0] : _babel_types.sequenceExpression(expressions);
 				return true;
 			}
-			const shouldRemove = assignments.some(({ call, sourceArg }) => call === node.expression && sourceArg.properties.length === 0);
+			const shouldRemove = isEmptyEnhancementCall(node.expression, assignments);
 			if (shouldRemove) modified = true;
 			return !shouldRemove;
 		});
@@ -290,6 +360,14 @@ function transformElementFile(code, usedMethods, options) {
 		return null;
 	}
 }
+function getObjectArgument(node, objectBindings) {
+	const unwrapped = unwrapExpression(node);
+	if (_babel_types.isObjectExpression(unwrapped)) return unwrapped;
+	return _babel_types.isIdentifier(unwrapped) ? objectBindings.get(unwrapped.name) : void 0;
+}
+function isEmptyEnhancementCall(expression, assignments) {
+	return _babel_types.isCallExpression(expression) && assignments.some(({ call, sourceArg }) => call === expression && sourceArg.properties.length === 0) && assignments.filter(({ call }) => call === expression).every(({ sourceArg }) => sourceArg.properties.length === 0);
+}
 function getEnhancedPrototype(node) {
 	return _babel_types.isIdentifier(node) && isElementType(node.name) ? node.name : void 0;
 }
@@ -302,6 +380,11 @@ function getPropertyName(node) {
 	if (_babel_types.isStringLiteral(node)) return node.value;
 }
 function isMethodUsed(prototypeName, methodName, usedMethods, prototypeMethods) {
+	if ((prototypeName === "HTMLElement" || prototypeName === "SVGElement" || prototypeName === "MathMLElement") && prototypeMethods.get("HTMLElement")?.has(methodName) && prototypeMethods.get("SVGElement")?.has(methodName) && prototypeMethods.get("MathMLElement")?.has(methodName)) {
+		if (usedMethods.unknown.has(methodName)) return true;
+		for (const methods of usedMethods.byPrototype.values()) if (methods.has(methodName)) return true;
+		return false;
+	}
 	if (usedMethods.unknown.has(methodName) || usedMethods.byPrototype.get(prototypeName)?.has(methodName)) return true;
 	if (prototypeName !== "HTMLElement") return false;
 	if (keepHTMLElementMethods.has(methodName)) return true;

package/dist/index.mjs

@@ -22,7 +22,9 @@ const factoryElementTypes = {
 	input: "HTMLInputElement",
 	textarea: "HTMLTextAreaElement",
 	btn: "HTMLButtonElement",
-	select: "HTMLSelectElement"
+	select: "HTMLSelectElement",
+	svg: "SVGElement",
+	mathml: "MathMLElement"
 };
 const tagElementTypes = {
 	a: "HTMLAnchorElement",
@@ -57,7 +59,11 @@ const zedGpuiPlugin = createUnplugin((options = {}) => {
 	return {
 		name: "unplugin-zed-gpui",
 		transform(code, id) {
-			if (shouldProcessFile(id)) analyzeUsage(code, usedMethods, opts);
+			if (shouldProcessFile(id)) {
+				analyzeUsage(code, usedMethods, opts);
+				const result = transformForbiddenHCalls(code, opts);
+				if (result) return result;
+			}
 			if (hasPrototypeEnhancement(code)) {
 				if (opts.debug) {
 					console.log(`[zed-gpui] Processing element file: ${id}`);
@@ -80,6 +86,44 @@ function shouldProcessFile(id) {
 	if (id.includes("node_modules") || id.includes("dist")) return false;
 	return /\.(ts|js|tsx|jsx)$/.test(id);
 }
+function transformForbiddenHCalls(code, options) {
+	if (!hasZedGpuiImport(code, options) || !/\bh\s*\(\s*(['"])(svg|mathml)\1/.test(code)) return null;
+	try {
+		const ast = parse(code, {
+			sourceType: "module",
+			plugins: ["typescript", "jsx"]
+		});
+		let modified = false;
+		visitAst(ast.program, (node) => {
+			if (!t.isCallExpression(node) || !t.isIdentifier(node.callee, { name: "h" })) return;
+			const arg = node.arguments[0];
+			if (!t.isStringLiteral(arg) || arg.value !== "svg" && arg.value !== "mathml") return;
+			node.callee = t.identifier("throws_");
+			node.arguments = [t.stringLiteral(arg.value === "svg" ? "Cannot use h('svg') to create SVGElement" : "Cannot use h('mathml') to create MathMLElement")];
+			node.typeArguments = void 0;
+			modified = true;
+		});
+		if (!modified) return null;
+		ast.program.body.push(t.functionDeclaration(t.identifier("throws_"), [t.identifier("message")], t.blockStatement([t.throwStatement(t.newExpression(t.identifier("Error"), [t.identifier("message")]))])));
+		return { code: generate(ast, {}, code).code };
+	} catch (error) {
+		if (options.debug) console.warn(`[zed-gpui] Failed to transform forbidden h() calls:`, error);
+		return null;
+	}
+}
+function hasZedGpuiImport(code, options) {
+	const packageName = options.zedGpuiPackageName.replace(/[.*+?^\${}()|[\]\\]/g, "\\$&");
+	return new RegExp(`from\\s+['"]${packageName}(?:\\/[^'"]*)?['"]|import\\s+['"]${packageName}(?:\\/[^'"]*)?['"]`).test(code);
+}
+function visitAst(node, visitor) {
+	visitor(node);
+	for (const key in node) {
+		if (!Object.prototype.hasOwnProperty.call(node, key)) continue;
+		const child = node[key];
+		if (Array.isArray(child)) child.forEach((item) => item?.type && visitAst(item, visitor));
+		else if (child?.type) visitAst(child, visitor);
+	}
+}
 /**
 * Analyze code to find zed-gpui method usage
 */
@@ -112,7 +156,7 @@ function hasZedGpuiUsage(code) {
 	return /\.\s*([a-z_][a-zA-Z0-9_]*)\s*\(/.test(code);
 }
 function hasPrototypeEnhancement(code) {
-	return code.includes("$_(") && /HTML[A-Za-z]*Element/.test(code);
+	return code.includes("$_(") && /(HTML[A-Za-z]*Element|SVGElement|MathMLElement)/.test(code);
 }
 /**
 * Recursively scan AST nodes for method calls
@@ -198,7 +242,7 @@ function getElementTypeFromTsType(node) {
 	return t.isTSTypeReference(node) && t.isIdentifier(node.typeName) && isElementType(node.typeName.name) ? node.typeName.name : void 0;
 }
 function isElementType(name) {
-	return name === "HTMLElement" || /^HTML[A-Za-z]*Element$/.test(name);
+	return name === "HTMLElement" || /^HTML[A-Za-z]*Element$/.test(name) || name === "SVGElement" || name === "MathMLElement";
 }
 /**
 * Transform element.ts to remove unused methods
@@ -210,21 +254,36 @@ function transformElementFile(code, usedMethods, options) {
 			plugins: ["typescript"]
 		});
 		let modified = false;
+		const objectBindings = /* @__PURE__ */ new Map();
 		const prototypeMethods = /* @__PURE__ */ new Map();
 		const assignments = [];
+		for (const node of ast.program.body) {
+			if (!t.isVariableDeclaration(node)) continue;
+			for (const declaration of node.declarations) {
+				const init = declaration.init && unwrapExpression(declaration.init);
+				if (t.isIdentifier(declaration.id) && init && t.isObjectExpression(init)) objectBindings.set(declaration.id.name, init);
+			}
+		}
 		for (const node of ast.program.body) {
 			if (!t.isExpressionStatement(node)) continue;
 			for (const expression of t.isSequenceExpression(node.expression) ? node.expression.expressions : [node.expression]) {
 				if (!t.isCallExpression(expression) || !t.isIdentifier(expression.callee, { name: "$_" }) || expression.arguments.length < 2) continue;
 				const targetPrototype = getEnhancedPrototype(expression.arguments[0]);
-				const sourceArg = unwrapExpression(expression.arguments[1]);
-				if (targetPrototype && t.isObjectExpression(sourceArg)) {
+				if (!targetPrototype) continue;
+				for (const arg of expression.arguments.slice(1)) {
+					const sourceArg = getObjectArgument(arg, objectBindings);
+					if (!sourceArg) continue;
 					assignments.push({
 						targetPrototype,
 						sourceArg,
 						call: expression
 					});
-					prototypeMethods.set(targetPrototype, new Set(sourceArg.properties.map((prop) => t.isObjectProperty(prop) || t.isObjectMethod(prop) ? getPropertyName(prop.key) : void 0).filter((methodName) => !!methodName)));
+					const methods = prototypeMethods.get(targetPrototype) ?? /* @__PURE__ */ new Set();
+					for (const prop of sourceArg.properties) {
+						const methodName = t.isObjectProperty(prop) || t.isObjectMethod(prop) ? getPropertyName(prop.key) : void 0;
+						if (methodName) methods.add(methodName);
+					}
+					prototypeMethods.set(targetPrototype, methods);
 				}
 			}
 		}
@@ -243,15 +302,26 @@ function transformElementFile(code, usedMethods, options) {
 			}
 		}
 		ast.program.body = ast.program.body.filter((node) => {
+			if (t.isVariableDeclaration(node)) {
+				const declarations = node.declarations.filter((declaration) => {
+					if (!t.isIdentifier(declaration.id)) return true;
+					const sourceArg = objectBindings.get(declaration.id.name);
+					if (!sourceArg || sourceArg.properties.length > 0) return true;
+					modified = true;
+					return false;
+				});
+				node.declarations = declarations;
+				return declarations.length > 0;
+			}
 			if (!t.isExpressionStatement(node)) return true;
 			if (t.isSequenceExpression(node.expression)) {
-				const expressions = node.expression.expressions.filter((expression) => !assignments.some(({ call, sourceArg }) => call === expression && sourceArg.properties.length === 0));
+				const expressions = node.expression.expressions.filter((expression) => !isEmptyEnhancementCall(expression, assignments));
 				if (expressions.length !== node.expression.expressions.length) modified = true;
 				if (expressions.length === 0) return false;
 				node.expression = expressions.length === 1 ? expressions[0] : t.sequenceExpression(expressions);
 				return true;
 			}
-			const shouldRemove = assignments.some(({ call, sourceArg }) => call === node.expression && sourceArg.properties.length === 0);
+			const shouldRemove = isEmptyEnhancementCall(node.expression, assignments);
 			if (shouldRemove) modified = true;
 			return !shouldRemove;
 		});
@@ -262,6 +332,14 @@ function transformElementFile(code, usedMethods, options) {
 		return null;
 	}
 }
+function getObjectArgument(node, objectBindings) {
+	const unwrapped = unwrapExpression(node);
+	if (t.isObjectExpression(unwrapped)) return unwrapped;
+	return t.isIdentifier(unwrapped) ? objectBindings.get(unwrapped.name) : void 0;
+}
+function isEmptyEnhancementCall(expression, assignments) {
+	return t.isCallExpression(expression) && assignments.some(({ call, sourceArg }) => call === expression && sourceArg.properties.length === 0) && assignments.filter(({ call }) => call === expression).every(({ sourceArg }) => sourceArg.properties.length === 0);
+}
 function getEnhancedPrototype(node) {
 	return t.isIdentifier(node) && isElementType(node.name) ? node.name : void 0;
 }
@@ -274,6 +352,11 @@ function getPropertyName(node) {
 	if (t.isStringLiteral(node)) return node.value;
 }
 function isMethodUsed(prototypeName, methodName, usedMethods, prototypeMethods) {
+	if ((prototypeName === "HTMLElement" || prototypeName === "SVGElement" || prototypeName === "MathMLElement") && prototypeMethods.get("HTMLElement")?.has(methodName) && prototypeMethods.get("SVGElement")?.has(methodName) && prototypeMethods.get("MathMLElement")?.has(methodName)) {
+		if (usedMethods.unknown.has(methodName)) return true;
+		for (const methods of usedMethods.byPrototype.values()) if (methods.has(methodName)) return true;
+		return false;
+	}
 	if (usedMethods.unknown.has(methodName) || usedMethods.byPrototype.get(prototypeName)?.has(methodName)) return true;
 	if (prototypeName !== "HTMLElement") return false;
 	if (keepHTMLElementMethods.has(methodName)) return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unplugin-zed-gpui",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Unplugin for zed-gpui tree-shaking optimization - removes unused zed-gpui methods from bundle",
   "author": {
     "name": "Kasukabe Tsumugi",