From 8dffc4c95f2b9cd8a487941e98c54388d4d28337 Mon Sep 17 00:00:00 2001
From: Jordan Pittman <jordan@cryptica.me>
Date: Fri, 4 Oct 2024 18:11:27 -0400
Subject: [PATCH] Fix tests

---
 .../migrate-at-layer-utilities.test.ts        | 27 ++++++++++++++-----
 .../codemods/migrate-at-layer-utilities.ts    |  2 +-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.test.ts b/packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.test.ts
index 02376ce71..2bac6ba6c 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.test.ts
@@ -1,17 +1,32 @@
 import dedent from 'dedent'
 import postcss from 'postcss'
 import { describe, expect, it } from 'vitest'
-import type { Stylesheet } from '../migrate'
+import { Stylesheet } from '../stylesheet'
 import { formatNodes } from './format-nodes'
 import { migrateAtLayerUtilities } from './migrate-at-layer-utilities'
 
 const css = dedent
 
-function migrate(stylesheet: Stylesheet | string) {
-  if (typeof stylesheet === 'string') {
-    stylesheet = {
-      content: stylesheet,
-      root: postcss.parse(stylesheet),
+async function migrate(
+  data:
+    | Stylesheet
+    | string
+    | {
+        root: postcss.Root
+        layers?: string[]
+      },
+) {
+  let stylesheet: Stylesheet
+
+  if (typeof data === 'string') {
+    stylesheet = await Stylesheet.fromString(data)
+  } else if (data instanceof Stylesheet) {
+    stylesheet = data
+  } else {
+    stylesheet = await Stylesheet.fromRoot(data.root)
+
+    for (let layer of data.layers ?? []) {
+      stylesheet.layers.add(layer)
     }
   }
 
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.ts b/packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.ts
index 644cec719..c362a9fbd 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.ts
@@ -1,7 +1,7 @@
 import { type AtRule, type Comment, type Plugin, type Rule } from 'postcss'
 import SelectorParser from 'postcss-selector-parser'
 import { segment } from '../../../tailwindcss/src/utils/segment'
-import type { Stylesheet } from '../migrate'
+import { Stylesheet } from '../stylesheet'
 import { walk, WalkAction, walkDepth } from '../utils/walk'
 
 export function migrateAtLayerUtilities(stylesheet: Stylesheet): Plugin {