@tamagui/get-token 2.7.7 → 3.0.0-beta.643.1

package/dist/cjs/index.cjs

@@ -1,87 +1,47 @@
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-  for (var name in all) __defProp(target, name, {
-    get: all[name],
-    enumerable: true
-  });
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
 };
 var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    });
-  }
-  return to;
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: () => from[key],
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
 };
-var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: true
-}), mod);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var index_exports = {};
 __export(index_exports, {
-  getRadius: () => getRadius,
-  getSize: () => getSize,
-  getSpace: () => getSpace,
-  getTokenRelative: () => getTokenRelative,
-  stepTokenUpOrDown: () => stepTokenUpOrDown
+	getRadius: () => getRadius,
+	getSize: () => getSize,
+	getSpace: () => getSpace,
+	oneSizeTokenSmaller: () => oneSizeTokenSmaller
 });
 module.exports = __toCommonJS(index_exports);
+var import_size = require("@tamagui/size");
 var import_web = require("@tamagui/web");
-const defaultOptions = {
-  shift: 0,
-  bounds: [0]
+const resolveToken = (type, input) => {
+	const tokens = (0, import_web.getTokens)()[type];
+	const resolved = (0, import_size.resolveSizeToken)(input, type);
+	if (resolved == null) return resolved;
+	if (typeof resolved === "number") return resolved;
+	const key = typeof resolved === "object" ? resolved.key : String(resolved);
+	return tokens[key] ?? resolved;
 };
-const getSize = (size, options) => {
-  return getTokenRelative("size", size, options);
+const getSize = (size) => resolveToken("size", size);
+const getSpace = (space) => resolveToken("space", space);
+const getRadius = (radius) => resolveToken("radius", radius);
+const oneSizeTokenSmaller = (token) => {
+	const n = Number(String(token));
+	if (Number.isNaN(n)) return String(token);
+	return `${Math.max(1, Math.round(n) - 1)}`;
 };
-const getSpace = (space, options) => {
-  return getTokenRelative("space", space, options);
-};
-const getRadius = (radius, options) => {
-  return getTokenRelative("radius", radius, options);
-};
-const cacheVariables = {};
-const cacheWholeVariables = {};
-const cacheKeys = {};
-const cacheWholeKeys = {};
-const stepTokenUpOrDown = (type, current, options = defaultOptions) => {
-  const tokens = (0, import_web.getTokens)({
-    prefixed: true
-  })[type];
-  if (!(type in cacheVariables)) {
-    cacheKeys[type] = [];
-    cacheVariables[type] = [];
-    cacheWholeKeys[type] = [];
-    cacheWholeVariables[type] = [];
-    const sorted = Object.keys(tokens).map(k => tokens[k]).sort((a, b) => a.val - b.val);
-    for (const token of sorted) {
-      cacheKeys[type].push(token.key);
-      cacheVariables[type].push(token);
-    }
-    const sortedExcludingHalfSteps = sorted.filter(x => !x.key.endsWith(".5"));
-    for (const token of sortedExcludingHalfSteps) {
-      cacheWholeKeys[type].push(token.key);
-      cacheWholeVariables[type].push(token);
-    }
-  }
-  const isString = typeof current === "string";
-  const cache = options.excludeHalfSteps ? isString ? cacheWholeKeys : cacheWholeVariables : isString ? cacheKeys : cacheVariables;
-  const tokensOrdered = cache[type];
-  const min = options.bounds?.[0] ?? 0;
-  const max = options.bounds?.[1] ?? tokensOrdered.length - 1;
-  const currentIndex = tokensOrdered.indexOf(current);
-  let shift = options.shift || 0;
-  if (shift) {
-    if (current === "$true" || (0, import_web.isVariable)(current) && current.name === "true") {
-      shift += shift > 0 ? 1 : -1;
-    }
-  }
-  const index = Math.min(max, Math.max(min, currentIndex + shift));
-  const found = tokensOrdered[index];
-  const result = (typeof found === "string" ? tokens[found] : found) || tokens["$true"];
-  return result;
-};
-const getTokenRelative = stepTokenUpOrDown;

package/dist/cjs/index.native.cjs

@@ -0,0 +1,60 @@
+"use strict";
+
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+};
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: () => from[key],
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var index_exports = {};
+__export(index_exports, {
+	getRadius: () => getRadius,
+	getSize: () => getSize,
+	getSpace: () => getSpace,
+	oneSizeTokenSmaller: () => oneSizeTokenSmaller
+});
+module.exports = __toCommonJS(index_exports);
+var import_size = require("@tamagui/size");
+var import_web = require("@tamagui/web");
+function _type_of(obj) {
+	"@swc/helpers - typeof";
+	return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+var resolveToken = function(type, input) {
+	var tokens = (0, import_web.getTokens)()[type];
+	var resolved = (0, import_size.resolveSizeToken)(input, type);
+	if (resolved == null) return resolved;
+	if (typeof resolved === "number") return resolved;
+	var key = (typeof resolved === "undefined" ? "undefined" : _type_of(resolved)) === "object" ? resolved.key : String(resolved);
+	var _tokens_key;
+	return (_tokens_key = tokens[key]) !== null && _tokens_key !== void 0 ? _tokens_key : resolved;
+};
+var getSize = function(size) {
+	return resolveToken("size", size);
+};
+var getSpace = function(space) {
+	return resolveToken("space", space);
+};
+var getRadius = function(radius) {
+	return resolveToken("radius", radius);
+};
+var oneSizeTokenSmaller = function(token) {
+	var n = Number(String(token));
+	if (Number.isNaN(n)) return String(token);
+	return `${Math.max(1, Math.round(n) - 1)}`;
+};

package/dist/cjs/index.native.js

@@ -1,138 +1,62 @@
 "use strict";
 
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-  for (var name in all) __defProp(target, name, {
-    get: all[name],
-    enumerable: true
-  });
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
 };
 var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    });
-  }
-  return to;
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: () => from[key],
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
 };
-var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: true
-}), mod);
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var index_exports = {};
 __export(index_exports, {
-  getRadius: () => getRadius,
-  getSize: () => getSize,
-  getSpace: () => getSpace,
-  getTokenRelative: () => getTokenRelative,
-  stepTokenUpOrDown: () => stepTokenUpOrDown
+	getRadius: () => getRadius,
+	getSize: () => getSize,
+	getSpace: () => getSpace,
+	oneSizeTokenSmaller: () => oneSizeTokenSmaller
 });
 module.exports = __toCommonJS(index_exports);
+var import_size = require("@tamagui/size");
 var import_web = require("@tamagui/web");
