feat: commit util and new htmlHandler

Author: sonofmagic

packages/core/src/html/index.ts

@@ -1,23 +1,24 @@
 import { parse, serialize } from 'parse5'
 import { traverse } from '@parse5/tools'
 import { IHtmlHandlerOptions } from '../types'
-
+import { splitCode } from '../split'
+import { makeRegex } from '../regex'
 export function htmlHandler(rawSource: string, options: IHtmlHandlerOptions) {
   const { runtimeSet, classGenerator } = options
   const fragment = parse(rawSource)
   traverse(fragment, {
     element(node, parent) {
       const attr = node.attrs.find((x) => x.name === 'class')
       if (attr) {
-        const arr = attr.value.split(/\s/).filter((x) => x)
-        attr.value = arr
-          .map((x) => {
-            if (runtimeSet.has(x)) {
-              return classGenerator.generateClassName(x).name
-            }
-            return x
-          })
-          .join(' ')
+        const arr = splitCode(attr.value, {
+          splitQuote: false
+        })
+        for (let i = 0; i < arr.length; i++) {
+          const v = arr[i]
+          if (runtimeSet.has(v)) {
+            attr.value = attr.value.replace(makeRegex(v), classGenerator.generateClassName(v).name)
+          }
+        }
       }
     }
   })

packages/core/src/index.ts

@@ -2,3 +2,4 @@ export * from './css'
 export * from './html'
 export * from './js'
 export { default as ClassGenerator } from './classGenerator'
+export * from './types'

packages/core/src/js/index.ts

@@ -2,12 +2,8 @@ import type { StringLiteral, TemplateElement, CallExpression } from '@babel/type
 import * as t from '@babel/types'
 import { transformSync, type BabelFileResult, type NodePath } from '@babel/core'
 import type { IJsHandlerOptions } from '../types'
-import { escapeStringRegexp } from '../utils'
-import { splitCode } from './split'
-
-export function makeRegex(str: string) {
-  return new RegExp('(?<=^|[\\s"])' + escapeStringRegexp(str), 'g')
-}
+import { makeRegex } from '../regex'
+import { splitCode } from '../split'
 
 export function handleValue(str: string, node: StringLiteral | TemplateElement, options: IJsHandlerOptions) {
   const { runtimeSet: set, classGenerator: clsGen, splitQuote = true } = options

packages/core/src/regex.ts

@@ -0,0 +1,10 @@
+export function escapeStringRegexp(str: string) {
+  if (typeof str !== 'string') {
+    throw new TypeError('Expected a string')
+  }
+  return str.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&').replace(/-/g, '\\x2d')
+}
+
+export function makeRegex(str: string) {
+  return new RegExp('(?<=^|[\\s"])' + escapeStringRegexp(str), 'g')
+}

packages/core/src/js/split.ts renamed to packages/core/src/split.ts

@@ -121,10 +121,3 @@ export function regExpTest(arr: (string | RegExp)[] = [], str: string) {
   }
   throw new TypeError("paramater 'arr' should be a Array of Regexp | String !")
 }
-
-export function escapeStringRegexp(str: string) {
-  if (typeof str !== 'string') {
-    throw new TypeError('Expected a string')
-  }
-  return str.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&').replace(/-/g, '\\x2d')
-}

packages/core/src/utils.ts

@@ -1,8 +1,8 @@
-import { ClassGenerator, cssHandler, handleValue, htmlHandler, jsHandler, makeRegex } from '../'
+import { ClassGenerator, cssHandler, handleValue, htmlHandler, jsHandler } from '../'
 
 describe('exports', () => {
   it('exports should be defined', () => {
-    ;[ClassGenerator, cssHandler, handleValue, htmlHandler, jsHandler, makeRegex].forEach((x) => {
+    ;[ClassGenerator, cssHandler, handleValue, htmlHandler, jsHandler].forEach((x) => {
       expect(x).toBeDefined()
     })
   })

packages/core/test/exports.test.ts

@@ -1,5 +1,4 @@
-// import { escapeStringRegexp } from '../src/utils'
-import { makeRegex } from '../src/js'
+import { makeRegex } from '../src/regex'
 
 describe('regex', () => {
   it('z-10 regex', () => {

packages/core/test/reg.test.ts

@@ -1,4 +1,4 @@
-import { splitCode } from '../src/js/split'
+import { splitCode } from '../src/split'
 
 describe('split code', () => {
   it('split vue static str', () => {