8000 feat: allow better tree shaking (#9798) · NativeScript/NativeScript@d3674de · GitHub
[go: up one dir, main page]
Skip to content

Commit d3674de

Browse files
farfromrefugfarfromrefug
authored
feat: allow better tree shaking (#9798)
1 parent 0a7318f commit d3674de

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

‎packages/core/ui/styling/css-selector/index.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { isCssVariable } from '../../core/properties';
33
import { isNullOrUndefined } from '../../../utils/types';
44

55
import * as cssParser from '../../../css';
6-
import * as parser from '../../../css/parser';
6+
import { Combinator as ICombinator , SimpleSelectorSequence as ISimpleSelectorSequence, Selector as ISelector, SimpleSelector as ISimpleSelector, parseSelector} from '../../../css/parser';
77

88
/**
99
* An interface describing the shape of a type on which the selectors may apply.
@@ -527,7 +527,7 @@ function createDeclaration(decl: cssParser.Declaration): any {
527527
return { property: isCssVariable(decl.property) ? decl.property : decl.property.toLowerCase(), value: decl.value };
528528
}
529529

530-
function createSimpleSelectorFromAst(ast: parser.SimpleSelector): SimpleSelector {
530+
function createSimpleSelectorFromAst(ast: ISimpleSelector): SimpleSelector {
531531
if (ast.type === '.') {
532532
return new ClassSelector(ast.identifier);
533533
}
@@ -553,7 +553,7 @@ function createSimpleSelectorFromAst(ast: parser.SimpleSelector): SimpleSelector
553553
}
554554
}
555555

556-
function createSimpleSelectorSequenceFromAst(ast: parser.SimpleSelectorSequence): SimpleSelectorSequence | SimpleSelector {
556+
function createSimpleSelectorSequenceFromAst(ast: ISimpleSelectorSequence): SimpleSelectorSequence | SimpleSelector {
557557
if (ast.length === 0) {
558558
return new InvalidSelector(new Error('Empty simple selector sequence.'));
559559
} else if (ast.length === 1) {
@@ -563,18 +563,18 @@ function createSimpleSelectorSequenceFromAst(ast: parser.SimpleSelectorSequence)
563563
}
564564
}
565565

566-
function createSelectorFromAst(ast: parser.Selector): SimpleSelector | SimpleSelectorSequence | Selector {
566+
function createSelectorFromAst(ast: ISelector): SimpleSelector | SimpleSelectorSequence | Selector {
567567
if (ast.length === 0) {
568568
return new InvalidSelector(new Error('Empty selector.'));
569569
} else if (ast.length === 1) {
570570
return createSimpleSelectorSequenceFromAst(ast[0][0]);
571571
} else {
572572
const simpleSelectorSequences = [];
573573
let simpleSelectorSequence: SimpleSelectorSequence | SimpleSelector;
574-
let combinator: parser.Combinator;
574+
let combinator: ICombinator;
575575
for (let i = 0; i < ast.length; i++) {
576-
simpleSelectorSequence = createSimpleSelectorSequenceFromAst(<parser.SimpleSelectorSequence>ast[i][0]);
577-
combinator = <parser.Combinator>ast[i][1];
576+
simpleSelectorSequence = createSimpleSelectorSequenceFromAst(<ISimpleSelectorSequence>ast[i][0]);
577+
combinator = <ICombinator>ast[i][1];
578578
if (combinator) {
579579
simpleSelectorSequence.combinator = combinator;
580580
}
@@ -587,7 +587,7 @@ function createSelectorFromAst(ast: parser.Selector): SimpleSelector | SimpleSel
587587

588588
export function createSelector(sel: string): SimpleSelector | SimpleSelectorSequence | Selector {
589589
try {
590-
const parsedSelector = parser.parseSelector(sel);
590+
const parsedSelector = parseSelector(sel);
591591
if (!parsedSelector) {
592592
return new InvalidSelector(new Error('Empty selector'));
593593
}

‎packages/core/ui/styling/linear-gradient.ts

Lines changed: 1 addition & 1 deletion
10000
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { CoreTypes } from '../../core-types';
22
import { Color } from '../../color';
33
import { ColorStop } from './gradient';
4-
import { LinearGradient as CSSLinearGradient } from '../../css/parser';
4+
import type { LinearGradient as CSSLinearGradient } from '../../css/parser';
55

66
export class LinearGradient {
77
public angle: number;

‎packages/core/ui/styling/style-properties.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { decompose2DTransformMatrix, getTransformMatrix, matrixArrayToCssMatrix,
1414
import { Trace } from '../../trace';
1515
import { CoreTypes } from '../../core-types';
1616

17-
import * as parser from '../../css/parser';
17+
import { parseBackground } from '../../css/parser';
1818
import { LinearGradient } from './linear-gradient';
1919
import { CSSShadow, parseCSSShadow } from './css-shadow';
2020

@@ -785,7 +785,7 @@ export const backgroundImageProperty = new CssProperty<Style, string | LinearGra
785785
},
786786
valueConverter: (value: any) => {
787787
if (typeof value === 'string') {
788-
const parsed = parser.parseBackground(value);
788+
const parsed = parseBackground(value);
789789
if (parsed) {
790790
value = typeof parsed.value.image === 'object' ? LinearGradient.parse(parsed.value.image) : value;
791791
}
@@ -837,7 +837,7 @@ backgroundPositionProperty.register(Style);
837837

838838
function convertToBackgrounds(this: void, value: string): [CssProperty<any, any>, any][] {
839839
if (typeof value === 'string') {
840-
const backgrounds = parser.parseBackground(value).value;
840+
const backgrounds = parseBackground(value).value;
841841
let backgroundColor = unsetValue;
842842
if (backgrounds.color) {
843843
backgroundColor = backgrounds.color instanceof Color ? backgrounds.color : new Color(backgrounds.color);

0 commit comments

Comments
 (0)
0