rename NumberExpression raws.value to raws.number to be less confusin…

…g. update tests
sass · Oct 18, 2024 · 25f8928 · 25f8928
1 parent 4314751
commit 25f8928
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/pkg/sass-parser/lib/src/expression/number.test.ts b/pkg/sass-parser/lib/src/expression/number.test.ts
@@ -118,31 +118,31 @@ describe('a number expression', () => {
         expect(
           new NumberExpression({
             value: 123,
-            raws: {raw: 'hello', value: 123},
+            raws: {number: {raw: 'hello', value: 123}},
           }).toString()
         ).toBe('hello'));
 
       it('with a different raw value than the expression', () =>
         expect(
           new NumberExpression({
             value: 123,
-            raws: {raw: 'hello', value: 234},
+            raws: {number: {raw: 'hello', value: 234}},
           }).toString()
         ).toBe('123'));
 
       it('with a the same value as the expression but undefined format', () =>
         expect(
           new NumberExpression({
             value: 123,
-            raws: {raw: undefined, value: 123},
+            raws: {number: {raw: undefined, value: 123}},
           }).toString()
         ).toBe('123'));
 
       it('with a the same value as the expression but falsy format', () =>
         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
@@ -34,7 +34,7 @@ export interface NumberExpressionRaws {
    * have the same value: `1e3`, `1000`, `01000.0`.
    */
   // TODO: Replace with RawWithValue<T> 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 ?? '');
   }