@vizejs/vite-plugin-musea 0.270.0 → 0.272.0

package/dist/index.mjs

@@ -1330,7 +1330,7 @@ export const __styles__ = ${JSON.stringify(art.styleBlocks ?? [])};
 	const isolatedSetup = art.scriptSetupIsolated !== false;
 	if (scriptSetup && hasSetup && !isolatedSetup) code += `
 const __museaSharedSetup = (() => {
-${scriptSetup.setupBody.map((l) => `  ${l}`).join("\n")}
+${scriptSetup.setupBody.join("\n")}
   return ${setupReturn};
 })();
 `;
@@ -1343,14 +1343,14 @@ ${scriptSetup.setupBody.map((l) => `  ${l}`).join("\n")}
 		const componentNames = /* @__PURE__ */ new Map();
 		if (componentTagName) componentNames.set(componentTagName, componentBindingName);
 		if (scriptSetup) {
-			for (const name of scriptSetup.returnNames) if (/^[A-Z]/.test(name)) componentNames.set(name, name);
+			for (const name of scriptSetup.returnNames) if (/^[A-Z]/.test(name) && scriptSetup.imports.some((imp) => importDeclaresName(imp, name))) componentNames.set(name, name);
 		}
 		const components = componentNames.size > 0 ? `  components: { ${[...componentNames].map(([name, value]) => `${JSON.stringify(name)}: ${value}`).join(", ")} },\n` : "";
 		if (scriptSetup && hasSetup && isolatedSetup) code += `
 export const ${variantComponentName} = defineComponent({
   name: '${variantComponentName}',
 ${components}  setup() {
-${scriptSetup.setupBody.map((l) => `    ${l}`).join("\n")}
+${scriptSetup.setupBody.join("\n")}
     return ${setupReturn};
   },
   template: \`${fullTemplate}\`,
@@ -1608,6 +1608,24 @@ function registerMiddleware(devServer, ctx) {
 	});
 }
 //#endregion
+//#region src/art-order.ts
+function sortedArts(arts) {
+	return [...arts].sort(compareArtFiles);
+}
+function compareArtFiles(a, b) {
+	const order = compareOrder(a.metadata.order, b.metadata.order);
+	if (order !== 0) return order;
+	const title = a.metadata.title.localeCompare(b.metadata.title, void 0, { numeric: true });
+	if (title !== 0) return title;
+	return a.path.localeCompare(b.path, void 0, { numeric: true });
+}
+function compareOrder(a, b) {
+	if (a === void 0 && b === void 0) return 0;
+	if (a === void 0) return 1;
+	if (b === void 0) return -1;
+	return a - b;
+}
+//#endregion
 //#region src/tokens/native.ts
 function tokenNative() {
 	const native = loadNative();
@@ -1646,11 +1664,34 @@ function parseJsonResult(value) {
 }
 function normalizeCategories(categories) {
 	for (const category of categories) {
-		category.tokens = nullRecord(category.tokens);
+		category.tokens = nullRecord(Object.fromEntries(sortTokenEntries(category.tokens)));
 		if (category.subcategories) normalizeCategories(category.subcategories);
 	}
 	return categories;
 }
+function sortTokenEntries(tokens) {
+	return Object.entries(tokens).sort((a, b) => {
+		const order = compareTokenOrder(a[1], b[1]);
+		if (order !== 0) return order;
+		return a[0].localeCompare(b[0], void 0, { numeric: true });
+	});
+}
+function compareTokenOrder(a, b) {
+	const aOrder = tokenOrder(a);
+	const bOrder = tokenOrder(b);
+	if (aOrder === void 0 && bOrder === void 0) return 0;
+	if (aOrder === void 0) return 1;
+	if (bOrder === void 0) return -1;
+	return aOrder - bOrder;
+}
+function tokenOrder(token) {
+	const order = token.attributes?.order;
+	if (typeof order === "number" && Number.isFinite(order)) return order;
+	if (typeof order === "string") {
+		const parsed = Number(order);
+		if (Number.isFinite(parsed)) return parsed;
+	}
+}
 function nullRecord(record) {
 	return Object.assign(Object.create(null), record);
 }
@@ -2340,6 +2381,11 @@ function inferPreviewKind(candidates, value) {
 		"round",
 		"rounded"
 	])) return "radius";
+	if (hasType(candidates, ["letterspacing", "letter-spacing"]) || hasSignal(candidates, [
+		"letter-spacing",
+		"letterspacing",
+		"tracking"
+	])) return "letterSpacing";
 	if (hasType(candidates, ["spacing", "space"]) || hasSignal(candidates, [
 		"spacing",
 		"spasing",
@@ -2976,7 +3022,7 @@ function createApiMiddleware(ctx) {
 				return;
 			}
 			if (url === "/arts" && req.method === "GET") {
-				sendJson(Array.from(ctx.artFiles.values()));
+				sendJson(sortedArts(ctx.artFiles.values()));
 				return;
 			}
 			if (url === "/tokens/usage" && req.method === "GET") {
@@ -3085,7 +3131,7 @@ function createApiMiddleware(ctx) {
 * Generate the virtual manifest module code containing all art file metadata.
 */
 function generateManifestModule(artFiles) {
-	const arts = Array.from(artFiles.values());
+	const arts = sortedArts(artFiles.values());
 	return `export const arts = ${JSON.stringify(arts, null, 2)};`;
 }
 //#endregion
@@ -3260,7 +3306,7 @@ function joinUrlPath(basePath, ...segments) {
 }
 async function createStaticGalleryPayload(ctx) {
 	const apiCtx = createApiContext(ctx);
-	const arts = Array.from(ctx.artFiles.values());
+	const arts = sortedArts(ctx.artFiles.values());
 	const previews = {};
 	const details = {};
 	for (const art of arts) {
@@ -3437,22 +3483,27 @@ if (typeof window !== "undefined") {
 async function emitStaticGallery(emitFile, bundle, ctx) {
 	const runtimeFileName = findRuntimeFileName(bundle);
 	if (!runtimeFileName) throw new Error("musea static build could not find its generated runtime entry");
-	const payload = await createStaticGalleryPayload(ctx);
 	const staticRoot = staticRootFromBasePath(ctx.basePath);
-	await emitGalleryShell(emitFile, staticRoot, ctx, payload);
+	const publicBasePath = publicBasePathFromViteBase(ctx.config.base, ctx.basePath);
+	const publicCtx = {
+		...ctx,
+		basePath: publicBasePath
+	};
+	const publicPayload = await createStaticGalleryPayload(publicCtx);
+	await emitGalleryShell(emitFile, staticRoot, publicCtx, publicPayload);
 	emitFile({
 		type: "asset",
 		fileName: joinFileName(staticRoot, "api", "static.json"),
-		source: JSON.stringify(payload, null, 2)
+		source: JSON.stringify(publicPayload, null, 2)
 	});
 	emitFile({
 		type: "asset",
 		fileName: joinFileName(staticRoot, "api", "arts"),
-		source: JSON.stringify(payload.arts, null, 2)
+		source: JSON.stringify(publicPayload.arts, null, 2)
 	});
 	await emitAxeVendor(emitFile, staticRoot);
-	emitPreviewHtml(emitFile, staticRoot, runtimeFileName, ctx.basePath, payload, ctx.artFiles);
-	emitRootRedirect(emitFile, staticRoot, ctx.basePath);
+	emitPreviewHtml(emitFile, staticRoot, runtimeFileName, publicBasePath, ctx.artFiles);
+	emitRootRedirect(emitFile, staticRoot, publicBasePath);
 }
 function findRuntimeFileName(bundle) {
 	for (const item of Object.values(bundle)) if (item.type === "chunk" && item.name === "musea-static-runtime") return item.fileName;
@@ -3484,7 +3535,6 @@ async function emitGalleryShell(emitFile, staticRoot, ctx, payload) {
 			source: content
 		});
 	}
-	if (payload.arts.length === 0) return;
 }
 function generateStaticFallbackGalleryHtml(basePath) {
 	return `<!DOCTYPE html>
@@ -3502,7 +3552,7 @@ function generateStaticFallbackGalleryHtml(basePath) {
 </body>
 </html>`;
 }
-function emitPreviewHtml(emitFile, staticRoot, runtimeFileName, basePath, payload, artFiles) {
+function emitPreviewHtml(emitFile, staticRoot, runtimeFileName, basePath, artFiles) {
 	const previewDir = joinFileName(staticRoot, "preview");
 	const runtimeUrl = relativeUrl(previewDir, runtimeFileName);
 	for (const art of artFiles.values()) for (const variant of art.variants) {
@@ -3557,6 +3607,9 @@ function injectStaticGlobals(html, ctx, payload) {
 function rewriteGalleryBase(html, basePath) {
 	return html.replaceAll("/__musea__/", `${basePath.replace(/\/?$/, "/")}`);
 }
+function publicBasePathFromViteBase(viteBase, basePath) {
+	return viteBase && viteBase !== "/" && viteBase !== "./" ? joinUrlPath(viteBase, basePath) : basePath;
+}
 function emitRootRedirect(emitFile, staticRoot, basePath) {
 	if (!staticRoot) return;
 	const target = joinUrlPath(basePath, "");