@yahoo/uds 3.134.0 → 3.134.1

package/dist/tailwind/dist/css/runner.cjs

@@ -4,6 +4,7 @@ const require_colors = require("../cli/dist/lib/colors.cjs");
 const require_print = require("../cli/dist/lib/print.cjs");
 const require_spinner = require("../cli/dist/lib/spinner.cjs");
 const require_logger = require("../cli/dist/lib/logger.cjs");
+const require_perf = require("./perf.cjs");
 const require_entryPoints = require("../utils/entryPoints.cjs");
 const require_nodeUtils = require("./nodeUtils.cjs");
 const require_index = require("../config/dist/index.cjs");
@@ -12,6 +13,7 @@ const require_runner_helpers = require("./runner.helpers.cjs");
 const require_utils = require("./utils.cjs");
 const require_generate_helpers = require("./generate.helpers.cjs");
 const require_generate = require("./generate.cjs");
+const require_workerPool = require("./workerPool.cjs");
 let node_fs = require("node:fs");
 node_fs = require_runtime.__toESM(node_fs, 1);
 //#region src/css/runner.ts
@@ -249,170 +251,181 @@ const runThemeMode = async (options, context) => {
 		if (themeConfig.config && appConfig === require_index.defaultTokensConfig) log.warn(`App config not found: ${themeConfig.config}, using defaults`);
 		const packageDirs = [];
 		const generateThemeModeCSS = async (opts) => {
+			require_perf.clearTimings();
+			require_perf.captureMemory("start");
 			const genStartTime = performance.now();
 			const genLog = opts?.isWatch ? require_logger.createLogger({ silent: true }) : log;
 			const scopedCssOutputs = [];
-			genLog.spinStart("Scanning app code...");
-			const appScanResult = await require_nodeUtils.scanDirectoriesForSafelist(entryDirs, colorModes, context.variants, context.autoVariants, context.componentData, appVariantDefaults, runtimeConfigValues);
-			genLog.spinStop("✅", require_runner_helpers.getScanSummaryMessage({
-				label: "app",
-				filesScanned: appScanResult.filesScanned,
-				filesWithComponents: appScanResult.filesWithComponents,
-				componentCount: appScanResult.components.length,
-				mode: "app"
-			}));
-			if (options.verbose) printVerboseScanFiles(genLog, workspaceDir, appScanResult.filePaths);
-			genLog.spinStart("Generating main CSS...");
-			const inheritedClasses = [...appScanResult.safelist];
-			const inheritedComponents = new Set(appScanResult.components);
-			const scopedPackageTargets = [];
-			const processInheritedPackage = async (packageName) => {
-				genLog.spinStart(`Processing package: ${packageName}...`);
-				const packageDir = require_nodeUtils.findPackageSourceDir(packageName);
-				if (!packageDir) {
-					genLog.spinStop("⚠️", `Package not found: ${packageName}`);
-					return;
-				}
-				if (!packageDirs.includes(packageDir)) packageDirs.push(packageDir);
-				const packageScanResult = await require_nodeUtils.scanDirectoryForSafelist(packageDir, colorModes, context.variants, context.autoVariants, context.componentData, appVariantDefaults, runtimeConfigValues, true);
-				inheritedClasses.push(...packageScanResult.safelist);
-				packageScanResult.components.forEach((comp) => inheritedComponents.add(comp));
+			const pool = await require_workerPool.createWorkerPool({
+				variants: context.variants,
+				autoVariants: context.autoVariants,
+				componentData: context.componentData
+			}, options.workers);
+			try {
+				genLog.spinStart(`Scanning app and packages... (${pool.workerCount} worker${pool.workerCount === 1 ? "" : "s"})`);
+				const scopedPackageTargets = [];
+				const processInheritedPackage = async (packageName) => {
+					const packageDir = require_nodeUtils.findPackageSourceDir(packageName);
+					if (!packageDir) return {
+						packageName,
+						status: "not-found"
+					};
+					if (!packageDirs.includes(packageDir)) packageDirs.push(packageDir);
+					return {
+						packageName,
+						status: "ok",
+						scanResult: await require_nodeUtils.scanDirectoryForSafelist(packageDir, colorModes, context.variants, context.autoVariants, context.componentData, appVariantDefaults, runtimeConfigValues, true, pool)
+					};
+				};
+				const processScopedPackage = async (packageName, scopedPackageValue) => {
+					const scopedPackageConfig = normalizeScopedPackageConfig(scopedPackageValue);
+					const packageRoot = require_nodeUtils.findPackageRoot(packageName);
+					const packageDir = require_nodeUtils.findPackageSourceDir(packageName);
+					if (!packageRoot || !packageDir) return;
+					const scopeClass = require_nodeUtils.getPackageUdsScope(packageName);
+					if (!scopeClass) return;
+					const entryDirs = resolveScopedEntryDirs(packageRoot, packageDir, scopedPackageConfig.entry);
+					entryDirs.forEach((entryDir) => {
+						if (!packageDirs.includes(entryDir)) packageDirs.push(entryDir);
+					});
+					scopedPackageTargets.push({
+						packageName,
+						packageRoot,
+						packageDir,
+						entryDirs,
+						scopeClass,
+						config: scopedPackageConfig
+					});
+				};
+				const [appScanResult, inheritedResults] = await Promise.all([
+					require_perf.measureAsync("scan", () => require_nodeUtils.scanDirectoriesForSafelist(entryDirs, colorModes, context.variants, context.autoVariants, context.componentData, appVariantDefaults, runtimeConfigValues, false, pool)),
+					Promise.all((themeConfig.inherit ?? []).map((packageName) => require_perf.measureAsync(`scan:inherit:${packageName}`, () => processInheritedPackage(packageName)))),
+					Promise.all(Object.entries(themeConfig.scoped ?? {}).map(([packageName, scopedPackageConfig]) => processScopedPackage(packageName, scopedPackageConfig)))
+				]);
 				genLog.spinStop("✅", require_runner_helpers.getScanSummaryMessage({
-					label: packageName,
-					filesScanned: packageScanResult.filesScanned,
-					filesWithComponents: packageScanResult.filesWithComponents,
-					componentCount: packageScanResult.components.length,
-					mode: "inherit"
+					label: "app",
+					filesScanned: appScanResult.filesScanned,
+					filesWithComponents: appScanResult.filesWithComponents,
+					componentCount: appScanResult.components.length,
+					mode: "app"
 				}));
-				if (options.verbose) printVerboseScanFiles(genLog, workspaceDir, packageScanResult.filePaths);
-			};
-			const processScopedPackage = async (packageName, scopedPackageValue) => {
-				genLog.spinStart(`Processing scoped package: ${packageName}...`);
-				const scopedPackageConfig = normalizeScopedPackageConfig(scopedPackageValue);
-				const packageRoot = require_nodeUtils.findPackageRoot(packageName);
-				const packageDir = require_nodeUtils.findPackageSourceDir(packageName);
-				if (!packageRoot || !packageDir) {
-					genLog.spinStop("⚠️", `Scoped package not found: ${packageName}`);
-					return;
+				if (options.verbose) printVerboseScanFiles(genLog, workspaceDir, appScanResult.filePaths);
+				for (const result of inheritedResults) if (result.status === "not-found") genLog.spinStop("⚠️", `Package not found: ${result.packageName}`);
+				else {
+					genLog.spinStop("✅", require_runner_helpers.getScanSummaryMessage({
+						label: result.packageName,
+						filesScanned: result.scanResult.filesScanned,
+						filesWithComponents: result.scanResult.filesWithComponents,
+						componentCount: result.scanResult.components.length,
+						mode: "inherit"
+					}));
+					if (options.verbose) printVerboseScanFiles(genLog, workspaceDir, result.scanResult.filePaths);
 				}
-				const scopeClass = require_nodeUtils.getPackageUdsScope(packageName);
-				if (!scopeClass) {
-					genLog.spinStop("⚠️", `Scoped package missing package.json uds.scope: ${packageName}`);
-					return;
+				const inheritedClasses = [...appScanResult.safelist];
+				const inheritedComponents = new Set(appScanResult.components);
+				for (const result of inheritedResults) if (result.status === "ok") {
+					inheritedClasses.push(...result.scanResult.safelist);
+					result.scanResult.components.forEach((comp) => inheritedComponents.add(comp));
 				}
-				const entryDirs = resolveScopedEntryDirs(packageRoot, packageDir, scopedPackageConfig.entry);
-				entryDirs.forEach((entryDir) => {
-					if (!packageDirs.includes(entryDir)) packageDirs.push(entryDir);
-				});
-				scopedPackageTargets.push({
-					packageName,
-					packageRoot,
-					packageDir,
-					entryDirs,
-					scopeClass,
-					config: scopedPackageConfig
-				});
-			};
-			await (themeConfig.inherit ?? []).reduce(async (promise, packageName) => {
-				await promise;
-				await processInheritedPackage(packageName);
-			}, Promise.resolve());
-			await Object.entries(themeConfig.scoped ?? {}).reduce(async (promise, [packageName, scopedPackageConfig]) => {
-				await promise;
-				await processScopedPackage(packageName, scopedPackageConfig);
-			}, Promise.resolve());
-			const mainSafelist = require_safelist.deduplicateSafelist([
-				...inheritedClasses,
-				...require_safelist.getThemeAndScaleClasses(colorModes),
-				...require_safelist.getInternalSafelistClasses()
-			]);
-			const allMotionComponents = [...inheritedComponents];
-			const mainCssResult = await require_generate.generateCSS([...themeConfig.css?.safelist ?? [], ...mainSafelist], appConfig, {
-				scope: options.scope,
-				contentDir: entryDirs,
-				cssOptions: themeConfig.css,
-				safeVarPrefixes: [
-					...require_utils.getMotionVarPrefixes(context.componentData, allMotionComponents),
-					...require_utils.getConfigurableCssVariables(),
-					...require_generate_helpers.getPruneVarSafelist(themeConfig.css)
-				]
-			});
-			ensureOutputDirectory(outputPath);
-			node_fs.default.writeFileSync(outputPath, mainCssResult.css);
-			for (const scopedPackageTarget of scopedPackageTargets) {
-				const packageConfig = await require_nodeUtils.loadConfigFile(isAbsolutePath(scopedPackageTarget.config.config) ? scopedPackageTarget.config.config : joinPath(scopedPackageTarget.packageRoot, scopedPackageTarget.config.config)) ?? require_index.defaultTokensConfig;
-				const packageVariantDefaults = require_utils.extractVariantDefaults(packageConfig);
-				const packageRuntimeConfigValues = require_utils.extractRuntimeConfigValues(packageConfig);
-				const packageScanResult = await require_nodeUtils.scanDirectoriesForSafelist(scopedPackageTarget.entryDirs, colorModes, context.variants, context.autoVariants, context.componentData, packageVariantDefaults, packageRuntimeConfigValues, true);
-				genLog.spinStop("✅", require_runner_helpers.getScanSummaryMessage({
-					label: scopedPackageTarget.packageName,
-					filesScanned: packageScanResult.filesScanned,
-					filesWithComponents: packageScanResult.filesWithComponents,
-					componentCount: packageScanResult.components.length,
-					mode: "scoped"
-				}));
-				if (options.verbose) printVerboseScanFiles(genLog, workspaceDir, packageScanResult.filePaths);
-				const packageSafelist = require_safelist.deduplicateSafelist([
-					...packageScanResult.safelist,
+				genLog.spinStart("Generating main CSS...");
+				const mainSafelist = require_safelist.deduplicateSafelist([
+					...inheritedClasses,
 					...require_safelist.getThemeAndScaleClasses(colorModes),
 					...require_safelist.getInternalSafelistClasses()
 				]);
-				const scopedCssResult = await require_generate.generateCSS([...themeConfig.css?.safelist ?? [], ...packageSafelist], packageConfig, {
-					scope: scopedPackageTarget.scopeClass,
-					contentDir: scopedPackageTarget.entryDirs,
+				const allMotionComponents = [...inheritedComponents];
+				require_perf.captureMemory("before-gen");
+				const mainCssResult = await require_perf.measureAsync("gen", () => require_generate.generateCSS([...themeConfig.css?.safelist ?? [], ...mainSafelist], appConfig, {
+					scope: options.scope,
+					contentDir: entryDirs,
 					cssOptions: themeConfig.css,
-					referenceCss: themeConfig.css?.optimization?.deduplicateScopedCss === false ? void 0 : mainCssResult.css,
 					safeVarPrefixes: [
-						...require_utils.getMotionVarPrefixes(context.componentData, [...packageScanResult.components]),
+						...require_utils.getMotionVarPrefixes(context.componentData, allMotionComponents),
 						...require_utils.getConfigurableCssVariables(),
 						...require_generate_helpers.getPruneVarSafelist(themeConfig.css)
 					]
-				});
-				const scopedOutputPath = resolveOutputPath(workspaceDir, getScopedPackageOutputPath(scopedPackageTarget.packageName, scopedPackageTarget.config.outFile));
-				ensureOutputDirectory(scopedOutputPath);
-				node_fs.default.writeFileSync(scopedOutputPath, scopedCssResult.css);
-				scopedCssOutputs.push({
-					label: scopedPackageTarget.packageName,
-					outputPath: scopedOutputPath,
-					sizeGzipBytes: scopedCssResult.sizeGzipBytes,
-					optimizationStats: scopedCssResult.optimizationStats
-				});
-			}
-			const mainCssSummary = require_runner_helpers.getMainCssSummaryMessage({
-				sizeGzipBytes: mainCssResult.sizeGzipBytes,
-				optimizationStats: mainCssResult.optimizationStats,
-				formatBytes: require_utils.formatBytes
-			});
-			genLog.spinStop("✅", mainCssSummary.summaryLine);
-			mainCssSummary.detailLines.forEach((detailLine) => {
-				genLog.print(detailLine);
-			});
-			scopedCssOutputs.forEach((scopedCssOutput) => {
-				const scopedCssSummary = require_runner_helpers.getScopedCssSummaryMessage(scopedCssOutput.label, {
-					sizeGzipBytes: scopedCssOutput.sizeGzipBytes,
-					optimizationStats: scopedCssOutput.optimizationStats,
+				}));
+				require_perf.captureMemory("after-gen");
+				ensureOutputDirectory(outputPath);
+				node_fs.default.writeFileSync(outputPath, mainCssResult.css);
+				for (const scopedPackageTarget of scopedPackageTargets) {
+					const packageConfig = await require_nodeUtils.loadConfigFile(isAbsolutePath(scopedPackageTarget.config.config) ? scopedPackageTarget.config.config : joinPath(scopedPackageTarget.packageRoot, scopedPackageTarget.config.config)) ?? require_index.defaultTokensConfig;
+					const packageVariantDefaults = require_utils.extractVariantDefaults(packageConfig);
+					const packageRuntimeConfigValues = require_utils.extractRuntimeConfigValues(packageConfig);
+					const packageScanResult = await require_nodeUtils.scanDirectoriesForSafelist(scopedPackageTarget.entryDirs, colorModes, context.variants, context.autoVariants, context.componentData, packageVariantDefaults, packageRuntimeConfigValues, true, pool);
+					genLog.spinStop("✅", require_runner_helpers.getScanSummaryMessage({
+						label: scopedPackageTarget.packageName,
+						filesScanned: packageScanResult.filesScanned,
+						filesWithComponents: packageScanResult.filesWithComponents,
+						componentCount: packageScanResult.components.length,
+						mode: "scoped"
+					}));
+					if (options.verbose) printVerboseScanFiles(genLog, workspaceDir, packageScanResult.filePaths);
+					const packageSafelist = require_safelist.deduplicateSafelist([
+						...packageScanResult.safelist,
+						...require_safelist.getThemeAndScaleClasses(colorModes),
+						...require_safelist.getInternalSafelistClasses()
+					]);
+					const scopedCssResult = await require_generate.generateCSS([...themeConfig.css?.safelist ?? [], ...packageSafelist], packageConfig, {
+						scope: scopedPackageTarget.scopeClass,
+						contentDir: scopedPackageTarget.entryDirs,
+						cssOptions: themeConfig.css,
+						referenceCss: themeConfig.css?.optimization?.deduplicateScopedCss === false ? void 0 : mainCssResult.css,
+						safeVarPrefixes: [
+							...require_utils.getMotionVarPrefixes(context.componentData, [...packageScanResult.components]),
+							...require_utils.getConfigurableCssVariables(),
+							...require_generate_helpers.getPruneVarSafelist(themeConfig.css)
+						]
+					});
+					const scopedOutputPath = resolveOutputPath(workspaceDir, getScopedPackageOutputPath(scopedPackageTarget.packageName, scopedPackageTarget.config.outFile));
+					ensureOutputDirectory(scopedOutputPath);
+					node_fs.default.writeFileSync(scopedOutputPath, scopedCssResult.css);
+					scopedCssOutputs.push({
+						label: scopedPackageTarget.packageName,
+						outputPath: scopedOutputPath,
+						sizeGzipBytes: scopedCssResult.sizeGzipBytes,
+						optimizationStats: scopedCssResult.optimizationStats
+					});
+				}
+				const mainCssSummary = require_runner_helpers.getMainCssSummaryMessage({
+					sizeGzipBytes: mainCssResult.sizeGzipBytes,
+					optimizationStats: mainCssResult.optimizationStats,
 					formatBytes: require_utils.formatBytes
 				});
-				genLog.spinStop("✅", scopedCssSummary.summaryLine);
-				scopedCssSummary.detailLines.forEach((detailLine) => {
+				genLog.spinStop("✅", mainCssSummary.summaryLine);
+				mainCssSummary.detailLines.forEach((detailLine) => {
 					genLog.print(detailLine);
 				});
-			});
-			const duration = Math.round(performance.now() - genStartTime);
-			const outputFileSection = require_runner_helpers.getOutputFileSection(workspaceDir, [outputPath, ...scopedCssOutputs.map((scopedCssOutput) => scopedCssOutput.outputPath)]);
-			genLog.newline();
-			genLog.print(outputFileSection.label);
-			outputFileSection.paths.forEach((filePath) => {
-				genLog.listItem(filePath);
-			});
-			genLog.newline();
-			genLog.print(`${require_colors.magenta("Total time:")} ${require_runner_helpers.formatCssDuration(duration)}`);
-			return {
-				duration,
-				outputPath,
-				outputPaths: outputFileSection.paths,
-				packageDirs
-			};
+				scopedCssOutputs.forEach((scopedCssOutput) => {
+					const scopedCssSummary = require_runner_helpers.getScopedCssSummaryMessage(scopedCssOutput.label, {
+						sizeGzipBytes: scopedCssOutput.sizeGzipBytes,
+						optimizationStats: scopedCssOutput.optimizationStats,
+						formatBytes: require_utils.formatBytes
+					});
+					genLog.spinStop("✅", scopedCssSummary.summaryLine);
+					scopedCssSummary.detailLines.forEach((detailLine) => {
+						genLog.print(detailLine);
+					});
+				});
+				const duration = Math.round(performance.now() - genStartTime);
+				const outputFileSection = require_runner_helpers.getOutputFileSection(workspaceDir, [outputPath, ...scopedCssOutputs.map((scopedCssOutput) => scopedCssOutput.outputPath)]);
+				genLog.newline();
+				genLog.print(outputFileSection.label);
+				outputFileSection.paths.forEach((filePath) => {
+					genLog.listItem(filePath);
+				});
+				genLog.newline();
+				genLog.print(`${require_colors.magenta("Total time:")} ${require_runner_helpers.formatCssDuration(duration)}`);
+				require_perf.printPerfSummary(duration);
+				return {
+					duration,
+					outputPath,
+					outputPaths: outputFileSection.paths,
+					packageDirs
+				};
+			} finally {
+				await pool.destroy();
+			}
 		};
 		await generateThemeModeCSS();
 		if (options.watch) {