remove allowDeclarationsAfterNestedRules

.bin/test-tape.js

@@ -21,10 +21,8 @@ export default async function tape() {
 	failures += await test('ignores invalid entries', { basename: 'ignore' })
 	failures += await test('supports complex entries', { basename: 'complex' })
 	failures += await test('supports all spec examples', { basename: 'spec-examples' })
-	failures += await test('supports spec compliant mixing of nested rules and declarations', { basename: 'mixing-nested-rules-and-declarations-spec' })
-	failures += await test('supports legacy mixing of nested rules and declarations', { basename: 'mixing-nested-rules-and-declarations-legacy', pluginOptions: { allowDeclarationsAfterNestedRules: true } })
 
-	let mixinPlugin = () => {
+	let mixinPluginRule = () => {
 		return {
 			postcssPlugin: 'mixin',
 			AtRule: {
@@ -34,20 +32,35 @@ export default async function tape() {
 			},
 		}
 	}
-	mixinPlugin.postcss = true
-	failures += await test('supports other visitors', { basename: 'mixin' }, mixinPlugin)
+
+	mixinPluginRule.postcss = true
+	failures += await test('supports other visitors (mixin rule)', { basename: 'mixin-rule' }, mixinPluginRule)
+
+	let mixinPluginDeclaration = () => {
+		return {
+			postcssPlugin: 'mixin',
+			AtRule: {
+				mixin(node) {
+					node.replaceWith('color: blue;')
+				},
+			},
+		}
+	}
+
+	mixinPluginDeclaration.postcss = true
+	failures += await test('supports other visitors (mixin declaration)', { basename: 'mixin-declaration' }, mixinPluginDeclaration)
 
 	return failures === 0
 }
 
 async function test(name, init, ...plugins) {
-	const { basename, pluginOptions } = Object(init)
+	const { basename } = Object(init)
 
 	let sourceUrl = new URL(`test/${basename}.css`, workingUrl)
 	let expectUrl = new URL(`test/${basename}.expect.css`, workingUrl)
 	let resultUrl = new URL(`test/${basename}.result.css`, workingUrl)
 
-	plugins.unshift(plugin(pluginOptions))
+	plugins.unshift(plugin())
 
 	let sourceCss = await fs.readFile(sourceUrl, 'utf8')
 	let expectCss = await fs.readFile(expectUrl, 'utf8')

README.md

@@ -71,65 +71,6 @@ import postcssNesting from "https://deno.land/x/postcss_nesting/mod.js";
 await postcss([postcssNesting]).process(YOUR_CSS /*, processOptions */);
 ```
 
-## Options
-
-### allowDeclarationsAfterNestedRules
-
-The [specification](https://www.w3.org/TR/css-nesting-1/#mixing) does not allow declarations after nested rules.
-This was previously supported by this plugin and can be re-enabled with `allowDeclarationsAfterNestedRules`.
-
-Before :
-
-```css
-a {
-  color: red;
-
-  & b {
-    color: white;
-  }
-
-  padding: 20px;
-}
-```
-
-After **without** the option :
-
-```js
-postcssNesting()
-```
-
-```css
-a {
-  color: red;
-}
-
-a b {
-  color: white;
-}
-```
-
-After **with** the option :
-
-```js
-postcssNesting({
-  allowDeclarationsAfterNestedRules: true
-})
-```
-
-```css
-a {
-  color: red;
-}
-
-a b {
-  color: white;
-}
-
-a {
-  padding: 20px;
-}
-```
-
 [cli-img]: https://img.shields.io/travis/csstools/postcss-nesting.svg
 [cli-url]: https://travis-ci.org/csstools/postcss-nesting
 [css-img]: https://cssdb.org/badge/nesting-rules.svg

src/index.js

@@ -1,19 +1,12 @@
-import ensureCorrectMixingOfNestingRulesAndDeclarations from './lib/mixing-nesting-rules-and-declarations.js'
 import walk from './lib/walk.js'
 
 /**
- * @param {{allowDeclarationsAfterNestedRules?: boolean}} opts
  * @returns {import('postcss').Plugin}
  */
-export default function postcssNesting(opts) {
-	const allowDeclarationsAfterNestedRules = Object(opts).allowDeclarationsAfterNestedRules || false
-
+export default function postcssNesting() {
 	return {
 		postcssPlugin: 'postcss-nesting',
 		Rule(rule) {
-			if (!allowDeclarationsAfterNestedRules) {
-				ensureCorrectMixingOfNestingRulesAndDeclarations(rule)
-			}
 			walk(rule)
 		},
 	}

test/basic.expect.css

@@ -24,6 +24,12 @@ a {
 }
 	}
 
+a {
+
+	order: 5;
+	order: 6
+}
+
 a b {
 		order: 7;
 	}
@@ -37,6 +43,11 @@ a b {
 		order: 9;
 	}
 
+a {
+
+	order: 10
+}
+
 body a {
 		order: 11
 }
@@ -50,6 +61,11 @@ body a {
 		order: 13
 }
 
+a {
+
+	order: 14
+}
+
 @media screen {
 
 a {

test/direct.expect.css

@@ -10,6 +10,9 @@ a, b {
 :is(a,b) c, :is(a,b) d {
 		order: 4;
 	}
+a, b {
+	order: 5;
+}
 a, b {
 	order: 1;
 }
@@ -22,3 +25,6 @@ a, b {
 :is(a,b) c, :is(a,b) d {
 		order: 4;
 }
+a, b {
+	order: 5;
+}

test/empty.expect.css

@@ -11,6 +11,9 @@ d e {
 f g {
 		order: 4;
 	}
+f {
+	order: 5;
+}
 a b c {
 			order: 1
 }
@@ -23,3 +26,6 @@ d e {
 f g {
 		order: 4;
 }
+f {
+	order: 5;
+}

test/ignore.expect.css

@@ -1,7 +1,5 @@
 a, b {
-	order: 1
-}
-a, b {
+	order: 1;
 	c, d {
 		order: 2;
 	}
@@ -13,9 +11,7 @@ f:is(g) {
 		order: 5;
 	}
 a, b {
-	order: 1
-}
-a, b {
+	order: 1;
 	@nest c, d {
 		order: 2;
 	}

test/mixin-declaration.css

@@ -0,0 +1,13 @@
+/* prevent regressions : https://github.com/csstools/postcss-nesting/issues/95 */
+body {
+	@mixin;
+
+	background: red;
+	font-size: 1rem;
+
+	@media (min-width: 64em) {
+		background: green;
+	}
+
+	margin: 0;
+}

test/mixin-declaration.expect.css

@@ -0,0 +1,15 @@
+/* prevent regressions : https://github.com/csstools/postcss-nesting/issues/95 */
+body {color: blue;
+
+	background: red;
+	font-size: 1rem;
+}
+@media (min-width: 64em) {
+body {
+		background: green;
+}
+	}
+body {
+
+	margin: 0;
+}