@animus-ui/extract 0.1.17 → 0.1.19

package/dist/session.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_pipeline = require("./pipeline-OMz1HGqU.cjs");
+const require_pipeline = require("./pipeline-CD2qmEEn.cjs");
 let crypto = require("crypto");
 let fs = require("fs");
 let path = require("path");
@@ -518,10 +518,6 @@ function logBuildTimings(bt, rustTiming, log, verbose) {
 		]) {
 			const sms = bt[sk] ?? 0;
 			log(`    ${pad(sl, 15)}${String(sms).padStart(5)}ms`);
-			if (sk === "rustExtract" && rustTiming) for (const line of require_pipeline.formatRustTimingWaterfall(rustTiming, {
-				indent: "      ",
-				labelWidth: 13
-			})) log(line);
 		}
 	}
 	log(`  total             ${String(bt.total).padStart(5)}ms`);
@@ -611,9 +607,6 @@ var ExtractionSession = class {
 	options;
 	staticCssJson;
 	system = null;
-	/** Vocabulary witness diagnostics from the sealed system's registration
-	*  record, awaiting the shared surfacing pass. */
-	systemVocabularyDiagnostics = [];
 	/** Configured external files that could not be read. Incremental passes
 	*  re-collect nothing, so they replay these instead of passing strict. */
 	ingestionFailureDiagnostics = [];
@@ -1013,7 +1006,6 @@ var ExtractionSession = class {
 			rootDir,
 			prefix: this.options.prefix
 		});
-		this.systemVocabularyDiagnostics = require_pipeline.vocabularyWitnessDiagnostics(this.system.vocabularyWitnessesJson);
 		this.assetCopyCache.clear();
 		this.assetDependencyPaths.clear();
 		this.assetDependencyKeys.clear();
@@ -1184,7 +1176,6 @@ var ExtractionSession = class {
 			externalFileOwners: this.externalFileOwners,
 			externalSourceEntries: this.externalSourceEntries,
 			externalPackageDirs: this.externalPackageDirs,
-			systemVocabularyDiagnostics: this.systemVocabularyDiagnostics,
 			ingestionFailureDiagnostics: this.ingestionFailureDiagnostics
 		};
 	}
