@animus-ui/theming 0.1.1-beta.23 → 0.1.1-beta.25

package/CHANGELOG.md

@@ -3,198 +3,110 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.1.1-beta.23](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.21...@animus-ui/theming@0.1.1-beta.23) (2023-03-13)
+## [0.1.1-beta.25](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.24...@animus-ui/theming@0.1.1-beta.25) (2023-03-15)
 
 **Note:** Version bump only for package @animus-ui/theming
 
+## [0.1.1-beta.24](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.23...@animus-ui/theming@0.1.1-beta.24) (2023-03-15)
 
+**Note:** Version bump only for package @animus-ui/theming
 
+## [0.1.1-beta.23](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.21...@animus-ui/theming@0.1.1-beta.23) (2023-03-13)
 
+**Note:** Version bump only for package @animus-ui/theming
 
 ## [0.1.1-beta.22](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.21...@animus-ui/theming@0.1.1-beta.22) (2022-03-25)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.21](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.20...@animus-ui/theming@0.1.1-beta.21) (2022-02-14)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.20](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.19...@animus-ui/theming@0.1.1-beta.20) (2022-02-14)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.19](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.18...@animus-ui/theming@0.1.1-beta.19) (2022-02-12)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.18](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.17...@animus-ui/theming@0.1.1-beta.18) (2022-02-11)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.17](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.16...@animus-ui/theming@0.1.1-beta.17) (2022-02-02)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.16](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.15...@animus-ui/theming@0.1.1-beta.16) (2022-02-02)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.15](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.14...@animus-ui/theming@0.1.1-beta.15) (2022-01-26)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.14](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.13...@animus-ui/theming@0.1.1-beta.14) (2022-01-24)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.13](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.12...@animus-ui/theming@0.1.1-beta.13) (2022-01-24)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.12](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.11...@animus-ui/theming@0.1.1-beta.12) (2022-01-24)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.11](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.10...@animus-ui/theming@0.1.1-beta.11) (2022-01-24)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.10](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.9...@animus-ui/theming@0.1.1-beta.10) (2022-01-23)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.9](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.8...@animus-ui/theming@0.1.1-beta.9) (2022-01-18)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.8](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.7...@animus-ui/theming@0.1.1-beta.8) (2022-01-16)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.7](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.6...@animus-ui/theming@0.1.1-beta.7) (2022-01-16)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.6](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.5...@animus-ui/theming@0.1.1-beta.6) (2022-01-11)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.5](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.4...@animus-ui/theming@0.1.1-beta.5) (2022-01-09)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.4](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.3...@animus-ui/theming@0.1.1-beta.4) (2022-01-09)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.3](https://github.com/codecaaron/animus/compare/@animus-ui/theming@0.1.1-beta.2...@animus-ui/theming@0.1.1-beta.3) (2022-01-09)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## 0.1.1-beta.2 (2022-01-09)
 
-
-
 ## 0.1.1-beta.1 (2022-01-09)
 
-
-
 ## 0.1.1-beta.0 (2022-01-09)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## [0.1.1-beta.1](https://github.com/codecaaron/animus/compare/v0.1.1-beta.0...v0.1.1-beta.1) (2022-01-09)
 
 **Note:** Version bump only for package @animus-ui/theming
 
-
-
-
-
 ## 0.1.1-beta.0 (2022-01-09)
 
 **Note:** Version bump only for package @animus-ui/theming

package/dist/index.js

@@ -2,17 +2,14 @@ import { isObject, merge, mapValues } from 'lodash';
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
-
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
     enumerableOnly && (symbols = symbols.filter(function (sym) {
       return Object.getOwnPropertyDescriptor(object, sym).enumerable;
     })), keys.push.apply(keys, symbols);
   }
-
   return keys;
 }
-
 function _objectSpread2(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = null != arguments[i] ? arguments[i] : {};
@@ -22,26 +19,22 @@ function _objectSpread2(target) {
       Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
     });
   }
-
   return target;
 }
-
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
     throw new TypeError("Cannot call a class as a function");
   }
 }
