@hulla/style 0.0.2 → 0.1.0

package/dist/cjs/index.d.ts

@@ -1,38 +1,90 @@
-import { HTMLAttributes } from 'astro/types';
+import { HTMLAttributes } from "astro/types"
 
-type Variants = Record<string, string>;
-type Compose = <const CS extends any[] = ClassName[]>(...classes: CS) => string;
-type Fn = (...args: any[]) => any;
-type ClassName = string | null | undefined | false | 0 | 0n | typeof NaN;
-type Config<V extends Variants, DV extends keyof V, B extends string, C extends Compose> = {
-    variants?: V;
-    defaultVariant?: DV;
-    base?: B;
-    compose?: C;
-    transform?: Transform;
-};
-type Props<V extends Variants> = {
-    variant?: keyof V;
-    class?: string | null;
-    className?: string | null;
-    "class:list"?: HTMLAttributes<"div">["class:list"];
-};
-type Incorrect<S extends string = "[@hulla/style]: Invalid style configuration passed. Refer to https://hulla.dev/docs/style for help"> = S;
-type VariantProps<S> = S extends Fn ? Parameters<S>[0] extends Props<infer V> ? {
-    variant?: keyof V;
-} : Incorrect : Incorrect;
-type Variant<S> = S extends Fn ? (Parameters<S>[0] extends Props<infer V> ? keyof V : Incorrect) : Incorrect;
-type Transform = (css: string) => string;
+type Variants = Record<string, Record<string, string>>
+type Compose = <const CS extends any[] = ClassName[]>(...classes: CS) => string
+type ClassName = string | null | undefined | false | 0 | 0n | typeof NaN
+type Config<
+  V extends Variants,
+  DV extends {
+    [K in keyof V]?: keyof V[K]
+  },
+  B extends string,
+  C extends Compose,
+> = {
+  props: V
+  defaults?: DV
+  base?: B
+  compose?: C
+  transform?: Transform
+}
+type BaseProps = {
+  class?: string | null
+  className?: string | null
+  "class:list"?: HTMLAttributes<"div">["class:list"]
+}
+type Props<V extends Variants, _DV extends Defaults<V>, Extra extends Record<string, unknown>> = BaseProps & {
+  [K in keyof V]?: keyof V[K]
+} & Extra
+type Transform = (css: string) => string
 type Setup<C extends Compose> = {
-    compose?: C;
-    transform?: (css: string) => string;
-};
+  compose?: C
+  transform?: (css: string) => string
+}
+type Defaults<V extends Variants> = {
+  [K in keyof V]?: keyof V[K]
+}
+type VariantFunction<ExtraProps extends Record<string, unknown> = {}> = <
+  const V extends Variants,
+  const DV extends Defaults<V>,
+  const B extends string,
+  const C extends Compose,
+>(
+  config: Config<V, DV, B, C>,
+  modifier?: (data: {
+    config: Config<V, DV, B, Compose>
+    props: Props<V, DV, ExtraProps>
+  }) => Partial<Config<V, DV, B, Compose>>
+) => (props: Props<V, DV, ExtraProps>) => string
 type StyleFunctions = {
-    cn: Compose;
-    vn: <V extends Variants, DV extends keyof V, B extends string>(config: Config<V, DV, B, Compose>) => (props: Props<V>) => string;
-};
+  cn: Compose
+  vn: VariantFunction<{}>
+}
+type NotNeverKeys<T extends Record<string, unknown>> = {
+  [K in keyof T]: T[K] extends never ? never : K
+}[keyof T]
+type HideNever<T extends Record<string, unknown>> = {
+  [K in NotNeverKeys<T>]: T[K]
+}
+type VariantProps<S extends (props: Props<Variants, Defaults<Variants>, Record<string, unknown>>) => string> =
+  Parameters<S>[0] extends Props<infer V, infer DV, Record<string, unknown>>
+    ? Omit<
+        {
+          [K in keyof V]: K extends keyof DV ? never : keyof V[K]
+        },
+        {
+          [K in keyof DV]: K extends keyof V ? K : never
+        }[keyof DV]
+      > & {
+        [K in keyof DV]?: K extends keyof V ? keyof V[K] : never
+      }
+    : never
 
-declare function style(): StyleFunctions;
-declare function style<C extends Compose>(setup: Setup<C>): StyleFunctions;
+declare function style<C extends Compose>(setup?: Setup<C>): StyleFunctions
 
-export { type ClassName, type Compose, type Config, type Props, type Setup, type StyleFunctions, type Transform, type Variant, type VariantProps, type Variants, style };
+export {
+  type BaseProps,
+  type ClassName,
+  type Compose,
+  type Config,
+  type Defaults,
+  type HideNever,
+  type NotNeverKeys,
+  type Props,
+  type Setup,
+  type StyleFunctions,
+  type Transform,
+  type VariantFunction,
+  type VariantProps,
+  type Variants,
+  style,
+}