@@ -1356,8 +1347,9 @@ var ExtractionSession = class {
 		const result = require_pipeline.runProjectAnalysis(engineApi, {
 			...analysisOptions,
 			warn: (message) => this.warn(message),
+			info: (message) => this.log(message),
 			strict: this.options.strict,
-			extraDiagnostics: [...this.systemVocabularyDiagnostics, ...this.ingestionFailureDiagnostics]
+			extraDiagnostics: this.ingestionFailureDiagnostics
 		});
 		require_pipeline.assertNoErrorDiagnostics(result.manifest?.diagnostics);
 		require_pipeline.enforceExternalTokenContracts({
@@ -1378,12 +1370,14 @@ var ExtractionSession = class {
 			bt.analysis = (bt.jsonSerialize ?? 0) + (bt.rustExtract ?? 0) + (bt.jsonParse ?? 0);
 			if (manifest?.report) this.log(`Extracted ${manifest.report.components_extracted ?? "?"}/${manifest.report.components_total ?? "?"} components (${bt.analysis}ms)`);
 		}
-		const globalCss = this.substituteAssetReferences(result.globalCss, !devMode || this.staleAssetPruning === "every-cycle");
+		const sheets = this.substituteAssetReferences({
+			variableCss: system.variableCss,
+			globalCss: result.globalCss,
+			componentCss: result.componentCss
+		}, !devMode || this.staleAssetPruning === "every-cycle");
 		const { declaration, variables, body } = require_pipeline.assembleStylesheet({
 			layers: this.options.layers,
-			variableCss: system.variableCss,
-			globalCss,
-			componentCss: result.componentCss,
+			...sheets,
 			split: true
 		});
 		if (this.lcssTargets === null) this.lcssTargets = require_pipeline.resolveLightningTargets(this.options.targets, this.rootDir);
@@ -1396,6 +1390,11 @@ var ExtractionSession = class {
 				warnFn: (msg) => this.warn(msg)
 			})
 		].filter(Boolean).join("\n");
+		require_pipeline.reportSurvivingAssetPlaceholders(fullCss, {
+			strict: this.options.strict,
+			warn: (message) => this.warn(message),
+			prefix: `[${this.driverLabel}]`
+		});
 		setSharedCss(fullCss);
 		const systemPropsContent = require_pipeline.buildSystemPropsModule({
 			systemPropMapJson: JSON.stringify(manifest?.system_prop_map ?? {}),
@@ -1686,10 +1685,11 @@ var ExtractionSession = class {
 		(0, fs.renameSync)(tmpPath, (0, path.join)(dir, name));
 		this.onArtifactWrite?.(name, content);
 	}
-	/** Copy each asset() specifier's bytes into `assets/` under a
-	*  content-hashed name and substitute a url relative to styles.css. */
-	substituteAssetReferences(globalCss, pruneSuperseded) {
-		const specifiers = require_pipeline.findAssetSpecifiers(globalCss);
+	/** Copy each asset() specifier's bytes, from every sheet, into `assets/`
+	*  under a content-hashed name and substitute a url relative to
+	*  styles.css. */
+	substituteAssetReferences(sheets, pruneSuperseded) {
+		const specifiers = require_pipeline.findSheetAssetSpecifiers(sheets);
 		const assetsDir = (0, path.join)(this.sessionDir, SESSION_ASSETS_DIR);
 		const expected = /* @__PURE__ */ new Set();
 		this.assetDependencyPaths.clear();
@@ -1734,7 +1734,7 @@ var ExtractionSession = class {
 			});
 		}
 		if (pruneSuperseded) pruneStaleAssets(assetsDir, expected);
-		return require_pipeline.substituteAssetPlaceholders(globalCss, urlBySpecifier);
+		return require_pipeline.substituteSheetAssets(sheets, urlBySpecifier);
 	}
 	trackAssetDependency(path$8) {
 		this.assetDependencyPaths.add(path$8);

package/dist/session.mjs

@@ -1,4 +1,4 @@
-import { A as enforceExternalTokenContracts, B as firstOwners, D as postProcessCss, E as vocabularyWitnessDiagnostics, F as createSourceCorpus, G as walkPackageSources, I as collectExternalPackageSources, J as sharesVolumeRoot, K as createSourceIdentity, L as excludeCollectedPackages, N as findAssetSpecifiers, O as resolveLightningTargets, P as substituteAssetPlaceholders, R as extractSystemFilePackages, St as assembleStylesheet, Tt as __require, U as staleDistIncludesMessage, V as isExcludedPackageRelativePath, W as unresolvableIncludesMessage, X as discoverFiles, _ as clearEngineCache, a as assertNoErrorDiagnostics, at as resolveMode, c as buildSystemPropsModule, d as loadSystemConfig, ht as DEFAULT_EXTENSIONS, i as snapshotFilePlans, it as createExcludeMatcher, j as resolveAssetFile, lt as createV2EngineApi, ot as resolveVerbosity, p as serializeStaticCss, pt as projectExternalFileOwners, q as isPathWithinRoot, r as hashReplacementPlans, s as formatRustTimingWaterfall, t as toWatchKeys, v as runProjectAnalysis, w as unreadableSourceDiagnostic, yt as contentHash, z as findPackageRoot } from "./pipeline-D7TdVERQ.mjs";
+import { B as collectExternalPackageSources, Ct as contentHash, Et as assembleStylesheet, F as findSheetAssetSpecifiers, G as isExcludedPackageRelativePath, H as extractSystemFilePackages, I as reportSurvivingAssetPlaceholders, J as unresolvableIncludesMessage, M as resolveAssetFile, O as postProcessCss, Q as sharesVolumeRoot, R as substituteSheetAssets, T as unreadableSourceDiagnostic, U as findPackageRoot, V as excludeCollectedPackages, W as firstOwners, X as createSourceIdentity, Y as walkPackageSources, Z as isPathWithinRoot, _ as runProjectAnalysis, _t as projectExternalFileOwners, a as assertNoErrorDiagnostics, ct as createExcludeMatcher, et as discoverFiles, f as serializeStaticCss, g as clearEngineCache, i as snapshotFilePlans, j as enforceExternalTokenContracts, k as resolveLightningTargets, kt as __require, lt as resolveMode, pt as createV2EngineApi, q as staleDistIncludesMessage, r as hashReplacementPlans, s as buildSystemPropsModule, t as toWatchKeys, u as loadSystemConfig, ut as resolveVerbosity, yt as DEFAULT_EXTENSIONS, z as createSourceCorpus } from "./pipeline-BuiItKT-.mjs";
 import { randomUUID } from "crypto";
 import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, watch, writeFileSync } from "fs";
 import { basename, extname, join, relative, resolve } from "path";
@@ -517,10 +517,6 @@ function logBuildTimings(bt, rustTiming, log, verbose) {
 		]) {
 			const sms = bt[sk] ?? 0;
 			log(`    ${pad(sl, 15)}${String(sms).padStart(5)}ms`);
-			if (sk === "rustExtract" && rustTiming) for (const line of formatRustTimingWaterfall(rustTiming, {
-				indent: "      ",
-				labelWidth: 13
-			})) log(line);
 		}
 	}
 	log(`  total             ${String(bt.total).padStart(5)}ms`);
