@unhead/addons 1.1.4 → 1.1.6

package/dist/shared/{addons.35bf3c01.cjs → addons.cdb14016.cjs}

@@ -7,7 +7,6 @@ const ufo = require('ufo');
 const node_vm = require('node:vm');
 const unhead = require('unhead');
 const MagicString = require('magic-string');
-const estreeWalker = require('estree-walker');
 const mlly = require('mlly');
 
 const RemoveFunctions = (functionNames) => ({
@@ -17,10 +16,13 @@ const RemoveFunctions = (functionNames) => ({
   }
 });
 const TreeshakeServerComposables = unplugin.createUnplugin(() => {
+  let enabled = true;
   return {
     name: "unhead:remove-server-composables",
     enforce: "post",
     transformInclude(id) {
+      if (!enabled)
+        return false;
       const { pathname, search } = ufo.parseURL(decodeURIComponent(node_url.pathToFileURL(id).href));
       const { type } = ufo.parseQuery(search);
       if (pathname.includes("node_modules"))
@@ -32,9 +34,8 @@ const TreeshakeServerComposables = unplugin.createUnplugin(() => {
       return false;
     },
     async transform(code, id) {
-      if (!code.includes("useServerHead") && !code.includes("useServerHeadSafe") && !code.includes("useServerSeoMeta") && !code.includes("useSchemaOrg")) {
+      if (!code.includes("useServerHead") && !code.includes("useServerHeadSafe") && !code.includes("useServerSeoMeta") && !code.includes("useSchemaOrg"))
         return;
-      }
       let transformed;
       try {
         transformed = await unpluginAst.transform(code, id, {
@@ -55,11 +56,12 @@ const TreeshakeServerComposables = unplugin.createUnplugin(() => {
     },
     webpack(ctx) {
       if (ctx.name === "server")
-        ;
+        enabled = false;
     },
     vite: {
       apply(config, env) {
         if (env.ssrBuild) {
+          enabled = false;
           return true;
         }
         return false;
@@ -68,6 +70,238 @@ const TreeshakeServerComposables = unplugin.createUnplugin(() => {
   };
 });
 
+/**
+ * @typedef { import('estree').Node} Node
+ * @typedef {{
+ *   skip: () => void;
+ *   remove: () => void;
+ *   replace: (node: Node) => void;
+ * }} WalkerContext
+ */
+
+class WalkerBase {
+	constructor() {
+		/** @type {boolean} */
+		this.should_skip = false;
+
+		/** @type {boolean} */
+		this.should_remove = false;
+
+		/** @type {Node | null} */
+		this.replacement = null;
+
+		/** @type {WalkerContext} */
+		this.context = {
+			skip: () => (this.should_skip = true),
+			remove: () => (this.should_remove = true),
+			replace: (node) => (this.replacement = node)
+		};
+	}
+
+	/**
+	 * @template {Node} Parent
+	 * @param {Parent | null | undefined} parent
+	 * @param {keyof Parent | null | undefined} prop
+	 * @param {number | null | undefined} index
+	 * @param {Node} node
+	 */
+	replace(parent, prop, index, node) {
+		if (parent && prop) {
+			if (index != null) {
+				/** @type {Array<Node>} */ (parent[prop])[index] = node;
+			} else {
+				/** @type {Node} */ (parent[prop]) = node;
+			}
+		}
+	}
+
+	/**
+	 * @template {Node} Parent
+	 * @param {Parent | null | undefined} parent
+	 * @param {keyof Parent | null | undefined} prop
+	 * @param {number | null | undefined} index
+	 */
+	remove(parent, prop, index) {
+		if (parent && prop) {
+			if (index !== null && index !== undefined) {
+				/** @type {Array<Node>} */ (parent[prop]).splice(index, 1);
+			} else {
+				delete parent[prop];
+			}
+		}
+	}
+}
+
+/**
+ * @typedef { import('estree').Node} Node
+ * @typedef { import('./walker.js').WalkerContext} WalkerContext
+ * @typedef {(
+ *    this: WalkerContext,
+ *    node: Node,
+ *    parent: Node | null,
+ *    key: string | number | symbol | null | undefined,
+ *    index: number | null | undefined
+ * ) => void} SyncHandler
+ */
+
+class SyncWalker extends WalkerBase {
+	/**
+	 *
+	 * @param {SyncHandler} [enter]
+	 * @param {SyncHandler} [leave]
+	 */
+	constructor(enter, leave) {
+		super();
+
+		/** @type {boolean} */
+		this.should_skip = false;
+
+		/** @type {boolean} */
+		this.should_remove = false;
+
+		/** @type {Node | null} */
+		this.replacement = null;
+
+		/** @type {WalkerContext} */
+		this.context = {
+			skip: () => (this.should_skip = true),
+			remove: () => (this.should_remove = true),
+			replace: (node) => (this.replacement = node)
+		};
+
+		/** @type {SyncHandler | undefined} */
+		this.enter = enter;
+
+		/** @type {SyncHandler | undefined} */
+		this.leave = leave;
+	}
+
+	/**
+	 * @template {Node} Parent
+	 * @param {Node} node
+	 * @param {Parent | null} parent
+	 * @param {keyof Parent} [prop]
+	 * @param {number | null} [index]
+	 * @returns {Node | null}
+	 */
+	visit(node, parent, prop, index) {
+		if (node) {
+			if (this.enter) {
+				const _should_skip = this.should_skip;
+				const _should_remove = this.should_remove;
+				const _replacement = this.replacement;
+				this.should_skip = false;
+				this.should_remove = false;
+				this.replacement = null;
+
+				this.enter.call(this.context, node, parent, prop, index);
+
+				if (this.replacement) {
+					node = this.replacement;
+					this.replace(parent, prop, index, node);
+				}
+
+				if (this.should_remove) {
+					this.remove(parent, prop, index);
+				}
+
+				const skipped = this.should_skip;
+				const removed = this.should_remove;
+
+				this.should_skip = _should_skip;
+				this.should_remove = _should_remove;
+				this.replacement = _replacement;
+
+				if (skipped) return node;
+				if (removed) return null;
+			}
+
+			/** @type {keyof Node} */
+			let key;
+
+			for (key in node) {
+				/** @type {unknown} */
+				const value = node[key];
+
+				if (value && typeof value === 'object') {
+					if (Array.isArray(value)) {
+						const nodes = /** @type {Array<unknown>} */ (value);
+						for (let i = 0; i < nodes.length; i += 1) {
+							const item = nodes[i];
+							if (isNode(item)) {
+								if (!this.visit(item, node, key, i)) {
+									// removed
+									i--;
+								}
+							}
+						}
+					} else if (isNode(value)) {
+						this.visit(value, node, key, null);
+					}
+				}
+			}
+
+			if (this.leave) {
+				const _replacement = this.replacement;
+				const _should_remove = this.should_remove;
+				this.replacement = null;
+				this.should_remove = false;
+
+				this.leave.call(this.context, node, parent, prop, index);
+
+				if (this.replacement) {
+					node = this.replacement;
+					this.replace(parent, prop, index, node);
+				}
+
+				if (this.should_remove) {
+					this.remove(parent, prop, index);
+				}
+
+				const removed = this.should_remove;
+
+				this.replacement = _replacement;
+				this.should_remove = _should_remove;
+
+				if (removed) return null;
+			}
+		}
+
+		return node;
+	}
+}
+
+/**
+ * Ducktype a node.
+ *
+ * @param {unknown} value
+ * @returns {value is Node}
+ */
+function isNode(value) {
+	return (
+		value !== null && typeof value === 'object' && 'type' in value && typeof value.type === 'string'
+	);
+}
+
+/**
+ * @typedef {import('estree').Node} Node
+ * @typedef {import('./sync.js').SyncHandler} SyncHandler
+ * @typedef {import('./async.js').AsyncHandler} AsyncHandler
+ */
+
+/**
+ * @param {Node} ast
+ * @param {{
+ *   enter?: SyncHandler
+ *   leave?: SyncHandler
+ * }} walker
+ * @returns {Node | null}
+ */
+function walk(ast, { enter, leave }) {
+	const instance = new SyncWalker(enter, leave);
+	return instance.visit(ast, null);
+}
+
 const UseSeoMetaTransform = unplugin.createUnplugin(() => {
   return {
     name: "unhead:use-seo-meta-transform",
@@ -98,7 +332,7 @@ const UseSeoMetaTransform = unplugin.createUnplugin(() => {
       const ast = this.parse(code);
       const s = new MagicString(code);
       const extraImports = /* @__PURE__ */ new Set();
-      estreeWalker.walk(ast, {
+      walk(ast, {
         enter(_node) {
           if (_node.type === "ImportDeclaration" && packages.includes(_node.source.value)) {
             if (!_node.specifiers.some((s2) => s2.type === "ImportSpecifier" && ["useSeoMeta", "useServerSeoMeta"].includes(s2.imported?.name)))

package/dist/shared/{addons.687f69d7.mjs → addons.f060f6c8.mjs}

@@ -5,7 +5,6 @@ import { parseURL, parseQuery } from 'ufo';
 import { createContext, runInContext } from 'node:vm';
 import { resolveMetaKeyType, MetaPackingSchema, fixKeyCase, resolvePackedMetaObjectValue } from 'unhead';
 import MagicString from 'magic-string';
-import { walk } from 'estree-walker';
 import { findStaticImports, parseStaticImport } from 'mlly';
 
 const RemoveFunctions = (functionNames) => ({
@@ -15,10 +14,13 @@ const RemoveFunctions = (functionNames) => ({
   }
 });
 const TreeshakeServerComposables = createUnplugin(() => {
+  let enabled = true;
   return {
     name: "unhead:remove-server-composables",
     enforce: "post",
     transformInclude(id) {
+      if (!enabled)
+        return false;
       const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href));
       const { type } = parseQuery(search);
       if (pathname.includes("node_modules"))
@@ -30,9 +32,8 @@ const TreeshakeServerComposables = createUnplugin(() => {
       return false;
     },
     async transform(code, id) {
-      if (!code.includes("useServerHead") && !code.includes("useServerHeadSafe") && !code.includes("useServerSeoMeta") && !code.includes("useSchemaOrg")) {
+      if (!code.includes("useServerHead") && !code.includes("useServerHeadSafe") && !code.includes("useServerSeoMeta") && !code.includes("useSchemaOrg"))
         return;
-      }
       let transformed;
       try {
         transformed = await transform(code, id, {
@@ -53,11 +54,12 @@ const TreeshakeServerComposables = createUnplugin(() => {
     },
     webpack(ctx) {
       if (ctx.name === "server")
-        ;
+        enabled = false;
     },
     vite: {
       apply(config, env) {
         if (env.ssrBuild) {
+          enabled = false;
           return true;
         }
         return false;
@@ -66,6 +68,238 @@ const TreeshakeServerComposables = createUnplugin(() => {
   };
 });
 
+/**
+ * @typedef { import('estree').Node} Node
+ * @typedef {{
+ *   skip: () => void;
+ *   remove: () => void;
+ *   replace: (node: Node) => void;
+ * }} WalkerContext
+ */
+
+class WalkerBase {
+	constructor() {
+		/** @type {boolean} */
+		this.should_skip = false;
+
+		/** @type {boolean} */
+		this.should_remove = false;
+
+		/** @type {Node | null} */
+		this.replacement = null;
+
+		/** @type {WalkerContext} */
+		this.context = {
+			skip: () => (this.should_skip = true),
+			remove: () => (this.should_remove = true),
+			replace: (node) => (this.replacement = node)
+		};
+	}
+
+	/**
+	 * @template {Node} Parent
+	 * @param {Parent | null | undefined} parent
+	 * @param {keyof Parent | null | undefined} prop
+	 * @param {number | null | undefined} index
+	 * @param {Node} node
+	 */
+	replace(parent, prop, index, node) {
+		if (parent && prop) {
+			if (index != null) {
+				/** @type {Array<Node>} */ (parent[prop])[index] = node;
+			} else {
+				/** @type {Node} */ (parent[prop]) = node;
+			}
+		}
+	}
+
+	/**
+	 * @template {Node} Parent
+	 * @param {Parent | null | undefined} parent
+	 * @param {keyof Parent | null | undefined} prop
+	 * @param {number | null | undefined} index
+	 */
+	remove(parent, prop, index) {
+		if (parent && prop) {
+			if (index !== null && index !== undefined) {
+				/** @type {Array<Node>} */ (parent[prop]).splice(index, 1);
+			} else {
+				delete parent[prop];
+			}
+		}
+	}
+}
+
+/**
+ * @typedef { import('estree').Node} Node
+ * @typedef { import('./walker.js').WalkerContext} WalkerContext
+ * @typedef {(
+ *    this: WalkerContext,
+ *    node: Node,
+ *    parent: Node | null,
+ *    key: string | number | symbol | null | undefined,
+ *    index: number | null | undefined
+ * ) => void} SyncHandler
+ */
+
+class SyncWalker extends WalkerBase {
+	/**
+	 *
+	 * @param {SyncHandler} [enter]
+	 * @param {SyncHandler} [leave]
+	 */
+	constructor(enter, leave) {
+		super();
+
+		/** @type {boolean} */
+		this.should_skip = false;
+
+		/** @type {boolean} */
+		this.should_remove = false;
+
+		/** @type {Node | null} */
+		this.replacement = null;
+
+		/** @type {WalkerContext} */
+		this.context = {
+			skip: () => (this.should_skip = true),
+			remove: () => (this.should_remove = true),
+			replace: (node) => (this.replacement = node)
+		};
+
+		/** @type {SyncHandler | undefined} */
+		this.enter = enter;
+
+		/** @type {SyncHandler | undefined} */
+		this.leave = leave;
+	}
+
+	/**
+	 * @template {Node} Parent
+	 * @param {Node} node
+	 * @param {Parent | null} parent
+	 * @param {keyof Parent} [prop]
+	 * @param {number | null} [index]
+	 * @returns {Node | null}
+	 */
+	visit(node, parent, prop, index) {
+		if (node) {
+			if (this.enter) {
+				const _should_skip = this.should_skip;
+				const _should_remove = this.should_remove;
+				const _replacement = this.replacement;
+				this.should_skip = false;
+				this.should_remove = false;
+				this.replacement = null;
+
+				this.enter.call(this.context, node, parent, prop, index);
+
+				if (this.replacement) {
+					node = this.replacement;
+					this.replace(parent, prop, index, node);
+				}
+
+				if (this.should_remove) {
+					this.remove(parent, prop, index);
+				}
+
+				const skipped = this.should_skip;
+				const removed = this.should_remove;
+
+				this.should_skip = _should_skip;
+				this.should_remove = _should_remove;
+				this.replacement = _replacement;
+
+				if (skipped) return node;
+				if (removed) return null;
+			}
+
+			/** @type {keyof Node} */
+			let key;
+
+			for (key in node) {
+				/** @type {unknown} */
+				const value = node[key];
+
+				if (value && typeof value === 'object') {
+					if (Array.isArray(value)) {
+						const nodes = /** @type {Array<unknown>} */ (value);
+						for (let i = 0; i < nodes.length; i += 1) {
+							const item = nodes[i];
+							if (isNode(item)) {
+								if (!this.visit(item, node, key, i)) {
+									// removed
+									i--;
+								}
+							}
+						}
+					} else if (isNode(value)) {
+						this.visit(value, node, key, null);
+					}
+				}
+			}
+
+			if (this.leave) {
+				const _replacement = this.replacement;
+				const _should_remove = this.should_remove;
+				this.replacement = null;
+				this.should_remove = false;
+
+				this.leave.call(this.context, node, parent, prop, index);
+
+				if (this.replacement) {
+					node = this.replacement;
+					this.replace(parent, prop, index, node);
+				}
+
+				if (this.should_remove) {
+					this.remove(parent, prop, index);
+				}
+
+				const removed = this.should_remove;
+
+				this.replacement = _replacement;
+				this.should_remove = _should_remove;
+
+				if (removed) return null;
+			}
+		}
+
+		return node;
+	}
+}
+
+/**
+ * Ducktype a node.
+ *
+ * @param {unknown} value
+ * @returns {value is Node}
+ */
+function isNode(value) {
+	return (
+		value !== null && typeof value === 'object' && 'type' in value && typeof value.type === 'string'
+	);
+}
+
+/**
+ * @typedef {import('estree').Node} Node
+ * @typedef {import('./sync.js').SyncHandler} SyncHandler
+ * @typedef {import('./async.js').AsyncHandler} AsyncHandler
+ */
+
+/**
+ * @param {Node} ast
+ * @param {{
+ *   enter?: SyncHandler
+ *   leave?: SyncHandler
+ * }} walker
+ * @returns {Node | null}
+ */
+function walk(ast, { enter, leave }) {
+	const instance = new SyncWalker(enter, leave);
+	return instance.visit(ast, null);
+}
+
 const UseSeoMetaTransform = createUnplugin(() => {
   return {
     name: "unhead:use-seo-meta-transform",

package/dist/vite.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const UseSeoMetaTransform = require('./shared/addons.35bf3c01.cjs');
+const UseSeoMetaTransform = require('./shared/addons.cdb14016.cjs');
 require('node:url');
 require('unplugin');
 require('unplugin-ast');
@@ -8,7 +8,6 @@ require('ufo');
 require('node:vm');
 require('unhead');
 require('magic-string');
-require('estree-walker');
 require('mlly');
 
 const vite = () => {

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { T as TreeshakeServerComposables, U as UseSeoMetaTransform } from './shared/addons.687f69d7.mjs';
+import { T as TreeshakeServerComposables, U as UseSeoMetaTransform } from './shared/addons.f060f6c8.mjs';
 import 'node:url';
 import 'unplugin';
 import 'unplugin-ast';
@@ -6,7 +6,6 @@ import 'ufo';
 import 'node:vm';
 import 'unhead';
 import 'magic-string';
-import 'estree-walker';
 import 'mlly';
 
 const vite = () => {

package/dist/webpack.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const UseSeoMetaTransform = require('./shared/addons.35bf3c01.cjs');
+const UseSeoMetaTransform = require('./shared/addons.cdb14016.cjs');
 require('node:url');
 require('unplugin');
 require('unplugin-ast');
@@ -8,7 +8,6 @@ require('ufo');
 require('node:vm');
 require('unhead');
 require('magic-string');
-require('estree-walker');
 require('mlly');
 
 const webpack = () => {

package/dist/webpack.mjs

@@ -1,4 +1,4 @@
-import { T as TreeshakeServerComposables, U as UseSeoMetaTransform } from './shared/addons.687f69d7.mjs';
+import { T as TreeshakeServerComposables, U as UseSeoMetaTransform } from './shared/addons.f060f6c8.mjs';
 import 'node:url';
 import 'unplugin';
 import 'unplugin-ast';
@@ -6,7 +6,6 @@ import 'ufo';
 import 'node:vm';
 import 'unhead';
 import 'magic-string';
-import 'estree-walker';
 import 'mlly';
 
 const webpack = () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unhead/addons",
   "type": "module",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "packageManager": "pnpm@7.27.1",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -51,18 +51,18 @@
   ],
   "dependencies": {
     "@rollup/pluginutils": "^5.0.2",
-    "estree-walker": "^3.0.3",
     "magic-string": "^0.30.0",
     "mlly": "^1.1.1",
     "ufo": "^1.1.0",
     "unplugin": "^1.1.0",
     "unplugin-ast": "^0.7.0",
-    "@unhead/schema": "1.1.4",
-    "@unhead/shared": "1.1.4",
-    "unhead": "1.1.4"
+    "@unhead/schema": "1.1.6",
+    "@unhead/shared": "1.1.6",
+    "unhead": "1.1.6"
   },
   "devDependencies": {
-    "@babel/types": "^7.21.0"
+    "@babel/types": "^7.21.2",
+    "estree-walker": "^3.0.3"
   },
   "scripts": {
     "build": "unbuild .",