package/dist/cjs/index.js

@@ -1 +1,38 @@
-function t(...a){let r=[];for(let t of a.filter(Boolean))for(let a of t.split(" "))r.push(a);return Array.from(new Set(r).values()).join(" ")}exports.style=function(a){let{compose:r=t,transform:e}=a??{};return{vn:t=>a=>{let n=a.variant?t.variants?.[a.variant]:t.defaultVariant?t.variants?.[t.defaultVariant]:void 0,s=[a.class,a.className,...a["class:list"]??[]],l=(t.compose??r)(t.base,n,...s),o=e??t.transform;return o?o(l):l},cn:e?(...t)=>e(r(...t)):r}};
+function e(...t) {
+  let r = []
+  for (let e of t.filter(Boolean)) for (let t of e.split(" ")) r.push(t)
+  return Array.from(new Set(r).values()).join(" ")
+}
+exports.style = function (t) {
+  let { compose: r = e, transform: n } = t ?? {}
+  return {
+    vn: (e, t) => (o) => {
+      let s = t ? { ...e, ...(t({ config: e, props: o }) ?? {}) } : e,
+        f = ""
+      for (let e in s.props) {
+        let t = void 0 !== o[e] ? s.props[e][o[e]] : s.defaults?.[e] ? s.props[e][s.defaults[e]] : void 0
+        t && (f += "" === f ? t : ` ${t}`)
+      }
+      let a = [
+          o.class,
+          o.className,
+          ...((function (e) {
+            switch (typeof e) {
+              case "string":
+                return [e]
+              case "object":
+                if (e instanceof Array) return e
+                if (e instanceof Set || e instanceof Map) return Array.from(e)
+                return Object.entries(e).map(([e, t]) => (t ? e : void 0))
+              default:
+                return
+            }
+          })(o["class:list"]) ?? []),
+        ],
+        i = (s.compose ?? r)(s.base, f, ...a),
+        l = n ?? s.transform
+      return l ? l(i) : i
+    },
+    cn: n ? (...e) => n(r(...e)) : r,
+  }
+}

package/dist/es/index.d.mts

@@ -1,38 +1,90 @@
-import { HTMLAttributes } from 'astro/types';
+import { HTMLAttributes } from "astro/types"
 
-type Variants = Record<string, string>;
-type Compose = <const CS extends any[] = ClassName[]>(...classes: CS) => string;
-type Fn = (...args: any[]) => any;
-type ClassName = string | null | undefined | false | 0 | 0n | typeof NaN;
-type Config<V extends Variants, DV extends keyof V, B extends string, C extends Compose> = {
-    variants?: V;
-    defaultVariant?: DV;
-    base?: B;
-    compose?: C;
-    transform?: Transform;
-};
-type Props<V extends Variants> = {
-    variant?: keyof V;
-    class?: string | null;
-    className?: string | null;
-    "class:list"?: HTMLAttributes<"div">["class:list"];
-};
-type Incorrect<S extends string = "[@hulla/style]: Invalid style configuration passed. Refer to https://hulla.dev/docs/style for help"> = S;
-type VariantProps<S> = S extends Fn ? Parameters<S>[0] extends Props<infer V> ? {
-    variant?: keyof V;
-} : Incorrect : Incorrect;
-type Variant<S> = S extends Fn ? (Parameters<S>[0] extends Props<infer V> ? keyof V : Incorrect) : Incorrect;
-type Transform = (css: string) => string;
+type Variants = Record<string, Record<string, string>>
+type Compose = <const CS extends any[] = ClassName[]>(...classes: CS) => string
+type ClassName = string | null | undefined | false | 0 | 0n | typeof NaN
+type Config<
+  V extends Variants,
+  DV extends {
+    [K in keyof V]?: keyof V[K]
+  },
+  B extends string,
+  C extends Compose,
+> = {
+  props: V
+  defaults?: DV
+  base?: B
+  compose?: C
+  transform?: Transform
+}
+type BaseProps = {
+  class?: string | null
+  className?: string | null
+  "class:list"?: HTMLAttributes<"div">["class:list"]
+}
+type Props<V extends Variants, _DV extends Defaults<V>, Extra extends Record<string, unknown>> = BaseProps & {
+  [K in keyof V]?: keyof V[K]
+} & Extra
+type Transform = (css: string) => string
 type Setup<C extends Compose> = {
-    compose?: C;
-    transform?: (css: string) => string;
-};
+  compose?: C
+  transform?: (css: string) => string
+}
+type Defaults<V extends Variants> = {
+  [K in keyof V]?: keyof V[K]
+}
+type VariantFunction<ExtraProps extends Record<string, unknown> = {}> = <
+  const V extends Variants,
+  const DV extends Defaults<V>,
+  const B extends string,
+  const C extends Compose,
+>(
+  config: Config<V, DV, B, C>,
+  modifier?: (data: {
+    config: Config<V, DV, B, Compose>
+    props: Props<V, DV, ExtraProps>
+  }) => Partial<Config<V, DV, B, Compose>>
+) => (props: Props<V, DV, ExtraProps>) => string
 type StyleFunctions = {
-    cn: Compose;
-    vn: <V extends Variants, DV extends keyof V, B extends string>(config: Config<V, DV, B, Compose>) => (props: Props<V>) => string;
-};
+  cn: Compose
+  vn: VariantFunction<{}>
+}
+type NotNeverKeys<T extends Record<string, unknown>> = {
+  [K in keyof T]: T[K] extends never ? never : K
+}[keyof T]
+type HideNever<T extends Record<string, unknown>> = {
+  [K in NotNeverKeys<T>]: T[K]
+}
+type VariantProps<S extends (props: Props<Variants, Defaults<Variants>, Record<string, unknown>>) => string> =
+  Parameters<S>[0] extends Props<infer V, infer DV, Record<string, unknown>>
+    ? Omit<
+        {
+          [K in keyof V]: K extends keyof DV ? never : keyof V[K]
+        },
+        {
+          [K in keyof DV]: K extends keyof V ? K : never
+        }[keyof DV]
+      > & {
+        [K in keyof DV]?: K extends keyof V ? keyof V[K] : never
+      }
+    : never
 
