@weapp-tailwindcss/engine 0.1.1 → 0.1.2

package/dist/index.cjs

@@ -1,13 +1,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_v4 = require("./v4-DVqsqn8b.cjs");
+const require_v4 = require("./v4-_oyKsjgy.cjs");
 let node_process = require("node:process");
 node_process = require_v4.__toESM(node_process, 1);
 let _weapp_tailwindcss_source_scan = require("@weapp-tailwindcss/source-scan");
 //#region src/extraction/candidate-extractor/valid.ts
-const designSystemCandidateCache = /* @__PURE__ */ new Map();
-function createCandidateCacheKey(designSystemKey, options) {
-	if (options.bareArbitraryValues == null || options.bareArbitraryValues === false) return designSystemKey;
-	return `${designSystemKey}:bare-arbitrary:${JSON.stringify(options.bareArbitraryValues)}`;
+const designSystemCandidateCache = /* @__PURE__ */ new WeakMap();
+function createCandidateCacheKey(options) {
+	if (options.bareArbitraryValues == null || options.bareArbitraryValues === false) return "default";
+	return `bare-arbitrary:${JSON.stringify(options.bareArbitraryValues)}`;
 }
 async function extractValidCandidates(options) {
 	const providedOptions = options ?? {};
@@ -24,18 +24,18 @@ async function extractValidCandidates(options) {
 		pattern: source.pattern,
 		negated: source.negated
 	}));
-	const source = {
+	const designSystem = await require_v4.loadTailwindV4DesignSystem({
 		projectRoot: defaultCwd,
 		base,
 		baseFallbacks,
 		css,
 		dependencies: []
-	};
-	const designSystemKey = require_v4.getTailwindV4DesignSystemCacheKey(source);
-	const designSystem = await require_v4.loadTailwindV4DesignSystem(source);
-	const candidateCacheKey = createCandidateCacheKey(designSystemKey, providedOptions);
-	const candidateCache = designSystemCandidateCache.get(candidateCacheKey) ?? /* @__PURE__ */ new Map();
-	designSystemCandidateCache.set(candidateCacheKey, candidateCache);
+	});
+	const candidateCacheKey = createCandidateCacheKey(providedOptions);
+	const caches = designSystemCandidateCache.get(designSystem) ?? /* @__PURE__ */ new Map();
+	designSystemCandidateCache.set(designSystem, caches);
+	const candidateCache = caches.get(candidateCacheKey) ?? /* @__PURE__ */ new Map();
+	caches.set(candidateCacheKey, candidateCache);
 	const candidates = await require_v4.extractRawCandidates(sources, providedOptions.bareArbitraryValues === void 0 ? void 0 : { bareArbitraryValues: providedOptions.bareArbitraryValues });
 	const inlineSources = require_v4.extractTailwindV4InlineSourceCandidates(css);
 	for (const candidate of inlineSources.included) candidates.push(candidate);

package/dist/index.js

