Add support for list literals (#2515)

Co-authored-by: Carlos (Goodwine) <[email protected]>

Author: nex3

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.85.1-dev
+
+* No user-visible changes.
+
 ## 1.85.0
 
 * No longer fully trim redundant selectors generated by `@extend`. This caused

pkg/sass-parser/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.15-dev
+
+* Add support for parsing list expressions.
+
 ## 0.4.14
 
 * Add support for parsing color expressions.

pkg/sass-parser/lib/index.ts

@@ -70,6 +70,13 @@ export {
   ColorExpressionProps,
   ColorExpressionRaws,
 } from './src/expression/color';
+export {
+  ListExpression,
+  ListExpressionProps,
+  ListExpressionRaws,
+  ListSeparator,
+  NewNodeForListExpression,
+} from './src/expression/list';
 export {
   NumberExpression,
   NumberExpressionProps,

pkg/sass-parser/lib/src/expression/__snapshots__/list.test.ts.snap

@@ -0,0 +1,22 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`a list expression toJSON 1`] = `
+{
+  "brackets": true,
+  "inputs": [
+    {
+      "css": "@#{[foo, bar]}",
+      "hasBOM": false,
+      "id": "<input css _____>",
+    },
+  ],
+  "nodes": [
+    <foo>,
+    <bar>,
+  ],
+  "raws": {},
+  "sassType": "list",
+  "separator": ",",
+  "source": <1:4-1:14 in 0>,
+}
+`;

pkg/sass-parser/lib/src/expression/convert.ts

@@ -8,6 +8,7 @@ import {Expression} from '.';
 import {BinaryOperationExpression} from './binary-operation';
 import {BooleanExpression} from './boolean';
 import {ColorExpression} from './color';
+import {ListExpression} from './list';
 import {NumberExpression} from './number';
 import {StringExpression} from './string';
 
@@ -18,6 +19,7 @@ const visitor = sassInternal.createExpressionVisitor<Expression>({
   visitStringExpression: inner => new StringExpression(undefined, inner),
   visitBooleanExpression: inner => new BooleanExpression(undefined, inner),
   visitColorExpression: inner => new ColorExpression(undefined, inner),
+  visitListExpression: inner => new ListExpression(undefined, inner),
   visitNumberExpression: inner => new NumberExpression(undefined, inner),
 });
 

pkg/sass-parser/lib/src/expression/from-props.ts

@@ -7,13 +7,15 @@ import {Expression, ExpressionProps} from '.';
 import {BinaryOperationExpression} from './binary-operation';
 import {BooleanExpression} from './boolean';
 import {ColorExpression} from './color';
+import {ListExpression} from './list';
 import {NumberExpression} from './number';
 import {StringExpression} from './string';
 
 /** Constructs an expression from {@link ExpressionProps}. */
 export function fromProps(props: ExpressionProps): Expression {
   if ('text' in props) return new StringExpression(props);
   if ('left' in props) return new BinaryOperationExpression(props);
+  if ('separator' in props) return new ListExpression(props);
   if ('value' in props) {
     if (typeof props.value === 'boolean') return new BooleanExpression(props);
     if (typeof props.value === 'number') return new NumberExpression(props);

pkg/sass-parser/lib/src/expression/index.ts

@@ -9,6 +9,7 @@ import type {
 } from './binary-operation';
 import {BooleanExpression, BooleanExpressionProps} from './boolean';
 import {ColorExpression, ColorExpressionProps} from './color';
+import {ListExpression, ListExpressionProps} from './list';
 import {NumberExpression, NumberExpressionProps} from './number';
 import type {StringExpression, StringExpressionProps} from './string';
 
@@ -21,6 +22,7 @@ export type AnyExpression =
   | BinaryOperationExpression
   | BooleanExpression
   | ColorExpression
+  | ListExpression
   | NumberExpression
   | StringExpression;
 
@@ -33,6 +35,7 @@ export type ExpressionType =
   | 'binary-operation'
   | 'boolean'
   | 'color'
+  | 'list'
   | 'number'
   | 'string';
 
@@ -46,6 +49,7 @@ export type ExpressionProps =
   | BinaryOperationExpressionProps
   | BooleanExpressionProps
   | ColorExpressionProps
+  | ListExpressionProps
   | NumberExpressionProps
   | StringExpressionProps;