Revert "Fix Liquid capture sorting (#135)" (#140)

This reverts commit 3ebd6d0.
tailwindlabs · Mar 29, 2023 · 2aabc3c · 2aabc3c
1 parent 41c7738
commit 2aabc3c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 55 deletions.
diff --git a/src/index.js b/src/index.js
@@ -379,75 +379,55 @@ function transformLiquid(ast, { env }) {
       : node.name === 'class'
   }
 
-  /** @type {{type: string, source: string}[]} */
-  let sources = []
-
-  /** @type {{pos: {start: number, end: number}, value: string}[]} */
-  let changes = []
-
-  function sortAttribute(attr) {
+  function sortAttribute(attr, path) {
     visit(attr.value, {
       TextNode(node) {
         node.value = sortClasses(node.value, { env });
-        changes.push({
-          pos: node.position,
-          value: node.value,
-        })
+
+        let source = node.source.slice(0, node.position.start) + node.value + node.source.slice(node.position.end)
+        path.forEach(node => (node.source = source))
       },
 
       String(node) {
         node.value = sortClasses(node.value, { env });
-        changes.push({
-          pos: {
-            // String position includes the quotes even if the value doesn't
-            // Hence the +1 and -1 when slicing
-            start: node.position.start+1,
-            end: node.position.end-1,
-          },
-          value: node.value,
-        })
+
+        // String position includes the quotes even if the value doesn't
+        // Hence the +1 and -1 when slicing
+        let source = node.source.slice(0, node.position.start+1) + node.value + node.source.slice(node.position.end-1)
+        path.forEach(node => (node.source = source))
       },
     })
   }
 
   visit(ast, {
-    LiquidTag(node) {
-      sources.push(node)
+    LiquidTag(node, _parent, _key, _index, meta) {
+      meta.path = [...meta.path ?? [], node];
     },
 
-    HtmlElement(node) {
-      sources.push(node)
+    HtmlElement(node, _parent, _key, _index, meta) {
+      meta.path = [...meta.path ?? [], node];
     },
 
-    AttrSingleQuoted(node) {
-      if (isClassAttr(node)) {
-        sources.push(node)
-        sortAttribute(node)
+    AttrSingleQuoted(node, _parent, _key, _index, meta) {
+      if (!isClassAttr(node)) {
+        return;
       }
+
+      meta.path = [...meta.path ?? [], node];
+
+      sortAttribute(node, meta.path)
     },
 
-    AttrDoubleQuoted(node) {
-      if (isClassAttr(node)) {
-        sources.push(node)
-        sortAttribute(node)
+    AttrDoubleQuoted(node, _parent, _key, _index, meta) {
+      if (!isClassAttr(node)) {
+        return;
       }
-    },
-  });
 
-  // Sort so all changes occur in order
-  changes = changes.sort((a, b) => {
-    return a.start - b.start
-        || a.end - b.end
-  })
+      meta.path = [...meta.path ?? [], node];
 
-  for (let change of changes) {
-    for (let node of sources) {
-      node.source =
-        node.source.slice(0, change.pos.start) +
-        change.value +
-        node.source.slice(change.pos.end)
-    }
-  }
+      sortAttribute(node, meta.path)
+    },
+  });
 }
 
 function sortStringLiteral(node, { env }) {

diff --git a/tests/plugins.test.js b/tests/plugins.test.js
@@ -257,14 +257,6 @@ let tests = [
           `{%- capture class_ordering -%}<div class="sm:p-0 p-4"></div>{%- endcapture -%}`,
           `{%- capture class_ordering -%}<div class="p-4 sm:p-0"></div>{%- endcapture -%}`,
         ],
-        [
-          `{%- capture class_ordering -%}<div class="foo1 sm:p-0 p-4"></div><div class="foo2 sm:p-0 p-4"></div>{%- endcapture -%}`,
-          `{%- capture class_ordering -%}<div class="foo1 p-4 sm:p-0"></div><div class="foo2 p-4 sm:p-0"></div>{%- endcapture -%}`,
-        ],
-        [
-          `{%- capture class_ordering -%}<div class="foo1 sm:p-0 p-4"><div class="foo2 sm:p-0 p-4"></div></div>{%- endcapture -%}`,
-          `{%- capture class_ordering -%}<div class="foo1 p-4 sm:p-0"><div class="foo2 p-4 sm:p-0"></div></div>{%- endcapture -%}`,
-        ],
       ],
     }
   },