@vizejs/vite-plugin-musea 0.135.0 → 0.137.0

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { a as collectRequestBody, c as parseJsonBody, d as resolveUrlPathInside, f as serializeScriptValue, i as HttpError, l as resolveInside, n as generateGalleryModule, o as createDevSessionToken, p as validateDevApiRequest, s as decodeUrlComponent, u as resolveInsideAny } from "./gallery-kaxHo2Kt.mjs";
 import { i as MuseaVrtRunner, n as generateVrtJsonReport, r as generateVrtReport } from "./vrt-Cv1PK1EF.mjs";
 import { t as MuseaA11yRunner } from "./a11y-62l8G1tr.mjs";
-import { n as writeArtFile, t as generateArtFile } from "./autogen-CywxMrJH.mjs";
+import { n as writeArtFile, t as generateArtFile } from "./autogen-D32ZAiUd.mjs";
 import { createRequire } from "node:module";
 import { transformWithEsbuild } from "vite";
 import fs from "node:fs";
@@ -226,6 +226,12 @@ function buildThemeConfig(theme) {
 function extractScriptSetupContent(source) {
 	return source.match(/<script\s+[^>]*setup[^>]*>([\s\S]*?)<\/script>/)?.[1]?.trim();
 }
+function extractScriptSetupIsolated(source) {
+	const match = source.match(/<script\s+([^>]*)\bsetup\b([^>]*)>/);
+	if (!match) return true;
+	const isolate = `${match[1] ?? ""} ${match[2] ?? ""}`.match(/\bisolate\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))/);
+	return (isolate?.[1] ?? isolate?.[2] ?? isolate?.[3]) !== "false";
+}
 function resolveRelativeSpecifier(specifier, artDir) {
 	if (!specifier.startsWith(".")) return specifier;
 	return path.resolve(artDir, specifier);
@@ -295,6 +301,11 @@ function collectImportedNames(statement, returnNames) {
 		if (alias) returnNames.add(alias);
 	}
 }