-declare function style(): StyleFunctions;
-declare function style<C extends Compose>(setup: Setup<C>): StyleFunctions;
+declare function style<C extends Compose>(setup?: Setup<C>): StyleFunctions
 
-export { type ClassName, type Compose, type Config, type Props, type Setup, type StyleFunctions, type Transform, type Variant, type VariantProps, type Variants, style };
+export {
+  type BaseProps,
+  type ClassName,
+  type Compose,
+  type Config,
+  type Defaults,
+  type HideNever,
+  type NotNeverKeys,
+  type Props,
+  type Setup,
+  type StyleFunctions,
+  type Transform,
+  type VariantFunction,
+  type VariantProps,
+  type Variants,
+  style,
+}

package/dist/es/index.mjs

@@ -1 +1,39 @@
-function t(...a){let r=[];for(let t of a.filter(Boolean))for(let a of t.split(" "))r.push(a);return Array.from(new Set(r).values()).join(" ")}function a(a){let{compose:r=t,transform:e}=a??{};return{vn:t=>a=>{let n=a.variant?t.variants?.[a.variant]:t.defaultVariant?t.variants?.[t.defaultVariant]:void 0,l=[a.class,a.className,...a["class:list"]??[]],s=(t.compose??r)(t.base,n,...l),o=e??t.transform;return o?o(s):s},cn:e?(...t)=>e(r(...t)):r}}export{a as style};
+function e(...t) {
+  let r = []
+  for (let e of t.filter(Boolean)) for (let t of e.split(" ")) r.push(t)
+  return Array.from(new Set(r).values()).join(" ")
+}
+function t(t) {
+  let { compose: r = e, transform: n } = t ?? {}
+  return {
+    vn: (e, t) => (o) => {
+      let s = t ? { ...e, ...(t({ config: e, props: o }) ?? {}) } : e,
+        f = ""
+      for (let e in s.props) {
+        let t = void 0 !== o[e] ? s.props[e][o[e]] : s.defaults?.[e] ? s.props[e][s.defaults[e]] : void 0
+        t && (f += "" === f ? t : ` ${t}`)
+      }
+      let a = [
+          o.class,
+          o.className,
+          ...((function (e) {
+            switch (typeof e) {
+              case "string":
+                return [e]
+              case "object":
+                if (e instanceof Array) return e
+                if (e instanceof Set || e instanceof Map) return Array.from(e)
+                return Object.entries(e).map(([e, t]) => (t ? e : void 0))
+              default:
+                return
+            }
+          })(o["class:list"]) ?? []),
+        ],
+        i = (s.compose ?? r)(s.base, f, ...a),
+        l = n ?? s.transform
+      return l ? l(i) : i
+    },
+    cn: n ? (...e) => n(r(...e)) : r,
+  }
+}
+export { t as style }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hulla/style",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "description": "Styling made easy 🎨",
   "author": {
     "name": "Samuel Hulla",