@unocss/transformer-directives 0.29.3 → 0.29.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.cjs +20 -18
  2. package/dist/index.mjs +20 -18
  3. package/package.json +2 -2
package/dist/index.cjs CHANGED
@@ -50,28 +50,30 @@ async function transformDirectives(code, uno, filename, originalCode, offset) {
50
50
  }, []);
51
51
  if (!utils.length)
52
52
  return;
53
- const parentSelector = cssTree.generate(node.prelude);
54
53
  for (const i of utils) {
55
54
  const [, _selector, body, parent] = i;
56
55
  const selector = _selector?.replace(core.regexScopePlaceholder, " ") || _selector;
57
- if (parent) {
58
- const newNodeCss = `${parent}{${parentSelector}{${body}}}`;
59
- code.appendLeft(calcOffset(node.loc.end.offset), newNodeCss);
60
- } else if (selector && selector !== ".\\-") {
61
- const selectorAST = cssTree.parse(selector, {
62
- context: "selector"
63
- });
64
- const prelude = cssTree.clone(node.prelude);
65
- prelude.children.forEach((child) => {
66
- const parentSelectorAst = cssTree.clone(selectorAST);
67
- parentSelectorAst.children.forEach((i2) => {
68
- if (i2.type === "ClassSelector" && i2.name === "\\-")
69
- Object.assign(i2, cssTree.clone(child));
56
+ if (parent || selector && selector !== ".\\-") {
57
+ let newSelector = cssTree.generate(node.prelude);
58
+ if (selector && selector !== ".\\-") {
59
+ const selectorAST = cssTree.parse(selector, {
60
+ context: "selector"
70
61
  });
71
- Object.assign(child, parentSelectorAst);
72
- });
73
- const newNodeCss = `${cssTree.generate(prelude)}{${body}}`;
74
- code.appendLeft(calcOffset(node.loc.end.offset), newNodeCss);
62
+ const prelude = cssTree.clone(node.prelude);
63
+ prelude.children.forEach((child) => {
64
+ const parentSelectorAst = cssTree.clone(selectorAST);
65
+ parentSelectorAst.children.forEach((i2) => {
66
+ if (i2.type === "ClassSelector" && i2.name === "\\-")
67
+ Object.assign(i2, cssTree.clone(child));
68
+ });
69
+ Object.assign(child, parentSelectorAst);
70
+ });
71
+ newSelector = cssTree.generate(prelude);
72
+ }
73
+ let css = `${newSelector}{${body}}`;
74
+ if (parent)
75
+ css = `${parent}{${css}}`;
76
+ code.appendLeft(calcOffset(node.loc.end.offset), css);
75
77
  } else {
76
78
  code.appendRight(calcOffset(childNode.loc.end.offset), body);
77
79
  }
package/dist/index.mjs CHANGED
@@ -46,28 +46,30 @@ async function transformDirectives(code, uno, filename, originalCode, offset) {
46
46
  }, []);
47
47
  if (!utils.length)
48
48
  return;
49
- const parentSelector = generate(node.prelude);
50
49
  for (const i of utils) {
51
50
  const [, _selector, body, parent] = i;
52
51
  const selector = _selector?.replace(regexScopePlaceholder, " ") || _selector;
53
- if (parent) {
54
- const newNodeCss = `${parent}{${parentSelector}{${body}}}`;
55
- code.appendLeft(calcOffset(node.loc.end.offset), newNodeCss);
56
- } else if (selector && selector !== ".\\-") {
57
- const selectorAST = parse(selector, {
58
- context: "selector"
59
- });
60
- const prelude = clone(node.prelude);
61
- prelude.children.forEach((child) => {
62
- const parentSelectorAst = clone(selectorAST);
63
- parentSelectorAst.children.forEach((i2) => {
64
- if (i2.type === "ClassSelector" && i2.name === "\\-")
65
- Object.assign(i2, clone(child));
52
+ if (parent || selector && selector !== ".\\-") {
53
+ let newSelector = generate(node.prelude);
54
+ if (selector && selector !== ".\\-") {
55
+ const selectorAST = parse(selector, {
56
+ context: "selector"
66
57
  });
67
- Object.assign(child, parentSelectorAst);
68
- });
69
- const newNodeCss = `${generate(prelude)}{${body}}`;
70
- code.appendLeft(calcOffset(node.loc.end.offset), newNodeCss);
58
+ const prelude = clone(node.prelude);
59
+ prelude.children.forEach((child) => {
60
+ const parentSelectorAst = clone(selectorAST);
61
+ parentSelectorAst.children.forEach((i2) => {
62
+ if (i2.type === "ClassSelector" && i2.name === "\\-")
63
+ Object.assign(i2, clone(child));
64
+ });
65
+ Object.assign(child, parentSelectorAst);
66
+ });
67
+ newSelector = generate(prelude);
68
+ }
69
+ let css = `${newSelector}{${body}}`;
70
+ if (parent)
71
+ css = `${parent}{${css}}`;
72
+ code.appendLeft(calcOffset(node.loc.end.offset), css);
71
73
  } else {
72
74
  code.appendRight(calcOffset(childNode.loc.end.offset), body);
73
75
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unocss/transformer-directives",
3
- "version": "0.29.3",
3
+ "version": "0.29.6",
4
4
  "description": "UnoCSS transformer for `@apply` directive",
5
5
  "keywords": [
6
6
  "unocss",
@@ -31,7 +31,7 @@
31
31
  ],
32
32
  "sideEffects": false,
33
33
  "dependencies": {
34
- "@unocss/core": "0.29.3",
34
+ "@unocss/core": "0.29.6",
35
35
  "css-tree": "^2.1.0"
36
36
  },
37
37
  "devDependencies": {