@tamagui/get-token 1.34.2 → 1.34.3

package/dist/cjs/index.js

@@ -41,20 +41,31 @@ const getRadius = (radius, options) => {
   return getTokenRelative("radius", radius, options);
 };
 const cacheVariables = {};
+const cacheWholeVariables = {};
 const cacheKeys = {};
+const cacheWholeKeys = {};
 const stepTokenUpOrDown = (type, current, options = defaultOptions) => {
   var _a, _b;
   const tokens = (0, import_web2.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 tokensOrdered = typeof current === "string" ? cacheKeys[type] : cacheVariables[type];
+  const isString = typeof current === "string";
+  const cache = options.excludeHalfSteps ? isString ? cacheWholeKeys : cacheWholeVariables : isString ? cacheKeys : cacheVariables;
+  const tokensOrdered = cache[type];
   const min = ((_a = options.bounds) == null ? void 0 : _a[0]) ?? 0;
   const max = ((_b = options.bounds) == null ? void 0 : _b[1]) ?? tokensOrdered.length - 1;
   const currentIndex = tokensOrdered.indexOf(current);

package/dist/cjs/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAAqC;AACrC,IAAAA,cAA0B;AAU1B,MAAM,iBAAkC;AAAA,EACtC,OAAO;AAAA,EACP,QAAQ,CAAC,CAAC;AACZ;AAEO,MAAM,UAAU,CAAC,MAAoB,YAA8B;AACxE,SAAO,iBAAiB,QAAQ,MAAM,OAAO;AAC/C;AAEO,MAAM,WAAW,CAAC,OAAqB,YAA8B;AAC1E,SAAO,iBAAiB,SAAS,OAAO,OAAO;AACjD;AAEO,MAAM,YAAY,CAAC,QAAsB,YAA8B;AAC5E,SAAO,iBAAiB,UAAU,QAAQ,OAAO;AACnD;AAEA,MAAM,iBAA6C,CAAC;AACpD,MAAM,YAAsC,CAAC;AAGtC,MAAM,oBAAoB,CAC/B,MACA,SACA,UAA2B,mBACN;AApCvB;AAqCE,QAAM,aAAS,uBAAU,EAAE,UAAU,KAAK,CAAC,EAAE,IAAI;AAEjD,MAAI,EAAE,QAAQ,iBAAiB;AAC7B,cAAU,IAAI,IAAI,CAAC;AACnB,mBAAe,IAAI,IAAI,CAAC;AACxB,UAAM,SAAS,OAAO,KAAK,MAAM,EAC9B,IAAI,CAAC,MAAM,OAAO,CAAC,CAAC,EACpB,KAAK,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG;AAE/B,eAAW,SAAS,QAAQ;AAC1B,gBAAU,IAAI,EAAE,KAAK,MAAM,GAAG;AAC9B,qBAAe,IAAI,EAAE,KAAK,KAAK;AAAA,IACjC;AAAA,EACF;AAEA,QAAM,gBACJ,OAAO,YAAY,WAAW,UAAU,IAAI,IAAI,eAAe,IAAI;AAErE,QAAM,QAAM,aAAQ,WAAR,mBAAiB,OAAM;AACnC,QAAM,QAAM,aAAQ,WAAR,mBAAiB,OAAM,cAAc,SAAS;AAC1D,QAAM,eAAe,cAAc,QAAQ,OAAc;AAEzD,MAAI,QAAQ,QAAQ,SAAS;AAC7B,MAAI,OAAO;AACT,QAAI,YAAY,eAAY,uBAAW,OAAO,KAAK,QAAQ,SAAS,QAAS;AAC3E,eAAS,QAAQ,IAAI,IAAI;AAAA,IAC3B;AAAA,EACF;AAEA,QAAM,QAAQ,KAAK,IAAI,KAAK,KAAK,IAAI,KAAK,eAAe,KAAK,CAAC;AAC/D,QAAM,QAAQ,cAAc,KAAK;AAEjC,QAAM,UAAU,OAAO,UAAU,WAAW,OAAO,KAAK,IAAI,UAAU,OAAO,OAAO;AAKpF,SAAO;AACT;AAEO,MAAM,mBAAmB;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAAqC;AACrC,IAAAA,cAA0B;AAW1B,MAAM,iBAAkC;AAAA,EACtC,OAAO;AAAA,EACP,QAAQ,CAAC,CAAC;AACZ;AAEO,MAAM,UAAU,CAAC,MAAoB,YAA8B;AACxE,SAAO,iBAAiB,QAAQ,MAAM,OAAO;AAC/C;AAEO,MAAM,WAAW,CAAC,OAAqB,YAA8B;AAC1E,SAAO,iBAAiB,SAAS,OAAO,OAAO;AACjD;AAEO,MAAM,YAAY,CAAC,QAAsB,YAA8B;AAC5E,SAAO,iBAAiB,UAAU,QAAQ,OAAO;AACnD;AAEA,MAAM,iBAA6C,CAAC;AACpD,MAAM,sBAAkD,CAAC;AACzD,MAAM,YAAsC,CAAC;AAC7C,MAAM,iBAA2C,CAAC;AAG3C,MAAM,oBAAoB,CAC/B,MACA,SACA,UAA2B,mBACN;AAvCvB;AAwCE,QAAM,aAAS,uBAAU,EAAE,UAAU,KAAK,CAAC,EAAE,IAAI;AAEjD,MAAI,EAAE,QAAQ,iBAAiB;AAC7B,cAAU,IAAI,IAAI,CAAC;AACnB,mBAAe,IAAI,IAAI,CAAC;AACxB,mBAAe,IAAI,IAAI,CAAC;AACxB,wBAAoB,IAAI,IAAI,CAAC;AAE7B,UAAM,SAAS,OAAO,KAAK,MAAM,EAC9B,IAAI,CAAC,MAAM,OAAO,CAAC,CAAC,EACpB,KAAK,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG;AAE/B,eAAW,SAAS,QAAQ;AAC1B,gBAAU,IAAI,EAAE,KAAK,MAAM,GAAG;AAC9B,qBAAe,IAAI,EAAE,KAAK,KAAK;AAAA,IACjC;AAEA,UAAM,2BAA2B,OAAO,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,SAAS,IAAI,CAAC;AAC3E,eAAW,SAAS,0BAA0B;AAC5C,qBAAe,IAAI,EAAE,KAAK,MAAM,GAAG;AACnC,0BAAoB,IAAI,EAAE,KAAK,KAAK;AAAA,IACtC;AAAA,EACF;AAEA,QAAM,WAAW,OAAO,YAAY;AACpC,QAAM,QAAQ,QAAQ,mBAClB,WACE,iBACA,sBACF,WACA,YACA;AAEJ,QAAM,gBAAgB,MAAM,IAAI;AAEhC,QAAM,QAAM,aAAQ,WAAR,mBAAiB,OAAM;AACnC,QAAM,QAAM,aAAQ,WAAR,mBAAiB,OAAM,cAAc,SAAS;AAC1D,QAAM,eAAe,cAAc,QAAQ,OAAc;AAEzD,MAAI,QAAQ,QAAQ,SAAS;AAC7B,MAAI,OAAO;AACT,QAAI,YAAY,eAAY,uBAAW,OAAO,KAAK,QAAQ,SAAS,QAAS;AAC3E,eAAS,QAAQ,IAAI,IAAI;AAAA,IAC3B;AAAA,EACF;AAEA,QAAM,QAAQ,KAAK,IAAI,KAAK,KAAK,IAAI,KAAK,eAAe,KAAK,CAAC;AAC/D,QAAM,QAAQ,cAAc,KAAK;AAEjC,QAAM,UAAU,OAAO,UAAU,WAAW,OAAO,KAAK,IAAI,UAAU,OAAO,OAAO;AAKpF,SAAO;AACT;AAEO,MAAM,mBAAmB;",
   "names": ["import_web"]
 }

package/dist/esm/index.js

@@ -14,20 +14,31 @@ const getRadius = (radius, options) => {
   return getTokenRelative("radius", radius, options);
 };
 const cacheVariables = {};
+const cacheWholeVariables = {};
 const cacheKeys = {};
+const cacheWholeKeys = {};
 const stepTokenUpOrDown = (type, current, options = defaultOptions) => {
   var _a, _b;
   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 tokensOrdered = typeof current === "string" ? cacheKeys[type] : cacheVariables[type];
+  const isString = typeof current === "string";
+  const cache = options.excludeHalfSteps ? isString ? cacheWholeKeys : cacheWholeVariables : isString ? cacheKeys : cacheVariables;
+  const tokensOrdered = cache[type];
   const min = ((_a = options.bounds) == null ? void 0 : _a[0]) ?? 0;
   const max = ((_b = options.bounds) == null ? void 0 : _b[1]) ?? tokensOrdered.length - 1;
   const currentIndex = tokensOrdered.indexOf(current);

package/dist/esm/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "mappings": "AAAA,SAAmB,kBAAkB;AACrC,SAAS,iBAAiB;AAU1B,MAAM,iBAAkC;AAAA,EACtC,OAAO;AAAA,EACP,QAAQ,CAAC,CAAC;AACZ;AAEO,MAAM,UAAU,CAAC,MAAoB,YAA8B;AACxE,SAAO,iBAAiB,QAAQ,MAAM,OAAO;AAC/C;AAEO,MAAM,WAAW,CAAC,OAAqB,YAA8B;AAC1E,SAAO,iBAAiB,SAAS,OAAO,OAAO;AACjD;AAEO,MAAM,YAAY,CAAC,QAAsB,YAA8B;AAC5E,SAAO,iBAAiB,UAAU,QAAQ,OAAO;AACnD;AAEA,MAAM,iBAA6C,CAAC;AACpD,MAAM,YAAsC,CAAC;AAGtC,MAAM,oBAAoB,CAC/B,MACA,SACA,UAA2B,mBACN;AApCvB;AAqCE,QAAM,SAAS,UAAU,EAAE,UAAU,KAAK,CAAC,EAAE,IAAI;AAEjD,MAAI,EAAE,QAAQ,iBAAiB;AAC7B,cAAU,IAAI,IAAI,CAAC;AACnB,mBAAe,IAAI,IAAI,CAAC;AACxB,UAAM,SAAS,OAAO,KAAK,MAAM,EAC9B,IAAI,CAAC,MAAM,OAAO,CAAC,CAAC,EACpB,KAAK,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG;AAE/B,eAAW,SAAS,QAAQ;AAC1B,gBAAU,IAAI,EAAE,KAAK,MAAM,GAAG;AAC9B,qBAAe,IAAI,EAAE,KAAK,KAAK;AAAA,IACjC;AAAA,EACF;AAEA,QAAM,gBACJ,OAAO,YAAY,WAAW,UAAU,IAAI,IAAI,eAAe,IAAI;AAErE,QAAM,QAAM,aAAQ,WAAR,mBAAiB,OAAM;AACnC,QAAM,QAAM,aAAQ,WAAR,mBAAiB,OAAM,cAAc,SAAS;AAC1D,QAAM,eAAe,cAAc,QAAQ,OAAc;AAEzD,MAAI,QAAQ,QAAQ,SAAS;AAC7B,MAAI,OAAO;AACT,QAAI,YAAY,WAAY,WAAW,OAAO,KAAK,QAAQ,SAAS,QAAS;AAC3E,eAAS,QAAQ,IAAI,IAAI;AAAA,IAC3B;AAAA,EACF;AAEA,QAAM,QAAQ,KAAK,IAAI,KAAK,KAAK,IAAI,KAAK,eAAe,KAAK,CAAC;AAC/D,QAAM,QAAQ,cAAc,KAAK;AAEjC,QAAM,UAAU,OAAO,UAAU,WAAW,OAAO,KAAK,IAAI,UAAU,OAAO,OAAO;AAKpF,SAAO;AACT;AAEO,MAAM,mBAAmB;",
+  "mappings": "AAAA,SAAmB,kBAAkB;AACrC,SAAS,iBAAiB;AAW1B,MAAM,iBAAkC;AAAA,EACtC,OAAO;AAAA,EACP,QAAQ,CAAC,CAAC;AACZ;AAEO,MAAM,UAAU,CAAC,MAAoB,YAA8B;AACxE,SAAO,iBAAiB,QAAQ,MAAM,OAAO;AAC/C;AAEO,MAAM,WAAW,CAAC,OAAqB,YAA8B;AAC1E,SAAO,iBAAiB,SAAS,OAAO,OAAO;AACjD;AAEO,MAAM,YAAY,CAAC,QAAsB,YAA8B;AAC5E,SAAO,iBAAiB,UAAU,QAAQ,OAAO;AACnD;AAEA,MAAM,iBAA6C,CAAC;AACpD,MAAM,sBAAkD,CAAC;AACzD,MAAM,YAAsC,CAAC;AAC7C,MAAM,iBAA2C,CAAC;AAG3C,MAAM,oBAAoB,CAC/B,MACA,SACA,UAA2B,mBACN;AAvCvB;AAwCE,QAAM,SAAS,UAAU,EAAE,UAAU,KAAK,CAAC,EAAE,IAAI;AAEjD,MAAI,EAAE,QAAQ,iBAAiB;AAC7B,cAAU,IAAI,IAAI,CAAC;AACnB,mBAAe,IAAI,IAAI,CAAC;AACxB,mBAAe,IAAI,IAAI,CAAC;AACxB,wBAAoB,IAAI,IAAI,CAAC;AAE7B,UAAM,SAAS,OAAO,KAAK,MAAM,EAC9B,IAAI,CAAC,MAAM,OAAO,CAAC,CAAC,EACpB,KAAK,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG;AAE/B,eAAW,SAAS,QAAQ;AAC1B,gBAAU,IAAI,EAAE,KAAK,MAAM,GAAG;AAC9B,qBAAe,IAAI,EAAE,KAAK,KAAK;AAAA,IACjC;AAEA,UAAM,2BAA2B,OAAO,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,SAAS,IAAI,CAAC;AAC3E,eAAW,SAAS,0BAA0B;AAC5C,qBAAe,IAAI,EAAE,KAAK,MAAM,GAAG;AACnC,0BAAoB,IAAI,EAAE,KAAK,KAAK;AAAA,IACtC;AAAA,EACF;AAEA,QAAM,WAAW,OAAO,YAAY;AACpC,QAAM,QAAQ,QAAQ,mBAClB,WACE,iBACA,sBACF,WACA,YACA;AAEJ,QAAM,gBAAgB,MAAM,IAAI;AAEhC,QAAM,QAAM,aAAQ,WAAR,mBAAiB,OAAM;AACnC,QAAM,QAAM,aAAQ,WAAR,mBAAiB,OAAM,cAAc,SAAS;AAC1D,QAAM,eAAe,cAAc,QAAQ,OAAc;AAEzD,MAAI,QAAQ,QAAQ,SAAS;AAC7B,MAAI,OAAO;AACT,QAAI,YAAY,WAAY,WAAW,OAAO,KAAK,QAAQ,SAAS,QAAS;AAC3E,eAAS,QAAQ,IAAI,IAAI;AAAA,IAC3B;AAAA,EACF;AAEA,QAAM,QAAQ,KAAK,IAAI,KAAK,KAAK,IAAI,KAAK,eAAe,KAAK,CAAC;AAC/D,QAAM,QAAQ,cAAc,KAAK;AAEjC,QAAM,UAAU,OAAO,UAAU,WAAW,OAAO,KAAK,IAAI,UAAU,OAAO,OAAO;AAKpF,SAAO;AACT;AAEO,MAAM,mBAAmB;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/get-token",
-  "version": "1.34.2",
+  "version": "1.34.3",
   "types": "./types/index.d.ts",
   "main": "dist/cjs/index",
   "module": "dist/esm/index",
@@ -18,10 +18,10 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/web": "1.34.2"
+    "@tamagui/web": "1.34.3"
   },
   "devDependencies": {
-    "@tamagui/build": "1.34.2",
+    "@tamagui/build": "1.34.3",
     "react": "^18.2.0",
     "react-native": "^0.71.7"
   },

package/src/index.ts

@@ -7,6 +7,7 @@ type GetTokenBase = Variable | string | number | undefined
 type GetTokenOptions = {
   shift?: number
   bounds?: [number] | [number, number]
+  excludeHalfSteps?: boolean
 }
 
 const defaultOptions: GetTokenOptions = {
@@ -27,7 +28,9 @@ export const getRadius = (radius: GetTokenBase, options?: GetTokenOptions) => {
 }
 
 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 = (
@@ -40,6 +43,9 @@ export const stepTokenUpOrDown = (
   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)
@@ -48,10 +54,24 @@ export const stepTokenUpOrDown = (
       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 tokensOrdered =
-    typeof current === 'string' ? cacheKeys[type] : cacheVariables[type]
+  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

package/types/index.d.ts

@@ -3,6 +3,7 @@ type GetTokenBase = Variable | string | number | undefined;
 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>;

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,cAAc,CAAA;AAInD,KAAK,YAAY,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;AAE1D,KAAK,eAAe,GAAG;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACrC,CAAA;AAOD,eAAO,MAAM,OAAO,SAAU,YAAY,YAAY,eAAe,qBAEpE,CAAA;AAED,eAAO,MAAM,QAAQ,UAAW,YAAY,YAAY,eAAe,qBAEtE,CAAA;AAED,eAAO,MAAM,SAAS,WAAY,YAAY,YAAY,eAAe,qBAExE,CAAA;AAKD,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,SACtB,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,WACnC,YAAY,YACZ,eAAe,KACvB,SAAS,MAAM,CAuCjB,CAAA;AAED,eAAO,MAAM,gBAAgB,SA5CrB,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,WACnC,YAAY,YACZ,eAAe,KACvB,SAAS,MAAM,CAyC+B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,cAAc,CAAA;AAInD,KAAK,YAAY,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;AAE1D,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,SAAU,YAAY,YAAY,eAAe,qBAEpE,CAAA;AAED,eAAO,MAAM,QAAQ,UAAW,YAAY,YAAY,eAAe,qBAEtE,CAAA;AAED,eAAO,MAAM,SAAS,WAAY,YAAY,YAAY,eAAe,qBAExE,CAAA;AAOD,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,SACtB,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,WACnC,YAAY,YACZ,eAAe,KACvB,SAAS,MAAM,CAwDjB,CAAA;AAED,eAAO,MAAM,gBAAgB,SA7DrB,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,WACnC,YAAY,YACZ,eAAe,KACvB,SAAS,MAAM,CA0D+B,CAAA"}