refactor(weapp-tailwindcss): utils

Author: sonofmagic

.changeset/zh-context-refactor-tests.md

@@ -2,4 +2,4 @@
 "weapp-tailwindcss": minor
 ---
 
-重构编译上下文模块，将日志、Tailwind 补丁、模板属性转换、处理器构建拆分为独立单元并补充 100% 覆盖率的单元测试，确保模块化结构更清晰且行为可验证。新增 Lightning CSS 版本的样式处理器，覆盖类名转义、选择器兼容、`:hover` 清理与子选择器替换等关键能力，并提供针对性单测。
+重构编译上下文模块，将日志、Tailwind 补丁、模板属性转换、处理器构建拆分为独立单元并补充 100% 覆盖率的单元测试，确保模块化结构更清晰且行为可验证。新增 Lightning CSS 版本的样式处理器，覆盖类名转义、选择器兼容、`:hover` 清理与子选择器替换等关键能力，并提供针对性单测。同步优化工具方法：为文件分组逻辑提供固定分组输出，替换已废弃的 `unescape` Unicode 解码实现，并补充对应的单元测试。

packages/weapp-tailwindcss/src/utils/decode.ts

@@ -1,12 +1,17 @@
-export function decodeUnicode(s: string) {
-  return unescape(s.replaceAll(/\\(u[\dA-Fa-f]{4})/g, '%$1'))
+const unicodeEscapeRE = /\\u([\dA-Fa-f]{4})/g
+
+export function decodeUnicode(value: string) {
+  return value.replace(unicodeEscapeRE, (_match, hex) => {
+    const codePoint = Number.parseInt(hex, 16)
+    return Number.isNaN(codePoint) ? _match : String.fromCharCode(codePoint)
+  })
 }
 
 export function decodeUnicode2(input: string) {
   try {
     return JSON.parse(`"${input}"`)
   }
   catch (_error) {
-    return input
+    return decodeUnicode(input)
   }
 }

packages/weapp-tailwindcss/src/utils/index.ts

@@ -12,23 +12,38 @@ export {
   removeExt,
 }
 
+export type EntryGroup = 'css' | 'html' | 'js' | 'other'
+
+function classifyEntry(filename: string, options: InternalUserDefinedOptions): EntryGroup {
+  if (options.cssMatcher(filename)) {
+    return 'css'
+  }
+  if (options.htmlMatcher(filename)) {
+    return 'html'
+  }
+  if (options.jsMatcher(filename) || options.wxsMatcher(filename)) {
+    return 'js'
+  }
+  return 'other'
+}
+
+function createEmptyGroups<T>(): Record<EntryGroup, [string, T][]> {
+  return {
+    css: [],
+    html: [],
+    js: [],
+    other: [],
+  }
+}
+
 export function getGroupedEntries<T>(entries: [string, T][], options: InternalUserDefinedOptions) {
-  const { cssMatcher, htmlMatcher, jsMatcher, wxsMatcher } = options
-  const groupedEntries = groupBy(entries, ([file]) => {
-    if (cssMatcher(file)) {
-      return 'css'
-    }
-    else if (htmlMatcher(file)) {
-      return 'html'
-    }
-    else if (jsMatcher(file) || wxsMatcher(file)) {
-      return 'js'
-    }
-    else {
-      return 'other'
-    }
-  })
-  return groupedEntries as Record<'css' | 'html' | 'js' | 'other', [string, T][]>
+  const groups = createEmptyGroups<T>()
+  for (const entry of entries) {
+    const [filename] = entry
+    const group = classifyEntry(filename, options)
+    groups[group].push(entry)
+  }
+  return groups
 }
 
 // const MAX_ASCII_CHAR_CODE = 127

packages/weapp-tailwindcss/test/util.test.ts

@@ -1,5 +1,6 @@
+import type { InternalUserDefinedOptions } from '@/types'
 import path from 'node:path'
-import { groupBy, regExpTest } from '@/utils'
+import { getGroupedEntries, groupBy, regExpTest } from '@/utils'
 import { switch2relative } from './util'
 
 function xxx(fn: any) {
@@ -124,4 +125,46 @@ describe('test util', () => {
       ],
     })
   })
+
+  describe('getGroupedEntries', () => {
+    const matchers = {
+      cssMatcher: (file: string) => file.endsWith('.wxss'),
+      htmlMatcher: (file: string) => file.endsWith('.wxml'),
+      jsMatcher: (file: string) => file.endsWith('.js'),
+      wxsMatcher: (file: string) => file.endsWith('.wxs'),
+    } as Pick<InternalUserDefinedOptions, 'cssMatcher' | 'htmlMatcher' | 'jsMatcher' | 'wxsMatcher'>
+
+    const options = matchers as unknown as InternalUserDefinedOptions
+
+    it('groups entries by matcher priority', () => {
+      const entries: [string, number][] = [
+        ['app.wxss', 1],
+        ['index.wxml', 2],
+        ['logic.js', 3],
+        ['helper.wxs', 4],
+        ['README.md', 5],
+      ]
+
+      expect(getGroupedEntries(entries, options)).toEqual({
+        css: [['app.wxss', 1]],
+        html: [['index.wxml', 2]],
+        js: [
+          ['logic.js', 3],
+          ['helper.wxs', 4],
+        ],
+        other: [['README.md', 5]],
+      })
+    })
+
+    it('returns empty arrays for missing groups', () => {
+      const entries: [string, number][] = []
+
+      expect(getGroupedEntries(entries, options)).toEqual({
+        css: [],
+        html: [],
+        js: [],
+        other: [],
+      })
+    })
+  })
 })

packages/weapp-tailwindcss/test/utils/decode.test.ts

@@ -0,0 +1,20 @@
+import { describe, expect, it } from 'vitest'
+import { decodeUnicode, decodeUnicode2 } from '@/utils/decode'
+
+describe('decode utils', () => {
+  it('decodes unicode escape sequences', () => {
+    expect(decodeUnicode('\\u4f60\\u597d')).toBe('你好')
+  })
+
+  it('leaves invalid escapes untouched', () => {
+    expect(decodeUnicode('\\uZZZZ-test')).toBe('\\uZZZZ-test')
+  })
+
+  it('decodes mixed escape characters via JSON parser fallback', () => {
+    expect(decodeUnicode2('\\u4f60\\u597d\\nworld')).toBe('你好\nworld')
+  })
+
+  it('falls back gracefully when JSON parsing fails', () => {
+    expect(decodeUnicode2('\\u4f60\\u597d\\uZZZZ')).toBe('你好\\uZZZZ')
+  })
+})