@@ -610,9 +606,6 @@ var ExtractionSession = class {
 	options;
 	staticCssJson;
 	system = null;
-	/** Vocabulary witness diagnostics from the sealed system's registration
-	*  record, awaiting the shared surfacing pass. */
-	systemVocabularyDiagnostics = [];
 	/** Configured external files that could not be read. Incremental passes
 	*  re-collect nothing, so they replay these instead of passing strict. */
 	ingestionFailureDiagnostics = [];
@@ -1012,7 +1005,6 @@ var ExtractionSession = class {
 			rootDir,
 			prefix: this.options.prefix
 		});
-		this.systemVocabularyDiagnostics = vocabularyWitnessDiagnostics(this.system.vocabularyWitnessesJson);
 		this.assetCopyCache.clear();
 		this.assetDependencyPaths.clear();
 		this.assetDependencyKeys.clear();
@@ -1183,7 +1175,6 @@ var ExtractionSession = class {
 			externalFileOwners: this.externalFileOwners,
 			externalSourceEntries: this.externalSourceEntries,
 			externalPackageDirs: this.externalPackageDirs,
-			systemVocabularyDiagnostics: this.systemVocabularyDiagnostics,
 			ingestionFailureDiagnostics: this.ingestionFailureDiagnostics
 		};
 	}
