@tamagui/get-token 1.28.0 → 1.28.1

package/dist/cjs/index.js

@@ -48,9 +48,10 @@ const stepTokenUpOrDown = (type, current, options = defaultOptions) => {
   if (!(type in cacheVariables)) {
     cacheKeys[type] = [];
     cacheVariables[type] = [];
-    for (const key in tokens) {
-      cacheKeys[type].push(key[0] === "$" ? key : `$${key}`);
-      cacheVariables[type].push(tokens[key]);
+    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 tokensOrdered = typeof current === "string" ? cacheKeys[type] : cacheVariables[type];
@@ -65,7 +66,8 @@ const stepTokenUpOrDown = (type, current, options = defaultOptions) => {
   }
   const index = Math.min(max, Math.max(min, currentIndex + shift));
   const found = tokensOrdered[index];
-  return (typeof found === "string" ? tokens[found] : found) || tokens["$true"];
+  const result = (typeof found === "string" ? tokens[found] : found) || tokens["$true"];
+  return result;
 };
 const getTokenRelative = stepTokenUpOrDown;
 // Annotate the CommonJS export names for ESM import in node:

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,eAAW,OAAO,QAAQ;AACxB,gBAAU,IAAI,EAAE,KAAK,IAAI,CAAC,MAAM,MAAM,MAAM,IAAI,KAAK;AACrD,qBAAe,IAAI,EAAE,KAAK,OAAO,GAAG,CAAQ;AAAA,IAC9C;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;AAGjC,UAAQ,OAAO,UAAU,WAAW,OAAO,KAAK,IAAI,UAAU,OAAO,OAAO;AAC9E;AAEO,MAAM,mBAAmB;",
+  "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;",
   "names": ["import_web"]
 }

package/dist/esm/index.js

@@ -21,9 +21,10 @@ const stepTokenUpOrDown = (type, current, options = defaultOptions) => {
   if (!(type in cacheVariables)) {
     cacheKeys[type] = [];
     cacheVariables[type] = [];
-    for (const key in tokens) {
-      cacheKeys[type].push(key[0] === "$" ? key : `$${key}`);
-      cacheVariables[type].push(tokens[key]);
+    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 tokensOrdered = typeof current === "string" ? cacheKeys[type] : cacheVariables[type];
@@ -38,7 +39,8 @@ const stepTokenUpOrDown = (type, current, options = defaultOptions) => {
   }
   const index = Math.min(max, Math.max(min, currentIndex + shift));
   const found = tokensOrdered[index];
-  return (typeof found === "string" ? tokens[found] : found) || tokens["$true"];
+  const result = (typeof found === "string" ? tokens[found] : found) || tokens["$true"];
+  return result;
 };
 const getTokenRelative = stepTokenUpOrDown;
 export {

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,eAAW,OAAO,QAAQ;AACxB,gBAAU,IAAI,EAAE,KAAK,IAAI,CAAC,MAAM,MAAM,MAAM,IAAI,KAAK;AACrD,qBAAe,IAAI,EAAE,KAAK,OAAO,GAAG,CAAQ;AAAA,IAC9C;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;AAGjC,UAAQ,OAAO,UAAU,WAAW,OAAO,KAAK,IAAI,UAAU,OAAO,OAAO;AAC9E;AAEO,MAAM,mBAAmB;",
+  "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;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/get-token",
-  "version": "1.28.0",
+  "version": "1.28.1",
   "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.28.0"
+    "@tamagui/web": "1.28.1"
   },
   "devDependencies": {
-    "@tamagui/build": "1.28.0",
+    "@tamagui/build": "1.28.1",
     "react": "^18.2.0",
     "react-native": "^0.71.7"
   },

package/src/index.ts

@@ -35,14 +35,18 @@ export const stepTokenUpOrDown = (
   current: GetTokenBase,
   options: GetTokenOptions = defaultOptions
 ): Variable<number> => {
-  const tokens = getTokens({ prefixed: true })[type]
+  const tokens = getTokens({ prefixed: true })[type] as Record<string, Variable>
 
   if (!(type in cacheVariables)) {
     cacheKeys[type] = []
     cacheVariables[type] = []
-    for (const key in tokens) {
-      cacheKeys[type].push(key[0] === '$' ? key : `$${key}`)
-      cacheVariables[type].push(tokens[key] as any)
+    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)
     }
   }
 
@@ -63,8 +67,12 @@ export const stepTokenUpOrDown = (
   const index = Math.min(max, Math.max(min, currentIndex + shift))
   const found = tokensOrdered[index]
 
+  const result = (typeof found === 'string' ? tokens[found] : found) || tokens['$true']
+
+  // console.log('found', { current, shift, index, found, result })
+
   // @ts-ignore
-  return (typeof found === 'string' ? tokens[found] : found) || tokens['$true']
+  return result
 }
 
 export const getTokenRelative = stepTokenUpOrDown

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,CA+BjB,CAAA;AAED,eAAO,MAAM,gBAAgB,SApCrB,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,WACnC,YAAY,YACZ,eAAe,KACvB,SAAS,MAAM,CAiC+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;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"}