@@ -1,10 +1,10 @@
-import { A as expandTailwindV4SourceEntryBraces, B as expandTailwindV4SourceEntries, C as TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN, D as createTailwindV4CompiledSourceEntries, E as TAILWIND_V4_IGNORED_FILES, F as resolveTailwindV4SourceBaseCandidates, G as compileTailwindV4Source, H as isFileExcludedByTailwindV4SourceEntries, I as resolveTailwindV4SourceEntry, J as loadTailwindV4NodeModule, K as getTailwindV4DesignSystemCacheKey, L as toPosixPath, M as normalizeTailwindV4ScannerSources, N as normalizeTailwindV4SourceEntries, O as createTailwindV4DefaultIgnoreSources, P as resolveSourceScanPath, R as createTailwindV4SourceEntryMatcher, S as resolveProjectSourceFiles, T as TAILWIND_V4_IGNORED_EXTENSIONS, U as isFileMatchedByTailwindV4SourceEntries, V as groupTailwindV4SourceEntriesByBase, W as mergeTailwindV4SourceEntries, _ as isBareArbitraryValuesEnabled, a as createTailwindGenerationSession, b as extractProjectCandidatesWithPositions, c as replaceBareArbitraryValueSelectors, d as extractRawCandidates, f as extractRawCandidatesWithPositions, g as extractBareArbitraryValueSourceCandidatesWithPositions, h as extractBareArbitraryValueSourceCandidates, i as createTailwindV4Engine, j as normalizeGlobPattern, k as createTailwindV4RootSources, l as resolveValidTailwindV4Candidates, m as extractSourceCandidatesWithPositions, n as generateTailwindV4Style, o as collectTailwindStyleCandidates, p as extractSourceCandidates, q as loadTailwindV4DesignSystem, r as resolveTailwindV4Source, s as canonicalizeBareArbitraryValueCandidates, t as collectTailwindV4StyleCandidates, u as extractTailwindV4InlineSourceCandidates, v as resolveBareArbitraryValueCandidate, w as TAILWIND_V4_IGNORED_CONTENT_DIRS, x as groupTokensByFile, y as escapeCssClassName, z as createTailwindV4SourceExclusionMatcher } from "./v4-D46xWjyQ.js";
+import { A as expandTailwindV4SourceEntryBraces, B as expandTailwindV4SourceEntries, C as TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN, D as createTailwindV4CompiledSourceEntries, E as TAILWIND_V4_IGNORED_FILES, F as resolveTailwindV4SourceBaseCandidates, G as compileTailwindV4Source, H as isFileExcludedByTailwindV4SourceEntries, I as resolveTailwindV4SourceEntry, J as loadTailwindV4NodeModule, K as getTailwindV4DesignSystemCacheKey, L as toPosixPath, M as normalizeTailwindV4ScannerSources, N as normalizeTailwindV4SourceEntries, O as createTailwindV4DefaultIgnoreSources, P as resolveSourceScanPath, R as createTailwindV4SourceEntryMatcher, S as resolveProjectSourceFiles, T as TAILWIND_V4_IGNORED_EXTENSIONS, U as isFileMatchedByTailwindV4SourceEntries, V as groupTailwindV4SourceEntriesByBase, W as mergeTailwindV4SourceEntries, _ as isBareArbitraryValuesEnabled, a as createTailwindGenerationSession, b as extractProjectCandidatesWithPositions, c as replaceBareArbitraryValueSelectors, d as extractRawCandidates, f as extractRawCandidatesWithPositions, g as extractBareArbitraryValueSourceCandidatesWithPositions, h as extractBareArbitraryValueSourceCandidates, i as createTailwindV4Engine, j as normalizeGlobPattern, k as createTailwindV4RootSources, l as resolveValidTailwindV4Candidates, m as extractSourceCandidatesWithPositions, n as generateTailwindV4Style, o as collectTailwindStyleCandidates, p as extractSourceCandidates, q as loadTailwindV4DesignSystem, r as resolveTailwindV4Source, s as canonicalizeBareArbitraryValueCandidates, t as collectTailwindV4StyleCandidates, u as extractTailwindV4InlineSourceCandidates, v as resolveBareArbitraryValueCandidate, w as TAILWIND_V4_IGNORED_CONTENT_DIRS, x as groupTokensByFile, y as escapeCssClassName, z as createTailwindV4SourceExclusionMatcher } from "./v4-Ct27rkAi.js";
 import process from "node:process";
 //#region src/extraction/candidate-extractor/valid.ts
-const designSystemCandidateCache = /* @__PURE__ */ new Map();
-function createCandidateCacheKey(designSystemKey, options) {
-	if (options.bareArbitraryValues == null || options.bareArbitraryValues === false) return designSystemKey;
-	return `${designSystemKey}:bare-arbitrary:${JSON.stringify(options.bareArbitraryValues)}`;
+const designSystemCandidateCache = /* @__PURE__ */ new WeakMap();
+function createCandidateCacheKey(options) {
+	if (options.bareArbitraryValues == null || options.bareArbitraryValues === false) return "default";
+	return `bare-arbitrary:${JSON.stringify(options.bareArbitraryValues)}`;
 }
 async function extractValidCandidates(options) {
 	const providedOptions = options ?? {};
@@ -21,18 +21,18 @@ async function extractValidCandidates(options) {
 		pattern: source.pattern,
 		negated: source.negated
 	}));
