Skip to content

Commit a90acef

Browse files
author
Andrii Kirmas
committed
Some prettify
1 parent 617159e commit a90acef

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

src/ctx.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
export type { ClassNames } from "./defs"
21
import type { Falsy, ToggleMap, ClassValue, ClassNamer, ClassNamed } from "./defs"
32
import { emptize, stringifyClassNamed, truthyKeys } from "./utils"
43

54
export default classNamingCtx
65

76
function classNamingCtx<ClassKeys extends string>(ctx: ClassNamer<ClassKeys>) {
87
emptize(ctx.classNames)
8+
99
const {classNames, className} = ctx
10+
1011
return function classNamer/*<ClassKeys extends string>*/(
1112
// this: ClassNamer<ClassKeys>,
1213
//TODO (typeof className extends string ? true : never)
@@ -18,13 +19,15 @@ function classNamingCtx<ClassKeys extends string>(ctx: ClassNamer<ClassKeys>) {
1819
): ClassNamed {
1920
// const {className, classNames} = this
2021
const withPropagation = arg0 === true
21-
//@ts-expect-error
2222
, allowed: ClassKeys[] = truthyKeys(arg0 === true ? false : arg0)
2323
//@ts-expect-error
2424
.concat(truthyKeys(arg1))
2525
//@ts-expect-error
2626
.concat(args)
27-
.filter(Boolean)
27+
.filter<ClassKeys>(
28+
//@ts-expect-error
29+
Boolean
30+
)
2831

2932
for (let i = allowed.length; i--;) {
3033
const key = allowed[i]
@@ -37,8 +40,7 @@ function classNamingCtx<ClassKeys extends string>(ctx: ClassNamer<ClassKeys>) {
3740

3841
const allowedString = allowed.join(" ")
3942
, propagated = withPropagation && className || ""
40-
41-
return stringifyClassNamed({
43+
, $return = {
4244
className: `${
4345
propagated
4446
}${
@@ -48,7 +50,11 @@ function classNamingCtx<ClassKeys extends string>(ctx: ClassNamer<ClassKeys>) {
4850
}${
4951
allowedString
5052
}`
51-
})
53+
}
54+
55+
stringifyClassNamed($return)
56+
57+
return $return
5258
}
5359
}
5460

src/defs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ type GetClassNames<T, K = "classNames", D = EmptyObject> = [T] extends [never] ?
5858
export type GetClassKeys<C> = keyof GetClassNames<GetProps<C>>
5959

6060
type Ever<T, V> = [T] extends [never] ? EmptyObject : V
61-
type EmptyObject = Record<never, never>
61+
export type EmptyObject = Record<never, never>
6262

6363
export type Falsy = undefined|null|false|0|""
6464

0 commit comments

Comments
 (0)