unplugin-zed-gpui 0.0.3 → 0.0.5

package/dist/index.cjs

@@ -85,14 +85,14 @@ const zedGpuiPlugin = (0, unplugin.createUnplugin)((options = {}) => {
 	return {
 		name: "unplugin-zed-gpui",
 		transform(code, id) {
-			if (hasElementPrototypeAssign(code)) {
+			if (shouldProcessFile(id)) analyzeUsage(code, usedMethods, opts);
+			if (hasPrototypeEnhancement(code)) {
 				if (opts.debug) {
 					console.log(`[zed-gpui] Processing element file: ${id}`);
 					console.log(`[zed-gpui] Used methods:`, formatUsedMethods(usedMethods));
 				}
 				return transformElementFile(code, usedMethods, opts);
 			}
-			if (shouldProcessFile(id)) analyzeUsage(code, usedMethods, opts);
 			return null;
 		},
 		buildEnd() {
@@ -139,8 +139,8 @@ function analyzeUsage(code, usedMethods, options) {
 function hasZedGpuiUsage(code) {
 	return /\.\s*([a-z_][a-zA-Z0-9_]*)\s*\(/.test(code);
 }
-function hasElementPrototypeAssign(code) {
-	return code.includes("Object.assign") && /HTML[A-Za-z]*Element\.prototype/.test(code);
+function hasPrototypeEnhancement(code) {
+	return code.includes("$_(") && /HTML[A-Za-z]*Element/.test(code);
 }
 /**
 * Recursively scan AST nodes for method calls
@@ -203,15 +203,20 @@ function addUsedMethod(usedMethods, elementType, methodName) {
 function inferElementType(node, bindings) {
 	if (_babel_types.isIdentifier(node)) return bindings.get(node.name);
 	if (_babel_types.isTSAsExpression(node) || _babel_types.isTSTypeAssertion(node)) return getElementTypeFromTsType(node.typeAnnotation) ?? inferElementType(node.expression, bindings);
+	if (_babel_types.isTSNonNullExpression(node)) return inferElementType(node.expression, bindings);
 	if (_babel_types.isCallExpression(node)) {
+		if (_babel_types.isMemberExpression(node.callee)) {
+			if (_babel_types.isIdentifier(node.callee.object, { name: "document" }) && (_babel_types.isIdentifier(node.callee.property, { name: "querySelector" }) || _babel_types.isIdentifier(node.callee.property, { name: "getElementById" }))) {
+				const typeArg = node.typeArguments?.params[0];
+				return typeArg && _babel_types.isTSType(typeArg) ? getElementTypeFromTsType(typeArg) : "HTMLElement";
+			}
+			if (_babel_types.isIdentifier(node.callee.property, { name: "createElement" }) && _babel_types.isIdentifier(node.callee.object, { name: "document" }) && _babel_types.isStringLiteral(node.arguments[0])) return tagElementTypes[node.arguments[0].value] ?? "HTMLElement";
+			return inferElementType(node.callee.object, bindings);
+		}
 		if (_babel_types.isIdentifier(node.callee)) {
 			if (node.callee.name === "h" && _babel_types.isStringLiteral(node.arguments[0])) return tagElementTypes[node.arguments[0].value] ?? "HTMLElement";
 			return factoryElementTypes[node.callee.name];
 		}
-		if (_babel_types.isMemberExpression(node.callee)) {
-			if (_babel_types.isMemberExpression(node.callee) && _babel_types.isIdentifier(node.callee.property, { name: "createElement" }) && _babel_types.isIdentifier(node.callee.object, { name: "document" }) && _babel_types.isStringLiteral(node.arguments[0])) return tagElementTypes[node.arguments[0].value] ?? "HTMLElement";
-			return inferElementType(node.callee.object, bindings);
-		}
 	}
 }
 function getElementTypeFromTypeAnnotation(node) {
@@ -234,20 +239,24 @@ function transformElementFile(code, usedMethods, options) {
 		});
 		let modified = false;
 		const prototypeMethods = /* @__PURE__ */ new Map();
+		const assignments = [];
 		for (const node of ast.program.body) {
-			if (!_babel_types.isExpressionStatement(node) || !_babel_types.isCallExpression(node.expression)) continue;
-			const targetPrototype = getAssignedPrototype(node.expression.arguments[0]);
-			const sourceArg = unwrapExpression(node.expression.arguments[1]);
-			if (!targetPrototype || !_babel_types.isObjectExpression(sourceArg)) continue;
-			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)));
+			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)) {
+					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)));
+				}
+			}
 		}
