@hulla/style 0.2.0 → 0.2.2

package/dist/{cjs/index.d.ts → index.d.ts}

@@ -50,7 +50,7 @@ type VariantGroupAPI<V extends readonly VariantAPI<any>[]> = {
 type StyleFunctions = {
     cn: <const CN extends ClassName[]>(...classes: CN) => string;
 };
-type VariantProps<V extends VariantAPI<any> | VariantGroupAPI<any>> = V extends VariantGroupAPI<infer G> ? GroupProps<G> : V extends VariantAPI<infer V> ? APIPropsMapper<VariantAPI<V>> : {};
+type VariantProps<V> = V extends VariantGroupAPI<infer G> ? GroupProps<G> : V extends VariantAPI<infer VD> ? APIPropsMapper<VariantAPI<VD>> : {};
 
 declare function variantGroupBuilder<const V extends readonly VariantAPI<any>[]>(...variants: V): VariantGroupAPI<V>;
 
@@ -62,15 +62,15 @@ declare function style(config?: StyleConfig): {
             name: N;
             classes: V;
             default: D;
-            base?: B | undefined;
+            base?: B;
         }): VariantAPI<Variant<N, V, D, B>>;
-        <N_1 extends string, V_1 extends ClassesDefinition, B_1 extends string = "">(variantDefinition: {
-            name: N_1;
-            classes: V_1;
-            base?: B_1 | undefined;
+        <N extends string, V extends ClassesDefinition, B extends string = "">(variantDefinition: {
+            name: N;
+            classes: V;
+            base?: B;
         } & {
             default?: undefined;
-        }): VariantAPI<Variant<N_1, V_1, typeof NO_DEFAULT, B_1>>;
+        }): VariantAPI<Variant<N, V, NO_DEFAULT, B>>;
     };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hulla/style",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Styling made easy 🎨",
   "author": {
     "name": "Samuel Hulla",
@@ -19,14 +19,16 @@
   "files": [
     "dist"
   ],
+  "type": "module",
+  "types": "./dist/index.d.ts",
+  "main": "./dist/cjs/index.cjs",
+  "module": "./dist/es/index.mjs",
   "exports": {
-    "import": {
-      "types": "./dist/es/index.d.mts",
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/es/index.mjs",
+      "require": "./dist/cjs/index.cjs",
       "default": "./dist/es/index.mjs"
-    },
-    "require": {
-      "types": "./dist/cjs/index.d.ts",
-      "default": "./dist/cjs/index.js"
     }
   },
   "devDependencies": {

package/dist/es/index.d.mts

@@ -1,81 +0,0 @@
-type ClassNameNonRecursive = string | string[] | null | undefined | false | true | boolean | 0 | 0n | typeof NaN;
-type ClassesDefinition = Record<string, ClassNameNonRecursive | Record<string, any> | any[]>;
-type Simplify<T> = {
-    [K in keyof T]: T[K];
-} & {};
-type KeysWithDefault<V extends readonly VariantAPI<any>[]> = {
-    [P in V[number]["params"] as P["name"]]: P["default"] extends undefined ? P["name"] : never;
-}[V[number]["params"]["name"]];
-type KeysWithoutDefault<V extends readonly VariantAPI<any>[]> = {
-    [P in V[number]["params"] as P["name"]]: P["default"] extends undefined ? never : P["name"];
-}[V[number]["params"]["name"]];
-type GroupProps<V extends readonly VariantAPI<any>[]> = Simplify<{
-    [P in KeysWithDefault<V>]: keyof Extract<V[number]["params"], {
-        name: P;
-    }>["classes"];
-} & {
-    [P in KeysWithoutDefault<V>]?: keyof Extract<V[number]["params"], {
-        name: P;
-    }>["classes"];
-}>;
-type APIPropsMapper<V extends VariantAPI<any>> = V extends VariantAPI<Variant<infer N, infer VN, infer D, any>> ? D extends NO_DEFAULT ? {
-    [K in N]: keyof VN;
-} : {
-    [K in N]?: keyof VN;
-} : {};
-
-type ClassName = ClassNameNonRecursive | Record<string, ClassNameNonRecursive>;
-type Serializer = (input: ClassName) => string;
-type Composer = (...strings: string[]) => string;
-declare const NO_DEFAULT: unique symbol;
-type NO_DEFAULT = typeof NO_DEFAULT;
-type Variant<N extends string, V extends ClassesDefinition, D extends keyof V | NO_DEFAULT = NO_DEFAULT, B extends string = ""> = {
-    name: N;
-    classes: V;
-    base?: B;
-    default?: D extends NO_DEFAULT ? never : D;
-};
-type StyleConfig = {
-    serializer?: Serializer;
-    composer?: Composer;
-};
-type VariantAPI<V extends Variant<any, any, any, any>> = {
-    params: V;
-    css: V extends Variant<any, any, NO_DEFAULT, any> ? (prop: keyof V["classes"]) => string : (prop?: keyof V["classes"]) => string;
-};
-type VariantGroupAPI<V extends readonly VariantAPI<any>[]> = {
-    params: Record<V[number]["params"]["name"], VariantAPI<any>>;
-    css: (props: GroupProps<V>) => string;
-};
-type StyleFunctions = {
-    cn: <const CN extends ClassName[]>(...classes: CN) => string;
-};
-type VariantProps<V extends VariantAPI<any> | VariantGroupAPI<any>> = V extends VariantGroupAPI<infer G> ? GroupProps<G> : V extends VariantAPI<infer V> ? APIPropsMapper<VariantAPI<V>> : {};
-
-declare function variantGroupBuilder<const V extends readonly VariantAPI<any>[]>(...variants: V): VariantGroupAPI<V>;
-
-declare function style(config?: StyleConfig): {
-    cn: <const CN extends ClassName[]>(...classes: CN) => string;
-    variantGroup: typeof variantGroupBuilder;
-    variant: {
-        <N extends string, V extends ClassesDefinition, D extends keyof V & string, B extends string = "">(variantDefinition: {
-            name: N;
-            classes: V;
-            default: D;
-            base?: B | undefined;
-        }): VariantAPI<Variant<N, V, D, B>>;
-        <N_1 extends string, V_1 extends ClassesDefinition, B_1 extends string = "">(variantDefinition: {
-            name: N_1;
-            classes: V_1;
-            base?: B_1 | undefined;
-        } & {
-            default?: undefined;
-        }): VariantAPI<Variant<N_1, V_1, typeof NO_DEFAULT, B_1>>;
-    };
-};
-
-declare function defaultSerializer(input: ClassName): string;
-
-declare function defaultComposer(...strings: string[]): string;
-
-export { type ClassName, type Composer, NO_DEFAULT, type Serializer, type StyleConfig, type StyleFunctions, type Variant, type VariantAPI, type VariantGroupAPI, type VariantProps, defaultComposer, defaultSerializer, style };