@unhead/addons 2.0.0-alpha.9 → 2.0.0-beta.0

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

@@ -3,10 +3,10 @@ import { parseURL, parseQuery } from 'ufo';
 import { createUnplugin } from 'unplugin';
 import { transform } from 'unplugin-ast';
 import { createContext, runInContext } from 'node:vm';
-import { resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue } from '@unhead/shared';
 import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
 import { findStaticImports, parseStaticImport } from 'mlly';
+import { resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue } from 'unhead/utils';
 
 function RemoveFunctions(functionNames) {
   return {
@@ -17,7 +17,7 @@ function RemoveFunctions(functionNames) {
   };
 }
 const TreeshakeServerComposables = createUnplugin((options = {}) => {
-  options.enabled = options.enabled !== undefined ? options.enabled : true;
+  options.enabled = options.enabled !== void 0 ? options.enabled : true;
   return {
     name: "unhead:remove-server-composables",
     enforce: "post",
@@ -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"];
-      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;
@@ -169,12 +184,30 @@ const UseSeoMetaTransform = createUnplugin((options = {}) => {
               if (output === false)
                 return;
               const propertyKey = property.key;
-              const key = resolveMetaKeyType(propertyKey.name);
+              let key = resolveMetaKeyType(propertyKey.name);
               const keyValue = resolveMetaKeyValue(propertyKey.name);
-              const valueKey = key === "charset" ? "charset" : "content";
+              let valueKey = "content";
+              if (keyValue === "charset") {
+                valueKey = "charset";
+                key = "charset";
+              }
               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");
@@ -205,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,13 +1,13 @@
-import { T as TreeshakeServerComposables, U as UseSeoMetaTransform } from './shared/addons.CmryBgzY.mjs';
+import { T as TreeshakeServerComposables, U as UseSeoMetaTransform } from './shared/addons.DAcLivtz.mjs';
 import 'node:url';
 import 'ufo';
 import 'unplugin';
 import 'unplugin-ast';
 import 'node:vm';
-import '@unhead/shared';
 import 'estree-walker';
 import 'magic-string';
 import 'mlly';
+import 'unhead/utils';
 
 const vite = (options = {}) => {
   return [

package/dist/webpack.mjs

@@ -1,13 +1,13 @@
-import { T as TreeshakeServerComposables, U as UseSeoMetaTransform } from './shared/addons.CmryBgzY.mjs';
+import { T as TreeshakeServerComposables, U as UseSeoMetaTransform } from './shared/addons.DAcLivtz.mjs';
 import 'node:url';
 import 'ufo';
 import 'unplugin';
 import 'unplugin-ast';
 import 'node:vm';
-import '@unhead/shared';
 import 'estree-walker';
 import 'magic-string';
 import 'mlly';
+import 'unhead/utils';
 
 const webpack = (options = {}) => {
   return [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unhead/addons",
   "type": "module",
-  "version": "2.0.0-alpha.9",
+  "version": "2.0.0-beta.0",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -22,21 +22,18 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
+      "import": "./dist/index.mjs"
     },
     "./vite": {
       "types": "./dist/vite.d.ts",
-      "import": "./dist/vite.mjs",
-      "require": "./dist/vite.cjs"
+      "import": "./dist/vite.mjs"
     },
     "./webpack": {
       "types": "./dist/webpack.d.ts",
-      "import": "./dist/webpack.mjs",
-      "require": "./dist/webpack.cjs"
+      "import": "./dist/webpack.mjs"
     }
   },
-  "main": "dist/index.cjs",
+  "main": "dist/index.mjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "typesVersions": {
@@ -53,7 +50,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "unhead": "2.0.0-alpha.9"
+    "unhead": "2.0.0-beta.0"
   },
   "dependencies": {
     "@rollup/pluginutils": "^5.1.4",
@@ -61,13 +58,11 @@
     "magic-string": "^0.30.17",
     "mlly": "^1.7.4",
     "ufo": "^1.5.4",
-    "unplugin": "^2.1.2",
-    "unplugin-ast": "^0.13.1",
-    "@unhead/schema": "2.0.0-alpha.9",
-    "@unhead/shared": "2.0.0-alpha.9"
+    "unplugin": "^2.2.0",
+    "unplugin-ast": "^0.14.0"
   },
   "devDependencies": {
-    "@babel/types": "^7.26.7"
+    "@babel/types": "^7.26.9"
   },
   "scripts": {
     "build": "unbuild .",

package/dist/index.cjs

@@ -1,16 +0,0 @@
-'use strict';
-
-const plugins = require('unhead/plugins');
-
-const DefaultCriticalTags = {
-  htmlAttrs: {
-    lang: "en"
-  },
-  meta: [
-    { charset: "utf-8" },
-    { name: "viewport", content: "width=device-width, initial-scale=1" }
-  ]
-};
-
-exports.InferSeoMetaPlugin = plugins.InferSeoMetaPlugin;
-exports.DefaultCriticalTags = DefaultCriticalTags;

package/dist/index.d.cts

@@ -1,18 +0,0 @@
-export { InferSeoMetaPlugin } from 'unhead/plugins';
-
-declare const DefaultCriticalTags: {
-    htmlAttrs: {
-        lang: string;
-    };
-    meta: ({
-        charset: string;
-        name?: undefined;
-        content?: undefined;
-    } | {
-        name: string;
-        content: string;
-        charset?: undefined;
-    })[];
-};
-
-export { DefaultCriticalTags };

package/dist/shared/addons.By35C-fR.cjs

@@ -1,232 +0,0 @@
-'use strict';
-
-const node_url = require('node:url');
-const ufo = require('ufo');
-const unplugin = require('unplugin');
-const unpluginAst = require('unplugin-ast');
-const node_vm = require('node:vm');
-const shared = require('@unhead/shared');
-const estreeWalker = require('estree-walker');
-const MagicString = require('magic-string');
-const mlly = require('mlly');
-
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
-
-const MagicString__default = /*#__PURE__*/_interopDefaultCompat(MagicString);
-
-function RemoveFunctions(functionNames) {
-  return {
-    onNode: (node) => node.type === "CallExpression" && node.callee.type === "Identifier" && functionNames.includes(node.callee.name),
-    transform() {
-      return false;
-    }
-  };
-}
-const TreeshakeServerComposables = unplugin.createUnplugin((options = {}) => {
-  options.enabled = options.enabled !== undefined ? options.enabled : true;
-  return {
-    name: "unhead:remove-server-composables",
-    enforce: "post",
-    transformInclude(id) {
-      if (!options.enabled)
-        return false;
-      const { pathname, search } = ufo.parseURL(decodeURIComponent(node_url.pathToFileURL(id).href));
-      const { type } = ufo.parseQuery(search);
-      if (pathname.match(/[\\/]node_modules[\\/]/))
-        return false;
-      if (options.filter?.include?.some((pattern) => id.match(pattern)))
-        return true;
-      if (options.filter?.exclude?.some((pattern) => id.match(pattern)))
-        return false;
-      if (pathname.endsWith(".vue") && (type === "script" || !search))
-        return true;
-      if (pathname.match(/\.((c|m)?j|t)sx?$/g))
-        return true;
-      return false;
-    },
-    async transform(code, id) {
-      if (!code.includes("useServerHead") && !code.includes("useServerHeadSafe") && !code.includes("useServerSeoMeta") && !code.includes("useSchemaOrg")) {
-        return;
-      }
-      let transformed;
-      try {
-        transformed = await unpluginAst.transform(code, id, {
-          parserOptions: {},
-          transformer: [
-            RemoveFunctions([
-              "useServerHead",
-              "useServerHeadSafe",
-              "useServerSeoMeta",
-              // plugins
-              "useSchemaOrg"
-            ])
-          ]
-        });
-      } catch {
-      }
-      return transformed;
-    },
-    webpack(ctx) {
-      if (ctx.name === "server")
-        options.enabled = false;
-    },
-    vite: {
-      apply(config, env) {
-        if (env.ssrBuild || env.isSsrBuild) {
-          options.enabled = false;
-          return true;
-        }
-        return false;
-      }
-    }
-  };
-});
-
-const UseSeoMetaTransform = unplugin.createUnplugin((options = {}) => {
-  options.imports = options.imports || true;
-  return {
-    name: "unhead:use-seo-meta-transform",
-    enforce: "post",
-    transformInclude(id) {
-      const { pathname, search } = ufo.parseURL(decodeURIComponent(node_url.pathToFileURL(id).href));
-      const { type } = ufo.parseQuery(search);
-      if (pathname.match(/[\\/]node_modules[\\/]/))
-        return false;
-      if (options.filter?.include?.some((pattern) => id.match(pattern)))
-        return true;
-      if (options.filter?.exclude?.some((pattern) => id.match(pattern)))
-        return false;
-      if (pathname.endsWith(".vue") && (type === "script" || !search))
-        return true;
-      if (pathname.match(/\.((c|m)?j|t)sx?$/g))
-        return true;
-      return false;
-    },
-    async transform(code, id) {
-      if (!code.includes("useSeoMeta") && !code.includes("useServerSeoMeta"))
-        return;
-      const packages = ["unhead", "@unhead/vue", "unhead"];
-      const statements = mlly.findStaticImports(code).filter((i) => packages.includes(i.specifier));
-      const importNames = {};
-      for (const i of statements.flatMap((i2) => mlly.parseStaticImport(i2))) {
-        if (i.namedImports) {
-          for (const key in i.namedImports) {
-            if (key === "useSeoMeta" || key === "useServerSeoMeta")
-              importNames[i.namedImports[key]] = key;
-          }
-        }
-      }
-      const ast = this.parse(code);
-      const s = new MagicString__default(code);
-      const extraImports = /* @__PURE__ */ new Set();
-      estreeWalker.walk(ast, {
-        enter(_node) {
-          if (options.imports && _node.type === "ImportDeclaration" && packages.includes(_node.source.value)) {
-            const node = _node;
-            if (
-              // @ts-expect-error untyped
-              !node.specifiers.some((s2) => s2.type === "ImportSpecifier" && ["useSeoMeta", "useServerSeoMeta"].includes(s2.imported?.name))
-            )
-              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}'`);
-          } else if (_node.type === "CallExpression" && _node.callee.type === "Identifier" && Object.keys({
-            useSeoMeta: "useSeoMeta",
-            useServerSeoMeta: "useServerSeoMeta",
-            ...importNames
-          }).includes(_node.callee.name)) {
-            const node = _node;
-            const calleeName = importNames[node.callee.name] || node.callee.name;
-            const properties = node.arguments[0].properties;
-            if (!properties)
-              return;
-            let output = [];
-            const title = properties.find((property) => property.key?.name === "title");
-            const titleTemplate = properties.find((property) => property.key?.name === "titleTemplate");
-            const meta = properties.filter((property) => property.key?.name !== "title" && property.key?.name !== "titleTemplate");
-            if (title || titleTemplate || calleeName === "useSeoMeta") {
-              output.push("useHead({");
-              if (title) {
-                output.push(`  title: ${code.substring(title.value.start, title.value.end)},`);
-              }
-              if (titleTemplate) {
-                output.push(`  titleTemplate: ${code.substring(titleTemplate.value.start, titleTemplate.value.end)},`);
-              }
-            }
-            if (calleeName === "useServerSeoMeta") {
-              if (output.length)
-                output.push("});");
-              output.push("useServerHead({");
-            }
-            if (meta.length)
-              output.push("  meta: [");
-            meta.forEach((property) => {
-              if (property.type === "SpreadElement") {
-                output = false;
-                return;
-              }
-              if (property.key.type !== "Identifier" || !property.value) {
-                output = false;
-                return;
-              }
-              if (output === false)
-                return;
-              const propertyKey = property.key;
-              const key = shared.resolveMetaKeyType(propertyKey.name);
-              const keyValue = shared.resolveMetaKeyValue(propertyKey.name);
-              const valueKey = key === "charset" ? "charset" : "content";
-              let value = code.substring(property.value.start, property.value.end);
-              if (property.value.type === "ArrayExpression") {
-                output = false;
-                return;
-              } else if (property.value.type === "ObjectExpression") {
-                const isStatic = property.value.properties.every((p) => p.value.type === "Literal" && typeof p.value.value === "string");
-                if (!isStatic) {
-                  output = false;
-                  return;
-                }
-                const context = node_vm.createContext({
-                  resolvePackedMetaObjectValue: shared.resolvePackedMetaObjectValue
-                });
-                const start = property.value.start;
-                const end = property.value.end;
-                try {
-                  value = JSON.stringify(node_vm.runInContext(`resolvePackedMetaObjectValue(${code.slice(start, end)})`, context));
-                } catch {
-                  output = false;
-                  return;
-                }
-              }
-              if (valueKey === "charset")
-                output.push(`    { ${key}: ${value} },`);
-              else
-                output.push(`    { ${key}: '${keyValue}', ${valueKey}: ${value} },`);
-            });
-            if (output) {
-              if (meta.length)
-                output.push("  ]");
-              output.push("})");
-              s.overwrite(node.start, node.end, output.join("\n"));
-            }
-          }
-        }
-      });
-      if (s.hasChanged()) {
-        const prependImports = [...extraImports];
-        if (prependImports.length)
-          s.prepend(`${prependImports.join("\n")}
-`);
-        return {
-          code: s.toString(),
-          map: s.generateMap({ includeContent: true, source: id })
-        };
-      }
-    }
-  };
-});
-
-exports.TreeshakeServerComposables = TreeshakeServerComposables;
-exports.UseSeoMetaTransform = UseSeoMetaTransform;

package/dist/shared/addons.ChoDmUFv.d.cts

@@ -1,16 +0,0 @@
-import { TreeshakeServerComposablesOptions } from '@unhead/addons/src/unplugin/TreeshakeServerComposables';
-import { UseSeoMetaTransformOptions } from '@unhead/addons/src/unplugin/UseSeoMetaTransform';
-
-interface BaseTransformerTypes {
-    sourcemap?: boolean;
-    filter?: {
-        exclude?: RegExp[];
-        include?: RegExp[];
-    };
-}
-interface UnpluginOptions extends BaseTransformerTypes {
-    treeshake?: TreeshakeServerComposablesOptions;
-    transformSeoMeta?: UseSeoMetaTransformOptions;
-}
-
-export type { UnpluginOptions as U };

package/dist/vite.cjs

@@ -1,21 +0,0 @@
-'use strict';
-
-const UseSeoMetaTransform = require('./shared/addons.By35C-fR.cjs');
-require('node:url');
-require('ufo');
-require('unplugin');
-require('unplugin-ast');
-require('node:vm');
-require('@unhead/shared');
-require('estree-walker');
-require('magic-string');
-require('mlly');
-
-const vite = (options = {}) => {
-  return [
-    UseSeoMetaTransform.TreeshakeServerComposables.vite({ filter: options.filter, sourcemap: options.sourcemap, ...options.treeshake }),
-    UseSeoMetaTransform.UseSeoMetaTransform.vite({ filter: options.filter, sourcemap: options.sourcemap, ...options.transformSeoMeta })
-  ];
-};
-
-module.exports = vite;

package/dist/vite.d.cts

@@ -1,8 +0,0 @@
-import { Plugin } from 'vite';
-import { U as UnpluginOptions } from './shared/addons.ChoDmUFv.cjs';
-import '@unhead/addons/src/unplugin/TreeshakeServerComposables';
-import '@unhead/addons/src/unplugin/UseSeoMetaTransform';
-
-declare const _default: (options?: UnpluginOptions) => Plugin[];
-
-export { UnpluginOptions, _default as default };

package/dist/webpack.cjs

@@ -1,21 +0,0 @@
-'use strict';
-
-const UseSeoMetaTransform = require('./shared/addons.By35C-fR.cjs');
-require('node:url');
-require('ufo');
-require('unplugin');
-require('unplugin-ast');
-require('node:vm');
-require('@unhead/shared');
-require('estree-walker');
-require('magic-string');
-require('mlly');
-
-const webpack = (options = {}) => {
-  return [
-    UseSeoMetaTransform.TreeshakeServerComposables.webpack({ filter: options.filter, sourcemap: options.sourcemap, ...options.treeshake || {} }),
-    UseSeoMetaTransform.UseSeoMetaTransform.webpack({ filter: options.filter, sourcemap: options.sourcemap, ...options.transformSeoMeta || {} })
-  ];
-};
-
-module.exports = webpack;

package/dist/webpack.d.cts

@@ -1,8 +0,0 @@
-import * as webpack from 'webpack';
-import { U as UnpluginOptions } from './shared/addons.ChoDmUFv.cjs';
-import '@unhead/addons/src/unplugin/TreeshakeServerComposables';
-import '@unhead/addons/src/unplugin/UseSeoMetaTransform';
-
-declare const _default: (options?: UnpluginOptions) => webpack.WebpackPluginInstance[];
-
-export { UnpluginOptions, _default as default };