fix(helper): [tw] cannot merge template string correctly

Author: akinoccc

packages/core/src/helper/tw.ts

@@ -1,10 +1,24 @@
-export function tw(classNames: TemplateStringsArray, ...expressions: string[]): any {
+export interface TailwindObject {
+  source: string
+  value: (string | number)[]
+}
+
+export function tw(classNames: TemplateStringsArray, ...expressions: (string | number)[]): TailwindObject {
+  // const raw
+  const result = mergeTemplateStrings(classNames, expressions)
   return {
     source: 'tw',
-    value: classNames[0]
+    value: result
       ?.replace(/(\s|\\n)+/g, ' ')
       .trim()
-      .split(' ')
-      .concat(expressions),
+      .split(' '),
+  }
+}
+
+function mergeTemplateStrings(templateStrings: TemplateStringsArray, values: any[]) {
+  let result = templateStrings[0]
+  for (let i = 0; i < values.length; i++) {
+    result += values[i] + templateStrings[i + 1]
   }
+  return result
 }

packages/core/src/hooks/index.ts

@@ -1,4 +1,10 @@
-export type ExpressionType<T = Record<string, any>> = ((props: T) => string | number | ExpressionType | ExpressionType[]) | string
+import { TailwindObject } from '../helper'
+
+export type ExpressionType<T = Record<string, any>> =
+  | ((props: T) => string | number | ExpressionType | ExpressionType[])
+  | string
+  | number
+  | TailwindObject
 
 export function insertExpressions<T>(
   strings: TemplateStringsArray,