@udixio/theme 2.1.1 → 2.1.3

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 2.1.3 (2025-11-05)
+
+### 🩹 Fixes
+
+- **theme:** simplify tone calculation and enhance custom palette handling ([b7bb339](https://github.com/Udixio/UI/commit/b7bb339))
+
+### ❤️ Thank You
+
+- Joël VIGREUX
+
+## 2.1.2 (2025-10-17)
+
+### 🩹 Fixes
+
+- **theme, plugins-tailwind:** improve container caching and enhance debugging logs ([a8f955d](https://github.com/Udixio/UI/commit/a8f955d))
+
+### ❤️ Thank You
+
+- Joël VIGREUX
+
 ## 2.1.1 (2025-10-17)
 
 ### 🩹 Fixes

package/dist/app.container.d.ts

@@ -1,4 +1,6 @@
-import { Resolver } from 'awilix';
+import { AwilixContainer, Resolver } from 'awilix';
 export type Module = Record<string, Resolver<any>>;
-export declare const AppContainer: () => import('awilix').AwilixContainer<any>;
+export declare const AppContainer: (options?: {
+    fresh?: boolean;
+}) => AwilixContainer<any>;
 //# sourceMappingURL=app.container.d.ts.map

package/dist/app.container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.container.d.ts","sourceRoot":"","sources":["../src/app.container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAOlE,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAEnD,eAAO,MAAM,YAAY,6CAuBxB,CAAC"}
+{"version":3,"file":"app.container.d.ts","sourceRoot":"","sources":["../src/app.container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAkC,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAOnF,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAInD,eAAO,MAAM,YAAY,GAAI,UAAU;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,yBA4BzD,CAAC"}

package/dist/bin.cjs

@@ -2,7 +2,7 @@
 const commander = require("commander");
 const chokidar = require("chokidar");
 const chalk = require("chalk");
-const loadFromPath = require("./load-from-path-Bvj18-eg.cjs");
+const loadFromPath = require("./load-from-path-C3UAcZqv.cjs");
 const program = new commander.Command();
 async function runOnce(configPath) {
   try {

package/dist/bin.js

@@ -1,7 +1,7 @@
 import { Command } from "commander";
 import chokidar from "chokidar";
 import chalk from "chalk";
-import { l as loadFromPath } from "./load-from-path-CjLV8qqN.js";
+import { l as loadFromPath } from "./load-from-path-BCh7ss_Z.js";
 const program = new Command();
 async function runOnce(configPath) {
   try {

package/dist/browser.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const loader = require("./loader-DuLiOKuW.cjs");
-const font_plugin = require("./font.plugin-Czq_-M7T.cjs");
+const loader = require("./loader-BbjdPvAo.cjs");
+const font_plugin = require("./font.plugin-CkYgSR9K.cjs");
 exports.API = loader.API;
 exports.AppContainer = loader.AppContainer;
 exports.AppModule = loader.AppModule;

package/dist/browser.js

@@ -1,5 +1,5 @@
-import { A, a, b, h, i, C, j, k, e, f, o, n, q, D, P, r, s, v, u, V, z, c, d, m, F, g, w, x, l, p, G, B, t, y, E } from "./loader-Dy9GSe3X.js";
-import { F as F2, b as b2, P as P2, a as a2, d as d2 } from "./font.plugin-B2IbI3Qs.js";
+import { A, a, b, h, i, C, j, k, e, f, o, n, q, D, P, r, s, v, u, V, z, c, d, m, F, g, w, x, l, p, G, B, t, y, E } from "./loader-C-8QkFag.js";
+import { F as F2, b as b2, P as P2, a as a2, d as d2 } from "./font.plugin-BU5iUqHq.js";
 export {
   A as API,
   a as AppContainer,

package/dist/context/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,GAAG,GAAG,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,qBAAa,OAAO;IAClB,OAAO,CAAC,QAAQ,CAAC,CAAiB;IAClC,OAAO,CAAC,WAAW,CAA+B;IAClD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAEzB;;IAUP;;;;;;;;OAQG;IACH,MAAM,CAAC,iBAAiB,CAAC,CAAC,EACxB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,CAAC,GAC5B;QAAE,MAAM,EAAE,CAAC,CAAC;QAAC,YAAY,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,CAAA;KAAE;IAsBjD,GAAG,CAAC,OAAO,EAAE,cAAc;IAqBpB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC;IA4B3C,OAAO,CAAC,UAAU;IAalB,IAAI,QAAQ,CAAC,MAAM,EAAE,OAAO,EAE3B;IACD,IAAI,MAAM,YAET;IAED,IAAI,aAAa,CAAC,aAAa,EAAE,MAAM,EAEtC;IACD,IAAI,aAAa,IAHgB,MAAM,CAKtC;IAED,IAAI,WAAW,CAAC,WAAW,EAAE,MAAM,EAElC;IACD,IAAI,WAAW,IAAI,GAAG,CAMrB;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,OAAO,EAE3B;IACD,IAAI,OAAO,IAHU,OAAO,CAK3B;IAED,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC;IAW5D,QAAQ,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,KAAK,IAAI,GAAG,IAAI;CAG/D"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,GAAG,GAAG,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,qBAAa,OAAO;IAClB,OAAO,CAAC,QAAQ,CAAC,CAAiB;IAClC,OAAO,CAAC,WAAW,CAA+B;IAClD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAEzB;;IAUP;;;;;;;;OAQG;IACH,MAAM,CAAC,iBAAiB,CAAC,CAAC,EACxB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,CAAC,GAC5B;QAAE,MAAM,EAAE,CAAC,CAAC;QAAC,YAAY,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,CAAA;KAAE;IAsBjD,GAAG,CAAC,OAAO,EAAE,cAAc;IAoBpB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC;IA4B3C,OAAO,CAAC,UAAU;IAalB,IAAI,QAAQ,CAAC,MAAM,EAAE,OAAO,EAE3B;IACD,IAAI,MAAM,YAET;IAED,IAAI,aAAa,CAAC,aAAa,EAAE,MAAM,EAEtC;IACD,IAAI,aAAa,IAHgB,MAAM,CAKtC;IAED,IAAI,WAAW,CAAC,WAAW,EAAE,MAAM,EAElC;IACD,IAAI,WAAW,IAAI,GAAG,CAMrB;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,OAAO,EAE3B;IACD,IAAI,OAAO,IAHU,OAAO,CAK3B;IAED,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC;IAW5D,QAAQ,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,KAAK,IAAI,GAAG,IAAI;CAG/D"}

package/dist/{font.plugin-B2IbI3Qs.js → font.plugin-BU5iUqHq.js}

@@ -1,7 +1,7 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import "./loader-Dy9GSe3X.js";
+import "./loader-C-8QkFag.js";
 class PluginAbstract {
   constructor(options) {
     __publicField(this, "options");

package/dist/{font.plugin-Czq_-M7T.cjs → font.plugin-CkYgSR9K.cjs}

@@ -2,7 +2,7 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-require("./loader-DuLiOKuW.cjs");
+require("./loader-BbjdPvAo.cjs");
 class PluginAbstract {
   constructor(options) {
     __publicField(this, "options");

package/dist/{load-from-path-CjLV8qqN.js → load-from-path-BCh7ss_Z.js}

@@ -1,4 +1,4 @@
-import { p as loader } from "./loader-Dy9GSe3X.js";
+import { p as loader } from "./loader-C-8QkFag.js";
 import * as fs from "node:fs";
 async function resolveConfig(configPath = "./theme.config") {
   const { createJiti } = await import("jiti");

package/dist/{load-from-path-Bvj18-eg.cjs → load-from-path-C3UAcZqv.cjs}

@@ -21,7 +21,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-const loader = require("./loader-DuLiOKuW.cjs");
+const loader = require("./loader-BbjdPvAo.cjs");
 const fs = require("node:fs");
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 function _interopNamespaceDefault(e) {
@@ -44,7 +44,7 @@ const fs__namespace = /* @__PURE__ */ _interopNamespaceDefault(fs);
 async function resolveConfig(configPath = "./theme.config") {
   const { createJiti } = await import("jiti");
   const { resolve } = await import("pathe");
-  const jiti = createJiti(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("load-from-path-Bvj18-eg.cjs", document.baseURI).href, {
+  const jiti = createJiti(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("load-from-path-C3UAcZqv.cjs", document.baseURI).href, {
     debug: process.env.NODE_ENV === "development",
     fsCache: true,
     interopDefault: true

package/dist/{loader-DuLiOKuW.cjs → loader-BbjdPvAo.cjs}

@@ -2526,8 +2526,7 @@ class Context {
   }
   set(options) {
     if (this._options) {
-      console.error(this._options);
-      throw new Error("Options already set");
+      return this.update(options);
     }
     if (typeof options.sourceColor === "string") {
       options.sourceColor = Hct.fromInt(materialColorUtilities.argbFromHex(options.sourceColor));
@@ -2730,7 +2729,7 @@ class PaletteApi {
           Hct.fromInt(materialColorUtilities.argbFromHex(callback))
         );
       } else {
-        this.paletteManager.add(key, callback);
+        this.paletteManager.addCustomPalette(key, callback);
       }
     });
   }
@@ -2760,8 +2759,13 @@ class PaletteManager {
       ...this._palettes
     };
   }
-  addCustomPalette(key, color) {
-    const palette = Palette.fromVariant(key, color, this.context);
+  addCustomPalette(key, args) {
+    let palette;
+    if (args instanceof Hct) {
+      palette = Palette.fromVariant(key, args, this.context);
+    } else {
+      palette = new Palette(key, args, this.context);
+    }
     this.add(key, palette);
     this.colorApi.addFromCustomPalette(key);
   }
@@ -2797,7 +2801,14 @@ const PaletteModule = {
   paletteApi: awilix.asClass(PaletteApi).scoped(),
   paletteManager: awilix.asClass(PaletteManager).scoped()
 };
-const AppContainer = () => {
+let cachedContainer = null;
+const AppContainer = (options) => {
+  if (!(options == null ? void 0 : options.fresh) && cachedContainer) {
+    return cachedContainer;
+  }
+  const container = awilix.createContainer({
+    injectionMode: awilix.InjectionMode.PROXY
+  });
   function registerModule(...modules) {
     modules.forEach((module2) => {
       Object.entries(module2).forEach(([name, moduleClass]) => {
@@ -2806,9 +2817,6 @@ const AppContainer = () => {
     });
     return AppContainer;
   }
-  const container = awilix.createContainer({
-    injectionMode: awilix.InjectionMode.PROXY
-  });
   registerModule(
     AppModule,
     PluginModule,
@@ -2816,6 +2824,7 @@ const AppContainer = () => {
     PaletteModule,
     ContextModule
   );
+  cachedContainer = container;
   return container;
 };
 function bootstrap() {
@@ -3144,13 +3153,7 @@ const udixioVariant = variant({
       [colorKey]: {
         palette: () => palettes.get(colorKey),
         tone: () => {
-          if (ctx.variant.name === "neutral") {
-            return ctx.isDark ? tMinC(palettes.get(colorKey), 0, 98) : tMaxC(palettes.get(colorKey));
-          } else if (ctx.variant.name === "vibrant") {
-            return tMaxC(palettes.get(colorKey), 0, ctx.isDark ? 90 : 98);
-          } else {
-            return ctx.isDark ? 80 : tMaxC(palettes.get(colorKey));
-          }
+          return ctx.isDark ? 80 : tMaxC(palettes.get(colorKey));
         },
         isBackground: true,
         background: () => highestSurface(ctx, colors2),

package/dist/{loader-Dy9GSe3X.js → loader-C-8QkFag.js}

@@ -2525,8 +2525,7 @@ class Context {
   }
   set(options) {
     if (this._options) {
-      console.error(this._options);
-      throw new Error("Options already set");
+      return this.update(options);
     }
     if (typeof options.sourceColor === "string") {
       options.sourceColor = Hct.fromInt(argbFromHex(options.sourceColor));
@@ -2729,7 +2728,7 @@ class PaletteApi {
           Hct.fromInt(argbFromHex(callback))
         );
       } else {
-        this.paletteManager.add(key, callback);
+        this.paletteManager.addCustomPalette(key, callback);
       }
     });
   }
@@ -2759,8 +2758,13 @@ class PaletteManager {
       ...this._palettes
     };
   }
-  addCustomPalette(key, color) {
-    const palette = Palette.fromVariant(key, color, this.context);
+  addCustomPalette(key, args) {
+    let palette;
+    if (args instanceof Hct) {
+      palette = Palette.fromVariant(key, args, this.context);
+    } else {
+      palette = new Palette(key, args, this.context);
+    }
     this.add(key, palette);
     this.colorApi.addFromCustomPalette(key);
   }
@@ -2796,7 +2800,14 @@ const PaletteModule = {
   paletteApi: asClass(PaletteApi).scoped(),
   paletteManager: asClass(PaletteManager).scoped()
 };
-const AppContainer = () => {
+let cachedContainer = null;
+const AppContainer = (options) => {
+  if (!(options == null ? void 0 : options.fresh) && cachedContainer) {
+    return cachedContainer;
+  }
+  const container = createContainer({
+    injectionMode: InjectionMode.PROXY
+  });
   function registerModule(...modules) {
     modules.forEach((module) => {
       Object.entries(module).forEach(([name, moduleClass]) => {
@@ -2805,9 +2816,6 @@ const AppContainer = () => {
     });
     return AppContainer;
   }
-  const container = createContainer({
-    injectionMode: InjectionMode.PROXY
-  });
   registerModule(
     AppModule,
     PluginModule,
@@ -2815,6 +2823,7 @@ const AppContainer = () => {
     PaletteModule,
     ContextModule
   );
+  cachedContainer = container;
   return container;
 };
 function bootstrap() {
@@ -3143,13 +3152,7 @@ const udixioVariant = variant({
       [colorKey]: {
         palette: () => palettes.get(colorKey),
         tone: () => {
-          if (ctx.variant.name === "neutral") {
-            return ctx.isDark ? tMinC(palettes.get(colorKey), 0, 98) : tMaxC(palettes.get(colorKey));
-          } else if (ctx.variant.name === "vibrant") {
-            return tMaxC(palettes.get(colorKey), 0, ctx.isDark ? 90 : 98);
-          } else {
-            return ctx.isDark ? 80 : tMaxC(palettes.get(colorKey));
-          }
+          return ctx.isDark ? 80 : tMaxC(palettes.get(colorKey));
         },
         isBackground: true,
         background: () => highestSurface(ctx, colors2),

package/dist/node.cjs

@@ -22,9 +22,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const loader = require("./loader-DuLiOKuW.cjs");
-const font_plugin = require("./font.plugin-Czq_-M7T.cjs");
-const loadFromPath = require("./load-from-path-Bvj18-eg.cjs");
+const loader = require("./loader-BbjdPvAo.cjs");
+const font_plugin = require("./font.plugin-CkYgSR9K.cjs");
+const loadFromPath = require("./load-from-path-C3UAcZqv.cjs");
 let unpluginInstance = null;
 const createUnpluginTheme = async () => {
   if (unpluginInstance) {

package/dist/node.js

@@ -1,7 +1,7 @@
-import { A, a, b, h, i, C, j, k, e, f, o, n, q, D, P, r, s, v, u, V, z, c, d, m, F, g, w, x, l, p, G, B, t, y, E } from "./loader-Dy9GSe3X.js";
-import { F as F2, b as b2, P as P2, a as a2, d as d2 } from "./font.plugin-B2IbI3Qs.js";
-import { l as loadFromPath } from "./load-from-path-CjLV8qqN.js";
-import { r as r2 } from "./load-from-path-CjLV8qqN.js";
+import { A, a, b, h, i, C, j, k, e, f, o, n, q, D, P, r, s, v, u, V, z, c, d, m, F, g, w, x, l, p, G, B, t, y, E } from "./loader-C-8QkFag.js";
+import { F as F2, b as b2, P as P2, a as a2, d as d2 } from "./font.plugin-BU5iUqHq.js";
+import { l as loadFromPath } from "./load-from-path-BCh7ss_Z.js";
+import { r as r2 } from "./load-from-path-BCh7ss_Z.js";
 let unpluginInstance = null;
 const createUnpluginTheme = async () => {
   if (unpluginInstance) {

package/dist/palette/palette.manager.d.ts

@@ -11,7 +11,7 @@ export declare class PaletteManager {
         context: Context;
         colorApi: ColorApi;
     });
-    addCustomPalette(key: string, color: Hct): void;
+    addCustomPalette(key: string, args: Hct | PaletteCallback): void;
     add(key: string, palette: PaletteCallback | Palette): void;
     get(key: 'primary' | 'secondary' | 'tertiary' | 'neutral' | 'neutralVariant' | 'error' | string): Palette;
     private set;

package/dist/palette/palette.manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"palette.manager.d.ts","sourceRoot":"","sources":["../../src/palette/palette.manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,qBAAa,cAAc;IACzB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IAEnB,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAKhD;gBAEW,IAAI,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE;IAW1D,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAMxC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,GAAG,IAAI;IAS1D,GAAG,CACD,GAAG,EACC,SAAS,GACT,WAAW,GACX,UAAU,GACV,SAAS,GACT,gBAAgB,GAChB,OAAO,GACP,MAAM,GACT,OAAO;IAQV,OAAO,CAAC,GAAG;IAIX,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,GAAG,IAAI;CAS3D"}
+{"version":3,"file":"palette.manager.d.ts","sourceRoot":"","sources":["../../src/palette/palette.manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,qBAAa,cAAc;IACzB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IAEnB,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAKhD;gBAEW,IAAI,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE;IAW1D,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,eAAe,GAAG,IAAI;IAWhE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,GAAG,IAAI;IAS1D,GAAG,CACD,GAAG,EACC,SAAS,GACT,WAAW,GACX,UAAU,GACV,SAAS,GACT,gBAAgB,GAChB,OAAO,GACP,MAAM,GACT,OAAO;IAQV,OAAO,CAAC,GAAG;IAIX,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,GAAG,IAAI;CAS3D"}

package/dist/variant/variants/udixio.variant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"udixio.variant.d.ts","sourceRoot":"","sources":["../../../src/variant/variants/udixio.variant.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,OAAO,EAAE,MAAM,YAAY,CAAC;AAuD9E,eAAO,MAAM,aAAa,EAAE,OAsxB1B,CAAC"}
+{"version":3,"file":"udixio.variant.d.ts","sourceRoot":"","sources":["../../../src/variant/variants/udixio.variant.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,OAAO,EAAE,MAAM,YAAY,CAAC;AAuD9E,eAAO,MAAM,aAAa,EAAE,OA8wB1B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@udixio/theme",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "type": "module",
   "main": "./dist/node.js",
   "module": "./dist/node.js",

package/src/app.container.ts

@@ -1,4 +1,4 @@
-import { createContainer, InjectionMode, Resolver } from 'awilix';
+import { AwilixContainer, createContainer, InjectionMode, Resolver } from 'awilix';
 import { ColorModule } from './color';
 import { AppModule } from './app.module';
 import { PluginModule } from './plugin';
@@ -7,7 +7,17 @@ import { ContextModule } from './context';
 
 export type Module = Record<string, Resolver<any>>;
 
-export const AppContainer = () => {
+let cachedContainer: AwilixContainer | null = null;
+
+export const AppContainer = (options?: { fresh?: boolean }) => {
+  if (!options?.fresh && cachedContainer) {
+    return cachedContainer;
+  }
+
+  const container = createContainer({
+    injectionMode: InjectionMode.PROXY,
+  });
+
   function registerModule(...modules: Module[]) {
     modules.forEach((module) => {
       Object.entries(module).forEach(([name, moduleClass]) => {
@@ -17,10 +27,6 @@ export const AppContainer = () => {
     return AppContainer;
   }
 
-  const container = createContainer({
-    injectionMode: InjectionMode.PROXY,
-  });
-
   registerModule(
     AppModule,
     PluginModule,
@@ -29,5 +35,6 @@ export const AppContainer = () => {
     ContextModule,
   );
 
+  cachedContainer = container;
   return container;
 };

package/src/context/context.ts

@@ -60,8 +60,7 @@ export class Context {
 
   set(options: ContextOptions) {
     if (this._options) {
-      console.error(this._options);
-      throw new Error('Options already set');
+      return this.update(options);
     }
     if (typeof options.sourceColor === 'string') {
       options.sourceColor = Hct.fromInt(argbFromHex(options.sourceColor));

package/src/palette/palette.api.ts

@@ -19,7 +19,7 @@ export class PaletteApi {
           Hct.fromInt(argbFromHex(callback)),
         );
       } else {
-        this.paletteManager.add(key, callback);
+        this.paletteManager.addCustomPalette(key, callback);
       }
     });
   }

package/src/palette/palette.manager.ts

@@ -26,8 +26,13 @@ export class PaletteManager {
     );
   }
 
-  addCustomPalette(key: string, color: Hct) {
-    const palette = Palette.fromVariant(key, color, this.context);
+  addCustomPalette(key: string, args: Hct | PaletteCallback): void {
+    let palette: Palette;
+    if (args instanceof Hct) {
+      palette = Palette.fromVariant(key, args, this.context);
+    } else {
+      palette = new Palette(key, args, this.context);
+    }
     this.add(key, palette);
     this.colorApi.addFromCustomPalette(key);
   }

package/src/variant/variants/udixio.variant.ts

@@ -124,15 +124,7 @@ export const udixioVariant: Variant = variant({
       [colorKey]: {
         palette: () => palettes.get(colorKey),
         tone: () => {
-          if (ctx.variant.name === 'neutral') {
-            return ctx.isDark
-              ? tMinC(palettes.get(colorKey), 0, 98)
-              : tMaxC(palettes.get(colorKey));
-          } else if (ctx.variant.name === 'vibrant') {
-            return tMaxC(palettes.get(colorKey), 0, ctx.isDark ? 90 : 98);
-          } else {
-            return ctx.isDark ? 80 : tMaxC(palettes.get(colorKey));
-          }
+          return ctx.isDark ? 80 : tMaxC(palettes.get(colorKey));
         },
         isBackground: true,
         background: () => highestSurface(ctx, colors),