Skip to content

Commit dd78e80

Browse files
committed
chore: code format
1 parent 0bcf3e3 commit dd78e80

19 files changed

+257
-316
lines changed

.dumirc.ts

-2
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ export default defineConfig({
88
logo: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4',
99
},
1010
});
11-
12-

.prettierrc

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"semi": true,
44
"singleQuote": true,
55
"tabWidth": 2,
6+
"printWidth": 100,
67
"trailingComma": "all",
78
"jsxSingleQuote": false
89
}

docs/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ hero:
44
description: A cssinjs util library to support Ant Design (antd) and its ecosystem libraries.
55
---
66

7-
<embed src="../README.md"></embed>
7+
<embed src="../README.md"></embed>

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"rc-test": "^7.0.13",
5353
"react": "^18.0.0",
5454
"react-dom": "^18.0.0",
55+
"prettier": "^3.3.3",
5556
"regenerator-runtime": "^0.14.0",
5657
"typescript": "^5.1.6"
5758
},

src/hooks/useToken.ts

+7-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ export type TokenMapWithTheme<
77
AliasToken extends TokenType,
88
DesignToken extends TokenType,
99
> = {
10-
[key in keyof OverrideTokenMap<CompTokenMap, AliasToken>]?: OverrideTokenMap<CompTokenMap, AliasToken>[key] & {
11-
theme?: Theme<DesignToken, AliasToken>;
12-
};
10+
[key in keyof OverrideTokenMap<CompTokenMap, AliasToken>]?: OverrideTokenMap<
11+
CompTokenMap,
12+
AliasToken
13+
>[key] & {
14+
theme?: Theme<DesignToken, AliasToken>;
1315
};
16+
};
1417

1518
export interface UseTokenReturn<
1619
CompTokenMap extends TokenMap,
@@ -33,4 +36,4 @@ export type UseToken<
3336
CompTokenMap extends TokenMap,
3437
DesignToken extends TokenType,
3538
AliasToken extends TokenType,
36-
> = () => UseTokenReturn<CompTokenMap, DesignToken, AliasToken>;
39+
> = () => UseTokenReturn<CompTokenMap, DesignToken, AliasToken>;

src/index.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
export { default as genStyleUtils } from './util/genStyleUtils';
22
export { default as genCalc } from './util/calc';
3-
export {
4-
default as statisticToken,
5-
merge as mergeToken,
6-
statistic,
7-
} from './util/statistic';
3+
export { default as statisticToken, merge as mergeToken, statistic } from './util/statistic';
84

95
export type {
106
OverrideTokenMap,
@@ -23,4 +19,4 @@ export type {
2319
GenStyleFn,
2420
TokenWithCommonCls,
2521
CSSUtil,
26-
} from './util/genStyleUtils';
22+
} from './util/genStyleUtils';

src/interface/components.ts

+9-14
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,30 @@
11
import type { TokenType } from '@ant-design/cssinjs';
22

3-
export type TokenMap = object;
3+
export type TokenMap = Record<PropertyKey, any>;
44

55
export type TokenMapKey<CompTokenMap extends TokenMap> = Extract<keyof CompTokenMap, string>;
66

7-
export type GlobalToken<
8-
CompTokenMap extends TokenMap,
9-
AliasToken extends TokenType,
10-
> = AliasToken & CompTokenMap;
7+
export type GlobalToken<CompTokenMap extends TokenMap, AliasToken extends TokenType> = AliasToken &
8+
CompTokenMap;
119

12-
export type OverrideTokenMap<
13-
CompTokenMap extends TokenMap,
14-
AliasToken extends TokenType,
15-
> = {
16-
[key in keyof CompTokenMap]: Partial<CompTokenMap[key]> & Partial<AliasToken>;
17-
};
10+
export type OverrideTokenMap<CompTokenMap extends TokenMap, AliasToken extends TokenType> = {
11+
[key in keyof CompTokenMap]: Partial<CompTokenMap[key]> & Partial<AliasToken>;
12+
};
1813

1914
export type GlobalTokenWithComponent<
2015
CompTokenMap extends TokenMap,
2116
AliasToken extends TokenType,
22-
C extends TokenMapKey<CompTokenMap>
17+
C extends TokenMapKey<CompTokenMap>,
2318
> = GlobalToken<CompTokenMap, AliasToken> & CompTokenMap[C];
2419

2520
export type ComponentToken<
2621
CompTokenMap extends TokenMap,
2722
AliasToken extends TokenType,
28-
C extends TokenMapKey<CompTokenMap>
23+
C extends TokenMapKey<CompTokenMap>,
2924
> = Exclude<OverrideTokenMap<CompTokenMap, AliasToken>[C], undefined>;
3025

3126
export type ComponentTokenKey<
3227
CompTokenMap extends TokenMap,
3328
AliasToken extends TokenType,
3429
C extends TokenMapKey<CompTokenMap>,
35-
> = keyof ComponentToken<CompTokenMap, AliasToken, C>;
30+
> = keyof ComponentToken<CompTokenMap, AliasToken, C>;

src/util/calc/CSSCalculator.ts

+2-9
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ export default class CSSCalculator extends AbstractCalculator {
1818

1919
lowPriority?: boolean;
2020

21-
constructor(
22-
num: number | string | AbstractCalculator,
23-
unitlessCssVar: Set<string>,
24-
) {
21+
constructor(num: number | string | AbstractCalculator, unitlessCssVar: Set<string>) {
2522
super();
2623

2724
const numType = typeof num;
@@ -93,11 +90,7 @@ export default class CSSCalculator extends AbstractCalculator {
9390
let mergedUnit: boolean = true;
9491
if (typeof cssUnit === 'boolean') {
9592
mergedUnit = cssUnit;
96-
} else if (
97-
Array.from(this.unitlessCssVar).some((cssVar) =>
98-
this.result.includes(cssVar),
99-
)
100-
) {
93+
} else if (Array.from(this.unitlessCssVar).some((cssVar) => this.result.includes(cssVar))) {
10194
mergedUnit = false;
10295
}
10396

src/util/calc/NumCalculator.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import AbstractCalculator from './calculator';
22

3-
export default class NumCalculator extends AbstractCalculator {
3+
class NumCalculator extends AbstractCalculator {
44
result: number = 0;
55

66
constructor(num: number | string | AbstractCalculator) {
@@ -52,3 +52,5 @@ export default class NumCalculator extends AbstractCalculator {
5252
return this.result;
5353
}
5454
}
55+
56+
export default NumCalculator;

src/util/calc/index.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import NumCalculator from './NumCalculator';
44

55
const genCalc = (type: 'css' | 'js', unitlessCssVar: Set<string>) => {
66
const Calculator = type === 'css' ? CSSCalculator : NumCalculator;
7-
8-
return (num: number | string | AbstractCalculator) =>
9-
new Calculator(num, unitlessCssVar);
7+
return (num: number | string | AbstractCalculator) => new Calculator(num, unitlessCssVar);
108
};
119

1210
export default genCalc;

0 commit comments

Comments
 (0)