feat: 提取常用字符串/数组工具到 shared，并在相关包中复用

Author: sonofmagic

.changeset/shared-utils-extract.md

@@ -0,0 +1,7 @@
+---
+"@weapp-tailwindcss/shared": patch
+"weapp-style-injector": patch
+"wetw": patch
+---
+
+提取常用字符串/数组工具到 shared，并在相关包中复用。

packages/shared/src/index.ts

@@ -6,13 +6,47 @@ export { getValue, setValue }
 
 export { defu } from 'defu'
 
+const HTTP_PATTERN = /^https?:\/\//i
+const CLEAN_URL_REGEXP = /[?#].*$/
+
 export function isRegexp(value: unknown): value is RegExp {
   return value instanceof RegExp
 }
 
 export function isMap<T = unknown, K = unknown>(value: unknown): value is Map<T, K> {
   return value instanceof Map
 }
+
+export function isHttp(target: string) {
+  return HTTP_PATTERN.test(target)
+}
+
+export function cleanUrl(url: string): string {
+  return url.replace(CLEAN_URL_REGEXP, '')
+}
+
+export function toArray<T>(value: T | T[] | null | undefined): Array<NonNullable<T>> {
+  if (value == null) {
+    return []
+  }
+  return (Array.isArray(value) ? value : [value]) as Array<NonNullable<T>>
+}
+
+export function ensurePosix(value: string): string {
+  return value.replace(/\\/g, '/')
+}
+
+export function normalizeRoot(root: string): string {
+  const trimmed = root.trim().replace(/^[./\\]+/, '').replace(/\\+/g, '/')
+  return trimmed.endsWith('/') ? trimmed.slice(0, -1) : trimmed
+}
+
+export function normalizeRelativeImport(target: string): string {
+  if (target.startsWith('.') || target.startsWith('/')) {
+    return target
+  }
+  return `./${target}`
+}
 export function regExpTest(arr: (string | RegExp)[], str: string, options?: { exact?: boolean }) {
   if (!Array.isArray(arr)) {
     throw new TypeError('paramater \'arr\' should be an Array of Regexp | String')

packages/shared/test/index.test.ts

@@ -1,5 +1,19 @@
 import { describe, expect, it } from 'vitest'
-import { defuOverrideArray, groupBy, isMap, isRegexp, noop, regExpTest, removeExt } from '@/index'
+import {
+  cleanUrl,
+  defuOverrideArray,
+  ensurePosix,
+  groupBy,
+  isHttp,
+  isMap,
+  isRegexp,
+  noop,
+  normalizeRelativeImport,
+  normalizeRoot,
+  regExpTest,
+  removeExt,
+  toArray,
+} from '@/index'
 
 describe('shared utils', () => {
   it('isRegexp correctly detects regular expressions', () => {
@@ -94,4 +108,35 @@ describe('shared utils', () => {
   it('noop returns undefined without side effects', () => {
     expect(noop()).toBeUndefined()
   })
+
+  it('toArray normalizes values to arrays', () => {
+    expect(toArray(null)).toEqual([])
+    expect(toArray('a')).toEqual(['a'])
+    expect(toArray(['a', 'b'])).toEqual(['a', 'b'])
+  })
+
+  it('ensurePosix normalizes windows separators', () => {
+    expect(ensurePosix('C:\\Users\\file.css')).toBe('C:/Users/file.css')
+  })
+
+  it('normalizeRoot trims and normalizes root paths', () => {
+    expect(normalizeRoot('./src/')).toBe('src')
+    expect(normalizeRoot(' /src/app ')).toBe('src/app')
+  })
+
+  it('normalizeRelativeImport prepends dot for bare paths', () => {
+    expect(normalizeRelativeImport('styles/index.css')).toBe('./styles/index.css')
+    expect(normalizeRelativeImport('./styles/index.css')).toBe('./styles/index.css')
+    expect(normalizeRelativeImport('/styles/index.css')).toBe('/styles/index.css')
+  })
+
+  it('cleanUrl strips query and hash', () => {
+    expect(cleanUrl('style.css?inline#hash')).toBe('style.css')
+  })
+
+  it('isHttp detects http/https urls', () => {
+    expect(isHttp('http://example.com')).toBe(true)
+    expect(isHttp('https://example.com')).toBe(true)
+    expect(isHttp('ftp://example.com')).toBe(false)
+  })
 })

packages/weapp-style-injector/package.json

@@ -81,6 +81,7 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
+    "@weapp-tailwindcss/shared": "workspace:*",
     "micromatch": "^4.0.8"
   },
   "publishConfig": {}

packages/weapp-style-injector/src/utils.ts

@@ -1,11 +1,7 @@
 import type { PerFileImportResolver } from './core'
+import { toArray } from '@weapp-tailwindcss/shared'
 
-export function toArray<T>(value: T | T[] | null | undefined): Array<NonNullable<T>> {
-  if (value == null) {
-    return []
-  }
-  return (Array.isArray(value) ? value : [value]) as Array<NonNullable<T>>
-}
+export { ensurePosix, normalizeRelativeImport, normalizeRoot, toArray } from '@weapp-tailwindcss/shared'
 
 export function mergePerFileResolvers(
   resolvers: Array<PerFileImportResolver | null | undefined>,
@@ -18,19 +14,3 @@ export function mergePerFileResolvers(
 
   return (fileName: string) => activeResolvers.flatMap(resolver => toArray(resolver(fileName)))
 }
-
-export function ensurePosix(value: string): string {
-  return value.replace(/\\/g, '/')
-}
-
-export function normalizeRoot(root: string): string {
-  const trimmed = root.trim().replace(/^[./\\]+/, '').replace(/\\+/g, '/')
-  return trimmed.endsWith('/') ? trimmed.slice(0, -1) : trimmed
-}
-
-export function normalizeRelativeImport(target: string): string {
-  if (target.startsWith('.') || target.startsWith('/')) {
-    return target
-  }
-  return `./${target}`
-}

packages/weapp-tailwindcss/src/bundlers/vite/utils.ts

@@ -1,9 +1,10 @@
 import type { ExistingRawSourceMap } from 'rollup'
 import path from 'node:path'
 import process from 'node:process'
+import { cleanUrl, ensurePosix } from '@weapp-tailwindcss/shared'
 
 export function slash(p: string): string {
-  return p.replace(/\\/g, '/')
+  return ensurePosix(p)
 }
 
 export const isWindows = process.platform === 'win32'
@@ -15,13 +16,9 @@ export function isCSSRequest(request: string): boolean {
 }
 
 export function normalizePath(id: string): string {
-  return path.posix.normalize(isWindows ? slash(id) : id)
-}
-
-const postfixRE = /[?#].*$/
-export function cleanUrl(url: string): string {
-  return url.replace(postfixRE, '')
+  return path.posix.normalize(isWindows ? ensurePosix(id) : id)
 }
+export { cleanUrl }
 
 export async function formatPostcssSourceMap(
   rawMap: ExistingRawSourceMap,

packages/weapp-tailwindcss/src/bundlers/webpack/loaders/weapp-tw-css-import-rewrite-loader.ts

@@ -3,6 +3,7 @@ import type { Buffer } from 'node:buffer'
 import type webpack from 'webpack'
 import type { AppType } from '@/types'
 import process from 'node:process'
+import { ensurePosix } from '@weapp-tailwindcss/shared'
 import loaderUtils from 'loader-utils'
 import { rewriteTailwindcssImportsInCode } from '@/bundlers/shared/css-imports'
 
@@ -13,10 +14,6 @@ interface CssImportRewriteLoaderOptions {
   }
 }
 
-function slash(p: string): string {
-  return p.replace(/\\/g, '/')
-}
-
 function joinPosixPath(base: string, subpath: string) {
   if (base.endsWith('/')) {
     return `${base}${subpath}`
@@ -32,7 +29,7 @@ function applyCssImportRewrite(source: string, options: CssImportRewriteLoaderOp
   }
   const rewritten = rewriteTailwindcssImportsInCode(
     source,
-    slash(pkgDir),
+    ensurePosix(pkgDir),
     {
       join: joinPosixPath,
       appType: rewriteOptions.appType,

packages/wetw/package.json

@@ -52,6 +52,7 @@
   "publishConfig": {},
   "dependencies": {
     "@inquirer/prompts": "^8.2.0",
+    "@weapp-tailwindcss/shared": "workspace:*",
     "c12": "^3.3.3",
     "cac": "^6.7.14"
   }

packages/wetw/src/utils.ts

@@ -1,5 +1 @@
-const HTTP_PATTERN = /^https?:\/\//i
-
-export function isHttp(target: string) {
-  return HTTP_PATTERN.test(target)
-}
+export { isHttp } from '@weapp-tailwindcss/shared'