chore: fix conflicts

Author: jaredLunde

README.md

@@ -152,9 +152,7 @@ function mq<
   mediaQueries: MediaQueries<QueryNames>
 ): {
   (queryName: QueryNames): string;
-  (queryName: MediaQueryObject<QueryNames, Tokens, Themes>): (
-    tokens: TokensUnion<Tokens, Themes>
-  ) => string;
+  (queryName: MediaQueryObject<QueryNames, Tokens, Themes>): string;
 };
 ```
 
@@ -171,7 +169,7 @@ function mq<
 function mqStyles(queryName: QueryNames): string;
 function mqStyles(
   queryName: MediaQueryObject<QueryNames, Tokens, Themes>
-): (tokens: TokensUnion<Tokens, Themes>) => string;
+): string;
 ```
 
 ## LICENSE

src/index.ts

@@ -4,7 +4,6 @@ import type {
   StyleCallback,
   StyleObject,
   Styles,
-  TokensUnion,
 } from "@dash-ui/styles";
 
 /**
@@ -31,10 +30,10 @@ function mq<
   function mqStyles(queryName: QueryNames): string;
   function mqStyles(
     queryName: MediaQueryObject<QueryNames, Tokens, Themes>
-  ): (tokens: TokensUnion<Tokens, Themes>) => string;
+  ): string;
   function mqStyles(
     queryName: QueryNames | MediaQueryObject<QueryNames, Tokens, Themes>
-  ): string | ((tokens: TokensUnion<Tokens, Themes>) => string) {
+  ): string {
     if (typeof queryName === "string") {
       return `@media ${mediaQueries[queryName]}`;
     } else {

tsconfig.json

@@ -6,6 +6,7 @@
     "lib": ["esnext"],
     "moduleResolution": "node",
     "esModuleInterop": true,
+    "incremental": true,
     "strict": true
   }
 }

types/index.d.ts

@@ -1,19 +1,39 @@
-import type { DashThemes, DashTokens, StyleCallback, StyleObject, Styles, TokensUnion } from "@dash-ui/styles";
+import type {
+  DashThemes,
+  DashTokens,
+  StyleCallback,
+  StyleObject,
+  Styles,
+} from "@dash-ui/styles";
 /**
  * A factory function that creates a utility for adding breakpoints and
  * media queries to Dash styles
  *
  * @param styles - A Dash `styles` instance
  * @param mediaQueries - A map of media query name/query pairs
  */
-declare function mq<Tokens extends DashTokens = DashTokens, Themes extends DashThemes = DashThemes, QueryNames extends string = string>(styles: Styles<Tokens, Themes>, mediaQueries: MediaQueries<QueryNames>): {
-    (queryName: QueryNames): string;
-    (queryName: MediaQueryObject<QueryNames, Tokens, Themes>): (tokens: TokensUnion<Tokens, Themes>) => string;
+declare function mq<
+  Tokens extends DashTokens = DashTokens,
+  Themes extends DashThemes = DashThemes,
+  QueryNames extends string = string
+>(
+  styles: Styles<Tokens, Themes>,
+  mediaQueries: MediaQueries<QueryNames>
+): {
+  (queryName: QueryNames): string;
+  (queryName: MediaQueryObject<QueryNames, Tokens, Themes>): string;
 };
 export default mq;
 export declare type MediaQueries<QueryNames extends string> = {
-    readonly [K in QueryNames]: string;
+  readonly [K in QueryNames]: string;
 };
-export declare type MediaQueryObject<QueryNames extends string, Tokens extends DashTokens = DashTokens, Themes extends DashThemes = DashThemes> = {
-    readonly [K in QueryNames | "default"]?: string | StyleObject | StyleCallback<Tokens, Themes>;
+export declare type MediaQueryObject<
+  QueryNames extends string,
+  Tokens extends DashTokens = DashTokens,
+  Themes extends DashThemes = DashThemes
+> = {
+  readonly [K in QueryNames | "default"]?:
+    | string
+    | StyleObject
+    | StyleCallback<Tokens, Themes>;
 };