@unhead/solid-js 3.0.0-beta.6 → 3.0.0-beta.7

package/dist/stream/vite.mjs

@@ -1,43 +1,64 @@
 import MagicString from 'magic-string';
-import { findStaticImports } from 'mlly';
-import { parseSync, Visitor } from 'oxc-parser';
+import { parseAndWalk } from 'oxc-walker';
 import { createStreamingPlugin } from 'unhead/stream/vite';
 
 function transform(code, id, isSSR, s) {
   const lang = id.endsWith(".tsx") ? "tsx" : id.endsWith(".jsx") ? "jsx" : "tsx";
-  const result = parseSync(id, code, { lang });
-  if (result.errors.length > 0)
-    return false;
   const returns = [];
-  const visitor = new Visitor({
-    FunctionDeclaration: (node) => processFunction(node),
-    FunctionExpression: (node) => processFunction(node),
-    ArrowFunctionExpression: (node) => processFunction(node)
-  });
-  function processFunction(node) {
-    if (!node.body)
-      return;
-    const bodyCode = code.slice(node.body.start, node.body.end);
-    if (!bodyCode.includes("useHead") && !bodyCode.includes("useSeoMeta") && !bodyCode.includes("useHeadSafe"))
-      return;
-    if (node.body.type === "JSXElement" || node.body.type === "JSXFragment") {
-      returns.push({ jsxStart: node.body.start, jsxEnd: node.body.end });
-      return;
-    }
-    const innerVisitor = new Visitor({
-      ReturnStatement(innerNode) {
-        if (!innerNode.argument)
+  let currentFnHasHead = false;
+  const fnStack = [];
+  const importPath = isSSR ? "@unhead/solid-js/stream/server" : "@unhead/solid-js/stream/client";
+  let existingImport = null;
+  let lastImportEnd = -1;
+  const result = parseAndWalk(code, id, {
+    parseOptions: { lang },
+    enter(node) {
+      if (node.type === "ImportDeclaration") {
+        if (node.source.value === importPath) {
+          existingImport = {
+            start: node.start,
+            end: node.end,
+            specifiers: node.specifiers?.map((spec) => spec.local?.name).filter(Boolean) || []
+          };
+        }
+        if (node.end > lastImportEnd)
+          lastImportEnd = node.end;
+        this.skip();
+        return;
+      }
+      const isFn = node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression";
+      if (isFn) {
+        fnStack.push(currentFnHasHead);
+        if (!node.body) {
+          currentFnHasHead = false;
+          return;
+        }
+        const bodyCode = code.slice(node.body.start, node.body.end);
+        currentFnHasHead = bodyCode.includes("useHead") || bodyCode.includes("useSeoMeta") || bodyCode.includes("useHeadSafe");
+        if (currentFnHasHead && (node.body.type === "JSXElement" || node.body.type === "JSXFragment")) {
+          returns.push({ jsxStart: node.body.start, jsxEnd: node.body.end });
+        }
+        return;
+      }
+      if (currentFnHasHead && node.type === "ReturnStatement") {
+        if (!node.argument)
           return;
-        let arg = innerNode.argument;
+        let arg = node.argument;
         if (arg.type === "ParenthesizedExpression" && arg.expression)
           arg = arg.expression;
         if (arg.type === "JSXElement" || arg.type === "JSXFragment")
           returns.push({ jsxStart: arg.start, jsxEnd: arg.end });
       }
-    });
-    innerVisitor.visit(node.body);
-  }
-  visitor.visit(result.program);
+    },
+    leave(node) {
+      const isFn = node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression";
+      if (isFn) {
+        currentFnHasHead = fnStack.pop();
+      }
+    }
+  });
+  if (result.errors.length > 0)
+    return false;
   if (returns.length === 0)
     return false;
   returns.sort((a, b) => b.jsxStart - a.jsxStart);
@@ -45,22 +66,17 @@ function transform(code, id, isSSR, s) {
     const jsxCode = code.slice(ret.jsxStart, ret.jsxEnd);
     s.overwrite(ret.jsxStart, ret.jsxEnd, `<><HeadStream />${jsxCode}</>`);
   }
-  const importPath = isSSR ? "@unhead/solid-js/stream/server" : "@unhead/solid-js/stream/client";
-  const imports = findStaticImports(code);
-  const existing = imports.find((i) => i.specifier === importPath);
-  if (existing) {
-    if (!existing.imports?.includes("HeadStream")) {
-      const inner = existing.imports?.replace(/^\{\s*|\s*\}\s*$/g, "").trim() || "";
-      s.overwrite(existing.start, existing.end, `import { ${inner ? `${inner}, ` : ""}HeadStream } from '${importPath}'
-`);
+  const foundImport = existingImport;
+  if (foundImport) {
+    if (!foundImport.specifiers.includes("HeadStream")) {
+      const inner = foundImport.specifiers.join(", ");
+      s.overwrite(foundImport.start, foundImport.end, `import { ${inner ? `${inner}, ` : ""}HeadStream } from '${importPath}'`);
     }
+  } else if (lastImportEnd > -1) {
+    s.appendLeft(lastImportEnd, `
+import { HeadStream } from '${importPath}'`);
   } else {
-    const last = imports[imports.length - 1];
-    if (last)
-      s.appendLeft(last.end, `import { HeadStream } from '${importPath}'
-`);
-    else
-      s.prepend(`import { HeadStream } from '${importPath}'
+    s.prepend(`import { HeadStream } from '${importPath}'
 `);
   }
   return true;
@@ -68,13 +84,11 @@ function transform(code, id, isSSR, s) {
 function unheadSolidPlugin(options) {
   return createStreamingPlugin({
     framework: "@unhead/solid-js",
+    filter: /\.[jt]sx$/,
     mode: options?.mode,
     transform(code, id, opts) {
-      if (!/\.[jt]sx$/.test(id))
-        return null;
       const s = new MagicString(code);
-      const transformed = transform(code, id, opts?.ssr ?? false, s);
-      if (!transformed)
+      if (!transform(code, id, opts?.ssr ?? false, s))
         return null;
       return {
         code: s.toString(),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unhead/solid-js",
   "type": "module",
-  "version": "3.0.0-beta.6",
+  "version": "3.0.0-beta.7",
   "description": "Full-stack <head> manager built for SolidJS.",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -98,16 +98,16 @@
   },
   "dependencies": {
     "magic-string": "^0.30.21",
-    "mlly": "^1.8.0",
     "oxc-parser": "^0.106.0",
-    "unhead": "3.0.0-beta.6"
+    "oxc-walker": "^0.7.0",
+    "unhead": "3.0.0-beta.7"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/user-event": "14.6.1",
     "solid-js": "^1.9.10",
-    "vite": "7.2.2",
+    "vite": "^7.2.2",
     "vite-plugin-solid": "^2.11.10"
   },
   "scripts": {