Merge branch 'master' of github.com:parcel-bundler/lightningcss

Author: devongovett

node/composeVisitors.js

@@ -13,8 +13,10 @@ function composeVisitors(visitors) {
 
   /** @type Visitor */
   let res = {};
-  composeObjectVisitors(res, visitors, 'Rule', ruleVisitor, wrapUnknownAtRule);
-  composeObjectVisitors(res, visitors, 'RuleExit', ruleVisitor, wrapUnknownAtRule);
+  composeSimpleVisitors(res, visitors, 'StyleSheet');
+  composeSimpleVisitors(res, visitors, 'StyleSheetExit');
+  composeObjectVisitors(res, visitors, 'Rule', ruleVisitor, wrapCustomAndUnknownAtRule);
+  composeObjectVisitors(res, visitors, 'RuleExit', ruleVisitor, wrapCustomAndUnknownAtRule);
   composeObjectVisitors(res, visitors, 'Declaration', declarationVisitor, wrapCustomProperty);
   composeObjectVisitors(res, visitors, 'DeclarationExit', declarationVisitor, wrapCustomProperty);
   composeSimpleVisitors(res, visitors, 'Url');
@@ -45,8 +47,14 @@ function composeVisitors(visitors) {
 
 module.exports = composeVisitors;
 
-function wrapUnknownAtRule(k, f) {
-  return k === 'unknown' ? (value => f({ type: 'unknown', value })) : f;
+function wrapCustomAndUnknownAtRule(k, f) {
+  if (k === 'unknown') {
+    return (value => f({ type: 'unknown', value }));
+  }
+  if (k === 'custom') {
+    return (value => f({ type: 'custom', value }));
+  }
+  return f;
 }
 
 function wrapCustomProperty(k, f) {
@@ -66,6 +74,13 @@ function ruleVisitor(f, item) {
       }
       return v?.(item.value);
     }
+    if (item.type === 'custom') {
+      let v = f.custom;
+      if (typeof v === 'object') {
+        v = v[item.value.name];
+      }
+      return v?.(item.value);
+    }
     return f[item.type]?.(item);
   }
   return f?.(item);

node/test/composeVisitors.test.mjs

@@ -513,6 +513,87 @@ test('unknown rules', () => {
   assert.equal(res.code.toString(), '.menu_link{background:#056ef0}');
 });
 
+test('custom at rules', () => {
+  let res = transform({
+    filename: 'test.css',
+    minify: true,
+    code: Buffer.from(`
+      @testA;
+      @testB;
+    `),
+    customAtRules: {
+      testA: {},
+      testB: {}
+    },
+    visitor: composeVisitors([
+      {
+        Rule: {
+          custom: {
+            testA(rule) {
+              return {
+                type: 'style',
+                value: {
+                  loc: rule.loc,
+                  selectors: [
+                    [{ type: 'class', name: 'testA' }]
+                  ],
+                  declarations: {
+                    declarations: [
+                      {
+                        property: 'color',
+                        value: {
+                          type: 'rgb',
+                          r: 0xff,
+                          g: 0x00,
+                          b: 0x00,
+                          alpha: 1,
+                        }
+                      }
+                    ]
+                  }
+                }
+              };
+            }
+          }
+        }
+      },
+      {
+        Rule: {
+          custom: {
+            testB(rule) {
+              return {
+                type: 'style',
+                value: {
+                  loc: rule.loc,
+                  selectors: [
+                    [{ type: 'class', name: 'testB' }]
+                  ],
+                  declarations: {
+                    declarations: [
+                      {
+                        property: 'color',
+                        value: {
+                          type: 'rgb',
+                          r: 0x00,
+                          g: 0xff,
+                          b: 0x00,
+                          alpha: 1,
+                        }
+                      }
+                    ]
+                  }
+                }
+              };
+            }
+          }
+        }
+      }
+    ])
+  });
+
+  assert.equal(res.code.toString(), '.testA{color:red}.testB{color:#0f0}');
+});
+
 test('known rules', () => {
   let declared = new Map();
   let res = transform({
@@ -686,4 +767,37 @@ test('variables', () => {
   assert.equal(res.code.toString(), 'body{padding:20px;width:600px}');
 });
 
+test('StyleSheet', () => {
+  let styleSheetCalledCount = 0;
+  let styleSheetExitCalledCount = 0;
+  transform({
+    filename: 'test.css',
+    code: Buffer.from(`
+      body {
+        color: blue;
+      }
+    `),
+    visitor: composeVisitors([
+      {
+        StyleSheet() {
+          styleSheetCalledCount++
+        },
+        StyleSheetExit() {
+          styleSheetExitCalledCount++
+        }
+      },
+      {
+        StyleSheet() {
+          styleSheetCalledCount++
+        },
+        StyleSheetExit() {
+          styleSheetExitCalledCount++
+        }
+      }
+    ])
+  });
+  assert.equal(styleSheetCalledCount, 2);
+  assert.equal(styleSheetExitCalledCount, 2);
+});
+
 test.run();