@unocss/transformer-directives 0.27.0 → 0.27.3

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 (4) hide show
  1. package/dist/index.cjs +3 -7
  2. package/dist/index.d.ts +1 -1
  3. package/dist/index.mjs +3 -7
  4. package/package.json +4 -4
package/dist/index.cjs CHANGED
@@ -37,7 +37,7 @@ async function transformDirectives(code, uno, filename) {
37
37
  if (childNode.prelude.type !== "Raw")
38
38
  return;
39
39
  const classNames = core.expandVariantGroup(childNode.prelude.value).split(/\s+/g);
40
- const utils = (await Promise.all(classNames.map((i) => uno.parseToken(i, "-")))).filter(core.notNull).flat().sort((a, b) => a[0] - b[0]).reduce((acc, item) => {
40
+ const utils = (await Promise.all(classNames.map((i) => uno.parseToken(i, "-")))).filter(core.notNull).flat().sort((a, b) => a[0] - b[0]).sort((a, b) => (a[3] ? uno.parentOrders.get(a[3]) ?? 0 : 0) - (b[3] ? uno.parentOrders.get(b[3]) ?? 0 : 0)).reduce((acc, item) => {
41
41
  const target = acc.find((i) => i[1] === item[1] && i[3] === item[3]);
42
42
  if (target)
43
43
  target[2] += item[2];
@@ -53,7 +53,7 @@ async function transformDirectives(code, uno, filename) {
53
53
  const selector = _selector?.replace(core.regexScopePlaceholder, " ") || _selector;
54
54
  if (parent) {
55
55
  const newNodeCss = `${parent}{${parentSelector}{${body}}}`;
56
- code.appendLeft(node.loc.start.offset, newNodeCss);
56
+ code.appendLeft(node.loc.end.offset, newNodeCss);
57
57
  } else if (selector && selector !== ".\\-") {
58
58
  const selectorAST = cssTree.parse(selector, {
59
59
  context: "selector"
@@ -68,11 +68,7 @@ async function transformDirectives(code, uno, filename) {
68
68
  Object.assign(child, parentSelectorAst);
69
69
  });
70
70
  const newNodeCss = `${cssTree.generate(prelude)}{${body}}`;
71
- code.appendLeft(node.loc.start.offset, newNodeCss);
72
- } else if (node.block.children.toArray().length === 1) {
73
- const newNodeCss = `${parentSelector}{${body}}`;
74
- code.appendLeft(node.loc.start.offset, newNodeCss);
75
- code.remove(node.loc.start.offset, node.loc.end.offset);
71
+ code.appendLeft(node.loc.end.offset, newNodeCss);
76
72
  } else {
77
73
  code.appendRight(childNode.loc.end.offset, body);
78
74
  }
package/dist/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { SourceCodeTransformer, UnoGenerator } from '@unocss/core';
2
- import MagicString from 'magic-string-extra';
2
+ import MagicString from 'magic-string';
3
3
 
4
4
  declare function transformerDirectives(): SourceCodeTransformer;
5
5
  declare function transformDirectives(code: MagicString, uno: UnoGenerator, filename?: string): Promise<void>;
package/dist/index.mjs CHANGED
@@ -33,7 +33,7 @@ async function transformDirectives(code, uno, filename) {
33
33
  if (childNode.prelude.type !== "Raw")
34
34
  return;
35
35
  const classNames = expandVariantGroup(childNode.prelude.value).split(/\s+/g);
36
- const utils = (await Promise.all(classNames.map((i) => uno.parseToken(i, "-")))).filter(notNull).flat().sort((a, b) => a[0] - b[0]).reduce((acc, item) => {
36
+ const utils = (await Promise.all(classNames.map((i) => uno.parseToken(i, "-")))).filter(notNull).flat().sort((a, b) => a[0] - b[0]).sort((a, b) => (a[3] ? uno.parentOrders.get(a[3]) ?? 0 : 0) - (b[3] ? uno.parentOrders.get(b[3]) ?? 0 : 0)).reduce((acc, item) => {
37
37
  const target = acc.find((i) => i[1] === item[1] && i[3] === item[3]);
38
38
  if (target)
39
39
  target[2] += item[2];
@@ -49,7 +49,7 @@ async function transformDirectives(code, uno, filename) {
49
49
  const selector = _selector?.replace(regexScopePlaceholder, " ") || _selector;
50
50
  if (parent) {
51
51
  const newNodeCss = `${parent}{${parentSelector}{${body}}}`;
52
- code.appendLeft(node.loc.start.offset, newNodeCss);
52
+ code.appendLeft(node.loc.end.offset, newNodeCss);
53
53
  } else if (selector && selector !== ".\\-") {
54
54
  const selectorAST = parse(selector, {
55
55
  context: "selector"
@@ -64,11 +64,7 @@ async function transformDirectives(code, uno, filename) {
64
64
  Object.assign(child, parentSelectorAst);
65
65
  });
66
66
  const newNodeCss = `${generate(prelude)}{${body}}`;
67
- code.appendLeft(node.loc.start.offset, newNodeCss);
68
- } else if (node.block.children.toArray().length === 1) {
69
- const newNodeCss = `${parentSelector}{${body}}`;
70
- code.appendLeft(node.loc.start.offset, newNodeCss);
71
- code.remove(node.loc.start.offset, node.loc.end.offset);
67
+ code.appendLeft(node.loc.end.offset, newNodeCss);
72
68
  } else {
73
69
  code.appendRight(childNode.loc.end.offset, body);
74
70
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unocss/transformer-directives",
3
- "version": "0.27.0",
3
+ "version": "0.27.3",
4
4
  "description": "UnoCSS transformer for `@apply` directive",
5
5
  "keywords": [
6
6
  "unocss",
@@ -31,11 +31,11 @@
31
31
  "module": "./dist/index.mjs",
32
32
  "types": "./dist/index.d.ts",
33
33
  "dependencies": {
34
- "@unocss/core": "0.27.0",
35
- "css-tree": "^2.0.4"
34
+ "@unocss/core": "0.27.3",
35
+ "css-tree": "^2.1.0"
36
36
  },
37
37
  "devDependencies": {
38
- "magic-string-extra": "^0.1.2"
38
+ "magic-string": "^0.26.1"
39
39
  },
40
40
  "scripts": {
41
41
  "build": "unbuild",