@tamagui/eslint-plugin 3.0.0-beta.924.1 → 3.0.1

package/README.md

@@ -6,7 +6,6 @@ parsing, configured candidate validation, and v6 built-in names to
 
 ```ts
 // eslint.config.ts
-import parser from '@typescript-eslint/parser'
 import tamagui from '@tamagui/eslint-plugin'
 import { createGrammarConfigView } from '@tamagui/style-grammar/tooling'
 import config from './tamagui.config'
@@ -16,7 +15,6 @@ const grammarConfig = createGrammarConfigView(config)
 export default [
   {
     files: ['**/*.{ts,tsx}'],
-    languageOptions: { parser },
     plugins: { tamagui },
     rules: {
       'tamagui/valid-flat-values': ['error', { config: grammarConfig }],
@@ -65,3 +63,6 @@ payload validator, and obsolete v6 built-in names. It never fixes those
 diagnostics. When a valid value differs only from style-grammar's canonical
 print of the same parsed IR, the rule can safely collapse boundary whitespace
 with ESLint's normal autofix.
+
+Pass `strictPayloads: true` to enable strict validation of single-token clause payloads against configured tokens, theme values, and CSS keywords, catching typos like `bg="backgroun"` with did-you-mean suggestions.
+

package/dist/cjs/index.cjs

@@ -22,12 +22,77 @@ var index_exports = {};
 __export(index_exports, {
 	default: () => index_default,
 	rules: () => rules,
-	validFlatValues: () => import_validFlatValues.validFlatValues
+	validFlatValues: () => validFlatValues
 });
 module.exports = __toCommonJS(index_exports);
-var import_validFlatValues = require("./validFlatValues.cjs");
-var import_validFlatValues2 = require("./validFlatValues.cjs");
-const rules = { "valid-flat-values": import_validFlatValues2.validFlatValues };
+var import_extract_estree = require("@tamagui/language-service/extract-estree");
+var import_tooling = require("@tamagui/style-grammar/tooling");
+const validFlatValues = {
+	meta: {
+		type: "problem",
+		fixable: "code",
+		docs: { description: "validate static Tamagui flat values with @tamagui/style-grammar" },
+		schema: [{
+			type: "object",
+			properties: {
+				config: { type: "object" },
+				strictPayloads: { type: "boolean" }
+			},
+			required: ["config"],
+			additionalProperties: false
+		}],
+		messages: {
+			invalidFlatValue: "{{message}}",
+			nonCanonicalFlatValue: "use the canonical flat value \"{{canonical}}\""
+		}
+	},
+	create(context) {
+		const option = context.options[0];
+		const config = option?.config || {};
+		const strictPayloads = option?.strictPayloads ?? false;
+		const registry = (0, import_tooling.createModifierRegistry)(config).registry;
+		const candidates = (0, import_tooling.createCandidatePropertyVocabulary)(config);
+		const styleProps = (0, import_tooling.createStylePropSet)(config);
+		const sourceCode = context.sourceCode;
+		const report = (site) => {
+			const node = site.node;
+			const diagnostics = (0, import_tooling.diagnoseStyleValueProgram)(site.property, site.value, {
+				config,
+				registry,
+				candidates,
+				strictPayloads
+			});
+			for (const diagnostic of diagnostics) {
+				context.report({
+					node,
+					loc: {
+						start: sourceCode.getLocFromIndex(site.start + diagnostic.start),
+						end: sourceCode.getLocFromIndex(site.start + diagnostic.end)
+					},
+					messageId: "invalidFlatValue",
+					data: { message: diagnostic.message }
+				});
+			}
+			if (diagnostics.length > 0) return;
+			const formatted = (0, import_tooling.canonicalizeStyleValue)(site.value, registry);
+			if (!formatted.ok || formatted.value === site.value) return;
+			const canonical = formatted.value;
+			context.report({
+				node,
+				messageId: "nonCanonicalFlatValue",
+				data: { canonical },
+				fix(fixer) {
+					return fixer.replaceText(node, JSON.stringify(canonical));
+				}
+			});
+		};
+		return { "Program:exit"(program) {
+			const sites = (0, import_extract_estree.extractStyleSitesFromEstree)(program, { isStyleProp: (name) => styleProps.has(name) });
+			for (const site of sites) report(site);
+		} };
+	}
+};
+const rules = { "valid-flat-values": validFlatValues };
 const plugin = {
 	meta: { name: "@tamagui/eslint-plugin" },
 	rules

package/dist/cjs/index.native.cjs

@@ -24,12 +24,116 @@ var index_exports = {};
 __export(index_exports, {
 	default: () => index_default,
 	rules: () => rules,
-	validFlatValues: () => import_validFlatValues.validFlatValues
+	validFlatValues: () => validFlatValues
 });
 module.exports = __toCommonJS(index_exports);
-var import_validFlatValues = require("./validFlatValues.native.js");
-var import_validFlatValues2 = require("./validFlatValues.native.js");
-var rules = { "valid-flat-values": import_validFlatValues2.validFlatValues };
+var import_extract_estree = require("@tamagui/language-service/extract-estree");
+var import_tooling = require("@tamagui/style-grammar/tooling");
+var validFlatValues = {
+	meta: {
+		type: "problem",
+		fixable: "code",
+		docs: { description: "validate static Tamagui flat values with @tamagui/style-grammar" },
+		schema: [{
+			type: "object",
+			properties: {
+				config: { type: "object" },
+				strictPayloads: { type: "boolean" }
+			},
+			required: ["config"],
+			additionalProperties: false
+		}],
+		messages: {
+			invalidFlatValue: "{{message}}",
+			nonCanonicalFlatValue: "use the canonical flat value \"{{canonical}}\""
+		}
+	},
+	create(context) {
+		var option = context.options[0];
+		var config = (option === null || option === void 0 ? void 0 : option.config) || {};
+		var _option_strictPayloads;
+		var strictPayloads = (_option_strictPayloads = option === null || option === void 0 ? void 0 : option.strictPayloads) !== null && _option_strictPayloads !== void 0 ? _option_strictPayloads : false;
+		var registry = (0, import_tooling.createModifierRegistry)(config).registry;
+		var candidates = (0, import_tooling.createCandidatePropertyVocabulary)(config);
+		var styleProps = (0, import_tooling.createStylePropSet)(config);
+		var sourceCode = context.sourceCode;
+		var report = function(site) {
+			var node = site.node;
+			var diagnostics = (0, import_tooling.diagnoseStyleValueProgram)(site.property, site.value, {
+				config,
+				registry,
+				candidates,
+				strictPayloads
+			});
+			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+			try {
+				for (var _iterator = diagnostics[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+					var diagnostic = _step.value;
+					context.report({
+						node,
+						loc: {
+							start: sourceCode.getLocFromIndex(site.start + diagnostic.start),
+							end: sourceCode.getLocFromIndex(site.start + diagnostic.end)
+						},
+						messageId: "invalidFlatValue",
+						data: { message: diagnostic.message }
+					});
+				}
+			} catch (err) {
+				_didIteratorError = true;
+				_iteratorError = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion && _iterator.return != null) {
+						_iterator.return();
+					}
+				} finally {
+					if (_didIteratorError) {
+						throw _iteratorError;
+					}
+				}
+			}
+			if (diagnostics.length > 0) return;
+			var formatted = (0, import_tooling.canonicalizeStyleValue)(site.value, registry);
+			if (!formatted.ok || formatted.value === site.value) return;
+			var canonical = formatted.value;
+			context.report({
+				node,
+				messageId: "nonCanonicalFlatValue",
+				data: { canonical },
+				fix(fixer) {
+					return fixer.replaceText(node, JSON.stringify(canonical));
+				}
+			});
+		};
+		return { "Program:exit"(program) {
+			var sites = (0, import_extract_estree.extractStyleSitesFromEstree)(program, { isStyleProp: function(name) {
+				return styleProps.has(name);
+			} });
+			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+			try {
+				for (var _iterator = sites[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+					var site = _step.value;
+					report(site);
+				}
+			} catch (err) {
+				_didIteratorError = true;
+				_iteratorError = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion && _iterator.return != null) {
+						_iterator.return();
+					}
+				} finally {
+					if (_didIteratorError) {
+						throw _iteratorError;
+					}
+				}
+			}
+		} };
+	}
+};
+var rules = { "valid-flat-values": validFlatValues };
 var plugin = {
 	meta: { name: "@tamagui/eslint-plugin" },
 	rules

package/dist/cjs/index.native.js

@@ -24,12 +24,116 @@ var index_exports = {};
 __export(index_exports, {
 	default: () => index_default,
 	rules: () => rules,
-	validFlatValues: () => import_validFlatValues.validFlatValues
+	validFlatValues: () => validFlatValues
 });
 module.exports = __toCommonJS(index_exports);
-var import_validFlatValues = require("./validFlatValues.native.js");
-var import_validFlatValues2 = require("./validFlatValues.native.js");
-var rules = { "valid-flat-values": import_validFlatValues2.validFlatValues };
+var import_extract_estree = require("@tamagui/language-service/extract-estree");
+var import_tooling = require("@tamagui/style-grammar/tooling");
+var validFlatValues = {
+	meta: {
+		type: "problem",
+		fixable: "code",
+		docs: { description: "validate static Tamagui flat values with @tamagui/style-grammar" },
+		schema: [{
+			type: "object",
+			properties: {
+				config: { type: "object" },
+				strictPayloads: { type: "boolean" }
+			},
+			required: ["config"],
+			additionalProperties: false
+		}],
+		messages: {
+			invalidFlatValue: "{{message}}",
+			nonCanonicalFlatValue: "use the canonical flat value \"{{canonical}}\""
+		}
+	},
+	create(context) {
+		var option = context.options[0];
+		var config = (option === null || option === void 0 ? void 0 : option.config) || {};
+		var _option_strictPayloads;
+		var strictPayloads = (_option_strictPayloads = option === null || option === void 0 ? void 0 : option.strictPayloads) !== null && _option_strictPayloads !== void 0 ? _option_strictPayloads : false;
+		var registry = (0, import_tooling.createModifierRegistry)(config).registry;
+		var candidates = (0, import_tooling.createCandidatePropertyVocabulary)(config);
+		var styleProps = (0, import_tooling.createStylePropSet)(config);
+		var sourceCode = context.sourceCode;
+		var report = function(site) {
+			var node = site.node;
+			var diagnostics = (0, import_tooling.diagnoseStyleValueProgram)(site.property, site.value, {
+				config,
+				registry,
+				candidates,
+				strictPayloads
+			});
+			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+			try {
+				for (var _iterator = diagnostics[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+					var diagnostic = _step.value;
+					context.report({
+						node,
+						loc: {
+							start: sourceCode.getLocFromIndex(site.start + diagnostic.start),
+							end: sourceCode.getLocFromIndex(site.start + diagnostic.end)
+						},
+						messageId: "invalidFlatValue",
+						data: { message: diagnostic.message }
+					});
+				}
+			} catch (err) {
+				_didIteratorError = true;
+				_iteratorError = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion && _iterator.return != null) {
+						_iterator.return();
+					}
+				} finally {
+					if (_didIteratorError) {
+						throw _iteratorError;
+					}
+				}
+			}
+			if (diagnostics.length > 0) return;
+			var formatted = (0, import_tooling.canonicalizeStyleValue)(site.value, registry);
+			if (!formatted.ok || formatted.value === site.value) return;
+			var canonical = formatted.value;
+			context.report({
+				node,
+				messageId: "nonCanonicalFlatValue",
+				data: { canonical },
+				fix(fixer) {
+					return fixer.replaceText(node, JSON.stringify(canonical));
+				}
+			});
+		};
+		return { "Program:exit"(program) {
+			var sites = (0, import_extract_estree.extractStyleSitesFromEstree)(program, { isStyleProp: function(name) {
+				return styleProps.has(name);
+			} });
+			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+			try {
+				for (var _iterator = sites[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+					var site = _step.value;
+					report(site);
+				}
+			} catch (err) {
+				_didIteratorError = true;
+				_iteratorError = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion && _iterator.return != null) {
+						_iterator.return();
+					}
+				} finally {
+					if (_didIteratorError) {
+						throw _iteratorError;
+					}
+				}
+			}
+		} };
+	}
+};
+var rules = { "valid-flat-values": validFlatValues };
 var plugin = {
 	meta: { name: "@tamagui/eslint-plugin" },
 	rules

package/dist/cjs/index.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.native.js","names":[],"sources":["cjs/index.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar index_exports = {};\n__export(index_exports, {\n  default: () => index_default,\n  rules: () => rules,\n  validFlatValues: () => import_validFlatValues.validFlatValues\n});\nmodule.exports = __toCommonJS(index_exports);\nvar import_validFlatValues = require(\"./validFlatValues\");\nvar import_validFlatValues2 = require(\"./validFlatValues\");\nvar rules = {\n  \"valid-flat-values\": import_validFlatValues2.validFlatValues\n};\nvar plugin = {\n  meta: {\n    name: \"@tamagui/eslint-plugin\"\n  },\n  rules\n};\nvar index_default = plugin;\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,gBAAgB,CAAC;AACrB,SAAS,eAAe;CACtB,eAAe;CACf,aAAa;CACb,uBAAuB,uBAAuB;AAChD,CAAC;AACD,OAAO,UAAU,aAAa,aAAa;AAC3C,IAAI,yBAAyB,QAAQ,6BAAmB;AACxD,IAAI,0BAA0B,QAAQ,6BAAmB;AACzD,IAAI,QAAQ,EACV,qBAAqB,wBAAwB,gBAC/C;AACA,IAAI,SAAS;CACX,MAAM,EACJ,MAAM,yBACR;CACA;AACF;AACA,IAAI,gBAAgB"}
+{"version":3,"file":"index.native.js","names":[],"sources":["cjs/index.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar index_exports = {};\n__export(index_exports, {\n  default: () => index_default,\n  rules: () => rules,\n  validFlatValues: () => validFlatValues\n});\nmodule.exports = __toCommonJS(index_exports);\nvar import_extract_estree = require(\"@tamagui/language-service/extract-estree\");\nvar import_tooling = require(\"@tamagui/style-grammar/tooling\");\nvar validFlatValues = {\n  meta: {\n    type: \"problem\",\n    fixable: \"code\",\n    docs: {\n      description: \"validate static Tamagui flat values with @tamagui/style-grammar\"\n    },\n    schema: [\n      {\n        type: \"object\",\n        properties: {\n          config: {\n            type: \"object\"\n          },\n          strictPayloads: {\n            type: \"boolean\"\n          }\n        },\n        required: [\n          \"config\"\n        ],\n        additionalProperties: false\n      }\n    ],\n    messages: {\n      invalidFlatValue: \"{{message}}\",\n      nonCanonicalFlatValue: 'use the canonical flat value \"{{canonical}}\"'\n    }\n  },\n  create(context) {\n    var option = context.options[0];\n    var config = (option === null || option === void 0 ? void 0 : option.config) || {};\n    var _option_strictPayloads;\n    var strictPayloads = (_option_strictPayloads = option === null || option === void 0 ? void 0 : option.strictPayloads) !== null && _option_strictPayloads !== void 0 ? _option_strictPayloads : false;\n    var registry = (0, import_tooling.createModifierRegistry)(config).registry;\n    var candidates = (0, import_tooling.createCandidatePropertyVocabulary)(config);\n    var styleProps = (0, import_tooling.createStylePropSet)(config);\n    var sourceCode = context.sourceCode;\n    var report = function(site) {\n      var node = site.node;\n      var diagnostics = (0, import_tooling.diagnoseStyleValueProgram)(site.property, site.value, {\n        config,\n        registry,\n        candidates,\n        strictPayloads\n      });\n      var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n      try {\n        for (var _iterator = diagnostics[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n          var diagnostic = _step.value;\n          context.report({\n            node,\n            // the engine reports value-relative spans; surface them exactly\n            loc: {\n              start: sourceCode.getLocFromIndex(site.start + diagnostic.start),\n              end: sourceCode.getLocFromIndex(site.start + diagnostic.end)\n            },\n            messageId: \"invalidFlatValue\",\n            data: {\n              message: diagnostic.message\n            }\n          });\n        }\n      } catch (err) {\n        _didIteratorError = true;\n        _iteratorError = err;\n      } finally {\n        try {\n          if (!_iteratorNormalCompletion && _iterator.return != null) {\n            _iterator.return();\n          }\n        } finally {\n          if (_didIteratorError) {\n            throw _iteratorError;\n          }\n        }\n      }\n      if (diagnostics.length > 0) return;\n      var formatted = (0, import_tooling.canonicalizeStyleValue)(site.value, registry);\n      if (!formatted.ok || formatted.value === site.value) return;\n      var canonical = formatted.value;\n      context.report({\n        node,\n        messageId: \"nonCanonicalFlatValue\",\n        data: {\n          canonical\n        },\n        fix(fixer) {\n          return fixer.replaceText(node, JSON.stringify(canonical));\n        }\n      });\n    };\n    return {\n      \"Program:exit\"(program) {\n        var sites = (0, import_extract_estree.extractStyleSitesFromEstree)(program, {\n          isStyleProp: function(name) {\n            return styleProps.has(name);\n          }\n        });\n        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n        try {\n          for (var _iterator = sites[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n            var site = _step.value;\n            report(site);\n          }\n        } catch (err) {\n          _didIteratorError = true;\n          _iteratorError = err;\n        } finally {\n          try {\n            if (!_iteratorNormalCompletion && _iterator.return != null) {\n              _iterator.return();\n            }\n          } finally {\n            if (_didIteratorError) {\n              throw _iteratorError;\n            }\n          }\n        }\n      }\n    };\n  }\n};\nvar rules = {\n  \"valid-flat-values\": validFlatValues\n};\nvar plugin = {\n  meta: {\n    name: \"@tamagui/eslint-plugin\"\n  },\n  rules\n};\nvar index_default = plugin;\n//# sourceMappingURL=index.js.map\n"],"mappings":"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"}

package/dist/esm/index.mjs

@@ -1,6 +1,72 @@
-import { validFlatValues, validFlatValues as validFlatValues$1 } from "./validFlatValues.mjs";
+import { extractStyleSitesFromEstree } from "@tamagui/language-service/extract-estree";
+import { canonicalizeStyleValue, createCandidatePropertyVocabulary, createModifierRegistry, createStylePropSet, diagnoseStyleValueProgram } from "@tamagui/style-grammar/tooling";
 
-const rules = { "valid-flat-values": validFlatValues$1 };
+const validFlatValues = {
+	meta: {
+		type: "problem",
+		fixable: "code",
+		docs: { description: "validate static Tamagui flat values with @tamagui/style-grammar" },
+		schema: [{
+			type: "object",
+			properties: {
+				config: { type: "object" },
+				strictPayloads: { type: "boolean" }
+			},
+			required: ["config"],
+			additionalProperties: false
+		}],
+		messages: {
+			invalidFlatValue: "{{message}}",
+			nonCanonicalFlatValue: "use the canonical flat value \"{{canonical}}\""
+		}
+	},
+	create(context) {
+		const option = context.options[0];
+		const config = option?.config || {};
+		const strictPayloads = option?.strictPayloads ?? false;
+		const registry = createModifierRegistry(config).registry;
+		const candidates = createCandidatePropertyVocabulary(config);
+		const styleProps = createStylePropSet(config);
+		const sourceCode = context.sourceCode;
+		const report = (site) => {
+			const node = site.node;
+			const diagnostics = diagnoseStyleValueProgram(site.property, site.value, {
+				config,
+				registry,
+				candidates,
+				strictPayloads
+			});
+			for (const diagnostic of diagnostics) {
+				context.report({
+					node,
+					loc: {
+						start: sourceCode.getLocFromIndex(site.start + diagnostic.start),
+						end: sourceCode.getLocFromIndex(site.start + diagnostic.end)
+					},
+					messageId: "invalidFlatValue",
+					data: { message: diagnostic.message }
+				});
+			}
+			if (diagnostics.length > 0) return;
+			const formatted = canonicalizeStyleValue(site.value, registry);
+			if (!formatted.ok || formatted.value === site.value) return;
+			const canonical = formatted.value;
+			context.report({
+				node,
+				messageId: "nonCanonicalFlatValue",
+				data: { canonical },
+				fix(fixer) {
+					return fixer.replaceText(node, JSON.stringify(canonical));
+				}
+			});
+		};
+		return { "Program:exit"(program) {
+			const sites = extractStyleSitesFromEstree(program, { isStyleProp: (name) => styleProps.has(name) });
+			for (const site of sites) report(site);
+		} };
+	}
+};
+const rules = { "valid-flat-values": validFlatValues };
 const plugin = {
 	meta: { name: "@tamagui/eslint-plugin" },
 	rules

package/dist/esm/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["validFlatValues2"],"sources":["esm/index.js"],"sourcesContent":["import { validFlatValues } from \"./validFlatValues\";\nimport { validFlatValues as validFlatValues2 } from \"./validFlatValues\";\nconst rules = {\n  \"valid-flat-values\": validFlatValues2\n};\nconst plugin = {\n  meta: {\n    name: \"@tamagui/eslint-plugin\"\n  },\n  rules\n};\nvar index_default = plugin;\nexport {\n  index_default as default,\n  rules,\n  validFlatValues\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;AAEA,MAAM,QAAQ,EACZ,qBAAqBA,kBACvB;AACA,MAAM,SAAS;CACb,MAAM,EACJ,MAAM,yBACR;CACA;AACF;AACA,IAAI,gBAAgB"}
+{"version":3,"file":"index.js","names":[],"sources":["esm/index.js"],"sourcesContent":["import {\n  extractStyleSitesFromEstree\n} from \"@tamagui/language-service/extract-estree\";\nimport {\n  canonicalizeStyleValue,\n  createCandidatePropertyVocabulary,\n  createModifierRegistry,\n  createStylePropSet,\n  diagnoseStyleValueProgram\n} from \"@tamagui/style-grammar/tooling\";\nconst validFlatValues = {\n  meta: {\n    type: \"problem\",\n    fixable: \"code\",\n    docs: {\n      description: \"validate static Tamagui flat values with @tamagui/style-grammar\"\n    },\n    schema: [\n      {\n        type: \"object\",\n        properties: {\n          config: {\n            type: \"object\"\n          },\n          strictPayloads: {\n            type: \"boolean\"\n          }\n        },\n        required: [\"config\"],\n        additionalProperties: false\n      }\n    ],\n    messages: {\n      invalidFlatValue: \"{{message}}\",\n      nonCanonicalFlatValue: 'use the canonical flat value \"{{canonical}}\"'\n    }\n  },\n  create(context) {\n    const option = context.options[0];\n    const config = option?.config || {};\n    const strictPayloads = option?.strictPayloads ?? false;\n    const registry = createModifierRegistry(config).registry;\n    const candidates = createCandidatePropertyVocabulary(config);\n    const styleProps = createStylePropSet(config);\n    const sourceCode = context.sourceCode;\n    const report = (site) => {\n      const node = site.node;\n      const diagnostics = diagnoseStyleValueProgram(site.property, site.value, {\n        config,\n        registry,\n        candidates,\n        strictPayloads\n      });\n      for (const diagnostic of diagnostics) {\n        context.report({\n          node,\n          // the engine reports value-relative spans; surface them exactly\n          loc: {\n            start: sourceCode.getLocFromIndex(site.start + diagnostic.start),\n            end: sourceCode.getLocFromIndex(site.start + diagnostic.end)\n          },\n          messageId: \"invalidFlatValue\",\n          data: { message: diagnostic.message }\n        });\n      }\n      if (diagnostics.length > 0) return;\n      const formatted = canonicalizeStyleValue(site.value, registry);\n      if (!formatted.ok || formatted.value === site.value) return;\n      const canonical = formatted.value;\n      context.report({\n        node,\n        messageId: \"nonCanonicalFlatValue\",\n        data: { canonical },\n        fix(fixer) {\n          return fixer.replaceText(node, JSON.stringify(canonical));\n        }\n      });\n    };\n    return {\n      \"Program:exit\"(program) {\n        const sites = extractStyleSitesFromEstree(program, {\n          isStyleProp: (name) => styleProps.has(name)\n        });\n        for (const site of sites) report(site);\n      }\n    };\n  }\n};\nconst rules = {\n  \"valid-flat-values\": validFlatValues\n};\nconst plugin = {\n  meta: {\n    name: \"@tamagui/eslint-plugin\"\n  },\n  rules\n};\nvar index_default = plugin;\nexport {\n  index_default as default,\n  rules,\n  validFlatValues\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;;AAUA,MAAM,kBAAkB;CACtB,MAAM;EACJ,MAAM;EACN,SAAS;EACT,MAAM,EACJ,aAAa,kEACf;EACA,QAAQ,CACN;GACE,MAAM;GACN,YAAY;IACV,QAAQ,EACN,MAAM,SACR;IACA,gBAAgB,EACd,MAAM,UACR;GACF;GACA,UAAU,CAAC,QAAQ;GACnB,sBAAsB;EACxB,CACF;EACA,UAAU;GACR,kBAAkB;GAClB,uBAAuB;EACzB;CACF;CACA,OAAO,SAAS;EACd,MAAM,SAAS,QAAQ,QAAQ;EAC/B,MAAM,SAAS,QAAQ,UAAU,CAAC;EAClC,MAAM,iBAAiB,QAAQ,kBAAkB;EACjD,MAAM,WAAW,uBAAuB,MAAM,CAAC,CAAC;EAChD,MAAM,aAAa,kCAAkC,MAAM;EAC3D,MAAM,aAAa,mBAAmB,MAAM;EAC5C,MAAM,aAAa,QAAQ;EAC3B,MAAM,UAAU,SAAS;GACvB,MAAM,OAAO,KAAK;GAClB,MAAM,cAAc,0BAA0B,KAAK,UAAU,KAAK,OAAO;IACvE;IACA;IACA;IACA;GACF,CAAC;GACD,KAAK,MAAM,cAAc,aAAa;IACpC,QAAQ,OAAO;KACb;KAEA,KAAK;MACH,OAAO,WAAW,gBAAgB,KAAK,QAAQ,WAAW,KAAK;MAC/D,KAAK,WAAW,gBAAgB,KAAK,QAAQ,WAAW,GAAG;KAC7D;KACA,WAAW;KACX,MAAM,EAAE,SAAS,WAAW,QAAQ;IACtC,CAAC;GACH;GACA,IAAI,YAAY,SAAS,GAAG;GAC5B,MAAM,YAAY,uBAAuB,KAAK,OAAO,QAAQ;GAC7D,IAAI,CAAC,UAAU,MAAM,UAAU,UAAU,KAAK,OAAO;GACrD,MAAM,YAAY,UAAU;GAC5B,QAAQ,OAAO;IACb;IACA,WAAW;IACX,MAAM,EAAE,UAAU;IAClB,IAAI,OAAO;KACT,OAAO,MAAM,YAAY,MAAM,KAAK,UAAU,SAAS,CAAC;IAC1D;GACF,CAAC;EACH;EACA,OAAO,EACL,eAAe,SAAS;GACtB,MAAM,QAAQ,4BAA4B,SAAS,EACjD,cAAc,SAAS,WAAW,IAAI,IAAI,EAC5C,CAAC;GACD,KAAK,MAAM,QAAQ,OAAO,OAAO,IAAI;EACvC,EACF;CACF;AACF;AACA,MAAM,QAAQ,EACZ,qBAAqB,gBACvB;AACA,MAAM,SAAS;CACb,MAAM,EACJ,MAAM,yBACR;CACA;AACF;AACA,IAAI,gBAAgB"}

package/dist/esm/index.native.js

@@ -1,6 +1,111 @@
-import { validFlatValues, validFlatValues as validFlatValues$1 } from "./validFlatValues.native.js";
+import { extractStyleSitesFromEstree } from "@tamagui/language-service/extract-estree";
+import { canonicalizeStyleValue, createCandidatePropertyVocabulary, createModifierRegistry, createStylePropSet, diagnoseStyleValueProgram } from "@tamagui/style-grammar/tooling";
 
-var rules = { "valid-flat-values": validFlatValues$1 };
+var validFlatValues = {
+	meta: {
+		type: "problem",
+		fixable: "code",
+		docs: { description: "validate static Tamagui flat values with @tamagui/style-grammar" },
+		schema: [{
+			type: "object",
+			properties: {
+				config: { type: "object" },
+				strictPayloads: { type: "boolean" }
+			},
+			required: ["config"],
+			additionalProperties: false
+		}],
+		messages: {
+			invalidFlatValue: "{{message}}",
+			nonCanonicalFlatValue: "use the canonical flat value \"{{canonical}}\""
+		}
+	},
+	create(context) {
+		var option = context.options[0];
+		var config = (option === null || option === void 0 ? void 0 : option.config) || {};
+		var _option_strictPayloads;
+		var strictPayloads = (_option_strictPayloads = option === null || option === void 0 ? void 0 : option.strictPayloads) !== null && _option_strictPayloads !== void 0 ? _option_strictPayloads : false;
+		var registry = createModifierRegistry(config).registry;
+		var candidates = createCandidatePropertyVocabulary(config);
+		var styleProps = createStylePropSet(config);
+		var sourceCode = context.sourceCode;
+		var report = function(site) {
+			var node = site.node;
+			var diagnostics = diagnoseStyleValueProgram(site.property, site.value, {
+				config,
+				registry,
+				candidates,
+				strictPayloads
+			});
+			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+			try {
+				for (var _iterator = diagnostics[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+					var diagnostic = _step.value;
+					context.report({
+						node,
+						loc: {
+							start: sourceCode.getLocFromIndex(site.start + diagnostic.start),
+							end: sourceCode.getLocFromIndex(site.start + diagnostic.end)
+						},
+						messageId: "invalidFlatValue",
+						data: { message: diagnostic.message }
+					});
+				}
+			} catch (err) {
+				_didIteratorError = true;
+				_iteratorError = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion && _iterator.return != null) {
+						_iterator.return();
+					}
+				} finally {
+					if (_didIteratorError) {
+						throw _iteratorError;
+					}
+				}
+			}
+			if (diagnostics.length > 0) return;
+			var formatted = canonicalizeStyleValue(site.value, registry);
+			if (!formatted.ok || formatted.value === site.value) return;
+			var canonical = formatted.value;
+			context.report({
+				node,
+				messageId: "nonCanonicalFlatValue",
+				data: { canonical },
+				fix(fixer) {
+					return fixer.replaceText(node, JSON.stringify(canonical));
+				}
+			});
+		};
+		return { "Program:exit"(program) {
+			var sites = extractStyleSitesFromEstree(program, { isStyleProp: function(name) {
+				return styleProps.has(name);
+			} });
+			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+			try {
+				for (var _iterator = sites[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+					var site = _step.value;
+					report(site);
+				}
+			} catch (err) {
+				_didIteratorError = true;
+				_iteratorError = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion && _iterator.return != null) {
+						_iterator.return();
+					}
+				} finally {
+					if (_didIteratorError) {
+						throw _iteratorError;
+					}
+				}
+			}
+		} };
+	}
+};
+var rules = { "valid-flat-values": validFlatValues };
 var plugin = {
 	meta: { name: "@tamagui/eslint-plugin" },
 	rules

package/dist/esm/index.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.native.js","names":["validFlatValues2"],"sources":["esm/index.native.js"],"sourcesContent":["import { validFlatValues } from \"./validFlatValues\";\nimport { validFlatValues as validFlatValues2 } from \"./validFlatValues\";\nvar rules = {\n  \"valid-flat-values\": validFlatValues2\n};\nvar plugin = {\n  meta: {\n    name: \"@tamagui/eslint-plugin\"\n  },\n  rules\n};\nvar index_default = plugin;\nexport {\n  index_default as default,\n  rules,\n  validFlatValues\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;AAEA,IAAI,QAAQ,EACV,qBAAqBA,kBACvB;AACA,IAAI,SAAS;CACX,MAAM,EACJ,MAAM,yBACR;CACA;AACF;AACA,IAAI,gBAAgB"}
+{"version":3,"file":"index.native.js","names":[],"sources":["esm/index.native.js"],"sourcesContent":["import { extractStyleSitesFromEstree } from \"@tamagui/language-service/extract-estree\";\nimport { canonicalizeStyleValue, createCandidatePropertyVocabulary, createModifierRegistry, createStylePropSet, diagnoseStyleValueProgram } from \"@tamagui/style-grammar/tooling\";\nvar validFlatValues = {\n  meta: {\n    type: \"problem\",\n    fixable: \"code\",\n    docs: {\n      description: \"validate static Tamagui flat values with @tamagui/style-grammar\"\n    },\n    schema: [\n      {\n        type: \"object\",\n        properties: {\n          config: {\n            type: \"object\"\n          },\n          strictPayloads: {\n            type: \"boolean\"\n          }\n        },\n        required: [\n          \"config\"\n        ],\n        additionalProperties: false\n      }\n    ],\n    messages: {\n      invalidFlatValue: \"{{message}}\",\n      nonCanonicalFlatValue: 'use the canonical flat value \"{{canonical}}\"'\n    }\n  },\n  create(context) {\n    var option = context.options[0];\n    var config = (option === null || option === void 0 ? void 0 : option.config) || {};\n    var _option_strictPayloads;\n    var strictPayloads = (_option_strictPayloads = option === null || option === void 0 ? void 0 : option.strictPayloads) !== null && _option_strictPayloads !== void 0 ? _option_strictPayloads : false;\n    var registry = createModifierRegistry(config).registry;\n    var candidates = createCandidatePropertyVocabulary(config);\n    var styleProps = createStylePropSet(config);\n    var sourceCode = context.sourceCode;\n    var report = function(site) {\n      var node = site.node;\n      var diagnostics = diagnoseStyleValueProgram(site.property, site.value, {\n        config,\n        registry,\n        candidates,\n        strictPayloads\n      });\n      var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n      try {\n        for (var _iterator = diagnostics[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n          var diagnostic = _step.value;\n          context.report({\n            node,\n            // the engine reports value-relative spans; surface them exactly\n            loc: {\n              start: sourceCode.getLocFromIndex(site.start + diagnostic.start),\n              end: sourceCode.getLocFromIndex(site.start + diagnostic.end)\n            },\n            messageId: \"invalidFlatValue\",\n            data: {\n              message: diagnostic.message\n            }\n          });\n        }\n      } catch (err) {\n        _didIteratorError = true;\n        _iteratorError = err;\n      } finally {\n        try {\n          if (!_iteratorNormalCompletion && _iterator.return != null) {\n            _iterator.return();\n          }\n        } finally {\n          if (_didIteratorError) {\n            throw _iteratorError;\n          }\n        }\n      }\n      if (diagnostics.length > 0) return;\n      var formatted = canonicalizeStyleValue(site.value, registry);\n      if (!formatted.ok || formatted.value === site.value) return;\n      var canonical = formatted.value;\n      context.report({\n        node,\n        messageId: \"nonCanonicalFlatValue\",\n        data: {\n          canonical\n        },\n        fix(fixer) {\n          return fixer.replaceText(node, JSON.stringify(canonical));\n        }\n      });\n    };\n    return {\n      \"Program:exit\"(program) {\n        var sites = extractStyleSitesFromEstree(program, {\n          isStyleProp: function(name) {\n            return styleProps.has(name);\n          }\n        });\n        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n        try {\n          for (var _iterator = sites[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n            var site = _step.value;\n            report(site);\n          }\n        } catch (err) {\n          _didIteratorError = true;\n          _iteratorError = err;\n        } finally {\n          try {\n            if (!_iteratorNormalCompletion && _iterator.return != null) {\n              _iterator.return();\n            }\n          } finally {\n            if (_didIteratorError) {\n              throw _iteratorError;\n            }\n          }\n        }\n      }\n    };\n  }\n};\nvar rules = {\n  \"valid-flat-values\": validFlatValues\n};\nvar plugin = {\n  meta: {\n    name: \"@tamagui/eslint-plugin\"\n  },\n  rules\n};\nvar index_default = plugin;\nexport {\n  index_default as default,\n  rules,\n  validFlatValues\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;;AAEA,IAAI,kBAAkB;CACpB,MAAM;EACJ,MAAM;EACN,SAAS;EACT,MAAM,EACJ,aAAa,kEACf;EACA,QAAQ,CACN;GACE,MAAM;GACN,YAAY;IACV,QAAQ,EACN,MAAM,SACR;IACA,gBAAgB,EACd,MAAM,UACR;GACF;GACA,UAAU,CACR,QACF;GACA,sBAAsB;EACxB,CACF;EACA,UAAU;GACR,kBAAkB;GAClB,uBAAuB;EACzB;CACF;CACA,OAAO,SAAS;EACd,IAAI,SAAS,QAAQ,QAAQ;EAC7B,IAAI,UAAU,WAAW,QAAQ,WAAW,KAAK,IAAI,KAAK,IAAI,OAAO,WAAW,CAAC;EACjF,IAAI;EACJ,IAAI,kBAAkB,yBAAyB,WAAW,QAAQ,WAAW,KAAK,IAAI,KAAK,IAAI,OAAO,oBAAoB,QAAQ,2BAA2B,KAAK,IAAI,yBAAyB;EAC/L,IAAI,WAAW,uBAAuB,MAAM,CAAC,CAAC;EAC9C,IAAI,aAAa,kCAAkC,MAAM;EACzD,IAAI,aAAa,mBAAmB,MAAM;EAC1C,IAAI,aAAa,QAAQ;EACzB,IAAI,SAAS,SAAS,MAAM;GAC1B,IAAI,OAAO,KAAK;GAChB,IAAI,cAAc,0BAA0B,KAAK,UAAU,KAAK,OAAO;IACrE;IACA;IACA;IACA;GACF,CAAC;GACD,IAAI,4BAA4B,MAAM,oBAAoB,OAAO,iBAAiB,KAAK;GACvF,IAAI;IACF,KAAK,IAAI,YAAY,YAAY,OAAO,SAAS,CAAC,GAAG,OAAO,EAAE,6BAA6B,QAAQ,UAAU,KAAK,EAAC,CAAE,OAAO,4BAA4B,MAAM;KAC5J,IAAI,aAAa,MAAM;KACvB,QAAQ,OAAO;MACb;MAEA,KAAK;OACH,OAAO,WAAW,gBAAgB,KAAK,QAAQ,WAAW,KAAK;OAC/D,KAAK,WAAW,gBAAgB,KAAK,QAAQ,WAAW,GAAG;MAC7D;MACA,WAAW;MACX,MAAM,EACJ,SAAS,WAAW,QACtB;KACF,CAAC;IACH;GACF,SAAS,KAAK;IACZ,oBAAoB;IACpB,iBAAiB;GACnB,UAAU;IACR,IAAI;KACF,IAAI,CAAC,6BAA6B,UAAU,UAAU,MAAM;MAC1D,UAAU,OAAO;KACnB;IACF,UAAU;KACR,IAAI,mBAAmB;MACrB,MAAM;KACR;IACF;GACF;GACA,IAAI,YAAY,SAAS,GAAG;GAC5B,IAAI,YAAY,uBAAuB,KAAK,OAAO,QAAQ;GAC3D,IAAI,CAAC,UAAU,MAAM,UAAU,UAAU,KAAK,OAAO;GACrD,IAAI,YAAY,UAAU;GAC1B,QAAQ,OAAO;IACb;IACA,WAAW;IACX,MAAM,EACJ,UACF;IACA,IAAI,OAAO;KACT,OAAO,MAAM,YAAY,MAAM,KAAK,UAAU,SAAS,CAAC;IAC1D;GACF,CAAC;EACH;EACA,OAAO,EACL,eAAe,SAAS;GACtB,IAAI,QAAQ,4BAA4B,SAAS,EAC/C,aAAa,SAAS,MAAM;IAC1B,OAAO,WAAW,IAAI,IAAI;GAC5B,EACF,CAAC;GACD,IAAI,4BAA4B,MAAM,oBAAoB,OAAO,iBAAiB,KAAK;GACvF,IAAI;IACF,KAAK,IAAI,YAAY,MAAM,OAAO,SAAS,CAAC,GAAG,OAAO,EAAE,6BAA6B,QAAQ,UAAU,KAAK,EAAC,CAAE,OAAO,4BAA4B,MAAM;KACtJ,IAAI,OAAO,MAAM;KACjB,OAAO,IAAI;IACb;GACF,SAAS,KAAK;IACZ,oBAAoB;IACpB,iBAAiB;GACnB,UAAU;IACR,IAAI;KACF,IAAI,CAAC,6BAA6B,UAAU,UAAU,MAAM;MAC1D,UAAU,OAAO;KACnB;IACF,UAAU;KACR,IAAI,mBAAmB;MACrB,MAAM;KACR;IACF;GACF;EACF,EACF;CACF;AACF;AACA,IAAI,QAAQ,EACV,qBAAqB,gBACvB;AACA,IAAI,SAAS;CACX,MAAM,EACJ,MAAM,yBACR;CACA;AACF;AACA,IAAI,gBAAgB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/eslint-plugin",
-  "version": "3.0.0-beta.924.1",
+  "version": "3.0.1",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -31,15 +31,14 @@
     "test:web": "vitest --run test"
   },
   "dependencies": {
-    "@tamagui/style-grammar": "3.0.0-beta.924.1",
-    "@tamagui/language-service": "3.0.0-beta.924.1"
+    "@tamagui/style-grammar": "3.0.1",
+    "@tamagui/language-service": "3.0.1"
   },
   "peerDependencies": {
     "eslint": ">=9"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.0-beta.924.1",
-    "@typescript-eslint/parser": "8.65.0",
+    "@tamagui/build": "3.0.1",
     "eslint": "10.8.0",
     "vitest": "4.1.0"
   },
@@ -47,5 +46,6 @@
     "type": "git",
     "url": "git+https://github.com/tamagui/tamagui.git",
     "directory": "code/core/eslint-plugin"
-  }
+  },
+  "releaseSourceCommit": "c156b7cc55e5a6cc5883ebc8189720850ac32dbd"
 }

package/src/index.ts

@@ -1,7 +1,104 @@
-export { validFlatValues } from './validFlatValues'
-
 import type { Rule } from 'eslint'
-import { validFlatValues } from './validFlatValues'
+import {
+  extractStyleSitesFromEstree,
+  type EstreeStyleSite,
+} from '@tamagui/language-service/extract-estree'
+import {
+  canonicalizeStyleValue,
+  createCandidatePropertyVocabulary,
+  createModifierRegistry,
+  createStylePropSet,
+  diagnoseStyleValueProgram,
+  type GrammarConfigView,
+} from '@tamagui/style-grammar/tooling'
+
+type RuleOption = {
+  config: GrammarConfigView
+  strictPayloads?: boolean
+}
+
+export const validFlatValues: Rule.RuleModule = {
+  meta: {
+    type: 'problem',
+    fixable: 'code',
+    docs: {
+      description: 'validate static Tamagui flat values with @tamagui/style-grammar',
+    },
+    schema: [
+      {
+        type: 'object',
+        properties: {
+          config: {
+            type: 'object',
+          },
+          strictPayloads: {
+            type: 'boolean',
+          },
+        },
+        required: ['config'],
+        additionalProperties: false,
+      },
+    ],
+    messages: {
+      invalidFlatValue: '{{message}}',
+      nonCanonicalFlatValue: 'use the canonical flat value "{{canonical}}"',
+    },
+  },
+
+  create(context) {
+    const option = context.options[0] as RuleOption | undefined
+    const config = option?.config || {}
+    const strictPayloads = option?.strictPayloads ?? false
+    const registry = createModifierRegistry(config).registry
+    const candidates = createCandidatePropertyVocabulary(config)
+    const styleProps = createStylePropSet(config)
+    const sourceCode = context.sourceCode
+
+    const report = (site: EstreeStyleSite): void => {
+      const node = site.node as Rule.Node
+      const diagnostics = diagnoseStyleValueProgram(site.property, site.value, {
+        config,
+        registry,
+        candidates,
+        strictPayloads,
+      })
+      for (const diagnostic of diagnostics) {
+        context.report({
+          node,
+          // the engine reports value-relative spans; surface them exactly
+          loc: {
+            start: sourceCode.getLocFromIndex(site.start + diagnostic.start),
+            end: sourceCode.getLocFromIndex(site.start + diagnostic.end),
+          },
+          messageId: 'invalidFlatValue',
+          data: { message: diagnostic.message },
+        })
+      }
+      if (diagnostics.length > 0) return
+
+      const formatted = canonicalizeStyleValue(site.value, registry)
+      if (!formatted.ok || formatted.value === site.value) return
+      const canonical = formatted.value
+      context.report({
+        node,
+        messageId: 'nonCanonicalFlatValue',
+        data: { canonical },
+        fix(fixer) {
+          return fixer.replaceText(node, JSON.stringify(canonical))
+        },
+      })
+    }
+
+    return {
+      'Program:exit'(program) {
+        const sites = extractStyleSitesFromEstree(program, {
+          isStyleProp: (name) => styleProps.has(name),
+        })
+        for (const site of sites) report(site)
+      },
+    }
+  },
+}
 
 export interface TamaguiEslintRules {
   'valid-flat-values': Rule.RuleModule

package/types/index.d.ts

@@ -1,5 +1,5 @@
-export { validFlatValues } from "./validFlatValues";
 import type { Rule } from "eslint";
+export declare const validFlatValues: Rule.RuleModule;
 export interface TamaguiEslintRules {
 	"valid-flat-values": Rule.RuleModule;
 }

package/types/index.d.ts.map

@@ -1,11 +1,11 @@
 {
-  "mappings": "AAAA,SAAS,uBAAuB;AAEhC,cAAc,YAAY;AAG1B,iBAAiB,mBAAmB;CAClC,qBAAqB,KAAK;;AAG5B,iBAAiB,oBAAoB;CACnC,MAAM;EACJ;;CAEF,OAAO;;AAGT,OAAO,cAAM,OAAO;AAIpB,cAAM,QAAQ;AAOd,eAAe",
+  "mappings": "AAAA,cAAc,YAAY;AAmB1B,OAAO,cAAM,iBAAiB,KAAK;AAmFnC,iBAAiB,mBAAmB;CAClC,qBAAqB,KAAK;;AAG5B,iBAAiB,oBAAoB;CACnC,MAAM;EACJ;;CAEF,OAAO;;AAGT,OAAO,cAAM,OAAO;AAIpB,cAAM,QAAQ;AAOd,eAAe",
   "names": [],
   "sources": [
     "src/index.ts"
   ],
   "version": 3,
   "sourcesContent": [
-    "export { validFlatValues } from './validFlatValues'\n\nimport type { Rule } from 'eslint'\nimport { validFlatValues } from './validFlatValues'\n\nexport interface TamaguiEslintRules {\n  'valid-flat-values': Rule.RuleModule\n}\n\nexport interface TamaguiEslintPlugin {\n  meta: {\n    name: string\n  }\n  rules: TamaguiEslintRules\n}\n\nexport const rules: TamaguiEslintRules = {\n  'valid-flat-values': validFlatValues,\n}\n\nconst plugin: TamaguiEslintPlugin = {\n  meta: {\n    name: '@tamagui/eslint-plugin',\n  },\n  rules,\n}\n\nexport default plugin\n"
+    "import type { Rule } from 'eslint'\nimport {\n  extractStyleSitesFromEstree,\n  type EstreeStyleSite,\n} from '@tamagui/language-service/extract-estree'\nimport {\n  canonicalizeStyleValue,\n  createCandidatePropertyVocabulary,\n  createModifierRegistry,\n  createStylePropSet,\n  diagnoseStyleValueProgram,\n  type GrammarConfigView,\n} from '@tamagui/style-grammar/tooling'\n\ntype RuleOption = {\n  config: GrammarConfigView\n  strictPayloads?: boolean\n}\n\nexport const validFlatValues: Rule.RuleModule = {\n  meta: {\n    type: 'problem',\n    fixable: 'code',\n    docs: {\n      description: 'validate static Tamagui flat values with @tamagui/style-grammar',\n    },\n    schema: [\n      {\n        type: 'object',\n        properties: {\n          config: {\n            type: 'object',\n          },\n          strictPayloads: {\n            type: 'boolean',\n          },\n        },\n        required: ['config'],\n        additionalProperties: false,\n      },\n    ],\n    messages: {\n      invalidFlatValue: '{{message}}',\n      nonCanonicalFlatValue: 'use the canonical flat value \"{{canonical}}\"',\n    },\n  },\n\n  create(context) {\n    const option = context.options[0] as RuleOption | undefined\n    const config = option?.config || {}\n    const strictPayloads = option?.strictPayloads ?? false\n    const registry = createModifierRegistry(config).registry\n    const candidates = createCandidatePropertyVocabulary(config)\n    const styleProps = createStylePropSet(config)\n    const sourceCode = context.sourceCode\n\n    const report = (site: EstreeStyleSite): void => {\n      const node = site.node as Rule.Node\n      const diagnostics = diagnoseStyleValueProgram(site.property, site.value, {\n        config,\n        registry,\n        candidates,\n        strictPayloads,\n      })\n      for (const diagnostic of diagnostics) {\n        context.report({\n          node,\n          // the engine reports value-relative spans; surface them exactly\n          loc: {\n            start: sourceCode.getLocFromIndex(site.start + diagnostic.start),\n            end: sourceCode.getLocFromIndex(site.start + diagnostic.end),\n          },\n          messageId: 'invalidFlatValue',\n          data: { message: diagnostic.message },\n        })\n      }\n      if (diagnostics.length > 0) return\n\n      const formatted = canonicalizeStyleValue(site.value, registry)\n      if (!formatted.ok || formatted.value === site.value) return\n      const canonical = formatted.value\n      context.report({\n        node,\n        messageId: 'nonCanonicalFlatValue',\n        data: { canonical },\n        fix(fixer) {\n          return fixer.replaceText(node, JSON.stringify(canonical))\n        },\n      })\n    }\n\n    return {\n      'Program:exit'(program) {\n        const sites = extractStyleSitesFromEstree(program, {\n          isStyleProp: (name) => styleProps.has(name),\n        })\n        for (const site of sites) report(site)\n      },\n    }\n  },\n}\n\nexport interface TamaguiEslintRules {\n  'valid-flat-values': Rule.RuleModule\n}\n\nexport interface TamaguiEslintPlugin {\n  meta: {\n    name: string\n  }\n  rules: TamaguiEslintRules\n}\n\nexport const rules: TamaguiEslintRules = {\n  'valid-flat-values': validFlatValues,\n}\n\nconst plugin: TamaguiEslintPlugin = {\n  meta: {\n    name: '@tamagui/eslint-plugin',\n  },\n  rules,\n}\n\nexport default plugin\n"
   ]
 }