babel-plugin-essor 0.0.17-beta.5 → 0.0.17-beta.6

package/dist/index.cjs

@@ -609,6 +609,8 @@ function checkHasJSXReturn(path) {
 var HMR_COMPONENT_NAME = "__$createHMRComponent$__";
 var WHITESPACE_REGEX = /\s+/g;
 var PATH_SEPARATOR_REGEX = /[/\\]/;
+var ESSOR_IMPORT = "essor";
+var HMR_IMPORTS = /* @__PURE__ */ new Set(["createApp", "hydrate", "createComponent"]);
 function getFileBasename(ctx) {
   const filename = ctx.options.filename;
   const segments = filename.split(PATH_SEPARATOR_REGEX);
@@ -675,6 +677,65 @@ function collectFromStatement(statementPath, ctx) {
     }
   }
 }
+function isComponentDeclarationExport(statementPath) {
+  const declarationPath = unwrapTopLevelDeclaration(statementPath);
+  if (!declarationPath) {
+    return false;
+  }
+  if (declarationPath.isFunctionDeclaration()) {
+    return checkHasJSXReturn(declarationPath);
+  }
+  if (!declarationPath.isVariableDeclaration()) {
+    return false;
+  }
+  const declarations = declarationPath.get("declarations");
+  if (declarations.length === 0) {
+    return false;
+  }
+  return declarations.every((variablePath) => {
+    const initPath = variablePath.get("init");
+    return isFunctionLikeExpressionPath(initPath) && checkHasJSXReturn(initPath);
+  });
+}
+function hasOnlyComponentSpecifiers(statementPath, componentNames) {
+  const { node } = statementPath;
+  if (node.declaration || node.source || node.specifiers.length === 0) {
+    return false;
+  }
+  return node.specifiers.every((specifier) => {
+    return core.types.isExportSpecifier(specifier) && core.types.isIdentifier(specifier.local) && componentNames.has(specifier.local.name);
+  });
+}
+function hasNonComponentExport(programPath, componentNames) {
+  for (const statementPath of programPath.get("body")) {
+    if (!statementPath.isExportNamedDeclaration() && !statementPath.isExportDefaultDeclaration()) {
+      continue;
+    }
+    if (isTypeOnlyExport(statementPath)) {
+      continue;
+    }
+    if (statementPath.isExportNamedDeclaration() && hasOnlyComponentSpecifiers(statementPath, componentNames)) {
+      continue;
+    }
+    if (!isComponentDeclarationExport(statementPath)) {
+      return true;
+    }
+  }
+  return false;
+}
+function isTypeOnlyExport(statementPath) {
+  if (!statementPath.isExportNamedDeclaration()) {
+    return false;
+  }
+  const { declaration, exportKind, specifiers } = statementPath.node;
+  if (exportKind === "type") {
+    return true;
+  }
+  if (core.types.isTSTypeAliasDeclaration(declaration) || core.types.isTSInterfaceDeclaration(declaration)) {
+    return true;
+  }
+  return specifiers.length > 0 && specifiers.every((specifier) => "exportKind" in specifier && specifier.exportKind === "type");
+}
 function getMetadataTargets(statementPath, ctx) {
   const declarationPath = unwrapTopLevelDeclaration(statementPath);
   if (!declarationPath) {
@@ -747,22 +808,101 @@ function isCreateHMRComponentCall(value) {
 function canWrapArgument(value) {
   return !!value && !core.types.isSpreadElement(value) && !core.types.isArgumentPlaceholder(value);
 }
-function wrapComponentCreationCalls(programPath, ctx) {
+function getEssorHmrBindings(programPath) {
+  const bindings = {
+    createComponent: /* @__PURE__ */ new Map(),
+    mount: /* @__PURE__ */ new Map()
+  };
+  for (const statementPath of programPath.get("body")) {
+    if (!statementPath.isImportDeclaration() || statementPath.node.source.value !== ESSOR_IMPORT) {
+      continue;
+    }
+    for (const specifier of statementPath.node.specifiers) {
+      if (!core.types.isImportSpecifier(specifier)) {
+        continue;
+      }
+      const imported = specifier.imported;
+      const name = core.types.isIdentifier(imported) ? imported.name : imported.value;
+      if (!HMR_IMPORTS.has(name)) {
+        continue;
+      }
+      if (name === "createComponent") {
+        const binding = statementPath.scope.getBinding(specifier.local.name);
+        if (binding) {
+          bindings.createComponent.set(specifier.local.name, binding);
+        }
+      } else {
+        const binding = statementPath.scope.getBinding(specifier.local.name);
+        if (binding) {
+          bindings.mount.set(specifier.local.name, binding);
+        }
+      }
+    }
+  }
+  return bindings;
+}
+function hasImportBinding(path, name, bindings) {
+  return bindings.has(name) && path.scope.getBinding(name) === bindings.get(name);
+}
+function isMountCallee(callPath, bindings) {
+  const { callee } = callPath.node;
+  return core.types.isIdentifier(callee) && hasImportBinding(callPath, callee.name, bindings.mount);
+}
+function createImportMetaHot() {
+  return core.types.memberExpression(
+    core.types.metaProperty(core.types.identifier("import"), core.types.identifier("meta")),
+    core.types.identifier("hot")
+  );
+}
+function createDisposeStatement(appId) {
+  const dispose = core.types.optionalMemberExpression(
+    createImportMetaHot(),
+    core.types.identifier("dispose"),
+    false,
+    true
+  );
+  const unmount = core.types.optionalCallExpression(
+    core.types.optionalMemberExpression(appId, core.types.identifier("unmount"), false, true),
+    [],
+    true
+  );
+  return core.types.expressionStatement(
+    core.types.optionalCallExpression(dispose, [core.types.arrowFunctionExpression([], unmount)], false)
+  );
+}
+function wrapTopLevelMountDisposals(programPath, bindings) {
+  const nextBody = [];
+  for (const statementPath of programPath.get("body")) {
+    const statement = statementPath.node;
+    const expressionPath = statementPath.isExpressionStatement() ? statementPath.get("expression") : null;
+    if ((expressionPath == null ? void 0 : expressionPath.isCallExpression()) && isMountCallee(expressionPath, bindings)) {
+      const appId = programPath.scope.generateUidIdentifier("app");
+      nextBody.push(
+        core.types.variableDeclaration("const", [core.types.variableDeclarator(appId, expressionPath.node)])
+      );
+      nextBody.push(createDisposeStatement(appId));
+      continue;
+    }
+    nextBody.push(statement);
+  }
+  programPath.node.body = nextBody;
+}
+function wrapComponentCreationCalls(programPath, ctx, bindings) {
   programPath.traverse({
     /**
-     * Rewrites `createComponent` and `createApp` calls for HMR tracking.
+     * Rewrites `createComponent`, `createApp`, and `hydrate` calls for HMR tracking.
      */
     CallExpression(callPath) {
       const { callee } = callPath.node;
       if (!core.types.isIdentifier(callee)) return;
-      if (callee.name === ctx.importIdentifiers.createComponent.name) {
+      if (callee.name === ctx.importIdentifiers.createComponent.name || hasImportBinding(callPath, callee.name, bindings.createComponent)) {
         const firstArg = callPath.node.arguments[0];
         if (canWrapArgument(firstArg)) {
           callPath.node.callee = core.types.identifier(HMR_COMPONENT_NAME);
         }
         return;
       }
-      if (callee.name === "createApp") {
+      if (isMountCallee(callPath, bindings)) {
         const args = callPath.node.arguments;
         if (args.length === 0) return;
         if (isCreateHMRComponentCall(args[0])) {
@@ -782,6 +922,10 @@ function collectTopLevelHmrComponents(programPath, ctx) {
   for (const statementPath of programPath.get("body")) {
     collectFromStatement(statementPath, ctx);
   }
+  if (hasNonComponentExport(programPath, ctx.hmrComponents)) {
+    ctx.hmrComponents.clear();
+    ctx.hmrSignatures.clear();
+  }
 }
 function applyHmr(programPath, ctx) {
   if (!ctx.options.hmr || !ctx.options.bundler) {
@@ -790,10 +934,12 @@ function applyHmr(programPath, ctx) {
   if (ctx.hmrComponents.size > 0) {
     injectComponentMetadata(programPath, ctx);
   }
-  wrapComponentCreationCalls(programPath, ctx);
+  const bindings = getEssorHmrBindings(programPath);
+  wrapComponentCreationCalls(programPath, ctx, bindings);
   if (ctx.hmrComponents.size === 0) {
     return;
   }
+  wrapTopLevelMountDisposals(programPath, bindings);
   programPath.node.body.push(
     core.types.variableDeclaration("const", [
       core.types.variableDeclarator(

package/dist/index.js

@@ -607,6 +607,8 @@ function checkHasJSXReturn(path) {
 var HMR_COMPONENT_NAME = "__$createHMRComponent$__";
 var WHITESPACE_REGEX = /\s+/g;
 var PATH_SEPARATOR_REGEX = /[/\\]/;
+var ESSOR_IMPORT = "essor";
+var HMR_IMPORTS = /* @__PURE__ */ new Set(["createApp", "hydrate", "createComponent"]);
 function getFileBasename(ctx) {
   const filename = ctx.options.filename;
   const segments = filename.split(PATH_SEPARATOR_REGEX);
@@ -673,6 +675,65 @@ function collectFromStatement(statementPath, ctx) {
     }
   }
 }
+function isComponentDeclarationExport(statementPath) {
+  const declarationPath = unwrapTopLevelDeclaration(statementPath);
+  if (!declarationPath) {
+    return false;
+  }
+  if (declarationPath.isFunctionDeclaration()) {
+    return checkHasJSXReturn(declarationPath);
+  }
+  if (!declarationPath.isVariableDeclaration()) {
+    return false;
+  }
+  const declarations = declarationPath.get("declarations");
+  if (declarations.length === 0) {
+    return false;
+  }
+  return declarations.every((variablePath) => {
+    const initPath = variablePath.get("init");
+    return isFunctionLikeExpressionPath(initPath) && checkHasJSXReturn(initPath);
+  });
+}
+function hasOnlyComponentSpecifiers(statementPath, componentNames) {
+  const { node } = statementPath;
+  if (node.declaration || node.source || node.specifiers.length === 0) {
+    return false;
+  }
+  return node.specifiers.every((specifier) => {
+    return types.isExportSpecifier(specifier) && types.isIdentifier(specifier.local) && componentNames.has(specifier.local.name);
+  });
+}
+function hasNonComponentExport(programPath, componentNames) {
+  for (const statementPath of programPath.get("body")) {
+    if (!statementPath.isExportNamedDeclaration() && !statementPath.isExportDefaultDeclaration()) {
+      continue;
+    }
+    if (isTypeOnlyExport(statementPath)) {
+      continue;
+    }
+    if (statementPath.isExportNamedDeclaration() && hasOnlyComponentSpecifiers(statementPath, componentNames)) {
+      continue;
+    }
+    if (!isComponentDeclarationExport(statementPath)) {
+      return true;
+    }
+  }
+  return false;
+}
+function isTypeOnlyExport(statementPath) {
+  if (!statementPath.isExportNamedDeclaration()) {
+    return false;
+  }
+  const { declaration, exportKind, specifiers } = statementPath.node;
+  if (exportKind === "type") {
+    return true;
+  }
+  if (types.isTSTypeAliasDeclaration(declaration) || types.isTSInterfaceDeclaration(declaration)) {
+    return true;
+  }
+  return specifiers.length > 0 && specifiers.every((specifier) => "exportKind" in specifier && specifier.exportKind === "type");
+}
 function getMetadataTargets(statementPath, ctx) {
   const declarationPath = unwrapTopLevelDeclaration(statementPath);
   if (!declarationPath) {
@@ -745,22 +806,101 @@ function isCreateHMRComponentCall(value) {
 function canWrapArgument(value) {
   return !!value && !types.isSpreadElement(value) && !types.isArgumentPlaceholder(value);
 }
-function wrapComponentCreationCalls(programPath, ctx) {
+function getEssorHmrBindings(programPath) {
+  const bindings = {
+    createComponent: /* @__PURE__ */ new Map(),
+    mount: /* @__PURE__ */ new Map()
+  };
+  for (const statementPath of programPath.get("body")) {
+    if (!statementPath.isImportDeclaration() || statementPath.node.source.value !== ESSOR_IMPORT) {
+      continue;
+    }
+    for (const specifier of statementPath.node.specifiers) {
+      if (!types.isImportSpecifier(specifier)) {
+        continue;
+      }
+      const imported = specifier.imported;
+      const name = types.isIdentifier(imported) ? imported.name : imported.value;
+      if (!HMR_IMPORTS.has(name)) {
+        continue;
+      }
+      if (name === "createComponent") {
+        const binding = statementPath.scope.getBinding(specifier.local.name);
+        if (binding) {
+          bindings.createComponent.set(specifier.local.name, binding);
+        }
+      } else {
+        const binding = statementPath.scope.getBinding(specifier.local.name);
+        if (binding) {
+          bindings.mount.set(specifier.local.name, binding);
+        }
+      }
+    }
+  }
+  return bindings;
+}
+function hasImportBinding(path, name, bindings) {
+  return bindings.has(name) && path.scope.getBinding(name) === bindings.get(name);
+}
+function isMountCallee(callPath, bindings) {
+  const { callee } = callPath.node;
+  return types.isIdentifier(callee) && hasImportBinding(callPath, callee.name, bindings.mount);
+}
+function createImportMetaHot() {
+  return types.memberExpression(
+    types.metaProperty(types.identifier("import"), types.identifier("meta")),
+    types.identifier("hot")
+  );
+}
+function createDisposeStatement(appId) {
+  const dispose = types.optionalMemberExpression(
+    createImportMetaHot(),
+    types.identifier("dispose"),
+    false,
+    true
+  );
+  const unmount = types.optionalCallExpression(
+    types.optionalMemberExpression(appId, types.identifier("unmount"), false, true),
+    [],
+    true
+  );
+  return types.expressionStatement(
+    types.optionalCallExpression(dispose, [types.arrowFunctionExpression([], unmount)], false)
+  );
+}
+function wrapTopLevelMountDisposals(programPath, bindings) {
+  const nextBody = [];
+  for (const statementPath of programPath.get("body")) {
+    const statement = statementPath.node;
+    const expressionPath = statementPath.isExpressionStatement() ? statementPath.get("expression") : null;
+    if ((expressionPath == null ? void 0 : expressionPath.isCallExpression()) && isMountCallee(expressionPath, bindings)) {
+      const appId = programPath.scope.generateUidIdentifier("app");
+      nextBody.push(
+        types.variableDeclaration("const", [types.variableDeclarator(appId, expressionPath.node)])
+      );
+      nextBody.push(createDisposeStatement(appId));
+      continue;
+    }
+    nextBody.push(statement);
+  }
+  programPath.node.body = nextBody;
+}
+function wrapComponentCreationCalls(programPath, ctx, bindings) {
   programPath.traverse({
     /**
-     * Rewrites `createComponent` and `createApp` calls for HMR tracking.
+     * Rewrites `createComponent`, `createApp`, and `hydrate` calls for HMR tracking.
      */
     CallExpression(callPath) {
       const { callee } = callPath.node;
       if (!types.isIdentifier(callee)) return;
-      if (callee.name === ctx.importIdentifiers.createComponent.name) {
+      if (callee.name === ctx.importIdentifiers.createComponent.name || hasImportBinding(callPath, callee.name, bindings.createComponent)) {
         const firstArg = callPath.node.arguments[0];
         if (canWrapArgument(firstArg)) {
           callPath.node.callee = types.identifier(HMR_COMPONENT_NAME);
         }
         return;
       }
-      if (callee.name === "createApp") {
+      if (isMountCallee(callPath, bindings)) {
         const args = callPath.node.arguments;
         if (args.length === 0) return;
         if (isCreateHMRComponentCall(args[0])) {
@@ -780,6 +920,10 @@ function collectTopLevelHmrComponents(programPath, ctx) {
   for (const statementPath of programPath.get("body")) {
     collectFromStatement(statementPath, ctx);
   }
+  if (hasNonComponentExport(programPath, ctx.hmrComponents)) {
+    ctx.hmrComponents.clear();
+    ctx.hmrSignatures.clear();
+  }
 }
 function applyHmr(programPath, ctx) {
   if (!ctx.options.hmr || !ctx.options.bundler) {
@@ -788,10 +932,12 @@ function applyHmr(programPath, ctx) {
   if (ctx.hmrComponents.size > 0) {
     injectComponentMetadata(programPath, ctx);
   }
-  wrapComponentCreationCalls(programPath, ctx);
+  const bindings = getEssorHmrBindings(programPath);
+  wrapComponentCreationCalls(programPath, ctx, bindings);
   if (ctx.hmrComponents.size === 0) {
     return;
   }
+  wrapTopLevelMountDisposals(programPath, bindings);
   programPath.node.body.push(
     types.variableDeclaration("const", [
       types.variableDeclarator(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-essor",
-  "version": "0.0.17-beta.5",
+  "version": "0.0.17-beta.6",
   "description": "",
   "type": "module",
   "keywords": [],
@@ -34,7 +34,7 @@
   "dependencies": {
     "@babel/core": "^7.29.7",
     "@babel/generator": "^7.29.7",
-    "@estjs/shared": "0.0.17-beta.5"
+    "@estjs/shared": "0.0.17-beta.6"
   },
   "devDependencies": {
     "@babel/traverse": "^7.29.7",