Cleanup

Author: thecrypticace

packages/tailwindcss-language-service/src/css/ast.ts

@@ -1,6 +1,5 @@
-import { parseAtRule } from './parse'
 import type { SourceLocation } from './source'
-import type { VisitContext } from '../util/walk'
+import { parseAtRule } from './parse'
 
 const AT_SIGN = 0x40
 
@@ -117,95 +116,3 @@ export function atRoot(nodes: AstNode[]): AtRoot {
     nodes,
   }
 }
-
-export function cloneAstNode<T extends AstNode>(node: T): T {
-  switch (node.kind) {
-    case 'rule':
-      return {
-        kind: node.kind,
-        selector: node.selector,
-        nodes: node.nodes.map(cloneAstNode),
-        src: node.src,
-        dst: node.dst,
-      } satisfies StyleRule as T
-
-    case 'at-rule':
-      return {
-        kind: node.kind,
-        name: node.name,
-        params: node.params,
-        nodes: node.nodes.map(cloneAstNode),
-        src: node.src,
-        dst: node.dst,
-      } satisfies AtRule as T
-
-    case 'at-root':
-      return {
-        kind: node.kind,
-        nodes: node.nodes.map(cloneAstNode),
-        src: node.src,
-        dst: node.dst,
-      } satisfies AtRoot as T
-
-    case 'context':
-      return {
-        kind: node.kind,
-        context: { ...node.context },
-        nodes: node.nodes.map(cloneAstNode),
-        src: node.src,
-        dst: node.dst,
-      } satisfies Context as T
-
-    case 'declaration':
-      return {
-        kind: node.kind,
-        property: node.property,
-        value: node.value,
-        important: node.important,
-        src: node.src,
-        dst: node.dst,
-      } satisfies Declaration as T
-
-    case 'comment':
-      return {
-        kind: node.kind,
-        value: node.value,
-        src: node.src,
-        dst: node.dst,
-      } satisfies Comment as T
-
-    default:
-      node satisfies never
-      throw new Error(`Unknown node kind: ${(node as any).kind}`)
-  }
-}
-
-export function cssContext(
-  ctx: VisitContext<AstNode>,
-): VisitContext<AstNode> & { context: Record<string, string | boolean> } {
-  return {
-    depth: ctx.depth,
-    get context() {
-      let context: Record<string, string | boolean> = {}
-      for (let child of ctx.path()) {
-        if (child.kind === 'context') {
-          Object.assign(context, child.context)
-        }
-      }
-
-      // Once computed, we never need to compute this again
-      Object.defineProperty(this, 'context', { value: context })
-      return context
-    },
-    get parent() {
-      let parent = (this.path().pop() as Extract<AstNode, { nodes: AstNode[] }>) ?? null
-
-      // Once computed, we never need to compute this again
-      Object.defineProperty(this, 'parent', { value: parent })
-      return parent
-    },
-    path() {
-      return ctx.path().filter((n) => n.kind !== 'context')
-    },
-  }
-}

packages/tailwindcss-language-service/src/css/css-context.ts

@@ -0,0 +1,32 @@
+import type { VisitContext } from '../util/walk'
+import type { AstNode } from './ast'
+
+export function cssContext(
+  ctx: VisitContext<AstNode>,
+): VisitContext<AstNode> & { context: Record<string, string | boolean> } {
+  return {
+    depth: ctx.depth,
+    get context() {
+      let context: Record<string, string | boolean> = {}
+      for (let child of ctx.path()) {
+        if (child.kind === 'context') {
+          Object.assign(context, child.context)
+        }
+      }
+
+      // Once computed, we never need to compute this again
+      Object.defineProperty(this, 'context', { value: context })
+      return context
+    },
+    get parent() {
+      let parent = (this.path().pop() as Extract<AstNode, { nodes: AstNode[] }>) ?? null
+
+      // Once computed, we never need to compute this again
+      Object.defineProperty(this, 'parent', { value: parent })
+      return parent
+    },
+    path() {
+      return ctx.path().filter((n) => n.kind !== 'context')
+    },
+  }
+}

packages/tailwindcss-language-service/src/css/index.ts

@@ -1,6 +1,7 @@
 export * from './ast'
 export * from './source'
 export { parse } from './parse'
+export { cloneAstNode } from './clone-ast-node'
 export { fromPostCSSAst } from './from-postcss-ast'
 export { toPostCSSAst } from './to-postcss-ast'
 export { toCss } from './to-css'

packages/tailwindcss-language-service/src/css/to-postcss-ast.ts

@@ -1,5 +1,5 @@
 import * as postcss from 'postcss'
-import { atRule, comment, decl, styleRule, type AstNode } from './ast'
+import type { AstNode } from './ast'
 import type { Source, SourceLocation } from './source'
 import { DefaultMap } from '../util/default-map'
 import { createLineTable, LineTable } from '../util/line-table'