@@ -1355,8 +1346,9 @@ var ExtractionSession = class {
 		const result = runProjectAnalysis(engineApi, {
 			...analysisOptions,
 			warn: (message) => this.warn(message),
+			info: (message) => this.log(message),
 			strict: this.options.strict,
-			extraDiagnostics: [...this.systemVocabularyDiagnostics, ...this.ingestionFailureDiagnostics]
+			extraDiagnostics: this.ingestionFailureDiagnostics
 		});
 		assertNoErrorDiagnostics(result.manifest?.diagnostics);
 		enforceExternalTokenContracts({
@@ -1377,12 +1369,14 @@ var ExtractionSession = class {
 			bt.analysis = (bt.jsonSerialize ?? 0) + (bt.rustExtract ?? 0) + (bt.jsonParse ?? 0);
 			if (manifest?.report) this.log(`Extracted ${manifest.report.components_extracted ?? "?"}/${manifest.report.components_total ?? "?"} components (${bt.analysis}ms)`);
 		}
-		const globalCss = this.substituteAssetReferences(result.globalCss, !devMode || this.staleAssetPruning === "every-cycle");
+		const sheets = this.substituteAssetReferences({
+			variableCss: system.variableCss,
+			globalCss: result.globalCss,
+			componentCss: result.componentCss
+		}, !devMode || this.staleAssetPruning === "every-cycle");
 		const { declaration, variables, body } = assembleStylesheet({
 			layers: this.options.layers,
-			variableCss: system.variableCss,
-			globalCss,
-			componentCss: result.componentCss,
+			...sheets,
 			split: true
 		});
 		if (this.lcssTargets === null) this.lcssTargets = resolveLightningTargets(this.options.targets, this.rootDir);
@@ -1395,6 +1389,11 @@ var ExtractionSession = class {
 				warnFn: (msg) => this.warn(msg)
 			})
 		].filter(Boolean).join("\n");
+		reportSurvivingAssetPlaceholders(fullCss, {
+			strict: this.options.strict,
+			warn: (message) => this.warn(message),
+			prefix: `[${this.driverLabel}]`
+		});
 		setSharedCss(fullCss);
 		const systemPropsContent = buildSystemPropsModule({
 			systemPropMapJson: JSON.stringify(manifest?.system_prop_map ?? {}),
@@ -1685,10 +1684,11 @@ var ExtractionSession = class {
 		renameSync(tmpPath, join(dir, name));
 		this.onArtifactWrite?.(name, content);
 	}
-	/** Copy each asset() specifier's bytes into `assets/` under a
-	*  content-hashed name and substitute a url relative to styles.css. */
-	substituteAssetReferences(globalCss, pruneSuperseded) {
-		const specifiers = findAssetSpecifiers(globalCss);
+	/** Copy each asset() specifier's bytes, from every sheet, into `assets/`
+	*  under a content-hashed name and substitute a url relative to
+	*  styles.css. */
+	substituteAssetReferences(sheets, pruneSuperseded) {
+		const specifiers = findSheetAssetSpecifiers(sheets);
 		const assetsDir = join(this.sessionDir, SESSION_ASSETS_DIR);
 		const expected = /* @__PURE__ */ new Set();
 		this.assetDependencyPaths.clear();
@@ -1733,7 +1733,7 @@ var ExtractionSession = class {
 			});
 		}
 		if (pruneSuperseded) pruneStaleAssets(assetsDir, expected);
-		return substituteAssetPlaceholders(globalCss, urlBySpecifier);
+		return substituteSheetAssets(sheets, urlBySpecifier);
 	}
 	trackAssetDependency(path) {
 		this.assetDependencyPaths.add(path);

package/index-v2.js

@@ -17,7 +17,7 @@ function loadNative() {
       `(looked for ${candidates.join(', ')} under crates/extract-v2/). ` +
       `Published releases ship this binary for darwin-arm64, linux-x64-gnu and ` +
       `linux-arm64-gnu — reinstall the package to restore it (v2 is the only ` +
-      `engine; the v1 escape hatch was retired, openspec: retire-extract-v1). ` +
+      `engine, so there is no other engine to fall back to). ` +
       `In the animus workspace, build it with: vp run build:extract-v2.`
   );
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@animus-ui/extract",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "Animus static CSS extraction pipeline (Rust/NAPI)",
   "keywords": [
     "animus",
@@ -55,13 +55,13 @@
     "build:v2:debug": "cd crates/extract-v2 && bunx napi build --platform --no-js"
   },
   "dependencies": {
-    "@animus-ui/properties": "0.1.17",
+    "@animus-ui/properties": "0.1.19",
     "browserslist": "^4.28.8",
     "lightningcss": "^1.33.0"
   },
   "devDependencies": {
-    "@animus-ui/assertions": "0.1.17",
-    "@animus-ui/system": "0.1.17",
+    "@animus-ui/assertions": "0.1.19",
+    "@animus-ui/system": "0.1.19",
     "@mdx-js/mdx": "3.1.1",
     "@napi-rs/cli": "^3.10.5",
     "svelte": "5.57.0"

package/dist/pipeline/timing-waterfall.d.ts

@@ -1,6 +0,0 @@
-export declare const RUST_TIMING_PHASES: ReadonlyArray<readonly [key: string, label: string]>;
-export declare function formatRustTimingWaterfall(timing: Record<string, number>, opts: {
-    indent: string;
-    labelWidth: number;
-}): string[];
-//# sourceMappingURL=timing-waterfall.d.ts.map

package/dist/pipeline/timing-waterfall.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"timing-waterfall.d.ts","sourceRoot":"","sources":["../../pipeline/timing-waterfall.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAC5C,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAatC,CAAC;AAEF,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAC3C,MAAM,EAAE,CAcV"}