@tamagui/core 1.0.17 → 1.0.18

package/dist/cjs/createFont.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/createFont.ts"],
-  "sourcesContent": ["import { FontWeightSteps, GenericFont } from './types'\n\nconst fontWeights: FontWeightSteps[] = [\n  '100',\n  '200',\n  '300',\n  '400',\n  '500',\n  '600',\n  '700',\n  '800',\n  '900',\n]\n\nconst processSection = <T>(\n  section: string | Record<string, T>,\n  keys: string[],\n  defaultValue?: any\n): string | Record<string, T> => {\n  if (typeof section === 'string') return section\n\n  const sectionKeys = Object.keys(section)\n  let fillValue = section[sectionKeys[0]]\n\n  return Object.fromEntries(\n    [...new Set([...keys, ...sectionKeys])].map((key) => {\n      const value = section[key] ?? defaultValue ?? fillValue\n      fillValue = value\n      defaultValue = value\n      return [key, value]\n    })\n  )\n}\n\nexport const createFont = <A extends GenericFont>(font: A): A => {\n  const sizeKeys = Object.keys(font.size)\n  const processedFont = Object.fromEntries(\n    Object.entries(font).map(([key, section]) => {\n      return [\n        key,\n        processSection(\n          section,\n          key === 'face' ? fontWeights : sizeKeys,\n          key === 'face' ? { normal: font.family } : undefined\n        ),\n      ]\n    })\n  )\n  return Object.freeze(processedFont) as A\n}\n"],
+  "sourcesContent": ["import { FontWeightSteps, GenericFont } from './types'\n\nconst fontWeights: FontWeightSteps[] = [\n  '100',\n  '200',\n  '300',\n  '400',\n  '500',\n  '600',\n  '700',\n  '800',\n  '900',\n]\n\nconst processSection = <T>(\n  section: string | Record<string, T>,\n  keys: string[],\n  defaultValue?: any\n): string | Record<string, T> => {\n  if (typeof section === 'string') return section\n\n  const sectionKeys = Object.keys(section)\n  let fillValue = section[sectionKeys[0]]\n\n  return Object.fromEntries(\n    [...new Set([...keys, ...sectionKeys])].map((key) => {\n      const value = section[key] ?? defaultValue ?? fillValue\n      fillValue = value\n      defaultValue = value\n      return [key, value]\n    })\n  )\n}\n\nexport const createFont = <A extends GenericFont>(font: A): A => {\n  const sizeKeys = Object.keys(font.size)\n  const processedFont = Object.fromEntries(\n    Object.entries(font).map(([key, section]) => {\n      return [\n        key,\n        processSection(\n          section as any,\n          key === 'face' ? fontWeights : sizeKeys,\n          key === 'face' ? { normal: font.family } : undefined\n        ),\n      ]\n    })\n  )\n  return Object.freeze(processedFont) as A\n}\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,MAAM,cAAiC;AAAA,EACrC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEA,MAAM,iBAAiB,CACrB,SACA,MACA,iBAC+B;AAC/B,MAAI,OAAO,YAAY;AAAU,WAAO;AAExC,QAAM,cAAc,OAAO,KAAK,OAAO;AACvC,MAAI,YAAY,QAAQ,YAAY;AAEpC,SAAO,OAAO;AAAA,IACZ,CAAC,GAAG,oBAAI,IAAI,CAAC,GAAG,MAAM,GAAG,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ;AACnD,YAAM,QAAQ,QAAQ,QAAQ,gBAAgB;AAC9C,kBAAY;AACZ,qBAAe;AACf,aAAO,CAAC,KAAK,KAAK;AAAA,IACpB,CAAC;AAAA,EACH;AACF;AAEO,MAAM,aAAa,CAAwB,SAAe;AAC/D,QAAM,WAAW,OAAO,KAAK,KAAK,IAAI;AACtC,QAAM,gBAAgB,OAAO;AAAA,IAC3B,OAAO,QAAQ,IAAI,EAAE,IAAI,CAAC,CAAC,KAAK,OAAO,MAAM;AAC3C,aAAO;AAAA,QACL;AAAA,QACA;AAAA,UACE;AAAA,UACA,QAAQ,SAAS,cAAc;AAAA,UAC/B,QAAQ,SAAS,EAAE,QAAQ,KAAK,OAAO,IAAI;AAAA,QAC7C;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH;AACA,SAAO,OAAO,OAAO,aAAa;AACpC;",
   "names": []
 }

package/dist/cjs/createTokens.js

@@ -22,9 +22,16 @@ __export(createTokens_exports, {
 });
 module.exports = __toCommonJS(createTokens_exports);
 var import_createVariables = require("./createVariables");