-	const source = {
+	const designSystem = await loadTailwindV4DesignSystem({
 		projectRoot: defaultCwd,
 		base,
 		baseFallbacks,
 		css,
 		dependencies: []
-	};
-	const designSystemKey = getTailwindV4DesignSystemCacheKey(source);
-	const designSystem = await loadTailwindV4DesignSystem(source);
-	const candidateCacheKey = createCandidateCacheKey(designSystemKey, providedOptions);
-	const candidateCache = designSystemCandidateCache.get(candidateCacheKey) ?? /* @__PURE__ */ new Map();
-	designSystemCandidateCache.set(candidateCacheKey, candidateCache);
+	});
+	const candidateCacheKey = createCandidateCacheKey(providedOptions);
+	const caches = designSystemCandidateCache.get(designSystem) ?? /* @__PURE__ */ new Map();
+	designSystemCandidateCache.set(designSystem, caches);
+	const candidateCache = caches.get(candidateCacheKey) ?? /* @__PURE__ */ new Map();
+	caches.set(candidateCacheKey, candidateCache);
 	const candidates = await extractRawCandidates(sources, providedOptions.bareArbitraryValues === void 0 ? void 0 : { bareArbitraryValues: providedOptions.bareArbitraryValues });
 	const inlineSources = extractTailwindV4InlineSourceCandidates(css);
 	for (const candidate of inlineSources.included) candidates.push(candidate);

package/dist/v4/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_v4 = require("../v4-DVqsqn8b.cjs");
+const require_v4 = require("../v4-_oyKsjgy.cjs");
 let _weapp_tailwindcss_source_scan = require("@weapp-tailwindcss/source-scan");
 exports.TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN = require_v4.TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN;
 exports.TAILWIND_V4_IGNORED_CONTENT_DIRS = require_v4.TAILWIND_V4_IGNORED_CONTENT_DIRS;

package/dist/v4/index.js

