@vue-jsx-vapor/macros 2.3.3 → 2.3.5

package/dist/volar.js

@@ -1,8 +1,6 @@
-import { resolveOptions } from "./options-pbSvpKdV.js";
+import { resolveOptions } from "./options-BWRkHmm5.js";
 import { HELPER_PREFIX, createFilter } from "@vue-macros/common";
 import { allCodeFeatures, createPlugin, replaceRange } from "ts-macro";
-import { generateClassProperty } from "@vue/language-core/lib/codegen/style/classProperty.js";
-import { parseCssClassNames } from "@vue/language-core/lib/utils/parseCssClassNames.js";
 
 //#region src/volar/define-component.ts
 function transformDefineComponent(node, parent, options) {
@@ -24,16 +22,10 @@ function transformDefineComponent(node, parent, options) {
 
 //#endregion
 //#region src/volar/define-style.ts
-function transformDefineStyle(defineStyles, options) {
-	if (!defineStyles?.length) return;
+function transformDefineStyle({ expression, isCssModules }, index, options) {
 	const { ts, codes, ast } = options;
-	defineStyles.forEach(({ expression, isCssModules }, index) => {
-		if (isCssModules && expression?.arguments[0] && !expression.typeArguments && ts.isTemplateLiteral(expression.arguments[0])) replaceRange(codes, expression.arguments.pos - 1, expression.arguments.pos - 1, `<${HELPER_PREFIX}PrettifyLocal<{}`, ...generateCssClassesType(expression.arguments[0].getText(ast).slice(1, -1), expression.arguments[0].getStart(ast) + 1, index), ">>");
-		addEmbeddedCode(expression, index, options);
-	});
-}
-function* generateCssClassesType(css, offset, index) {
-	for (const className of [...parseCssClassNames(css)]) yield* generateClassProperty(index, className.text, className.offset + offset, "string");
+	if (isCssModules && expression?.arguments[0] && !expression.typeArguments && ts.isTemplateLiteral(expression.arguments[0])) replaceRange(codes, expression.arguments.pos - 1, expression.arguments.pos - 1, `<{`, ...parseCssClassNames(expression.arguments[0].getText(ast).slice(1, -1)).map(({ text }) => `\n'${text.slice(1)}': string`), "\n}>");
+	addEmbeddedCode(expression, index, options);
 }
 function addEmbeddedCode(expression, index, options) {
 	const { ts, ast } = options;
@@ -64,16 +56,33 @@ function addEmbeddedCode(expression, index, options) {
 		embeddedCodes: []
 	});
 }
+const commentReg = /(?<=\/\*)[\s\S]*?(?=\*\/)|(?<=\/\/)[\s\S]*?(?=\n)/g;
+const cssClassNameReg = /(?=(\.[a-z_][-\w]*)[\s.,+~>:#)[{])/gi;
+const fragmentReg = /(?<=\{)[^{]*(?=(?<!\\);)/g;
+function parseCssClassNames(css) {
+	for (const reg of [commentReg, fragmentReg]) css = css.replace(reg, (match) => " ".repeat(match.length));
+	const matches = css.matchAll(cssClassNameReg);
+	const result = [];
+	for (const match of matches) {
+		const matchText = match[1];
+		if (matchText) result.push({
+			offset: match.index,
+			text: matchText
+		});
+	}
+	return result;
+}
 
 //#endregion
 //#region src/volar/transform.ts
 function transformJsxMacros(rootMap, options) {
 	const { ts, codes, ast } = options;
-	for (const [root, map] of rootMap) {
-		transformDefineStyle(map.defineStyle, options);
+	let defineStyleIndex = 0;
+	for (const [root, macros] of rootMap) {
+		macros.defineStyle?.forEach((defaultStyle) => transformDefineStyle(defaultStyle, defineStyleIndex++, options));
 		if (!root?.body) continue;
 		const asyncModifier = root.modifiers?.find((modifier) => modifier.kind === ts.SyntaxKind.AsyncKeyword);
-		if (asyncModifier && map.defineComponent) replaceRange(codes, asyncModifier.pos, asyncModifier.end);
+		if (asyncModifier && macros.defineComponent) replaceRange(codes, asyncModifier.pos, asyncModifier.end);
 		const result = `({}) as __VLS_PickNotAny<typeof ${HELPER_PREFIX}ctx.render, {}> & { __ctx: typeof ${HELPER_PREFIX}ctx }`;
 		const propsType = root.parameters[0]?.type ? String(root.parameters[0].type.getText(ast)) : "{}";
 		replaceRange(codes, root.parameters.pos, root.parameters.pos, ts.isArrowFunction(root) && root.parameters.pos === root.pos ? "(" : "", `${HELPER_PREFIX}props: typeof ${HELPER_PREFIX}ctx.props & ${propsType}, `, `${HELPER_PREFIX}placeholder?: {}, `, `${HELPER_PREFIX}ctx = {} as Awaited<ReturnType<typeof ${HELPER_PREFIX}setup>>, `, `${HELPER_PREFIX}setup = (${asyncModifier ? "async" : ""}(`);
@@ -84,16 +93,16 @@ function transformJsxMacros(rootMap, options) {
 		}
 		ts.forEachChild(root.body, (node) => {
 			if (ts.isReturnStatement(node) && node.expression) {
-				const props = [...map.defineModel ?? []];
+				const props = [...macros.defineModel ?? []];
 				const elements = root.parameters[0] && !root.parameters[0].type && ts.isObjectBindingPattern(root.parameters[0].name) ? root.parameters[0].name.elements : [];
 				for (const element of elements) if (ts.isIdentifier(element.name)) props.push(`${element.name.escapedText}${element.initializer && ts.isNonNullExpression(element.initializer) ? ":" : "?:"} typeof ${element.name.escapedText}`);
-				const shouldWrapByCall = (ts.isArrowFunction(node.expression) || ts.isFunctionExpression(node.expression)) && map.defineComponent;
+				const shouldWrapByCall = (ts.isArrowFunction(node.expression) || ts.isFunctionExpression(node.expression)) && macros.defineComponent;
 				replaceRange(codes, node.getStart(ast), node.expression.getStart(ast), `const ${HELPER_PREFIX}render = `, shouldWrapByCall ? "(" : "");
 				replaceRange(codes, node.expression.end, node.expression.end, shouldWrapByCall ? ")()" : "", `
 return {
   props: {} as {${props.join(", ")}},
-  slots: {} as ${map.defineSlots ?? "{}"},
-  expose: (exposed: import('vue').ShallowUnwrapRef<${map.defineExpose ?? "{}"}>) => {},
+  slots: {} as ${macros.defineSlots ?? "{}"},
+  expose: (exposed: import('vue').ShallowUnwrapRef<${macros.defineExpose ?? "{}"}>) => {},
   render: ${HELPER_PREFIX}render,
 }`);
 			}
@@ -115,7 +124,6 @@ ${defineSlots}
 ${defineExpose}
 ${defineStyle}
 type ${HELPER_PREFIX}StyleArgs = [style: string, options?: { scoped?: boolean }];
-type ${HELPER_PREFIX}PrettifyLocal<T> = { [K in keyof T]: T[K]; } & {};
 // @ts-ignore
 type __VLS_IsAny<T> = 0 extends 1 & T ? true : false; type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
 `;
@@ -162,11 +170,6 @@ function getRootMap(options) {
 	const { ts, ast, codes } = options;
 	const rootMap = new Map();
 	function walk(node, parents) {
-		ts.forEachChild(node, (child) => {
-			parents.unshift(node);
-			walk(child, parents);
-			parents.shift();
-		});
 		const root = parents[1] && (ts.isArrowFunction(parents[1]) || ts.isFunctionExpression(parents[1]) || ts.isFunctionDeclaration(parents[1])) ? parents[1] : void 0;
 		if (root && parents[2] && ts.isCallExpression(parents[2]) && !parents[2].typeArguments && options.defineComponent.alias.includes(parents[2].expression.getText(ast))) {
 			if (!rootMap.has(root)) rootMap.set(root, {});
@@ -176,40 +179,50 @@ function getRootMap(options) {
 			}
 		}
 		const macro = getMacro(node, ts, options);
-		if (!macro) return;
-		const { expression, initializer } = macro;
-		let isRequired = macro.isRequired;
-		if (!rootMap.has(root)) rootMap.set(root, {});
-		const macroName = expression.expression.getText(ast);
-		if (macroName.startsWith("defineStyle")) (rootMap.get(root).defineStyle ??= []).push({
-			expression,
-			isCssModules: !!ts.isVariableStatement(node)
-		});
-		if (!root) return;
-		if (options.defineModel.alias.includes(macroName)) {
-			const modelName = expression.arguments[0] && ts.isStringLiteralLike(expression.arguments[0]) ? expression.arguments[0].text : "modelValue";
-			const modelOptions = expression.arguments[0] && ts.isStringLiteralLike(expression.arguments[0]) ? expression.arguments[1] : expression.arguments[0];
-			if (modelOptions && ts.isObjectLiteralExpression(modelOptions)) {
-				let hasRequired = false;
-				for (const prop of modelOptions.properties) if (ts.isPropertyAssignment(prop) && prop.name.getText(ast) === "required") {
-					hasRequired = true;
-					isRequired = prop.initializer.kind === ts.SyntaxKind.TrueKeyword;
+		if (macro) {
+			const { expression, initializer } = macro;
+			let isRequired = macro.isRequired;
+			if (!rootMap.has(root)) rootMap.set(root, {});
+			const macroName = expression.expression.getText(ast);
+			if (macroName.startsWith("defineStyle")) {
+				(rootMap.get(root).defineStyle ??= []).push({
+					expression,
+					isCssModules: ts.isVariableStatement(node)
+				});
+				return;
+			}
+			if (root) {
+				if (options.defineModel.alias.includes(macroName)) {
+					const modelName = expression.arguments[0] && ts.isStringLiteralLike(expression.arguments[0]) ? expression.arguments[0].text : "modelValue";
+					const modelOptions = expression.arguments[0] && ts.isStringLiteralLike(expression.arguments[0]) ? expression.arguments[1] : expression.arguments[0];
+					if (modelOptions && ts.isObjectLiteralExpression(modelOptions)) {
+						let hasRequired = false;
+						for (const prop of modelOptions.properties) if (ts.isPropertyAssignment(prop) && prop.name.getText(ast) === "required") {
+							hasRequired = true;
+							isRequired = prop.initializer.kind === ts.SyntaxKind.TrueKeyword;
+						}
+						if (!hasRequired && isRequired) replaceRange(codes, modelOptions.end - 1, modelOptions.end - 1, `${!modelOptions.properties.hasTrailingComma && modelOptions.properties.length ? "," : ""} required: true`);
+					} else if (isRequired) replaceRange(codes, expression.arguments.end, expression.arguments.end, `${!expression.arguments.hasTrailingComma && expression.arguments.length ? "," : ""} { required: true }`);
+					const id = toValidAssetId(modelName, `${HELPER_PREFIX}model`);
+					const typeString = `import('vue').UnwrapRef<typeof ${id}>`;
+					const defineModel = rootMap.get(root).defineModel ??= [];
+					defineModel.push(`${modelName.includes("-") ? `'${modelName}'` : modelName}${isRequired ? ":" : "?:"} ${typeString}`, `'onUpdate:${modelName}'?: ($event: ${typeString}) => any`);
+					if (expression.typeArguments?.[1]) defineModel.push(`${modelName}Modifiers?: Partial<Record<${expression.typeArguments[1].getText(ast)}, boolean>>`);
+					if (ts.isVariableStatement(node)) replaceRange(codes, initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
+				} else if (options.defineSlots.alias.includes(macroName)) {
+					replaceRange(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${HELPER_PREFIX}slots;\nconst ${HELPER_PREFIX}slots = `);
+					rootMap.get(root).defineSlots = `Partial<typeof ${HELPER_PREFIX}slots>`;
+				} else if (options.defineExpose.alias.includes(macroName)) {
+					replaceRange(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${HELPER_PREFIX}exposed;\nconst ${HELPER_PREFIX}exposed = `);
+					rootMap.get(root).defineExpose = `typeof ${HELPER_PREFIX}exposed`;
 				}
-				if (!hasRequired && isRequired) replaceRange(codes, modelOptions.end - 1, modelOptions.end - 1, `${!modelOptions.properties.hasTrailingComma && modelOptions.properties.length ? "," : ""} required: true`);
-			} else if (isRequired) replaceRange(codes, expression.arguments.end, expression.arguments.end, `${!expression.arguments.hasTrailingComma && expression.arguments.length ? "," : ""} { required: true }`);
-			const id = toValidAssetId(modelName, `${HELPER_PREFIX}model`);
-			const typeString = `import('vue').UnwrapRef<typeof ${id}>`;
-			const defineModel = rootMap.get(root).defineModel ??= [];
-			defineModel.push(`${modelName.includes("-") ? `'${modelName}'` : modelName}${isRequired ? ":" : "?:"} ${typeString}`, `'onUpdate:${modelName}'?: ($event: ${typeString}) => any`);
-			if (expression.typeArguments?.[1]) defineModel.push(`${modelName}Modifiers?: Partial<Record<${expression.typeArguments[1].getText(ast)}, boolean>>`);
-			replaceRange(codes, initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
-		} else if (options.defineSlots.alias.includes(macroName)) {
-			replaceRange(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${HELPER_PREFIX}slots;\nconst ${HELPER_PREFIX}slots = `);
-			rootMap.get(root).defineSlots = `Partial<typeof ${HELPER_PREFIX}slots>`;
-		} else if (options.defineExpose.alias.includes(macroName)) {
-			replaceRange(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${HELPER_PREFIX}exposed;\nconst ${HELPER_PREFIX}exposed = `);
-			rootMap.get(root).defineExpose = `typeof ${HELPER_PREFIX}exposed`;
+			}
 		}
+		ts.forEachChild(node, (child) => {
+			parents.unshift(node);
+			walk(child, parents);
+			parents.shift();
+		});
 	}
 	ts.forEachChild(ast, (node) => walk(node, []));
 	return rootMap;

package/dist/{webpack-5inEmXrh.js → webpack-C78RZrII.js}

@@ -1,4 +1,4 @@
-import { src_default } from "./src-CjDaDFw_.js";
+import { src_default } from "./src-BDMVJUXS.js";
 
 //#region src/webpack.ts
 var webpack_default = src_default.webpack;

package/dist/{webpack-YO7qm0E9.cjs → webpack-qmJC3FBB.cjs}

@@ -1,5 +1,5 @@
 "use strict";
-const require_src = require('./src-CY9FOMwg.cjs');
+const require_src = require('./src-2EUAmvRo.cjs');
 
 //#region src/webpack.ts
 var webpack_default = require_src.src_default.webpack;

package/dist/webpack.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdPKEM79.cjs');
-require('./raw-oJpqvj1N.cjs');
-require('./options-CNIhAQHD.cjs');
-require('./src-CY9FOMwg.cjs');
-const require_webpack = require('./webpack-YO7qm0E9.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
+require('./options-BSX_vMxh.cjs');
+require('./src-2EUAmvRo.cjs');
+const require_webpack = require('./webpack-qmJC3FBB.cjs');
 
 exports.default = require_webpack.webpack_default

package/dist/webpack.d.cts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-B3WOiT_L.cjs";
+import { Options } from "./options.d-CXMsJZSo.cjs";
 import { WebpackPluginInstance } from "webpack";
 
 //#region src/webpack.d.ts

package/dist/webpack.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-DtyRfe-9.js";
+import { Options } from "./options.d-DNWXuL_g.js";
 import { WebpackPluginInstance } from "webpack";
 
 //#region src/webpack.d.ts

package/dist/webpack.js

@@ -1,7 +1,7 @@
-import "./core-B_EM_kTA.js";
-import "./raw-9H5vTeLe.js";
-import "./options-pbSvpKdV.js";
-import "./src-CjDaDFw_.js";
-import { webpack_default } from "./webpack-5inEmXrh.js";
+import "./core-CHBxRAvb.js";
+import "./raw-Hr7QYA0U.js";
+import "./options-BWRkHmm5.js";
+import "./src-BDMVJUXS.js";
+import { webpack_default } from "./webpack-C78RZrII.js";
 
 export { webpack_default as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/macros",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "description": "Macros for Vue JSX Vapor",
   "type": "module",
   "keywords": [
@@ -169,7 +169,6 @@
   "dependencies": {
     "@vue-macros/common": "^3.0.0-beta.10",
     "@vue/compiler-sfc": "https://pkg.pr.new/@vue/compiler-sfc@42f38ca",
-    "@vue/language-core": "^2.2.8",
     "hash-sum": "^2.0.0",
     "ts-macro": "^0.1.25",
     "unplugin": "^2.2.2"

package/dist/options-pbSvpKdV.js

@@ -1,20 +0,0 @@
-import { REGEX_NODE_MODULES, REGEX_SETUP_SFC, REGEX_SRC_FILE } from "@vue-macros/common";
-
-//#region src/options.ts
-function resolveOptions(options) {
-	const version = options.version || 3.6;
-	return {
-		include: [REGEX_SRC_FILE],
-		exclude: [REGEX_SETUP_SFC, REGEX_NODE_MODULES],
-		...options,
-		version,
-		defineComponent: { alias: options?.defineComponent?.alias ?? ["defineComponent", "defineVaporComponent"] },
-		defineModel: { alias: options?.defineModel?.alias ?? ["defineModel"] },
-		defineSlots: { alias: options?.defineSlots?.alias ?? ["defineSlots"] },
-		defineExpose: { alias: options?.defineExpose?.alias ?? ["defineExpose"] },
-		defineStyle: { alias: options?.defineStyle?.alias ?? ["defineStyle"] }
-	};
-}
-
-//#endregion
-export { resolveOptions };

package/dist/options.d-B3WOiT_L.d.cts

@@ -1,26 +0,0 @@
-import { BaseOptions, MarkRequired } from "@vue-macros/common";
-
-//#region src/options.d.ts
-type Options = BaseOptions & {
-    defineComponent?: {
-        alias: string[];
-        autoReturnFunction?: boolean;
-    };
-    defineModel?: {
-        alias: string[];
-    };
-    defineExpose?: {
-        alias: string[];
-    };
-    defineSlots?: {
-        alias: string[];
-    };
-    defineStyle?: {
-        alias: string[];
-    };
-};
-type OptionsResolved = MarkRequired<Options, 'include' | 'version' | 'defineComponent' | 'defineModel' | 'defineExpose' | 'defineSlots' | 'defineStyle'>;
-declare function resolveOptions(options: Options): OptionsResolved;
-
-//#endregion
-export { Options, OptionsResolved, resolveOptions };

package/dist/options.d-DtyRfe-9.d.ts

@@ -1,26 +0,0 @@
-import { BaseOptions, MarkRequired } from "@vue-macros/common";
-
-//#region src/options.d.ts
-type Options = BaseOptions & {
-    defineComponent?: {
-        alias: string[];
-        autoReturnFunction?: boolean;
-    };
-    defineModel?: {
-        alias: string[];
-    };
-    defineExpose?: {
-        alias: string[];
-    };
-    defineSlots?: {
-        alias: string[];
-    };
-    defineStyle?: {
-        alias: string[];
-    };
-};
-type OptionsResolved = MarkRequired<Options, 'include' | 'version' | 'defineComponent' | 'defineModel' | 'defineExpose' | 'defineSlots' | 'defineStyle'>;
-declare function resolveOptions(options: Options): OptionsResolved;
-
-//#endregion
-export { Options, OptionsResolved, resolveOptions as resolveOptions$1 };