@animus-ui/extract 0.1.0-next.60 → 0.1.0-next.62

package/dist/assemble-stylesheet.d.ts

@@ -10,6 +10,17 @@ export declare const ANIMUS_LAYERS: readonly ["anm-global", "anm-base", "anm-var
  * @throws Error with descriptive message on violation
  */
 export declare function validateLayerOrder(layers: string[]): void;
+/**
+ * Strip a leading `@layer ...;` declaration line from CSS if present.
+ * The Rust crate embeds this in prod-mode output; we strip it so the
+ * shared assembler controls placement.
+ */
+export declare function stripLeadingLayerDeclaration(css: string): string;
+export interface AssembleStylesheetParts {
+    declaration: string;
+    variables: string;
+    body: string;
+}
 export interface AssembleStylesheetOptions {
     /**
      * Custom layer order. Must contain all 7 Animus `anm-*` layers as a subsequence.
@@ -23,6 +34,8 @@ export interface AssembleStylesheetOptions {
     globalCss?: string;
     /** Component CSS from the Rust crate (may contain embedded @layer declaration) */
     componentCss?: string;
+    /** When true, return structured `{ declaration, variables, body }` instead of a single string. */
+    split?: boolean;
 }
 /**
  * Assemble the final stylesheet in canonical order:
@@ -35,5 +48,11 @@ export interface AssembleStylesheetOptions {
  * This is the single source of truth for stylesheet assembly.
  * Both Vite and Next.js plugins must use this function.
  */
-export declare function assembleStylesheet(options: AssembleStylesheetOptions): string;
+export declare function assembleStylesheet(options: AssembleStylesheetOptions & {
+    split: true;
+}): AssembleStylesheetParts;
+export declare function assembleStylesheet(options: AssembleStylesheetOptions & {
+    split?: false;
+}): string;
+export declare function assembleStylesheet(options: AssembleStylesheetOptions): string | AssembleStylesheetParts;
 //# sourceMappingURL=assemble-stylesheet.d.ts.map

package/dist/assemble-stylesheet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assemble-stylesheet.d.ts","sourceRoot":"","sources":["../pipeline/assemble-stylesheet.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,aAAa,gHAQhB,CAAC;AAiBX;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CA2BzD;AAYD,MAAM,WAAW,yBAAyB;IACxC;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,sEAAsE;IACtE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gEAAgE;IAChE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kFAAkF;IAClF,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,MAAM,CAqB7E"}
+{"version":3,"file":"assemble-stylesheet.d.ts","sourceRoot":"","sources":["../pipeline/assemble-stylesheet.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,aAAa,gHAQhB,CAAC;AAiBX;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CA2BzD;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAGhE;AAED,MAAM,WAAW,uBAAuB;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,yBAAyB;IACxC;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,sEAAsE;IACtE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gEAAgE;IAChE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kFAAkF;IAClF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kGAAkG;IAClG,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,yBAAyB,GAAG;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GACnD,uBAAuB,CAAC;AAC3B,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,yBAAyB,GAAG;IAAE,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,GACrD,MAAM,CAAC;AACV,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,yBAAyB,GACjC,MAAM,GAAG,uBAAuB,CAAC"}

package/dist/discover-packages.d.ts

@@ -1,12 +1,15 @@
 /**
- * Extract external DS package names from `.includes([...])` calls in the system file.
+ * Extract external DS package names from `includes` declarations in the system file.
  *
- * Reads the system file source, finds `.includes([identifier, ...])` calls in the
- * builder chain, traces each identifier back to its import declaration, and returns
- * the import specifiers. This is the authoritative mechanism — only packages explicitly
- * declared via `.includes()` are treated as external DS dependencies.
+ * Supports two forms:
+ *   - Primary (1.0+):  `createSystem({ includes: [identifier, ...] })` constructor arg
+ *   - Legacy:          `.includes([identifier, ...])` chain method (RC migration fallback)
  *
- * Falls back to empty array if no `.includes()` call is found.
+ * For each identifier found, traces back to its import declaration and returns
+ * the import specifier. Only packages explicitly declared via `includes` are treated
+ * as external DS dependencies.
+ *
+ * Falls back to empty array if no `includes` declaration is found.
  */
 export declare function extractSystemFilePackages(systemFilePath: string): string[];
 //# sourceMappingURL=discover-packages.d.ts.map

package/dist/discover-packages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discover-packages.d.ts","sourceRoot":"","sources":["../pipeline/discover-packages.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAyE1E"}
+{"version":3,"file":"discover-packages.d.ts","sourceRoot":"","sources":["../pipeline/discover-packages.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAmF1E"}

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-export type { AssembleStylesheetOptions } from './assemble-stylesheet';
-export { ANIMUS_LAYERS, assembleStylesheet, validateLayerOrder, } from './assemble-stylesheet';
+export type { AssembleStylesheetOptions, AssembleStylesheetParts, } from './assemble-stylesheet';
+export { ANIMUS_LAYERS, assembleStylesheet, stripLeadingLayerDeclaration, validateLayerOrder, } from './assemble-stylesheet';
 export { extractSystemFilePackages } from './discover-packages';
 export { applyPrefix } from './prefix';
 export { resolveGlobalStyles, resolveTokenAliases, resolveValue, } from './resolve-global-styles';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../pipeline/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EACL,aAAa,EACb,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,YAAY,GACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../pipeline/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,aAAa,EACb,kBAAkB,EAClB,4BAA4B,EAC5B,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,YAAY,GACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC"}

package/dist/index.mjs

@@ -52,41 +52,39 @@ function validateLayerOrder(layers) {
 function stripLeadingLayerDeclaration(css) {
 	return css.replace(/^@layer\s+[^;{]+;\s*\n?/, "");
 }
-/**
-* Assemble the final stylesheet in canonical order:
-*
-* 1. `@layer` declaration (cascade ordering)
-* 2. Emitted variables (`:root`, color mode selectors)
-* 3. `@layer anm-global { ... }` (reset + global styles)
-* 4. `@layer anm-base/variants/compounds/states/system/custom { ... }` (components)
-*
-* This is the single source of truth for stylesheet assembly.
-* Both Vite and Next.js plugins must use this function.
-*/
 function assembleStylesheet(options) {
 	const hasCustomLayers = !!options.layers;
 	const layers = options.layers ?? ANIMUS_LAYERS;
 	if (options.layers) validateLayerOrder(options.layers);
-	const layerDeclaration = buildLayerDeclaration(layers, hasCustomLayers);
+	const declaration = buildLayerDeclaration(layers, hasCustomLayers);
+	const variables = options.variableCss || "";
 	const componentCss = options.componentCss ? stripLeadingLayerDeclaration(options.componentCss) : "";
+	const body = [options.globalCss || "", componentCss].filter(Boolean).join("\n");
+	if (options.split) return {
+		declaration,
+		variables,
+		body
+	};
 	return [
-		layerDeclaration,
-		options.variableCss || "",
-		options.globalCss || "",
-		componentCss
+		declaration,
+		variables,
+		body
 	].filter(Boolean).join("\n");
 }
 //#endregion
 //#region pipeline/discover-packages.ts
 /**
-* Extract external DS package names from `.includes([...])` calls in the system file.
+* Extract external DS package names from `includes` declarations in the system file.
 *
-* Reads the system file source, finds `.includes([identifier, ...])` calls in the
-* builder chain, traces each identifier back to its import declaration, and returns
-* the import specifiers. This is the authoritative mechanism — only packages explicitly
-* declared via `.includes()` are treated as external DS dependencies.
+* Supports two forms:
+*   - Primary (1.0+):  `createSystem({ includes: [identifier, ...] })` constructor arg
+*   - Legacy:          `.includes([identifier, ...])` chain method (RC migration fallback)
 *
-* Falls back to empty array if no `.includes()` call is found.
+* For each identifier found, traces back to its import declaration and returns
+* the import specifier. Only packages explicitly declared via `includes` are treated
+* as external DS dependencies.
+*
+* Falls back to empty array if no `includes` declaration is found.
 */
 function extractSystemFilePackages(systemFilePath) {
 	let source;
@@ -95,16 +93,21 @@ function extractSystemFilePackages(systemFilePath) {
 	} catch {
 		return [];
 	}
-	const includesRegex = /\.includes\(\s*\[([^\]]*)\]\s*\)/gs;
 	const identifiers = /* @__PURE__ */ new Set();
-	let includesMatch;
-	while ((includesMatch = includesRegex.exec(source)) !== null) {
-		const inner = includesMatch[1];
-		for (const token of inner.split(",")) {
-			const id = token.trim();
-			if (id && /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(id)) identifiers.add(id);
+	const constructorRegex = /createSystem\s*\(\s*\{[^}]*?\bincludes\s*:\s*\[([^\]]*)\]/gs;
+	const chainRegex = /\.includes\s*\(\s*\[([^\]]*)\]\s*\)/gs;
+	const collectIdentifiers = (regex) => {
+		let match;
+		while ((match = regex.exec(source)) !== null) {
+			const inner = match[1];
+			for (const token of inner.split(",")) {
+				const id = token.trim();
+				if (id && /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(id)) identifiers.add(id);
+			}
 		}
-	}
+	};
+	collectIdentifiers(constructorRegex);
+	collectIdentifiers(chainRegex);
 	if (identifiers.size === 0) return [];
 	const importMap = /* @__PURE__ */ new Map();
 	const importRegex = /^\s*import\s+(?:([a-zA-Z_$][a-zA-Z0-9_$]*)\s*,\s*)?(?:\{([^}]*)\}|([a-zA-Z_$][a-zA-Z0-9_$]*))\s+from\s+['"]([^'"]+)['"]/gm;
@@ -316,4 +319,4 @@ function applyUnitFallback(css) {
 	});
 }
 //#endregion
-export { ANIMUS_LAYERS, applyPrefix, applyUnitFallback, assembleStylesheet, camelToKebab, extractSystemFilePackages, resolveGlobalStyles, resolveTokenAliases, resolveTransformPlaceholders, resolveValue, validateLayerOrder };
+export { ANIMUS_LAYERS, applyPrefix, applyUnitFallback, assembleStylesheet, camelToKebab, extractSystemFilePackages, resolveGlobalStyles, resolveTokenAliases, resolveTransformPlaceholders, resolveValue, stripLeadingLayerDeclaration, validateLayerOrder };

package/index.d.ts

@@ -16,7 +16,7 @@
  *   Overrides hardcoded import paths in generated source. When `None`, defaults to
  *   `@animus-ui/system` and `virtual:animus/styles.css`.
  */
-export declare function analyzeProject(fileEntriesJson: string, themeJson: string, variableMapJson: string, contextualVarsJson: string | undefined | null, configJson: string, groupRegistryJson: string, packageResolutionJson: string, devMode?: boolean | undefined | null, emitterConfigJson?: string | undefined | null, selectorAliasesJson?: string | undefined | null, selectorOrderJson?: string | undefined | null, globalStyleBlocksJson?: string | undefined | null, pathAliasesJson?: string | undefined | null): string
+export declare function analyzeProject(fileEntriesJson: string, themeJson: string, variableMapJson: string, contextualVarsJson: string | undefined | null, configJson: string, groupRegistryJson: string, packageResolutionJson: string, devMode?: boolean | undefined | null, emitterConfigJson?: string | undefined | null, selectorAliasesJson?: string | undefined | null, selectorOrderJson?: string | undefined | null, globalStyleBlocksJson?: string | undefined | null, pathAliasesJson?: string | undefined | null, keyframesBlocksJson?: string | undefined | null): string
 
 /**
  * Clear the per-file extraction cache used by `analyze_project()`.
@@ -47,6 +47,7 @@ export interface NapiSystemConfig {
   selectorAliases?: string
   selectorOrder?: string
   globalStyleBlocks?: string
+  keyframesBlocks?: string
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@animus-ui/extract",
-  "version": "0.1.0-next.60",
+  "version": "0.1.0-next.62",
   "description": "Animus static CSS extraction pipeline (Rust/NAPI)",
   "author": "codecaaron <airrobb@gmail.com>",
   "license": "MIT",
@@ -59,12 +59,12 @@
     "compile": "tsc -p tsconfig.build.json --noEmit"
   },
   "optionalDependencies": {
-    "@animus-ui/extract-darwin-arm64": "0.1.0-next.60",
-    "@animus-ui/extract-linux-x64-gnu": "0.1.0-next.60",
-    "@animus-ui/extract-linux-arm64-gnu": "0.1.0-next.60"
+    "@animus-ui/extract-darwin-arm64": "0.1.0-next.62",
+    "@animus-ui/extract-linux-x64-gnu": "0.1.0-next.62",
+    "@animus-ui/extract-linux-arm64-gnu": "0.1.0-next.62"
   },
   "dependencies": {
-    "@animus-ui/properties": "0.1.0-next.60"
+    "@animus-ui/properties": "0.1.0-next.62"
   },
   "devDependencies": {
     "@animus-ui/system": "workspace:*",