@@ -1,2 +1,2 @@
-import { A as expandTailwindV4SourceEntryBraces, B as expandTailwindV4SourceEntries, C as TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN, D as createTailwindV4CompiledSourceEntries, E as TAILWIND_V4_IGNORED_FILES, F as resolveTailwindV4SourceBaseCandidates, G as compileTailwindV4Source, H as isFileExcludedByTailwindV4SourceEntries, I as resolveTailwindV4SourceEntry, J as loadTailwindV4NodeModule, K as getTailwindV4DesignSystemCacheKey, L as toPosixPath, M as normalizeTailwindV4ScannerSources, N as normalizeTailwindV4SourceEntries, O as createTailwindV4DefaultIgnoreSources, P as resolveSourceScanPath, R as createTailwindV4SourceEntryMatcher, T as TAILWIND_V4_IGNORED_EXTENSIONS, U as isFileMatchedByTailwindV4SourceEntries, V as groupTailwindV4SourceEntriesByBase, W as mergeTailwindV4SourceEntries, _ as isBareArbitraryValuesEnabled, a as createTailwindGenerationSession, c as replaceBareArbitraryValueSelectors, g as extractBareArbitraryValueSourceCandidatesWithPositions, h as extractBareArbitraryValueSourceCandidates, i as createTailwindV4Engine, j as normalizeGlobPattern, k as createTailwindV4RootSources, l as resolveValidTailwindV4Candidates, n as generateTailwindV4Style, q as loadTailwindV4DesignSystem, r as resolveTailwindV4Source, s as canonicalizeBareArbitraryValueCandidates, t as collectTailwindV4StyleCandidates, u as extractTailwindV4InlineSourceCandidates, v as resolveBareArbitraryValueCandidate, w as TAILWIND_V4_IGNORED_CONTENT_DIRS, y as escapeCssClassName, z as createTailwindV4SourceExclusionMatcher } from "../v4-D46xWjyQ.js";
+import { A as expandTailwindV4SourceEntryBraces, B as expandTailwindV4SourceEntries, C as TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN, D as createTailwindV4CompiledSourceEntries, E as TAILWIND_V4_IGNORED_FILES, F as resolveTailwindV4SourceBaseCandidates, G as compileTailwindV4Source, H as isFileExcludedByTailwindV4SourceEntries, I as resolveTailwindV4SourceEntry, J as loadTailwindV4NodeModule, K as getTailwindV4DesignSystemCacheKey, L as toPosixPath, M as normalizeTailwindV4ScannerSources, N as normalizeTailwindV4SourceEntries, O as createTailwindV4DefaultIgnoreSources, P as resolveSourceScanPath, R as createTailwindV4SourceEntryMatcher, T as TAILWIND_V4_IGNORED_EXTENSIONS, U as isFileMatchedByTailwindV4SourceEntries, V as groupTailwindV4SourceEntriesByBase, W as mergeTailwindV4SourceEntries, _ as isBareArbitraryValuesEnabled, a as createTailwindGenerationSession, c as replaceBareArbitraryValueSelectors, g as extractBareArbitraryValueSourceCandidatesWithPositions, h as extractBareArbitraryValueSourceCandidates, i as createTailwindV4Engine, j as normalizeGlobPattern, k as createTailwindV4RootSources, l as resolveValidTailwindV4Candidates, n as generateTailwindV4Style, q as loadTailwindV4DesignSystem, r as resolveTailwindV4Source, s as canonicalizeBareArbitraryValueCandidates, t as collectTailwindV4StyleCandidates, u as extractTailwindV4InlineSourceCandidates, v as resolveBareArbitraryValueCandidate, w as TAILWIND_V4_IGNORED_CONTENT_DIRS, y as escapeCssClassName, z as createTailwindV4SourceExclusionMatcher } from "../v4-Ct27rkAi.js";
 export { TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN, TAILWIND_V4_IGNORED_CONTENT_DIRS, TAILWIND_V4_IGNORED_EXTENSIONS, TAILWIND_V4_IGNORED_FILES, canonicalizeBareArbitraryValueCandidates, collectTailwindV4StyleCandidates, compileTailwindV4Source, createTailwindGenerationSession, createTailwindV4CompiledSourceEntries, createTailwindV4DefaultIgnoreSources, createTailwindV4Engine, createTailwindV4RootSources, createTailwindV4SourceEntryMatcher, createTailwindV4SourceExclusionMatcher, escapeCssClassName, expandTailwindV4SourceEntries, expandTailwindV4SourceEntryBraces, extractBareArbitraryValueSourceCandidates, extractBareArbitraryValueSourceCandidatesWithPositions, extractTailwindV4InlineSourceCandidates, generateTailwindV4Style, getTailwindV4DesignSystemCacheKey, groupTailwindV4SourceEntriesByBase, isBareArbitraryValuesEnabled, isFileExcludedByTailwindV4SourceEntries, isFileMatchedByTailwindV4SourceEntries, loadTailwindV4DesignSystem, loadTailwindV4NodeModule, mergeTailwindV4SourceEntries, normalizeGlobPattern, normalizeTailwindV4ScannerSources, normalizeTailwindV4SourceEntries, replaceBareArbitraryValueSelectors, resolveBareArbitraryValueCandidate, resolveSourceScanPath, resolveTailwindV4Source, resolveTailwindV4SourceBaseCandidates, resolveTailwindV4SourceEntry, resolveValidTailwindV4Candidates, toPosixPath };

package/dist/{v4-D46xWjyQ.js → v4-Ct27rkAi.js}