-function createTokens(tokens) {
-  return (0, import_createVariables.createVariables)(tokens);
+function createTokens(tokens2) {
+  return (0, import_createVariables.createVariables)(tokens2);
 }
+const tokens = createTokens({
+  size: { 0: 1 },
+  space: { 0: 1 },
+  radius: { 0: 1 },
+  zIndex: { 0: 1 },
+  color: { 0: "hi" }
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createTokens

package/dist/cjs/createTokens.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/createTokens.ts"],
-  "sourcesContent": ["import { Variable } from './createVariable'\nimport { createVariables } from './createVariables'\nimport { CreateTokens } from './types'\n\n// tokens.color.dark.red ===> { var: `color-dark-red`, val: '' }\nexport function createTokens<T extends CreateTokens>(tokens: T): MakeTokens<T> {\n  return createVariables(tokens) as any\n}\n\n// verbose but gives us nice types...\ntype MakeTokens<T> = T extends {\n  color: infer E\n  space: infer F\n  size: infer G\n  radius: infer H\n  zIndex: infer J\n}\n  ? {\n      color: {\n        [Key in keyof E]: E[Key] extends Variable ? E[Key] : Variable<E[Key]>\n      }\n      space: {\n        [Key in keyof F]: F[Key] extends Variable ? F[Key] : Variable<F[Key]>\n      }\n      size: {\n        [Key in keyof G]: G[Key] extends Variable ? G[Key] : Variable<G[Key]>\n      }\n      radius: {\n        [Key in keyof H]: H[Key] extends Variable ? H[Key] : Variable<H[Key]>\n      }\n      zIndex: {\n        [Key in keyof J]: J[Key] extends Variable ? J[Key] : Variable<J[Key]>\n      }\n    }\n  : never\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,6BAAgC;AAIzB,SAAS,aAAqC,QAA0B;AAC7E,aAAO,wCAAgB,MAAM;AAC/B;",
-  "names": []
+  "sourcesContent": ["import { Variable } from './createVariable'\nimport { createVariables } from './createVariables'\nimport { CreateTokens } from './types'\n\n// tokens.color.dark.red ===> { var: `color-dark-red`, val: '' }\nexport function createTokens<T extends CreateTokens>(tokens: T): MakeTokens<T> {\n  return createVariables(tokens) as any\n}\n\n// verbose but gives us nice types...\ntype MakeTokens<T> = T extends {\n  color: infer E\n  space: infer F\n  size: infer G\n  radius: infer H\n  zIndex: infer J\n}\n  ? {\n      color: {\n        // removes $ prefix allowing for defining either as $1: or 1:,\n        // which is important because Chrome re-orders numerical-seeming keys :/\n        [Key in keyof E extends `$${infer X}` ? X : keyof E]: Variable<string>\n      }\n      space: {\n        [Key in keyof F extends `$${infer X}` ? X : keyof F]: Variable<number>\n      }\n      size: {\n        [Key in keyof G extends `$${infer X}` ? X : keyof G]: Variable<number>\n      }\n      radius: {\n        [Key in keyof H extends `$${infer X}` ? X : keyof H]: Variable<number>\n      }\n      zIndex: {\n        [Key in keyof J extends `$${infer X}` ? X : keyof J]: Variable<number>\n      }\n    }\n  : never\n\n// test\nconst tokens = createTokens({\n  size: { 0: 1 },\n  space: { 0: 1 },\n  radius: { 0: 1 },\n  zIndex: { 0: 1 },\n  color: { 0: 'hi' },\n})\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,6BAAgC;AAIzB,SAAS,aAAqCA,SAA0B;AAC7E,aAAO,wCAAgBA,OAAM;AAC/B;AAgCA,MAAM,SAAS,aAAa;AAAA,EAC1B,MAAM,EAAE,GAAG,EAAE;AAAA,EACb,OAAO,EAAE,GAAG,EAAE;AAAA,EACd,QAAQ,EAAE,GAAG,EAAE;AAAA,EACf,QAAQ,EAAE,GAAG,EAAE;AAAA,EACf,OAAO,EAAE,GAAG,KAAK;AACnB,CAAC;",
+  "names": ["tokens"]
 }

package/dist/cjs/createVariable.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/createVariable.ts"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { simpleHash } from '@tamagui/helpers'\n\nimport { getConfig } from './config'\n\n/**\n * Should rename this to Token\n * Moving to objects for React Server Components support\n */\n\nconst IS_VAR = 'isVar'\n\ntype VariableIn<A = any> = {\n  val: A\n  name: string\n  key: string\n}\n\nexport type Variable<A = any> = VariableIn<A> & {\n  [IS_VAR]?: true\n  variable?: string\n}\n\nexport const createVariable = <A extends string | number = any>(props: VariableIn<A>) => {\n  if (isVariable(props)) return props\n  const { key, name, val } = props\n  return {\n    [IS_VAR]: true,\n    key,\n    name: simpleHash(name, 40),\n    val,\n    variable: isWeb ? createCSSVariable(name) : '',\n  }\n}\n\n// could do weakmap cache\nexport function variableToString(vrble?: any, getValue = false) {\n  if (isVariable(vrble)) {\n    if (!getValue && isWeb && vrble.variable) {\n      return vrble.variable\n    }\n    return `${vrble.val}`\n  }\n  return `${vrble || ''}`\n}\n\nexport function isVariable(v: Variable | any): v is Variable {\n  return v && typeof v === 'object' && IS_VAR in v\n}\n\nexport function getVariable(nameOrVariable: Variable | string) {\n  setDidGetVariableValue(true)\n  if (isVariable(nameOrVariable)) {\n    return variableToString(nameOrVariable)\n  }\n  const tokens = getConfig().tokensParsed\n  return variableToString(tokens[nameOrVariable] ?? nameOrVariable)\n}\n\nlet accessed = false\nexport const setDidGetVariableValue = (val: boolean) => (accessed = val)\nexport const didGetVariableValue = () => accessed\n\nexport function getVariableValue(v: Variable | any) {\n  if (isVariable(v)) {\n    setDidGetVariableValue(true)\n    return v.val\n  }\n  return v\n}\n\nexport function getVariableName(v: Variable | any) {\n  if (isVariable(v)) return v.name\n  return v\n}\n\nexport function getVariableVariable(v: Variable | any) {\n  if (isVariable(v)) return v.variable\n  return v\n}\n\n// bugfix { space: { 0.5: 10 } } was generating var(--space-0.5) (invalid CSS):\nexport const createCSSVariable = (nameProp: string, includeVar = true) => {\n  if (process.env.NODE_ENV === 'development') {\n    if (!nameProp || typeof nameProp !== 'string') {\n      throw new Error(`createCSSVariable expected string: ${nameProp}`)\n    }\n  }\n  const name = simpleHash(nameProp, 60)\n  return includeVar ? `var(--${name})` : name\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB;AACtB,qBAA2B;AAE3B,oBAA0B;AAO1B,MAAM,SAAS;AAaR,MAAM,iBAAiB,CAAkC,UAAyB;AACvF,MAAI,WAAW,KAAK;AAAG,WAAO;AAC9B,QAAM,EAAE,KAAK,MAAM,IAAI,IAAI;AAC3B,SAAO;AAAA,IACL,CAAC,SAAS;AAAA,IACV;AAAA,IACA,UAAM,2BAAW,MAAM,EAAE;AAAA,IACzB;AAAA,IACA,UAAU,yBAAQ,kBAAkB,IAAI,IAAI;AAAA,EAC9C;AACF;AAGO,SAAS,iBAAiB,OAAa,WAAW,OAAO;AAC9D,MAAI,WAAW,KAAK,GAAG;AACrB,QAAI,CAAC,YAAY,0BAAS,MAAM,UAAU;AACxC,aAAO,MAAM;AAAA,IACf;AACA,WAAO,GAAG,MAAM;AAAA,EAClB;AACA,SAAO,GAAG,SAAS;AACrB;AAEO,SAAS,WAAW,GAAkC;AAC3D,SAAO,KAAK,OAAO,MAAM,YAAY,UAAU;AACjD;AAEO,SAAS,YAAY,gBAAmC;AAC7D,yBAAuB,IAAI;AAC3B,MAAI,WAAW,cAAc,GAAG;AAC9B,WAAO,iBAAiB,cAAc;AAAA,EACxC;AACA,QAAM,aAAS,yBAAU,EAAE;AAC3B,SAAO,iBAAiB,OAAO,mBAAmB,cAAc;AAClE;AAEA,IAAI,WAAW;AACR,MAAM,yBAAyB,CAAC,QAAkB,WAAW;AAC7D,MAAM,sBAAsB,MAAM;AAElC,SAAS,iBAAiB,GAAmB;AAClD,MAAI,WAAW,CAAC,GAAG;AACjB,2BAAuB,IAAI;AAC3B,WAAO,EAAE;AAAA,EACX;AACA,SAAO;AACT;AAEO,SAAS,gBAAgB,GAAmB;AACjD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAEO,SAAS,oBAAoB,GAAmB;AACrD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAGO,MAAM,oBAAoB,CAAC,UAAkB,aAAa,SAAS;AACxE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,YAAY,OAAO,aAAa,UAAU;AAC7C,YAAM,IAAI,MAAM,sCAAsC,UAAU;AAAA,IAClE;AAAA,EACF;AACA,QAAM,WAAO,2BAAW,UAAU,EAAE;AACpC,SAAO,aAAa,SAAS,UAAU;AACzC;",
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { simpleHash } from '@tamagui/helpers'\n\nimport { getConfig } from './config'\n\n/**\n * Should rename this to Token\n * Moving to objects for React Server Components support\n */\n\nconst IS_VAR = 'isVar'\n\nexport interface Variable<A = any> {\n  [IS_VAR]?: true\n  variable?: string\n  val: A\n  name: string\n  key: string\n}\n\nexport type MakeVariable<A = any> = A extends string | number ? Variable<A> : A\n\ntype VariableIn<A = any> = Pick<Variable<A>, 'key' | 'name' | 'val'>\nexport const createVariable = <A extends string | number = any>(\n  props: VariableIn<A>\n): Variable<A> => {\n  if (isVariable(props)) return props\n  const { key, name, val } = props\n  return {\n    [IS_VAR]: true,\n    key: key!,\n    name: simpleHash(name, 40),\n    val: val as any,\n    variable: isWeb ? createCSSVariable(name) : '',\n  }\n}\n\n// could do weakmap cache\nexport function variableToString(vrble?: any, getValue = false) {\n  if (isVariable(vrble)) {\n    if (!getValue && isWeb && vrble.variable) {\n      return vrble.variable\n    }\n    return `${vrble.val}`\n  }\n  return `${vrble || ''}`\n}\n\nexport function isVariable(v: Variable | any): v is Variable {\n  return v && typeof v === 'object' && IS_VAR in v\n}\n\nexport function getVariable(nameOrVariable: Variable | string) {\n  setDidGetVariableValue(true)\n  if (isVariable(nameOrVariable)) {\n    return variableToString(nameOrVariable)\n  }\n  const tokens = getConfig().tokensParsed\n  return variableToString(tokens[nameOrVariable] ?? nameOrVariable)\n}\n\nlet accessed = false\nexport const setDidGetVariableValue = (val: boolean) => (accessed = val)\nexport const didGetVariableValue = () => accessed\n\nexport function getVariableValue(v: Variable | any) {\n  if (isVariable(v)) {\n    setDidGetVariableValue(true)\n    return v.val\n  }\n  return v\n}\n\nexport function getVariableName(v: Variable | any) {\n  if (isVariable(v)) return v.name\n  return v\n}\n\nexport function getVariableVariable(v: Variable | any) {\n  if (isVariable(v)) return v.variable\n  return v\n}\n\n// bugfix { space: { 0.5: 10 } } was generating var(--space-0.5) (invalid CSS):\nexport const createCSSVariable = (nameProp: string, includeVar = true) => {\n  if (process.env.NODE_ENV === 'development') {\n    if (!nameProp || typeof nameProp !== 'string') {\n      throw new Error(`createCSSVariable expected string: ${nameProp}`)\n    }\n  }\n  const name = simpleHash(nameProp, 60)\n  return includeVar ? `var(--${name})` : name\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB;AACtB,qBAA2B;AAE3B,oBAA0B;AAO1B,MAAM,SAAS;AAaR,MAAM,iBAAiB,CAC5B,UACgB;AAChB,MAAI,WAAW,KAAK;AAAG,WAAO;AAC9B,QAAM,EAAE,KAAK,MAAM,IAAI,IAAI;AAC3B,SAAO;AAAA,IACL,CAAC,SAAS;AAAA,IACV;AAAA,IACA,UAAM,2BAAW,MAAM,EAAE;AAAA,IACzB;AAAA,IACA,UAAU,yBAAQ,kBAAkB,IAAI,IAAI;AAAA,EAC9C;AACF;AAGO,SAAS,iBAAiB,OAAa,WAAW,OAAO;AAC9D,MAAI,WAAW,KAAK,GAAG;AACrB,QAAI,CAAC,YAAY,0BAAS,MAAM,UAAU;AACxC,aAAO,MAAM;AAAA,IACf;AACA,WAAO,GAAG,MAAM;AAAA,EAClB;AACA,SAAO,GAAG,SAAS;AACrB;AAEO,SAAS,WAAW,GAAkC;AAC3D,SAAO,KAAK,OAAO,MAAM,YAAY,UAAU;AACjD;AAEO,SAAS,YAAY,gBAAmC;AAC7D,yBAAuB,IAAI;AAC3B,MAAI,WAAW,cAAc,GAAG;AAC9B,WAAO,iBAAiB,cAAc;AAAA,EACxC;AACA,QAAM,aAAS,yBAAU,EAAE;AAC3B,SAAO,iBAAiB,OAAO,mBAAmB,cAAc;AAClE;AAEA,IAAI,WAAW;AACR,MAAM,yBAAyB,CAAC,QAAkB,WAAW;AAC7D,MAAM,sBAAsB,MAAM;AAElC,SAAS,iBAAiB,GAAmB;AAClD,MAAI,WAAW,CAAC,GAAG;AACjB,2BAAuB,IAAI;AAC3B,WAAO,EAAE;AAAA,EACX;AACA,SAAO;AACT;AAEO,SAAS,gBAAgB,GAAmB;AACjD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAEO,SAAS,oBAAoB,GAAmB;AACrD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAGO,MAAM,oBAAoB,CAAC,UAAkB,aAAa,SAAS;AACxE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,YAAY,OAAO,aAAa,UAAU;AAC7C,YAAM,IAAI,MAAM,sCAAsC,UAAU;AAAA,IAClE;AAAA,EACF;AACA,QAAM,WAAO,2BAAW,UAAU,EAAE;AACpC,SAAO,aAAa,SAAS,UAAU;AACzC;",
   "names": []
 }

package/dist/cjs/helpers/themes.js

@@ -49,20 +49,19 @@ function proxyThemeToParents(themeName, theme, themes) {
     cur.push(part);
     return cur.join("_");
   });
-  const hasParents = parents.length;
+  const len = parents.length;
   return new Proxy(theme, {
     get(target, key) {
       if (key === import_getThemeUnwrapped.GetThemeUnwrapped) {
         return theme;
       }
-      if (!hasParents || Reflect.has(target, key)) {
+      if (!len || Reflect.has(target, key)) {
         return Reflect.get(target, key);
       }
-      for (let i = parents.length - 1; i >= 0; i--) {
+      for (let i = len - 1; i >= 0; i--) {
         const parent = themes[parents[i]];
-        if (!parent) {
+        if (!parent)
           continue;
-        }
         if (Reflect.has(parent, key)) {
           return Reflect.get(parent, key);
         }

package/dist/cjs/helpers/themes.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/themes.ts"],
-  "sourcesContent": ["import { createVariable, isVariable } from '../createVariable'\nimport { GetThemeUnwrapped } from '../hooks/getThemeUnwrapped'\nimport { CreateTamaguiProps } from '../types'\n\n// mutates, freeze after\n// shared by createTamagui so extracted here\nexport function ensureThemeVariable(theme: any, key: string) {\n  const val = theme[key]\n  const themeKey = key\n  if (!isVariable(val)) {\n    theme[key] = createVariable({\n      key: themeKey,\n      name: themeKey,\n      val,\n    })\n  } else {\n    if (val.name !== themeKey) {\n      // rename to theme name\n      theme[key] = createVariable({\n        key: val.name,\n        name: themeKey,\n        val: val.val,\n      })\n    }\n  }\n}\n\nexport function proxyThemeToParents(\n  themeName: string,\n  theme: any,\n  themes: CreateTamaguiProps['themes']\n) {\n  // we could test if this is better as just a straight object spread or fancier proxy\n  const cur: string[] = []\n  // if theme is dark_blue_alt1_Button\n  // this will be the parent names in order: ['dark', 'dark_blue', 'dark_blue_alt1\"]\n  const parents = themeName\n    .split('_')\n    .slice(0, -1)\n    .map((part) => {\n      cur.push(part)\n      return cur.join('_')\n    })\n\n  const hasParents = parents.length\n\n  // proxy fallback values to parent theme values\n  return new Proxy(theme, {\n    get(target, key) {\n      if (key === GetThemeUnwrapped) {\n        return theme\n      }\n      if (!hasParents || Reflect.has(target, key)) {\n        return Reflect.get(target, key)\n      }\n      // check parents\n      for (let i = parents.length - 1; i >= 0; i--) {\n        const parent = themes[parents[i]]\n        if (!parent) {\n          continue\n        }\n        if (Reflect.has(parent, key)) {\n          return Reflect.get(parent, key)\n        }\n      }\n      return Reflect.get(target, key)\n    },\n  })\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA2C;AAC3C,+BAAkC;AAK3B,SAAS,oBAAoB,OAAY,KAAa;AAC3D,QAAM,MAAM,MAAM;AAClB,QAAM,WAAW;AACjB,MAAI,KAAC,kCAAW,GAAG,GAAG;AACpB,UAAM,WAAO,sCAAe;AAAA,MAC1B,KAAK;AAAA,MACL,MAAM;AAAA,MACN;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,QAAI,IAAI,SAAS,UAAU;AAEzB,YAAM,WAAO,sCAAe;AAAA,QAC1B,KAAK,IAAI;AAAA,QACT,MAAM;AAAA,QACN,KAAK,IAAI;AAAA,MACX,CAAC;AAAA,IACH;AAAA,EACF;AACF;AAEO,SAAS,oBACd,WACA,OACA,QACA;AAEA,QAAM,MAAgB,CAAC;AAGvB,QAAM,UAAU,UACb,MAAM,GAAG,EACT,MAAM,GAAG,EAAE,EACX,IAAI,CAAC,SAAS;AACb,QAAI,KAAK,IAAI;AACb,WAAO,IAAI,KAAK,GAAG;AAAA,EACrB,CAAC;AAEH,QAAM,aAAa,QAAQ;AAG3B,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,QAAQ,KAAK;AACf,UAAI,QAAQ,4CAAmB;AAC7B,eAAO;AAAA,MACT;AACA,UAAI,CAAC,cAAc,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC3C,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAChC;AAEA,eAAS,IAAI,QAAQ,SAAS,GAAG,KAAK,GAAG,KAAK;AAC5C,cAAM,SAAS,OAAO,QAAQ;AAC9B,YAAI,CAAC,QAAQ;AACX;AAAA,QACF;AACA,YAAI,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC5B,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,QAChC;AAAA,MACF;AACA,aAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,IAChC;AAAA,EACF,CAAC;AACH;",
+  "sourcesContent": ["import { createVariable, isVariable } from '../createVariable'\nimport { GetThemeUnwrapped } from '../hooks/getThemeUnwrapped'\nimport { CreateTamaguiProps } from '../types'\n\n// mutates, freeze after\n// shared by createTamagui so extracted here\nexport function ensureThemeVariable(theme: any, key: string) {\n  const val = theme[key]\n  const themeKey = key\n  if (!isVariable(val)) {\n    theme[key] = createVariable({\n      key: themeKey,\n      name: themeKey,\n      val,\n    })\n  } else {\n    if (val.name !== themeKey) {\n      // rename to theme name\n      theme[key] = createVariable({\n        key: val.name,\n        name: themeKey,\n        val: val.val,\n      })\n    }\n  }\n}\n\nexport function proxyThemeToParents(\n  themeName: string,\n  theme: any,\n  themes: CreateTamaguiProps['themes']\n) {\n  // we could test if this is better as just a straight object spread or fancier proxy\n  const cur: string[] = []\n  // if theme is dark_blue_alt1_Button\n  // this will be the parent names in order: ['dark', 'dark_blue', 'dark_blue_alt1\"]\n  const parents = themeName\n    .split('_')\n    .slice(0, -1)\n    .map((part) => {\n      cur.push(part)\n      return cur.join('_')\n    })\n\n  const len = parents.length\n\n  // proxy fallback values to parent theme values\n  return new Proxy(theme, {\n    get(target, key) {\n      if (key === GetThemeUnwrapped) {\n        return theme\n      }\n      if (!len || Reflect.has(target, key)) {\n        return Reflect.get(target, key)\n      }\n      // check parents\n      for (let i = len - 1; i >= 0; i--) {\n        const parent = themes[parents[i]]\n        if (!parent) continue\n        if (Reflect.has(parent, key)) {\n          return Reflect.get(parent, key)\n        }\n      }\n      return Reflect.get(target, key)\n    },\n  })\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA2C;AAC3C,+BAAkC;AAK3B,SAAS,oBAAoB,OAAY,KAAa;AAC3D,QAAM,MAAM,MAAM;AAClB,QAAM,WAAW;AACjB,MAAI,KAAC,kCAAW,GAAG,GAAG;AACpB,UAAM,WAAO,sCAAe;AAAA,MAC1B,KAAK;AAAA,MACL,MAAM;AAAA,MACN;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,QAAI,IAAI,SAAS,UAAU;AAEzB,YAAM,WAAO,sCAAe;AAAA,QAC1B,KAAK,IAAI;AAAA,QACT,MAAM;AAAA,QACN,KAAK,IAAI;AAAA,MACX,CAAC;AAAA,IACH;AAAA,EACF;AACF;AAEO,SAAS,oBACd,WACA,OACA,QACA;AAEA,QAAM,MAAgB,CAAC;AAGvB,QAAM,UAAU,UACb,MAAM,GAAG,EACT,MAAM,GAAG,EAAE,EACX,IAAI,CAAC,SAAS;AACb,QAAI,KAAK,IAAI;AACb,WAAO,IAAI,KAAK,GAAG;AAAA,EACrB,CAAC;AAEH,QAAM,MAAM,QAAQ;AAGpB,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,QAAQ,KAAK;AACf,UAAI,QAAQ,4CAAmB;AAC7B,eAAO;AAAA,MACT;AACA,UAAI,CAAC,OAAO,QAAQ,IAAI,QAAQ,GAAG,GAAG;AACpC,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAChC;AAEA,eAAS,IAAI,MAAM,GAAG,KAAK,GAAG,KAAK;AACjC,cAAM,SAAS,OAAO,QAAQ;AAC9B,YAAI,CAAC;AAAQ;AACb,YAAI,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC5B,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,QAChC;AAAA,MACF;AACA,aAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,IAChC;AAAA,EACF,CAAC;AACH;",
   "names": []
 }

package/dist/esm/createFont.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/createFont.ts"],
-  "sourcesContent": ["import { FontWeightSteps, GenericFont } from './types'\n\nconst fontWeights: FontWeightSteps[] = [\n  '100',\n  '200',\n  '300',\n  '400',\n  '500',\n  '600',\n  '700',\n  '800',\n  '900',\n]\n\nconst processSection = <T>(\n  section: string | Record<string, T>,\n  keys: string[],\n  defaultValue?: any\n): string | Record<string, T> => {\n  if (typeof section === 'string') return section\n\n  const sectionKeys = Object.keys(section)\n  let fillValue = section[sectionKeys[0]]\n\n  return Object.fromEntries(\n    [...new Set([...keys, ...sectionKeys])].map((key) => {\n      const value = section[key] ?? defaultValue ?? fillValue\n      fillValue = value\n      defaultValue = value\n      return [key, value]\n    })\n  )\n}\n\nexport const createFont = <A extends GenericFont>(font: A): A => {\n  const sizeKeys = Object.keys(font.size)\n  const processedFont = Object.fromEntries(\n    Object.entries(font).map(([key, section]) => {\n      return [\n        key,\n        processSection(\n          section,\n          key === 'face' ? fontWeights : sizeKeys,\n          key === 'face' ? { normal: font.family } : undefined\n        ),\n      ]\n    })\n  )\n  return Object.freeze(processedFont) as A\n}\n"],
+  "sourcesContent": ["import { FontWeightSteps, GenericFont } from './types'\n\nconst fontWeights: FontWeightSteps[] = [\n  '100',\n  '200',\n  '300',\n  '400',\n  '500',\n  '600',\n  '700',\n  '800',\n  '900',\n]\n\nconst processSection = <T>(\n  section: string | Record<string, T>,\n  keys: string[],\n  defaultValue?: any\n): string | Record<string, T> => {\n  if (typeof section === 'string') return section\n\n  const sectionKeys = Object.keys(section)\n  let fillValue = section[sectionKeys[0]]\n\n  return Object.fromEntries(\n    [...new Set([...keys, ...sectionKeys])].map((key) => {\n      const value = section[key] ?? defaultValue ?? fillValue\n      fillValue = value\n      defaultValue = value\n      return [key, value]\n    })\n  )\n}\n\nexport const createFont = <A extends GenericFont>(font: A): A => {\n  const sizeKeys = Object.keys(font.size)\n  const processedFont = Object.fromEntries(\n    Object.entries(font).map(([key, section]) => {\n      return [\n        key,\n        processSection(\n          section as any,\n          key === 'face' ? fontWeights : sizeKeys,\n          key === 'face' ? { normal: font.family } : undefined\n        ),\n      ]\n    })\n  )\n  return Object.freeze(processedFont) as A\n}\n"],
   "mappings": "AAEA,MAAM,cAAiC;AAAA,EACrC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEA,MAAM,iBAAiB,CACrB,SACA,MACA,iBAC+B;AAC/B,MAAI,OAAO,YAAY;AAAU,WAAO;AAExC,QAAM,cAAc,OAAO,KAAK,OAAO;AACvC,MAAI,YAAY,QAAQ,YAAY;AAEpC,SAAO,OAAO;AAAA,IACZ,CAAC,GAAG,oBAAI,IAAI,CAAC,GAAG,MAAM,GAAG,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ;AACnD,YAAM,QAAQ,QAAQ,QAAQ,gBAAgB;AAC9C,kBAAY;AACZ,qBAAe;AACf,aAAO,CAAC,KAAK,KAAK;AAAA,IACpB,CAAC;AAAA,EACH;AACF;AAEO,MAAM,aAAa,CAAwB,SAAe;AAC/D,QAAM,WAAW,OAAO,KAAK,KAAK,IAAI;AACtC,QAAM,gBAAgB,OAAO;AAAA,IAC3B,OAAO,QAAQ,IAAI,EAAE,IAAI,CAAC,CAAC,KAAK,OAAO,MAAM;AAC3C,aAAO;AAAA,QACL;AAAA,QACA;AAAA,UACE;AAAA,UACA,QAAQ,SAAS,cAAc;AAAA,UAC/B,QAAQ,SAAS,EAAE,QAAQ,KAAK,OAAO,IAAI;AAAA,QAC7C;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH;AACA,SAAO,OAAO,OAAO,aAAa;AACpC;",
   "names": []
 }

package/dist/esm/createTokens.js

@@ -1,7 +1,14 @@
 import { createVariables } from "./createVariables";
-function createTokens(tokens) {
-  return createVariables(tokens);
+function createTokens(tokens2) {
+  return createVariables(tokens2);
 }
+const tokens = createTokens({
+  size: { 0: 1 },
+  space: { 0: 1 },
+  radius: { 0: 1 },
+  zIndex: { 0: 1 },
+  color: { 0: "hi" }
+});
 export {
   createTokens
 };

package/dist/esm/createTokens.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/createTokens.ts"],
-  "sourcesContent": ["import { Variable } from './createVariable'\nimport { createVariables } from './createVariables'\nimport { CreateTokens } from './types'\n\n// tokens.color.dark.red ===> { var: `color-dark-red`, val: '' }\nexport function createTokens<T extends CreateTokens>(tokens: T): MakeTokens<T> {\n  return createVariables(tokens) as any\n}\n\n// verbose but gives us nice types...\ntype MakeTokens<T> = T extends {\n  color: infer E\n  space: infer F\n  size: infer G\n  radius: infer H\n  zIndex: infer J\n}\n  ? {\n      color: {\n        [Key in keyof E]: E[Key] extends Variable ? E[Key] : Variable<E[Key]>\n      }\n      space: {\n        [Key in keyof F]: F[Key] extends Variable ? F[Key] : Variable<F[Key]>\n      }\n      size: {\n        [Key in keyof G]: G[Key] extends Variable ? G[Key] : Variable<G[Key]>\n      }\n      radius: {\n        [Key in keyof H]: H[Key] extends Variable ? H[Key] : Variable<H[Key]>\n      }\n      zIndex: {\n        [Key in keyof J]: J[Key] extends Variable ? J[Key] : Variable<J[Key]>\n      }\n    }\n  : never\n"],
-  "mappings": "AACA,SAAS,uBAAuB;AAIzB,SAAS,aAAqC,QAA0B;AAC7E,SAAO,gBAAgB,MAAM;AAC/B;",
-  "names": []
+  "sourcesContent": ["import { Variable } from './createVariable'\nimport { createVariables } from './createVariables'\nimport { CreateTokens } from './types'\n\n// tokens.color.dark.red ===> { var: `color-dark-red`, val: '' }\nexport function createTokens<T extends CreateTokens>(tokens: T): MakeTokens<T> {\n  return createVariables(tokens) as any\n}\n\n// verbose but gives us nice types...\ntype MakeTokens<T> = T extends {\n  color: infer E\n  space: infer F\n  size: infer G\n  radius: infer H\n  zIndex: infer J\n}\n  ? {\n      color: {\n        // removes $ prefix allowing for defining either as $1: or 1:,\n        // which is important because Chrome re-orders numerical-seeming keys :/\n        [Key in keyof E extends `$${infer X}` ? X : keyof E]: Variable<string>\n      }\n      space: {\n        [Key in keyof F extends `$${infer X}` ? X : keyof F]: Variable<number>\n      }\n      size: {\n        [Key in keyof G extends `$${infer X}` ? X : keyof G]: Variable<number>\n      }\n      radius: {\n        [Key in keyof H extends `$${infer X}` ? X : keyof H]: Variable<number>\n      }\n      zIndex: {\n        [Key in keyof J extends `$${infer X}` ? X : keyof J]: Variable<number>\n      }\n    }\n  : never\n\n// test\nconst tokens = createTokens({\n  size: { 0: 1 },\n  space: { 0: 1 },\n  radius: { 0: 1 },\n  zIndex: { 0: 1 },\n  color: { 0: 'hi' },\n})\n"],
+  "mappings": "AACA,SAAS,uBAAuB;AAIzB,SAAS,aAAqCA,SAA0B;AAC7E,SAAO,gBAAgBA,OAAM;AAC/B;AAgCA,MAAM,SAAS,aAAa;AAAA,EAC1B,MAAM,EAAE,GAAG,EAAE;AAAA,EACb,OAAO,EAAE,GAAG,EAAE;AAAA,EACd,QAAQ,EAAE,GAAG,EAAE;AAAA,EACf,QAAQ,EAAE,GAAG,EAAE;AAAA,EACf,OAAO,EAAE,GAAG,KAAK;AACnB,CAAC;",
+  "names": ["tokens"]
 }

package/dist/esm/createVariable.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/createVariable.ts"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { simpleHash } from '@tamagui/helpers'\n\nimport { getConfig } from './config'\n\n/**\n * Should rename this to Token\n * Moving to objects for React Server Components support\n */\n\nconst IS_VAR = 'isVar'\n\ntype VariableIn<A = any> = {\n  val: A\n  name: string\n  key: string\n}\n\nexport type Variable<A = any> = VariableIn<A> & {\n  [IS_VAR]?: true\n  variable?: string\n}\n\nexport const createVariable = <A extends string | number = any>(props: VariableIn<A>) => {\n  if (isVariable(props)) return props\n  const { key, name, val } = props\n  return {\n    [IS_VAR]: true,\n    key,\n    name: simpleHash(name, 40),\n    val,\n    variable: isWeb ? createCSSVariable(name) : '',\n  }\n}\n\n// could do weakmap cache\nexport function variableToString(vrble?: any, getValue = false) {\n  if (isVariable(vrble)) {\n    if (!getValue && isWeb && vrble.variable) {\n      return vrble.variable\n    }\n    return `${vrble.val}`\n  }\n  return `${vrble || ''}`\n}\n\nexport function isVariable(v: Variable | any): v is Variable {\n  return v && typeof v === 'object' && IS_VAR in v\n}\n\nexport function getVariable(nameOrVariable: Variable | string) {\n  setDidGetVariableValue(true)\n  if (isVariable(nameOrVariable)) {\n    return variableToString(nameOrVariable)\n  }\n  const tokens = getConfig().tokensParsed\n  return variableToString(tokens[nameOrVariable] ?? nameOrVariable)\n}\n\nlet accessed = false\nexport const setDidGetVariableValue = (val: boolean) => (accessed = val)\nexport const didGetVariableValue = () => accessed\n\nexport function getVariableValue(v: Variable | any) {\n  if (isVariable(v)) {\n    setDidGetVariableValue(true)\n    return v.val\n  }\n  return v\n}\n\nexport function getVariableName(v: Variable | any) {\n  if (isVariable(v)) return v.name\n  return v\n}\n\nexport function getVariableVariable(v: Variable | any) {\n  if (isVariable(v)) return v.variable\n  return v\n}\n\n// bugfix { space: { 0.5: 10 } } was generating var(--space-0.5) (invalid CSS):\nexport const createCSSVariable = (nameProp: string, includeVar = true) => {\n  if (process.env.NODE_ENV === 'development') {\n    if (!nameProp || typeof nameProp !== 'string') {\n      throw new Error(`createCSSVariable expected string: ${nameProp}`)\n    }\n  }\n  const name = simpleHash(nameProp, 60)\n  return includeVar ? `var(--${name})` : name\n}\n"],
-  "mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,kBAAkB;AAE3B,SAAS,iBAAiB;AAO1B,MAAM,SAAS;AAaR,MAAM,iBAAiB,CAAkC,UAAyB;AACvF,MAAI,WAAW,KAAK;AAAG,WAAO;AAC9B,QAAM,EAAE,KAAK,MAAM,IAAI,IAAI;AAC3B,SAAO;AAAA,IACL,CAAC,SAAS;AAAA,IACV;AAAA,IACA,MAAM,WAAW,MAAM,EAAE;AAAA,IACzB;AAAA,IACA,UAAU,QAAQ,kBAAkB,IAAI,IAAI;AAAA,EAC9C;AACF;AAGO,SAAS,iBAAiB,OAAa,WAAW,OAAO;AAC9D,MAAI,WAAW,KAAK,GAAG;AACrB,QAAI,CAAC,YAAY,SAAS,MAAM,UAAU;AACxC,aAAO,MAAM;AAAA,IACf;AACA,WAAO,GAAG,MAAM;AAAA,EAClB;AACA,SAAO,GAAG,SAAS;AACrB;AAEO,SAAS,WAAW,GAAkC;AAC3D,SAAO,KAAK,OAAO,MAAM,YAAY,UAAU;AACjD;AAEO,SAAS,YAAY,gBAAmC;AAC7D,yBAAuB,IAAI;AAC3B,MAAI,WAAW,cAAc,GAAG;AAC9B,WAAO,iBAAiB,cAAc;AAAA,EACxC;AACA,QAAM,SAAS,UAAU,EAAE;AAC3B,SAAO,iBAAiB,OAAO,mBAAmB,cAAc;AAClE;AAEA,IAAI,WAAW;AACR,MAAM,yBAAyB,CAAC,QAAkB,WAAW;AAC7D,MAAM,sBAAsB,MAAM;AAElC,SAAS,iBAAiB,GAAmB;AAClD,MAAI,WAAW,CAAC,GAAG;AACjB,2BAAuB,IAAI;AAC3B,WAAO,EAAE;AAAA,EACX;AACA,SAAO;AACT;AAEO,SAAS,gBAAgB,GAAmB;AACjD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAEO,SAAS,oBAAoB,GAAmB;AACrD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAGO,MAAM,oBAAoB,CAAC,UAAkB,aAAa,SAAS;AACxE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,YAAY,OAAO,aAAa,UAAU;AAC7C,YAAM,IAAI,MAAM,sCAAsC,UAAU;AAAA,IAClE;AAAA,EACF;AACA,QAAM,OAAO,WAAW,UAAU,EAAE;AACpC,SAAO,aAAa,SAAS,UAAU;AACzC;",
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { simpleHash } from '@tamagui/helpers'\n\nimport { getConfig } from './config'\n\n/**\n * Should rename this to Token\n * Moving to objects for React Server Components support\n */\n\nconst IS_VAR = 'isVar'\n\nexport interface Variable<A = any> {\n  [IS_VAR]?: true\n  variable?: string\n  val: A\n  name: string\n  key: string\n}\n\nexport type MakeVariable<A = any> = A extends string | number ? Variable<A> : A\n\ntype VariableIn<A = any> = Pick<Variable<A>, 'key' | 'name' | 'val'>\nexport const createVariable = <A extends string | number = any>(\n  props: VariableIn<A>\n): Variable<A> => {\n  if (isVariable(props)) return props\n  const { key, name, val } = props\n  return {\n    [IS_VAR]: true,\n    key: key!,\n    name: simpleHash(name, 40),\n    val: val as any,\n    variable: isWeb ? createCSSVariable(name) : '',\n  }\n}\n\n// could do weakmap cache\nexport function variableToString(vrble?: any, getValue = false) {\n  if (isVariable(vrble)) {\n    if (!getValue && isWeb && vrble.variable) {\n      return vrble.variable\n    }\n    return `${vrble.val}`\n  }\n  return `${vrble || ''}`\n}\n\nexport function isVariable(v: Variable | any): v is Variable {\n  return v && typeof v === 'object' && IS_VAR in v\n}\n\nexport function getVariable(nameOrVariable: Variable | string) {\n  setDidGetVariableValue(true)\n  if (isVariable(nameOrVariable)) {\n    return variableToString(nameOrVariable)\n  }\n  const tokens = getConfig().tokensParsed\n  return variableToString(tokens[nameOrVariable] ?? nameOrVariable)\n}\n\nlet accessed = false\nexport const setDidGetVariableValue = (val: boolean) => (accessed = val)\nexport const didGetVariableValue = () => accessed\n\nexport function getVariableValue(v: Variable | any) {\n  if (isVariable(v)) {\n    setDidGetVariableValue(true)\n    return v.val\n  }\n  return v\n}\n\nexport function getVariableName(v: Variable | any) {\n  if (isVariable(v)) return v.name\n  return v\n}\n\nexport function getVariableVariable(v: Variable | any) {\n  if (isVariable(v)) return v.variable\n  return v\n}\n\n// bugfix { space: { 0.5: 10 } } was generating var(--space-0.5) (invalid CSS):\nexport const createCSSVariable = (nameProp: string, includeVar = true) => {\n  if (process.env.NODE_ENV === 'development') {\n    if (!nameProp || typeof nameProp !== 'string') {\n      throw new Error(`createCSSVariable expected string: ${nameProp}`)\n    }\n  }\n  const name = simpleHash(nameProp, 60)\n  return includeVar ? `var(--${name})` : name\n}\n"],
+  "mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,kBAAkB;AAE3B,SAAS,iBAAiB;AAO1B,MAAM,SAAS;AAaR,MAAM,iBAAiB,CAC5B,UACgB;AAChB,MAAI,WAAW,KAAK;AAAG,WAAO;AAC9B,QAAM,EAAE,KAAK,MAAM,IAAI,IAAI;AAC3B,SAAO;AAAA,IACL,CAAC,SAAS;AAAA,IACV;AAAA,IACA,MAAM,WAAW,MAAM,EAAE;AAAA,IACzB;AAAA,IACA,UAAU,QAAQ,kBAAkB,IAAI,IAAI;AAAA,EAC9C;AACF;AAGO,SAAS,iBAAiB,OAAa,WAAW,OAAO;AAC9D,MAAI,WAAW,KAAK,GAAG;AACrB,QAAI,CAAC,YAAY,SAAS,MAAM,UAAU;AACxC,aAAO,MAAM;AAAA,IACf;AACA,WAAO,GAAG,MAAM;AAAA,EAClB;AACA,SAAO,GAAG,SAAS;AACrB;AAEO,SAAS,WAAW,GAAkC;AAC3D,SAAO,KAAK,OAAO,MAAM,YAAY,UAAU;AACjD;AAEO,SAAS,YAAY,gBAAmC;AAC7D,yBAAuB,IAAI;AAC3B,MAAI,WAAW,cAAc,GAAG;AAC9B,WAAO,iBAAiB,cAAc;AAAA,EACxC;AACA,QAAM,SAAS,UAAU,EAAE;AAC3B,SAAO,iBAAiB,OAAO,mBAAmB,cAAc;AAClE;AAEA,IAAI,WAAW;AACR,MAAM,yBAAyB,CAAC,QAAkB,WAAW;AAC7D,MAAM,sBAAsB,MAAM;AAElC,SAAS,iBAAiB,GAAmB;AAClD,MAAI,WAAW,CAAC,GAAG;AACjB,2BAAuB,IAAI;AAC3B,WAAO,EAAE;AAAA,EACX;AACA,SAAO;AACT;AAEO,SAAS,gBAAgB,GAAmB;AACjD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAEO,SAAS,oBAAoB,GAAmB;AACrD,MAAI,WAAW,CAAC;AAAG,WAAO,EAAE;AAC5B,SAAO;AACT;AAGO,MAAM,oBAAoB,CAAC,UAAkB,aAAa,SAAS;AACxE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,YAAY,OAAO,aAAa,UAAU;AAC7C,YAAM,IAAI,MAAM,sCAAsC,UAAU;AAAA,IAClE;AAAA,EACF;AACA,QAAM,OAAO,WAAW,UAAU,EAAE;AACpC,SAAO,aAAa,SAAS,UAAU;AACzC;",
   "names": []
 }

package/dist/esm/helpers/themes.js

@@ -25,20 +25,19 @@ function proxyThemeToParents(themeName, theme, themes) {
     cur.push(part);
     return cur.join("_");
   });
-  const hasParents = parents.length;
+  const len = parents.length;
   return new Proxy(theme, {
     get(target, key) {
       if (key === GetThemeUnwrapped) {
         return theme;
       }
-      if (!hasParents || Reflect.has(target, key)) {
+      if (!len || Reflect.has(target, key)) {
         return Reflect.get(target, key);
       }
-      for (let i = parents.length - 1; i >= 0; i--) {
+      for (let i = len - 1; i >= 0; i--) {
         const parent = themes[parents[i]];
-        if (!parent) {
+        if (!parent)
           continue;
-        }
         if (Reflect.has(parent, key)) {
           return Reflect.get(parent, key);
         }

package/dist/esm/helpers/themes.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/themes.ts"],
-  "sourcesContent": ["import { createVariable, isVariable } from '../createVariable'\nimport { GetThemeUnwrapped } from '../hooks/getThemeUnwrapped'\nimport { CreateTamaguiProps } from '../types'\n\n// mutates, freeze after\n// shared by createTamagui so extracted here\nexport function ensureThemeVariable(theme: any, key: string) {\n  const val = theme[key]\n  const themeKey = key\n  if (!isVariable(val)) {\n    theme[key] = createVariable({\n      key: themeKey,\n      name: themeKey,\n      val,\n    })\n  } else {\n    if (val.name !== themeKey) {\n      // rename to theme name\n      theme[key] = createVariable({\n        key: val.name,\n        name: themeKey,\n        val: val.val,\n      })\n    }\n  }\n}\n\nexport function proxyThemeToParents(\n  themeName: string,\n  theme: any,\n  themes: CreateTamaguiProps['themes']\n) {\n  // we could test if this is better as just a straight object spread or fancier proxy\n  const cur: string[] = []\n  // if theme is dark_blue_alt1_Button\n  // this will be the parent names in order: ['dark', 'dark_blue', 'dark_blue_alt1\"]\n  const parents = themeName\n    .split('_')\n    .slice(0, -1)\n    .map((part) => {\n      cur.push(part)\n      return cur.join('_')\n    })\n\n  const hasParents = parents.length\n\n  // proxy fallback values to parent theme values\n  return new Proxy(theme, {\n    get(target, key) {\n      if (key === GetThemeUnwrapped) {\n        return theme\n      }\n      if (!hasParents || Reflect.has(target, key)) {\n        return Reflect.get(target, key)\n      }\n      // check parents\n      for (let i = parents.length - 1; i >= 0; i--) {\n        const parent = themes[parents[i]]\n        if (!parent) {\n          continue\n        }\n        if (Reflect.has(parent, key)) {\n          return Reflect.get(parent, key)\n        }\n      }\n      return Reflect.get(target, key)\n    },\n  })\n}\n"],
-  "mappings": "AAAA,SAAS,gBAAgB,kBAAkB;AAC3C,SAAS,yBAAyB;AAK3B,SAAS,oBAAoB,OAAY,KAAa;AAC3D,QAAM,MAAM,MAAM;AAClB,QAAM,WAAW;AACjB,MAAI,CAAC,WAAW,GAAG,GAAG;AACpB,UAAM,OAAO,eAAe;AAAA,MAC1B,KAAK;AAAA,MACL,MAAM;AAAA,MACN;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,QAAI,IAAI,SAAS,UAAU;AAEzB,YAAM,OAAO,eAAe;AAAA,QAC1B,KAAK,IAAI;AAAA,QACT,MAAM;AAAA,QACN,KAAK,IAAI;AAAA,MACX,CAAC;AAAA,IACH;AAAA,EACF;AACF;AAEO,SAAS,oBACd,WACA,OACA,QACA;AAEA,QAAM,MAAgB,CAAC;AAGvB,QAAM,UAAU,UACb,MAAM,GAAG,EACT,MAAM,GAAG,EAAE,EACX,IAAI,CAAC,SAAS;AACb,QAAI,KAAK,IAAI;AACb,WAAO,IAAI,KAAK,GAAG;AAAA,EACrB,CAAC;AAEH,QAAM,aAAa,QAAQ;AAG3B,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,QAAQ,KAAK;AACf,UAAI,QAAQ,mBAAmB;AAC7B,eAAO;AAAA,MACT;AACA,UAAI,CAAC,cAAc,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC3C,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAChC;AAEA,eAAS,IAAI,QAAQ,SAAS,GAAG,KAAK,GAAG,KAAK;AAC5C,cAAM,SAAS,OAAO,QAAQ;AAC9B,YAAI,CAAC,QAAQ;AACX;AAAA,QACF;AACA,YAAI,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC5B,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,QAChC;AAAA,MACF;AACA,aAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,IAChC;AAAA,EACF,CAAC;AACH;",
+  "sourcesContent": ["import { createVariable, isVariable } from '../createVariable'\nimport { GetThemeUnwrapped } from '../hooks/getThemeUnwrapped'\nimport { CreateTamaguiProps } from '../types'\n\n// mutates, freeze after\n// shared by createTamagui so extracted here\nexport function ensureThemeVariable(theme: any, key: string) {\n  const val = theme[key]\n  const themeKey = key\n  if (!isVariable(val)) {\n    theme[key] = createVariable({\n      key: themeKey,\n      name: themeKey,\n      val,\n    })\n  } else {\n    if (val.name !== themeKey) {\n      // rename to theme name\n      theme[key] = createVariable({\n        key: val.name,\n        name: themeKey,\n        val: val.val,\n      })\n    }\n  }\n}\n\nexport function proxyThemeToParents(\n  themeName: string,\n  theme: any,\n  themes: CreateTamaguiProps['themes']\n) {\n  // we could test if this is better as just a straight object spread or fancier proxy\n  const cur: string[] = []\n  // if theme is dark_blue_alt1_Button\n  // this will be the parent names in order: ['dark', 'dark_blue', 'dark_blue_alt1\"]\n  const parents = themeName\n    .split('_')\n    .slice(0, -1)\n    .map((part) => {\n      cur.push(part)\n      return cur.join('_')\n    })\n\n  const len = parents.length\n\n  // proxy fallback values to parent theme values\n  return new Proxy(theme, {\n    get(target, key) {\n      if (key === GetThemeUnwrapped) {\n        return theme\n      }\n      if (!len || Reflect.has(target, key)) {\n        return Reflect.get(target, key)\n      }\n      // check parents\n      for (let i = len - 1; i >= 0; i--) {\n        const parent = themes[parents[i]]\n        if (!parent) continue\n        if (Reflect.has(parent, key)) {\n          return Reflect.get(parent, key)\n        }\n      }\n      return Reflect.get(target, key)\n    },\n  })\n}\n"],
+  "mappings": "AAAA,SAAS,gBAAgB,kBAAkB;AAC3C,SAAS,yBAAyB;AAK3B,SAAS,oBAAoB,OAAY,KAAa;AAC3D,QAAM,MAAM,MAAM;AAClB,QAAM,WAAW;AACjB,MAAI,CAAC,WAAW,GAAG,GAAG;AACpB,UAAM,OAAO,eAAe;AAAA,MAC1B,KAAK;AAAA,MACL,MAAM;AAAA,MACN;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,QAAI,IAAI,SAAS,UAAU;AAEzB,YAAM,OAAO,eAAe;AAAA,QAC1B,KAAK,IAAI;AAAA,QACT,MAAM;AAAA,QACN,KAAK,IAAI;AAAA,MACX,CAAC;AAAA,IACH;AAAA,EACF;AACF;AAEO,SAAS,oBACd,WACA,OACA,QACA;AAEA,QAAM,MAAgB,CAAC;AAGvB,QAAM,UAAU,UACb,MAAM,GAAG,EACT,MAAM,GAAG,EAAE,EACX,IAAI,CAAC,SAAS;AACb,QAAI,KAAK,IAAI;AACb,WAAO,IAAI,KAAK,GAAG;AAAA,EACrB,CAAC;AAEH,QAAM,MAAM,QAAQ;AAGpB,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,QAAQ,KAAK;AACf,UAAI,QAAQ,mBAAmB;AAC7B,eAAO;AAAA,MACT;AACA,UAAI,CAAC,OAAO,QAAQ,IAAI,QAAQ,GAAG,GAAG;AACpC,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAChC;AAEA,eAAS,IAAI,MAAM,GAAG,KAAK,GAAG,KAAK;AACjC,cAAM,SAAS,OAAO,QAAQ;AAC9B,YAAI,CAAC;AAAQ;AACb,YAAI,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC5B,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,QAChC;AAAA,MACF;AACA,aAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,IAChC;AAAA,EACF,CAAC;AACH;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -30,22 +30,22 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "^1.0.17",
-    "@tamagui/constants": "^1.0.17",
-    "@tamagui/helpers": "^1.0.17",
-    "@tamagui/normalize-css-color": "^1.0.17",
-    "@tamagui/react-native-use-pressable": "^1.0.17",
-    "@tamagui/react-native-use-responder-events": "^1.0.17",
-    "@tamagui/use-did-finish-ssr": "^1.0.17",
-    "@tamagui/use-event": "^1.0.17",
-    "@tamagui/use-force-update": "^1.0.17"
+    "@tamagui/compose-refs": "^1.0.18",
+    "@tamagui/constants": "^1.0.18",
+    "@tamagui/helpers": "^1.0.18",
+    "@tamagui/normalize-css-color": "^1.0.18",
+    "@tamagui/react-native-use-pressable": "^1.0.18",
+    "@tamagui/react-native-use-responder-events": "^1.0.18",
+    "@tamagui/use-did-finish-ssr": "^1.0.18",
+    "@tamagui/use-event": "^1.0.18",
+    "@tamagui/use-force-update": "^1.0.18"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.17",
+    "@tamagui/build": "^1.0.18",
     "@testing-library/react": "^13.4.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/createFont.ts

@@ -39,7 +39,7 @@ export const createFont = <A extends GenericFont>(font: A): A => {
       return [
         key,
         processSection(
-          section,
+          section as any,
           key === 'face' ? fontWeights : sizeKeys,
           key === 'face' ? { normal: font.family } : undefined
         ),

package/src/createTokens.ts

@@ -17,19 +17,30 @@ type MakeTokens<T> = T extends {
 }
   ? {
       color: {
-        [Key in keyof E]: E[Key] extends Variable ? E[Key] : Variable<E[Key]>
+        // removes $ prefix allowing for defining either as $1: or 1:,
+        // which is important because Chrome re-orders numerical-seeming keys :/
+        [Key in keyof E extends `$${infer X}` ? X : keyof E]: Variable<string>
       }
       space: {
-        [Key in keyof F]: F[Key] extends Variable ? F[Key] : Variable<F[Key]>
+        [Key in keyof F extends `$${infer X}` ? X : keyof F]: Variable<number>
       }
       size: {
-        [Key in keyof G]: G[Key] extends Variable ? G[Key] : Variable<G[Key]>
+        [Key in keyof G extends `$${infer X}` ? X : keyof G]: Variable<number>
       }
       radius: {
-        [Key in keyof H]: H[Key] extends Variable ? H[Key] : Variable<H[Key]>
+        [Key in keyof H extends `$${infer X}` ? X : keyof H]: Variable<number>
       }
       zIndex: {
-        [Key in keyof J]: J[Key] extends Variable ? J[Key] : Variable<J[Key]>
+        [Key in keyof J extends `$${infer X}` ? X : keyof J]: Variable<number>
       }
     }
   : never
+
+// test
+const tokens = createTokens({
+  size: { 0: 1 },
+  space: { 0: 1 },
+  radius: { 0: 1 },
+  zIndex: { 0: 1 },
+  color: { 0: 'hi' },
+})

package/src/createVariable.ts

@@ -10,25 +10,27 @@ import { getConfig } from './config'
 
 const IS_VAR = 'isVar'
 
-type VariableIn<A = any> = {
+export interface Variable<A = any> {
+  [IS_VAR]?: true
+  variable?: string
   val: A
   name: string
   key: string
 }
 
-export type Variable<A = any> = VariableIn<A> & {
-  [IS_VAR]?: true
-  variable?: string
-}
+export type MakeVariable<A = any> = A extends string | number ? Variable<A> : A
 
-export const createVariable = <A extends string | number = any>(props: VariableIn<A>) => {
+type VariableIn<A = any> = Pick<Variable<A>, 'key' | 'name' | 'val'>
+export const createVariable = <A extends string | number = any>(
+  props: VariableIn<A>
+): Variable<A> => {
   if (isVariable(props)) return props
   const { key, name, val } = props
   return {
     [IS_VAR]: true,
-    key,
+    key: key!,
     name: simpleHash(name, 40),
-    val,
+    val: val as any,
     variable: isWeb ? createCSSVariable(name) : '',
   }
 }

package/src/helpers/themes.ts

@@ -42,7 +42,7 @@ export function proxyThemeToParents(
       return cur.join('_')
     })
 
-  const hasParents = parents.length
+  const len = parents.length
 
   // proxy fallback values to parent theme values
   return new Proxy(theme, {
@@ -50,15 +50,13 @@ export function proxyThemeToParents(
       if (key === GetThemeUnwrapped) {
         return theme
       }
-      if (!hasParents || Reflect.has(target, key)) {
+      if (!len || Reflect.has(target, key)) {
         return Reflect.get(target, key)
       }
       // check parents
-      for (let i = parents.length - 1; i >= 0; i--) {
+      for (let i = len - 1; i >= 0; i--) {
         const parent = themes[parents[i]]
-        if (!parent) {
-          continue
-        }
+        if (!parent) continue
         if (Reflect.has(parent, key)) {
           return Reflect.get(parent, key)
         }

package/types/createTokens.d.ts

@@ -9,19 +9,19 @@ type MakeTokens<T> = T extends {
     zIndex: infer J;
 } ? {
     color: {
-        [Key in keyof E]: E[Key] extends Variable ? E[Key] : Variable<E[Key]>;
+        [Key in keyof E extends `$${infer X}` ? X : keyof E]: Variable<string>;
     };
     space: {
-        [Key in keyof F]: F[Key] extends Variable ? F[Key] : Variable<F[Key]>;
+        [Key in keyof F extends `$${infer X}` ? X : keyof F]: Variable<number>;
     };
     size: {
-        [Key in keyof G]: G[Key] extends Variable ? G[Key] : Variable<G[Key]>;
+        [Key in keyof G extends `$${infer X}` ? X : keyof G]: Variable<number>;
     };
     radius: {
-        [Key in keyof H]: H[Key] extends Variable ? H[Key] : Variable<H[Key]>;
+        [Key in keyof H extends `$${infer X}` ? X : keyof H]: Variable<number>;
     };
     zIndex: {
-        [Key in keyof J]: J[Key] extends Variable ? J[Key] : Variable<J[Key]>;
+        [Key in keyof J extends `$${infer X}` ? X : keyof J]: Variable<number>;
     };
 } : never;
 export {};

package/types/createVariable.d.ts

@@ -3,22 +3,16 @@
  * Moving to objects for React Server Components support
  */
 declare const IS_VAR = "isVar";
-type VariableIn<A = any> = {
-    val: A;
-    name: string;
-    key: string;
-};
-export type Variable<A = any> = VariableIn<A> & {
+export interface Variable<A = any> {
     [IS_VAR]?: true;
     variable?: string;
-};
-export declare const createVariable: <A extends string | number = any>(props: VariableIn<A>) => VariableIn<A> | {
-    isVar: boolean;
-    key: string;
-    name: string;
     val: A;
-    variable: string;
-};
+    name: string;
+    key: string;
+}
+export type MakeVariable<A = any> = A extends string | number ? Variable<A> : A;
+type VariableIn<A = any> = Pick<Variable<A>, 'key' | 'name' | 'val'>;
+export declare const createVariable: <A extends string | number = any>(props: VariableIn<A>) => Variable<A>;
 export declare function variableToString(vrble?: any, getValue?: boolean): string;
 export declare function isVariable(v: Variable | any): v is Variable;
 export declare function getVariable(nameOrVariable: Variable | string): string;

package/types/helpers/ThemeManager.d.ts

@@ -28,7 +28,7 @@ export declare class ThemeManager {
     getState(props?: ThemeProps, parentManager?: ThemeManager | null): ThemeManagerState | null;
     _allKeys: Set<string> | null;
     get allKeys(): Set<string>;
-    getValue(key: string, state?: ThemeManagerState): import("../types").VariableVal | undefined;
+    getValue(key: string, state?: ThemeManagerState): string | number | import("..").Variable<any> | undefined;
     notify(): void;
     onChangeTheme(cb: ThemeListener): () => void;
 }