Skip to content
This repository was archived by the owner on Aug 25, 2020. It is now read-only.

Commit 92157b3

Browse files
committed
feat: move DefService methods to standalone functions
1 parent 042cced commit 92157b3

11 files changed

Lines changed: 50 additions & 43 deletions

File tree

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
"build-and-copy": "npm run build && node ./dev/dev-copy.js",
1313
"publish": "npm publish ./dist/release --access=public",
1414
"release": "npm run build && npm run publish",
15-
"test": "karma start ./karma.conf.js --browsers Firefox --single-run",
16-
"test:local": "karma start ./karma.conf.js"
15+
"test": "karma start ./karma.conf.js --browsers Firefox --single-run"
1716
},
1817
"private": true,
1918
"dependencies": {

package/src/styler-def.service.ts

Lines changed: 0 additions & 38 deletions
This file was deleted.

package/src/styler.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { HashStrategy } from './compiler/hash/hash-strategy';
88
import { componentStyle } from './meta/tokens';
99
import { StylerColorService } from './styler-color.service';
1010
import { StylerComponent } from './styler-component';
11-
import { StylerDefService } from './styler-def.service';
1211
import { StylerDirective } from './styler.directive';
1312
import { StylerService } from './styler.service';
1413

@@ -45,7 +44,6 @@ export class StylerModule {
4544
providers: [
4645
StylerService,
4746
CompilerService,
48-
StylerDefService,
4947
StylerColorService,
5048
{
5149
provide: HashStrategy,

package/src/styler.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ export * from './styler.module';
33
export * from './styler.service';
44
export * from './styler-color.service';
55
export * from './styler-component';
6-
export * from './styler-def.service';
76
export * from './styler-element';
87
export * from './class-gen/bem-class-gen-strategy';
98
export * from './class-gen/class-gen-stategy';
@@ -19,4 +18,6 @@ export * from './meta/def';
1918
export * from './meta/state';
2019
export * from './meta/style';
2120
export * from './meta/tokens';
21+
export * from './utils/index';
22+
export * from './utils/color/index';
2223
export * from './utils/merge-deep';

package/src/utils/color/index.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
export * from './hsl-to-hex';
2+
export * from './hsl-to-rgb';
3+
export * from './is-hsl';
4+
export * from './is-rgb';
5+
export * from './name-to-hex';
6+
export * from './number-to-hex';
7+
export * from './parse-to-hsl';
8+
export * from './parse-to-rgb';
9+
export * from './reduce-hex-value';
10+
export * from './rgb-to-hsl';

package/src/utils/def/def-merge.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { StyleDef } from '../../meta/def';
2+
import { mergeDeepAll } from '../merge-deep';
3+
4+
export function defMerge(chunks: StyleDef[]): StyleDef {
5+
return mergeDeepAll(chunks);
6+
}

package/src/utils/def/def-pick.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { PickStyleDef, StyleDef } from '../../meta/def';
2+
import { defUnwrap } from './def-unwrap';
3+
4+
export function defPick(state: string, styles: PickStyleDef, def: string | null = null): StyleDef {
5+
return state
6+
? defUnwrap(styles[state])
7+
: def !== null
8+
? defUnwrap(styles[def])
9+
: {};
10+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { StyleDef } from '../../meta/def';
2+
import { defUnwrap } from './def-unwrap';
3+
4+
export function defToggle(state: boolean, styles: StyleDef, falseStyles?: StyleDef): StyleDef {
5+
return state
6+
? defUnwrap(styles)
7+
: defUnwrap(falseStyles || {});
8+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { StyleDef, WrappedStyleDef } from '../../meta/def';
2+
import { isFunction } from '../is-function';
3+
4+
export function defUnwrap(raw: StyleDef | WrappedStyleDef): StyleDef {
5+
return isFunction(raw)
6+
? raw()
7+
: raw;
8+
}

package/src/utils/def/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export * from './def-merge';
2+
export * from './def-pick';
3+
export * from './def-toggle';
4+
export * from './def-unwrap';

0 commit comments

Comments
 (0)