@@ -2,9 +2,9 @@ import { createRequire, findPackageJSON } from "node:module";
 import { promises, readFileSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
+import { createHash } from "node:crypto";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { AsyncLocalStorage } from "node:async_hooks";
-import { createHash } from "node:crypto";
 import { clearRequireCache } from "@tailwindcss/node/require-cache";
 import { createSourceScanPlan, expandSourceEntries as expandTailwindV4SourceEntries, expandSourceEntryBraces, expandSourceEntryBraces as expandTailwindV4SourceEntryBraces, groupSourceEntriesByBase as groupTailwindV4SourceEntriesByBase, isFileExcludedByTailwindSourceEntries, isFileExcludedByTailwindSourceEntries as isFileExcludedByTailwindV4SourceEntries, isFileMatchedByTailwindSourceEntries, mergeSourceEntries as mergeTailwindV4SourceEntries, normalizeGlobPattern, resolveSourceScanPath, resolveSourceScanPath as resolveSourceScanPath$1, resolveTailwindSourceEntry, toPosixPath } from "@weapp-tailwindcss/source-scan";
 import postcss from "postcss";
@@ -171,6 +171,18 @@ function prepareGenerationModuleRequests(css, base) {
 //#region src/v4/node-adapter.ts
 const nodeModulePromiseCache = /* @__PURE__ */ new Map();
 const designSystemPromiseCache = /* @__PURE__ */ new Map();
+function fingerprintDesignDependencies(files) {
+	const hash = createHash("sha256");
+	for (const file of [...files].sort()) {
+		hash.update(file);
+		try {
+			hash.update(readFileSync(file));
+		} catch {
+			hash.update("missing");
+		}
+	}
+	return hash.digest("hex");
+}
 function unique(values) {
 	return Array.from(new Set(Array.from(values).filter(Boolean).map((value) => path.resolve(value))));
 }
@@ -242,14 +254,14 @@ function createDesignSystemCacheKey(css, bases) {
 function getTailwindV4DesignSystemCacheKey(source) {
 	return createDesignSystemCacheKey(source.css, [source.base, ...source.baseFallbacks]);
 }
-async function createTailwindV4DesignSystem(source) {
+async function createTailwindV4DesignSystem(source, onDependency) {
 	const bases = unique([source.base, ...source.baseFallbacks]);
 	if (bases.length === 0) throw new Error("No base directories provided for Tailwind CSS v4 design system.");
 	const node = await loadTailwindV4NodeModule([source.projectRoot, ...bases]);
 	let lastError;
 	for (const base of bases) try {
 		const prepared = prepareGenerationModuleRequests(source.css, base);
-		return await withGenerationModuleCache(node, () => node.__unstable__loadDesignSystem(prepared.css, { base }), prepared.files);
+		return await withGenerationModuleCache(node, () => node.__unstable__loadDesignSystem(prepared.css, { base }), prepared.files, onDependency);
 	} catch (error) {
 		lastError = error;
 	}
@@ -258,13 +270,20 @@ async function createTailwindV4DesignSystem(source) {
 }
 async function loadTailwindV4DesignSystem(source, options) {
 	if (options?.cache === false) return createTailwindV4DesignSystem(source);
-	const cacheKey = getTailwindV4DesignSystemCacheKey(source);
+	const cacheKey = JSON.stringify([source.projectRoot, getTailwindV4DesignSystemCacheKey(source)]);
 	const cached = designSystemPromiseCache.get(cacheKey);
-	if (cached) return cached;
-	const promise = createTailwindV4DesignSystem(source);
-	designSystemPromiseCache.set(cacheKey, promise);
-	promise.catch(() => {
-		if (designSystemPromiseCache.get(cacheKey) === promise) designSystemPromiseCache.delete(cacheKey);
+	if (cached && (cached.fingerprint === void 0 || cached.fingerprint === fingerprintDesignDependencies(cached.dependencies))) return cached.promise;
+	const dependencies = new Set(source.dependencies);
+	const promise = createTailwindV4DesignSystem(source, (file) => dependencies.add(file));
+	const entry = {
+		promise,
+		dependencies
+	};
+	designSystemPromiseCache.set(cacheKey, entry);
+	promise.then(() => {
+		entry.fingerprint = fingerprintDesignDependencies(dependencies);
+	}, () => {
+		if (designSystemPromiseCache.get(cacheKey) === entry) designSystemPromiseCache.delete(cacheKey);
 	});
 	return promise;
 }

package/dist/{v4-DVqsqn8b.cjs → v4-_oyKsjgy.cjs}

@@ -25,10 +25,10 @@ let node_path = require("node:path");
 node_path = __toESM(node_path, 1);
 let node_process = require("node:process");
 node_process = __toESM(node_process, 1);
+let node_crypto = require("node:crypto");
 let node_module = require("node:module");
 let node_url = require("node:url");
 let node_async_hooks = require("node:async_hooks");
-let node_crypto = require("node:crypto");
 let _tailwindcss_node_require_cache = require("@tailwindcss/node/require-cache");
 let _weapp_tailwindcss_source_scan = require("@weapp-tailwindcss/source-scan");
 let postcss = require("postcss");
@@ -196,6 +196,18 @@ function prepareGenerationModuleRequests(css, base) {
 //#region src/v4/node-adapter.ts
 const nodeModulePromiseCache = /* @__PURE__ */ new Map();
 const designSystemPromiseCache = /* @__PURE__ */ new Map();
+function fingerprintDesignDependencies(files) {
+	const hash = (0, node_crypto.createHash)("sha256");
+	for (const file of [...files].sort()) {
+		hash.update(file);
+		try {
+			hash.update((0, node_fs.readFileSync)(file));
+		} catch {
+			hash.update("missing");
+		}
+	}
+	return hash.digest("hex");
+}
 function unique(values) {
 	return Array.from(new Set(Array.from(values).filter(Boolean).map((value) => node_path.default.resolve(value))));
 }
@@ -267,14 +279,14 @@ function createDesignSystemCacheKey(css, bases) {
 function getTailwindV4DesignSystemCacheKey(source) {
 	return createDesignSystemCacheKey(source.css, [source.base, ...source.baseFallbacks]);
 }
-async function createTailwindV4DesignSystem(source) {
+async function createTailwindV4DesignSystem(source, onDependency) {
 	const bases = unique([source.base, ...source.baseFallbacks]);
 	if (bases.length === 0) throw new Error("No base directories provided for Tailwind CSS v4 design system.");
 	const node = await loadTailwindV4NodeModule([source.projectRoot, ...bases]);
 	let lastError;
 	for (const base of bases) try {
 		const prepared = prepareGenerationModuleRequests(source.css, base);
-		return await withGenerationModuleCache(node, () => node.__unstable__loadDesignSystem(prepared.css, { base }), prepared.files);
+		return await withGenerationModuleCache(node, () => node.__unstable__loadDesignSystem(prepared.css, { base }), prepared.files, onDependency);
 	} catch (error) {
 		lastError = error;
 	}
@@ -283,13 +295,20 @@ async function createTailwindV4DesignSystem(source) {
 }
 async function loadTailwindV4DesignSystem(source, options) {
 	if (options?.cache === false) return createTailwindV4DesignSystem(source);
-	const cacheKey = getTailwindV4DesignSystemCacheKey(source);
+	const cacheKey = JSON.stringify([source.projectRoot, getTailwindV4DesignSystemCacheKey(source)]);
 	const cached = designSystemPromiseCache.get(cacheKey);
-	if (cached) return cached;
-	const promise = createTailwindV4DesignSystem(source);
-	designSystemPromiseCache.set(cacheKey, promise);
-	promise.catch(() => {
-		if (designSystemPromiseCache.get(cacheKey) === promise) designSystemPromiseCache.delete(cacheKey);
+	if (cached && (cached.fingerprint === void 0 || cached.fingerprint === fingerprintDesignDependencies(cached.dependencies))) return cached.promise;
+	const dependencies = new Set(source.dependencies);
+	const promise = createTailwindV4DesignSystem(source, (file) => dependencies.add(file));
+	const entry = {
+		promise,
+		dependencies
+	};
+	designSystemPromiseCache.set(cacheKey, entry);
+	promise.then(() => {
+		entry.fingerprint = fingerprintDesignDependencies(dependencies);
+	}, () => {
+		if (designSystemPromiseCache.get(cacheKey) === entry) designSystemPromiseCache.delete(cacheKey);
 	});
 	return promise;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-tailwindcss/engine",
   "type": "module",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Tailwind CSS 4 候选提取、源码扫描与样式生成引擎。",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",