-
 function _defineProperties(target, props) {
   for (var i = 0; i < props.length; i++) {
     var descriptor = props[i];
     descriptor.enumerable = descriptor.enumerable || false;
     descriptor.configurable = true;
     if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, descriptor.key, descriptor);
+    Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
   }
 }
-
 function _createClass(Constructor, protoProps, staticProps) {
   if (protoProps) _defineProperties(Constructor.prototype, protoProps);
   if (staticProps) _defineProperties(Constructor, staticProps);
@@ -50,8 +43,8 @@ function _createClass(Constructor, protoProps, staticProps) {
   });
   return Constructor;
 }
-
 function _defineProperty(obj, key, value) {
+  key = _toPropertyKey(key);
   if (key in obj) {
     Object.defineProperty(obj, key, {
       value: value,
@@ -62,35 +55,26 @@ function _defineProperty(obj, key, value) {
   } else {
     obj[key] = value;
   }
-
   return obj;
 }
-
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null) return {};
   var target = {};
   var sourceKeys = Object.keys(source);
   var key, i;
-
   for (i = 0; i < sourceKeys.length; i++) {
     key = sourceKeys[i];
     if (excluded.indexOf(key) >= 0) continue;
     target[key] = source[key];
   }
-
   return target;
 }
-
 function _objectWithoutProperties(source, excluded) {
   if (source == null) return {};
-
   var target = _objectWithoutPropertiesLoose(source, excluded);
-
   var key, i;
-
   if (Object.getOwnPropertySymbols) {
     var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-
     for (i = 0; i < sourceSymbolKeys.length; i++) {
       key = sourceSymbolKeys[i];
       if (excluded.indexOf(key) >= 0) continue;
@@ -98,40 +82,43 @@ function _objectWithoutProperties(source, excluded) {
       target[key] = source[key];
     }
   }
-
   return target;
 }
-
+function _toPrimitive(input, hint) {
+  if (typeof input !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if (typeof res !== "object") return res;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (hint === "string" ? String : Number)(input);
+}
+function _toPropertyKey(arg) {
+  var key = _toPrimitive(arg, "string");
+  return typeof key === "symbol" ? key : String(key);
+}
 function _classPrivateFieldGet(receiver, privateMap) {
   var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get");
-
   return _classApplyDescriptorGet(receiver, descriptor);
 }
-
 function _classPrivateFieldSet(receiver, privateMap, value) {
   var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set");
-
   _classApplyDescriptorSet(receiver, descriptor, value);
-
   return value;
 }
-
 function _classExtractFieldDescriptor(receiver, privateMap, action) {
   if (!privateMap.has(receiver)) {
     throw new TypeError("attempted to " + action + " private field on non-instance");
   }
-
   return privateMap.get(receiver);
 }
-
 function _classApplyDescriptorGet(receiver, descriptor) {
   if (descriptor.get) {
     return descriptor.get.call(receiver);
   }
-
   return descriptor.value;
 }
-
 function _classApplyDescriptorSet(receiver, descriptor, value) {
   if (descriptor.set) {
     descriptor.set.call(receiver, value);
@@ -139,20 +126,16 @@ function _classApplyDescriptorSet(receiver, descriptor, value) {
     if (!descriptor.writable) {
       throw new TypeError("attempted to set read only private field");
     }
-
     descriptor.value = value;
   }
 }
-
 function _checkPrivateRedeclaration(obj, privateCollection) {
   if (privateCollection.has(obj)) {
     throw new TypeError("Cannot initialize the same private elements twice on an object");
   }
 }
-
 function _classPrivateFieldInitSpec(obj, privateMap, value) {
   _checkPrivateRedeclaration(obj, privateMap);
-
   privateMap.set(obj, value);
 }
 
@@ -160,24 +143,19 @@ function flattenScale(object, path) {
   return Object.keys(object).reduce(function (carry, key) {
     var nextKey = path ? "".concat(path).concat(key === '_' ? '' : "-".concat(key)) : key;
     var current = object[key];
-
     if (isObject(current)) {
       return _objectSpread2(_objectSpread2({}, carry), flattenScale(current, nextKey));
     }
-
     return _objectSpread2(_objectSpread2({}, carry), {}, _defineProperty({}, nextKey, object[key]));
   }, {});
 }
 
 var _excluded = ["_"];
-
 var templateBreakpoints = function templateBreakpoints(value, alias, theme) {
   if (isObject(value)) {
     var _ = value._,
-        rest = _objectWithoutProperties(value, _excluded);
-
+      rest = _objectWithoutProperties(value, _excluded);
     var css = _defineProperty({}, alias, _);
-
     if (theme) {
       var breakpoints = theme.breakpoints;
       Object.keys(breakpoints).forEach(function (key) {
@@ -186,13 +164,10 @@ var templateBreakpoints = function templateBreakpoints(value, alias, theme) {
         }
       });
     }
-
     return css;
   }
-
   return _defineProperty({}, alias, value);
 };
-
 var serializeTokens = function serializeTokens(tokens, prefix, theme) {
   var tokenReferences = {};
   var tokenVariables = {};
@@ -208,16 +183,13 @@ var serializeTokens = function serializeTokens(tokens, prefix, theme) {
 };
 
 var _theme = /*#__PURE__*/new WeakMap();
-
 var ThemeBuilder = /*#__PURE__*/function () {
   function ThemeBuilder(baseTheme) {
     _classCallCheck(this, ThemeBuilder);
-
     _classPrivateFieldInitSpec(this, _theme, {
       writable: true,
       value: {}
     });
-
     _classPrivateFieldSet(this, _theme, baseTheme);
   }
   /**
@@ -225,19 +197,14 @@ var ThemeBuilder = /*#__PURE__*/function () {
    * @param key A key of the current theme to transform into CSS Variables and Variable References
    * @example .createScaleVariables('fontSize')
    */
-
-
   _createClass(ThemeBuilder, [{
     key: "createScaleVariables",
     value: function createScaleVariables(key) {
       var _merge;
-
       var _serializeTokens = serializeTokens(_classPrivateFieldGet(this, _theme)[key], key, _classPrivateFieldGet(this, _theme)),
-          variables = _serializeTokens.variables,
-          tokens = _serializeTokens.tokens;
-
+        variables = _serializeTokens.variables,
+        tokens = _serializeTokens.tokens;
       _classPrivateFieldSet(this, _theme, merge({}, _classPrivateFieldGet(this, _theme), (_merge = {}, _defineProperty(_merge, key, tokens), _defineProperty(_merge, "_variables", _defineProperty({}, key, variables)), _defineProperty(_merge, "_tokens", _defineProperty({}, key, _classPrivateFieldGet(this, _theme)[key])), _merge)));
-
       return this;
     }
     /**
@@ -245,16 +212,13 @@ var ThemeBuilder = /*#__PURE__*/function () {
      * @param colors A map of color tokens to add to the theme. These tokens are immediately converted to CSS Variables `--color-${key}`.
      * @example .addColors({ navy: 'navy', hyper: 'purple' })
      */
-
   }, {
     key: "addColors",
     value: function addColors(colors) {
       var flatColors = flattenScale(colors);
-
       var _serializeTokens2 = serializeTokens(flatColors, 'color', _classPrivateFieldGet(this, _theme)),
-          variables = _serializeTokens2.variables,
-          tokens = _serializeTokens2.tokens;
-
+        variables = _serializeTokens2.variables,
+        tokens = _serializeTokens2.tokens;
       _classPrivateFieldSet(this, _theme, merge({}, _classPrivateFieldGet(this, _theme), {
         colors: tokens,
         _variables: {
@@ -264,7 +228,6 @@ var ThemeBuilder = /*#__PURE__*/function () {
           colors: flatColors
         }
       }));
-
       return this;
     }
     /**
@@ -273,29 +236,23 @@ var ThemeBuilder = /*#__PURE__*/function () {
      * @param modes A map of color modes with keys of each possible mode with a value of alias to color keys.  This must be called after `addColors`
      * @example .addColorModes('light', { light: { primary: 'hyper' }, { dark: { primary: 'navy' } } })
      */
-
   }, {
     key: "addColorModes",
     value: function addColorModes(initialMode, modeConfig) {
       var _classPrivateFieldGet2,
-          _this = this;
-
+        _this = this;
       var modes = mapValues(modeConfig, function (mode) {
         return flattenScale(mode);
       });
-
       var _serializeTokens3 = serializeTokens(mapValues(merge({}, (_classPrivateFieldGet2 = _classPrivateFieldGet(this, _theme).modes) === null || _classPrivateFieldGet2 === void 0 ? void 0 : _classPrivateFieldGet2[initialMode], modes[initialMode]), function (color) {
-        return _classPrivateFieldGet(_this, _theme).colors[color];
-      }), 'color', _classPrivateFieldGet(this, _theme)),
-          colors = _serializeTokens3.tokens,
-          variables = _serializeTokens3.variables;
-
+          return _classPrivateFieldGet(_this, _theme).colors[color];
+        }), 'color', _classPrivateFieldGet(this, _theme)),
+        colors = _serializeTokens3.tokens,
+        variables = _serializeTokens3.variables;
       var getColorValue = function getColorValue(color) {
         var _classPrivateFieldGet3, _classPrivateFieldGet4;
-
         return (_classPrivateFieldGet3 = _classPrivateFieldGet(_this, _theme)._tokens) === null || _classPrivateFieldGet3 === void 0 ? void 0 : (_classPrivateFieldGet4 = _classPrivateFieldGet3.colors) === null || _classPrivateFieldGet4 === void 0 ? void 0 : _classPrivateFieldGet4[color];
       };
-
       _classPrivateFieldSet(this, _theme, merge({}, _classPrivateFieldGet(this, _theme), {
         colors: colors,
         modes: modes,
@@ -310,7 +267,6 @@ var ThemeBuilder = /*#__PURE__*/function () {
           })
         }
       }));
-
       return this;
     }
     /**
@@ -319,12 +275,10 @@ var ThemeBuilder = /*#__PURE__*/function () {
      * @param createScale A function that accepts the current theme and returns a new object of scale values.
      * @example .addScale('fonts', () => ({ basic: 'Gotham', cool: 'Wingdings' }))
      */
-
   }, {
     key: "addScale",
     value: function addScale(key, createScale) {
       _classPrivateFieldSet(this, _theme, merge({}, _classPrivateFieldGet(this, _theme), _defineProperty({}, key, flattenScale(createScale(_classPrivateFieldGet(this, _theme))))));
-
       return this;
     }
     /**
@@ -333,26 +287,22 @@ var ThemeBuilder = /*#__PURE__*/function () {
      * @param updateFn A function that accepts an argument of the current values at the specified keys an returns a map of new values to merge.
      * @example .updateScale('fonts', ({ basic }) => ({ basicFallback: `{basic}, Montserrat` }))
      */
-
   }, {
     key: "updateScale",
     value: function updateScale(key, updateFn) {
       _classPrivateFieldSet(this, _theme, merge({}, _classPrivateFieldGet(this, _theme), _defineProperty({}, key, updateFn(_classPrivateFieldGet(this, _theme)[key]))));
-
       return this;
     }
     /**
      * This finalizes the theme build and returns the final theme and variables to be provided.
      */
-
   }, {
     key: "build",
     value: function build() {
       var _serializeTokens4 = serializeTokens(mapValues(_classPrivateFieldGet(this, _theme).breakpoints, function (val) {
-        return "".concat(val, "px");
-      }), 'breakpoint', _classPrivateFieldGet(this, _theme)),
-          variables = _serializeTokens4.variables;
-
+          return "".concat(val, "px");
+        }), 'breakpoint', _classPrivateFieldGet(this, _theme)),
+        variables = _serializeTokens4.variables;
       return merge({}, _classPrivateFieldGet(this, _theme), {
         _variables: {
           breakpoints: variables
@@ -361,7 +311,6 @@ var ThemeBuilder = /*#__PURE__*/function () {
       });
     }
   }]);
-
   return ThemeBuilder;
 }();
 function createTheme(base) {

package/dist/utils/flattenScale.d.ts

@@ -2,19 +2,19 @@
  * Returns an exhaustive list of all possible paths of an object T for keys K.
  * Possibilities are returned as `k1.k2.k3`.
  */
-export declare type FindPath<T, K extends keyof T, D extends string = '.'> = K extends string | number ? T[K] extends Record<string | number, any> ? T[K] extends ArrayLike<any> ? K | `${K}${D}${FindPath<T[K], Exclude<keyof T[K], keyof any[]>, D>}` : K | `${K}${D}${FindPath<T[K], keyof T[K], D>}` : K : never;
+export type FindPath<T, K extends keyof T, D extends string = '.'> = K extends string | number ? T[K] extends Record<string | number, any> ? T[K] extends ArrayLike<any> ? K | `${K}${D}${FindPath<T[K], Exclude<keyof T[K], keyof any[]>, D>}` : K | `${K}${D}${FindPath<T[K], keyof T[K], D>}` : K : never;
 /** Returns valid paths of object T */
-export declare type Path<T, D extends string = '.'> = FindPath<T, keyof T, D> | keyof T;
+export type Path<T, D extends string = '.'> = FindPath<T, keyof T, D> | keyof T;
 /** Returns the value of a valid path P `k1.k2.k3` in object T */
-export declare type PathValue<T, P extends Path<T, D>, D extends string = '.'> = P extends `${infer K}${D}${infer Rest}` ? K extends keyof T ? Rest extends Path<T[K], D> ? PathValue<T[K], Rest, D> : never : never : P extends keyof T ? T[P] : never;
+export type PathValue<T, P extends Path<T, D>, D extends string = '.'> = P extends `${infer K}${D}${infer Rest}` ? K extends keyof T ? Rest extends Path<T[K], D> ? PathValue<T[K], Rest, D> : never : never : P extends keyof T ? T[P] : never;
 /** Check if path has a primitive end value and return only the union of end paths */
-export declare type PathToLiteral<T, K extends Path<T, D>, D extends string = '.', Base extends string = ''> = PathValue<T, K, D> extends string | number ? K extends string | number ? K extends `${infer BasePath}${D}${Base}` ? BasePath : K : never : never;
+export type PathToLiteral<T, K extends Path<T, D>, D extends string = '.', Base extends string = ''> = PathValue<T, K, D> extends string | number ? K extends string | number ? K extends `${infer BasePath}${D}${Base}` ? BasePath : K : never : never;
 /**
  * Reduce all paths to a single map of paths with primitive values removing all extra non stateful paths
  * { path: { sub: 1 } } => { 'path-sub': 1 }
  *
  */
-export declare type LiteralPaths<T extends Record<string | number, any>, D extends string = '.', Base extends string = ''> = {
+export type LiteralPaths<T extends Record<string | number, any>, D extends string = '.', Base extends string = ''> = {
     [K in Path<T, D> as PathToLiteral<T, K, D, Base>]: PathValue<T, PathToLiteral<T, K, D>, D>;
 };
 export declare function flattenScale<T extends Record<string | number, unknown>, P extends string>(object: T, path?: P): LiteralPaths<T, '-', '_'>;

package/dist/utils/serializeTokens.d.ts

@@ -3,11 +3,11 @@ import { Theme } from '@emotion/react';
 /**
  * Returns an type of any object with { key: 'var(--key) }
  */
-export declare type KeyAsVariable<T extends Record<string, any>, Prefix extends string> = {
+export type KeyAsVariable<T extends Record<string, any>, Prefix extends string> = {
     [V in keyof T]: `var(--${Prefix}-${SanitizeKey<Extract<V, string>>})`;
 };
-export declare type SanitizeKey<T extends string> = T extends `${'$'}${infer Y}` ? Y : T;
-declare type SerializedTokensInput = Record<string, string | number | CSSObject | SerializedTokensInputRecursive>;
+export type SanitizeKey<T extends string> = T extends `${'$'}${infer Y}` ? Y : T;
+type SerializedTokensInput = Record<string, string | number | CSSObject | SerializedTokensInputRecursive>;
 interface SerializedTokensInputRecursive {
     [i: number]: SerializedTokensInput;
     [i: string]: SerializedTokensInput;

package/dist/utils/types.d.ts

@@ -8,21 +8,21 @@ import { AbstractTheme, CSSObject } from '@animus-ui/core';
  *
  * The resulting type is then rejoined with keys that cannot be mutated (breakpoints) as the next version of Theme
  */
-export declare type MergeTheme<Base extends AbstractTheme, Next, Unmergable = Record<'breakpoints', Base['breakpoints']>> = Unmergable & Merge<Base, Next>;
+export type MergeTheme<Base extends AbstractTheme, Next, Unmergable = Record<'breakpoints', Base['breakpoints']>> = Unmergable & Merge<Base, Next>;
 /** This merges at 2 levels of depth */
-export declare type Merge<A, B> = {
+export type Merge<A, B> = {
     [K in keyof (A & B)]: K extends keyof B ? K extends keyof A ? AssignValueIfUnmergable<A[K], B[K]> : B[K] : K extends keyof A ? A[K] : never;
 };
 /** Extract mergable objects */
-export declare type Mergable<T> = Exclude<T, ((...args: any) => any) | string | boolean | symbol | number | any[]>;
+export type Mergable<T> = Exclude<T, ((...args: any) => any) | string | boolean | symbol | number | any[]>;
 /** Return B if either A or B is unmergable */
-export declare type AssignValueIfUnmergable<A, B> = Mergable<A> extends never ? B : Mergable<B> extends never ? B : Assign<A, B>;
+export type AssignValueIfUnmergable<A, B> = Mergable<A> extends never ? B : Mergable<B> extends never ? B : Assign<A, B>;
 /** Prefer all values from B */
-export declare type Assign<A, B> = {
+export type Assign<A, B> = {
     [K in keyof A | keyof B]: K extends keyof B ? B[K] : K extends keyof A ? A[K] : never;
 };
 /** These are keys that are consistent for all theme builds - they are loosely typed as they are not meant to be accessed directly */
-export declare type PrivateThemeKeys = {
+export type PrivateThemeKeys = {
     _variables: Record<string, CSSObject>;
     _tokens: Record<string | number, any>;
 };
@@ -38,4 +38,4 @@ export declare type PrivateThemeKeys = {
  *
  * `button-bg-hover`
  * */
-export declare type ColorModeConfig<Colors> = Record<string, Colors | Record<string, Colors> | Record<string, Colors | Record<string, Colors>>>;
+export type ColorModeConfig<Colors> = Record<string, Colors | Record<string, Colors> | Record<string, Colors | Record<string, Colors>>>;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@animus-ui/theming",
-  "version": "0.1.1-beta.23",
+  "version": "0.1.1-beta.25",
   "description": "Theming Utilities",
   "author": "Aaron Robb <airrobb@gmail.com>",
   "homepage": "https://github.com/codecaaron/animus#readme",
   "license": "MIT",
-  "module": "dist/index.js",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "module": "./dist/index.js",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "publishConfig": {
     "access": "public"
   },
@@ -25,7 +25,7 @@
     "url": "https://github.com/codecaaron/animus/issues"
   },
   "dependencies": {
-    "@animus-ui/core": "^0.1.1-beta.22",
+    "@animus-ui/core": "^0.1.1-beta.24",
     "@emotion/react": "^11.0.0",
     "@emotion/styled": "^11.0.0"
   },
@@ -33,5 +33,5 @@
     "lodash": "*",
     "typescript": ">=4.3.5"
   },
-  "gitHead": "c6a70813a9f9af38d07742d81db71e4547acada5"
+  "gitHead": "42aeb80b573618b883e9740ba803ed54ed29d5e5"
 }