-var defaultOptions = {
-  shift: 0,
-  bounds: [0]
+function _type_of(obj) {
+	"@swc/helpers - typeof";
+	return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+var resolveToken = function(type, input) {
+	var tokens = (0, import_web.getTokens)()[type];
+	var resolved = (0, import_size.resolveSizeToken)(input, type);
+	if (resolved == null) return resolved;
+	if (typeof resolved === "number") return resolved;
+	var key = (typeof resolved === "undefined" ? "undefined" : _type_of(resolved)) === "object" ? resolved.key : String(resolved);
+	var _tokens_key;
+	return (_tokens_key = tokens[key]) !== null && _tokens_key !== void 0 ? _tokens_key : resolved;
 };
-var getSize = function (size, options) {
-  return getTokenRelative("size", size, options);
+var getSize = function(size) {
+	return resolveToken("size", size);
 };
-var getSpace = function (space, options) {
-  return getTokenRelative("space", space, options);
+var getSpace = function(space) {
+	return resolveToken("space", space);
 };
-var getRadius = function (radius, options) {
-  return getTokenRelative("radius", radius, options);
+var getRadius = function(radius) {
+	return resolveToken("radius", radius);
 };
-var cacheVariables = {};
-var cacheWholeVariables = {};
-var cacheKeys = {};
-var cacheWholeKeys = {};
-var stepTokenUpOrDown = function (type, current) {
-  var options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : defaultOptions;
-  var _options_bounds, _options_bounds1;
-  var tokens = (0, import_web.getTokens)({
-    prefixed: true
-  })[type];
-  if (!(type in cacheVariables)) {
-    cacheKeys[type] = [];
-    cacheVariables[type] = [];
-    cacheWholeKeys[type] = [];
-    cacheWholeVariables[type] = [];
-    var sorted = Object.keys(tokens).map(function (k) {
-      return tokens[k];
-    }).sort(function (a, b) {
-      return a.val - b.val;
-    });
-    var _iteratorNormalCompletion = true,
-      _didIteratorError = false,
-      _iteratorError = void 0;
-    try {
-      for (var _iterator = sorted[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var token = _step.value;
-        cacheKeys[type].push(token.key);
-        cacheVariables[type].push(token);
-      }
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) {
-          _iterator.return();
-        }
-      } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
-        }
-      }
-    }
-    var sortedExcludingHalfSteps = sorted.filter(function (x) {
-      return !x.key.endsWith(".5");
-    });
-    var _iteratorNormalCompletion1 = true,
-      _didIteratorError1 = false,
-      _iteratorError1 = void 0;
-    try {
-      for (var _iterator1 = sortedExcludingHalfSteps[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
-        var token1 = _step1.value;
-        cacheWholeKeys[type].push(token1.key);
-        cacheWholeVariables[type].push(token1);
-      }
-    } catch (err) {
-      _didIteratorError1 = true;
-      _iteratorError1 = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-          _iterator1.return();
-        }
-      } finally {
-        if (_didIteratorError1) {
-          throw _iteratorError1;
-        }
-      }
-    }
-  }
-  var isString = typeof current === "string";
-  var cache = options.excludeHalfSteps ? isString ? cacheWholeKeys : cacheWholeVariables : isString ? cacheKeys : cacheVariables;
-  var tokensOrdered = cache[type];
-  var _options_bounds_;
-  var min = (_options_bounds_ = (_options_bounds = options.bounds) === null || _options_bounds === void 0 ? void 0 : _options_bounds[0]) !== null && _options_bounds_ !== void 0 ? _options_bounds_ : 0;
-  var _options_bounds_1;
-  var max = (_options_bounds_1 = (_options_bounds1 = options.bounds) === null || _options_bounds1 === void 0 ? void 0 : _options_bounds1[1]) !== null && _options_bounds_1 !== void 0 ? _options_bounds_1 : tokensOrdered.length - 1;
-  var currentIndex = tokensOrdered.indexOf(current);
-  var shift = options.shift || 0;
-  if (shift) {
-    if (current === "$true" || (0, import_web.isVariable)(current) && current.name === "true") {
-      shift += shift > 0 ? 1 : -1;
-    }
-  }
-  var index = Math.min(max, Math.max(min, currentIndex + shift));
-  var found = tokensOrdered[index];
-  var result = (typeof found === "string" ? tokens[found] : found) || tokens["$true"];
-  return result;
+var oneSizeTokenSmaller = function(token) {
+	var n = Number(String(token));
+	if (Number.isNaN(n)) return String(token);
+	return `${Math.max(1, Math.round(n) - 1)}`;
 };
-var getTokenRelative = stepTokenUpOrDown;
+
 //# sourceMappingURL=index.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toCommonJS","mod","value","index_exports","getRadius","getSize","getSpace","getTokenRelative","stepTokenUpOrDown","module","exports","import_web","require","defaultOptions","shift","bounds","size","options","space","radius","cacheVariables","cacheWholeVariables","cacheKeys","cacheWholeKeys","type","current","arguments","length","_options_bounds","_options_bounds1","tokens","getTokens","prefixed","sorted","keys","map","k","sort","a","b","val","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","token","push","err","return","sortedExcludingHalfSteps","filter","x","endsWith","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","token1","isString","cache","excludeHalfSteps","tokensOrdered","_options_bounds_","min","_options_bounds_1","max","currentIndex","indexOf","isVariable","index","Math","found","result"],"sources":["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  getRadius: () => getRadius,\n  getSize: () => getSize,\n  getSpace: () => getSpace,\n  getTokenRelative: () => getTokenRelative,\n  stepTokenUpOrDown: () => stepTokenUpOrDown\n});\nmodule.exports = __toCommonJS(index_exports);\nvar import_web = require(\"@tamagui/web\");\nvar defaultOptions = {\n  shift: 0,\n  bounds: [\n    0\n  ]\n};\nvar getSize = function(size, options) {\n  return getTokenRelative(\"size\", size, options);\n};\nvar getSpace = function(space, options) {\n  return getTokenRelative(\"space\", space, options);\n};\nvar getRadius = function(radius, options) {\n  return getTokenRelative(\"radius\", radius, options);\n};\nvar cacheVariables = {};\nvar cacheWholeVariables = {};\nvar cacheKeys = {};\nvar cacheWholeKeys = {};\nvar stepTokenUpOrDown = function(type, current) {\n  var options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : defaultOptions;\n  var _options_bounds, _options_bounds1;\n  var tokens = (0, import_web.getTokens)({\n    prefixed: true\n  })[type];\n  if (!(type in cacheVariables)) {\n    cacheKeys[type] = [];\n    cacheVariables[type] = [];\n    cacheWholeKeys[type] = [];\n    cacheWholeVariables[type] = [];\n    var sorted = Object.keys(tokens).map(function(k) {\n      return tokens[k];\n    }).sort(function(a, b) {\n      return a.val - b.val;\n    });\n    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n    try {\n      for (var _iterator = sorted[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n        var token = _step.value;\n        cacheKeys[type].push(token.key);\n        cacheVariables[type].push(token);\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    var sortedExcludingHalfSteps = sorted.filter(function(x) {\n      return !x.key.endsWith(\".5\");\n    });\n    var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;\n    try {\n      for (var _iterator1 = sortedExcludingHalfSteps[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {\n        var token1 = _step1.value;\n        cacheWholeKeys[type].push(token1.key);\n        cacheWholeVariables[type].push(token1);\n      }\n    } catch (err) {\n      _didIteratorError1 = true;\n      _iteratorError1 = err;\n    } finally {\n      try {\n        if (!_iteratorNormalCompletion1 && _iterator1.return != null) {\n          _iterator1.return();\n        }\n      } finally {\n        if (_didIteratorError1) {\n          throw _iteratorError1;\n        }\n      }\n    }\n  }\n  var isString = typeof current === \"string\";\n  var cache = options.excludeHalfSteps ? isString ? cacheWholeKeys : cacheWholeVariables : isString ? cacheKeys : cacheVariables;\n  var tokensOrdered = cache[type];\n  var _options_bounds_;\n  var min = (_options_bounds_ = (_options_bounds = options.bounds) === null || _options_bounds === void 0 ? void 0 : _options_bounds[0]) !== null && _options_bounds_ !== void 0 ? _options_bounds_ : 0;\n  var _options_bounds_1;\n  var max = (_options_bounds_1 = (_options_bounds1 = options.bounds) === null || _options_bounds1 === void 0 ? void 0 : _options_bounds1[1]) !== null && _options_bounds_1 !== void 0 ? _options_bounds_1 : tokensOrdered.length - 1;\n  var currentIndex = tokensOrdered.indexOf(current);\n  var shift = options.shift || 0;\n  if (shift) {\n    if (current === \"$true\" || (0, import_web.isVariable)(current) && current.name === \"true\") {\n      shift += shift > 0 ? 1 : -1;\n    }\n  }\n  var index = Math.min(max, Math.max(min, currentIndex + shift));\n  var found = tokensOrdered[index];\n  var result = (typeof found === \"string\" ? tokens[found] : found) || tokens[\"$true\"];\n  return result;\n};\nvar getTokenRelative = stepTokenUpOrDown;\n//# sourceMappingURL=index.js.map\n"],"mappings":"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","ignoreList":[]}
+{"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  getRadius: () => getRadius,\n  getSize: () => getSize,\n  getSpace: () => getSpace,\n  oneSizeTokenSmaller: () => oneSizeTokenSmaller\n});\nmodule.exports = __toCommonJS(index_exports);\nvar import_size = require(\"@tamagui/size\");\nvar import_web = require(\"@tamagui/web\");\nfunction _type_of(obj) {\n  \"@swc/helpers - typeof\";\n  return obj && typeof Symbol !== \"undefined\" && obj.constructor === Symbol ? \"symbol\" : typeof obj;\n}\nvar resolveToken = function(type, input) {\n  var tokens = (0, import_web.getTokens)()[type];\n  var resolved = (0, import_size.resolveSizeToken)(input, type);\n  if (resolved == null) return resolved;\n  if (typeof resolved === \"number\") return resolved;\n  var key = (typeof resolved === \"undefined\" ? \"undefined\" : _type_of(resolved)) === \"object\" ? resolved.key : String(resolved);\n  var _tokens_key;\n  return (_tokens_key = tokens[key]) !== null && _tokens_key !== void 0 ? _tokens_key : resolved;\n};\nvar getSize = function(size) {\n  return resolveToken(\"size\", size);\n};\nvar getSpace = function(space) {\n  return resolveToken(\"space\", space);\n};\nvar getRadius = function(radius) {\n  return resolveToken(\"radius\", radius);\n};\nvar oneSizeTokenSmaller = function(token) {\n  var n = Number(String(token));\n  if (Number.isNaN(n)) return String(token);\n  return `${Math.max(1, Math.round(n) - 1)}`;\n};\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,iBAAiB;CACjB,eAAe;CACf,gBAAgB;CAChB,2BAA2B;AAC7B,CAAC;AACD,OAAO,UAAU,aAAa,aAAa;AAC3C,IAAI,cAAc,QAAQ,eAAe;AACzC,IAAI,aAAa,QAAQ,cAAc;AACvC,SAAS,SAAS,KAAK;CACrB;CACA,OAAO,OAAO,OAAO,WAAW,eAAe,IAAI,gBAAgB,SAAS,WAAW,OAAO;AAChG;AACA,IAAI,eAAe,SAAS,MAAM,OAAO;CACvC,IAAI,UAAU,GAAG,WAAW,WAAW,EAAE;CACzC,IAAI,YAAY,GAAG,YAAY,kBAAkB,OAAO,IAAI;CAC5D,IAAI,YAAY,MAAM,OAAO;CAC7B,IAAI,OAAO,aAAa,UAAU,OAAO;CACzC,IAAI,OAAO,OAAO,aAAa,cAAc,cAAc,SAAS,QAAQ,OAAO,WAAW,SAAS,MAAM,OAAO,QAAQ;CAC5H,IAAI;CACJ,QAAQ,cAAc,OAAO,UAAU,QAAQ,gBAAgB,KAAK,IAAI,cAAc;AACxF;AACA,IAAI,UAAU,SAAS,MAAM;CAC3B,OAAO,aAAa,QAAQ,IAAI;AAClC;AACA,IAAI,WAAW,SAAS,OAAO;CAC7B,OAAO,aAAa,SAAS,KAAK;AACpC;AACA,IAAI,YAAY,SAAS,QAAQ;CAC/B,OAAO,aAAa,UAAU,MAAM;AACtC;AACA,IAAI,sBAAsB,SAAS,OAAO;CACxC,IAAI,IAAI,OAAO,OAAO,KAAK,CAAC;CAC5B,IAAI,OAAO,MAAM,CAAC,GAAG,OAAO,OAAO,KAAK;CACxC,OAAO,GAAG,KAAK,IAAI,GAAG,KAAK,MAAM,CAAC,IAAI,CAAC;AACzC"}

package/dist/esm/index.js

@@ -1,58 +1,22 @@
-import { getTokens, isVariable } from "@tamagui/web";
-const defaultOptions = {
-  shift: 0,
-  bounds: [0]
+import { resolveSizeToken } from "@tamagui/size";
+import { getTokens } from "@tamagui/web";
+
+const resolveToken = (type, input) => {
+	const tokens = getTokens()[type];
+	const resolved = resolveSizeToken(input, type);
+	if (resolved == null) return resolved;
+	if (typeof resolved === "number") return resolved;
+	const key = typeof resolved === "object" ? resolved.key : String(resolved);
+	return tokens[key] ?? resolved;
 };
-const getSize = (size, options) => {
-  return getTokenRelative("size", size, options);
+const getSize = (size) => resolveToken("size", size);
+const getSpace = (space) => resolveToken("space", space);
+const getRadius = (radius) => resolveToken("radius", radius);
+const oneSizeTokenSmaller = (token) => {
+	const n = Number(String(token));
+	if (Number.isNaN(n)) return String(token);
+	return `${Math.max(1, Math.round(n) - 1)}`;
 };
-const getSpace = (space, options) => {
-  return getTokenRelative("space", space, options);
-};
-const getRadius = (radius, options) => {
-  return getTokenRelative("radius", radius, options);
-};
-const cacheVariables = {};
-const cacheWholeVariables = {};
-const cacheKeys = {};
-const cacheWholeKeys = {};
-const stepTokenUpOrDown = (type, current, options = defaultOptions) => {
-  const tokens = getTokens({
-    prefixed: true
-  })[type];
-  if (!(type in cacheVariables)) {
-    cacheKeys[type] = [];
-    cacheVariables[type] = [];
-    cacheWholeKeys[type] = [];
-    cacheWholeVariables[type] = [];
-    const sorted = Object.keys(tokens).map(k => tokens[k]).sort((a, b) => a.val - b.val);
-    for (const token of sorted) {
-      cacheKeys[type].push(token.key);
-      cacheVariables[type].push(token);
-    }
-    const sortedExcludingHalfSteps = sorted.filter(x => !x.key.endsWith(".5"));
-    for (const token of sortedExcludingHalfSteps) {
-      cacheWholeKeys[type].push(token.key);
-      cacheWholeVariables[type].push(token);
-    }
-  }
-  const isString = typeof current === "string";
-  const cache = options.excludeHalfSteps ? isString ? cacheWholeKeys : cacheWholeVariables : isString ? cacheKeys : cacheVariables;
-  const tokensOrdered = cache[type];
-  const min = options.bounds?.[0] ?? 0;
-  const max = options.bounds?.[1] ?? tokensOrdered.length - 1;
-  const currentIndex = tokensOrdered.indexOf(current);
-  let shift = options.shift || 0;
-  if (shift) {
-    if (current === "$true" || isVariable(current) && current.name === "true") {
-      shift += shift > 0 ? 1 : -1;
-    }
-  }
-  const index = Math.min(max, Math.max(min, currentIndex + shift));
-  const found = tokensOrdered[index];
-  const result = (typeof found === "string" ? tokens[found] : found) || tokens["$true"];
-  return result;
-};
-const getTokenRelative = stepTokenUpOrDown;
-export { getRadius, getSize, getSpace, getTokenRelative, stepTokenUpOrDown };
+
+export { getRadius, getSize, getSpace, oneSizeTokenSmaller };
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["getTokens","isVariable","defaultOptions","shift","bounds","getSize","size","options","getTokenRelative","getSpace","space","getRadius","radius","cacheVariables","cacheWholeVariables","cacheKeys","cacheWholeKeys","stepTokenUpOrDown","type","current","tokens","prefixed","sorted","Object","keys","map","k","sort","a","b","val","token","push","key","sortedExcludingHalfSteps","filter","x","endsWith","isString","cache","excludeHalfSteps","tokensOrdered","min","max","length","currentIndex","indexOf","name","index","Math","found","result"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":[],"sources":["esm/index.js"],"sourcesContent":["import { resolveSizeToken } from \"@tamagui/size\";\nimport { getTokens } from \"@tamagui/web\";\nconst resolveToken = (type, input) => {\n  const tokens = getTokens()[type];\n  const resolved = resolveSizeToken(input, type);\n  if (resolved == null) return resolved;\n  if (typeof resolved === \"number\") return resolved;\n  const key = typeof resolved === \"object\" ? resolved.key : String(resolved);\n  return tokens[key] ?? resolved;\n};\nconst getSize = (size) => resolveToken(\"size\", size);\nconst getSpace = (space) => resolveToken(\"space\", space);\nconst getRadius = (radius) => resolveToken(\"radius\", radius);\nconst oneSizeTokenSmaller = (token) => {\n  const n = Number(String(token));\n  if (Number.isNaN(n)) return String(token);\n  return `${Math.max(1, Math.round(n) - 1)}`;\n};\nexport {\n  getRadius,\n  getSize,\n  getSpace,\n  oneSizeTokenSmaller\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;;AAEA,MAAM,gBAAgB,MAAM,UAAU;CACpC,MAAM,SAAS,UAAU,EAAE;CAC3B,MAAM,WAAW,iBAAiB,OAAO,IAAI;CAC7C,IAAI,YAAY,MAAM,OAAO;CAC7B,IAAI,OAAO,aAAa,UAAU,OAAO;CACzC,MAAM,MAAM,OAAO,aAAa,WAAW,SAAS,MAAM,OAAO,QAAQ;CACzE,OAAO,OAAO,QAAQ;AACxB;AACA,MAAM,WAAW,SAAS,aAAa,QAAQ,IAAI;AACnD,MAAM,YAAY,UAAU,aAAa,SAAS,KAAK;AACvD,MAAM,aAAa,WAAW,aAAa,UAAU,MAAM;AAC3D,MAAM,uBAAuB,UAAU;CACrC,MAAM,IAAI,OAAO,OAAO,KAAK,CAAC;CAC9B,IAAI,OAAO,MAAM,CAAC,GAAG,OAAO,OAAO,KAAK;CACxC,OAAO,GAAG,KAAK,IAAI,GAAG,KAAK,MAAM,CAAC,IAAI,CAAC;AACzC"}

package/dist/esm/index.mjs

@@ -1,58 +1,22 @@
-import { getTokens, isVariable } from "@tamagui/web";
-const defaultOptions = {
-  shift: 0,
-  bounds: [0]
+import { resolveSizeToken } from "@tamagui/size";
+import { getTokens } from "@tamagui/web";
+
+const resolveToken = (type, input) => {
+	const tokens = getTokens()[type];
+	const resolved = resolveSizeToken(input, type);
+	if (resolved == null) return resolved;
+	if (typeof resolved === "number") return resolved;
+	const key = typeof resolved === "object" ? resolved.key : String(resolved);
+	return tokens[key] ?? resolved;
 };
-const getSize = (size, options) => {
-  return getTokenRelative("size", size, options);
+const getSize = (size) => resolveToken("size", size);
+const getSpace = (space) => resolveToken("space", space);
+const getRadius = (radius) => resolveToken("radius", radius);
+const oneSizeTokenSmaller = (token) => {
+	const n = Number(String(token));
+	if (Number.isNaN(n)) return String(token);
+	return `${Math.max(1, Math.round(n) - 1)}`;
 };
-const getSpace = (space, options) => {
-  return getTokenRelative("space", space, options);
-};
-const getRadius = (radius, options) => {
-  return getTokenRelative("radius", radius, options);
-};
-const cacheVariables = {};
-const cacheWholeVariables = {};
-const cacheKeys = {};
-const cacheWholeKeys = {};
-const stepTokenUpOrDown = (type, current, options = defaultOptions) => {
-  const tokens = getTokens({
-    prefixed: true
-  })[type];
-  if (!(type in cacheVariables)) {
-    cacheKeys[type] = [];
-    cacheVariables[type] = [];
-    cacheWholeKeys[type] = [];
-    cacheWholeVariables[type] = [];
-    const sorted = Object.keys(tokens).map(k => tokens[k]).sort((a, b) => a.val - b.val);
-    for (const token of sorted) {
-      cacheKeys[type].push(token.key);
-      cacheVariables[type].push(token);
-    }
-    const sortedExcludingHalfSteps = sorted.filter(x => !x.key.endsWith(".5"));
-    for (const token of sortedExcludingHalfSteps) {
-      cacheWholeKeys[type].push(token.key);
-      cacheWholeVariables[type].push(token);
-    }
-  }
-  const isString = typeof current === "string";
-  const cache = options.excludeHalfSteps ? isString ? cacheWholeKeys : cacheWholeVariables : isString ? cacheKeys : cacheVariables;
-  const tokensOrdered = cache[type];
-  const min = options.bounds?.[0] ?? 0;
-  const max = options.bounds?.[1] ?? tokensOrdered.length - 1;
-  const currentIndex = tokensOrdered.indexOf(current);
-  let shift = options.shift || 0;
-  if (shift) {
-    if (current === "$true" || isVariable(current) && current.name === "true") {
-      shift += shift > 0 ? 1 : -1;
-    }
-  }
-  const index = Math.min(max, Math.max(min, currentIndex + shift));
-  const found = tokensOrdered[index];
-  const result = (typeof found === "string" ? tokens[found] : found) || tokens["$true"];
-  return result;
-};
-const getTokenRelative = stepTokenUpOrDown;
-export { getRadius, getSize, getSpace, getTokenRelative, stepTokenUpOrDown };
+
+export { getRadius, getSize, getSpace, oneSizeTokenSmaller };
 //# sourceMappingURL=index.mjs.map

package/dist/esm/index.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["getTokens","isVariable","defaultOptions","shift","bounds","getSize","size","options","getTokenRelative","getSpace","space","getRadius","radius","cacheVariables","cacheWholeVariables","cacheKeys","cacheWholeKeys","stepTokenUpOrDown","type","current","tokens","prefixed","sorted","Object","keys","map","k","sort","a","b","val","token","push","key","sortedExcludingHalfSteps","filter","x","endsWith","isString","cache","excludeHalfSteps","tokensOrdered","min","max","length","currentIndex","indexOf","name","index","Math","found","result"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":[],"sources":["esm/index.js"],"sourcesContent":["import { resolveSizeToken } from \"@tamagui/size\";\nimport { getTokens } from \"@tamagui/web\";\nconst resolveToken = (type, input) => {\n  const tokens = getTokens()[type];\n  const resolved = resolveSizeToken(input, type);\n  if (resolved == null) return resolved;\n  if (typeof resolved === \"number\") return resolved;\n  const key = typeof resolved === \"object\" ? resolved.key : String(resolved);\n  return tokens[key] ?? resolved;\n};\nconst getSize = (size) => resolveToken(\"size\", size);\nconst getSpace = (space) => resolveToken(\"space\", space);\nconst getRadius = (radius) => resolveToken(\"radius\", radius);\nconst oneSizeTokenSmaller = (token) => {\n  const n = Number(String(token));\n  if (Number.isNaN(n)) return String(token);\n  return `${Math.max(1, Math.round(n) - 1)}`;\n};\nexport {\n  getRadius,\n  getSize,\n  getSpace,\n  oneSizeTokenSmaller\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;;AAEA,MAAM,gBAAgB,MAAM,UAAU;CACpC,MAAM,SAAS,UAAU,EAAE;CAC3B,MAAM,WAAW,iBAAiB,OAAO,IAAI;CAC7C,IAAI,YAAY,MAAM,OAAO;CAC7B,IAAI,OAAO,aAAa,UAAU,OAAO;CACzC,MAAM,MAAM,OAAO,aAAa,WAAW,SAAS,MAAM,OAAO,QAAQ;CACzE,OAAO,OAAO,QAAQ;AACxB;AACA,MAAM,WAAW,SAAS,aAAa,QAAQ,IAAI;AACnD,MAAM,YAAY,UAAU,aAAa,SAAS,KAAK;AACvD,MAAM,aAAa,WAAW,aAAa,UAAU,MAAM;AAC3D,MAAM,uBAAuB,UAAU;CACrC,MAAM,IAAI,OAAO,OAAO,KAAK,CAAC;CAC9B,IAAI,OAAO,MAAM,CAAC,GAAG,OAAO,OAAO,KAAK;CACxC,OAAO,GAAG,KAAK,IAAI,GAAG,KAAK,MAAM,CAAC,IAAI,CAAC;AACzC"}

package/dist/esm/index.native.js

@@ -1,106 +1,33 @@
-import { getTokens, isVariable } from "@tamagui/web";
-var defaultOptions = {
-  shift: 0,
-  bounds: [0]
+import { resolveSizeToken } from "@tamagui/size";
+import { getTokens } from "@tamagui/web";
+
+function _type_of(obj) {
+	"@swc/helpers - typeof";
+	return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+var resolveToken = function(type, input) {
+	var tokens = getTokens()[type];
+	var resolved = resolveSizeToken(input, type);
+	if (resolved == null) return resolved;
+	if (typeof resolved === "number") return resolved;
+	var key = (typeof resolved === "undefined" ? "undefined" : _type_of(resolved)) === "object" ? resolved.key : String(resolved);
+	var _tokens_key;
+	return (_tokens_key = tokens[key]) !== null && _tokens_key !== void 0 ? _tokens_key : resolved;
 };
-var getSize = function (size, options) {
-  return getTokenRelative("size", size, options);
+var getSize = function(size) {
+	return resolveToken("size", size);
 };
-var getSpace = function (space, options) {
-  return getTokenRelative("space", space, options);
+var getSpace = function(space) {
+	return resolveToken("space", space);
 };
-var getRadius = function (radius, options) {
-  return getTokenRelative("radius", radius, options);
+var getRadius = function(radius) {
+	return resolveToken("radius", radius);
 };
-var cacheVariables = {};
-var cacheWholeVariables = {};
-var cacheKeys = {};
-var cacheWholeKeys = {};
-var stepTokenUpOrDown = function (type, current) {
-  var options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : defaultOptions;
-  var _options_bounds, _options_bounds1;
-  var tokens = getTokens({
-    prefixed: true
-  })[type];
-  if (!(type in cacheVariables)) {
-    cacheKeys[type] = [];
-    cacheVariables[type] = [];
-    cacheWholeKeys[type] = [];
-    cacheWholeVariables[type] = [];
-    var sorted = Object.keys(tokens).map(function (k) {
-      return tokens[k];
-    }).sort(function (a, b) {
-      return a.val - b.val;
-    });
-    var _iteratorNormalCompletion = true,
-      _didIteratorError = false,
-      _iteratorError = void 0;
-    try {
-      for (var _iterator = sorted[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var token = _step.value;
-        cacheKeys[type].push(token.key);
-        cacheVariables[type].push(token);
-      }
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) {
-          _iterator.return();
-        }
-      } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
-        }
-      }
-    }
-    var sortedExcludingHalfSteps = sorted.filter(function (x) {
-      return !x.key.endsWith(".5");
-    });
-    var _iteratorNormalCompletion1 = true,
-      _didIteratorError1 = false,
-      _iteratorError1 = void 0;
-    try {
-      for (var _iterator1 = sortedExcludingHalfSteps[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
-        var token1 = _step1.value;
-        cacheWholeKeys[type].push(token1.key);
-        cacheWholeVariables[type].push(token1);
-      }
-    } catch (err) {
-      _didIteratorError1 = true;
-      _iteratorError1 = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-          _iterator1.return();
-        }
-      } finally {
-        if (_didIteratorError1) {
-          throw _iteratorError1;
-        }
-      }
-    }
-  }
-  var isString = typeof current === "string";
-  var cache = options.excludeHalfSteps ? isString ? cacheWholeKeys : cacheWholeVariables : isString ? cacheKeys : cacheVariables;
-  var tokensOrdered = cache[type];
-  var _options_bounds_;
-  var min = (_options_bounds_ = (_options_bounds = options.bounds) === null || _options_bounds === void 0 ? void 0 : _options_bounds[0]) !== null && _options_bounds_ !== void 0 ? _options_bounds_ : 0;
-  var _options_bounds_1;
-  var max = (_options_bounds_1 = (_options_bounds1 = options.bounds) === null || _options_bounds1 === void 0 ? void 0 : _options_bounds1[1]) !== null && _options_bounds_1 !== void 0 ? _options_bounds_1 : tokensOrdered.length - 1;
-  var currentIndex = tokensOrdered.indexOf(current);
-  var shift = options.shift || 0;
-  if (shift) {
-    if (current === "$true" || isVariable(current) && current.name === "true") {
-      shift += shift > 0 ? 1 : -1;
-    }
-  }
-  var index = Math.min(max, Math.max(min, currentIndex + shift));
-  var found = tokensOrdered[index];
-  var result = (typeof found === "string" ? tokens[found] : found) || tokens["$true"];
-  return result;
+var oneSizeTokenSmaller = function(token) {
+	var n = Number(String(token));
+	if (Number.isNaN(n)) return String(token);
+	return `${Math.max(1, Math.round(n) - 1)}`;
 };
-var getTokenRelative = stepTokenUpOrDown;
-export { getRadius, getSize, getSpace, getTokenRelative, stepTokenUpOrDown };
+
+export { getRadius, getSize, getSpace, oneSizeTokenSmaller };
 //# sourceMappingURL=index.native.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["getTokens","isVariable","defaultOptions","shift","bounds","getSize","size","options","getTokenRelative","getSpace","space","getRadius","radius","cacheVariables","cacheWholeVariables","cacheKeys","cacheWholeKeys","stepTokenUpOrDown","type","current","arguments","length","_options_bounds","_options_bounds1","tokens","prefixed","sorted","Object","keys","map","k","sort","a","b","val","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","token","value","push","key","err","return"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,SAAA,EAAWC,UAAA,QAAkB;AAWtC,IAAAC,cAAM;EACJC,KAAA,EAAO;EACPC,MAAA,EAAQ,CACV;AAGE;AACF,IAAAC,OAAA,YAAAA,CAAAC,IAAA,EAAAC,OAAA;EAEO,OAAMC,gBAAiC,SAAAF,IAA8B,EAAAC,OAAA;AAC1E;AACF,IAAAE,QAAA,YAAAA,CAAAC,KAAA,EAAAH,OAAA;EAEO,OAAMC,gBAAa,QAAsB,EAAAE,KAA8B,EAAAH,OAAA;AAC5E;AACF,IAAAI,SAAA,YAAAA,CAAAC,MAAA,EAAAL,OAAA;EAEA,OAAMC,gBAA8C,WAAAI,MAAA,EAAAL,OAAA;AACpD;AACA,IAAAM,cAA4C,GAAC;AAC7C,IAAAC,mBAAiD,GAAC;AAG3C,IAAAC,SAAM;AAKX,IAAAC,cAAe;AAEf,IAAAC,iBAAc,YAAAA,CAAiBC,IAAA,EAAAC,OAAA;EAC7B,IAAAZ,OAAA,GAAUa,SAAS,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA,MAAAlB,cAAA;EACnB,IAAAoB,eAAe,EAAIC,gBAAK;EACxB,IAAAC,MAAA,GAAAxB,SAAmB;IACnByB,QAAA;EAEA,GAAAP,IAAA,CAAM;EAIN,MAAAA,IAAA,IAAWL,cAAS,GAAQ;IAC1BE,SAAA,CAAAG,IAAU,IAAM;IAChBL,cAAA,CAAAK,IAAe,IAAM;IACvBF,cAAA,CAAAE,IAAA;IAEAJ,mBAAM,CAAAI,IAAA;IACN,IAAAQ,MAAA,GAAWC,MAAA,CAASC,IAAA,CAAAJ,MAAA,EAAAK,GAAA,WAA0BC,CAAA;MAC5C,OAAAN,MAAA,CAAAM,CAAe;IACf,GAAAC,IAAA,WAAAC,CAAA,EAAAC,CAAA,EAAoB;MACtB,OAAAD,CAAA,CAAAE,GAAA,GAAAD,CAAA,CAAAC,GAAA;IACF;IAEA,IAAMC,yBAAkB,OAAY;MAAAC,iBAAA;MAAAC,cAAA;IACpC,IAAM;MAQN,KAAM,IAAAC,SAAgB,GAAAZ,MAAM,CAAIa,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;QAE1B,IAAAS,KAAM,GAAAH,KAAQ,CAAAI,KAAS;QACvB9B,SAAM,CAAAG,IAAQ,EAAA4B,IAAA,CAAAF,KAAU,CAAAG,GAAK;QAC7BlC,cAAA,CAAeK,IAAA,EAAA4B,IAAA,CAAAF,KAAc;MAE/B;IACJ,EAAI,OAAOI,GAAA;MACTZ,iBAAgB;MACdC,cAAS,GAAQW,GAAA;IACnB;MACF;QAEM,KAAAb,yBAA2B,IAAIG,SAAK,CAAAW,MAAA,IAAe,IAAM;UACzDX,SAAQ,CAAAW,MAAA;QAER;MAKN,UAAO;QACT,IAAAb,iBAAA;UAEa,MAAAC,cAAmB","ignoreList":[]}
+{"version":3,"file":"index.native.js","names":[],"sources":["esm/index.native.js"],"sourcesContent":["import { resolveSizeToken } from \"@tamagui/size\";\nimport { getTokens } from \"@tamagui/web\";\nfunction _type_of(obj) {\n  \"@swc/helpers - typeof\";\n  return obj && typeof Symbol !== \"undefined\" && obj.constructor === Symbol ? \"symbol\" : typeof obj;\n}\nvar resolveToken = function(type, input) {\n  var tokens = getTokens()[type];\n  var resolved = resolveSizeToken(input, type);\n  if (resolved == null) return resolved;\n  if (typeof resolved === \"number\") return resolved;\n  var key = (typeof resolved === \"undefined\" ? \"undefined\" : _type_of(resolved)) === \"object\" ? resolved.key : String(resolved);\n  var _tokens_key;\n  return (_tokens_key = tokens[key]) !== null && _tokens_key !== void 0 ? _tokens_key : resolved;\n};\nvar getSize = function(size) {\n  return resolveToken(\"size\", size);\n};\nvar getSpace = function(space) {\n  return resolveToken(\"space\", space);\n};\nvar getRadius = function(radius) {\n  return resolveToken(\"radius\", radius);\n};\nvar oneSizeTokenSmaller = function(token) {\n  var n = Number(String(token));\n  if (Number.isNaN(n)) return String(token);\n  return `${Math.max(1, Math.round(n) - 1)}`;\n};\nexport {\n  getRadius,\n  getSize,\n  getSpace,\n  oneSizeTokenSmaller\n};\n//# sourceMappingURL=index.js.map\n"],"mappings":";;;;AAEA,SAAS,SAAS,KAAK;CACrB;CACA,OAAO,OAAO,OAAO,WAAW,eAAe,IAAI,gBAAgB,SAAS,WAAW,OAAO;AAChG;AACA,IAAI,eAAe,SAAS,MAAM,OAAO;CACvC,IAAI,SAAS,UAAU,EAAE;CACzB,IAAI,WAAW,iBAAiB,OAAO,IAAI;CAC3C,IAAI,YAAY,MAAM,OAAO;CAC7B,IAAI,OAAO,aAAa,UAAU,OAAO;CACzC,IAAI,OAAO,OAAO,aAAa,cAAc,cAAc,SAAS,QAAQ,OAAO,WAAW,SAAS,MAAM,OAAO,QAAQ;CAC5H,IAAI;CACJ,QAAQ,cAAc,OAAO,UAAU,QAAQ,gBAAgB,KAAK,IAAI,cAAc;AACxF;AACA,IAAI,UAAU,SAAS,MAAM;CAC3B,OAAO,aAAa,QAAQ,IAAI;AAClC;AACA,IAAI,WAAW,SAAS,OAAO;CAC7B,OAAO,aAAa,SAAS,KAAK;AACpC;AACA,IAAI,YAAY,SAAS,QAAQ;CAC/B,OAAO,aAAa,UAAU,MAAM;AACtC;AACA,IAAI,sBAAsB,SAAS,OAAO;CACxC,IAAI,IAAI,OAAO,OAAO,KAAK,CAAC;CAC5B,IAAI,OAAO,MAAM,CAAC,GAAG,OAAO,OAAO,KAAK;CACxC,OAAO,GAAG,KAAK,IAAI,GAAG,KAAK,MAAM,CAAC,IAAI,CAAC;AACzC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/get-token",
-  "version": "2.7.7",
+  "version": "3.0.0-beta.643.1",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "files": [
     "src",
@@ -34,10 +34,11 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/web": "2.7.7"
+    "@tamagui/size": "3.0.0-beta.643.1",
+    "@tamagui/web": "3.0.0-beta.643.1"
   },
   "devDependencies": {
-    "@tamagui/build": "2.7.7",
+    "@tamagui/build": "3.0.0-beta.643.1",
     "react": ">=19"
   },
   "peerDependencies": {

package/src/index.ts

@@ -1,98 +1,36 @@
 import type { Variable, VariableValGeneric } from '@tamagui/web'
-import { getTokens, isVariable } from '@tamagui/web'
+import { resolveSizeToken } from '@tamagui/size'
+import { getTokens } from '@tamagui/web'
 
 // technically number | undefined just for compat with the generic VariableVal
-type GetTokenBase = Variable | string | number | undefined | VariableValGeneric
-
-type GetTokenOptions = {
-  shift?: number
-  bounds?: [number] | [number, number]
-  excludeHalfSteps?: boolean
-}
-
-const defaultOptions: GetTokenOptions = {
-  shift: 0,
-  bounds: [0],
-}
-
-export const getSize = (size: GetTokenBase, options?: GetTokenOptions) => {
-  return getTokenRelative('size', size, options)
-}
-
-export const getSpace = (space: GetTokenBase, options?: GetTokenOptions) => {
-  return getTokenRelative('space', space, options)
-}
-
-export const getRadius = (radius: GetTokenBase, options?: GetTokenOptions) => {
-  return getTokenRelative('radius', radius, options)
-}
-
-const cacheVariables: Record<string, Variable[]> = {}
-const cacheWholeVariables: Record<string, Variable[]> = {}
-const cacheKeys: Record<string, string[]> = {}
-const cacheWholeKeys: Record<string, string[]> = {}
-
-/** @deprecated use getSize, getSpace, or getTokenRelative instead */
-export const stepTokenUpOrDown = (
-  type: 'size' | 'space' | 'zIndex' | 'radius',
-  current: GetTokenBase,
-  options: GetTokenOptions = defaultOptions
+type GetTokenBase = Variable | string | number | boolean | undefined | VariableValGeneric
+
+// trivial same-key token resolver: token in, Variable out.
+// resolves `true` through the opt-in size policy, looks the key up in the
+// requested scale, and passes through numbers / unknown keys unchanged.
+const resolveToken = (
+  type: 'size' | 'space' | 'radius',
+  input: GetTokenBase
 ): Variable<number> => {
-  const tokens = getTokens({ prefixed: true })[type] as Record<string, Variable>
-
-  if (!(type in cacheVariables)) {
-    cacheKeys[type] = []
-    cacheVariables[type] = []
-    cacheWholeKeys[type] = []
-    cacheWholeVariables[type] = []
-
-    const sorted = Object.keys(tokens)
-      .map((k) => tokens[k])
-      .sort((a, b) => a.val - b.val)
-
-    for (const token of sorted) {
-      cacheKeys[type].push(token.key)
-      cacheVariables[type].push(token)
-    }
-
-    const sortedExcludingHalfSteps = sorted.filter((x) => !x.key.endsWith('.5'))
-    for (const token of sortedExcludingHalfSteps) {
-      cacheWholeKeys[type].push(token.key)
-      cacheWholeVariables[type].push(token)
-    }
-  }
-
-  const isString = typeof current === 'string'
-  const cache = options.excludeHalfSteps
-    ? isString
-      ? cacheWholeKeys
-      : cacheWholeVariables
-    : isString
-      ? cacheKeys
-      : cacheVariables
-
-  const tokensOrdered = cache[type]
-
-  const min = options.bounds?.[0] ?? 0
-  const max = options.bounds?.[1] ?? tokensOrdered.length - 1
-  const currentIndex = tokensOrdered.indexOf(current as any)
-
-  let shift = options.shift || 0
-  if (shift) {
-    if (current === '$true' || (isVariable(current) && current.name === 'true')) {
-      shift += shift > 0 ? 1 : -1
-    }
-  }
+  const tokens = getTokens()[type] as Record<string, Variable>
+  const resolved = resolveSizeToken(input, type)
+  if (resolved == null) return resolved as any
+  if (typeof resolved === 'number') return resolved as any
+  const key = typeof resolved === 'object' ? (resolved as Variable).key : String(resolved)
+  return (tokens[key] ?? resolved) as any
+}
 
-  const index = Math.min(max, Math.max(min, currentIndex + shift))
-  const found = tokensOrdered[index]
+export const getSize = (size: GetTokenBase) => resolveToken('size', size)
 
-  const result = (typeof found === 'string' ? tokens[found] : found) || tokens['$true']
+export const getSpace = (space: GetTokenBase) => resolveToken('space', space)
 
-  // console.log('found', { current, shift, index, found, result })
+export const getRadius = (radius: GetTokenBase) => resolveToken('radius', radius)
 
-  // @ts-ignore
-  return result
+// returns the token key one whole step smaller (e.g. `4` -> `3`), clamped at
+// `1`. used where a component wants a slightly smaller size/font token (list
+// item subtitle, tooltip default size) without stepping through a sorted scale.
+export const oneSizeTokenSmaller = (token: GetTokenBase): string => {
+  const n = Number(String(token))
+  if (Number.isNaN(n)) return String(token)
+  return `${Math.max(1, Math.round(n) - 1)}`
 }
-
-export const getTokenRelative = stepTokenUpOrDown

package/types/index.d.ts

@@ -1,15 +1,8 @@
 import type { Variable, VariableValGeneric } from '@tamagui/web';
-type GetTokenBase = Variable | string | number | undefined | VariableValGeneric;
-type GetTokenOptions = {
-    shift?: number;
-    bounds?: [number] | [number, number];
-    excludeHalfSteps?: boolean;
-};
-export declare const getSize: (size: GetTokenBase, options?: GetTokenOptions) => Variable<number>;
-export declare const getSpace: (space: GetTokenBase, options?: GetTokenOptions) => Variable<number>;
-export declare const getRadius: (radius: GetTokenBase, options?: GetTokenOptions) => Variable<number>;
-/** @deprecated use getSize, getSpace, or getTokenRelative instead */
-export declare const stepTokenUpOrDown: (type: "size" | "space" | "zIndex" | "radius", current: GetTokenBase, options?: GetTokenOptions) => Variable<number>;
-export declare const getTokenRelative: (type: "size" | "space" | "zIndex" | "radius", current: GetTokenBase, options?: GetTokenOptions) => Variable<number>;
+type GetTokenBase = Variable | string | number | boolean | undefined | VariableValGeneric;
+export declare const getSize: (size: GetTokenBase) => Variable<number>;
+export declare const getSpace: (space: GetTokenBase) => Variable<number>;
+export declare const getRadius: (radius: GetTokenBase) => Variable<number>;
+export declare const oneSizeTokenSmaller: (token: GetTokenBase) => string;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAIhE,KAAK,YAAY,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,kBAAkB,CAAA;AAE/E,KAAK,eAAe,GAAG;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACpC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAOD,eAAO,MAAM,OAAO,GAAI,MAAM,YAAY,EAAE,UAAU,eAAe,qBAEpE,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,OAAO,YAAY,EAAE,UAAU,eAAe,qBAEtE,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,QAAQ,YAAY,EAAE,UAAU,eAAe,qBAExE,CAAA;AAOD,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,EAC5C,SAAS,YAAY,EACrB,UAAS,eAAgC,KACxC,QAAQ,CAAC,MAAM,CAwDjB,CAAA;AAED,eAAO,MAAM,gBAAgB,SA7DrB,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,WACnC,YAAY,YACZ,eAAe,KACvB,QAAQ,CAAC,MAAM,CA0D+B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAKhE,KAAK,YAAY,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,kBAAkB,CAAA;AAiBzF,eAAO,MAAM,OAAO,SAAU,YAAY,qBAA+B,CAAA;AAEzE,eAAO,MAAM,QAAQ,UAAW,YAAY,qBAAiC,CAAA;AAE7E,eAAO,MAAM,SAAS,WAAY,YAAY,qBAAmC,CAAA;AAKjF,eAAO,MAAM,mBAAmB,UAAW,YAAY,KAAG,MAIzD,CAAA"}