feedback

Author: Goodwine

pkg/sass-parser/lib/index.ts

@@ -3,7 +3,6 @@
 // https://opensource.org/licenses/MIT.
 
 import * as postcss from 'postcss';
-import * as sassApi from 'sass';
 
 import {Root} from './src/statement/root';
 import * as sassInternal from './src/sass-internal';

pkg/sass-parser/lib/src/expression/number.test.ts

@@ -118,33 +118,17 @@ describe('a number expression', () => {
         expect(
           new NumberExpression({
             value: 123,
-            raws: {number: {raw: 'hello', value: 123}},
+            raws: {value: {raw: 'hello', value: 123}},
           }).toString()
         ).toBe('hello'));
 
       it('with a different raw value than the expression', () =>
         expect(
           new NumberExpression({
             value: 123,
-            raws: {number: {raw: 'hello', value: 234}},
+            raws: {value: {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: {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: {number: {raw: '', value: 123}},
-          }).toString()
-        ).toBe(''));
     });
   });
 
@@ -154,7 +138,7 @@ describe('a number expression', () => {
     beforeEach(() => {
       original = utils.parseExpression('123');
       // TODO: remove this once raws are properly parsed.
-      original.raws.number = {raw: '0123.0'};
+      original.raws.value = {raw: '0123.0', value: 123};
     });
 
     describe('with no overrides', () => {
@@ -167,7 +151,8 @@ describe('a number expression', () => {
 
         it('unit', () => expect(clone.unit).toBeNull());
 
-        it('raws', () => expect(clone.raws).toEqual({number: {raw: '0123.0'}}));
+        it('raws', () =>
+          expect(clone.raws).toEqual({value: {raw: '0123.0', value: 123}}));
 
         it('source', () => expect(clone.source).toBe(original.source));
       });
@@ -194,13 +179,15 @@ describe('a number expression', () => {
 
       describe('raws', () => {
         it('defined', () =>
-          expect(original.clone({raws: {number: {raw: '1e3'}}}).raws).toEqual({
-            number: {raw: '1e3'},
+          expect(
+            original.clone({raws: {value: {raw: '1e3', value: 1e3}}}).raws
+          ).toEqual({
+            value: {raw: '1e3', value: 1e3},
           }));
 
         it('undefined', () =>
           expect(original.clone({raws: undefined}).raws).toEqual({
-            number: {raw: '0123.0'},
+            value: {raw: '0123.0', value: 123},
           }));
       });
     });

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.
-  number?: {raw?: string; value?: number};
+  value?: {raw: string; value: number};
 }
 
 /**
@@ -99,8 +99,8 @@ export class NumberExpression extends Expression {
 
   /** @hidden */
   toString(): string {
-    if (this.raws?.number?.value === this.value) {
-      return (this.raws.number.raw ?? this.value) + (this.unit ?? '');
+    if (this.raws?.value?.value === this.value) {
+      return this.raws.value.raw + (this.unit ?? '');
     }
     return this.value + (this.unit ?? '');
   }