@tamagui/tailwind 3.0.0-beta.765.1 → 3.0.0-beta.804.1

package/dist/cjs/candidate.cjs

@@ -21,8 +21,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var candidate_exports = {};
 __export(candidate_exports, {
 	getStyleGrammarConfig: () => getStyleGrammarConfig,
+	getTailwindClassPlan: () => getTailwindClassPlan,
 	isTokenValueProp: () => isTokenValueProp,
-	preprocessTailwindClassName: () => preprocessTailwindClassName,
+	resolveTailwindClassName: () => resolveTailwindClassName,
 	setInAuthoredOrder: () => setInAuthoredOrder
 });
 module.exports = __toCommonJS(candidate_exports);
@@ -32,9 +33,13 @@ var import_runtime = require("@tamagui/style-grammar/runtime");
 const styleGrammarConfigCache = /* @__PURE__ */ new WeakMap();
 function getStyleGrammarConfig(config) {
 	const cached = styleGrammarConfigCache.get(config);
-	if (cached) return cached;
+	const revision = config[import_runtime.configRevisionSymbol]?.revision || 0;
+	if (cached && cached.revision === revision) return cached.value;
 	const view = (0, import_runtime.createGrammarConfigView)(config);
-	styleGrammarConfigCache.set(config, view);
+	styleGrammarConfigCache.set(config, {
+		revision,
+		value: view
+	});
 	return view;
 }
 function isTokenValueProp(prop) {
@@ -238,13 +243,17 @@ function createPlanEntry(property, value, modifiers) {
 	if (modifiers.length === 0) return [property, value];
 	const payload = (0, import_internal_runtime.plainValueToPayload)(value, property);
 	if (payload === null) return null;
-	return [null, (0, import_internal_runtime.createFrontendProgram)(property, {
-		base: null,
-		clauses: [{
-			modifiers,
-			payload
-		}]
-	})];
+	let condition = "";
+	for (let index = 0; index < modifiers.length; index++) {
+		if (index) condition += ":";
+		condition += modifiers[index];
+	}
+	return [
+		property,
+		payload,
+		condition,
+		modifiers
+	];
 }
 function computeClassPlan(cls, grammarConfig) {
 	const groupMarker = /^group(?:\/([A-Za-z0-9_-]+))?$/.exec(cls);
@@ -259,13 +268,9 @@ function computeClassPlan(cls, grammarConfig) {
 		const isSize = containerMarker[1] !== void 0;
 		const name = containerMarker[2];
 		const entries = [];
-		if (name) entries.push(["containerName", name]);
+		entries.push(["container", name || true]);
 		if (isSize) {
 			entries.push(["containerType", "size"]);
-		} else if (name) {
-			entries.push(["containerType", "inline-size"]);
-		} else {
-			entries.push(["container", true]);
 		}
 		return {
 			entries,
@@ -304,81 +309,63 @@ function computeClassPlan(cls, grammarConfig) {
 	}
 	return "raw";
 }
-const warnedNativePassthroughCandidates = /* @__PURE__ */ new Set();
-function setInAuthoredOrder(target, key, value) {
-	if (key in target) delete target[key];
-	target[key] = value;
-}
-function preprocessTailwindClassName(props, config, preservePassthroughPosition = false) {
-	const className = props.className;
-	if (!className || typeof className !== "string") {
-		return props;
-	}
-	const classes = className.split(/\s+/).filter(Boolean);
-	const result = {};
+function getTailwindClassPlan(candidate, config) {
 	const grammarConfig = getStyleGrammarConfig(config);
 	const plans = getClassPlanCache(grammarConfig);
-	const classPlans = classes.map((cls) => {
-		let plan = plans.get(cls);
-		if (plan === void 0) {
-			plan = computeClassPlan(cls, grammarConfig);
-			plans.set(cls, plan);
-		}
-		return plan;
-	});
-	const hasOwnedStyleCandidate = preservePassthroughPosition && classPlans.some((plan) => Array.isArray(plan));
-	let frontendProgramIndex = 0;
-	let passthroughIndex = 0;
-	const regularClasses = [];
-	const preserveRawClass = (cls) => {
-		if (hasOwnedStyleCandidate) {
-			result[`${import_internal_runtime.STYLE_FRONTEND_PASSTHROUGH_PREFIX}${passthroughIndex++}`] = cls;
-		} else {
-			regularClasses.push(cls);
-		}
-	};
-	const applyEntry = ([key, value]) => {
-		if (key === null) {
-			result[`__tamagui_frontend_program_${frontendProgramIndex++}`] = value;
-		} else {
-			setInAuthoredOrder(result, key, value);
-		}
-	};
-	for (const key in props) {
-		if (key !== "className") {
-			setInAuthoredOrder(result, key, props[key]);
+	let plan = plans.get(candidate);
+	if (plan === void 0) {
+		plan = computeClassPlan(candidate, grammarConfig);
+		plans.set(candidate, plan);
+	}
+	return plan;
+}
+function resolveTailwindClassName(className, config) {
+	const result = {};
+	let rawClassName = "";
+	let start = 0;
+	for (let index = 0; index <= className.length; index++) {
+		if (index !== className.length && className.charCodeAt(index) > 32) continue;
+		if (start === index) {
+			start = index + 1;
 			continue;
 		}
-		for (let classIndex = 0; classIndex < classes.length; classIndex++) {
-			const cls = classes[classIndex];
-			const plan = classPlans[classIndex];
-			if (plan === null) {
-				if (process.env.NODE_ENV !== "production" && !warnedNativePassthroughCandidates.has(cls)) {
-					warnedNativePassthroughCandidates.add(cls);
-					console.warn(`[tamagui] Tailwind candidate "${cls}" is web-only and was dropped on native. Use a Tamagui grammar candidate or a native style prop for cross-platform output.`);
-				}
-				continue;
-			}
-			if (plan === "raw") {
-				preserveRawClass(cls);
-				continue;
+		const candidate = className.slice(start, index);
+		const plan = getTailwindClassPlan(candidate, config);
+		if (plan === "raw") {
+			rawClassName = rawClassName ? `${rawClassName} ${candidate}` : candidate;
+		} else if (plan) {
+			const parentPlan = plan;
+			if (!Array.isArray(plan) && parentPlan.preserveRawClass) {
+				rawClassName = rawClassName ? `${rawClassName} ${candidate}` : candidate;
 			}
-			if (!Array.isArray(plan)) {
-				if (plan.preserveRawClass) {
-					preserveRawClass(cls);
+			const entries = Array.isArray(plan) ? plan : parentPlan.entries;
+			for (let entryIndex = 0; entryIndex < entries.length; entryIndex++) {
+				const [key, value, condition] = entries[entryIndex];
+				const previous = result[key];
+				let next = value;
+				if (condition !== void 0) {
+					next = previous && typeof previous === "object" && !Array.isArray(previous) ? {
+						...previous,
+						[condition]: value
+					} : previous === void 0 ? { [condition]: value } : {
+						default: previous,
+						[condition]: value
+					};
+				} else if (previous && typeof previous === "object" && !Array.isArray(previous)) {
+					next = {
+						...previous,
+						default: value
+					};
 				}
-				for (let i = 0; i < plan.entries.length; i++) {
-					applyEntry(plan.entries[i]);
-				}
-				continue;
-			}
-			for (let i = 0; i < plan.length; i++) {
-				applyEntry(plan[i]);
+				setInAuthoredOrder(result, key, next);
 			}
 		}
-		if (regularClasses.length > 0) {
-			result.className = regularClasses.join(" ");
-		}
+		start = index + 1;
 	}
+	if (rawClassName) result.className = rawClassName;
 	return result;
 }
+function setInAuthoredOrder(target, key, value) {
+	if (key in target) delete target[key];
+	target[key] = value;
+}

package/dist/cjs/candidate.native.cjs

@@ -23,20 +23,30 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var candidate_exports = {};
 __export(candidate_exports, {
 	getStyleGrammarConfig: () => getStyleGrammarConfig,
+	getTailwindClassPlan: () => getTailwindClassPlan,
 	isTokenValueProp: () => isTokenValueProp,
-	preprocessTailwindClassName: () => preprocessTailwindClassName,
+	resolveTailwindClassName: () => resolveTailwindClassName,
 	setInAuthoredOrder: () => setInAuthoredOrder
 });
 module.exports = __toCommonJS(candidate_exports);
 var import_constants = require("@tamagui/constants");
 var import_internal_runtime = require("@tamagui/core/internal-runtime");
 var import_runtime = require("@tamagui/style-grammar/runtime");
+function _type_of(obj) {
+	"@swc/helpers - typeof";
+	return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 var styleGrammarConfigCache = /* @__PURE__ */ new WeakMap();
 function getStyleGrammarConfig(config) {
+	var _config_configRevisionSymbol;
 	var cached = styleGrammarConfigCache.get(config);
-	if (cached) return cached;
+	var revision = ((_config_configRevisionSymbol = config[import_runtime.configRevisionSymbol]) === null || _config_configRevisionSymbol === void 0 ? void 0 : _config_configRevisionSymbol.revision) || 0;
+	if (cached && cached.revision === revision) return cached.value;
 	var view = (0, import_runtime.createGrammarConfigView)(config);
-	styleGrammarConfigCache.set(config, view);
+	styleGrammarConfigCache.set(config, {
+		revision,
+		value: view
+	});
 	return view;
 }
 function isTokenValueProp(prop) {
@@ -280,13 +290,17 @@ function createPlanEntry(property, value, modifiers) {
 	if (modifiers.length === 0) return [property, value];
 	var payload = (0, import_internal_runtime.plainValueToPayload)(value, property);
 	if (payload === null) return null;
-	return [null, (0, import_internal_runtime.createFrontendProgram)(property, {
-		base: null,
-		clauses: [{
-			modifiers,
-			payload
-		}]
-	})];
+	var condition = "";
+	for (var index = 0; index < modifiers.length; index++) {
+		if (index) condition += ":";
+		condition += modifiers[index];
+	}
+	return [
+		property,
+		payload,
+		condition,
+		modifiers
+	];
 }
 function computeClassPlan(cls, grammarConfig) {
 	var groupMarker = /^group(?:\/([A-Za-z0-9_-]+))?$/.exec(cls);
@@ -301,13 +315,9 @@ function computeClassPlan(cls, grammarConfig) {
 		var isSize = containerMarker[1] !== void 0;
 		var name = containerMarker[2];
 		var entries = [];
-		if (name) entries.push(["containerName", name]);
+		entries.push(["container", name || true]);
 		if (isSize) {
 			entries.push(["containerType", "size"]);
-		} else if (name) {
-			entries.push(["containerType", "inline-size"]);
-		} else {
-			entries.push(["container", true]);
 		}
 		return {
 			entries,
@@ -346,85 +356,63 @@ function computeClassPlan(cls, grammarConfig) {
 	}
 	return "raw";
 }
-var warnedNativePassthroughCandidates = /* @__PURE__ */ new Set();
-function setInAuthoredOrder(target, key, value) {
-	if (key in target) delete target[key];
-	target[key] = value;
-}
-function preprocessTailwindClassName(props, config) {
-	var preservePassthroughPosition = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
-	var className = props.className;
-	if (!className || typeof className !== "string") {
-		return props;
-	}
-	var classes = className.split(/\s+/).filter(Boolean);
-	var result = {};
+function getTailwindClassPlan(candidate, config) {
 	var grammarConfig = getStyleGrammarConfig(config);
 	var plans = getClassPlanCache(grammarConfig);
-	var classPlans = classes.map(function(cls2) {
-		var plan2 = plans.get(cls2);
-		if (plan2 === void 0) {
-			plan2 = computeClassPlan(cls2, grammarConfig);
-			plans.set(cls2, plan2);
-		}
-		return plan2;
-	});
-	var hasOwnedStyleCandidate = preservePassthroughPosition && classPlans.some(function(plan2) {
-		return Array.isArray(plan2);
-	});
-	var frontendProgramIndex = 0;
-	var passthroughIndex = 0;
-	var regularClasses = [];
-	var preserveRawClass = function(cls2) {
-		if (hasOwnedStyleCandidate) {
-			result[`${import_internal_runtime.STYLE_FRONTEND_PASSTHROUGH_PREFIX}${passthroughIndex++}`] = cls2;
-		} else {
-			regularClasses.push(cls2);
-		}
-	};
-	var applyEntry = function(param) {
-		var [key2, value] = param;
-		if (key2 === null) {
-			result[`__tamagui_frontend_program_${frontendProgramIndex++}`] = value;
-		} else {
-			setInAuthoredOrder(result, key2, value);
-		}
-	};
-	for (var key in props) {
-		if (key !== "className") {
-			setInAuthoredOrder(result, key, props[key]);
+	var plan = plans.get(candidate);
+	if (plan === void 0) {
+		plan = computeClassPlan(candidate, grammarConfig);
+		plans.set(candidate, plan);
+	}
+	return plan;
+}
+function resolveTailwindClassName(className, config) {
+	var result = {};
+	var rawClassName = "";
+	var start = 0;
+	for (var index = 0; index <= className.length; index++) {
+		if (index !== className.length && className.charCodeAt(index) > 32) continue;
+		if (start === index) {
+			start = index + 1;
 			continue;
 		}
-		for (var classIndex = 0; classIndex < classes.length; classIndex++) {
-			var cls = classes[classIndex];
-			var plan = classPlans[classIndex];
-			if (plan === null) {
-				if (process.env.NODE_ENV !== "production" && !warnedNativePassthroughCandidates.has(cls)) {
-					warnedNativePassthroughCandidates.add(cls);
-					console.warn(`[tamagui] Tailwind candidate "${cls}" is web-only and was dropped on native. Use a Tamagui grammar candidate or a native style prop for cross-platform output.`);
-				}
-				continue;
-			}
-			if (plan === "raw") {
-				preserveRawClass(cls);
-				continue;
+		var candidate = className.slice(start, index);
+		var plan = getTailwindClassPlan(candidate, config);
+		if (plan === "raw") {
+			rawClassName = rawClassName ? `${rawClassName} ${candidate}` : candidate;
+		} else if (plan) {
+			var parentPlan = plan;
+			if (!Array.isArray(plan) && parentPlan.preserveRawClass) {
+				rawClassName = rawClassName ? `${rawClassName} ${candidate}` : candidate;
 			}
-			if (!Array.isArray(plan)) {
-				if (plan.preserveRawClass) {
-					preserveRawClass(cls);
+			var entries = Array.isArray(plan) ? plan : parentPlan.entries;
+			for (var entryIndex = 0; entryIndex < entries.length; entryIndex++) {
+				var [key, value, condition] = entries[entryIndex];
+				var previous = result[key];
+				var next = value;
+				if (condition !== void 0) {
+					next = previous && (typeof previous === "undefined" ? "undefined" : _type_of(previous)) === "object" && !Array.isArray(previous) ? {
+						...previous,
+						[condition]: value
+					} : previous === void 0 ? { [condition]: value } : {
+						default: previous,
+						[condition]: value
+					};
+				} else if (previous && (typeof previous === "undefined" ? "undefined" : _type_of(previous)) === "object" && !Array.isArray(previous)) {
+					next = {
+						...previous,
+						default: value
+					};
 				}
-				for (var i = 0; i < plan.entries.length; i++) {
-					applyEntry(plan.entries[i]);
-				}
-				continue;
-			}
-			for (var i1 = 0; i1 < plan.length; i1++) {
-				applyEntry(plan[i1]);
+				setInAuthoredOrder(result, key, next);
 			}
 		}
-		if (regularClasses.length > 0) {
-			result.className = regularClasses.join(" ");
-		}
+		start = index + 1;
 	}
+	if (rawClassName) result.className = rawClassName;
 	return result;
 }
+function setInAuthoredOrder(target, key, value) {
+	if (key in target) delete target[key];
+	target[key] = value;
+}

package/dist/cjs/candidate.native.js

@@ -23,20 +23,30 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var candidate_exports = {};
 __export(candidate_exports, {
 	getStyleGrammarConfig: () => getStyleGrammarConfig,
+	getTailwindClassPlan: () => getTailwindClassPlan,
 	isTokenValueProp: () => isTokenValueProp,
-	preprocessTailwindClassName: () => preprocessTailwindClassName,
+	resolveTailwindClassName: () => resolveTailwindClassName,
 	setInAuthoredOrder: () => setInAuthoredOrder
 });
 module.exports = __toCommonJS(candidate_exports);
 var import_constants = require("@tamagui/constants");
 var import_internal_runtime = require("@tamagui/core/internal-runtime");
 var import_runtime = require("@tamagui/style-grammar/runtime");
+function _type_of(obj) {
+	"@swc/helpers - typeof";
+	return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 var styleGrammarConfigCache = /* @__PURE__ */ new WeakMap();
 function getStyleGrammarConfig(config) {
+	var _config_configRevisionSymbol;
 	var cached = styleGrammarConfigCache.get(config);
-	if (cached) return cached;
+	var revision = ((_config_configRevisionSymbol = config[import_runtime.configRevisionSymbol]) === null || _config_configRevisionSymbol === void 0 ? void 0 : _config_configRevisionSymbol.revision) || 0;
+	if (cached && cached.revision === revision) return cached.value;
 	var view = (0, import_runtime.createGrammarConfigView)(config);
-	styleGrammarConfigCache.set(config, view);
+	styleGrammarConfigCache.set(config, {
+		revision,
+		value: view
+	});
 	return view;
 }
 function isTokenValueProp(prop) {
@@ -280,13 +290,17 @@ function createPlanEntry(property, value, modifiers) {
 	if (modifiers.length === 0) return [property, value];
 	var payload = (0, import_internal_runtime.plainValueToPayload)(value, property);
 	if (payload === null) return null;
-	return [null, (0, import_internal_runtime.createFrontendProgram)(property, {
-		base: null,
-		clauses: [{
-			modifiers,
-			payload
-		}]
-	})];
+	var condition = "";
+	for (var index = 0; index < modifiers.length; index++) {
+		if (index) condition += ":";
+		condition += modifiers[index];
+	}
+	return [
+		property,
+		payload,
+		condition,
+		modifiers
+	];
 }
 function computeClassPlan(cls, grammarConfig) {
 	var groupMarker = /^group(?:\/([A-Za-z0-9_-]+))?$/.exec(cls);
@@ -301,13 +315,9 @@ function computeClassPlan(cls, grammarConfig) {
 		var isSize = containerMarker[1] !== void 0;
 		var name = containerMarker[2];
 		var entries = [];
-		if (name) entries.push(["containerName", name]);
+		entries.push(["container", name || true]);
 		if (isSize) {
 			entries.push(["containerType", "size"]);
-		} else if (name) {
-			entries.push(["containerType", "inline-size"]);
-		} else {
-			entries.push(["container", true]);
 		}
 		return {
 			entries,
@@ -346,87 +356,65 @@ function computeClassPlan(cls, grammarConfig) {
 	}
 	return "raw";
 }
-var warnedNativePassthroughCandidates = /* @__PURE__ */ new Set();
-function setInAuthoredOrder(target, key, value) {
-	if (key in target) delete target[key];
-	target[key] = value;
-}
-function preprocessTailwindClassName(props, config) {
-	var preservePassthroughPosition = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
-	var className = props.className;
-	if (!className || typeof className !== "string") {
-		return props;
-	}
-	var classes = className.split(/\s+/).filter(Boolean);
-	var result = {};
+function getTailwindClassPlan(candidate, config) {
 	var grammarConfig = getStyleGrammarConfig(config);
 	var plans = getClassPlanCache(grammarConfig);
-	var classPlans = classes.map(function(cls2) {
-		var plan2 = plans.get(cls2);
-		if (plan2 === void 0) {
-			plan2 = computeClassPlan(cls2, grammarConfig);
-			plans.set(cls2, plan2);
-		}
-		return plan2;
-	});
-	var hasOwnedStyleCandidate = preservePassthroughPosition && classPlans.some(function(plan2) {
-		return Array.isArray(plan2);
-	});
-	var frontendProgramIndex = 0;
-	var passthroughIndex = 0;
-	var regularClasses = [];
-	var preserveRawClass = function(cls2) {
-		if (hasOwnedStyleCandidate) {
-			result[`${import_internal_runtime.STYLE_FRONTEND_PASSTHROUGH_PREFIX}${passthroughIndex++}`] = cls2;
-		} else {
-			regularClasses.push(cls2);
-		}
-	};
-	var applyEntry = function(param) {
-		var [key2, value] = param;
-		if (key2 === null) {
-			result[`__tamagui_frontend_program_${frontendProgramIndex++}`] = value;
-		} else {
-			setInAuthoredOrder(result, key2, value);
-		}
-	};
-	for (var key in props) {
-		if (key !== "className") {
-			setInAuthoredOrder(result, key, props[key]);
+	var plan = plans.get(candidate);
+	if (plan === void 0) {
+		plan = computeClassPlan(candidate, grammarConfig);
+		plans.set(candidate, plan);
+	}
+	return plan;
+}
+function resolveTailwindClassName(className, config) {
+	var result = {};
+	var rawClassName = "";
+	var start = 0;
+	for (var index = 0; index <= className.length; index++) {
+		if (index !== className.length && className.charCodeAt(index) > 32) continue;
+		if (start === index) {
+			start = index + 1;
 			continue;
 		}
-		for (var classIndex = 0; classIndex < classes.length; classIndex++) {
-			var cls = classes[classIndex];
-			var plan = classPlans[classIndex];
-			if (plan === null) {
-				if (process.env.NODE_ENV !== "production" && !warnedNativePassthroughCandidates.has(cls)) {
-					warnedNativePassthroughCandidates.add(cls);
-					console.warn(`[tamagui] Tailwind candidate "${cls}" is web-only and was dropped on native. Use a Tamagui grammar candidate or a native style prop for cross-platform output.`);
-				}
-				continue;
-			}
-			if (plan === "raw") {
-				preserveRawClass(cls);
-				continue;
+		var candidate = className.slice(start, index);
+		var plan = getTailwindClassPlan(candidate, config);
+		if (plan === "raw") {
+			rawClassName = rawClassName ? `${rawClassName} ${candidate}` : candidate;
+		} else if (plan) {
+			var parentPlan = plan;
+			if (!Array.isArray(plan) && parentPlan.preserveRawClass) {
+				rawClassName = rawClassName ? `${rawClassName} ${candidate}` : candidate;
 			}
-			if (!Array.isArray(plan)) {
-				if (plan.preserveRawClass) {
-					preserveRawClass(cls);
+			var entries = Array.isArray(plan) ? plan : parentPlan.entries;
+			for (var entryIndex = 0; entryIndex < entries.length; entryIndex++) {
+				var [key, value, condition] = entries[entryIndex];
+				var previous = result[key];
+				var next = value;
+				if (condition !== void 0) {
+					next = previous && (typeof previous === "undefined" ? "undefined" : _type_of(previous)) === "object" && !Array.isArray(previous) ? {
+						...previous,
+						[condition]: value
+					} : previous === void 0 ? { [condition]: value } : {
+						default: previous,
+						[condition]: value
+					};
+				} else if (previous && (typeof previous === "undefined" ? "undefined" : _type_of(previous)) === "object" && !Array.isArray(previous)) {
+					next = {
+						...previous,
+						default: value
+					};
 				}
-				for (var i = 0; i < plan.entries.length; i++) {
-					applyEntry(plan.entries[i]);
-				}
-				continue;
-			}
-			for (var i1 = 0; i1 < plan.length; i1++) {
-				applyEntry(plan[i1]);
+				setInAuthoredOrder(result, key, next);
 			}
 		}
-		if (regularClasses.length > 0) {
-			result.className = regularClasses.join(" ");
-		}
+		start = index + 1;
 	}
+	if (rawClassName) result.className = rawClassName;
 	return result;
 }
+function setInAuthoredOrder(target, key, value) {
+	if (key in target) delete target[key];
+	target[key] = value;
+}
 
 //# sourceMappingURL=candidate.native.js.map