-		for (const node of ast.program.body) {
-			if (!_babel_types.isExpressionStatement(node) || !_babel_types.isCallExpression(node.expression)) continue;
-			const callExpr = node.expression;
-			if (!_babel_types.isMemberExpression(callExpr.callee) || !_babel_types.isIdentifier(callExpr.callee.object, { name: "Object" }) || !_babel_types.isIdentifier(callExpr.callee.property, { name: "assign" }) || callExpr.arguments.length < 2) continue;
-			const targetPrototype = getAssignedPrototype(callExpr.arguments[0]);
-			const sourceArg = unwrapExpression(callExpr.arguments[1]);
-			if (!targetPrototype || !_babel_types.isObjectExpression(sourceArg)) continue;
+		for (const { targetPrototype, sourceArg } of assignments) {
 			const originalProperties = sourceArg.properties.length;
 			sourceArg.properties = sourceArg.properties.filter((prop) => {
 				if (!_babel_types.isObjectProperty(prop) && !_babel_types.isObjectMethod(prop)) return true;
@@ -261,6 +270,19 @@ function transformElementFile(code, usedMethods, options) {
 				if (options.debug) console.log(`[zed-gpui] Removed ${originalProperties - sourceArg.properties.length} unused methods from ${targetPrototype}`);
 			}
 		}
+		ast.program.body = ast.program.body.filter((node) => {
+			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));
+				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);
+			if (shouldRemove) modified = true;
+			return !shouldRemove;
+		});
 		if (modified) return { code: (0, _babel_generator.default)(ast, {}, code).code };
 		return null;
 	} catch (error) {
@@ -268,8 +290,8 @@ function transformElementFile(code, usedMethods, options) {
 		return null;
 	}
 }
