@animus-ui/vite-plugin 0.1.0-next.32 → 0.1.0-next.36

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAAU,MAAM,EAAE,MAAM,MAAM,CAAC;AAI3C,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,MAAM,EAAE,MAAM,CAAC;IACf,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,gCAAgC;IAChC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,qGAAqG;IACrG,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,2EAA2E;IAC3E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AA6LD,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,MAAM,CAk+BnE;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAU,MAAM,EAAE,MAAM,MAAM,CAAC;AAI3C,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,MAAM,EAAE,MAAM,CAAC;IACf,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,gCAAgC;IAChC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,qGAAqG;IACrG,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,2EAA2E;IAC3E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AA6ID,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,MAAM,CAo+BnE;AAED,eAAe,aAAa,CAAC"}

package/dist/index.mjs

@@ -5,7 +5,7 @@ import { existsSync, readFileSync, readdirSync, statSync, unlinkSync, writeFileS
 import { tmpdir } from "os";
 import { dirname, extname, join, relative, resolve } from "path";
 import { fileURLToPath } from "url";
-import { applyPrefix, applyUnitFallback, detectRuntime, execSubprocess, extractSystemFilePackages } from "@animus-ui/extract/pipeline";
+import { applyPrefix, applyUnitFallback, assembleStylesheet, detectRuntime, execSubprocess, extractSystemFilePackages, validateLayerOrder } from "@animus-ui/extract/pipeline";
 import browserslist from "browserslist";
 import { browserslistToTargets, transform } from "lightningcss";
 //#region \0rolldown/runtime.js
@@ -107,38 +107,6 @@ function buildFileEntriesFromCache(cache, changedPath) {
 	});
 	return entries;
 }
