@tamagui/create-theme 1.14.8 → 1.15.0

package/dist/cjs/index.js

@@ -23,7 +23,8 @@ __export(src_exports, {
   createShiftMask: () => createShiftMask,
   createStrengthenMask: () => createStrengthenMask,
   createTheme: () => createTheme,
-  createWeakenMask: () => createWeakenMask
+  createWeakenMask: () => createWeakenMask,
+  skipMask: () => skipMask
 });
 module.exports = __toCommonJS(src_exports);
 const THEME_INFO = /* @__PURE__ */ new WeakMap();
@@ -58,15 +59,25 @@ function addChildren(themes, getChildren) {
   }
   return out;
 }
+const skipMask = (template, { skip }) => {
+  if (!skip)
+    return template;
+  return Object.fromEntries(
+    Object.entries(template).filter(([k]) => !(k in skip))
+  );
+};
 const createShiftMask = ({ inverse } = {}) => {
-  return (template, { skip, max: maxIn, palette, min = 0, strength = 1 }) => {
+  return (template, opts) => {
+    const { override, max: maxIn, palette, min = 0, strength = 1 } = opts;
     const values = Object.entries(template);
     const max = maxIn ?? (palette ? Object.values(palette).length - 1 : Infinity);
     const out = {};
     for (const [key, value] of values) {
       if (typeof value === "string")
         continue;
-      if (skip && key in skip) {
+      if (typeof (override == null ? void 0 : override[key]) === "number") {
+        const overrideShift = override[key];
+        out[key] = value + overrideShift;
         continue;
       }
       const isPositive = value === 0 ? !isMinusZero(value) : value >= 0;
@@ -76,7 +87,7 @@ const createShiftMask = ({ inverse } = {}) => {
       const clamped = isPositive ? Math.max(min, Math.min(max, next)) : Math.min(-min, Math.max(-max, next));
       out[key] = clamped;
     }
-    return out;
+    return skipMask(out, opts);
   };
 };
 const createWeakenMask = () => createShiftMask();
@@ -84,7 +95,6 @@ const createStrengthenMask = () => createShiftMask({ inverse: true });
 function isMinusZero(value) {
   return 1 / value === -Infinity;
 }
-const MaskKeyCache = /* @__PURE__ */ new WeakMap();
 function applyMask(theme, mask, options = {}) {
   const info = THEME_INFO.get(theme);
   if (!info) {
@@ -92,18 +102,11 @@ function applyMask(theme, mask, options = {}) {
       process.env.NODE_ENV !== "production" ? `No info found for theme, you must pass the theme created by createThemeFromPalette directly to extendTheme` : `\u274C Err2`
     );
   }
-  const maskKey = MaskKeyCache.get(mask) ?? `${Math.random()}`;
-  MaskKeyCache.set(mask, maskKey);
-  const key = `${maskKey}${JSON.stringify(options)}`;
-  if (info.cache.has(key)) {
-    return info.cache.get(key);
-  }
   const template = mask(info.definition, {
     palette: info.palette,
     ...options
   });
   const next = createTheme(info.palette, template);
-  info.cache.set(key, next);
   return next;
 }
 if (process.env.NODE_ENV === "development") {
@@ -139,6 +142,7 @@ if (process.env.NODE_ENV === "development") {
   createShiftMask,
   createStrengthenMask,
   createTheme,
-  createWeakenMask
+  createWeakenMask,
+  skipMask
 });
 //# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.tsx"],
-  "sourcesContent": ["import type { Variable } from '@tamagui/web'\n\nexport type ThemeMask = Record<string, string | number>\nexport type Palette = string[]\n\nexport type MaskOptions = {\n  palette?: Palette\n  skip?: Partial<ThemeMask>\n  strength?: number\n  max?: number\n  min?: number\n}\n\ntype GenericTheme = { [key: string]: string | Variable }\ntype CreateMask = <A extends ThemeMask>(template: A, options: MaskOptions) => A\n\nconst THEME_INFO = new WeakMap<\n  any,\n  { palette: Palette; definition: ThemeMask; cache: Map<any, any> }\n>()\n\nexport function createTheme<\n  Definition extends ThemeMask,\n  Extras extends Record<string, string> = {}\n>(\n  palette: Palette,\n  definition: Definition,\n  options?: {\n    nonInheritedValues?: Extras\n  }\n): {\n  [key in keyof Definition | keyof Extras]: string\n} {\n  const theme = {\n    ...(Object.fromEntries(\n      Object.entries(definition).map(([key, offset]) => {\n        return [key, getValue(palette, offset)]\n      })\n    ) as any),\n    ...options?.nonInheritedValues,\n  }\n  THEME_INFO.set(theme, { palette, definition, cache: new Map() })\n  return theme\n}\n\nconst getValue = (palette: Palette, value: string | number) => {\n  if (typeof value === 'string') return value\n  const max = palette.length - 1\n  const isPositive = value === 0 ? !isMinusZero(value) : value >= 0\n  const next = isPositive ? value : max + value\n  const index = Math.min(Math.max(0, next), max)\n  return palette[index]\n}\n\ntype SubThemeKeys<ParentKeys, ChildKeys> = `${ParentKeys extends string\n  ? ParentKeys\n  : never}_${ChildKeys extends string ? ChildKeys : never}`\n\ntype ChildGetter<Name extends string | number | symbol, Theme extends GenericTheme> = (\n  name: Name,\n  theme: Theme\n) => { [key: string]: Theme }\n\nexport function addChildren<\n  Themes extends { [key: string]: GenericTheme },\n  GetChildren extends ChildGetter<keyof Themes, Themes[keyof Themes]>\n>(\n  themes: Themes,\n  getChildren: GetChildren\n): Themes & {\n  [key in SubThemeKeys<keyof Themes, keyof ReturnType<GetChildren>>]: Themes[keyof Themes]\n} {\n  const out = { ...themes }\n  for (const key in themes) {\n    const subThemes = getChildren(key, themes[key])\n    for (const sKey in subThemes) {\n      out[`${key}_${sKey}`] = subThemes[sKey] as any\n    }\n  }\n  return out as any\n}\n\nexport const createShiftMask = ({ inverse }: { inverse?: boolean } = {}) => {\n  return ((template, { skip, max: maxIn, palette, min = 0, strength = 1 }) => {\n    const values = Object.entries(template)\n    const max = maxIn ?? (palette ? Object.values(palette).length - 1 : Infinity)\n    const out = {}\n    for (const [key, value] of values) {\n      if (typeof value === 'string') continue\n      if (skip && key in skip) {\n        continue\n      }\n      const isPositive = value === 0 ? !isMinusZero(value) : value >= 0\n      const direction = isPositive ? 1 : -1\n      const invert = inverse ? -1 : 1\n      const next = value + strength * direction * invert\n      const clamped = isPositive\n        ? Math.max(min, Math.min(max, next))\n        : Math.min(-min, Math.max(-max, next))\n\n      out[key] = clamped\n    }\n    return out as typeof template\n  }) as CreateMask\n}\n\nexport const createWeakenMask = () => createShiftMask()\nexport const createStrengthenMask = () => createShiftMask({ inverse: true })\n\nfunction isMinusZero(value) {\n  return 1 / value === -Infinity\n}\n\nconst MaskKeyCache = new WeakMap<any, string>()\n\nexport function applyMask<Theme extends GenericTheme>(\n  theme: Theme,\n  mask: CreateMask,\n  options: MaskOptions = {}\n): Theme {\n  const info = THEME_INFO.get(theme)\n  if (!info) {\n    throw new Error(\n      process.env.NODE_ENV !== 'production'\n        ? `No info found for theme, you must pass the theme created by createThemeFromPalette directly to extendTheme`\n        : `\u274C Err2`\n    )\n  }\n\n  const maskKey = MaskKeyCache.get(mask) ?? `${Math.random()}`\n  MaskKeyCache.set(mask, maskKey)\n\n  const key = `${maskKey}${JSON.stringify(options)}`\n\n  if (info.cache.has(key)) {\n    return info.cache.get(key)\n  }\n\n  const template = mask(info.definition, {\n    palette: info.palette,\n    ...options,\n  })\n  const next = createTheme(info.palette, template) as Theme\n\n  info.cache.set(key, next)\n\n  return next\n}\n\n// --- tests ---\n\nif (process.env.NODE_ENV === 'development') {\n  const palette = ['0', '1', '2', '3', '-3', '-2', '-1', '-0']\n  const template = { bg: 1, fg: -1 }\n\n  const stongerMask = createStrengthenMask()\n  const weakerMask = createWeakenMask()\n\n  const theme = createTheme(palette, template)\n  if (theme.bg !== '1') throw `\u274C`\n  if (theme.fg !== '-1') throw `\u274C`\n\n  const str = applyMask(theme, stongerMask)\n  if (str.bg !== '0') throw `\u274C`\n  if (str.fg !== '-0') throw `\u274C`\n\n  const weak = applyMask(theme, weakerMask)\n  if (weak.bg !== '2') throw `\u274C`\n  if (weak.fg !== '-2') throw `\u274C`\n\n  const weak2 = applyMask(theme, weakerMask, { strength: 2 })\n  if (weak2.bg !== '3') throw `\u274C`\n  if (weak2.fg !== '-3') throw `\u274C`\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { Variable } from '@tamagui/web'\n\nexport type ThemeMask = Record<string, string | number>\nexport type Palette = string[]\n\nexport type MaskOptions = {\n  palette?: Palette\n  override?: Partial<ThemeMask>\n  skip?: Partial<ThemeMask>\n  strength?: number\n  max?: number\n  min?: number\n}\n\ntype GenericTheme = { [key: string]: string | Variable }\ntype CreateMask = <A extends ThemeMask>(template: A, options: MaskOptions) => A\n\nconst THEME_INFO = new WeakMap<\n  any,\n  { palette: Palette; definition: ThemeMask; cache: Map<any, any> }\n>()\n\nexport function createTheme<\n  Definition extends ThemeMask,\n  Extras extends Record<string, string> = {}\n>(\n  palette: Palette,\n  definition: Definition,\n  options?: {\n    nonInheritedValues?: Extras\n  }\n): {\n  [key in keyof Definition | keyof Extras]: string\n} {\n  const theme = {\n    ...(Object.fromEntries(\n      Object.entries(definition).map(([key, offset]) => {\n        return [key, getValue(palette, offset)]\n      })\n    ) as any),\n    ...options?.nonInheritedValues,\n  }\n  THEME_INFO.set(theme, { palette, definition, cache: new Map() })\n  return theme\n}\n\nconst getValue = (palette: Palette, value: string | number) => {\n  if (typeof value === 'string') return value\n  const max = palette.length - 1\n  const isPositive = value === 0 ? !isMinusZero(value) : value >= 0\n  const next = isPositive ? value : max + value\n  const index = Math.min(Math.max(0, next), max)\n  return palette[index]\n}\n\ntype SubThemeKeys<ParentKeys, ChildKeys> = `${ParentKeys extends string\n  ? ParentKeys\n  : never}_${ChildKeys extends string ? ChildKeys : never}`\n\ntype ChildGetter<Name extends string | number | symbol, Theme extends GenericTheme> = (\n  name: Name,\n  theme: Theme\n) => { [key: string]: Theme }\n\nexport function addChildren<\n  Themes extends { [key: string]: GenericTheme },\n  GetChildren extends ChildGetter<keyof Themes, Themes[keyof Themes]>\n>(\n  themes: Themes,\n  getChildren: GetChildren\n): Themes & {\n  [key in SubThemeKeys<keyof Themes, keyof ReturnType<GetChildren>>]: Themes[keyof Themes]\n} {\n  const out = { ...themes }\n  for (const key in themes) {\n    const subThemes = getChildren(key, themes[key])\n    for (const sKey in subThemes) {\n      out[`${key}_${sKey}`] = subThemes[sKey] as any\n    }\n  }\n  return out as any\n}\n\nexport const skipMask: CreateMask = (template, { skip }) => {\n  if (!skip) return template\n  return Object.fromEntries(\n    Object.entries(template).filter(([k]) => !(k in skip))\n  ) as typeof template\n}\n\nexport const createShiftMask = ({ inverse }: { inverse?: boolean } = {}) => {\n  return ((template, opts) => {\n    const { override, max: maxIn, palette, min = 0, strength = 1 } = opts\n    const values = Object.entries(template)\n    const max = maxIn ?? (palette ? Object.values(palette).length - 1 : Infinity)\n    const out = {}\n    for (const [key, value] of values) {\n      if (typeof value === 'string') continue\n      if (typeof override?.[key] === 'number') {\n        const overrideShift = override[key] as number\n        out[key] = value + overrideShift\n        continue\n      }\n      const isPositive = value === 0 ? !isMinusZero(value) : value >= 0\n      const direction = isPositive ? 1 : -1\n      const invert = inverse ? -1 : 1\n      const next = value + strength * direction * invert\n      const clamped = isPositive\n        ? Math.max(min, Math.min(max, next))\n        : Math.min(-min, Math.max(-max, next))\n\n      out[key] = clamped\n    }\n\n    return skipMask(out, opts) as typeof template\n  }) as CreateMask\n}\n\nexport const createWeakenMask = () => createShiftMask()\nexport const createStrengthenMask = () => createShiftMask({ inverse: true })\n\nfunction isMinusZero(value) {\n  return 1 / value === -Infinity\n}\n\nexport function applyMask<Theme extends GenericTheme>(\n  theme: Theme,\n  mask: CreateMask,\n  options: MaskOptions = {}\n): Theme {\n  const info = THEME_INFO.get(theme)\n  if (!info) {\n    throw new Error(\n      process.env.NODE_ENV !== 'production'\n        ? `No info found for theme, you must pass the theme created by createThemeFromPalette directly to extendTheme`\n        : `\u274C Err2`\n    )\n  }\n\n  const template = mask(info.definition, {\n    palette: info.palette,\n    ...options,\n  })\n  const next = createTheme(info.palette, template) as Theme\n\n  return next\n}\n\n// --- tests ---\n\nif (process.env.NODE_ENV === 'development') {\n  const palette = ['0', '1', '2', '3', '-3', '-2', '-1', '-0']\n  const template = { bg: 1, fg: -1 }\n\n  const stongerMask = createStrengthenMask()\n  const weakerMask = createWeakenMask()\n\n  const theme = createTheme(palette, template)\n  if (theme.bg !== '1') throw `\u274C`\n  if (theme.fg !== '-1') throw `\u274C`\n\n  const str = applyMask(theme, stongerMask)\n  if (str.bg !== '0') throw `\u274C`\n  if (str.fg !== '-0') throw `\u274C`\n\n  const weak = applyMask(theme, weakerMask)\n  if (weak.bg !== '2') throw `\u274C`\n  if (weak.fg !== '-2') throw `\u274C`\n\n  const weak2 = applyMask(theme, weakerMask, { strength: 2 })\n  if (weak2.bg !== '3') throw `\u274C`\n  if (weak2.fg !== '-3') throw `\u274C`\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAiBA,MAAM,aAAa,oBAAI,QAGrB;AAEK,SAAS,YAId,SACA,YACA,SAKA;AACA,QAAM,QAAQ;AAAA,IACZ,GAAI,OAAO;AAAA,MACT,OAAO,QAAQ,UAAU,EAAE,IAAI,CAAC,CAAC,KAAK,MAAM,MAAM;AAChD,eAAO,CAAC,KAAK,SAAS,SAAS,MAAM,CAAC;AAAA,MACxC,CAAC;AAAA,IACH;AAAA,IACA,GAAG,mCAAS;AAAA,EACd;AACA,aAAW,IAAI,OAAO,EAAE,SAAS,YAAY,OAAO,oBAAI,IAAI,EAAE,CAAC;AAC/D,SAAO;AACT;AAEA,MAAM,WAAW,CAAC,SAAkB,UAA2B;AAC7D,MAAI,OAAO,UAAU;AAAU,WAAO;AACtC,QAAM,MAAM,QAAQ,SAAS;AAC7B,QAAM,aAAa,UAAU,IAAI,CAAC,YAAY,KAAK,IAAI,SAAS;AAChE,QAAM,OAAO,aAAa,QAAQ,MAAM;AACxC,QAAM,QAAQ,KAAK,IAAI,KAAK,IAAI,GAAG,IAAI,GAAG,GAAG;AAC7C,SAAO,QAAQ,KAAK;AACtB;AAWO,SAAS,YAId,QACA,aAGA;AACA,QAAM,MAAM,EAAE,GAAG,OAAO;AACxB,aAAW,OAAO,QAAQ;AACxB,UAAM,YAAY,YAAY,KAAK,OAAO,GAAG,CAAC;AAC9C,eAAW,QAAQ,WAAW;AAC5B,UAAI,GAAG,OAAO,MAAM,IAAI,UAAU,IAAI;AAAA,IACxC;AAAA,EACF;AACA,SAAO;AACT;AAEO,MAAM,WAAuB,CAAC,UAAU,EAAE,KAAK,MAAM;AAC1D,MAAI,CAAC;AAAM,WAAO;AAClB,SAAO,OAAO;AAAA,IACZ,OAAO,QAAQ,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,KAAK;AAAA,EACvD;AACF;AAEO,MAAM,kBAAkB,CAAC,EAAE,QAAQ,IAA2B,CAAC,MAAM;AAC1E,SAAQ,CAAC,UAAU,SAAS;AAC1B,UAAM,EAAE,UAAU,KAAK,OAAO,SAAS,MAAM,GAAG,WAAW,EAAE,IAAI;AACjE,UAAM,SAAS,OAAO,QAAQ,QAAQ;AACtC,UAAM,MAAM,UAAU,UAAU,OAAO,OAAO,OAAO,EAAE,SAAS,IAAI;AACpE,UAAM,MAAM,CAAC;AACb,eAAW,CAAC,KAAK,KAAK,KAAK,QAAQ;AACjC,UAAI,OAAO,UAAU;AAAU;AAC/B,UAAI,QAAO,qCAAW,UAAS,UAAU;AACvC,cAAM,gBAAgB,SAAS,GAAG;AAClC,YAAI,GAAG,IAAI,QAAQ;AACnB;AAAA,MACF;AACA,YAAM,aAAa,UAAU,IAAI,CAAC,YAAY,KAAK,IAAI,SAAS;AAChE,YAAM,YAAY,aAAa,IAAI;AACnC,YAAM,SAAS,UAAU,KAAK;AAC9B,YAAM,OAAO,QAAQ,WAAW,YAAY;AAC5C,YAAM,UAAU,aACZ,KAAK,IAAI,KAAK,KAAK,IAAI,KAAK,IAAI,CAAC,IACjC,KAAK,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,CAAC;AAEvC,UAAI,GAAG,IAAI;AAAA,IACb;AAEA,WAAO,SAAS,KAAK,IAAI;AAAA,EAC3B;AACF;AAEO,MAAM,mBAAmB,MAAM,gBAAgB;AAC/C,MAAM,uBAAuB,MAAM,gBAAgB,EAAE,SAAS,KAAK,CAAC;AAE3E,SAAS,YAAY,OAAO;AAC1B,SAAO,IAAI,UAAU;AACvB;AAEO,SAAS,UACd,OACA,MACA,UAAuB,CAAC,GACjB;AACP,QAAM,OAAO,WAAW,IAAI,KAAK;AACjC,MAAI,CAAC,MAAM;AACT,UAAM,IAAI;AAAA,MACR,QAAQ,IAAI,aAAa,eACrB,+GACA;AAAA,IACN;AAAA,EACF;AAEA,QAAM,WAAW,KAAK,KAAK,YAAY;AAAA,IACrC,SAAS,KAAK;AAAA,IACd,GAAG;AAAA,EACL,CAAC;AACD,QAAM,OAAO,YAAY,KAAK,SAAS,QAAQ;AAE/C,SAAO;AACT;AAIA,IAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAM,UAAU,CAAC,KAAK,KAAK,KAAK,KAAK,MAAM,MAAM,MAAM,IAAI;AAC3D,QAAM,WAAW,EAAE,IAAI,GAAG,IAAI,GAAG;AAEjC,QAAM,cAAc,qBAAqB;AACzC,QAAM,aAAa,iBAAiB;AAEpC,QAAM,QAAQ,YAAY,SAAS,QAAQ;AAC3C,MAAI,MAAM,OAAO;AAAK,UAAM;AAC5B,MAAI,MAAM,OAAO;AAAM,UAAM;AAE7B,QAAM,MAAM,UAAU,OAAO,WAAW;AACxC,MAAI,IAAI,OAAO;AAAK,UAAM;AAC1B,MAAI,IAAI,OAAO;AAAM,UAAM;AAE3B,QAAM,OAAO,UAAU,OAAO,UAAU;AACxC,MAAI,KAAK,OAAO;AAAK,UAAM;AAC3B,MAAI,KAAK,OAAO;AAAM,UAAM;AAE5B,QAAM,QAAQ,UAAU,OAAO,YAAY,EAAE,UAAU,EAAE,CAAC;AAC1D,MAAI,MAAM,OAAO;AAAK,UAAM;AAC5B,MAAI,MAAM,OAAO;AAAM,UAAM;AAC/B;",
   "names": []
 }

package/dist/esm/index.js

@@ -30,15 +30,25 @@ function addChildren(themes, getChildren) {
   }
   return out;
 }
+const skipMask = (template, { skip }) => {
+  if (!skip)
+    return template;
+  return Object.fromEntries(
+    Object.entries(template).filter(([k]) => !(k in skip))
+  );
+};
 const createShiftMask = ({ inverse } = {}) => {
-  return (template, { skip, max: maxIn, palette, min = 0, strength = 1 }) => {
+  return (template, opts) => {
+    const { override, max: maxIn, palette, min = 0, strength = 1 } = opts;
     const values = Object.entries(template);
     const max = maxIn ?? (palette ? Object.values(palette).length - 1 : Infinity);
     const out = {};
     for (const [key, value] of values) {
       if (typeof value === "string")
         continue;
-      if (skip && key in skip) {
+      if (typeof (override == null ? void 0 : override[key]) === "number") {
+        const overrideShift = override[key];
+        out[key] = value + overrideShift;
         continue;
       }
       const isPositive = value === 0 ? !isMinusZero(value) : value >= 0;
@@ -48,7 +58,7 @@ const createShiftMask = ({ inverse } = {}) => {
       const clamped = isPositive ? Math.max(min, Math.min(max, next)) : Math.min(-min, Math.max(-max, next));
       out[key] = clamped;
     }
-    return out;
+    return skipMask(out, opts);
   };
 };
 const createWeakenMask = () => createShiftMask();
@@ -56,7 +66,6 @@ const createStrengthenMask = () => createShiftMask({ inverse: true });
 function isMinusZero(value) {
   return 1 / value === -Infinity;
 }
-const MaskKeyCache = /* @__PURE__ */ new WeakMap();
 function applyMask(theme, mask, options = {}) {
   const info = THEME_INFO.get(theme);
   if (!info) {
@@ -64,18 +73,11 @@ function applyMask(theme, mask, options = {}) {
       process.env.NODE_ENV !== "production" ? `No info found for theme, you must pass the theme created by createThemeFromPalette directly to extendTheme` : `\u274C Err2`
     );
   }
-  const maskKey = MaskKeyCache.get(mask) ?? `${Math.random()}`;
-  MaskKeyCache.set(mask, maskKey);
-  const key = `${maskKey}${JSON.stringify(options)}`;
-  if (info.cache.has(key)) {
-    return info.cache.get(key);
-  }
   const template = mask(info.definition, {
     palette: info.palette,
     ...options
   });
   const next = createTheme(info.palette, template);
-  info.cache.set(key, next);
   return next;
 }
 if (process.env.NODE_ENV === "development") {
@@ -110,6 +112,7 @@ export {
   createShiftMask,
   createStrengthenMask,
   createTheme,
-  createWeakenMask
+  createWeakenMask,
+  skipMask
 };
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.tsx"],
-  "sourcesContent": ["import type { Variable } from '@tamagui/web'\n\nexport type ThemeMask = Record<string, string | number>\nexport type Palette = string[]\n\nexport type MaskOptions = {\n  palette?: Palette\n  skip?: Partial<ThemeMask>\n  strength?: number\n  max?: number\n  min?: number\n}\n\ntype GenericTheme = { [key: string]: string | Variable }\ntype CreateMask = <A extends ThemeMask>(template: A, options: MaskOptions) => A\n\nconst THEME_INFO = new WeakMap<\n  any,\n  { palette: Palette; definition: ThemeMask; cache: Map<any, any> }\n>()\n\nexport function createTheme<\n  Definition extends ThemeMask,\n  Extras extends Record<string, string> = {}\n>(\n  palette: Palette,\n  definition: Definition,\n  options?: {\n    nonInheritedValues?: Extras\n  }\n): {\n  [key in keyof Definition | keyof Extras]: string\n} {\n  const theme = {\n    ...(Object.fromEntries(\n      Object.entries(definition).map(([key, offset]) => {\n        return [key, getValue(palette, offset)]\n      })\n    ) as any),\n    ...options?.nonInheritedValues,\n  }\n  THEME_INFO.set(theme, { palette, definition, cache: new Map() })\n  return theme\n}\n\nconst getValue = (palette: Palette, value: string | number) => {\n  if (typeof value === 'string') return value\n  const max = palette.length - 1\n  const isPositive = value === 0 ? !isMinusZero(value) : value >= 0\n  const next = isPositive ? value : max + value\n  const index = Math.min(Math.max(0, next), max)\n  return palette[index]\n}\n\ntype SubThemeKeys<ParentKeys, ChildKeys> = `${ParentKeys extends string\n  ? ParentKeys\n  : never}_${ChildKeys extends string ? ChildKeys : never}`\n\ntype ChildGetter<Name extends string | number | symbol, Theme extends GenericTheme> = (\n  name: Name,\n  theme: Theme\n) => { [key: string]: Theme }\n\nexport function addChildren<\n  Themes extends { [key: string]: GenericTheme },\n  GetChildren extends ChildGetter<keyof Themes, Themes[keyof Themes]>\n>(\n  themes: Themes,\n  getChildren: GetChildren\n): Themes & {\n  [key in SubThemeKeys<keyof Themes, keyof ReturnType<GetChildren>>]: Themes[keyof Themes]\n} {\n  const out = { ...themes }\n  for (const key in themes) {\n    const subThemes = getChildren(key, themes[key])\n    for (const sKey in subThemes) {\n      out[`${key}_${sKey}`] = subThemes[sKey] as any\n    }\n  }\n  return out as any\n}\n\nexport const createShiftMask = ({ inverse }: { inverse?: boolean } = {}) => {\n  return ((template, { skip, max: maxIn, palette, min = 0, strength = 1 }) => {\n    const values = Object.entries(template)\n    const max = maxIn ?? (palette ? Object.values(palette).length - 1 : Infinity)\n    const out = {}\n    for (const [key, value] of values) {\n      if (typeof value === 'string') continue\n      if (skip && key in skip) {\n        continue\n      }\n      const isPositive = value === 0 ? !isMinusZero(value) : value >= 0\n      const direction = isPositive ? 1 : -1\n      const invert = inverse ? -1 : 1\n      const next = value + strength * direction * invert\n      const clamped = isPositive\n        ? Math.max(min, Math.min(max, next))\n        : Math.min(-min, Math.max(-max, next))\n\n      out[key] = clamped\n    }\n    return out as typeof template\n  }) as CreateMask\n}\n\nexport const createWeakenMask = () => createShiftMask()\nexport const createStrengthenMask = () => createShiftMask({ inverse: true })\n\nfunction isMinusZero(value) {\n  return 1 / value === -Infinity\n}\n\nconst MaskKeyCache = new WeakMap<any, string>()\n\nexport function applyMask<Theme extends GenericTheme>(\n  theme: Theme,\n  mask: CreateMask,\n  options: MaskOptions = {}\n): Theme {\n  const info = THEME_INFO.get(theme)\n  if (!info) {\n    throw new Error(\n      process.env.NODE_ENV !== 'production'\n        ? `No info found for theme, you must pass the theme created by createThemeFromPalette directly to extendTheme`\n        : `\u274C Err2`\n    )\n  }\n\n  const maskKey = MaskKeyCache.get(mask) ?? `${Math.random()}`\n  MaskKeyCache.set(mask, maskKey)\n\n  const key = `${maskKey}${JSON.stringify(options)}`\n\n  if (info.cache.has(key)) {\n    return info.cache.get(key)\n  }\n\n  const template = mask(info.definition, {\n    palette: info.palette,\n    ...options,\n  })\n  const next = createTheme(info.palette, template) as Theme\n\n  info.cache.set(key, next)\n\n  return next\n}\n\n// --- tests ---\n\nif (process.env.NODE_ENV === 'development') {\n  const palette = ['0', '1', '2', '3', '-3', '-2', '-1', '-0']\n  const template = { bg: 1, fg: -1 }\n\n  const stongerMask = createStrengthenMask()\n  const weakerMask = createWeakenMask()\n\n  const theme = createTheme(palette, template)\n  if (theme.bg !== '1') throw `\u274C`\n  if (theme.fg !== '-1') throw `\u274C`\n\n  const str = applyMask(theme, stongerMask)\n  if (str.bg !== '0') throw `\u274C`\n  if (str.fg !== '-0') throw `\u274C`\n\n  const weak = applyMask(theme, weakerMask)\n  if (weak.bg !== '2') throw `\u274C`\n  if (weak.fg !== '-2') throw `\u274C`\n\n  const weak2 = applyMask(theme, weakerMask, { strength: 2 })\n  if (weak2.bg !== '3') throw `\u274C`\n  if (weak2.fg !== '-3') throw `\u274C`\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { Variable } from '@tamagui/web'\n\nexport type ThemeMask = Record<string, string | number>\nexport type Palette = string[]\n\nexport type MaskOptions = {\n  palette?: Palette\n  override?: Partial<ThemeMask>\n  skip?: Partial<ThemeMask>\n  strength?: number\n  max?: number\n  min?: number\n}\n\ntype GenericTheme = { [key: string]: string | Variable }\ntype CreateMask = <A extends ThemeMask>(template: A, options: MaskOptions) => A\n\nconst THEME_INFO = new WeakMap<\n  any,\n  { palette: Palette; definition: ThemeMask; cache: Map<any, any> }\n>()\n\nexport function createTheme<\n  Definition extends ThemeMask,\n  Extras extends Record<string, string> = {}\n>(\n  palette: Palette,\n  definition: Definition,\n  options?: {\n    nonInheritedValues?: Extras\n  }\n): {\n  [key in keyof Definition | keyof Extras]: string\n} {\n  const theme = {\n    ...(Object.fromEntries(\n      Object.entries(definition).map(([key, offset]) => {\n        return [key, getValue(palette, offset)]\n      })\n    ) as any),\n    ...options?.nonInheritedValues,\n  }\n  THEME_INFO.set(theme, { palette, definition, cache: new Map() })\n  return theme\n}\n\nconst getValue = (palette: Palette, value: string | number) => {\n  if (typeof value === 'string') return value\n  const max = palette.length - 1\n  const isPositive = value === 0 ? !isMinusZero(value) : value >= 0\n  const next = isPositive ? value : max + value\n  const index = Math.min(Math.max(0, next), max)\n  return palette[index]\n}\n\ntype SubThemeKeys<ParentKeys, ChildKeys> = `${ParentKeys extends string\n  ? ParentKeys\n  : never}_${ChildKeys extends string ? ChildKeys : never}`\n\ntype ChildGetter<Name extends string | number | symbol, Theme extends GenericTheme> = (\n  name: Name,\n  theme: Theme\n) => { [key: string]: Theme }\n\nexport function addChildren<\n  Themes extends { [key: string]: GenericTheme },\n  GetChildren extends ChildGetter<keyof Themes, Themes[keyof Themes]>\n>(\n  themes: Themes,\n  getChildren: GetChildren\n): Themes & {\n  [key in SubThemeKeys<keyof Themes, keyof ReturnType<GetChildren>>]: Themes[keyof Themes]\n} {\n  const out = { ...themes }\n  for (const key in themes) {\n    const subThemes = getChildren(key, themes[key])\n    for (const sKey in subThemes) {\n      out[`${key}_${sKey}`] = subThemes[sKey] as any\n    }\n  }\n  return out as any\n}\n\nexport const skipMask: CreateMask = (template, { skip }) => {\n  if (!skip) return template\n  return Object.fromEntries(\n    Object.entries(template).filter(([k]) => !(k in skip))\n  ) as typeof template\n}\n\nexport const createShiftMask = ({ inverse }: { inverse?: boolean } = {}) => {\n  return ((template, opts) => {\n    const { override, max: maxIn, palette, min = 0, strength = 1 } = opts\n    const values = Object.entries(template)\n    const max = maxIn ?? (palette ? Object.values(palette).length - 1 : Infinity)\n    const out = {}\n    for (const [key, value] of values) {\n      if (typeof value === 'string') continue\n      if (typeof override?.[key] === 'number') {\n        const overrideShift = override[key] as number\n        out[key] = value + overrideShift\n        continue\n      }\n      const isPositive = value === 0 ? !isMinusZero(value) : value >= 0\n      const direction = isPositive ? 1 : -1\n      const invert = inverse ? -1 : 1\n      const next = value + strength * direction * invert\n      const clamped = isPositive\n        ? Math.max(min, Math.min(max, next))\n        : Math.min(-min, Math.max(-max, next))\n\n      out[key] = clamped\n    }\n\n    return skipMask(out, opts) as typeof template\n  }) as CreateMask\n}\n\nexport const createWeakenMask = () => createShiftMask()\nexport const createStrengthenMask = () => createShiftMask({ inverse: true })\n\nfunction isMinusZero(value) {\n  return 1 / value === -Infinity\n}\n\nexport function applyMask<Theme extends GenericTheme>(\n  theme: Theme,\n  mask: CreateMask,\n  options: MaskOptions = {}\n): Theme {\n  const info = THEME_INFO.get(theme)\n  if (!info) {\n    throw new Error(\n      process.env.NODE_ENV !== 'production'\n        ? `No info found for theme, you must pass the theme created by createThemeFromPalette directly to extendTheme`\n        : `\u274C Err2`\n    )\n  }\n\n  const template = mask(info.definition, {\n    palette: info.palette,\n    ...options,\n  })\n  const next = createTheme(info.palette, template) as Theme\n\n  return next\n}\n\n// --- tests ---\n\nif (process.env.NODE_ENV === 'development') {\n  const palette = ['0', '1', '2', '3', '-3', '-2', '-1', '-0']\n  const template = { bg: 1, fg: -1 }\n\n  const stongerMask = createStrengthenMask()\n  const weakerMask = createWeakenMask()\n\n  const theme = createTheme(palette, template)\n  if (theme.bg !== '1') throw `\u274C`\n  if (theme.fg !== '-1') throw `\u274C`\n\n  const str = applyMask(theme, stongerMask)\n  if (str.bg !== '0') throw `\u274C`\n  if (str.fg !== '-0') throw `\u274C`\n\n  const weak = applyMask(theme, weakerMask)\n  if (weak.bg !== '2') throw `\u274C`\n  if (weak.fg !== '-2') throw `\u274C`\n\n  const weak2 = applyMask(theme, weakerMask, { strength: 2 })\n  if (weak2.bg !== '3') throw `\u274C`\n  if (weak2.fg !== '-3') throw `\u274C`\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/esm/index.mjs

@@ -30,15 +30,25 @@ function addChildren(themes, getChildren) {
   }
   return out;
 }
+const skipMask = (template, { skip }) => {
+  if (!skip)
+    return template;
+  return Object.fromEntries(
+    Object.entries(template).filter(([k]) => !(k in skip))
+  );
+};
 const createShiftMask = ({ inverse } = {}) => {
-  return (template, { skip, max: maxIn, palette, min = 0, strength = 1 }) => {
+  return (template, opts) => {
+    const { override, max: maxIn, palette, min = 0, strength = 1 } = opts;
     const values = Object.entries(template);
     const max = maxIn ?? (palette ? Object.values(palette).length - 1 : Infinity);
     const out = {};
     for (const [key, value] of values) {
       if (typeof value === "string")
         continue;
-      if (skip && key in skip) {
+      if (typeof (override == null ? void 0 : override[key]) === "number") {
+        const overrideShift = override[key];
+        out[key] = value + overrideShift;
         continue;
       }
       const isPositive = value === 0 ? !isMinusZero(value) : value >= 0;
@@ -48,7 +58,7 @@ const createShiftMask = ({ inverse } = {}) => {
       const clamped = isPositive ? Math.max(min, Math.min(max, next)) : Math.min(-min, Math.max(-max, next));
       out[key] = clamped;
     }
-    return out;
+    return skipMask(out, opts);
   };
 };
 const createWeakenMask = () => createShiftMask();
@@ -56,7 +66,6 @@ const createStrengthenMask = () => createShiftMask({ inverse: true });
 function isMinusZero(value) {
   return 1 / value === -Infinity;
 }
-const MaskKeyCache = /* @__PURE__ */ new WeakMap();
 function applyMask(theme, mask, options = {}) {
   const info = THEME_INFO.get(theme);
   if (!info) {
@@ -64,18 +73,11 @@ function applyMask(theme, mask, options = {}) {
       process.env.NODE_ENV !== "production" ? `No info found for theme, you must pass the theme created by createThemeFromPalette directly to extendTheme` : `\u274C Err2`
     );
   }
-  const maskKey = MaskKeyCache.get(mask) ?? `${Math.random()}`;
-  MaskKeyCache.set(mask, maskKey);
-  const key = `${maskKey}${JSON.stringify(options)}`;
-  if (info.cache.has(key)) {
-    return info.cache.get(key);
-  }
   const template = mask(info.definition, {
     palette: info.palette,
     ...options
   });
   const next = createTheme(info.palette, template);
-  info.cache.set(key, next);
   return next;
 }
 if (process.env.NODE_ENV === "development") {
@@ -110,6 +112,7 @@ export {
   createShiftMask,
   createStrengthenMask,
   createTheme,
-  createWeakenMask
+  createWeakenMask,
+  skipMask
 };
 //# sourceMappingURL=index.mjs.map

package/dist/esm/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.tsx"],
-  "sourcesContent": ["import type { Variable } from '@tamagui/web'\n\nexport type ThemeMask = Record<string, string | number>\nexport type Palette = string[]\n\nexport type MaskOptions = {\n  palette?: Palette\n  skip?: Partial<ThemeMask>\n  strength?: number\n  max?: number\n  min?: number\n}\n\ntype GenericTheme = { [key: string]: string | Variable }\ntype CreateMask = <A extends ThemeMask>(template: A, options: MaskOptions) => A\n\nconst THEME_INFO = new WeakMap<\n  any,\n  { palette: Palette; definition: ThemeMask; cache: Map<any, any> }\n>()\n\nexport function createTheme<\n  Definition extends ThemeMask,\n  Extras extends Record<string, string> = {}\n>(\n  palette: Palette,\n  definition: Definition,\n  options?: {\n    nonInheritedValues?: Extras\n  }\n): {\n  [key in keyof Definition | keyof Extras]: string\n} {\n  const theme = {\n    ...(Object.fromEntries(\n      Object.entries(definition).map(([key, offset]) => {\n        return [key, getValue(palette, offset)]\n      })\n    ) as any),\n    ...options?.nonInheritedValues,\n  }\n  THEME_INFO.set(theme, { palette, definition, cache: new Map() })\n  return theme\n}\n\nconst getValue = (palette: Palette, value: string | number) => {\n  if (typeof value === 'string') return value\n  const max = palette.length - 1\n  const isPositive = value === 0 ? !isMinusZero(value) : value >= 0\n  const next = isPositive ? value : max + value\n  const index = Math.min(Math.max(0, next), max)\n  return palette[index]\n}\n\ntype SubThemeKeys<ParentKeys, ChildKeys> = `${ParentKeys extends string\n  ? ParentKeys\n  : never}_${ChildKeys extends string ? ChildKeys : never}`\n\ntype ChildGetter<Name extends string | number | symbol, Theme extends GenericTheme> = (\n  name: Name,\n  theme: Theme\n) => { [key: string]: Theme }\n\nexport function addChildren<\n  Themes extends { [key: string]: GenericTheme },\n  GetChildren extends ChildGetter<keyof Themes, Themes[keyof Themes]>\n>(\n  themes: Themes,\n  getChildren: GetChildren\n): Themes & {\n  [key in SubThemeKeys<keyof Themes, keyof ReturnType<GetChildren>>]: Themes[keyof Themes]\n} {\n  const out = { ...themes }\n  for (const key in themes) {\n    const subThemes = getChildren(key, themes[key])\n    for (const sKey in subThemes) {\n      out[`${key}_${sKey}`] = subThemes[sKey] as any\n    }\n  }\n  return out as any\n}\n\nexport const createShiftMask = ({ inverse }: { inverse?: boolean } = {}) => {\n  return ((template, { skip, max: maxIn, palette, min = 0, strength = 1 }) => {\n    const values = Object.entries(template)\n    const max = maxIn ?? (palette ? Object.values(palette).length - 1 : Infinity)\n    const out = {}\n    for (const [key, value] of values) {\n      if (typeof value === 'string') continue\n      if (skip && key in skip) {\n        continue\n      }\n      const isPositive = value === 0 ? !isMinusZero(value) : value >= 0\n      const direction = isPositive ? 1 : -1\n      const invert = inverse ? -1 : 1\n      const next = value + strength * direction * invert\n      const clamped = isPositive\n        ? Math.max(min, Math.min(max, next))\n        : Math.min(-min, Math.max(-max, next))\n\n      out[key] = clamped\n    }\n    return out as typeof template\n  }) as CreateMask\n}\n\nexport const createWeakenMask = () => createShiftMask()\nexport const createStrengthenMask = () => createShiftMask({ inverse: true })\n\nfunction isMinusZero(value) {\n  return 1 / value === -Infinity\n}\n\nconst MaskKeyCache = new WeakMap<any, string>()\n\nexport function applyMask<Theme extends GenericTheme>(\n  theme: Theme,\n  mask: CreateMask,\n  options: MaskOptions = {}\n): Theme {\n  const info = THEME_INFO.get(theme)\n  if (!info) {\n    throw new Error(\n      process.env.NODE_ENV !== 'production'\n        ? `No info found for theme, you must pass the theme created by createThemeFromPalette directly to extendTheme`\n        : `\u274C Err2`\n    )\n  }\n\n  const maskKey = MaskKeyCache.get(mask) ?? `${Math.random()}`\n  MaskKeyCache.set(mask, maskKey)\n\n  const key = `${maskKey}${JSON.stringify(options)}`\n\n  if (info.cache.has(key)) {\n    return info.cache.get(key)\n  }\n\n  const template = mask(info.definition, {\n    palette: info.palette,\n    ...options,\n  })\n  const next = createTheme(info.palette, template) as Theme\n\n  info.cache.set(key, next)\n\n  return next\n}\n\n// --- tests ---\n\nif (process.env.NODE_ENV === 'development') {\n  const palette = ['0', '1', '2', '3', '-3', '-2', '-1', '-0']\n  const template = { bg: 1, fg: -1 }\n\n  const stongerMask = createStrengthenMask()\n  const weakerMask = createWeakenMask()\n\n  const theme = createTheme(palette, template)\n  if (theme.bg !== '1') throw `\u274C`\n  if (theme.fg !== '-1') throw `\u274C`\n\n  const str = applyMask(theme, stongerMask)\n  if (str.bg !== '0') throw `\u274C`\n  if (str.fg !== '-0') throw `\u274C`\n\n  const weak = applyMask(theme, weakerMask)\n  if (weak.bg !== '2') throw `\u274C`\n  if (weak.fg !== '-2') throw `\u274C`\n\n  const weak2 = applyMask(theme, weakerMask, { strength: 2 })\n  if (weak2.bg !== '3') throw `\u274C`\n  if (weak2.fg !== '-3') throw `\u274C`\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { Variable } from '@tamagui/web'\n\nexport type ThemeMask = Record<string, string | number>\nexport type Palette = string[]\n\nexport type MaskOptions = {\n  palette?: Palette\n  override?: Partial<ThemeMask>\n  skip?: Partial<ThemeMask>\n  strength?: number\n  max?: number\n  min?: number\n}\n\ntype GenericTheme = { [key: string]: string | Variable }\ntype CreateMask = <A extends ThemeMask>(template: A, options: MaskOptions) => A\n\nconst THEME_INFO = new WeakMap<\n  any,\n  { palette: Palette; definition: ThemeMask; cache: Map<any, any> }\n>()\n\nexport function createTheme<\n  Definition extends ThemeMask,\n  Extras extends Record<string, string> = {}\n>(\n  palette: Palette,\n  definition: Definition,\n  options?: {\n    nonInheritedValues?: Extras\n  }\n): {\n  [key in keyof Definition | keyof Extras]: string\n} {\n  const theme = {\n    ...(Object.fromEntries(\n      Object.entries(definition).map(([key, offset]) => {\n        return [key, getValue(palette, offset)]\n      })\n    ) as any),\n    ...options?.nonInheritedValues,\n  }\n  THEME_INFO.set(theme, { palette, definition, cache: new Map() })\n  return theme\n}\n\nconst getValue = (palette: Palette, value: string | number) => {\n  if (typeof value === 'string') return value\n  const max = palette.length - 1\n  const isPositive = value === 0 ? !isMinusZero(value) : value >= 0\n  const next = isPositive ? value : max + value\n  const index = Math.min(Math.max(0, next), max)\n  return palette[index]\n}\n\ntype SubThemeKeys<ParentKeys, ChildKeys> = `${ParentKeys extends string\n  ? ParentKeys\n  : never}_${ChildKeys extends string ? ChildKeys : never}`\n\ntype ChildGetter<Name extends string | number | symbol, Theme extends GenericTheme> = (\n  name: Name,\n  theme: Theme\n) => { [key: string]: Theme }\n\nexport function addChildren<\n  Themes extends { [key: string]: GenericTheme },\n  GetChildren extends ChildGetter<keyof Themes, Themes[keyof Themes]>\n>(\n  themes: Themes,\n  getChildren: GetChildren\n): Themes & {\n  [key in SubThemeKeys<keyof Themes, keyof ReturnType<GetChildren>>]: Themes[keyof Themes]\n} {\n  const out = { ...themes }\n  for (const key in themes) {\n    const subThemes = getChildren(key, themes[key])\n    for (const sKey in subThemes) {\n      out[`${key}_${sKey}`] = subThemes[sKey] as any\n    }\n  }\n  return out as any\n}\n\nexport const skipMask: CreateMask = (template, { skip }) => {\n  if (!skip) return template\n  return Object.fromEntries(\n    Object.entries(template).filter(([k]) => !(k in skip))\n  ) as typeof template\n}\n\nexport const createShiftMask = ({ inverse }: { inverse?: boolean } = {}) => {\n  return ((template, opts) => {\n    const { override, max: maxIn, palette, min = 0, strength = 1 } = opts\n    const values = Object.entries(template)\n    const max = maxIn ?? (palette ? Object.values(palette).length - 1 : Infinity)\n    const out = {}\n    for (const [key, value] of values) {\n      if (typeof value === 'string') continue\n      if (typeof override?.[key] === 'number') {\n        const overrideShift = override[key] as number\n        out[key] = value + overrideShift\n        continue\n      }\n      const isPositive = value === 0 ? !isMinusZero(value) : value >= 0\n      const direction = isPositive ? 1 : -1\n      const invert = inverse ? -1 : 1\n      const next = value + strength * direction * invert\n      const clamped = isPositive\n        ? Math.max(min, Math.min(max, next))\n        : Math.min(-min, Math.max(-max, next))\n\n      out[key] = clamped\n    }\n\n    return skipMask(out, opts) as typeof template\n  }) as CreateMask\n}\n\nexport const createWeakenMask = () => createShiftMask()\nexport const createStrengthenMask = () => createShiftMask({ inverse: true })\n\nfunction isMinusZero(value) {\n  return 1 / value === -Infinity\n}\n\nexport function applyMask<Theme extends GenericTheme>(\n  theme: Theme,\n  mask: CreateMask,\n  options: MaskOptions = {}\n): Theme {\n  const info = THEME_INFO.get(theme)\n  if (!info) {\n    throw new Error(\n      process.env.NODE_ENV !== 'production'\n        ? `No info found for theme, you must pass the theme created by createThemeFromPalette directly to extendTheme`\n        : `\u274C Err2`\n    )\n  }\n\n  const template = mask(info.definition, {\n    palette: info.palette,\n    ...options,\n  })\n  const next = createTheme(info.palette, template) as Theme\n\n  return next\n}\n\n// --- tests ---\n\nif (process.env.NODE_ENV === 'development') {\n  const palette = ['0', '1', '2', '3', '-3', '-2', '-1', '-0']\n  const template = { bg: 1, fg: -1 }\n\n  const stongerMask = createStrengthenMask()\n  const weakerMask = createWeakenMask()\n\n  const theme = createTheme(palette, template)\n  if (theme.bg !== '1') throw `\u274C`\n  if (theme.fg !== '-1') throw `\u274C`\n\n  const str = applyMask(theme, stongerMask)\n  if (str.bg !== '0') throw `\u274C`\n  if (str.fg !== '-0') throw `\u274C`\n\n  const weak = applyMask(theme, weakerMask)\n  if (weak.bg !== '2') throw `\u274C`\n  if (weak.fg !== '-2') throw `\u274C`\n\n  const weak2 = applyMask(theme, weakerMask, { strength: 2 })\n  if (weak2.bg !== '3') throw `\u274C`\n  if (weak2.fg !== '-3') throw `\u274C`\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/create-theme",
-  "version": "1.14.8",
+  "version": "1.15.0",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -14,7 +14,7 @@
     "build": "tamagui-build",
     "watch": "tamagui-build --watch",
     "lint": "../../node_modules/.bin/rome check src",
-    "lint:fix": "../../node_modules/.bin/rome check --apply-suggested src",
+    "lint:fix": "../../node_modules/.bin/rome check --apply src",
     "clean": "tamagui-build clean",
     "clean:build": "tamagui-build clean:build"
   },
@@ -27,10 +27,10 @@
     }
   },
   "dependencies": {
-    "@tamagui/web": "1.14.8"
+    "@tamagui/web": "1.15.0"
   },
   "devDependencies": {
-    "@tamagui/build": "1.14.8"
+    "@tamagui/build": "1.15.0"
   },
   "publishConfig": {
     "access": "public"

package/src/index.tsx

@@ -5,6 +5,7 @@ export type Palette = string[]
 
 export type MaskOptions = {
   palette?: Palette
+  override?: Partial<ThemeMask>
   skip?: Partial<ThemeMask>
   strength?: number
   max?: number
@@ -80,14 +81,24 @@ export function addChildren<
   return out as any
 }
 
+export const skipMask: CreateMask = (template, { skip }) => {
+  if (!skip) return template
+  return Object.fromEntries(
+    Object.entries(template).filter(([k]) => !(k in skip))
+  ) as typeof template
+}
+
 export const createShiftMask = ({ inverse }: { inverse?: boolean } = {}) => {
-  return ((template, { skip, max: maxIn, palette, min = 0, strength = 1 }) => {
+  return ((template, opts) => {
+    const { override, max: maxIn, palette, min = 0, strength = 1 } = opts
     const values = Object.entries(template)
     const max = maxIn ?? (palette ? Object.values(palette).length - 1 : Infinity)
     const out = {}
     for (const [key, value] of values) {
       if (typeof value === 'string') continue
-      if (skip && key in skip) {
+      if (typeof override?.[key] === 'number') {
+        const overrideShift = override[key] as number
+        out[key] = value + overrideShift
         continue
       }
       const isPositive = value === 0 ? !isMinusZero(value) : value >= 0
@@ -100,7 +111,8 @@ export const createShiftMask = ({ inverse }: { inverse?: boolean } = {}) => {
 
       out[key] = clamped
     }
-    return out as typeof template
+
+    return skipMask(out, opts) as typeof template
   }) as CreateMask
 }
 
@@ -111,8 +123,6 @@ function isMinusZero(value) {
   return 1 / value === -Infinity
 }
 
-const MaskKeyCache = new WeakMap<any, string>()
-
 export function applyMask<Theme extends GenericTheme>(
   theme: Theme,
   mask: CreateMask,
@@ -127,23 +137,12 @@ export function applyMask<Theme extends GenericTheme>(
     )
   }
 
-  const maskKey = MaskKeyCache.get(mask) ?? `${Math.random()}`
-  MaskKeyCache.set(mask, maskKey)
-
-  const key = `${maskKey}${JSON.stringify(options)}`
-
-  if (info.cache.has(key)) {
-    return info.cache.get(key)
-  }
-
   const template = mask(info.definition, {
     palette: info.palette,
     ...options,
   })
   const next = createTheme(info.palette, template) as Theme
 
-  info.cache.set(key, next)
-
   return next
 }
 

package/types/index.d.ts

@@ -3,6 +3,7 @@ export type ThemeMask = Record<string, string | number>;
 export type Palette = string[];
 export type MaskOptions = {
     palette?: Palette;
+    override?: Partial<ThemeMask>;
     skip?: Partial<ThemeMask>;
     strength?: number;
     max?: number;
@@ -26,6 +27,7 @@ export declare function addChildren<Themes extends {
 }, GetChildren extends ChildGetter<keyof Themes, Themes[keyof Themes]>>(themes: Themes, getChildren: GetChildren): Themes & {
     [key in SubThemeKeys<keyof Themes, keyof ReturnType<GetChildren>>]: Themes[keyof Themes];
 };
+export declare const skipMask: CreateMask;
 export declare const createShiftMask: ({ inverse }?: {
     inverse?: boolean | undefined;
 }) => CreateMask;

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAE5C,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAA;AACvD,MAAM,MAAM,OAAO,GAAG,MAAM,EAAE,CAAA;AAE9B,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,YAAY,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,CAAA;CAAE,CAAA;AACxD,KAAK,UAAU,GAAG,CAAC,CAAC,SAAS,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,WAAW,KAAK,CAAC,CAAA;AAO/E,wBAAgB,WAAW,CACzB,UAAU,SAAS,SAAS,EAC5B,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,EAE1C,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,EACtB,OAAO,CAAC,EAAE;IACR,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B,GACA;KACA,GAAG,IAAI,MAAM,UAAU,GAAG,MAAM,MAAM,GAAG,MAAM;CACjD,CAWA;AAWD,KAAK,YAAY,CAAC,UAAU,EAAE,SAAS,IAAI,GAAG,UAAU,SAAS,MAAM,GACnE,UAAU,GACV,KAAK,IAAI,SAAS,SAAS,MAAM,GAAG,SAAS,GAAG,KAAK,EAAE,CAAA;AAE3D,KAAK,WAAW,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,KAAK,SAAS,YAAY,IAAI,CACpF,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,KACT;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAA;CAAE,CAAA;AAE7B,wBAAgB,WAAW,CACzB,MAAM,SAAS;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;CAAE,EAC9C,WAAW,SAAS,WAAW,CAAC,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,MAAM,CAAC,CAAC,EAEnE,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,GACvB,MAAM,GAAG;KACT,GAAG,IAAI,YAAY,CAAC,MAAM,MAAM,EAAE,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,MAAM,CAAC;CACzF,CASA;AAED,eAAO,MAAM,eAAe;;gBAsB3B,CAAA;AAED,eAAO,MAAM,gBAAgB,kBAA0B,CAAA;AACvD,eAAO,MAAM,oBAAoB,kBAA2C,CAAA;AAQ5E,wBAAgB,SAAS,CAAC,KAAK,SAAS,YAAY,EAClD,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,UAAU,EAChB,OAAO,GAAE,WAAgB,GACxB,KAAK,CA4BP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAE5C,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAA;AACvD,MAAM,MAAM,OAAO,GAAG,MAAM,EAAE,CAAA;AAE9B,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IAC7B,IAAI,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,YAAY,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,CAAA;CAAE,CAAA;AACxD,KAAK,UAAU,GAAG,CAAC,CAAC,SAAS,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,WAAW,KAAK,CAAC,CAAA;AAO/E,wBAAgB,WAAW,CACzB,UAAU,SAAS,SAAS,EAC5B,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,EAE1C,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,EACtB,OAAO,CAAC,EAAE;IACR,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC5B,GACA;KACA,GAAG,IAAI,MAAM,UAAU,GAAG,MAAM,MAAM,GAAG,MAAM;CACjD,CAWA;AAWD,KAAK,YAAY,CAAC,UAAU,EAAE,SAAS,IAAI,GAAG,UAAU,SAAS,MAAM,GACnE,UAAU,GACV,KAAK,IAAI,SAAS,SAAS,MAAM,GAAG,SAAS,GAAG,KAAK,EAAE,CAAA;AAE3D,KAAK,WAAW,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,KAAK,SAAS,YAAY,IAAI,CACpF,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,KACT;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAA;CAAE,CAAA;AAE7B,wBAAgB,WAAW,CACzB,MAAM,SAAS;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;CAAE,EAC9C,WAAW,SAAS,WAAW,CAAC,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,MAAM,CAAC,CAAC,EAEnE,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,GACvB,MAAM,GAAG;KACT,GAAG,IAAI,YAAY,CAAC,MAAM,MAAM,EAAE,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,MAAM,CAAC;CACzF,CASA;AAED,eAAO,MAAM,QAAQ,EAAE,UAKtB,CAAA;AAED,eAAO,MAAM,eAAe;;gBA0B3B,CAAA;AAED,eAAO,MAAM,gBAAgB,kBAA0B,CAAA;AACvD,eAAO,MAAM,oBAAoB,kBAA2C,CAAA;AAM5E,wBAAgB,SAAS,CAAC,KAAK,SAAS,YAAY,EAClD,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,UAAU,EAChB,OAAO,GAAE,WAAgB,GACxB,KAAK,CAiBP"}