@actview/plugin-babel 1.0.6 → 2.0.0

package/dist/index.js

@@ -130,9 +130,10 @@ function defineComponentPlugin() {
         if (!node.id) return;
         const name = node.id.name;
         if (!/^[A-Z]/.test(name)) return;
+        assertNoSetupStyleEarlyReturns(path, name);
         const fn = t.functionExpression(null, node.params, node.body, false, false);
         if (node.typeParameters) fn.typeParameters = node.typeParameters;
-        const wrapped = wrapComponentFn(fn, name);
+        const wrapped = wrapComponentFn(fn, name, path);
         if (!wrapped) return;
         const call = wrapped;
         hasTransformed = true;
@@ -153,11 +154,12 @@ function defineComponentPlugin() {
         const init = node.init;
         const isFn = t.isFunctionExpression(init) || t.isArrowFunctionExpression(init);
         if (!isFn) return;
-        const wrapped = wrapComponentFn(init, id.name);
+        const initPath = path.get("init");
+        assertNoSetupStyleEarlyReturns(initPath, id.name);
+        const wrapped = wrapComponentFn(init, id.name, initPath);
         if (!wrapped) return;
         const call = wrapped;
         hasTransformed = true;
-        const initPath = path.get("init");
         wrapEarlyReturns(initPath);
         node.init = call;
       },
@@ -184,18 +186,19 @@ function defineComponentPlugin() {
           ;
           fn.typeParameters = decl.typeParameters;
         }
-        const wrapped = wrapComponentFn(fn);
+        const declPath = path.get("declaration");
+        assertNoSetupStyleEarlyReturns(declPath);
+        const wrapped = wrapComponentFn(fn, void 0, path);
         if (!wrapped) return;
         const call = wrapped;
         hasTransformed = true;
-        const declPath = path.get("declaration");
         wrapEarlyReturns(declPath);
         path.node.declaration = call;
       }
     }
   };
 }
-function wrapComponentFn(fn, name) {
+function wrapComponentFn(fn, name, fnPath) {
   const body = fn.body;
   const isExprBody = !t.isBlockStatement(body);
   let last = null;
@@ -214,7 +217,13 @@ function wrapComponentFn(fn, name) {
   const isJsxCall = t.isCallExpression(ret) && t.isIdentifier(ret.callee) && /^_?jsx/.test(ret.callee.name);
   const isNullRet = t.isNullLiteral(ret);
   const isCondRet = isRenderExpr(ret);
-  if (!isJsx && !isJsxCall && !isNullRet && !isCondRet) return null;
+  if (!isJsx && !isJsxCall && !isNullRet && !isCondRet) {
+    const returnsFn = t.isArrowFunctionExpression(ret) || t.isFunctionExpression(ret);
+    if (returnsFn && (name !== void 0 || containsRenderNode(ret))) {
+      throw buildSetupStyleError(fnPath, name);
+    }
+    return null;
+  }
   if (isJsx) walkJSX(ret);
   if (isExprBody) {
     fn.body = t.blockStatement([
@@ -229,6 +238,54 @@ function wrapComponentFn(fn, name) {
   if (name) args.push(t.stringLiteral(name));
   return t.callExpression(t.identifier("defineComponent"), args);
 }
+function assertNoSetupStyleEarlyReturns(fnPath, name) {
+  const body = fnPath.node.body;
+  if (!t.isBlockStatement(body)) return;
+  const stmts = body.body;
+  const trailing = stmts.length ? stmts[stmts.length - 1] : null;
+  fnPath.traverse({
+    ReturnStatement(retPath) {
+      if (retPath.getFunctionParent() !== fnPath) return;
+      if (trailing && retPath.node === trailing) return;
+      const arg = retPath.node.argument;
+      if (t.isArrowFunctionExpression(arg) || t.isFunctionExpression(arg)) {
+        throw buildSetupStyleError(retPath, name);
+      }
+    }
+  });
+}
+function buildSetupStyleError(fnPath, name) {
+  const label = name ? `\u7EC4\u4EF6 ${name}` : "\u7EC4\u4EF6\u51FD\u6570";
+  const msg = `[actview] \u5DF2\u5E9F\u5F03\u7684 setup \u98CE\u683C\uFF1A${label}\u4F53\u5185 return \u4E86\u6E32\u67D3\u51FD\u6570\uFF08() => JSX / function () { JSX }\uFF09\u3002
+ActView \u53EA\u652F\u6301\u7B80\u5199\u7EC4\u4EF6\u2014\u2014\u76F4\u63A5 return JSX\uFF0C\u63D2\u4EF6\u4F1A\u81EA\u52A8\u5305\u88C5 render \u51FD\u6570\uFF1A
+
+    \u2717 function App() { return () => <div /> }
+    \u2713 function App() { return <div /> }
+`;
+  try {
+    return fnPath.buildCodeFrameError(msg);
+  } catch {
+    return new Error(msg);
+  }
+}
+function containsRenderNode(node, seen = /* @__PURE__ */ new Set()) {
+  if (!node || typeof node !== "object" || seen.has(node)) return false;
+  seen.add(node);
+  if (t.isJSXElement(node) || t.isJSXFragment(node)) return true;
+  if (t.isCallExpression(node) && t.isIdentifier(node.callee) && /^_?jsx/.test(node.callee.name)) {
+    return true;
+  }
+  for (const k in node) {
+    if (k === "leadingComments" || k === "trailingComments") continue;
+    const v = node[k];
+    if (Array.isArray(v)) {
+      if (v.some((c) => containsRenderNode(c, seen))) return true;
+    } else if (v !== null && typeof v === "object") {
+      if (containsRenderNode(v, seen)) return true;
+    }
+  }
+  return false;
+}
 function wrapEarlyReturns(fnPath) {
   fnPath.traverse({
     ReturnStatement(innerPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actview/plugin-babel",
-  "version": "1.0.6",
+  "version": "2.0.0",
   "type": "module",
   "description": "Babel 插件：JSX 组件自动 defineComponent 转换（ActView 编译核心，独立于 Vite 宿主）",
   "exports": {
@@ -9,7 +9,11 @@
       "import": "./dist/index.js"
     }
   },
-  "dependencies": {
+  "peerDependencies": {
+    "@babel/core": "^8.0.0",
+    "@babel/generator": "^8.0.0"
+  },
+  "devDependencies": {
     "@babel/core": "^8.0.1",
     "@babel/generator": "^8.0.0"
   },