From 25f8928828963ffa25ac42362197bb1d1a69aa1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Israel=20Ortiz=20Garc=C3=ADa?= Date: Fri, 18 Oct 2024 15:42:33 -0700 Subject: [PATCH] rename NumberExpression raws.value to raws.number to be less confusing. update tests --- .../lib/src/expression/number.test.ts | 18 +++++++++--------- pkg/sass-parser/lib/src/expression/number.ts | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/sass-parser/lib/src/expression/number.test.ts b/pkg/sass-parser/lib/src/expression/number.test.ts index ad6b9dd2b..87a9ad6e2 100644 --- a/pkg/sass-parser/lib/src/expression/number.test.ts +++ b/pkg/sass-parser/lib/src/expression/number.test.ts @@ -118,7 +118,7 @@ describe('a number expression', () => { expect( new NumberExpression({ value: 123, - raws: {raw: 'hello', value: 123}, + raws: {number: {raw: 'hello', value: 123}}, }).toString() ).toBe('hello')); @@ -126,7 +126,7 @@ describe('a number expression', () => { expect( new NumberExpression({ value: 123, - raws: {raw: 'hello', value: 234}, + raws: {number: {raw: 'hello', value: 234}}, }).toString() ).toBe('123')); @@ -134,7 +134,7 @@ describe('a number expression', () => { expect( new NumberExpression({ value: 123, - raws: {raw: undefined, value: 123}, + raws: {number: {raw: undefined, value: 123}}, }).toString() ).toBe('123')); @@ -142,7 +142,7 @@ describe('a number expression', () => { expect( new NumberExpression({ value: 123, - raws: {raw: '', value: 123}, + raws: {number: {raw: '', value: 123}}, }).toString() ).toBe('')); }); @@ -154,7 +154,7 @@ describe('a number expression', () => { beforeEach(() => { original = utils.parseExpression('123'); // TODO: remove this once raws are properly parsed. - original.raws.raw = '0123.0'; + original.raws.number = {raw: '0123.0'}; }); describe('with no overrides', () => { @@ -167,7 +167,7 @@ describe('a number expression', () => { it('unit', () => expect(clone.unit).toBeNull()); - it('raws', () => expect(clone.raws).toEqual({raw: '0123.0'})); + it('raws', () => expect(clone.raws).toEqual({number: {raw: '0123.0'}})); it('source', () => expect(clone.source).toBe(original.source)); }); @@ -194,13 +194,13 @@ describe('a number expression', () => { describe('raws', () => { it('defined', () => - expect(original.clone({raws: {raw: '1e3'}}).raws).toEqual({ - raw: '1e3', + expect(original.clone({raws: {number: {raw: '1e3'}}}).raws).toEqual({ + number: {raw: '1e3'}, })); it('undefined', () => expect(original.clone({raws: undefined}).raws).toEqual({ - raw: '0123.0', + number: {raw: '0123.0'}, })); }); }); diff --git a/pkg/sass-parser/lib/src/expression/number.ts b/pkg/sass-parser/lib/src/expression/number.ts index 4ebc7c96c..b00433839 100644 --- a/pkg/sass-parser/lib/src/expression/number.ts +++ b/pkg/sass-parser/lib/src/expression/number.ts @@ -34,7 +34,7 @@ export interface NumberExpressionRaws { * have the same value: `1e3`, `1000`, `01000.0`. */ // TODO: Replace with RawWithValue when #2389 lands. - value: {raw?: string; value?: number}; + number?: {raw?: string; value?: number}; } /** @@ -99,8 +99,8 @@ export class NumberExpression extends Expression { /** @hidden */ toString(): string { - if (this.raws?.value === this.value) { - return (this.raws.raw ?? this.value) + (this.unit ?? ''); + if (this.raws?.number?.value === this.value) { + return (this.raws.number.raw ?? this.value) + (this.unit ?? ''); } return this.value + (this.unit ?? ''); }