@unhead/addons 2.0.0-alpha.21 → 2.0.0-alpha.23

package/dist/shared/{addons.DMDJAAwv.mjs → addons.DAcLivtz.mjs}

@@ -78,6 +78,12 @@ const TreeshakeServerComposables = createUnplugin((options = {}) => {
 
 const UseSeoMetaTransform = createUnplugin((options = {}) => {
   options.imports = options.imports || true;
+  function isValidPackage(s) {
+    if (s === "unhead" || s.startsWith("@unhead")) {
+      return true;
+    }
+    return [...options.importPaths || []].includes(s);
+  }
   return {
     name: "unhead:use-seo-meta-transform",
     enforce: "post",
@@ -99,8 +105,7 @@ const UseSeoMetaTransform = createUnplugin((options = {}) => {
     async transform(code, id) {
       if (!code.includes("useSeoMeta") && !code.includes("useServerSeoMeta"))
         return;
-      const packages = ["unhead", "@unhead/vue", "@unhead/react"];
-      const statements = findStaticImports(code).filter((i) => packages.includes(i.specifier));
+      const statements = findStaticImports(code).filter((i) => isValidPackage(i.specifier));
       const importNames = {};
       for (const i of statements.flatMap((i2) => parseStaticImport(i2))) {
         if (i.namedImports) {
@@ -112,26 +117,36 @@ const UseSeoMetaTransform = createUnplugin((options = {}) => {
       }
       const ast = this.parse(code);
       const s = new MagicString(code);
-      const extraImports = /* @__PURE__ */ new Set();
+      let replacementPayload;
+      let replaceCount = 0;
+      let totalCount = 0;
       walk(ast, {
         enter(_node) {
-          if (options.imports && _node.type === "ImportDeclaration" && packages.includes(_node.source.value)) {
+          if (options.imports && _node.type === "ImportDeclaration" && isValidPackage(_node.source.value)) {
             const node = _node;
-            if (
-              // @ts-expect-error untyped
-              !node.specifiers.some((s2) => s2.type === "ImportSpecifier" && ["useSeoMeta", "useServerSeoMeta"].includes(s2.imported?.name))
-            )
+            const hasSeoMeta = node.specifiers.some(
+              (s2) => s2.type === "ImportSpecifier" && ["useSeoMeta", "useServerSeoMeta"].includes(s2.imported.name)
+            );
+            if (!hasSeoMeta) {
               return;
-            const imports = Object.values(importNames);
-            if (!imports.includes("useHead"))
-              extraImports.add(`import { useHead } from '${node.source.value}'`);
-            if (!imports.includes("useServerHead") && imports.includes("useServerSeoMeta"))
-              extraImports.add(`import { useServerHead } from '${node.source.value}'`);
+            }
+            const toImport = /* @__PURE__ */ new Set();
+            node.specifiers.forEach((spec) => {
+              if (spec.type === "ImportSpecifier" && ["useSeoMeta", "useServerSeoMeta"].includes(spec.imported.name)) {
+                toImport.add(spec.imported.name.includes("Server") ? "useServerHead" : "useHead");
+              } else {
+                toImport.add(spec.imported.name);
+              }
+            });
+            if (toImport.size) {
+              replacementPayload = (useSeoMeta = false) => [node.specifiers[0].start, node.specifiers[node.specifiers.length - 1].end, [...toImport, useSeoMeta ? "useSeoMeta" : false].filter(Boolean).join(", ")];
+            }
           } else if (_node.type === "CallExpression" && _node.callee.type === "Identifier" && Object.keys({
             useSeoMeta: "useSeoMeta",
             useServerSeoMeta: "useServerSeoMeta",
             ...importNames
           }).includes(_node.callee.name)) {
+            replaceCount++;
             const node = _node;
             const calleeName = importNames[node.callee.name] || node.callee.name;
             const properties = node.arguments[0].properties;
@@ -178,7 +193,21 @@ const UseSeoMetaTransform = createUnplugin((options = {}) => {
               }
               let value = code.substring(property.value.start, property.value.end);
               if (property.value.type === "ArrayExpression") {
-                output = false;
+                if (output === false)
+                  return;
+                const elements = property.value.elements;
+                if (!elements.length)
+                  return;
+                const metaTags = elements.map((element) => {
+                  if (element.type !== "ObjectExpression")
+                    return `    { ${key}: '${keyValue}', ${valueKey}: ${code.substring(element.start, element.end)} },`;
+                  return element.properties.map((p) => {
+                    const propKey = p.key.name;
+                    const propValue = code.substring(p.value.start, p.value.end);
+                    return `    { ${key}: '${keyValue}:${propKey}', ${valueKey}: ${propValue} },`;
+                  }).join("\n");
+                });
+                output.push(metaTags.join("\n"));
                 return;
               } else if (property.value.type === "ObjectExpression") {
                 const isStatic = property.value.properties.every((p) => p.value.type === "Literal" && typeof p.value.value === "string");
@@ -209,14 +238,15 @@ const UseSeoMetaTransform = createUnplugin((options = {}) => {
               output.push("})");
               s.overwrite(node.start, node.end, output.join("\n"));
             }
+          } else if (_node.type === "Identifier" && ["useSeoMeta", "useServerSeoMeta"].includes(_node.name)) {
+            totalCount++;
           }
         }
       });
       if (s.hasChanged()) {
-        const prependImports = [...extraImports];
-        if (prependImports.length)
-          s.prepend(`${prependImports.join("\n")}
-`);
+        if (replacementPayload) {
+          s.overwrite(...replacementPayload(replaceCount + 3 === totalCount));
+        }
         return {
           code: s.toString(),
           map: s.generateMap({ includeContent: true, source: id })

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { T as TreeshakeServerComposables, U as UseSeoMetaTransform } from './shared/addons.DMDJAAwv.mjs';
+import { T as TreeshakeServerComposables, U as UseSeoMetaTransform } from './shared/addons.DAcLivtz.mjs';
 import 'node:url';
 import 'ufo';
 import 'unplugin';

package/dist/webpack.mjs

@@ -1,4 +1,4 @@
-import { T as TreeshakeServerComposables, U as UseSeoMetaTransform } from './shared/addons.DMDJAAwv.mjs';
+import { T as TreeshakeServerComposables, U as UseSeoMetaTransform } from './shared/addons.DAcLivtz.mjs';
 import 'node:url';
 import 'ufo';
 import 'unplugin';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unhead/addons",
   "type": "module",
-  "version": "2.0.0-alpha.21",
+  "version": "2.0.0-alpha.23",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -50,7 +50,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "unhead": "2.0.0-alpha.21"
+    "unhead": "2.0.0-alpha.23"
   },
   "dependencies": {
     "@rollup/pluginutils": "^5.1.4",