+function importDeclaresName(statement, name) {
+	const names = /* @__PURE__ */ new Set();
+	collectImportedNames(statement, names);
+	return names.has(name);
+}
 function collectObjectDestructuredNames(statement, returnNames) {
 	const match = statement.match(/^(?:export\s+)?(?:const|let|var)\s+\{([\s\S]*?)\}\s*=/);
 	if (!match) return;
@@ -367,8 +378,14 @@ function parseScriptSetupForArt(content) {
 	const setupBody = [];
 	const returnNames = /* @__PURE__ */ new Set();
 	let currentImport = null;
+	const defineArtComponent = extractDefineArtComponent(content);
+	let defineArtBalance = 0;
 	for (const line of lines) {
 		const trimmed = line.trim();
+		if (defineArtBalance > 0) {
+			defineArtBalance += countCharBalance(line, "(", ")");
+			continue;
+		}
 		if (currentImport) {
 			currentImport.push(line);
 			const statement = currentImport.join("\n");
@@ -389,6 +406,10 @@ function parseScriptSetupForArt(content) {
 			}
 			continue;
 		}
+		if (isDefineArtLine(trimmed)) {
+			defineArtBalance = Math.max(0, countCharBalance(line, "(", ")"));
+			continue;
+		}
 		setupBody.push(line);
 	}
 	if (currentImport) {
@@ -398,24 +419,58 @@ function parseScriptSetupForArt(content) {
 	}
 	collectTopLevelReturnNames(setupBody, returnNames);
 	returnNames.delete("type");
+	if (defineArtComponent.name) returnNames.delete(defineArtComponent.name);
 	return {
 		imports,
 		setupBody,
-		returnNames: [...returnNames]
+		returnNames: [...returnNames],
+		defineArtComponentName: defineArtComponent.name,
+		defineArtComponentSource: defineArtComponent.source
 	};
 }
+function extractDefineArtComponent(content) {
+	const sourceMatch = content.match(/\bdefineArt\s*\(\s*(['"])([^'"]+)\1/);
+	if (sourceMatch) return {
+		name: componentNameFromSource(sourceMatch[2]),
+		source: sourceMatch[2]
+	};
+	return { name: content.match(/\bdefineArt\s*\(\s*([A-Za-z_$][\w$]*)/)?.[1] };
+}
+function componentNameFromSource(source) {
+	const withoutQuery = source.split(/[?#]/, 1)[0] || source;
+	const filename = path.basename(withoutQuery);
+	const extension = path.extname(filename);
+	const name = toPascalCase(extension ? filename.slice(0, -extension.length) : filename);
+	return name === "Variant" ? "MuseaComponent" : name;
+}
+function isDefineArtLine(trimmed) {
+	return /\bdefineArt\s*\(/.test(trimmed);
+}
 function generateArtModule(art, filePath, options = {}) {
 	let componentImportPath;
 	let componentTagName;
-	const componentBindingName = "__MuseaComponent";
+	let componentBindingName = "__MuseaComponent";
+	const scriptSetup = art.scriptSetupContent ? parseScriptSetupForArt(art.scriptSetupContent) : null;
+	const defineArtComponentName = scriptSetup?.defineArtComponentName;
+	const defineArtComponentSource = scriptSetup?.defineArtComponentSource;
 	if (art.isInline && art.componentPath) {
 		componentImportPath = options.root ? resolveComponentSourcePath(art, filePath, allowedSourceRoots(options.root, options.scanRoots ?? [])) ?? void 0 : art.componentPath;
 		componentTagName = "MuseaComponent";
-	} else if (art.metadata.component) {
-		componentImportPath = options.root ? resolveComponentSourcePath(art, filePath, allowedSourceRoots(options.root, options.scanRoots ?? [])) ?? void 0 : path.isAbsolute(art.metadata.component) ? art.metadata.component : path.resolve(path.dirname(filePath), art.metadata.component);
-		componentTagName = "MuseaComponent";
+	} else if (defineArtComponentSource || art.metadata.component) {
+		const componentSource = defineArtComponentSource ?? art.metadata.component;
+		if (componentSource) {
+			const sourceArt = componentSource === art.metadata.component ? art : {
+				...art,
+				metadata: {
+					...art.metadata,
+					component: componentSource
+				}
+			};
+			componentImportPath = options.root ? resolveComponentSourcePath(sourceArt, filePath, allowedSourceRoots(options.root, options.scanRoots ?? [])) ?? void 0 : path.isAbsolute(componentSource) ? componentSource : path.resolve(path.dirname(filePath), componentSource);
+		}
+		componentTagName = defineArtComponentName ?? (art.metadata.component ? componentNameFromSource(art.metadata.component) : "MuseaComponent");
+		componentBindingName = componentTagName;
 	}
-	const scriptSetup = art.scriptSetupContent ? parseScriptSetupForArt(art.scriptSetupContent) : null;
 	let code = `
 // Auto-generated module for: ${path.basename(filePath)}
 import { defineComponent, h } from 'vue';
@@ -428,13 +483,23 @@ import { defineComponent, h } from 'vue';
 		}
 	}
 	if (componentImportPath && componentTagName) {
-		if (!scriptSetup?.imports.some((imp) => new RegExp(`^import\\s+${componentBindingName}[\\s,]`).test(imp.trim()))) code += `import ${componentBindingName} from ${JSON.stringify(componentImportPath)};\n`;
+		if (!scriptSetup?.imports.some((imp) => importDeclaresName(imp, componentBindingName))) code += `import ${componentBindingName} from ${JSON.stringify(componentImportPath)};\n`;
 		code += `export const __component__ = ${componentBindingName};\n`;
 	}
 	code += `
 export const metadata = ${JSON.stringify(art.metadata)};
 export const variants = ${JSON.stringify(art.variants)};
 export const __styles__ = ${JSON.stringify(art.styleBlocks ?? [])};
+`;
+	const hasSetupBody = scriptSetup?.setupBody.some((line) => line.trim().length > 0) ?? false;
+	const hasSetup = !!scriptSetup && (hasSetupBody || scriptSetup.returnNames.length > 0);
+	const setupReturn = `{ ${scriptSetup?.returnNames.join(", ") ?? ""} }`;
+	const isolatedSetup = art.scriptSetupIsolated !== false;
+	if (scriptSetup && hasSetup && !isolatedSetup) code += `
+const __museaSharedSetup = (() => {
+${scriptSetup.setupBody.map((l) => `  ${l}`).join("\n")}
+  return ${setupReturn};
+})();
 `;
 	for (const variant of art.variants) {
 		const variantComponentName = toPascalCase(variant.name);
@@ -448,13 +513,21 @@ export const __styles__ = ${JSON.stringify(art.styleBlocks ?? [])};
 			for (const name of scriptSetup.returnNames) if (/^[A-Z]/.test(name)) componentNames.set(name, name);
 		}
 		const components = componentNames.size > 0 ? `  components: { ${[...componentNames].map(([name, value]) => `${JSON.stringify(name)}: ${value}`).join(", ")} },\n` : "";
-		const hasSetupBody = scriptSetup?.setupBody.some((line) => line.trim().length > 0) ?? false;
-		if (scriptSetup && (hasSetupBody || scriptSetup.returnNames.length > 0)) code += `
+		if (scriptSetup && hasSetup && isolatedSetup) code += `
 export const ${variantComponentName} = defineComponent({
   name: '${variantComponentName}',
 ${components}  setup() {
 ${scriptSetup.setupBody.map((l) => `    ${l}`).join("\n")}
-    return { ${scriptSetup.returnNames.join(", ")} };
+    return ${setupReturn};
+  },
+  template: \`${fullTemplate}\`,
+});
+`;
+		else if (scriptSetup && hasSetup) code += `
+export const ${variantComponentName} = defineComponent({
+  name: '${variantComponentName}',
+${components}  setup() {
+    return __museaSharedSetup;
   },
   template: \`${fullTemplate}\`,
 });
@@ -2688,6 +2761,7 @@ function musea(options = {}) {
 				})),
 				hasScriptSetup: isInline ? false : parsed.hasScriptSetup,
 				scriptSetupContent: !isInline && parsed.hasScriptSetup ? extractScriptSetupContent(source) : void 0,
+				scriptSetupIsolated: !isInline && parsed.hasScriptSetup ? extractScriptSetupIsolated(source) : true,
 				hasScript: parsed.hasScript,
 				styleCount: parsed.styleCount,
 				styleBlocks: isInline ? [] : extractStyleBlocks(source),