@animus-ui/theming 0.1.1-beta.15 → 0.1.1-beta.19

package/CHANGELOG.md

@@ -3,6 +3,38 @@
 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.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

package/dist/index.js

@@ -169,20 +169,21 @@ function flattenScale(object, path) {
   }, {});
 }
 
-var _excluded = ["_", "base"];
+var _excluded = ["_"];
 
 var templateBreakpoints = function templateBreakpoints(value, alias, theme) {
   if (isObject(value)) {
     var _ = value._,
-        base = value.base,
         rest = _objectWithoutProperties(value, _excluded);
 
-    var css = _defineProperty({}, alias, _ !== null && _ !== void 0 ? _ : base);
+    var css = _defineProperty({}, alias, _);
 
     if (theme) {
       var breakpoints = theme.breakpoints;
       Object.keys(breakpoints).forEach(function (key) {
-        css[breakpoints[key]] = _defineProperty({}, alias, rest[key]);
+        if (rest[key]) {
+          css[breakpoints[key]] = _defineProperty({}, alias, rest[key]);
+        }
       });
     }
 
@@ -196,7 +197,7 @@ var serializeTokens = function serializeTokens(tokens, prefix, theme) {
   var tokenReferences = {};
   var tokenVariables = {};
   Object.keys(tokens).forEach(function (key) {
-    var varName = "--".concat(prefix, "-").concat(key);
+    var varName = "--".concat(prefix, "-").concat(key.replace('$', ''));
     tokenReferences[key] = "var(".concat(varName, ")");
     merge(tokenVariables, templateBreakpoints(tokens[key], varName, theme));
   });
@@ -235,9 +236,7 @@ var ThemeBuilder = /*#__PURE__*/function () {
           variables = _serializeTokens.variables,
           tokens = _serializeTokens.tokens;
 
-      _classPrivateFieldSet(this, _theme, merge({}, _classPrivateFieldGet(this, _theme), (_merge = {}, _defineProperty(_merge, key, tokens), _defineProperty(_merge, "_variables", {
-        root: variables
-      }), _defineProperty(_merge, "_tokens", _defineProperty({}, key, _classPrivateFieldGet(this, _theme)[key])), _merge)));
+      _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;
     }

package/dist/utils/createTheme.d.ts

@@ -1,4 +1,4 @@
-import { CSSObject, AbstractTheme } from '@animus-ui/core';
+import { AbstractTheme, CSSObject } from '@animus-ui/core';
 import { LiteralPaths } from './flattenScale';
 import { KeyAsVariable } from './serializeTokens';
 import { ColorModeConfig, Merge, MergeTheme, PrivateThemeKeys } from './types';

package/dist/utils/serializeTokens.d.ts

@@ -1,11 +1,12 @@
-import { Theme } from '@emotion/react';
 import { CSSObject } from '@animus-ui/core';
+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> = {
-    [V in keyof T]: `var(--${Prefix}-${Extract<V, 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>;
 interface SerializedTokensInputRecursive {
     [i: number]: SerializedTokensInput;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@animus-ui/theming",
-  "version": "0.1.1-beta.15",
+  "version": "0.1.1-beta.19",
   "description": "Theming Utilities",
   "author": "Aaron Robb <airrobb@gmail.com>",
   "homepage": "https://github.com/codecaaron/animus#readme",
@@ -25,7 +25,7 @@
     "url": "https://github.com/codecaaron/animus/issues"
   },
   "dependencies": {
-    "@animus-ui/core": "^0.1.1-beta.15"
+    "@animus-ui/core": "^0.1.1-beta.18"
   },
   "peerDependencies": {
     "@emotion/react": ">=11.0.0",
@@ -33,5 +33,5 @@
     "lodash": "*",
     "typescript": ">=4.3.5"
   },
-  "gitHead": "8563b18650d797788e8e766ff4f1c090e98fb9ea"
+  "gitHead": "30a2b3bfda8f7edbde50c479712aeb4f50d2e7d2"
 }

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    // "emitDeclarationOnly": true,
+    "skipLibCheck": false,
     "outDir": "./dist"
   },
   "include": ["../../typings/*.d.ts", "./src/**/*.ts", "./src/**/*.tsx"],