-function getAssignedPrototype(node) {
-	return _babel_types.isMemberExpression(node) && _babel_types.isIdentifier(node.object) && _babel_types.isIdentifier(node.property, { name: "prototype" }) && isElementType(node.object.name) ? node.object.name : void 0;
+function getEnhancedPrototype(node) {
+	return _babel_types.isIdentifier(node) && isElementType(node.name) ? node.name : void 0;
 }
 function unwrapExpression(node) {
 	while (_babel_types.isTSAsExpression(node) || _babel_types.isTSTypeAssertion(node) || _babel_types.isTSNonNullExpression(node)) node = node.expression;

package/dist/index.d.ts

@@ -20,6 +20,6 @@ interface PluginOptions {
  * Unplugin for zed-gpui tree-shaking optimization
  * Removes unused zed-gpui methods from the bundle
  */
-declare const zedGpuiPlugin: import("unplugin").UnpluginInstance<PluginOptions, boolean>;
+declare const zedGpuiPlugin: import("unplugin").UnpluginInstance<PluginOptions | undefined, boolean>;
 //#endregion
 export { PluginOptions, zedGpuiPlugin as default, zedGpuiPlugin };

package/dist/index.mjs

@@ -57,14 +57,14 @@ const zedGpuiPlugin = createUnplugin((options = {}) => {
 	return {
 		name: "unplugin-zed-gpui",
 		transform(code, id) {
-			if (hasElementPrototypeAssign(code)) {
+			if (shouldProcessFile(id)) analyzeUsage(code, usedMethods, opts);
+			if (hasPrototypeEnhancement(code)) {
 				if (opts.debug) {
 					console.log(`[zed-gpui] Processing element file: ${id}`);
 					console.log(`[zed-gpui] Used methods:`, formatUsedMethods(usedMethods));
 				}
 				return transformElementFile(code, usedMethods, opts);
 			}
-			if (shouldProcessFile(id)) analyzeUsage(code, usedMethods, opts);
 			return null;
 		},
 		buildEnd() {
@@ -111,8 +111,8 @@ function analyzeUsage(code, usedMethods, options) {
 function hasZedGpuiUsage(code) {
 	return /\.\s*([a-z_][a-zA-Z0-9_]*)\s*\(/.test(code);
 }
-function hasElementPrototypeAssign(code) {
-	return code.includes("Object.assign") && /HTML[A-Za-z]*Element\.prototype/.test(code);
+function hasPrototypeEnhancement(code) {
+	return code.includes("$_(") && /HTML[A-Za-z]*Element/.test(code);
 }
 /**
 * Recursively scan AST nodes for method calls
@@ -175,15 +175,20 @@ function addUsedMethod(usedMethods, elementType, methodName) {
 function inferElementType(node, bindings) {
 	if (t.isIdentifier(node)) return bindings.get(node.name);
 	if (t.isTSAsExpression(node) || t.isTSTypeAssertion(node)) return getElementTypeFromTsType(node.typeAnnotation) ?? inferElementType(node.expression, bindings);
+	if (t.isTSNonNullExpression(node)) return inferElementType(node.expression, bindings);
 	if (t.isCallExpression(node)) {
+		if (t.isMemberExpression(node.callee)) {
+			if (t.isIdentifier(node.callee.object, { name: "document" }) && (t.isIdentifier(node.callee.property, { name: "querySelector" }) || t.isIdentifier(node.callee.property, { name: "getElementById" }))) {
+				const typeArg = node.typeArguments?.params[0];
+				return typeArg && t.isTSType(typeArg) ? getElementTypeFromTsType(typeArg) : "HTMLElement";
+			}
+			if (t.isIdentifier(node.callee.property, { name: "createElement" }) && t.isIdentifier(node.callee.object, { name: "document" }) && t.isStringLiteral(node.arguments[0])) return tagElementTypes[node.arguments[0].value] ?? "HTMLElement";
+			return inferElementType(node.callee.object, bindings);
+		}
 		if (t.isIdentifier(node.callee)) {
 			if (node.callee.name === "h" && t.isStringLiteral(node.arguments[0])) return tagElementTypes[node.arguments[0].value] ?? "HTMLElement";
 			return factoryElementTypes[node.callee.name];
 		}
-		if (t.isMemberExpression(node.callee)) {
-			if (t.isMemberExpression(node.callee) && t.isIdentifier(node.callee.property, { name: "createElement" }) && t.isIdentifier(node.callee.object, { name: "document" }) && t.isStringLiteral(node.arguments[0])) return tagElementTypes[node.arguments[0].value] ?? "HTMLElement";
-			return inferElementType(node.callee.object, bindings);
-		}
 	}
 }
 function getElementTypeFromTypeAnnotation(node) {
@@ -206,20 +211,24 @@ function transformElementFile(code, usedMethods, options) {
 		});
 		let modified = false;
 		const prototypeMethods = /* @__PURE__ */ new Map();
+		const assignments = [];
 		for (const node of ast.program.body) {
-			if (!t.isExpressionStatement(node) || !t.isCallExpression(node.expression)) continue;
-			const targetPrototype = getAssignedPrototype(node.expression.arguments[0]);
-			const sourceArg = unwrapExpression(node.expression.arguments[1]);
-			if (!targetPrototype || !t.isObjectExpression(sourceArg)) continue;
-			prototypeMethods.set(targetPrototype, new Set(sourceArg.properties.map((prop) => t.isObjectProperty(prop) || t.isObjectMethod(prop) ? getPropertyName(prop.key) : void 0).filter((methodName) => !!methodName)));
+			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)) {
+					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)));
+				}
+			}
 		}
-		for (const node of ast.program.body) {
-			if (!t.isExpressionStatement(node) || !t.isCallExpression(node.expression)) continue;
-			const callExpr = node.expression;
-			if (!t.isMemberExpression(callExpr.callee) || !t.isIdentifier(callExpr.callee.object, { name: "Object" }) || !t.isIdentifier(callExpr.callee.property, { name: "assign" }) || callExpr.arguments.length < 2) continue;
-			const targetPrototype = getAssignedPrototype(callExpr.arguments[0]);
-			const sourceArg = unwrapExpression(callExpr.arguments[1]);
-			if (!targetPrototype || !t.isObjectExpression(sourceArg)) continue;
+		for (const { targetPrototype, sourceArg } of assignments) {
 			const originalProperties = sourceArg.properties.length;
 			sourceArg.properties = sourceArg.properties.filter((prop) => {
 				if (!t.isObjectProperty(prop) && !t.isObjectMethod(prop)) return true;
@@ -233,6 +242,19 @@ function transformElementFile(code, usedMethods, options) {
 				if (options.debug) console.log(`[zed-gpui] Removed ${originalProperties - sourceArg.properties.length} unused methods from ${targetPrototype}`);
 			}
 		}
+		ast.program.body = ast.program.body.filter((node) => {
+			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));
+				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);
+			if (shouldRemove) modified = true;
+			return !shouldRemove;
+		});
 		if (modified) return { code: generate(ast, {}, code).code };
 		return null;
 	} catch (error) {
@@ -240,8 +262,8 @@ function transformElementFile(code, usedMethods, options) {
 		return null;
 	}
 }
-function getAssignedPrototype(node) {
-	return t.isMemberExpression(node) && t.isIdentifier(node.object) && t.isIdentifier(node.property, { name: "prototype" }) && isElementType(node.object.name) ? node.object.name : void 0;
+function getEnhancedPrototype(node) {
+	return t.isIdentifier(node) && isElementType(node.name) ? node.name : void 0;
 }
 function unwrapExpression(node) {
 	while (t.isTSAsExpression(node) || t.isTSTypeAssertion(node) || t.isTSNonNullExpression(node)) node = node.expression;

package/package.json

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