Support for nested at-rules

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [5.5.0] - 2024-09-28
+
+- Support for nested at-rules
+
 ## [5.4.0] - 2024-09-01
 
 - Update `RTLCSS` to version `4.3.0`

src/@types/index.ts

@@ -4,6 +4,8 @@ import {
     Declaration
 } from 'postcss';
 
+export type DeclarationContainer = Rule | AtRule;
+
 export enum Mode {
     combined = 'combined',
     override = 'override',

src/data/store.ts

@@ -1,7 +1,8 @@
-import { Rule, AtRule } from 'postcss';
+import { AtRule } from 'postcss';
 import {
     PluginOptions,
     PluginOptionsNormalized,
+    DeclarationContainer,
     DeclarationPlugin,
     DeclarationPluginProcessor,
     AtRulesObject,
@@ -31,7 +32,7 @@ interface Store {
     keyframesStringMap: AtRulesStringMap;
     keyframesRegExp: RegExp;
     rules: RulesObject[];
-    rulesToRemove: Rule[];
+    containersToRemove: DeclarationContainer[];
     rulesPrefixRegExp: RegExp;
     unmodifiedRules: UnmodifiedRulesObject[];
 }
@@ -169,7 +170,7 @@ const store: Store = {
     keyframesStringMap: {},
     keyframesRegExp: defaultRegExp,
     rules: [],
-    rulesToRemove: [],
+    containersToRemove: [],
     rulesPrefixRegExp: defaultRegExp,
     unmodifiedRules: []
 };
@@ -248,7 +249,7 @@ const initStore = (options: PluginOptions): void => {
     store.keyframesStringMap = {};
     store.keyframesRegExp = defaultRegExp;
     store.rules = [];
-    store.rulesToRemove = [];
+    store.containersToRemove = [];
     store.rulesPrefixRegExp = createRulesPrefixesRegExp(store.options);
     store.unmodifiedRules = [];
 };

src/parsers/atrules.ts

@@ -29,8 +29,13 @@ import {
 import { isAtRule } from '@utilities/predicates';
 import { vendor } from '@utilities/vendor';
 import { parseRules } from '@parsers/rules';
+import { parseDeclarations } from './declarations';
 
-export const parseAtRules = (container: Container): void => {
+export const parseAtRules = (
+    container: Container,
+    parentSourceDirective: string = undefined,
+    hasParentRule = false
+): void => {
 
     const controlDirectives: Record<string, ControlDirective> = {};
 
@@ -56,11 +61,35 @@ export const parseAtRules = (container: Container): void => {
 
             if (vendor.unprefixed(node.name) === KEYFRAMES_NAME) return;
 
-            const sourceDirectiveValue = getSourceDirectiveValue(controlDirectives);
+            const sourceDirectiveValue = getSourceDirectiveValue(
+                controlDirectives,
+                parentSourceDirective
+            );
+
+            if (
+                hasParentRule &&
+                node.nodes
+            ) {
+                parseDeclarations(
+                    node,
+                    hasParentRule,
+                    sourceDirectiveValue,
+                    checkDirective(controlDirectives, CONTROL_DIRECTIVE.RULES),
+                    checkDirective(controlDirectives, CONTROL_DIRECTIVE.URLS)
+                );
+            }
 
-            parseRules(node, sourceDirectiveValue);
+            parseAtRules(
+                node,
+                parentSourceDirective,
+                hasParentRule
+            );
 
-            parseAtRules(node);
+            parseRules(
+                node,
+                sourceDirectiveValue,
+                hasParentRule
+            );
 
         }
     );