@vue-jsx-vapor/macros 2.4.1 → 2.4.3

package/dist/api.cjs

@@ -1,4 +1,4 @@
-const require_core = require('./core-BP7HnDkZ.cjs');
+const require_core = require('./core-BQThMqcW.cjs');
 
 exports.getMacroExpression = require_core.getMacroExpression;
 exports.isFunctionalNode = require_core.isFunctionalNode;

package/dist/api.d.cts

@@ -1,11 +1,11 @@
-import { OptionsResolved } from "./options-BxlJkUDe.cjs";
+import { OptionsResolved } from "./options-Egmm6BVJ.cjs";
 import { CodeTransform, MagicStringAST } from "@vue-macros/common";
 import { ArrowFunctionExpression, CallExpression, FunctionDeclaration, FunctionExpression, LVal, Node } from "@babel/types";
 
-//#region src/core/babel-utils.d.ts
-
+//#region src/core/utils.d.ts
 type FunctionalNode = FunctionDeclaration | FunctionExpression | ArrowFunctionExpression;
-declare function isFunctionalNode(node?: Node | null): node is FunctionalNode; //#endregion
+declare function isFunctionalNode(node?: Node | null): node is FunctionalNode;
+//#endregion
 //#region src/core/restructure.d.ts
 type Options = {
   withDefaultsFrom?: string;
@@ -20,7 +20,6 @@ type Prop = {
   isRest?: boolean;
 };
 declare function restructure(s: MagicStringAST, node: FunctionalNode, options?: Options): Prop[];
-
 //#endregion
 //#region src/core/index.d.ts
 type DefineStyle = {
@@ -43,6 +42,5 @@ type Macros = {
 };
 declare function transformJsxMacros(code: string, id: string, importMap: Map<string, string>, options: OptionsResolved): CodeTransform | undefined;
 declare function getMacroExpression(node: Node, options: OptionsResolved): CallExpression | undefined;
-
 //#endregion
 export { DefineStyle, Macros, getMacroExpression, isFunctionalNode, restructure, transformJsxMacros };

package/dist/api.d.ts

@@ -1,11 +1,11 @@
-import { OptionsResolved } from "./options-QKLCzlvG.js";
+import { OptionsResolved } from "./options-K4yleEdU.js";
 import { CodeTransform, MagicStringAST } from "@vue-macros/common";
 import { ArrowFunctionExpression, CallExpression, FunctionDeclaration, FunctionExpression, LVal, Node } from "@babel/types";
 
-//#region src/core/babel-utils.d.ts
-
+//#region src/core/utils.d.ts
 type FunctionalNode = FunctionDeclaration | FunctionExpression | ArrowFunctionExpression;
-declare function isFunctionalNode(node?: Node | null): node is FunctionalNode; //#endregion
+declare function isFunctionalNode(node?: Node | null): node is FunctionalNode;
+//#endregion
 //#region src/core/restructure.d.ts
 type Options = {
   withDefaultsFrom?: string;
@@ -20,7 +20,6 @@ type Prop = {
   isRest?: boolean;
 };
 declare function restructure(s: MagicStringAST, node: FunctionalNode, options?: Options): Prop[];
-
 //#endregion
 //#region src/core/index.d.ts
 type DefineStyle = {
@@ -43,6 +42,5 @@ type Macros = {
 };
 declare function transformJsxMacros(code: string, id: string, importMap: Map<string, string>, options: OptionsResolved): CodeTransform | undefined;
 declare function getMacroExpression(node: Node, options: OptionsResolved): CallExpression | undefined;
-
 //#endregion
 export { DefineStyle, Macros, getMacroExpression, isFunctionalNode, restructure, transformJsxMacros };

package/dist/api.js

@@ -1,3 +1,3 @@
-import { getMacroExpression, isFunctionalNode, restructure, transformJsxMacros } from "./core-Bo9gAeWA.js";
+import { getMacroExpression, isFunctionalNode, restructure, transformJsxMacros } from "./core-DNI6OWXg.js";
 
 export { getMacroExpression, isFunctionalNode, restructure, transformJsxMacros };

package/dist/astro.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-BP7HnDkZ.cjs');
-require('./raw-DrrIS86r.cjs');
+require('./core-BQThMqcW.cjs');
+require('./raw-1tKjLen5.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-HPKL-RKa.cjs');
+const require_src = require('./src-CoejG7EN.cjs');
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/astro.d.cts

@@ -1,4 +1,4 @@
-import { Options } from "./options-BxlJkUDe.cjs";
+import { Options } from "./options-Egmm6BVJ.cjs";
 
 //#region src/astro.d.ts
 declare const _default: (options: Options) => {
@@ -6,5 +6,6 @@ declare const _default: (options: Options) => {
   hooks: {
     'astro:config:setup': (astro: any) => void;
   };
-}; //#endregion
+};
+//#endregion
 export { _default as default };

package/dist/astro.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./options-QKLCzlvG.js";
+import { Options } from "./options-K4yleEdU.js";
 
 //#region src/astro.d.ts
 declare const _default: (options: Options) => {
@@ -6,5 +6,6 @@ declare const _default: (options: Options) => {
   hooks: {
     'astro:config:setup': (astro: any) => void;
   };
-}; //#endregion
+};
+//#endregion
 export { _default as default };

package/dist/astro.js

@@ -1,7 +1,7 @@
-import "./core-Bo9gAeWA.js";
-import "./raw-BLYamp8z.js";
+import "./core-DNI6OWXg.js";
+import "./raw-D9bTtojC.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-DyWBtz6W.js";
+import { src_default } from "./src-Cf1P9kTp.js";
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/{core-BP7HnDkZ.cjs → core-BQThMqcW.cjs}

@@ -2,197 +2,21 @@ const require_chunk = require('./chunk-CUT6urMc.cjs');
 const __vue_macros_common = require_chunk.__toESM(require("@vue-macros/common"));
 const hash_sum = require_chunk.__toESM(require("hash-sum"));
 
-//#region src/core/babel-utils.ts
-/**
-* Return value indicates whether the AST walked can be a constant
-*/
-function walkIdentifiers(root, onIdentifier, includeAll = false, parentStack = [], knownIds = Object.create(null)) {
-	const rootExp = root.type === "Program" ? root.body[0].type === "ExpressionStatement" && root.body[0].expression : root;
-	(0, __vue_macros_common.walkAST)(root, {
-		enter(node, parent) {
-			parent && parentStack.push(parent);
-			if (parent && parent.type.startsWith("TS") && !TS_NODE_TYPES.includes(parent.type)) return this.skip();
-			if (node.type === "Identifier" || node.type === "JSXIdentifier") {
-				const isLocal = !!knownIds[node.name];
-				const isRefed = isReferencedIdentifier(node, parent, parentStack);
-				if (includeAll || isRefed && !isLocal) onIdentifier(node, parent, parentStack, isRefed, isLocal);
-			} else if (node.type === "ObjectProperty" && parent?.type === "ObjectPattern") node.inPattern = true;
-			else if (isFunctionType$1(node)) if (node.scopeIds) node.scopeIds.forEach((id) => markKnownIds(id, knownIds));
-			else walkFunctionParams(node, (id) => markScopeIdentifier(node, id, knownIds));
-			else if (node.type === "BlockStatement") if (node.scopeIds) node.scopeIds.forEach((id) => markKnownIds(id, knownIds));
-			else walkBlockDeclarations(node, (id) => markScopeIdentifier(node, id, knownIds));
-			else if (node.type === "CatchClause" && node.param) for (const id of extractIdentifiers(node.param)) markScopeIdentifier(node, id, knownIds);
-			else if (isForStatement(node)) walkForStatement(node, false, (id) => markScopeIdentifier(node, id, knownIds));
-		},
-		leave(node, parent) {
-			parent && parentStack.pop();
-			if (node !== rootExp && node.scopeIds) for (const id of node.scopeIds) {
-				knownIds[id]--;
-				if (knownIds[id] === 0) delete knownIds[id];
-			}
-		}
-	});
-}
-function isReferencedIdentifier(id, parent, parentStack) {
-	if (!parent) return true;
-	if (id.name === "arguments") return false;
-	if (isReferenced(id, parent)) return true;
-	switch (parent.type) {
-		case "AssignmentExpression":
-		case "AssignmentPattern": return true;
-		case "ObjectPattern":
-		case "ArrayPattern": return isInDestructureAssignment(parent, parentStack);
-	}
-	return false;
-}
-function isInDestructureAssignment(parent, parentStack) {
-	if (parent && (parent.type === "ObjectProperty" || parent.type === "ArrayPattern")) {
-		let i = parentStack.length;
-		while (i--) {
-			const p = parentStack[i];
-			if (p.type === "AssignmentExpression") return true;
-			else if (p.type !== "ObjectProperty" && !p.type.endsWith("Pattern")) break;
-		}
-	}
-	return false;
-}
-function walkFunctionParams(node, onIdent) {
-	for (const p of node.params) for (const id of extractIdentifiers(p)) onIdent(id);
-}
-function walkBlockDeclarations(block, onIdent) {
-	for (const stmt of block.body) if (stmt.type === "VariableDeclaration") {
-		if (stmt.declare) continue;
-		for (const decl of stmt.declarations) for (const id of extractIdentifiers(decl.id)) onIdent(id);
-	} else if (stmt.type === "FunctionDeclaration" || stmt.type === "ClassDeclaration") {
-		if (stmt.declare || !stmt.id) continue;
-		onIdent(stmt.id);
-	} else if (isForStatement(stmt)) walkForStatement(stmt, true, onIdent);
-}
-function isForStatement(stmt) {
-	return stmt.type === "ForOfStatement" || stmt.type === "ForInStatement" || stmt.type === "ForStatement";
-}
-function walkForStatement(stmt, isVar, onIdent) {
-	const variable = stmt.type === "ForStatement" ? stmt.init : stmt.left;
-	if (variable && variable.type === "VariableDeclaration" && (variable.kind === "var" ? isVar : !isVar)) for (const decl of variable.declarations) for (const id of extractIdentifiers(decl.id)) onIdent(id);
-}
-function extractIdentifiers(param, nodes = []) {
-	switch (param.type) {
-		case "Identifier":
-			nodes.push(param);
-			break;
-		case "MemberExpression": {
-			let object = param;
-			while (object.type === "MemberExpression") object = object.object;
-			nodes.push(object);
-			break;
-		}
-		case "JSXMemberExpression": {
-			let object = param;
-			while (object.type === "JSXMemberExpression") object = object.object;
-			nodes.push(object);
-			break;
-		}
-		case "ObjectPattern":
-			for (const prop of param.properties) if (prop.type === "RestElement") extractIdentifiers(prop.argument, nodes);
-			else extractIdentifiers(prop.value, nodes);
-			break;
-		case "ArrayPattern":
-			param.elements.forEach((element) => {
-				if (element) extractIdentifiers(element, nodes);
-			});
-			break;
-		case "RestElement":
-			extractIdentifiers(param.argument, nodes);
-			break;
-		case "AssignmentPattern":
-			extractIdentifiers(param.left, nodes);
-			break;
-	}
-	return nodes;
-}
-function markKnownIds(name, knownIds) {
-	if (name in knownIds) knownIds[name]++;
-	else knownIds[name] = 1;
-}
-function markScopeIdentifier(node, child, knownIds) {
-	const { name } = child;
-	if (node.scopeIds && node.scopeIds.has(name)) return;
-	markKnownIds(name, knownIds);
-	(node.scopeIds || (node.scopeIds = new Set())).add(name);
-}
-const isFunctionType$1 = (node) => {
-	return /Function(?:Expression|Declaration)$|Method$/.test(node.type);
-};
-/**
-* Copied from https://github.com/babel/babel/blob/main/packages/babel-types/src/validators/isReferenced.ts
-* To avoid runtime dependency on @babel/types (which includes process references)
-* This file should not change very often in babel but we may need to keep it
-* up-to-date from time to time.
-*
-* https://github.com/babel/babel/blob/main/LICENSE
-*
-*/
-function isReferenced(node, parent, grandparent) {
-	switch (parent.type) {
-		case "MemberExpression":
-		case "OptionalMemberExpression":
-			if (parent.property === node) return !!parent.computed;
-			return parent.object === node;
-		case "JSXMemberExpression": return parent.object === node;
-		case "VariableDeclarator": return parent.init === node;
-		case "ArrowFunctionExpression": return parent.body === node;
-		case "PrivateName": return false;
-		case "ClassMethod":
-		case "ClassPrivateMethod":
-		case "ObjectMethod":
-			if (parent.key === node) return !!parent.computed;
-			return false;
-		case "ObjectProperty":
-			if (parent.key === node) return !!parent.computed;
-			return !grandparent || grandparent.type !== "ObjectPattern";
-		case "ClassProperty":
-			if (parent.key === node) return !!parent.computed;
-			return true;
-		case "ClassPrivateProperty": return parent.key !== node;
-		case "ClassDeclaration":
-		case "ClassExpression": return parent.superClass === node;
-		case "AssignmentExpression": return parent.right === node;
-		case "AssignmentPattern": return parent.right === node;
-		case "LabeledStatement": return false;
-		case "CatchClause": return false;
-		case "RestElement": return false;
-		case "BreakStatement":
-		case "ContinueStatement": return false;
-		case "FunctionDeclaration":
-		case "FunctionExpression": return false;
-		case "ExportNamespaceSpecifier":
-		case "ExportDefaultSpecifier": return false;
-		case "ExportSpecifier":
-			if (grandparent?.source) return false;
-			return parent.local === node;
-		case "ImportDefaultSpecifier":
-		case "ImportNamespaceSpecifier":
-		case "ImportSpecifier": return false;
-		case "ImportAttribute": return false;
-		case "JSXAttribute": return false;
-		case "ObjectPattern":
-		case "ArrayPattern": return false;
-		case "MetaProperty": return false;
-		case "ObjectTypeProperty": return parent.key !== node;
-		case "TSEnumMember": return parent.id !== node;
-		case "TSPropertySignature":
-			if (parent.key === node) return !!parent.computed;
-			return true;
-	}
-	return true;
-}
-const TS_NODE_TYPES = [
-	"TSAsExpression",
-	"TSTypeAssertion",
-	"TSNonNullExpression",
-	"TSInstantiationExpression",
-	"TSSatisfiesExpression"
-];
+//#region src/core/helper/use-model.ts?raw
+var use_model_default = "import { customRef, watchSyncEffect } from \"vue\";\nexport function useModel(props, name, options = {}) {\n  const res = customRef((track, trigger) => {\n    let localValue = options && options.default;\n    let prevEmittedValue;\n    watchSyncEffect(() => {\n      const propValue = props[name];\n      if (!Object.is(prevEmittedValue, propValue)) {\n        localValue = propValue;\n        trigger();\n      }\n    });\n    return {\n      get() {\n        track();\n        return options.get ? options.get(localValue) : localValue;\n      },\n      set(value) {\n        if (Object.is(value, localValue)) return;\n        localValue = value;\n        trigger();\n        const emittedValue = prevEmittedValue = options.set ? options.set(value) : value;\n        for (const emit of [props[`onUpdate:${name}`]].flat()) {\n          if (typeof emit === \"function\") emit(emittedValue);\n        }\n      }\n    };\n  });\n  res[Symbol.iterator] = () => {\n    let i = 0;\n    return {\n      next() {\n        if (i < 2) {\n          return {\n            value: i++ ? props[`${name}Modifiers`] || {} : res,\n            done: false\n          };\n        } else {\n          return { done: true };\n        }\n      }\n    };\n  };\n  return res;\n}\n";
+
+//#endregion
+//#region src/core/helper/with-defaults.ts?raw
+var with_defaults_default = "function resolveDefaultProps(paths) {\n  const result = {};\n  for (const path of Object.keys(paths)) {\n    const segments = path.split(/[.?[\\]]/).filter(Boolean);\n    let current = result;\n    for (let i = 0; i < segments.length; i++) {\n      const segment = segments[i];\n      if (i === segments.length - 1) {\n        current[segment] = paths[path];\n      } else {\n        if (!current[segment]) {\n          current[segment] = Number.isNaN(Number(segments[i + 1])) ? {} : [];\n        }\n        current = current[segment];\n      }\n    }\n  }\n  return result;\n}\nexport function createPropsDefaultProxy(props, defaults) {\n  const defaultProps = resolveDefaultProps(defaults);\n  const result = {};\n  for (const key of [\n    .../* @__PURE__ */ new Set([...Object.keys(props), ...Object.keys(defaultProps)])\n  ]) {\n    Object.defineProperty(result, key, {\n      enumerable: true,\n      get: () => props[key] === void 0 ? defaultProps[key] : props[key]\n    });\n  }\n  return result;\n}\n";
+
+//#endregion
+//#region src/core/helper/index.ts
+const helperPrefix = "vue-jsx-vapor/macros";
+const useModelHelperId = `${helperPrefix}/use-model`;
+const withDefaultsHelperId = `${helperPrefix}/with-defaults`;
+
+//#endregion
+//#region src/core/utils.ts
 function prependFunctionalNode(node, s, result) {
 	const isBlockStatement = node.body.type === "BlockStatement";
 	const start = node.body.extra?.parenthesized ? node.body.extra.parenStart : node.body.start;
@@ -214,20 +38,6 @@ function getDefaultValue(node) {
 	return node;
 }
 
-//#endregion
-//#region src/core/helper/use-model.ts?raw
-var use_model_default = "import { customRef, watchSyncEffect } from \"vue\";\nexport function useModel(props, name, options = {}) {\n  const res = customRef((track, trigger) => {\n    let localValue = options && options.default;\n    let prevEmittedValue;\n    watchSyncEffect(() => {\n      const propValue = props[name];\n      if (!Object.is(prevEmittedValue, propValue)) {\n        localValue = propValue;\n        trigger();\n      }\n    });\n    return {\n      get() {\n        track();\n        return options.get ? options.get(localValue) : localValue;\n      },\n      set(value) {\n        if (Object.is(value, localValue)) return;\n        localValue = value;\n        trigger();\n        const emittedValue = prevEmittedValue = options.set ? options.set(value) : value;\n        for (const emit of [props[`onUpdate:${name}`]].flat()) {\n          if (typeof emit === \"function\") emit(emittedValue);\n        }\n      }\n    };\n  });\n  res[Symbol.iterator] = () => {\n    let i = 0;\n    return {\n      next() {\n        if (i < 2) {\n          return {\n            value: i++ ? props[`${name}Modifiers`] || {} : res,\n            done: false\n          };\n        } else {\n          return { done: true };\n        }\n      }\n    };\n  };\n  return res;\n}\n";
-
-//#endregion
-//#region src/core/helper/with-defaults.ts?raw
-var with_defaults_default = "function resolveDefaultProps(paths) {\n  const result = {};\n  for (const path of Object.keys(paths)) {\n    const segments = path.split(/[.?[\\]]/).filter(Boolean);\n    let current = result;\n    for (let i = 0; i < segments.length; i++) {\n      const segment = segments[i];\n      if (i === segments.length - 1) {\n        current[segment] = paths[path];\n      } else {\n        if (!current[segment]) {\n          current[segment] = Number.isNaN(Number(segments[i + 1])) ? {} : [];\n        }\n        current = current[segment];\n      }\n    }\n  }\n  return result;\n}\nexport function createPropsDefaultProxy(props, defaults) {\n  const defaultProps = resolveDefaultProps(defaults);\n  const result = {};\n  for (const key of [\n    .../* @__PURE__ */ new Set([...Object.keys(props), ...Object.keys(defaultProps)])\n  ]) {\n    Object.defineProperty(result, key, {\n      enumerable: true,\n      get: () => props[key] === void 0 ? defaultProps[key] : props[key]\n    });\n  }\n  return result;\n}\n";
-
-//#endregion
-//#region src/core/helper/index.ts
-const helperPrefix = "vue-jsx-vapor/macros";
-const useModelHelperId = `${helperPrefix}/use-model`;
-const withDefaultsHelperId = `${helperPrefix}/with-defaults`;
-
 //#endregion
 //#region src/core/restructure.ts
 function restructure(s, node, options = {}) {
@@ -257,7 +67,7 @@ function restructure(s, node, options = {}) {
 			const resolvedValues = values.map((i) => `'${i.path.replace(path, "")}${i.value}': ${i.defaultValue}`).join(", ");
 			prependFunctionalNode(node, s, `\n${path} = ${createPropsDefaultProxy}(${path}, {${resolvedValues}})`);
 		}
-		walkIdentifiers(node.body, (id, parent) => {
+		(0, __vue_macros_common.walkIdentifiers)(node.body, (id, parent) => {
 			const prop = propList.find((i) => i.name === id.name);
 			if (prop && !prop.isRest) s.overwrite(id.start, id.end, `${parent?.type === "ObjectProperty" && parent.shorthand ? `${id.name}: ` : ""}${prop.path}${prop.value}`);
 		}, false);
@@ -426,8 +236,8 @@ function prependObjectExpression(argument, name, value, s) {
 	return prop;
 }
 function getWalkedIds(root, propsName) {
-	const walkedIds = new Set();
-	walkIdentifiers(root.body, (id, parent) => {
+	const walkedIds = /* @__PURE__ */ new Set();
+	(0, __vue_macros_common.walkIdentifiers)(root.body, (id, parent) => {
 		if (id.name === propsName && (parent?.type === "MemberExpression" || parent?.type === "JSXMemberExpression" || parent?.type === "OptionalMemberExpression")) {
 			const prop = parent.property.type === "Identifier" || parent.property.type === "JSXIdentifier" ? parent.property.name : parent.property.type === "StringLiteral" ? parent.property.value : "";
 			if (prop) walkedIds.add(prop);
@@ -526,7 +336,7 @@ function transformDefineStyle(defineStyle, index, root, s, importMap, { defineSl
 	if (expression.arguments[0]?.type !== "TemplateLiteral") return;
 	let css = s.sliceNode(expression.arguments[0]).slice(1, -1);
 	const scopeId = (0, hash_sum.default)(css);
-	const vars = new Map();
+	const vars = /* @__PURE__ */ new Map();
 	expression.arguments[0].expressions.forEach((exp) => {
 		const cssVar = s.sliceNode(exp);
 		const cssVarId = toCssVarId(cssVar, `--${scopeId}-`);
@@ -608,7 +418,7 @@ function transformJsxMacros(code, id, importMap, options) {
 }
 function getRootMap(ast, s, options) {
 	const parents = [];
-	const rootMap = new Map();
+	const rootMap = /* @__PURE__ */ new Map();
 	(0, __vue_macros_common.walkAST)(ast, {
 		enter(node, parent) {
 			parents.unshift(parent);