-/**
-* The 7 Animus cascade layers in required order.
-* Consumer-provided `layers` must contain these as a subsequence.
-*/
-const ANIMUS_LAYERS = [
-	"global",
-	"base",
-	"variants",
-	"compounds",
-	"states",
-	"system",
-	"custom"
-];
-/**
-* Validate that a consumer `layers` array contains all 7 Animus layers
-* in the correct relative order. Consumer layers may be interleaved.
-*
-* @throws Error with descriptive message on violation
-*/
-function validateLayerOrder(layers) {
-	let cursor = 0;
-	for (const layer of layers) if (cursor < ANIMUS_LAYERS.length && layer === ANIMUS_LAYERS[cursor]) cursor++;
-	if (cursor < ANIMUS_LAYERS.length) {
-		const missing = ANIMUS_LAYERS.slice(cursor);
-		const found = ANIMUS_LAYERS.slice(0, cursor);
-		if (!ANIMUS_LAYERS.every((l) => layers.includes(l))) {
-			const absent = ANIMUS_LAYERS.filter((l) => !layers.includes(l));
-			throw new Error(`[animus] Invalid layers config: missing required layers: ${absent.join(", ")}. All 7 Animus layers must be present: ${ANIMUS_LAYERS.join(", ")}`);
-		}
-		throw new Error(`[animus] Invalid layers config: Animus layers must appear in order (${ANIMUS_LAYERS.join(" < ")}). Found ${found.join(", ")} in order, but ${missing.join(", ")} appeared out of sequence. Received: [${layers.join(", ")}]`);
-	}
-}
 function animusExtract(options) {
 	let themeJson = "{}";
 	let variableMapJson = "{}";
@@ -166,7 +134,6 @@ function animusExtract(options) {
 	let storedSystemPropMapJson = "{}";
 	let storedDynamicPropsJson = "{}";
 	let storedTransformsSource = "{}";
-	let layerDeclaration = "";
 	const fileCache = /* @__PURE__ */ new Map();
 	let packageMap = {};
 	let externalPackageDirs = [];
@@ -183,7 +150,7 @@ function animusExtract(options) {
 		try {
 			const ts = Date.now();
 			const tmpOut = join(tmpdir(), `animus-system-${ts}.json`);
-			execSubprocess(`const m = require(${JSON.stringify(resolvedSystemPath)});\nconst ds = m.ds || m.default || m.system;\nif (!ds || !ds.toConfig) { throw new Error('Module does not export a SystemInstance with .serialize()'); }\nconst cfg = ds.toConfig();\nconst tokens = m.tokens || m.theme || null;\nconst serialized = tokens && typeof tokens.serialize === 'function' ? tokens.serialize() : null;\nconst globalStyleBlocks = {};\nfor (const [key, val] of Object.entries(m)) {\n  if (val && typeof val === 'object' && val.__brand === 'GlobalStyleBlock') {\n    globalStyleBlocks[key] = val.styles;\n  }\n}\nrequire('fs').writeFileSync(${JSON.stringify(tmpOut)}, JSON.stringify({\n  propConfig: cfg.propConfig,\n  groupRegistry: cfg.groupRegistry,\n  serialized: serialized,\n  transformNames: Object.keys(cfg.transforms || {}),\n  globalStyleBlocks: Object.keys(globalStyleBlocks).length > 0 ? globalStyleBlocks : null\n}));\n`, rootDir);
+			execSubprocess(`const m = require(${JSON.stringify(resolvedSystemPath)});\nconst exportNames = Object.keys(m);\nconst candidates = exportNames.filter(k => m[k] && typeof m[k].toConfig === 'function');\nif (candidates.length === 0) {\n  throw new Error('[animus-extract] No SystemInstance found. Exports: [' + exportNames.join(', ') + ']. None have a .toConfig() method. A SystemInstance is created by: export const ds = createSystem().build()');\n}\nif (candidates.length > 1) {\n  throw new Error('[animus-extract] Multiple SystemInstance candidates found: [' + candidates.join(', ') + ']. Specify which one to use.');\n}\nconst ds = m[candidates[0]];\nconst cfg = ds.toConfig();\nconst tokens = m.tokens || m.theme || null;\nconst serialized = tokens && typeof tokens.serialize === 'function' ? tokens.serialize() : null;\nconst globalStyleBlocks = {};\nfor (const [key, val] of Object.entries(m)) {\n  if (val && typeof val === 'object' && val.__brand === 'GlobalStyleBlock') {\n    globalStyleBlocks[key] = val.styles;\n  }\n}\nrequire('fs').writeFileSync(${JSON.stringify(tmpOut)}, JSON.stringify({\n  propConfig: cfg.propConfig,\n  groupRegistry: cfg.groupRegistry,\n  serialized: serialized,\n  transformNames: Object.keys(cfg.transforms || {}),\n  globalStyleBlocks: Object.keys(globalStyleBlocks).length > 0 ? globalStyleBlocks : null\n}));\n`, rootDir);
 			const result = readFileSync(tmpOut, "utf-8");
 			try {
 				unlinkSync(tmpOut);
@@ -197,9 +164,11 @@ function animusExtract(options) {
 				variableCss = parsed.serialized.variableCss;
 				contextualVarsJson = parsed.serialized.contextualVarsJson;
 				if (options.prefix) {
-					const prefixed = applyPrefix(options.prefix, variableMapJson, variableCss);
+					const prefixed = applyPrefix(options.prefix, variableMapJson, variableCss, themeJson, contextualVarsJson);
 					variableMapJson = prefixed.variableMapJson;
 					variableCss = prefixed.variableCss;
+					if (prefixed.themeJson) themeJson = prefixed.themeJson;
+					if (prefixed.contextualVarsJson) contextualVarsJson = prefixed.contextualVarsJson;
 				}
 			} else throw new Error("[animus-extract] Theme must be built with createTheme().build(). No .serialize() method found on tokens export.");
 			if (parsed.globalStyleBlocks) {
@@ -427,11 +396,12 @@ function animusExtract(options) {
 				for (const d of diagnostics) if (d.kind === "bail") warn(`⚠ ${d.component} not extracted: ${d.message}`);
 				else if (d.kind === "skip") warn(`⚠ ${d.component}: skipped ${d.message}`);
 				log(`CSS: ${resolvedComponentCss.length} bytes (${Object.keys(storedManifest.components || {}).length} components)`);
-				if (options.layers) layerDeclaration = `@layer ${options.layers.join(", ")};\n`;
-				else if (storedSheets) layerDeclaration = storedSheets.declaration;
-				else layerDeclaration = `@layer ${ANIMUS_LAYERS.join(", ")};\n`;
 				if (!isProd && storedSheets) {
-					const staticSize = (layerDeclaration + variableCss + globalCss).length;
+					const staticSize = assembleStylesheet({
+						layers: options.layers,
+						variableCss,
+						globalCss
+					}).length;
 					const componentSize = resolvedComponentCss.length;
 					log(`Delivery: split mode — static ${staticSize} bytes, components ${componentSize} bytes (adopted stylesheet)`);
 				} else log("Delivery: single file mode (production)");
@@ -453,20 +423,20 @@ function animusExtract(options) {
 				warnFn: warn
 			};
 			if (id === RESOLVED_CSS_ID) {
-				if (!isProd && storedSheets) return postProcessCss([
-					layerDeclaration,
+				if (!isProd && storedSheets) return postProcessCss(assembleStylesheet({
+					layers: options.layers,
 					variableCss,
 					globalCss
-				].filter(Boolean).join("\n"), {
+				}), {
 					...lcssOpts,
 					minify: false
 				});
-				return postProcessCss([
-					layerDeclaration,
+				return postProcessCss(assembleStylesheet({
+					layers: options.layers,
 					variableCss,
 					globalCss,
-					resolvedComponentCss
-				].filter(Boolean).join("\n"), lcssOpts);
+					componentCss: resolvedComponentCss
+				}), lcssOpts);
 			}
 			if (id === RESOLVED_COMPONENTS_ID) return `export default \`${postProcessCss(resolvedComponentCss || "", {
 				...lcssOpts,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@animus-ui/vite-plugin",
-  "version": "0.1.0-next.32",
+  "version": "0.1.0-next.36",
   "description": "Animus static CSS extraction Vite plugin",
   "author": "codecaaron <airrobb@gmail.com>",
   "license": "MIT",
@@ -18,15 +18,16 @@
     "url": "git+https://github.com/codecaaron/animus"
   },
   "scripts": {
-    "build": "tsdown && tsc -p tsconfig.build.json",
+    "build": "bun run build:ts",
+    "build:ts": "tsdown && tsc -p tsconfig.build.json",
     "compile": "tsc --noEmit"
   },
   "peerDependencies": {
     "vite": ">=5.0.0"
   },
   "dependencies": {
-    "@animus-ui/extract": "0.1.0-next.32",
-    "@animus-ui/system": "0.1.0-next.32",
+    "@animus-ui/extract": "0.1.0-next.36",
+    "@animus-ui/system": "0.1.0-next.36",
     "browserslist": "^4.24.0",
     "lightningcss": "^1.29.0"
   }