From 919bb8a9ea5e760c48c28aedcda2ff303df73171 Mon Sep 17 00:00:00 2001 From: Romain Menke Date: Sun, 15 Nov 2026 18:58:10 +0100 Subject: [PATCH 1/3] postcss-mixins --- plugins/postcss-mixins/CHANGELOG.md | 10 + plugins/postcss-mixins/README.md | 18 +- plugins/postcss-mixins/dist/index.mjs | 2 +- plugins/postcss-mixins/docs/README.md | 6 + plugins/postcss-mixins/package.json | 3 +- plugins/postcss-mixins/src/index.ts | 16 +- plugins/postcss-mixins/src/mixin-expander.ts | 211 ++++++++-------- .../postcss-mixins/src/processable-apply.ts | 64 ++--- .../postcss-mixins/src/processable-mixin.ts | 128 ++++------ plugins/postcss-mixins/test/_tape.mjs | 18 ++ plugins/postcss-mixins/test/arguments.css | 112 +++++++++ .../postcss-mixins/test/arguments.expect.css | 156 ++++++++++-- .../test/arguments.preserve-true.expect.css | 201 +++++++++++++-- plugins/postcss-mixins/test/basic.expect.css | 2 +- .../test/basic.preserve-true.expect.css | 1 - plugins/postcss-mixins/test/contents.css | 80 ++++++ .../postcss-mixins/test/contents.expect.css | 44 +++- .../test/contents.preserve-true.expect.css | 103 +++++++- .../test/examples/example.expect.css | 6 +- .../examples/example.preserve-true.expect.css | 6 +- plugins/postcss-mixins/test/ignore.css | 8 - plugins/postcss-mixins/test/invalid.css | 4 - .../postcss-mixins/test/invalid.expect.css | 4 - .../test/invalid.preserve-true.expect.css | 4 - plugins/postcss-mixins/test/layer.css | 35 +++ plugins/postcss-mixins/test/layer.expect.css | 12 + .../test/layer.preserve-true.expect.css | 42 ++++ plugins/postcss-mixins/test/nested-mixins.css | 29 +++ .../test/nested-mixins.expect.css | 35 ++- .../nested-mixins.preserve-true.expect.css | 56 ++++- .../postcss-mixins/test/nesting.expect.css | 6 +- .../test/nesting.preserve-true.expect.css | 6 +- plugins/postcss-mixins/test/private.css | 21 ++ .../postcss-mixins/test/private.expect.css | 19 +- .../test/private.preserve-true.expect.css | 37 ++- plugins/postcss-mixins/test/property.css | 122 ++++++++++ .../postcss-mixins/test/property.expect.css | 131 ++++++++++ .../test/property.preserve-true.expect.css | 229 ++++++++++++++++++ plugins/postcss-mixins/test/spaces.css | 12 + plugins/postcss-mixins/test/spaces.expect.css | 145 +++++------ .../test/spaces.preserve-true.expect.css | 154 ++++++------ .../test/wpt/mixin-private.html | 111 +++++++++ 42 files changed, 1910 insertions(+), 499 deletions(-) create mode 100644 plugins/postcss-mixins/test/layer.css create mode 100644 plugins/postcss-mixins/test/layer.expect.css create mode 100644 plugins/postcss-mixins/test/layer.preserve-true.expect.css create mode 100644 plugins/postcss-mixins/test/property.css create mode 100644 plugins/postcss-mixins/test/property.expect.css create mode 100644 plugins/postcss-mixins/test/property.preserve-true.expect.css diff --git a/plugins/postcss-mixins/CHANGELOG.md b/plugins/postcss-mixins/CHANGELOG.md index 9a8ca9c770..1e34ef56dc 100644 --- a/plugins/postcss-mixins/CHANGELOG.md +++ b/plugins/postcss-mixins/CHANGELOG.md @@ -1,5 +1,15 @@ # Changes to PostCSS Mixins +### Unreleased (minor) + +- Support `@property` rules in `@private` rules, including multi-name preludes and the shorthand form, and hoist registrations out of `@container`, `@scope` and `@starting-style` while keeping `@media` and `@supports` conditions +- Rename private property names in `transition` and `transition-property` +- Resolve references in nested mixins, `@contents` fallback blocks and contents blocks inside mixin bodies +- Support trailing commas, whitespace, empty arguments, `--x:` defaults, `type(*)` and `inherit` in parameter lists, and reject `{}` blocks mixed with other tokens +- Ignore invalid `` values and `--` parameter names, and leave mixins untouched when a name has several definitions or one that can not be transpiled +- Drop `@layer` rules from mixin bodies +- Use `@csstools/utilities-for-private-properties` and `@csstools/custom-function-parser` for shared implementation and a separate namespace for generated names + ### 1.1.0 _October 1, 2026_ diff --git a/plugins/postcss-mixins/README.md b/plugins/postcss-mixins/README.md index a30a2a233e..66dd06fc90 100644 --- a/plugins/postcss-mixins/README.md +++ b/plugins/postcss-mixins/README.md @@ -14,7 +14,13 @@ This plugin is only a partial implementation to avoid conflicts with the final s Unsupported: - typed mixin arguments - layered `@mixin` declarations +- conditional `@mixin` declarations - mixin overrides +- private properties in a passed `@contents` block + +`@apply` rules that can not be transpiled are left unchanged, together with all definitions of that mixin name. + +Run `@csstools/postcss-private-rule` after this plugin to resolve private properties from the applying style rule. ```css @mixin --foo() { @@ -53,9 +59,9 @@ Unsupported: } .bar { - --_csstools-p-1gice1e-0--arg-0: 200; - --_csstools-p-1gice1e-1--baz: var(--_csstools-p-1gice1e-0--arg-0); - color: rgb(var(--_csstools-p-1gice1e-1--baz) 127 0); + --_csstools-m-1gice1e-0--arg-0: 200; + --_csstools-m-1gice1e-1--baz: var(--_csstools-m-1gice1e-0--arg-0); + color: rgb(var(--_csstools-m-1gice1e-1--baz) 127 0); } .c { @@ -151,9 +157,9 @@ postcssMixins({ preserve: true }) } .bar { - --_csstools-p-1gice1e-0--arg-0: 200; - --_csstools-p-1gice1e-1--baz: var(--_csstools-p-1gice1e-0--arg-0); - color: rgb(var(--_csstools-p-1gice1e-1--baz) 127 0); + --_csstools-m-1gice1e-0--arg-0: 200; + --_csstools-m-1gice1e-1--baz: var(--_csstools-m-1gice1e-0--arg-0); + color: rgb(var(--_csstools-m-1gice1e-1--baz) 127 0); @apply --bar(200); } diff --git a/plugins/postcss-mixins/dist/index.mjs b/plugins/postcss-mixins/dist/index.mjs index 8ba221d7a3..74c1c9928e 100644 --- a/plugins/postcss-mixins/dist/index.mjs +++ b/plugins/postcss-mixins/dist/index.mjs @@ -1 +1 @@ -import{Rule as e,AtRule as t,Declaration as s}from"postcss";import{Transpiler as n}from"@csstools/postcss-private-rule";import{parseComponentValue as r,isTokenNode as a,isFunctionNode as o,parseCommaSeparatedListOfComponentValues as i,stringify as l,isSimpleBlockNode as u,isWhiteSpaceOrCommentNode as c}from"@csstools/css-parser-algorithms";import{tokenize as p,isTokenIdent as f,isTokenOpenCurly as d,isTokenColon as m}from"@csstools/css-tokenizer";const h=/^apply$/i,g=/!\s*important/i;function processableApplyRule(e){if(!e.params||!e.params.includes("--"))return!1;if(!isInStyleRule(e))return!1;const t=r(p({css:e.params}));let s,n=[];if(a(t)&&f(t.value))s=t.value[4].value;else{if(!o(t))return!1;{s=t.getName();const e=parseArguments(t.value);if(!e)return!1;n=e}}return!!s.startsWith("--")&&{name:s,arguments:n}}function parseArguments(e){const t=i(e.flatMap(e=>e.tokens()));if(1===t.length&&""===l([t[0]]).trim())return[];const s=[];for(const e of t){const t=(1===e.length&&u(e[0])&&d(e[0].startToken)?l([e[0].value]):l([e])).trim();if(""===t)return!1;if(g.test(t))return!1;s.push(t)}return s}const x=/^scope$/i;function isInStyleRule(e){const t=e.parent;return!(!t||"root"===t.type)&&("rule"===t.type||(!("atrule"!==t.type||!x.test(t.name))||isInStyleRule(t)))}const v=/^result$/i,y=/!\s*important/i;function processableMixinRule(e){if("mixin"!==e.name.toLowerCase())return!1;if(!e.params||!e.params.includes("--"))return!1;if(void 0===e.nodes)return!1;if(e.parent!==e.root())return!1;let t=!1;if(e.walk(e=>{"atrule"===e.type&&v.test(e.name)&&(t=!0)}),t)return!1;const s=r(p({css:e.params}));let n,i=[];if(a(s)&&f(s.value))n=s.value[4].value;else{if(!o(s))return!1;{n=s.getName();const e=parseParameters(s.value);if(!e)return!1;i=e}}return!!n.startsWith("--")&&{name:n,parameters:i}}function parseParameters(e){const t=i(e.flatMap(e=>e.tokens()));if(1===t.length&&""===l([t[0]]).trim())return[];const s=[],n=new Set;for(const e of t){let t=0;for(;t{hasMixinAncestor(e)||s.push(e)});for(const e of s)e.parent&&this.expand(e,t)}finish(){for(const e of this.desugaredNestingRules)e.replaceWith(...e.nodes||[]);this.desugaredNestingRules.clear()}expand(e,t){const s=processableApplyRule(e);if(!s)return;const n=this.mixins.get(s.name);if(!n)return;if(this.expanding.has(s.name))return;if(s.arguments.length>n.parameters.length)return;this.expanding.add(s.name);const r=this.buildBody(e,s.arguments,n);this.spendBudget(countNodes(r)),e.before(r),t||e.remove(),needsWrapper(n)&&this.transpile(r),this.replaceContents(r,void 0!==e.nodes,e.nodes||[]),this.expandNested(r),this.expanding.delete(s.name)}buildBody(s,n,r){const a=(r.atRule.nodes||[]).map(e=>e.clone());if(!needsWrapper(r))return a;const o=new e({selector:"&",source:s.source});let i,l;o.raws.semicolon=!0,this.desugaredNestingRules.add(o),r.parameters.length>0&&n.length>0&&(i=new e({selector:"&",source:s.source}),i.raws.semicolon=!0,this.desugaredNestingRules.add(i),l=new t({name:"private",source:s.source}),i.append(l),i.append(o)),r.parameters.length>0&&o.append(this.buildParameterPrivateRule(s,n,r.parameters,l));for(const e of a)o.append(e);return o.cleanRaws(),l?.nodes?.length?(i?.cleanRaws(),[i]):[o]}buildParameterPrivateRule(e,n,r,a){const o=new t({name:"private",source:e.source});for(let t=0;te.clone())),e.remove()}}spendBudget(e){if(this.generatedNodes+=e,this.generatedNodes>1e5)throw new Error("Maximum mixin expansion size exceeded, reduce the complexity of your mixins")}}function needsWrapper(e){return e.parameters.length>0||hasPrivateRules(e.atRule)}function countNodes(e){let t=0;for(const s of e)t++,"rule"!==s.type&&"atrule"!==s.type||(t+=countNodes(s.nodes||[]));return t}function hasPrivateRules(e){let t=!1;return e.walkAtRules(w,()=>{t=!0}),t}function findOwningRule(e){let t=e.parent;for(;t;){if("rule"===t.type)return t;if("atrule"!==t.type||!M.test(t.name))return!1;t=t.parent}return!1}function collectMatches(e,t,s){"atrule"===e.type&&t.test(e.name)&&s.push(e),"rule"!==e.type&&"atrule"!==e.type||e.walkAtRules(t,e=>{s.push(e)})}function collectDeclarationsAndAtRules(e,t,s){"decl"===e.type?t.push(e):"atrule"===e.type&&s.push(e),"rule"!==e.type&&"atrule"!==e.type||e.walk(e=>{"decl"===e.type?t.push(e):"atrule"===e.type&&s.push(e)})}function hasMixinAncestor(e){let t=e.parent;for(;t;){if("atrule"===t.type&&"mixin"===t.name.toLowerCase())return!0;t=t.parent}return!1}const creator=e=>{const t=Object.assign({preserve:!1},e);return{postcssPlugin:"postcss-mixins",prepare(){const e=new MixinExpander;return{postcssPlugin:"mixins",Once(s){const n=[];if(s.each(e=>{"atrule"===e.type&&n.push(e)}),e.registerMixins(n),!t.preserve)for(const t of e.registeredMixins())t.atRule.remove();e.expandAll(s,!0===t.preserve),e.finish()}}}}};creator.postcss=!0;export{creator as default,creator as"module.exports"}; +import{createPrivatePropertyTranspiler as e}from"@csstools/utilities-for-private-properties";import{parseComponentValue as t,isTokenNode as s,isFunctionNode as r,stringify as n}from"@csstools/css-parser-algorithms";import{tokenize as a,isTokenIdent as i}from"@csstools/css-tokenizer";import{parseDashedFunctionArguments as o,parseFunctionParameters as u}from"@csstools/custom-function-parser";const l=/^apply$/i,p=/^(container|layer|media|scope|starting-style|supports)$/i,c=/^keyframes$/i;function processableApplyRule(e){if(!e.params||!e.params.includes("--"))return!1;if(!isInStyleRule(e))return!1;const u=t(a({css:e.params}));let l,p=[];if(s(u)&&i(u.value))l=u.value[4].value;else{if(!r(u))return!1;{l=u.getName();const e=o(u.value);if(!e)return!1;p=e.map(e=>n([e]).trim())}}return!!l.startsWith("--")&&{name:l,arguments:p}}function isInStyleRule(e){let t=e.parent;for(;t;){if("rule"===t.type)return!isKeyframesRule(t);if("atrule"!==t.type||!p.test(t.name))return!1;t=t.parent}return!1}function isKeyframesRule(e){let t=e?.parent;for(;t;){if("atrule"===t.type&&c.test(t.name))return!0;t=t.parent}return!1}const d=/^result$/i;function mixinRuleName(e){if("mixin"!==e.name.toLowerCase())return null;if(!e.params||!e.params.includes("--"))return null;const n=t(a({css:e.params}));let o;if(s(n)&&i(n.value))o=n.value[4].value;else{if(!r(n))return null;o=n.getName()}return o.startsWith("--")?o:null}function processableMixinRule(e){const s=mixinRuleName(e);if(!s)return!1;if(void 0===e.nodes)return!1;if(e.parent!==e.root())return!1;let n=!1;if(e.walk(e=>{"atrule"===e.type&&d.test(e.name)&&(n=!0)}),n)return!1;const i=t(a({css:e.params}));let o=[];if(r(i)){const e=u(i.value);if(!e||e.some(e=>{const t=e.getParameterType();return!!t&&"*"!==t}))return!1;o=e.map(e=>({name:e.getName(),defaultValue:e.getDefaultValue()??void 0}))}return{name:s,parameters:o}}const m=/^contents$/i,f=/^private$/i,h=/^layer$/i;class MixinExpander{mixins=new Map;privateTranspiler=e({namespace:"m",allowUntranspiledMixins:!0});registrations=[];argumentCounter=0;desugaredNestingRules=new Set;expanding=new Set;generatedNodes=0;registeredMixins(){return Array.from(this.mixins.values())}registerMixins(e){const t=new Set;for(const s of e){const e=mixinRuleName(s);if(!e)continue;if(t.has(e)){this.mixins.delete(e);continue}t.add(e);const r=processableMixinRule(s);r&&this.mixins.set(r.name,Object.assign({},r,{atRule:s}))}}expandAll(e,t,s){this.generatedNodes=0;const r=[];e.walkAtRules(l,e=>{hasMixinAncestor(e)||r.push(e)});for(const e of r)e.parent&&this.expand(e,t,s)}finish(e){for(const e of this.desugaredNestingRules)e.replaceWith(...e.nodes||[]);this.desugaredNestingRules.clear(),e.append(...this.registrations),this.registrations=[]}expand(e,t,s){const r=processableApplyRule(e);if(!r)return;const n=this.mixins.get(r.name);if(!n)return;if(this.expanding.has(r.name))return;if(r.arguments.length>n.parameters.length)return;this.expanding.add(r.name);const a=this.buildBody(e,r.arguments,n,s);this.spendBudget(countNodes(a)),e.before(a),t||e.remove(),this.transpile(a),this.replaceContents(a,void 0!==e.nodes,e.nodes||[]),this.expandNested(a,s),this.expanding.delete(r.name)}buildBody(e,t,s,r){const n=cloneMixinBodyNodes(s.atRule);if(!needsWrapper(s))return n;const a=r.rule({selector:"&",source:e.source});let i,o;a.raws.semicolon=!0,this.desugaredNestingRules.add(a);const u=s.parameters.some((e,s)=>s>=t.length&&isInheritKeyword(e.defaultValue));s.parameters.length>0&&(t.length>0||u)&&(i=r.rule({selector:"&",source:e.source}),i.raws.semicolon=!0,this.desugaredNestingRules.add(i),o=r.atRule({name:"private",source:e.source}),i.append(o),i.append(a)),s.parameters.length>0&&a.append(this.buildParameterPrivateRule(e,t,s.parameters,r,o));for(const e of n)a.append(e);return a.cleanRaws(),o?.nodes?.length?(i?.cleanRaws(),[i]):[a]}buildParameterPrivateRule(e,t,s,r,n){const a=r.atRule({name:"private",source:e.source});for(let i=0;ie.clone());e.before(n),e.remove(),t||this.transpile(n)}}spendBudget(e){if(this.generatedNodes+=e,this.generatedNodes>1e5)throw new Error("Maximum mixin expansion size exceeded, reduce the complexity of your mixins")}}function needsWrapper(e){return e.parameters.length>0||hasPrivateRules(e.atRule)}function isInheritKeyword(e){return void 0!==e&&"inherit"===e.trim().toLowerCase()}function cloneMixinBodyNodes(e){const t=[];for(const s of e.nodes||[]){if("atrule"===s.type&&h.test(s.name))continue;const e=s.clone();"rule"!==e.type&&"atrule"!==e.type||e.walkAtRules(h,e=>{e.remove()}),t.push(e)}return t}function countNodes(e){let t=0;for(const s of e)t++,"rule"!==s.type&&"atrule"!==s.type||(t+=countNodes(s.nodes||[]));return t}function hasPrivateRules(e){let t=!1;return e.walkAtRules(f,()=>{t=!0}),t}function collectMatches(e,t,s){"atrule"===e.type&&t.test(e.name)&&s.push(e),"rule"!==e.type&&"atrule"!==e.type||e.walkAtRules(t,e=>{s.push(e)})}function hasMixinAncestor(e){let t=e.parent;for(;t;){if("atrule"===t.type&&"mixin"===t.name.toLowerCase())return!0;t=t.parent}return!1}const creator=e=>{const t=Object.assign({preserve:!1},e);return{postcssPlugin:"postcss-mixins",prepare(){const e=new MixinExpander;return{postcssPlugin:"mixins",Once(s,r){const n=[];if(s.walkAtRules(e=>{n.push(e)}),e.registerMixins(n),!t.preserve)for(const t of e.registeredMixins())t.atRule.remove();e.expandAll(s,!0===t.preserve,r),e.finish(s)}}}}};creator.postcss=!0;export{creator as default,creator as"module.exports"}; diff --git a/plugins/postcss-mixins/docs/README.md b/plugins/postcss-mixins/docs/README.md index e29a67ed77..00cbc35033 100644 --- a/plugins/postcss-mixins/docs/README.md +++ b/plugins/postcss-mixins/docs/README.md @@ -25,7 +25,13 @@ This plugin is only a partial implementation to avoid conflicts with the final s Unsupported: - typed mixin arguments - layered `@mixin` declarations +- conditional `@mixin` declarations - mixin overrides +- private properties in a passed `@contents` block + +`@apply` rules that can not be transpiled are left unchanged, together with all definitions of that mixin name. + +Run `@csstools/postcss-private-rule` after this plugin to resolve private properties from the applying style rule. ```css diff --git a/plugins/postcss-mixins/package.json b/plugins/postcss-mixins/package.json index cea31fb7f6..becb186b10 100644 --- a/plugins/postcss-mixins/package.json +++ b/plugins/postcss-mixins/package.json @@ -43,7 +43,8 @@ "dependencies": { "@csstools/css-parser-algorithms": "^4.0.2", "@csstools/css-tokenizer": "^4.0.2", - "@csstools/postcss-private-rule": "^1.0.3" + "@csstools/custom-function-parser": "^1.0.0", + "@csstools/utilities-for-private-properties": "^0.0.0" }, "peerDependencies": { "postcss": "^8.4" diff --git a/plugins/postcss-mixins/src/index.ts b/plugins/postcss-mixins/src/index.ts index 33f3f2b9bd..b1a5ae9b3b 100644 --- a/plugins/postcss-mixins/src/index.ts +++ b/plugins/postcss-mixins/src/index.ts @@ -24,15 +24,13 @@ const creator: PluginCreator = (opts?: pluginOptions) => { return { postcssPlugin: 'mixins', - Once(root): void { - const rootAtRules: Array = []; - root.each((child) => { - if (child.type === 'atrule') { - rootAtRules.push(child); - } + Once(root, helpers): void { + const atRules: Array = []; + root.walkAtRules((atRule) => { + atRules.push(atRule); }); - expander.registerMixins(rootAtRules); + expander.registerMixins(atRules); if (!options.preserve) { for (const mixin of expander.registeredMixins()) { @@ -40,8 +38,8 @@ const creator: PluginCreator = (opts?: pluginOptions) => { } } - expander.expandAll(root, options.preserve === true); - expander.finish(); + expander.expandAll(root, options.preserve === true, helpers); + expander.finish(root); }, }; }, diff --git a/plugins/postcss-mixins/src/mixin-expander.ts b/plugins/postcss-mixins/src/mixin-expander.ts index c0567885b9..6e0e939868 100644 --- a/plugins/postcss-mixins/src/mixin-expander.ts +++ b/plugins/postcss-mixins/src/mixin-expander.ts @@ -1,9 +1,8 @@ -import { AtRule, Declaration, Rule } from 'postcss'; -import type { ChildNode, Node, Root } from 'postcss'; -import { Transpiler } from '@csstools/postcss-private-rule'; +import type { AtRule, ChildNode, Helpers, Root, Rule } from 'postcss'; +import { createPrivatePropertyTranspiler } from '@csstools/utilities-for-private-properties'; import { IS_APPLY_REGEX, processableApplyRule } from './processable-apply'; import type { MixinParameter } from './processable-mixin'; -import { processableMixinRule } from './processable-mixin'; +import { mixinRuleName, processableMixinRule } from './processable-mixin'; type Mixin = { name: string, @@ -13,7 +12,7 @@ type Mixin = { const IS_CONTENTS_REGEX = /^contents$/i; const IS_PRIVATE_REGEX = /^private$/i; -const IS_NESTING_GROUP_RULE_REGEX = /^(container|layer|media|scope|starting-style|supports)$/i; +const IS_LAYER_REGEX = /^layer$/i; // Mixins can reference each other and duplicate subtrees, which can grow // exponentially. Bound the total number of nodes generated while expanding @@ -29,8 +28,8 @@ const MAX_GENERATED_NODES = 100_000; */ export class MixinExpander { private mixins: Map = new Map(); - private knownMixins: Set = new Set(); - private transpiler: Transpiler = new Transpiler(); + private privateTranspiler = createPrivatePropertyTranspiler({ namespace: 'm', allowUntranspiledMixins: true }); + private registrations: Array = []; private argumentCounter = 0; private desugaredNestingRules: Set = new Set(); private expanding: Set = new Set(); @@ -41,26 +40,37 @@ export class MixinExpander { return Array.from(this.mixins.values()); } - registerMixins(rootAtRules: Array): void { - for (const atRule of rootAtRules) { - const parsed = processableMixinRule(atRule); - if (!parsed) { + registerMixins(atRules: Array): void { + const seen = new Set(); + + for (const atRule of atRules) { + const name = mixinRuleName(atRule); + if (!name) { continue; } - // TODO: support mixin overrides - if (this.knownMixins.has(parsed.name)) { - this.mixins.delete(parsed.name); + if (seen.has(name)) { + // Multiple definitions are resolved by the browser cascade. + // Do not expand any call for this name. + this.mixins.delete(name); + continue; + } + + seen.add(name); + + const parsed = processableMixinRule(atRule); + if (!parsed) { + // The name has a definition that can not be transpiled. + // Do not expand any call for this name. continue; } this.mixins.set(parsed.name, Object.assign({}, parsed, { atRule })); - this.knownMixins.add(parsed.name); } } /** Expands all top level `@apply` rules in `root`, except those authored inside a `@mixin`. */ - expandAll(root: Root, preserve: boolean): void { + expandAll(root: Root, preserve: boolean, helpers: Helpers): void { this.generatedNodes = 0; const applies: Array = []; @@ -77,20 +87,23 @@ export class MixinExpander { continue; } - this.expand(atRule, preserve); + this.expand(atRule, preserve, helpers); } } - /** Removes the temporary `& {}` nesting rules created while desugaring. */ - finish(): void { + /** Removes temporary wrappers and appends registrations to the root. */ + finish(root: Root): void { for (const wrapper of this.desugaredNestingRules) { wrapper.replaceWith(...wrapper.nodes || []); } this.desugaredNestingRules.clear(); + + root.append(...this.registrations); + this.registrations = []; } - private expand(atRule: AtRule, preserve: boolean): void { + private expand(atRule: AtRule, preserve: boolean, helpers: Helpers): void { const apply = processableApplyRule(atRule); if (!apply) { return; @@ -113,7 +126,7 @@ export class MixinExpander { this.expanding.add(apply.name); - const inserted = this.buildBody(atRule, apply.arguments, mixin); + const inserted = this.buildBody(atRule, apply.arguments, mixin, helpers); this.spendBudget(countNodes(inserted)); @@ -125,22 +138,22 @@ export class MixinExpander { atRule.remove(); } - if (needsWrapper(mixin)) { - this.transpile(inserted); - } + // References in the mixin body can point at parameters or private + // properties of the mixin and of the rule it is applied to. + this.transpile(inserted); // `@contents` is substituted after insertion so the replaced at-rule has a parent. // It is substituted after transpilation so passed-in contents are not scoped to the mixin. this.replaceContents(inserted, atRule.nodes !== undefined, atRule.nodes || []); - this.expandNested(inserted); + this.expandNested(inserted, helpers); this.expanding.delete(apply.name); } /** Captures arguments, scopes parameters and `@private` rules, and returns the nodes to insert. */ - private buildBody(atRule: AtRule, args: Array, mixin: Mixin): Array { - const cloned: Array = (mixin.atRule.nodes || []).map((node) => node.clone()); + private buildBody(atRule: AtRule, args: Array, mixin: Mixin, helpers: Helpers): Array { + const cloned = cloneMixinBodyNodes(mixin.atRule); if (!needsWrapper(mixin)) { return cloned; @@ -150,25 +163,29 @@ export class MixinExpander { // Each supplied argument is bound to a fresh custom property so it can not be // shadowed by parameters of nested mixins that reuse the same names. // See: https://github.com/w3c/csswg-drafts/issues/14372 - const bodyWrapper = new Rule({ selector: '&', source: atRule.source }); + const bodyWrapper = helpers.rule({ selector: '&', source: atRule.source }); bodyWrapper.raws.semicolon = true; this.desugaredNestingRules.add(bodyWrapper); let outerWrapper: Rule | undefined; let argumentPrivateRule: AtRule | undefined; - if (mixin.parameters.length > 0 && args.length > 0) { - outerWrapper = new Rule({ selector: '&', source: atRule.source }); + const hasInheritedDefault = mixin.parameters.some((parameter, i) => { + return i >= args.length && isInheritKeyword(parameter.defaultValue); + }); + + if (mixin.parameters.length > 0 && (args.length > 0 || hasInheritedDefault)) { + outerWrapper = helpers.rule({ selector: '&', source: atRule.source }); outerWrapper.raws.semicolon = true; this.desugaredNestingRules.add(outerWrapper); - argumentPrivateRule = new AtRule({ name: 'private', source: atRule.source }); + argumentPrivateRule = helpers.atRule({ name: 'private', source: atRule.source }); outerWrapper.append(argumentPrivateRule); outerWrapper.append(bodyWrapper); } if (mixin.parameters.length > 0) { - bodyWrapper.append(this.buildParameterPrivateRule(atRule, args, mixin.parameters, argumentPrivateRule)); + bodyWrapper.append(this.buildParameterPrivateRule(atRule, args, mixin.parameters, helpers, argumentPrivateRule)); } for (const node of cloned) { @@ -187,8 +204,8 @@ export class MixinExpander { } /** Binds each parameter to its captured argument value, or to its default in the mixin's frame. */ - private buildParameterPrivateRule(atRule: AtRule, args: Array, parameters: Array, argumentPrivateRule?: AtRule): AtRule { - const parameterPrivateRule = new AtRule({ name: 'private', source: atRule.source }); + private buildParameterPrivateRule(atRule: AtRule, args: Array, parameters: Array, helpers: Helpers, argumentPrivateRule?: AtRule): AtRule { + const parameterPrivateRule = helpers.atRule({ name: 'private', source: atRule.source }); for (let i = 0; i < parameters.length; i++) { const parameter = parameters[i]; @@ -198,20 +215,32 @@ export class MixinExpander { if (i < args.length) { const argumentName = `--arg-${(this.argumentCounter++).toString(36)}`; - argumentPrivateRule?.append(new Declaration({ + argumentPrivateRule?.append(helpers.decl({ prop: argumentName, - value: args[i], + value: isInheritKeyword(args[i]) ? `var(${parameter.name})` : args[i], source: atRule.source, })); // The parameter resolves to the captured argument value. + value = `var(${argumentName})`; + } else if (argumentPrivateRule && isInheritKeyword(parameter.defaultValue)) { + const argumentName = `--arg-${(this.argumentCounter++).toString(36)}`; + + // `inherit` on a parameter default resolves to the same-named + // custom property in the calling context. + argumentPrivateRule.append(helpers.decl({ + prop: argumentName, + value: `var(${parameter.name})`, + source: atRule.source, + })); + value = `var(${argumentName})`; } else { // Missing arguments resolve to their default in the mixin's own frame. - value = parameter.defaultValue || 'initial'; + value = parameter.defaultValue ?? 'initial'; } - parameterPrivateRule.append(new Declaration({ + parameterPrivateRule.append(helpers.decl({ prop: parameter.name, value, source: atRule.source, @@ -223,37 +252,11 @@ export class MixinExpander { /** Only `@private` rules that originate from mixins are transpiled here. */ private transpile(inserted: Array): void { - const privateRules: Array = []; - for (const node of inserted) { - collectMatches(node, IS_PRIVATE_REGEX, privateRules); - } - - for (const privateRule of privateRules) { - const owner = findOwningRule(privateRule); - if (!owner) { - continue; - } - - this.transpiler.registerAndRemovePrivateRules(privateRule, owner); - } - - const declarations: Array = []; - const atRules: Array = []; - for (const node of inserted) { - collectDeclarationsAndAtRules(node, declarations, atRules); - } - - for (const declaration of declarations) { - this.transpiler.transpileDeclaration(declaration); - } - - for (const nestedAtRule of atRules) { - this.transpiler.transpileAtRule(nestedAtRule); - } + this.registrations.push(...this.privateTranspiler.transpile(inserted)); } /** Mixins applied within this mixin are resolved in the context of the arguments above. */ - private expandNested(inserted: Array): void { + private expandNested(inserted: Array, helpers: Helpers): void { const nestedApplies: Array = []; for (const node of inserted) { collectMatches(node, IS_APPLY_REGEX, nestedApplies); @@ -264,7 +267,7 @@ export class MixinExpander { continue; } - this.expand(nestedAtRule, false); + this.expand(nestedAtRule, false, helpers); } } @@ -280,8 +283,17 @@ export class MixinExpander { this.spendBudget(countNodes(replacement)); - contentsRule.before(replacement.map((child) => child.clone())); + const substituted = replacement.map((child) => child.clone()); + + contentsRule.before(substituted); contentsRule.remove(); + + // A fallback block is authored in the mixin body. Declarations in it are + // part of the mixin scope and may define private properties. + // Passed-in contents are scoped to the apply site and are left alone. + if (!hasContents) { + this.transpile(substituted); + } } } @@ -298,6 +310,33 @@ function needsWrapper(mixin: Mixin): boolean { return mixin.parameters.length > 0 || hasPrivateRules(mixin.atRule); } +function isInheritKeyword(value: string | undefined): boolean { + return value !== undefined && value.trim().toLowerCase() === 'inherit'; +} + +/** `@layer` is invalid in a mixin body and its contents are dropped when applied. */ +function cloneMixinBodyNodes(atRule: AtRule): Array { + const out: Array = []; + + for (const node of atRule.nodes || []) { + if (node.type === 'atrule' && IS_LAYER_REGEX.test(node.name)) { + continue; + } + + const clone = node.clone(); + + if (clone.type === 'rule' || clone.type === 'atrule') { + clone.walkAtRules(IS_LAYER_REGEX, (layer) => { + layer.remove(); + }); + } + + out.push(clone); + } + + return out; +} + function countNodes(nodes: Array): number { let count = 0; @@ -321,24 +360,6 @@ function hasPrivateRules(atRule: AtRule): boolean { return result; } -function findOwningRule(node: ChildNode): Rule | false { - let parent: Node | undefined = node.parent; - while (parent) { - if (parent.type === 'rule') { - return parent as Rule; - } - - if (parent.type === 'atrule' && IS_NESTING_GROUP_RULE_REGEX.test((parent as AtRule).name)) { - parent = parent.parent; - continue; - } - - return false; - } - - return false; -} - function collectMatches(node: ChildNode, name: RegExp, out: Array): void { if (node.type === 'atrule' && name.test(node.name)) { out.push(node); @@ -351,24 +372,6 @@ function collectMatches(node: ChildNode, name: RegExp, out: Array): void } } -function collectDeclarationsAndAtRules(node: ChildNode, declarations: Array, atRules: Array): void { - if (node.type === 'decl') { - declarations.push(node); - } else if (node.type === 'atrule') { - atRules.push(node); - } - - if (node.type === 'rule' || node.type === 'atrule') { - node.walk((child) => { - if (child.type === 'decl') { - declarations.push(child); - } else if (child.type === 'atrule') { - atRules.push(child); - } - }); - } -} - function hasMixinAncestor(atRule: AtRule): boolean { let parent: AtRule['parent'] = atRule.parent; while (parent) { diff --git a/plugins/postcss-mixins/src/processable-apply.ts b/plugins/postcss-mixins/src/processable-apply.ts index 46bb0027b7..cb56f24cc4 100644 --- a/plugins/postcss-mixins/src/processable-apply.ts +++ b/plugins/postcss-mixins/src/processable-apply.ts @@ -1,7 +1,7 @@ -import type { ComponentValue } from '@csstools/css-parser-algorithms'; -import { isFunctionNode, isSimpleBlockNode, isTokenNode, parseCommaSeparatedListOfComponentValues, parseComponentValue, stringify } from '@csstools/css-parser-algorithms'; -import { isTokenIdent, isTokenOpenCurly, tokenize } from '@csstools/css-tokenizer'; +import { isFunctionNode, isTokenNode, parseComponentValue, stringify } from '@csstools/css-parser-algorithms'; +import { isTokenIdent, tokenize } from '@csstools/css-tokenizer'; import type { AtRule } from 'postcss'; +import { parseDashedFunctionArguments } from '@csstools/custom-function-parser'; export const IS_APPLY_REGEX = /^apply$/i; @@ -10,7 +10,8 @@ export type ProcessableApply = { arguments: Array, }; -const IS_IMPORTANT_REGEX = /!\s*important/i; +const IS_NESTING_GROUP_RULE_REGEX = /^(container|layer|media|scope|starting-style|supports)$/i; +const IS_KEYFRAMES_REGEX = /^keyframes$/i; export function processableApplyRule(atRule: AtRule): false | ProcessableApply { if (!atRule.params || !atRule.params.includes('--')) { @@ -33,12 +34,12 @@ export function processableApplyRule(atRule: AtRule): false | ProcessableApply { } else if (isFunctionNode(prelude)) { name = prelude.getName(); - const parsedArguments = parseArguments(prelude.value); + const parsedArguments = parseDashedFunctionArguments(prelude.value); if (!parsedArguments) { return false; } - args = parsedArguments; + args = parsedArguments.map((argument) => stringify([argument]).trim()); } else { return false; } @@ -53,52 +54,33 @@ export function processableApplyRule(atRule: AtRule): false | ProcessableApply { }; } -function parseArguments(componentValues: Array): false | Array { - const rawArguments = parseCommaSeparatedListOfComponentValues(componentValues.flatMap((componentValue) => componentValue.tokens())); - - // `--foo()` has no arguments. - if (rawArguments.length === 1 && stringify([rawArguments[0]]).trim() === '') { - return []; - } - - const args: Array = []; - - for (const rawArgument of rawArguments) { - // A comma-containing value can be passed as a single argument by wrapping it in `{}`. - const argument = (rawArgument.length === 1 && isSimpleBlockNode(rawArgument[0]) && isTokenOpenCurly(rawArgument[0].startToken) - ? stringify([rawArgument[0].value]) - : stringify([rawArgument]) - ).trim(); +function isInStyleRule(atRule: AtRule): boolean { + let parent = atRule.parent; - if (argument === '') { - return false; + while (parent) { + if (parent.type === 'rule') { + return !isKeyframesRule(parent); } - if (IS_IMPORTANT_REGEX.test(argument)) { + if (parent.type !== 'atrule' || !IS_NESTING_GROUP_RULE_REGEX.test(parent.name)) { return false; } - args.push(argument); + parent = parent.parent; } - return args; + return false; } -const IS_SCOPE_REGEX = /^scope$/i; - -function isInStyleRule(atRule: AtRule): boolean { - const parent = atRule.parent; - if (!parent || parent.type === 'root') { - return false; - } - - if (parent.type === 'rule') { - return true; - } +function isKeyframesRule(rule: AtRule['parent']): boolean { + let parent = rule?.parent; + while (parent) { + if (parent.type === 'atrule' && IS_KEYFRAMES_REGEX.test(parent.name)) { + return true; + } - if (parent.type === 'atrule' && IS_SCOPE_REGEX.test(parent.name)) { - return true; + parent = parent.parent; } - return isInStyleRule(parent); + return false; } diff --git a/plugins/postcss-mixins/src/processable-mixin.ts b/plugins/postcss-mixins/src/processable-mixin.ts index 3d0f8271ef..2db8326dc2 100644 --- a/plugins/postcss-mixins/src/processable-mixin.ts +++ b/plugins/postcss-mixins/src/processable-mixin.ts @@ -1,7 +1,7 @@ -import type { ComponentValue } from '@csstools/css-parser-algorithms'; -import { isFunctionNode, isTokenNode, isWhiteSpaceOrCommentNode, parseCommaSeparatedListOfComponentValues, parseComponentValue, stringify } from '@csstools/css-parser-algorithms'; -import { isTokenColon, isTokenIdent, tokenize } from '@csstools/css-tokenizer'; +import { isFunctionNode, isTokenNode, parseComponentValue } from '@csstools/css-parser-algorithms'; +import { isTokenIdent, tokenize } from '@csstools/css-tokenizer'; import type { AtRule } from 'postcss'; +import { parseFunctionParameters } from '@csstools/custom-function-parser'; export type MixinParameter = { name: string, @@ -14,14 +14,39 @@ export type ProcessableMixin = { }; const IS_UNSUPPORTED_CHILD_RULE = /^result$/i; -const IS_IMPORTANT_REGEX = /!\s*important/i; -export function processableMixinRule(atRule: AtRule): false | ProcessableMixin { +/** + * The name of a `@mixin` rule, even when the rule is not transpilable. + */ +export function mixinRuleName(atRule: AtRule): string | null { if (atRule.name.toLowerCase() !== 'mixin') { - return false; + return null; } if (!atRule.params || !atRule.params.includes('--')) { + return null; + } + + const prelude = parseComponentValue(tokenize({ + css: atRule.params, + })); + + let name: string; + if (isTokenNode(prelude) && isTokenIdent(prelude.value)) { + // `@mixin --foo;` is equivalent to `@mixin --foo();` + name = prelude.value[4].value; + } else if (isFunctionNode(prelude)) { + name = prelude.getName(); + } else { + return null; + } + + return name.startsWith('--') ? name : null; +} + +export function processableMixinRule(atRule: AtRule): false | ProcessableMixin { + const name = mixinRuleName(atRule); + if (!name) { return false; } @@ -50,27 +75,21 @@ export function processableMixinRule(atRule: AtRule): false | ProcessableMixin { css: atRule.params, })); - let name: string; let parameters: Array = []; - if (isTokenNode(prelude) && isTokenIdent(prelude.value)) { - // `@mixin --foo;` is equivalent to `@mixin --foo();` - name = prelude.value[4].value; - } else if (isFunctionNode(prelude)) { - name = prelude.getName(); - - const parsedParameters = parseParameters(prelude.value); - if (!parsedParameters) { + if (isFunctionNode(prelude)) { + const parsedParameters = parseFunctionParameters(prelude.value); + if (!parsedParameters || parsedParameters.some((parameter) => { + const type = parameter.getParameterType(); + return !!type && type !== '*'; + })) { return false; } - parameters = parsedParameters; - } else { - return false; - } - - if (!name.startsWith('--')) { - return false; + parameters = parsedParameters.map((parameter) => ({ + name: parameter.getName(), + defaultValue: parameter.getDefaultValue() ?? undefined, + })); } return { @@ -78,68 +97,3 @@ export function processableMixinRule(atRule: AtRule): false | ProcessableMixin { parameters, }; } - -function parseParameters(componentValues: Array): false | Array { - const rawParameters = parseCommaSeparatedListOfComponentValues(componentValues.flatMap((componentValue) => componentValue.tokens())); - - // `--foo()` has no parameters. - if (rawParameters.length === 1 && stringify([rawParameters[0]]).trim() === '') { - return []; - } - - const parameters: Array = []; - const names = new Set(); - - for (const rawParameter of rawParameters) { - let start = 0; - while (start < rawParameter.length && isWhiteSpaceOrCommentNode(rawParameter[start])) { - start++; - } - - const nameNode = rawParameter[start]; - if (!nameNode || !isTokenNode(nameNode) || !isTokenIdent(nameNode.value) || !nameNode.value[4].value.startsWith('--')) { - return false; - } - - const name = nameNode.value[4].value; - if (names.has(name)) { - return false; - } - - names.add(name); - - let defaultValue: string | undefined; - let hasType = false; - - for (let i = start + 1; i < rawParameter.length; i++) { - const componentValue = rawParameter[i]; - - if (isWhiteSpaceOrCommentNode(componentValue)) { - continue; - } - - if (isTokenNode(componentValue) && isTokenColon(componentValue.value)) { - defaultValue = stringify([rawParameter.slice(i + 1)]).trim() || undefined; - break; - } - - hasType = true; - } - - // TODO: support typed arguments - if (hasType) { - return false; - } - - if (defaultValue && IS_IMPORTANT_REGEX.test(defaultValue)) { - return false; - } - - parameters.push({ - name, - defaultValue, - }); - } - - return parameters; -} diff --git a/plugins/postcss-mixins/test/_tape.mjs b/plugins/postcss-mixins/test/_tape.mjs index 63bcfd9bd6..22de84d026 100644 --- a/plugins/postcss-mixins/test/_tape.mjs +++ b/plugins/postcss-mixins/test/_tape.mjs @@ -65,6 +65,24 @@ postcssTape(plugin)({ preserve: true, }, }, + property: { + message: 'supports @property rules in @private rules', + }, + 'property:preserve-true': { + message: 'supports @property rules in @private rules with { preserve: true }', + options: { + preserve: true, + }, + }, + layer: { + message: 'drops @layer rules from mixin bodies', + }, + 'layer:preserve-true': { + message: 'drops @layer rules from mixin bodies with { preserve: true }', + options: { + preserve: true, + }, + }, invalid: { message: 'ignores invalid mixin invocations', }, diff --git a/plugins/postcss-mixins/test/arguments.css b/plugins/postcss-mixins/test/arguments.css index 8a03e21298..46d9b3c64f 100644 --- a/plugins/postcss-mixins/test/arguments.css +++ b/plugins/postcss-mixins/test/arguments.css @@ -46,3 +46,115 @@ .g { @apply --no-parameter-list; } + +@mixin --trailing-comma(--color,) { + border-color: var(--color); +} + +.h { + @apply --trailing-comma(green); +} + +@mixin --empty-arguments(--color, --background: teal) { + outline-color: var(--color); + background-color: var(--background); +} + +.i { + @apply --empty-arguments(, green); +} + +.j { + @apply --empty-arguments(green, ); +} + +.k { + @apply --empty-arguments(green, ,); +} + +.l { + @apply --empty-arguments(green, blue,); +} + +.m { + @apply --empty-arguments( green , blue ); +} + +@mixin --empty-default(--color:) { + outline-color: var(--color); +} + +.n { + @apply --empty-default; +} + +@mixin --one(--color) { + color: var(--color); +} + +.trailing-comma-single-argument { + @apply --one(red,); +} + +.invalid-important-argument { + @apply --one(red !important); +} + +.invalid-bang-argument { + @apply --one(!); +} + +.invalid-semicolon-argument { + @apply --one(red;); +} + +@mixin --inherit-default(--color: inherit) { + color: var(--color, red); +} + +.inherit-default { + --color: green; + @apply --inherit-default; +} + +@mixin --inherit-default-with-argument(--color: inherit) { + color: var(--color, red); +} + +.inherit-default-with-argument { + --color: green; + @apply --inherit-default-with-argument(blue); +} + +@mixin --inherit-argument(--color) { + color: var(--color, red); +} + +.inherit-argument { + --color: green; + @apply --inherit-argument(inherit); +} + +@mixin --universal-type(--color type(*)) { + color: var(--color); +} + +.universal-type { + @apply --universal-type(green); +} + +@mixin --invalid-default(--color: red !important) { + color: var(--color); +} + +.invalid-default { + @apply --invalid-default; +} + +@mixin --invalid-empty-parameter(--) { + color: red; +} + +.invalid-empty-parameter { + @apply --invalid-empty-parameter; +} diff --git a/plugins/postcss-mixins/test/arguments.expect.css b/plugins/postcss-mixins/test/arguments.expect.css index 510291deb9..ab2d4e8cc7 100644 --- a/plugins/postcss-mixins/test/arguments.expect.css +++ b/plugins/postcss-mixins/test/arguments.expect.css @@ -1,41 +1,157 @@ .a { - --_csstools-p-165tpc7-0--arg-0: green; - --_csstools-p-165tpc7-1--color: var(--_csstools-p-165tpc7-0--arg-0); - color: var(--_csstools-p-165tpc7-1--color); + --_csstools-m-165tpc7-0--arg-0: green; + --_csstools-m-165tpc7-1--color: var(--_csstools-m-165tpc7-0--arg-0); + color: var(--_csstools-m-165tpc7-1--color); } .b { - --_csstools-p-165tpc7-2--color: blue; - --_csstools-p-165tpc7-2--background: red; - color: var(--_csstools-p-165tpc7-2--color); - background-color: var(--_csstools-p-165tpc7-2--background); + --_csstools-m-165tpc7-2--color: blue; + --_csstools-m-165tpc7-2--background: red; + color: var(--_csstools-m-165tpc7-2--color); + background-color: var(--_csstools-m-165tpc7-2--background); } .c { - --_csstools-p-165tpc7-3--arg-1: red; - --_csstools-p-165tpc7-4--color: var(--_csstools-p-165tpc7-3--arg-1); - --_csstools-p-165tpc7-4--background: red; - color: var(--_csstools-p-165tpc7-4--color); - background-color: var(--_csstools-p-165tpc7-4--background); + --_csstools-m-165tpc7-3--arg-1: red; + --_csstools-m-165tpc7-4--color: var(--_csstools-m-165tpc7-3--arg-1); + --_csstools-m-165tpc7-4--background: red; + color: var(--_csstools-m-165tpc7-4--color); + background-color: var(--_csstools-m-165tpc7-4--background); } .d { - --_csstools-p-165tpc7-5--color: initial; - outline-color: var(--_csstools-p-165tpc7-5--color, navy); + --_csstools-m-165tpc7-5--color: initial; + outline-color: var(--_csstools-m-165tpc7-5--color, navy); } .e { - --_csstools-p-165tpc7-6--arg-2: green; - --_csstools-p-165tpc7-7--color: var(--_csstools-p-165tpc7-6--arg-2); - outline-color: var(--_csstools-p-165tpc7-7--color, navy); + --_csstools-m-165tpc7-6--arg-2: green; + --_csstools-m-165tpc7-7--color: var(--_csstools-m-165tpc7-6--arg-2); + outline-color: var(--_csstools-m-165tpc7-7--color, navy); } .f { - --_csstools-p-165tpc7-8--arg-3: color, background; - --_csstools-p-165tpc7-9--list: var(--_csstools-p-165tpc7-8--arg-3); - transition-property: var(--_csstools-p-165tpc7-9--list); + --_csstools-m-165tpc7-8--arg-3: color, background; + --_csstools-m-165tpc7-9--list: var(--_csstools-m-165tpc7-8--arg-3); + transition-property: var(--_csstools-m-165tpc7-9--list); } .g { border: 1px solid green; } + +.h { + --_csstools-m-165tpc7-a--arg-4: green; + --_csstools-m-165tpc7-b--color: var(--_csstools-m-165tpc7-a--arg-4); + border-color: var(--_csstools-m-165tpc7-b--color); +} + +.i { + --_csstools-m-165tpc7-c--arg-5: ; + --_csstools-m-165tpc7-c--arg-6: green; + --_csstools-m-165tpc7-d--color: var(--_csstools-m-165tpc7-c--arg-5); + --_csstools-m-165tpc7-d--background: var(--_csstools-m-165tpc7-c--arg-6); + outline-color: var(--_csstools-m-165tpc7-d--color); + background-color: var(--_csstools-m-165tpc7-d--background); +} + +.j { + --_csstools-m-165tpc7-e--arg-7: green; + --_csstools-m-165tpc7-f--color: var(--_csstools-m-165tpc7-e--arg-7); + --_csstools-m-165tpc7-f--background: teal; + outline-color: var(--_csstools-m-165tpc7-f--color); + background-color: var(--_csstools-m-165tpc7-f--background); +} + +.k { + --_csstools-m-165tpc7-g--arg-8: green; + --_csstools-m-165tpc7-g--arg-9: ; + --_csstools-m-165tpc7-h--color: var(--_csstools-m-165tpc7-g--arg-8); + --_csstools-m-165tpc7-h--background: var(--_csstools-m-165tpc7-g--arg-9); + outline-color: var(--_csstools-m-165tpc7-h--color); + background-color: var(--_csstools-m-165tpc7-h--background); +} + +.l { + --_csstools-m-165tpc7-i--arg-a: green; + --_csstools-m-165tpc7-i--arg-b: blue; + --_csstools-m-165tpc7-j--color: var(--_csstools-m-165tpc7-i--arg-a); + --_csstools-m-165tpc7-j--background: var(--_csstools-m-165tpc7-i--arg-b); + outline-color: var(--_csstools-m-165tpc7-j--color); + background-color: var(--_csstools-m-165tpc7-j--background); +} + +.m { + --_csstools-m-165tpc7-k--arg-c: green; + --_csstools-m-165tpc7-k--arg-d: blue; + --_csstools-m-165tpc7-l--color: var(--_csstools-m-165tpc7-k--arg-c); + --_csstools-m-165tpc7-l--background: var(--_csstools-m-165tpc7-k--arg-d); + outline-color: var(--_csstools-m-165tpc7-l--color); + background-color: var(--_csstools-m-165tpc7-l--background); +} + +.n { + --_csstools-m-165tpc7-m--color: ; + outline-color: var(--_csstools-m-165tpc7-m--color); +} + +.trailing-comma-single-argument { + --_csstools-m-165tpc7-n--arg-e: red; + --_csstools-m-165tpc7-o--color: var(--_csstools-m-165tpc7-n--arg-e); + color: var(--_csstools-m-165tpc7-o--color); +} + +.invalid-important-argument { + @apply --one(red !important); +} + +.invalid-bang-argument { + @apply --one(!); +} + +.invalid-semicolon-argument { + @apply --one(red;); +} + +.inherit-default { + --color: green; + --_csstools-m-165tpc7-p--arg-f: var(--color); + --_csstools-m-165tpc7-q--color: var(--_csstools-m-165tpc7-p--arg-f); + color: var(--_csstools-m-165tpc7-q--color, red); +} + +.inherit-default-with-argument { + --color: green; + --_csstools-m-165tpc7-r--arg-g: blue; + --_csstools-m-165tpc7-s--color: var(--_csstools-m-165tpc7-r--arg-g); + color: var(--_csstools-m-165tpc7-s--color, red); +} + +.inherit-argument { + --color: green; + --_csstools-m-165tpc7-t--arg-h: var(--color); + --_csstools-m-165tpc7-u--color: var(--_csstools-m-165tpc7-t--arg-h); + color: var(--_csstools-m-165tpc7-u--color, red); +} + +.universal-type { + --_csstools-m-165tpc7-v--arg-i: green; + --_csstools-m-165tpc7-w--color: var(--_csstools-m-165tpc7-v--arg-i); + color: var(--_csstools-m-165tpc7-w--color); +} + +@mixin --invalid-default(--color: red !important) { + color: var(--color); +} + +.invalid-default { + @apply --invalid-default; +} + +@mixin --invalid-empty-parameter(--) { + color: red; +} + +.invalid-empty-parameter { + @apply --invalid-empty-parameter; +} diff --git a/plugins/postcss-mixins/test/arguments.preserve-true.expect.css b/plugins/postcss-mixins/test/arguments.preserve-true.expect.css index 012391cd87..517db1e77f 100644 --- a/plugins/postcss-mixins/test/arguments.preserve-true.expect.css +++ b/plugins/postcss-mixins/test/arguments.preserve-true.expect.css @@ -3,9 +3,9 @@ } .a { - --_csstools-p-165tpc7-0--arg-0: green; - --_csstools-p-165tpc7-1--color: var(--_csstools-p-165tpc7-0--arg-0); - color: var(--_csstools-p-165tpc7-1--color); + --_csstools-m-165tpc7-0--arg-0: green; + --_csstools-m-165tpc7-1--color: var(--_csstools-m-165tpc7-0--arg-0); + color: var(--_csstools-m-165tpc7-1--color); @apply --basic(green); } @@ -15,19 +15,19 @@ } .b { - --_csstools-p-165tpc7-2--color: blue; - --_csstools-p-165tpc7-2--background: red; - color: var(--_csstools-p-165tpc7-2--color); - background-color: var(--_csstools-p-165tpc7-2--background); + --_csstools-m-165tpc7-2--color: blue; + --_csstools-m-165tpc7-2--background: red; + color: var(--_csstools-m-165tpc7-2--color); + background-color: var(--_csstools-m-165tpc7-2--background); @apply --defaults; } .c { - --_csstools-p-165tpc7-3--arg-1: red; - --_csstools-p-165tpc7-4--color: var(--_csstools-p-165tpc7-3--arg-1); - --_csstools-p-165tpc7-4--background: red; - color: var(--_csstools-p-165tpc7-4--color); - background-color: var(--_csstools-p-165tpc7-4--background); + --_csstools-m-165tpc7-3--arg-1: red; + --_csstools-m-165tpc7-4--color: var(--_csstools-m-165tpc7-3--arg-1); + --_csstools-m-165tpc7-4--background: red; + color: var(--_csstools-m-165tpc7-4--color); + background-color: var(--_csstools-m-165tpc7-4--background); @apply --defaults(red); } @@ -36,15 +36,15 @@ } .d { - --_csstools-p-165tpc7-5--color: initial; - outline-color: var(--_csstools-p-165tpc7-5--color, navy); + --_csstools-m-165tpc7-5--color: initial; + outline-color: var(--_csstools-m-165tpc7-5--color, navy); @apply --fallback; } .e { - --_csstools-p-165tpc7-6--arg-2: green; - --_csstools-p-165tpc7-7--color: var(--_csstools-p-165tpc7-6--arg-2); - outline-color: var(--_csstools-p-165tpc7-7--color, navy); + --_csstools-m-165tpc7-6--arg-2: green; + --_csstools-m-165tpc7-7--color: var(--_csstools-m-165tpc7-6--arg-2); + outline-color: var(--_csstools-m-165tpc7-7--color, navy); @apply --fallback(green); } @@ -53,9 +53,9 @@ } .f { - --_csstools-p-165tpc7-8--arg-3: color, background; - --_csstools-p-165tpc7-9--list: var(--_csstools-p-165tpc7-8--arg-3); - transition-property: var(--_csstools-p-165tpc7-9--list); + --_csstools-m-165tpc7-8--arg-3: color, background; + --_csstools-m-165tpc7-9--list: var(--_csstools-m-165tpc7-8--arg-3); + transition-property: var(--_csstools-m-165tpc7-9--list); @apply --braces({color, background}); } @@ -67,3 +67,164 @@ border: 1px solid green; @apply --no-parameter-list; } + +@mixin --trailing-comma(--color,) { + border-color: var(--color); +} + +.h { + --_csstools-m-165tpc7-a--arg-4: green; + --_csstools-m-165tpc7-b--color: var(--_csstools-m-165tpc7-a--arg-4); + border-color: var(--_csstools-m-165tpc7-b--color); + @apply --trailing-comma(green); +} + +@mixin --empty-arguments(--color, --background: teal) { + outline-color: var(--color); + background-color: var(--background); +} + +.i { + --_csstools-m-165tpc7-c--arg-5: ; + --_csstools-m-165tpc7-c--arg-6: green; + --_csstools-m-165tpc7-d--color: var(--_csstools-m-165tpc7-c--arg-5); + --_csstools-m-165tpc7-d--background: var(--_csstools-m-165tpc7-c--arg-6); + outline-color: var(--_csstools-m-165tpc7-d--color); + background-color: var(--_csstools-m-165tpc7-d--background); + @apply --empty-arguments(, green); +} + +.j { + --_csstools-m-165tpc7-e--arg-7: green; + --_csstools-m-165tpc7-f--color: var(--_csstools-m-165tpc7-e--arg-7); + --_csstools-m-165tpc7-f--background: teal; + outline-color: var(--_csstools-m-165tpc7-f--color); + background-color: var(--_csstools-m-165tpc7-f--background); + @apply --empty-arguments(green, ); +} + +.k { + --_csstools-m-165tpc7-g--arg-8: green; + --_csstools-m-165tpc7-g--arg-9: ; + --_csstools-m-165tpc7-h--color: var(--_csstools-m-165tpc7-g--arg-8); + --_csstools-m-165tpc7-h--background: var(--_csstools-m-165tpc7-g--arg-9); + outline-color: var(--_csstools-m-165tpc7-h--color); + background-color: var(--_csstools-m-165tpc7-h--background); + @apply --empty-arguments(green, ,); +} + +.l { + --_csstools-m-165tpc7-i--arg-a: green; + --_csstools-m-165tpc7-i--arg-b: blue; + --_csstools-m-165tpc7-j--color: var(--_csstools-m-165tpc7-i--arg-a); + --_csstools-m-165tpc7-j--background: var(--_csstools-m-165tpc7-i--arg-b); + outline-color: var(--_csstools-m-165tpc7-j--color); + background-color: var(--_csstools-m-165tpc7-j--background); + @apply --empty-arguments(green, blue,); +} + +.m { + --_csstools-m-165tpc7-k--arg-c: green; + --_csstools-m-165tpc7-k--arg-d: blue; + --_csstools-m-165tpc7-l--color: var(--_csstools-m-165tpc7-k--arg-c); + --_csstools-m-165tpc7-l--background: var(--_csstools-m-165tpc7-k--arg-d); + outline-color: var(--_csstools-m-165tpc7-l--color); + background-color: var(--_csstools-m-165tpc7-l--background); + @apply --empty-arguments( green , blue ); +} + +@mixin --empty-default(--color:) { + outline-color: var(--color); +} + +.n { + --_csstools-m-165tpc7-m--color: ; + outline-color: var(--_csstools-m-165tpc7-m--color); + @apply --empty-default; +} + +@mixin --one(--color) { + color: var(--color); +} + +.trailing-comma-single-argument { + --_csstools-m-165tpc7-n--arg-e: red; + --_csstools-m-165tpc7-o--color: var(--_csstools-m-165tpc7-n--arg-e); + color: var(--_csstools-m-165tpc7-o--color); + @apply --one(red,); +} + +.invalid-important-argument { + @apply --one(red !important); +} + +.invalid-bang-argument { + @apply --one(!); +} + +.invalid-semicolon-argument { + @apply --one(red;); +} + +@mixin --inherit-default(--color: inherit) { + color: var(--color, red); +} + +.inherit-default { + --color: green; + --_csstools-m-165tpc7-p--arg-f: var(--color); + --_csstools-m-165tpc7-q--color: var(--_csstools-m-165tpc7-p--arg-f); + color: var(--_csstools-m-165tpc7-q--color, red); + @apply --inherit-default; +} + +@mixin --inherit-default-with-argument(--color: inherit) { + color: var(--color, red); +} + +.inherit-default-with-argument { + --color: green; + --_csstools-m-165tpc7-r--arg-g: blue; + --_csstools-m-165tpc7-s--color: var(--_csstools-m-165tpc7-r--arg-g); + color: var(--_csstools-m-165tpc7-s--color, red); + @apply --inherit-default-with-argument(blue); +} + +@mixin --inherit-argument(--color) { + color: var(--color, red); +} + +.inherit-argument { + --color: green; + --_csstools-m-165tpc7-t--arg-h: var(--color); + --_csstools-m-165tpc7-u--color: var(--_csstools-m-165tpc7-t--arg-h); + color: var(--_csstools-m-165tpc7-u--color, red); + @apply --inherit-argument(inherit); +} + +@mixin --universal-type(--color type(*)) { + color: var(--color); +} + +.universal-type { + --_csstools-m-165tpc7-v--arg-i: green; + --_csstools-m-165tpc7-w--color: var(--_csstools-m-165tpc7-v--arg-i); + color: var(--_csstools-m-165tpc7-w--color); + @apply --universal-type(green); +} + +@mixin --invalid-default(--color: red !important) { + color: var(--color); +} + +.invalid-default { + @apply --invalid-default; +} + +@mixin --invalid-empty-parameter(--) { + color: red; +} + +.invalid-empty-parameter { + @apply --invalid-empty-parameter; +} diff --git a/plugins/postcss-mixins/test/basic.expect.css b/plugins/postcss-mixins/test/basic.expect.css index 73878cce64..0994793559 100644 --- a/plugins/postcss-mixins/test/basic.expect.css +++ b/plugins/postcss-mixins/test/basic.expect.css @@ -3,7 +3,7 @@ } @scope (.foo) { - color: green; + @apply --foo(); } .bar { diff --git a/plugins/postcss-mixins/test/basic.preserve-true.expect.css b/plugins/postcss-mixins/test/basic.preserve-true.expect.css index 3900c04f84..2eea05b6a8 100644 --- a/plugins/postcss-mixins/test/basic.preserve-true.expect.css +++ b/plugins/postcss-mixins/test/basic.preserve-true.expect.css @@ -8,7 +8,6 @@ } @scope (.foo) { - color: green; @apply --foo(); } diff --git a/plugins/postcss-mixins/test/contents.css b/plugins/postcss-mixins/test/contents.css index d6ab4193db..961bb321b2 100644 --- a/plugins/postcss-mixins/test/contents.css +++ b/plugins/postcss-mixins/test/contents.css @@ -69,3 +69,83 @@ background-color: var(--color); } } + +@mixin --fallback-argument(--color) { + @contents { + color: var(--color); + } +} + +.fallback-argument { + --color: blue; + @apply --fallback-argument(red); +} + +@mixin --contents-inner() { + @contents; +} + +@mixin --contents-outer(--color) { + @apply --contents-inner { + color: var(--color); + } +} + +.contents-outer { + --color: blue; + @apply --contents-outer(red); +} + +@mixin --fallback-private() { + @contents { + @private { + --x: red; + } + color: var(--x); + } +} + +.fallback-private { + @apply --fallback-private; +} + +@mixin --discarded-fallback() { + @contents { + @private { + --x: red; + } + } + color: var(--x); +} + +.discarded-fallback { + --x: green; + @apply --discarded-fallback { + color: blue; + } +} + +@mixin --contents-scope() { + @private { + --size: 20px; + } + @contents; +} + +.contents-scope { + @apply --contents-scope { + width: var(--size, 33px); + } +} + +@mixin --fallback-nested-rule(--color) { + @contents { + & .nested-fallback { + color: var(--color); + } + } +} + +.fallback-nested-rule { + @apply --fallback-nested-rule(red); +} diff --git a/plugins/postcss-mixins/test/contents.expect.css b/plugins/postcss-mixins/test/contents.expect.css index 5e42d2ef51..29582cb854 100644 --- a/plugins/postcss-mixins/test/contents.expect.css +++ b/plugins/postcss-mixins/test/contents.expect.css @@ -34,8 +34,46 @@ } .i { - --_csstools-p-1i0jh25-0--arg-0: green; - --_csstools-p-1i0jh25-1--color: var(--_csstools-p-1i0jh25-0--arg-0); - color: var(--_csstools-p-1i0jh25-1--color); + --_csstools-m-1i0jh25-0--arg-0: green; + --_csstools-m-1i0jh25-1--color: var(--_csstools-m-1i0jh25-0--arg-0); + color: var(--_csstools-m-1i0jh25-1--color); background-color: var(--color) } + +.fallback-argument { + --color: blue; + --_csstools-m-1i0jh25-2--arg-1: red; + --_csstools-m-1i0jh25-3--color: var(--_csstools-m-1i0jh25-2--arg-1); + color: var(--_csstools-m-1i0jh25-3--color); +} + +.contents-outer { + --color: blue; + --_csstools-m-1i0jh25-4--arg-2: red; + --_csstools-m-1i0jh25-5--color: var(--_csstools-m-1i0jh25-4--arg-2); + color: var(--_csstools-m-1i0jh25-5--color); +} + +.fallback-private { + --_csstools-m-1i0jh25-6--x: red; + color: var(--_csstools-m-1i0jh25-6--x); +} + +.discarded-fallback { + --x: green; + color: blue; + color: var(--x) +} + +.contents-scope { + --_csstools-m-1i0jh25-7--size: 20px; + width: var(--size, 33px) +} + +.fallback-nested-rule { + --_csstools-m-1i0jh25-8--arg-3: red; + --_csstools-m-1i0jh25-9--color: var(--_csstools-m-1i0jh25-8--arg-3); + & .nested-fallback { + color: var(--_csstools-m-1i0jh25-9--color); + } +} diff --git a/plugins/postcss-mixins/test/contents.preserve-true.expect.css b/plugins/postcss-mixins/test/contents.preserve-true.expect.css index d9dc5645c6..e64c81315c 100644 --- a/plugins/postcss-mixins/test/contents.preserve-true.expect.css +++ b/plugins/postcss-mixins/test/contents.preserve-true.expect.css @@ -76,11 +76,108 @@ } .i { - --_csstools-p-1i0jh25-0--arg-0: green; - --_csstools-p-1i0jh25-1--color: var(--_csstools-p-1i0jh25-0--arg-0); - color: var(--_csstools-p-1i0jh25-1--color); + --_csstools-m-1i0jh25-0--arg-0: green; + --_csstools-m-1i0jh25-1--color: var(--_csstools-m-1i0jh25-0--arg-0); + color: var(--_csstools-m-1i0jh25-1--color); background-color: var(--color); @apply --args-and-contents(green) { background-color: var(--color); } } + +@mixin --fallback-argument(--color) { + @contents { + color: var(--color); + } +} + +.fallback-argument { + --color: blue; + --_csstools-m-1i0jh25-2--arg-1: red; + --_csstools-m-1i0jh25-3--color: var(--_csstools-m-1i0jh25-2--arg-1); + color: var(--_csstools-m-1i0jh25-3--color); + @apply --fallback-argument(red); +} + +@mixin --contents-inner() { + @contents; +} + +@mixin --contents-outer(--color) { + @apply --contents-inner { + color: var(--color); + } +} + +.contents-outer { + --color: blue; + --_csstools-m-1i0jh25-4--arg-2: red; + --_csstools-m-1i0jh25-5--color: var(--_csstools-m-1i0jh25-4--arg-2); + color: var(--_csstools-m-1i0jh25-5--color); + @apply --contents-outer(red); +} + +@mixin --fallback-private() { + @contents { + @private { + --x: red; + } + color: var(--x); + } +} + +.fallback-private { + --_csstools-m-1i0jh25-6--x: red; + color: var(--_csstools-m-1i0jh25-6--x); + @apply --fallback-private; +} + +@mixin --discarded-fallback() { + @contents { + @private { + --x: red; + } + } + color: var(--x); +} + +.discarded-fallback { + --x: green; + color: blue; + color: var(--x); + @apply --discarded-fallback { + color: blue; + } +} + +@mixin --contents-scope() { + @private { + --size: 20px; + } + @contents; +} + +.contents-scope { + --_csstools-m-1i0jh25-7--size: 20px; + width: var(--size, 33px); + @apply --contents-scope { + width: var(--size, 33px); + } +} + +@mixin --fallback-nested-rule(--color) { + @contents { + & .nested-fallback { + color: var(--color); + } + } +} + +.fallback-nested-rule { + --_csstools-m-1i0jh25-8--arg-3: red; + --_csstools-m-1i0jh25-9--color: var(--_csstools-m-1i0jh25-8--arg-3); + & .nested-fallback { + color: var(--_csstools-m-1i0jh25-9--color); + } + @apply --fallback-nested-rule(red); +} diff --git a/plugins/postcss-mixins/test/examples/example.expect.css b/plugins/postcss-mixins/test/examples/example.expect.css index be1ce98b68..fdc06e4f2e 100644 --- a/plugins/postcss-mixins/test/examples/example.expect.css +++ b/plugins/postcss-mixins/test/examples/example.expect.css @@ -3,9 +3,9 @@ } .bar { - --_csstools-p-1gice1e-0--arg-0: 200; - --_csstools-p-1gice1e-1--baz: var(--_csstools-p-1gice1e-0--arg-0); - color: rgb(var(--_csstools-p-1gice1e-1--baz) 127 0); + --_csstools-m-1gice1e-0--arg-0: 200; + --_csstools-m-1gice1e-1--baz: var(--_csstools-m-1gice1e-0--arg-0); + color: rgb(var(--_csstools-m-1gice1e-1--baz) 127 0); } .c { diff --git a/plugins/postcss-mixins/test/examples/example.preserve-true.expect.css b/plugins/postcss-mixins/test/examples/example.preserve-true.expect.css index 79a9e59080..39d9fab458 100644 --- a/plugins/postcss-mixins/test/examples/example.preserve-true.expect.css +++ b/plugins/postcss-mixins/test/examples/example.preserve-true.expect.css @@ -12,9 +12,9 @@ } .bar { - --_csstools-p-1gice1e-0--arg-0: 200; - --_csstools-p-1gice1e-1--baz: var(--_csstools-p-1gice1e-0--arg-0); - color: rgb(var(--_csstools-p-1gice1e-1--baz) 127 0); + --_csstools-m-1gice1e-0--arg-0: 200; + --_csstools-m-1gice1e-1--baz: var(--_csstools-m-1gice1e-0--arg-0); + color: rgb(var(--_csstools-m-1gice1e-1--baz) 127 0); @apply --bar(200); } diff --git a/plugins/postcss-mixins/test/ignore.css b/plugins/postcss-mixins/test/ignore.css index 5f98dd28f4..fdc3033c63 100644 --- a/plugins/postcss-mixins/test/ignore.css +++ b/plugins/postcss-mixins/test/ignore.css @@ -61,11 +61,3 @@ .ignore-i { @apply --ignore-i; } - -@mixin --ignore-j(--color,) { - color: var(--color); -} - -.ignore-j { - @apply --ignore-j(red); -} diff --git a/plugins/postcss-mixins/test/invalid.css b/plugins/postcss-mixins/test/invalid.css index fd1327cf63..93122c65a3 100644 --- a/plugins/postcss-mixins/test/invalid.css +++ b/plugins/postcss-mixins/test/invalid.css @@ -10,10 +10,6 @@ @apply --one(red !important); } -.trailing-empty-argument { - @apply --one(red,); -} - .leading-empty-argument { @apply --one(,red); } diff --git a/plugins/postcss-mixins/test/invalid.expect.css b/plugins/postcss-mixins/test/invalid.expect.css index d5d99732c0..d3117b8c45 100644 --- a/plugins/postcss-mixins/test/invalid.expect.css +++ b/plugins/postcss-mixins/test/invalid.expect.css @@ -6,10 +6,6 @@ @apply --one(red !important); } -.trailing-empty-argument { - @apply --one(red,); -} - .leading-empty-argument { @apply --one(,red); } diff --git a/plugins/postcss-mixins/test/invalid.preserve-true.expect.css b/plugins/postcss-mixins/test/invalid.preserve-true.expect.css index fd1327cf63..93122c65a3 100644 --- a/plugins/postcss-mixins/test/invalid.preserve-true.expect.css +++ b/plugins/postcss-mixins/test/invalid.preserve-true.expect.css @@ -10,10 +10,6 @@ @apply --one(red !important); } -.trailing-empty-argument { - @apply --one(red,); -} - .leading-empty-argument { @apply --one(,red); } diff --git a/plugins/postcss-mixins/test/layer.css b/plugins/postcss-mixins/test/layer.css new file mode 100644 index 0000000000..d208905c28 --- /dev/null +++ b/plugins/postcss-mixins/test/layer.css @@ -0,0 +1,35 @@ +@mixin --with-layer() { + @layer one { + color: red; + } + + @layer two { + @layer three { + color: orange; + } + } + + @media (min-width: 1px) { + @layer four { + color: yellow; + } + + color: green; + } + + color: blue; +} + +.layer { + @apply --with-layer; +} + +@mixin --only-layer() { + @layer one { + color: red; + } +} + +.only-layer { + @apply --only-layer; +} diff --git a/plugins/postcss-mixins/test/layer.expect.css b/plugins/postcss-mixins/test/layer.expect.css new file mode 100644 index 0000000000..d2d1a4da75 --- /dev/null +++ b/plugins/postcss-mixins/test/layer.expect.css @@ -0,0 +1,12 @@ +.layer { + + @media (min-width: 1px) { + + color: green; + } + + color: blue; +} + +.only-layer { +} diff --git a/plugins/postcss-mixins/test/layer.preserve-true.expect.css b/plugins/postcss-mixins/test/layer.preserve-true.expect.css new file mode 100644 index 0000000000..fe6f1b78f6 --- /dev/null +++ b/plugins/postcss-mixins/test/layer.preserve-true.expect.css @@ -0,0 +1,42 @@ +@mixin --with-layer() { + @layer one { + color: red; + } + + @layer two { + @layer three { + color: orange; + } + } + + @media (min-width: 1px) { + @layer four { + color: yellow; + } + + color: green; + } + + color: blue; +} + +.layer { + + @media (min-width: 1px) { + + color: green; + } + + color: blue; + @apply --with-layer; +} + +@mixin --only-layer() { + @layer one { + color: red; + } +} + +.only-layer { + @apply --only-layer; +} diff --git a/plugins/postcss-mixins/test/nested-mixins.css b/plugins/postcss-mixins/test/nested-mixins.css index e407432238..da543b0a15 100644 --- a/plugins/postcss-mixins/test/nested-mixins.css +++ b/plugins/postcss-mixins/test/nested-mixins.css @@ -47,3 +47,32 @@ .d { @apply --cycle-a; } + +@mixin --nested-argument-inner() { + color: var(--color); +} + +@mixin --nested-argument-outer(--color) { + @apply --nested-argument-inner; +} + +.nested-argument { + --color: blue; + @apply --nested-argument-outer(red); +} + +@mixin --nested-private-inner() { + color: var(--x); +} + +@mixin --nested-private-outer() { + @private { + --x: red; + } + @apply --nested-private-inner; +} + +.nested-private { + --color: blue; + @apply --nested-private-outer; +} diff --git a/plugins/postcss-mixins/test/nested-mixins.expect.css b/plugins/postcss-mixins/test/nested-mixins.expect.css index 6c662c96eb..f8ce6d860b 100644 --- a/plugins/postcss-mixins/test/nested-mixins.expect.css +++ b/plugins/postcss-mixins/test/nested-mixins.expect.css @@ -4,22 +4,35 @@ } .b { - --_csstools-p-1rmdrz7-0--arg-0: red; - --_csstools-p-1rmdrz7-1--outer-color: var(--_csstools-p-1rmdrz7-0--arg-0); - --_csstools-p-1rmdrz7-2--arg-1: var(--_csstools-p-1rmdrz7-1--outer-color); - --_csstools-p-1rmdrz7-3--inner-color: var(--_csstools-p-1rmdrz7-2--arg-1); - border-color: var(--_csstools-p-1rmdrz7-3--inner-color); + --_csstools-m-1rmdrz7-0--arg-0: red; + --_csstools-m-1rmdrz7-1--outer-color: var(--_csstools-m-1rmdrz7-0--arg-0); + --_csstools-m-1rmdrz7-2--arg-1: var(--_csstools-m-1rmdrz7-1--outer-color); + --_csstools-m-1rmdrz7-3--inner-color: var(--_csstools-m-1rmdrz7-2--arg-1); + border-color: var(--_csstools-m-1rmdrz7-3--inner-color); } .c { - --_csstools-p-1rmdrz7-4--arg-2: red; - --_csstools-p-1rmdrz7-5--color: var(--_csstools-p-1rmdrz7-4--arg-2); - --_csstools-p-1rmdrz7-6--arg-3: blue; - --_csstools-p-1rmdrz7-7--color: var(--_csstools-p-1rmdrz7-6--arg-3); - border-color: var(--_csstools-p-1rmdrz7-7--color); - color: var(--_csstools-p-1rmdrz7-5--color); + --_csstools-m-1rmdrz7-4--arg-2: red; + --_csstools-m-1rmdrz7-5--color: var(--_csstools-m-1rmdrz7-4--arg-2); + --_csstools-m-1rmdrz7-6--arg-3: blue; + --_csstools-m-1rmdrz7-7--color: var(--_csstools-m-1rmdrz7-6--arg-3); + border-color: var(--_csstools-m-1rmdrz7-7--color); + color: var(--_csstools-m-1rmdrz7-5--color); } .d { @apply --cycle-a; } + +.nested-argument { + --color: blue; + --_csstools-m-1rmdrz7-8--arg-4: red; + --_csstools-m-1rmdrz7-9--color: var(--_csstools-m-1rmdrz7-8--arg-4); + color: var(--_csstools-m-1rmdrz7-9--color); +} + +.nested-private { + --color: blue; + --_csstools-m-1rmdrz7-a--x: red; + color: var(--_csstools-m-1rmdrz7-a--x); +} diff --git a/plugins/postcss-mixins/test/nested-mixins.preserve-true.expect.css b/plugins/postcss-mixins/test/nested-mixins.preserve-true.expect.css index f417dceb0c..71e772c99f 100644 --- a/plugins/postcss-mixins/test/nested-mixins.preserve-true.expect.css +++ b/plugins/postcss-mixins/test/nested-mixins.preserve-true.expect.css @@ -22,11 +22,11 @@ } .b { - --_csstools-p-1rmdrz7-0--arg-0: red; - --_csstools-p-1rmdrz7-1--outer-color: var(--_csstools-p-1rmdrz7-0--arg-0); - --_csstools-p-1rmdrz7-2--arg-1: var(--_csstools-p-1rmdrz7-1--outer-color); - --_csstools-p-1rmdrz7-3--inner-color: var(--_csstools-p-1rmdrz7-2--arg-1); - border-color: var(--_csstools-p-1rmdrz7-3--inner-color); + --_csstools-m-1rmdrz7-0--arg-0: red; + --_csstools-m-1rmdrz7-1--outer-color: var(--_csstools-m-1rmdrz7-0--arg-0); + --_csstools-m-1rmdrz7-2--arg-1: var(--_csstools-m-1rmdrz7-1--outer-color); + --_csstools-m-1rmdrz7-3--inner-color: var(--_csstools-m-1rmdrz7-2--arg-1); + border-color: var(--_csstools-m-1rmdrz7-3--inner-color); @apply --outer-args(red); } @@ -40,12 +40,12 @@ } .c { - --_csstools-p-1rmdrz7-4--arg-2: red; - --_csstools-p-1rmdrz7-5--color: var(--_csstools-p-1rmdrz7-4--arg-2); - --_csstools-p-1rmdrz7-6--arg-3: blue; - --_csstools-p-1rmdrz7-7--color: var(--_csstools-p-1rmdrz7-6--arg-3); - border-color: var(--_csstools-p-1rmdrz7-7--color); - color: var(--_csstools-p-1rmdrz7-5--color); + --_csstools-m-1rmdrz7-4--arg-2: red; + --_csstools-m-1rmdrz7-5--color: var(--_csstools-m-1rmdrz7-4--arg-2); + --_csstools-m-1rmdrz7-6--arg-3: blue; + --_csstools-m-1rmdrz7-7--color: var(--_csstools-m-1rmdrz7-6--arg-3); + border-color: var(--_csstools-m-1rmdrz7-7--color); + color: var(--_csstools-m-1rmdrz7-5--color); @apply --shadow-outer(red); } @@ -61,3 +61,37 @@ @apply --cycle-a; @apply --cycle-a; } + +@mixin --nested-argument-inner() { + color: var(--color); +} + +@mixin --nested-argument-outer(--color) { + @apply --nested-argument-inner; +} + +.nested-argument { + --color: blue; + --_csstools-m-1rmdrz7-8--arg-4: red; + --_csstools-m-1rmdrz7-9--color: var(--_csstools-m-1rmdrz7-8--arg-4); + color: var(--_csstools-m-1rmdrz7-9--color); + @apply --nested-argument-outer(red); +} + +@mixin --nested-private-inner() { + color: var(--x); +} + +@mixin --nested-private-outer() { + @private { + --x: red; + } + @apply --nested-private-inner; +} + +.nested-private { + --color: blue; + --_csstools-m-1rmdrz7-a--x: red; + color: var(--_csstools-m-1rmdrz7-a--x); + @apply --nested-private-outer; +} diff --git a/plugins/postcss-mixins/test/nesting.expect.css b/plugins/postcss-mixins/test/nesting.expect.css index 99242775e4..6a2626b8db 100644 --- a/plugins/postcss-mixins/test/nesting.expect.css +++ b/plugins/postcss-mixins/test/nesting.expect.css @@ -13,10 +13,10 @@ } .b { - --_csstools-p-1sa7v3t-0--arg-0: red; - --_csstools-p-1sa7v3t-1--color: var(--_csstools-p-1sa7v3t-0--arg-0); + --_csstools-m-1sa7v3t-0--arg-0: red; + --_csstools-m-1sa7v3t-1--color: var(--_csstools-m-1sa7v3t-0--arg-0); & { - color: var(--_csstools-p-1sa7v3t-1--color); + color: var(--_csstools-m-1sa7v3t-1--color); } } diff --git a/plugins/postcss-mixins/test/nesting.preserve-true.expect.css b/plugins/postcss-mixins/test/nesting.preserve-true.expect.css index 5b0c5566ba..c4ce7e9ab4 100644 --- a/plugins/postcss-mixins/test/nesting.preserve-true.expect.css +++ b/plugins/postcss-mixins/test/nesting.preserve-true.expect.css @@ -28,10 +28,10 @@ } .b { - --_csstools-p-1sa7v3t-0--arg-0: red; - --_csstools-p-1sa7v3t-1--color: var(--_csstools-p-1sa7v3t-0--arg-0); + --_csstools-m-1sa7v3t-0--arg-0: red; + --_csstools-m-1sa7v3t-1--color: var(--_csstools-m-1sa7v3t-0--arg-0); & { - color: var(--_csstools-p-1sa7v3t-1--color); + color: var(--_csstools-m-1sa7v3t-1--color); } @apply --author-nesting-with-args(red); } diff --git a/plugins/postcss-mixins/test/private.css b/plugins/postcss-mixins/test/private.css index e3d299342c..5fbff5364b 100644 --- a/plugins/postcss-mixins/test/private.css +++ b/plugins/postcss-mixins/test/private.css @@ -21,3 +21,24 @@ .b { @apply --args-and-private(red); } + +@mixin --inner-private() { + @private { + --x: 1px; + } + + width: var(--x); +} + +@mixin --outer-private() { + @private { + --y: 2px; + } + + @apply --inner-private; + height: var(--y); +} + +.nested-private { + @apply --outer-private; +} diff --git a/plugins/postcss-mixins/test/private.expect.css b/plugins/postcss-mixins/test/private.expect.css index 0f1abefbc9..0778a27b3f 100644 --- a/plugins/postcss-mixins/test/private.expect.css +++ b/plugins/postcss-mixins/test/private.expect.css @@ -1,11 +1,18 @@ .a { - --_csstools-p-pjvzd8-0--shadow: 2px 2px black; - box-shadow: var(--_csstools-p-pjvzd8-0--shadow); + --_csstools-m-pjvzd8-0--shadow: 2px 2px black; + box-shadow: var(--_csstools-m-pjvzd8-0--shadow); } .b { - --_csstools-p-pjvzd8-1--arg-0: red; - --_csstools-p-pjvzd8-2--color: var(--_csstools-p-pjvzd8-1--arg-0); - --_csstools-p-pjvzd8-2--local: var(--_csstools-p-pjvzd8-2--color); - color: var(--_csstools-p-pjvzd8-2--local); + --_csstools-m-pjvzd8-1--arg-0: red; + --_csstools-m-pjvzd8-2--color: var(--_csstools-m-pjvzd8-1--arg-0); + --_csstools-m-pjvzd8-2--local: var(--_csstools-m-pjvzd8-2--color); + color: var(--_csstools-m-pjvzd8-2--local); +} + +.nested-private { + --_csstools-m-pjvzd8-3--y: 2px; + --_csstools-m-pjvzd8-4--x: 1px; + width: var(--_csstools-m-pjvzd8-4--x); + height: var(--_csstools-m-pjvzd8-3--y); } diff --git a/plugins/postcss-mixins/test/private.preserve-true.expect.css b/plugins/postcss-mixins/test/private.preserve-true.expect.css index fc8467667a..ebb68b0919 100644 --- a/plugins/postcss-mixins/test/private.preserve-true.expect.css +++ b/plugins/postcss-mixins/test/private.preserve-true.expect.css @@ -7,8 +7,8 @@ } .a { - --_csstools-p-pjvzd8-0--shadow: 2px 2px black; - box-shadow: var(--_csstools-p-pjvzd8-0--shadow); + --_csstools-m-pjvzd8-0--shadow: 2px 2px black; + box-shadow: var(--_csstools-m-pjvzd8-0--shadow); @apply --with-private; } @@ -21,9 +21,34 @@ } .b { - --_csstools-p-pjvzd8-1--arg-0: red; - --_csstools-p-pjvzd8-2--color: var(--_csstools-p-pjvzd8-1--arg-0); - --_csstools-p-pjvzd8-2--local: var(--_csstools-p-pjvzd8-2--color); - color: var(--_csstools-p-pjvzd8-2--local); + --_csstools-m-pjvzd8-1--arg-0: red; + --_csstools-m-pjvzd8-2--color: var(--_csstools-m-pjvzd8-1--arg-0); + --_csstools-m-pjvzd8-2--local: var(--_csstools-m-pjvzd8-2--color); + color: var(--_csstools-m-pjvzd8-2--local); @apply --args-and-private(red); } + +@mixin --inner-private() { + @private { + --x: 1px; + } + + width: var(--x); +} + +@mixin --outer-private() { + @private { + --y: 2px; + } + + @apply --inner-private; + height: var(--y); +} + +.nested-private { + --_csstools-m-pjvzd8-3--y: 2px; + --_csstools-m-pjvzd8-4--x: 1px; + width: var(--_csstools-m-pjvzd8-4--x); + height: var(--_csstools-m-pjvzd8-3--y); + @apply --outer-private; +} diff --git a/plugins/postcss-mixins/test/property.css b/plugins/postcss-mixins/test/property.css new file mode 100644 index 0000000000..782b14610d --- /dev/null +++ b/plugins/postcss-mixins/test/property.css @@ -0,0 +1,122 @@ +@mixin --registered-private() { + @private { + @property --size { + syntax: ""; + inherits: false; + initial-value: 10px; + } + + @property --size-a, --size-b { + syntax: ""; + inherits: false; + initial-value: 11px; + } + + @property --size-c : 12px; + + @property --size-d type(#): red, blue; + + @property --size-e : red; + + --size: 20px; + --size-a: 30px; + --size-b: 40px; + --size-c: 40px; + --size-d: red, blue; + --size-e: blue; + } + + @private { + @property --initial-size { + syntax: ""; + inherits: false; + initial-value: 5px; + } + + @property --initial-untyped: 6px; + } + + width: var(--size); + min-width: var(--initial-size); + height: var(--size-a); + min-height: var(--size-b); + max-height: var(--size-c); + max-width: var(--size-d); + inline-size: var(--size-e); + border-width: var(--initial-untyped); +} + +.registered-private-a { + @apply --registered-private; +} + +.registered-private-b { + @apply --registered-private; +} + +@mixin --escaped-private() { + @private { + @property --\66 oo : 20px; + --\66 oo: 30px; + } + + width: var(--\66 oo); +} + +.escaped-private { + @apply --escaped-private; +} + +@mixin --container-registered() { + @container (width > 10px) { + @private { + @property --container-size : 10px; + --container-size: 20px; + } + } + + width: var(--container-size); +} + +.container-registered { + @apply --container-registered; +} + +@mixin --starting-style-registered() { + @starting-style { + @private { + @property --starting-size { + syntax: ""; + inherits: false; + initial-value: 10px; + } + } + } + + width: var(--starting-size); +} + +.starting-style-registered { + @apply --starting-style-registered; +} + +@mixin --media-registered() { + @private { + @property --media-size : 1em; + --media-size: 2em; + } + + width: var(--media-size); +} + +@media (min-width: 1px) { + .media-registered { + @apply --media-registered; + } +} + +@layer outer { + .layer-registered { + @apply --media-registered; + } +} diff --git a/plugins/postcss-mixins/test/property.expect.css b/plugins/postcss-mixins/test/property.expect.css new file mode 100644 index 0000000000..2b3105fe59 --- /dev/null +++ b/plugins/postcss-mixins/test/property.expect.css @@ -0,0 +1,131 @@ +.registered-private-a { + --_csstools-m-7q9ama-0--size: 20px; + --_csstools-m-7q9ama-0--size-a: 30px; + --_csstools-m-7q9ama-0--size-b: 40px; + --_csstools-m-7q9ama-0--size-c: 40px; + --_csstools-m-7q9ama-0--size-d: red, blue; + --_csstools-m-7q9ama-0--size-e: blue; + width: var(--_csstools-m-7q9ama-0--size); + min-width: var(--_csstools-m-7q9ama-0--initial-size); + height: var(--_csstools-m-7q9ama-0--size-a); + min-height: var(--_csstools-m-7q9ama-0--size-b); + max-height: var(--_csstools-m-7q9ama-0--size-c); + max-width: var(--_csstools-m-7q9ama-0--size-d); + inline-size: var(--_csstools-m-7q9ama-0--size-e); + border-width: var(--_csstools-m-7q9ama-0--initial-untyped); +} + +.registered-private-b { + --_csstools-m-7q9ama-1--size: 20px; + --_csstools-m-7q9ama-1--size-a: 30px; + --_csstools-m-7q9ama-1--size-b: 40px; + --_csstools-m-7q9ama-1--size-c: 40px; + --_csstools-m-7q9ama-1--size-d: red, blue; + --_csstools-m-7q9ama-1--size-e: blue; + width: var(--_csstools-m-7q9ama-1--size); + min-width: var(--_csstools-m-7q9ama-1--initial-size); + height: var(--_csstools-m-7q9ama-1--size-a); + min-height: var(--_csstools-m-7q9ama-1--size-b); + max-height: var(--_csstools-m-7q9ama-1--size-c); + max-width: var(--_csstools-m-7q9ama-1--size-d); + inline-size: var(--_csstools-m-7q9ama-1--size-e); + border-width: var(--_csstools-m-7q9ama-1--initial-untyped); +} + +.escaped-private { + --_csstools-m-7q9ama-2--\66 oo: 30px; + width: var(--_csstools-m-7q9ama-2--foo); +} + +.container-registered { + @container (width > 10px) { + --_csstools-m-7q9ama-3--container-size: 20px + } + width: var(--_csstools-m-7q9ama-3--container-size); +} + +.starting-style-registered { + width: var(--_csstools-m-7q9ama-4--starting-size); +} + +@media (min-width: 1px) { + .media-registered { + --_csstools-m-7q9ama-5--media-size: 2em; + width: var(--_csstools-m-7q9ama-5--media-size); + } +} + +@layer outer { + .layer-registered { + --_csstools-m-7q9ama-6--media-size: 2em; + width: var(--_csstools-m-7q9ama-6--media-size); + } +} + +@property --_csstools-m-7q9ama-0--size { + syntax: ""; + inherits: false; + initial-value: 10px; +} + +@property --_csstools-m-7q9ama-0--size-a, --_csstools-m-7q9ama-0--size-b { + syntax: ""; + inherits: false; + initial-value: 11px; +} + +@property --_csstools-m-7q9ama-0--size-c : 12px; + +@property --_csstools-m-7q9ama-0--size-d type(#): red, blue; + +@property --_csstools-m-7q9ama-0--size-e : red; + +@property --_csstools-m-7q9ama-0--initial-size { + syntax: ""; + inherits: false; + initial-value: 5px; +} + +@property --_csstools-m-7q9ama-0--initial-untyped: 6px; + +@property --_csstools-m-7q9ama-1--size { + syntax: ""; + inherits: false; + initial-value: 10px; +} + +@property --_csstools-m-7q9ama-1--size-a, --_csstools-m-7q9ama-1--size-b { + syntax: ""; + inherits: false; + initial-value: 11px; +} + +@property --_csstools-m-7q9ama-1--size-c : 12px; + +@property --_csstools-m-7q9ama-1--size-d type(#): red, blue; + +@property --_csstools-m-7q9ama-1--size-e : red; + +@property --_csstools-m-7q9ama-1--initial-size { + syntax: ""; + inherits: false; + initial-value: 5px; +} + +@property --_csstools-m-7q9ama-1--initial-untyped: 6px; + +@property --_csstools-m-7q9ama-2--foo : 20px; + +@property --_csstools-m-7q9ama-3--container-size : 10px; + +@property --_csstools-m-7q9ama-4--starting-size { + syntax: ""; + inherits: false; + initial-value: 10px; +} + +@media (min-width: 1px) {@property --_csstools-m-7q9ama-5--media-size : 1em +} + +@layer outer {@property --_csstools-m-7q9ama-6--media-size : 1em +} diff --git a/plugins/postcss-mixins/test/property.preserve-true.expect.css b/plugins/postcss-mixins/test/property.preserve-true.expect.css new file mode 100644 index 0000000000..1764328497 --- /dev/null +++ b/plugins/postcss-mixins/test/property.preserve-true.expect.css @@ -0,0 +1,229 @@ +@mixin --registered-private() { + @private { + @property --size { + syntax: ""; + inherits: false; + initial-value: 10px; + } + + @property --size-a, --size-b { + syntax: ""; + inherits: false; + initial-value: 11px; + } + + @property --size-c : 12px; + + @property --size-d type(#): red, blue; + + @property --size-e : red; + + --size: 20px; + --size-a: 30px; + --size-b: 40px; + --size-c: 40px; + --size-d: red, blue; + --size-e: blue; + } + + @private { + @property --initial-size { + syntax: ""; + inherits: false; + initial-value: 5px; + } + + @property --initial-untyped: 6px; + } + + width: var(--size); + min-width: var(--initial-size); + height: var(--size-a); + min-height: var(--size-b); + max-height: var(--size-c); + max-width: var(--size-d); + inline-size: var(--size-e); + border-width: var(--initial-untyped); +} + +.registered-private-a { + --_csstools-m-7q9ama-0--size: 20px; + --_csstools-m-7q9ama-0--size-a: 30px; + --_csstools-m-7q9ama-0--size-b: 40px; + --_csstools-m-7q9ama-0--size-c: 40px; + --_csstools-m-7q9ama-0--size-d: red, blue; + --_csstools-m-7q9ama-0--size-e: blue; + width: var(--_csstools-m-7q9ama-0--size); + min-width: var(--_csstools-m-7q9ama-0--initial-size); + height: var(--_csstools-m-7q9ama-0--size-a); + min-height: var(--_csstools-m-7q9ama-0--size-b); + max-height: var(--_csstools-m-7q9ama-0--size-c); + max-width: var(--_csstools-m-7q9ama-0--size-d); + inline-size: var(--_csstools-m-7q9ama-0--size-e); + border-width: var(--_csstools-m-7q9ama-0--initial-untyped); + @apply --registered-private; +} + +.registered-private-b { + --_csstools-m-7q9ama-1--size: 20px; + --_csstools-m-7q9ama-1--size-a: 30px; + --_csstools-m-7q9ama-1--size-b: 40px; + --_csstools-m-7q9ama-1--size-c: 40px; + --_csstools-m-7q9ama-1--size-d: red, blue; + --_csstools-m-7q9ama-1--size-e: blue; + width: var(--_csstools-m-7q9ama-1--size); + min-width: var(--_csstools-m-7q9ama-1--initial-size); + height: var(--_csstools-m-7q9ama-1--size-a); + min-height: var(--_csstools-m-7q9ama-1--size-b); + max-height: var(--_csstools-m-7q9ama-1--size-c); + max-width: var(--_csstools-m-7q9ama-1--size-d); + inline-size: var(--_csstools-m-7q9ama-1--size-e); + border-width: var(--_csstools-m-7q9ama-1--initial-untyped); + @apply --registered-private; +} + +@mixin --escaped-private() { + @private { + @property --\66 oo : 20px; + --\66 oo: 30px; + } + + width: var(--\66 oo); +} + +.escaped-private { + --_csstools-m-7q9ama-2--\66 oo: 30px; + width: var(--_csstools-m-7q9ama-2--foo); + @apply --escaped-private; +} + +@mixin --container-registered() { + @container (width > 10px) { + @private { + @property --container-size : 10px; + --container-size: 20px; + } + } + + width: var(--container-size); +} + +.container-registered { + @container (width > 10px) { + --_csstools-m-7q9ama-3--container-size: 20px + } + width: var(--_csstools-m-7q9ama-3--container-size); + @apply --container-registered; +} + +@mixin --starting-style-registered() { + @starting-style { + @private { + @property --starting-size { + syntax: ""; + inherits: false; + initial-value: 10px; + } + } + } + + width: var(--starting-size); +} + +.starting-style-registered { + width: var(--_csstools-m-7q9ama-4--starting-size); + @apply --starting-style-registered; +} + +@mixin --media-registered() { + @private { + @property --media-size : 1em; + --media-size: 2em; + } + + width: var(--media-size); +} + +@media (min-width: 1px) { + .media-registered { + --_csstools-m-7q9ama-5--media-size: 2em; + width: var(--_csstools-m-7q9ama-5--media-size); + @apply --media-registered; + } +} + +@layer outer { + .layer-registered { + --_csstools-m-7q9ama-6--media-size: 2em; + width: var(--_csstools-m-7q9ama-6--media-size); + @apply --media-registered; + } +} + +@property --_csstools-m-7q9ama-0--size { + syntax: ""; + inherits: false; + initial-value: 10px; +} + +@property --_csstools-m-7q9ama-0--size-a, --_csstools-m-7q9ama-0--size-b { + syntax: ""; + inherits: false; + initial-value: 11px; +} + +@property --_csstools-m-7q9ama-0--size-c : 12px; + +@property --_csstools-m-7q9ama-0--size-d type(#): red, blue; + +@property --_csstools-m-7q9ama-0--size-e : red; + +@property --_csstools-m-7q9ama-0--initial-size { + syntax: ""; + inherits: false; + initial-value: 5px; +} + +@property --_csstools-m-7q9ama-0--initial-untyped: 6px; + +@property --_csstools-m-7q9ama-1--size { + syntax: ""; + inherits: false; + initial-value: 10px; +} + +@property --_csstools-m-7q9ama-1--size-a, --_csstools-m-7q9ama-1--size-b { + syntax: ""; + inherits: false; + initial-value: 11px; +} + +@property --_csstools-m-7q9ama-1--size-c : 12px; + +@property --_csstools-m-7q9ama-1--size-d type(#): red, blue; + +@property --_csstools-m-7q9ama-1--size-e : red; + +@property --_csstools-m-7q9ama-1--initial-size { + syntax: ""; + inherits: false; + initial-value: 5px; +} + +@property --_csstools-m-7q9ama-1--initial-untyped: 6px; + +@property --_csstools-m-7q9ama-2--foo : 20px; + +@property --_csstools-m-7q9ama-3--container-size : 10px; + +@property --_csstools-m-7q9ama-4--starting-size { + syntax: ""; + inherits: false; + initial-value: 10px; +} + +@media (min-width: 1px) {@property --_csstools-m-7q9ama-5--media-size : 1em +} + +@layer outer {@property --_csstools-m-7q9ama-6--media-size : 1em +} diff --git a/plugins/postcss-mixins/test/spaces.css b/plugins/postcss-mixins/test/spaces.css index b5a811b8cf..4aebcdefb2 100644 --- a/plugins/postcss-mixins/test/spaces.css +++ b/plugins/postcss-mixins/test/spaces.css @@ -3,6 +3,18 @@ background-color: var(--background); } +@mixin --multiline-parameters( + --color, + --background, +) { + color: var(--color); + background-color: var(--background); +} + +.multiline-parameters { + @apply --multiline-parameters(green, blue); +} + .space-after-open { @apply --spaces( green, blue); } diff --git a/plugins/postcss-mixins/test/spaces.expect.css b/plugins/postcss-mixins/test/spaces.expect.css index f636189cf7..5a4e8898af 100644 --- a/plugins/postcss-mixins/test/spaces.expect.css +++ b/plugins/postcss-mixins/test/spaces.expect.css @@ -1,106 +1,115 @@ +.multiline-parameters { + --_csstools-m-1kp0udk-0--arg-0: green; + --_csstools-m-1kp0udk-0--arg-1: blue; + --_csstools-m-1kp0udk-1--color: var(--_csstools-m-1kp0udk-0--arg-0); + --_csstools-m-1kp0udk-1--background: var(--_csstools-m-1kp0udk-0--arg-1); + color: var(--_csstools-m-1kp0udk-1--color); + background-color: var(--_csstools-m-1kp0udk-1--background); +} + .space-after-open { - --_csstools-p-1kp0udk-0--arg-0: green; - --_csstools-p-1kp0udk-0--arg-1: blue; - --_csstools-p-1kp0udk-1--color: var(--_csstools-p-1kp0udk-0--arg-0); - --_csstools-p-1kp0udk-1--background: var(--_csstools-p-1kp0udk-0--arg-1); - color: var(--_csstools-p-1kp0udk-1--color); - background-color: var(--_csstools-p-1kp0udk-1--background); + --_csstools-m-1kp0udk-2--arg-2: green; + --_csstools-m-1kp0udk-2--arg-3: blue; + --_csstools-m-1kp0udk-3--color: var(--_csstools-m-1kp0udk-2--arg-2); + --_csstools-m-1kp0udk-3--background: var(--_csstools-m-1kp0udk-2--arg-3); + color: var(--_csstools-m-1kp0udk-3--color); + background-color: var(--_csstools-m-1kp0udk-3--background); } .space-before-close { - --_csstools-p-1kp0udk-2--arg-2: green; - --_csstools-p-1kp0udk-2--arg-3: blue; - --_csstools-p-1kp0udk-3--color: var(--_csstools-p-1kp0udk-2--arg-2); - --_csstools-p-1kp0udk-3--background: var(--_csstools-p-1kp0udk-2--arg-3); - color: var(--_csstools-p-1kp0udk-3--color); - background-color: var(--_csstools-p-1kp0udk-3--background); + --_csstools-m-1kp0udk-4--arg-4: green; + --_csstools-m-1kp0udk-4--arg-5: blue; + --_csstools-m-1kp0udk-5--color: var(--_csstools-m-1kp0udk-4--arg-4); + --_csstools-m-1kp0udk-5--background: var(--_csstools-m-1kp0udk-4--arg-5); + color: var(--_csstools-m-1kp0udk-5--color); + background-color: var(--_csstools-m-1kp0udk-5--background); } .space-around-both { - --_csstools-p-1kp0udk-4--arg-4: green; - --_csstools-p-1kp0udk-4--arg-5: blue; - --_csstools-p-1kp0udk-5--color: var(--_csstools-p-1kp0udk-4--arg-4); - --_csstools-p-1kp0udk-5--background: var(--_csstools-p-1kp0udk-4--arg-5); - color: var(--_csstools-p-1kp0udk-5--color); - background-color: var(--_csstools-p-1kp0udk-5--background); + --_csstools-m-1kp0udk-6--arg-6: green; + --_csstools-m-1kp0udk-6--arg-7: blue; + --_csstools-m-1kp0udk-7--color: var(--_csstools-m-1kp0udk-6--arg-6); + --_csstools-m-1kp0udk-7--background: var(--_csstools-m-1kp0udk-6--arg-7); + color: var(--_csstools-m-1kp0udk-7--color); + background-color: var(--_csstools-m-1kp0udk-7--background); } .tabs-and-newlines { - --_csstools-p-1kp0udk-6--arg-6: green; - --_csstools-p-1kp0udk-6--arg-7: blue; - --_csstools-p-1kp0udk-7--color: var(--_csstools-p-1kp0udk-6--arg-6); - --_csstools-p-1kp0udk-7--background: var(--_csstools-p-1kp0udk-6--arg-7); - color: var(--_csstools-p-1kp0udk-7--color); - background-color: var(--_csstools-p-1kp0udk-7--background); + --_csstools-m-1kp0udk-8--arg-8: green; + --_csstools-m-1kp0udk-8--arg-9: blue; + --_csstools-m-1kp0udk-9--color: var(--_csstools-m-1kp0udk-8--arg-8); + --_csstools-m-1kp0udk-9--background: var(--_csstools-m-1kp0udk-8--arg-9); + color: var(--_csstools-m-1kp0udk-9--color); + background-color: var(--_csstools-m-1kp0udk-9--background); } .space-around-comma { - --_csstools-p-1kp0udk-8--arg-8: green; - --_csstools-p-1kp0udk-8--arg-9: blue; - --_csstools-p-1kp0udk-9--color: var(--_csstools-p-1kp0udk-8--arg-8); - --_csstools-p-1kp0udk-9--background: var(--_csstools-p-1kp0udk-8--arg-9); - color: var(--_csstools-p-1kp0udk-9--color); - background-color: var(--_csstools-p-1kp0udk-9--background); + --_csstools-m-1kp0udk-a--arg-a: green; + --_csstools-m-1kp0udk-a--arg-b: blue; + --_csstools-m-1kp0udk-b--color: var(--_csstools-m-1kp0udk-a--arg-a); + --_csstools-m-1kp0udk-b--background: var(--_csstools-m-1kp0udk-a--arg-b); + color: var(--_csstools-m-1kp0udk-b--color); + background-color: var(--_csstools-m-1kp0udk-b--background); } .comment-before-comma { - --_csstools-p-1kp0udk-a--arg-a: green; - --_csstools-p-1kp0udk-a--arg-b: blue; - --_csstools-p-1kp0udk-b--color: var(--_csstools-p-1kp0udk-a--arg-a); - --_csstools-p-1kp0udk-b--background: var(--_csstools-p-1kp0udk-a--arg-b); - color: var(--_csstools-p-1kp0udk-b--color); - background-color: var(--_csstools-p-1kp0udk-b--background); + --_csstools-m-1kp0udk-c--arg-c: green; + --_csstools-m-1kp0udk-c--arg-d: blue; + --_csstools-m-1kp0udk-d--color: var(--_csstools-m-1kp0udk-c--arg-c); + --_csstools-m-1kp0udk-d--background: var(--_csstools-m-1kp0udk-c--arg-d); + color: var(--_csstools-m-1kp0udk-d--color); + background-color: var(--_csstools-m-1kp0udk-d--background); } .comment-around-arguments { - --_csstools-p-1kp0udk-c--arg-c: green; - --_csstools-p-1kp0udk-c--arg-d: blue; - --_csstools-p-1kp0udk-d--color: var(--_csstools-p-1kp0udk-c--arg-c); - --_csstools-p-1kp0udk-d--background: var(--_csstools-p-1kp0udk-c--arg-d); - color: var(--_csstools-p-1kp0udk-d--color); - background-color: var(--_csstools-p-1kp0udk-d--background); + --_csstools-m-1kp0udk-e--arg-e: green; + --_csstools-m-1kp0udk-e--arg-f: blue; + --_csstools-m-1kp0udk-f--color: var(--_csstools-m-1kp0udk-e--arg-e); + --_csstools-m-1kp0udk-f--background: var(--_csstools-m-1kp0udk-e--arg-f); + color: var(--_csstools-m-1kp0udk-f--color); + background-color: var(--_csstools-m-1kp0udk-f--background); } .comment-only-default { - --_csstools-p-1kp0udk-e--color: green; - color: var(--_csstools-p-1kp0udk-e--color); + --_csstools-m-1kp0udk-g--color: green; + color: var(--_csstools-m-1kp0udk-g--color); } .space-around-default { - --_csstools-p-1kp0udk-f--color: green; - --_csstools-p-1kp0udk-f--background: blue; - color: var(--_csstools-p-1kp0udk-f--color); - background-color: var(--_csstools-p-1kp0udk-f--background); + --_csstools-m-1kp0udk-h--color: green; + --_csstools-m-1kp0udk-h--background: blue; + color: var(--_csstools-m-1kp0udk-h--color); + background-color: var(--_csstools-m-1kp0udk-h--background); } .space-around-argument-defaults { - --_csstools-p-1kp0udk-g--arg-e: red; - --_csstools-p-1kp0udk-g--arg-f: blue; - --_csstools-p-1kp0udk-h--color: var(--_csstools-p-1kp0udk-g--arg-e); - --_csstools-p-1kp0udk-h--background: var(--_csstools-p-1kp0udk-g--arg-f); - color: var(--_csstools-p-1kp0udk-h--color); - background-color: var(--_csstools-p-1kp0udk-h--background); + --_csstools-m-1kp0udk-i--arg-g: red; + --_csstools-m-1kp0udk-i--arg-h: blue; + --_csstools-m-1kp0udk-j--color: var(--_csstools-m-1kp0udk-i--arg-g); + --_csstools-m-1kp0udk-j--background: var(--_csstools-m-1kp0udk-i--arg-h); + color: var(--_csstools-m-1kp0udk-j--color); + background-color: var(--_csstools-m-1kp0udk-j--background); } .comment-before-parameter-name { - --_csstools-p-1kp0udk-i--arg-g: green; - --_csstools-p-1kp0udk-i--arg-h: blue; - --_csstools-p-1kp0udk-j--color: var(--_csstools-p-1kp0udk-i--arg-g); - --_csstools-p-1kp0udk-j--background: var(--_csstools-p-1kp0udk-i--arg-h); - color: var(--_csstools-p-1kp0udk-j--color); - background-color: var(--_csstools-p-1kp0udk-j--background); + --_csstools-m-1kp0udk-k--arg-i: green; + --_csstools-m-1kp0udk-k--arg-j: blue; + --_csstools-m-1kp0udk-l--color: var(--_csstools-m-1kp0udk-k--arg-i); + --_csstools-m-1kp0udk-l--background: var(--_csstools-m-1kp0udk-k--arg-j); + color: var(--_csstools-m-1kp0udk-l--color); + background-color: var(--_csstools-m-1kp0udk-l--background); } .space-before-parameter-name { - --_csstools-p-1kp0udk-k--arg-i: green; - --_csstools-p-1kp0udk-k--arg-j: blue; - --_csstools-p-1kp0udk-l--color: var(--_csstools-p-1kp0udk-k--arg-i); - --_csstools-p-1kp0udk-l--background: var(--_csstools-p-1kp0udk-k--arg-j); - color: var(--_csstools-p-1kp0udk-l--color); - background-color: var(--_csstools-p-1kp0udk-l--background); + --_csstools-m-1kp0udk-m--arg-k: green; + --_csstools-m-1kp0udk-m--arg-l: blue; + --_csstools-m-1kp0udk-n--color: var(--_csstools-m-1kp0udk-m--arg-k); + --_csstools-m-1kp0udk-n--background: var(--_csstools-m-1kp0udk-m--arg-l); + color: var(--_csstools-m-1kp0udk-n--color); + background-color: var(--_csstools-m-1kp0udk-n--background); } .comment-before-default-name { - --_csstools-p-1kp0udk-m--color: green; - color: var(--_csstools-p-1kp0udk-m--color); + --_csstools-m-1kp0udk-o--color: green; + color: var(--_csstools-m-1kp0udk-o--color); } diff --git a/plugins/postcss-mixins/test/spaces.preserve-true.expect.css b/plugins/postcss-mixins/test/spaces.preserve-true.expect.css index b250a19872..6c7d3525f3 100644 --- a/plugins/postcss-mixins/test/spaces.preserve-true.expect.css +++ b/plugins/postcss-mixins/test/spaces.preserve-true.expect.css @@ -3,43 +3,61 @@ background-color: var(--background); } +@mixin --multiline-parameters( + --color, + --background, +) { + color: var(--color); + background-color: var(--background); +} + +.multiline-parameters { + --_csstools-m-1kp0udk-0--arg-0: green; + --_csstools-m-1kp0udk-0--arg-1: blue; + --_csstools-m-1kp0udk-1--color: var(--_csstools-m-1kp0udk-0--arg-0); + --_csstools-m-1kp0udk-1--background: var(--_csstools-m-1kp0udk-0--arg-1); + color: var(--_csstools-m-1kp0udk-1--color); + background-color: var(--_csstools-m-1kp0udk-1--background); + @apply --multiline-parameters(green, blue); +} + .space-after-open { - --_csstools-p-1kp0udk-0--arg-0: green; - --_csstools-p-1kp0udk-0--arg-1: blue; - --_csstools-p-1kp0udk-1--color: var(--_csstools-p-1kp0udk-0--arg-0); - --_csstools-p-1kp0udk-1--background: var(--_csstools-p-1kp0udk-0--arg-1); - color: var(--_csstools-p-1kp0udk-1--color); - background-color: var(--_csstools-p-1kp0udk-1--background); + --_csstools-m-1kp0udk-2--arg-2: green; + --_csstools-m-1kp0udk-2--arg-3: blue; + --_csstools-m-1kp0udk-3--color: var(--_csstools-m-1kp0udk-2--arg-2); + --_csstools-m-1kp0udk-3--background: var(--_csstools-m-1kp0udk-2--arg-3); + color: var(--_csstools-m-1kp0udk-3--color); + background-color: var(--_csstools-m-1kp0udk-3--background); @apply --spaces( green, blue); } .space-before-close { - --_csstools-p-1kp0udk-2--arg-2: green; - --_csstools-p-1kp0udk-2--arg-3: blue; - --_csstools-p-1kp0udk-3--color: var(--_csstools-p-1kp0udk-2--arg-2); - --_csstools-p-1kp0udk-3--background: var(--_csstools-p-1kp0udk-2--arg-3); - color: var(--_csstools-p-1kp0udk-3--color); - background-color: var(--_csstools-p-1kp0udk-3--background); + --_csstools-m-1kp0udk-4--arg-4: green; + --_csstools-m-1kp0udk-4--arg-5: blue; + --_csstools-m-1kp0udk-5--color: var(--_csstools-m-1kp0udk-4--arg-4); + --_csstools-m-1kp0udk-5--background: var(--_csstools-m-1kp0udk-4--arg-5); + color: var(--_csstools-m-1kp0udk-5--color); + background-color: var(--_csstools-m-1kp0udk-5--background); @apply --spaces(green, blue ); } .space-around-both { - --_csstools-p-1kp0udk-4--arg-4: green; - --_csstools-p-1kp0udk-4--arg-5: blue; - --_csstools-p-1kp0udk-5--color: var(--_csstools-p-1kp0udk-4--arg-4); - --_csstools-p-1kp0udk-5--background: var(--_csstools-p-1kp0udk-4--arg-5); - color: var(--_csstools-p-1kp0udk-5--color); - background-color: var(--_csstools-p-1kp0udk-5--background); + --_csstools-m-1kp0udk-6--arg-6: green; + --_csstools-m-1kp0udk-6--arg-7: blue; + --_csstools-m-1kp0udk-7--color: var(--_csstools-m-1kp0udk-6--arg-6); + --_csstools-m-1kp0udk-7--background: var(--_csstools-m-1kp0udk-6--arg-7); + color: var(--_csstools-m-1kp0udk-7--color); + background-color: var(--_csstools-m-1kp0udk-7--background); @apply --spaces( green, blue ); } .tabs-and-newlines { - --_csstools-p-1kp0udk-6--arg-6: green; - --_csstools-p-1kp0udk-6--arg-7: blue; - --_csstools-p-1kp0udk-7--color: var(--_csstools-p-1kp0udk-6--arg-6); - --_csstools-p-1kp0udk-7--background: var(--_csstools-p-1kp0udk-6--arg-7); - color: var(--_csstools-p-1kp0udk-7--color); - background-color: var(--_csstools-p-1kp0udk-7--background); + --_csstools-m-1kp0udk-8--arg-8: green; + --_csstools-m-1kp0udk-8--arg-9: blue; + --_csstools-m-1kp0udk-9--color: var(--_csstools-m-1kp0udk-8--arg-8); + --_csstools-m-1kp0udk-9--background: var(--_csstools-m-1kp0udk-8--arg-9); + color: var(--_csstools-m-1kp0udk-9--color); + background-color: var(--_csstools-m-1kp0udk-9--background); @apply --spaces( green, blue @@ -47,12 +65,12 @@ } .space-around-comma { - --_csstools-p-1kp0udk-8--arg-8: green; - --_csstools-p-1kp0udk-8--arg-9: blue; - --_csstools-p-1kp0udk-9--color: var(--_csstools-p-1kp0udk-8--arg-8); - --_csstools-p-1kp0udk-9--background: var(--_csstools-p-1kp0udk-8--arg-9); - color: var(--_csstools-p-1kp0udk-9--color); - background-color: var(--_csstools-p-1kp0udk-9--background); + --_csstools-m-1kp0udk-a--arg-a: green; + --_csstools-m-1kp0udk-a--arg-b: blue; + --_csstools-m-1kp0udk-b--color: var(--_csstools-m-1kp0udk-a--arg-a); + --_csstools-m-1kp0udk-b--background: var(--_csstools-m-1kp0udk-a--arg-b); + color: var(--_csstools-m-1kp0udk-b--color); + background-color: var(--_csstools-m-1kp0udk-b--background); @apply --spaces(green , blue); } @@ -62,12 +80,12 @@ } .comment-before-comma { - --_csstools-p-1kp0udk-a--arg-a: green; - --_csstools-p-1kp0udk-a--arg-b: blue; - --_csstools-p-1kp0udk-b--color: var(--_csstools-p-1kp0udk-a--arg-a); - --_csstools-p-1kp0udk-b--background: var(--_csstools-p-1kp0udk-a--arg-b); - color: var(--_csstools-p-1kp0udk-b--color); - background-color: var(--_csstools-p-1kp0udk-b--background); + --_csstools-m-1kp0udk-c--arg-c: green; + --_csstools-m-1kp0udk-c--arg-d: blue; + --_csstools-m-1kp0udk-d--color: var(--_csstools-m-1kp0udk-c--arg-c); + --_csstools-m-1kp0udk-d--background: var(--_csstools-m-1kp0udk-c--arg-d); + color: var(--_csstools-m-1kp0udk-d--color); + background-color: var(--_csstools-m-1kp0udk-d--background); @apply --comment-in-parameters(green /* one */, blue /* two */); } @@ -77,12 +95,12 @@ } .comment-around-arguments { - --_csstools-p-1kp0udk-c--arg-c: green; - --_csstools-p-1kp0udk-c--arg-d: blue; - --_csstools-p-1kp0udk-d--color: var(--_csstools-p-1kp0udk-c--arg-c); - --_csstools-p-1kp0udk-d--background: var(--_csstools-p-1kp0udk-c--arg-d); - color: var(--_csstools-p-1kp0udk-d--color); - background-color: var(--_csstools-p-1kp0udk-d--background); + --_csstools-m-1kp0udk-e--arg-e: green; + --_csstools-m-1kp0udk-e--arg-f: blue; + --_csstools-m-1kp0udk-f--color: var(--_csstools-m-1kp0udk-e--arg-e); + --_csstools-m-1kp0udk-f--background: var(--_csstools-m-1kp0udk-e--arg-f); + color: var(--_csstools-m-1kp0udk-f--color); + background-color: var(--_csstools-m-1kp0udk-f--background); @apply --comment-parameters-and-arguments( /* before */ green /* mid */, blue /* after */ ); } @@ -91,8 +109,8 @@ } .comment-only-default { - --_csstools-p-1kp0udk-e--color: green; - color: var(--_csstools-p-1kp0udk-e--color); + --_csstools-m-1kp0udk-g--color: green; + color: var(--_csstools-m-1kp0udk-g--color); @apply --comment-only-default; } @@ -102,20 +120,20 @@ } .space-around-default { - --_csstools-p-1kp0udk-f--color: green; - --_csstools-p-1kp0udk-f--background: blue; - color: var(--_csstools-p-1kp0udk-f--color); - background-color: var(--_csstools-p-1kp0udk-f--background); + --_csstools-m-1kp0udk-h--color: green; + --_csstools-m-1kp0udk-h--background: blue; + color: var(--_csstools-m-1kp0udk-h--color); + background-color: var(--_csstools-m-1kp0udk-h--background); @apply --space-around-default; } .space-around-argument-defaults { - --_csstools-p-1kp0udk-g--arg-e: red; - --_csstools-p-1kp0udk-g--arg-f: blue; - --_csstools-p-1kp0udk-h--color: var(--_csstools-p-1kp0udk-g--arg-e); - --_csstools-p-1kp0udk-h--background: var(--_csstools-p-1kp0udk-g--arg-f); - color: var(--_csstools-p-1kp0udk-h--color); - background-color: var(--_csstools-p-1kp0udk-h--background); + --_csstools-m-1kp0udk-i--arg-g: red; + --_csstools-m-1kp0udk-i--arg-h: blue; + --_csstools-m-1kp0udk-j--color: var(--_csstools-m-1kp0udk-i--arg-g); + --_csstools-m-1kp0udk-j--background: var(--_csstools-m-1kp0udk-i--arg-h); + color: var(--_csstools-m-1kp0udk-j--color); + background-color: var(--_csstools-m-1kp0udk-j--background); @apply --space-around-default( red , blue ); } @@ -125,12 +143,12 @@ } .comment-before-parameter-name { - --_csstools-p-1kp0udk-i--arg-g: green; - --_csstools-p-1kp0udk-i--arg-h: blue; - --_csstools-p-1kp0udk-j--color: var(--_csstools-p-1kp0udk-i--arg-g); - --_csstools-p-1kp0udk-j--background: var(--_csstools-p-1kp0udk-i--arg-h); - color: var(--_csstools-p-1kp0udk-j--color); - background-color: var(--_csstools-p-1kp0udk-j--background); + --_csstools-m-1kp0udk-k--arg-i: green; + --_csstools-m-1kp0udk-k--arg-j: blue; + --_csstools-m-1kp0udk-l--color: var(--_csstools-m-1kp0udk-k--arg-i); + --_csstools-m-1kp0udk-l--background: var(--_csstools-m-1kp0udk-k--arg-j); + color: var(--_csstools-m-1kp0udk-l--color); + background-color: var(--_csstools-m-1kp0udk-l--background); @apply --comment-before-parameter-name(green, blue); } @@ -140,12 +158,12 @@ } .space-before-parameter-name { - --_csstools-p-1kp0udk-k--arg-i: green; - --_csstools-p-1kp0udk-k--arg-j: blue; - --_csstools-p-1kp0udk-l--color: var(--_csstools-p-1kp0udk-k--arg-i); - --_csstools-p-1kp0udk-l--background: var(--_csstools-p-1kp0udk-k--arg-j); - color: var(--_csstools-p-1kp0udk-l--color); - background-color: var(--_csstools-p-1kp0udk-l--background); + --_csstools-m-1kp0udk-m--arg-k: green; + --_csstools-m-1kp0udk-m--arg-l: blue; + --_csstools-m-1kp0udk-n--color: var(--_csstools-m-1kp0udk-m--arg-k); + --_csstools-m-1kp0udk-n--background: var(--_csstools-m-1kp0udk-m--arg-l); + color: var(--_csstools-m-1kp0udk-n--color); + background-color: var(--_csstools-m-1kp0udk-n--background); @apply --space-before-parameter-name(green, blue); } @@ -154,7 +172,7 @@ } .comment-before-default-name { - --_csstools-p-1kp0udk-m--color: green; - color: var(--_csstools-p-1kp0udk-m--color); + --_csstools-m-1kp0udk-o--color: green; + color: var(--_csstools-m-1kp0udk-o--color); @apply --comment-before-default-name; } diff --git a/plugins/postcss-mixins/test/wpt/mixin-private.html b/plugins/postcss-mixins/test/wpt/mixin-private.html index c65e276d58..7c7c746452 100644 --- a/plugins/postcss-mixins/test/wpt/mixin-private.html +++ b/plugins/postcss-mixins/test/wpt/mixin-private.html @@ -11,6 +11,13 @@ + + + + + + +