From 35172905274b98e2884174a3d06d333915c03a5d Mon Sep 17 00:00:00 2001
From: lileirjyb <lileirjyb@vivo.com>
Date: Fri, 17 Jan 2025 17:54:00 +0800
Subject: [PATCH 1/9] feat: update jscard package result: extract template and
 json while keeping sourcemap

Signed-off-by: lileirjyb <lileirjyb@vivo.com>
---
 packages/hap-compiler/src/style/process.js    |   2 +-
 packages/hap-compiler/src/style/validator.js  |   2 +-
 packages/hap-compiler/src/template/exp.js     |  10 +-
 packages/hap-compiler/src/template/index.js   |  14 +-
 .../hap-compiler/src/template/validator.js    | 107 ++++-
 .../src/loaders/ux-fragment-utils.js          |  26 +-
 packages/hap-dsl-xvm/src/loaders/ux-loader.js |   9 +-
 packages/hap-packager/src/common/utils.js     |  16 +-
 .../{lite-card-plugin.js => card-plugin.js}   | 137 ++++--
 .../src/plugins/card-script-handle-plugin.js  | 186 ++++++++
 packages/hap-packager/src/plugins/index.js    |   4 +-
 .../src/plugins/remove-modules-plugin.js      | 105 +++++
 .../src/plugins/resource-plugin.js            |   3 +-
 .../src/plugins/widget-fingerprint-plugin.js  |   4 +-
 .../hap-packager/src/post-handler/index.js    | 426 +-----------------
 .../src/post-handler/js-card-post.js          | 297 ++++++++++++
 .../src/post-handler/lite-card-post.js        | 407 +++++++++++++++++
 packages/hap-packager/src/signature/index.js  |   2 +-
 .../hap-packager/src/subpackages/service.js   |   3 +-
 packages/hap-packager/src/webpack.post.js     |  10 +-
 packages/hap-shared-utils/src/index.js        |  38 ++
 packages/hap-toolkit/src/utils.js             |   7 +-
 22 files changed, 1277 insertions(+), 538 deletions(-)
 rename packages/hap-packager/src/plugins/{lite-card-plugin.js => card-plugin.js} (69%)
 create mode 100644 packages/hap-packager/src/plugins/card-script-handle-plugin.js
 create mode 100644 packages/hap-packager/src/plugins/remove-modules-plugin.js
 create mode 100644 packages/hap-packager/src/post-handler/js-card-post.js
 create mode 100644 packages/hap-packager/src/post-handler/lite-card-post.js

diff --git a/packages/hap-compiler/src/style/process.js b/packages/hap-compiler/src/style/process.js
index c21f3bdd..149b1c4d 100644
--- a/packages/hap-compiler/src/style/process.js
+++ b/packages/hap-compiler/src/style/process.js
@@ -141,7 +141,7 @@ function processImport(csscode, dir, log, depList) {
  * @param {String} filePath - 文件路径
  * @param {Array} depFiles - 使用到的资源集合
  */
-function processSingleClass(rule, jsonStyle, ruleResult, log, filePath, depFiles) {
+function processSingleClass(rule, jsonStyle, ruleResult, log, filePath, depFiles, options) {
   rule.declarations.forEach(function (declaration) {
     const subType = declaration.type
 
diff --git a/packages/hap-compiler/src/style/validator.js b/packages/hap-compiler/src/style/validator.js
index 262cad8f..3a3c6e82 100755
--- a/packages/hap-compiler/src/style/validator.js
+++ b/packages/hap-compiler/src/style/validator.js
@@ -2672,7 +2672,7 @@ function validate(name, value, options) {
   const validator = validatorMap[name]
 
   if (typeof validator === 'function') {
-    if (typeof value !== 'function') {
+    if (typeof value !== 'function' && value.indexOf('function') < 0) {
       if (mightReferlocalResource(name)) {
         result = validator(value, options)
       } else {
diff --git a/packages/hap-compiler/src/template/exp.js b/packages/hap-compiler/src/template/exp.js
index ee5ac312..c5c86e15 100644
--- a/packages/hap-compiler/src/template/exp.js
+++ b/packages/hap-compiler/src/template/exp.js
@@ -35,7 +35,7 @@ function trimhtml(str) {
  * @param isLite is lite card
  * @returns {*}
  */
-function transExpr(expContent, toFunc, isLite) {
+function transExpr(expContent, toFunc, isLite, isCard) {
   let ret
   const trimExpContent = expContent.trim()
   if (!textParser.isExpr(trimExpContent)) {
@@ -64,8 +64,12 @@ function transExpr(expContent, toFunc, isLite) {
     ret = ret.join(' + ')
     if (toFunc !== false) {
       try {
-        /* eslint-disable no-eval */
-        ret = eval('(function () {return ' + ret + '})')
+        if (isCard) {
+          ret = 'function () {return ' + ret + '}'
+        } else {
+          /* eslint-disable no-eval */
+          ret = eval('(function () {return ' + ret + '})')
+        }
         /* eslint-enable no-eval */
       } catch (err) {
         err.isExpressionError = true
diff --git a/packages/hap-compiler/src/template/index.js b/packages/hap-compiler/src/template/index.js
index 329db3e8..0e3f905b 100644
--- a/packages/hap-compiler/src/template/index.js
+++ b/packages/hap-compiler/src/template/index.js
@@ -128,9 +128,15 @@ function traverse(node, output, previousNode, conditionList, options) {
           if (name.match(/^model:/)) {
             // 解析model指令，model指令格式：model:name="{{youName}}"
             validator.checkModel(name, value, output, node, locationInfo, options)
+            if (output.isCard) {
+              throw new Error('卡片不支持 model 指令')
+            }
           } else if (name.match(/^dir:/)) {
             // 解析自定义指令，自定义指令格式：dir:指令名称="{{data}}"
             validator.checkCustomDirective(name, value, output, node)
+            if (output.isCard) {
+              throw new Error('卡片不支持自定义指令')
+            }
           } else {
             // 其余为普通属性
             validator.checkAttr(name, value, output, node.tagName, locationInfo, options)
@@ -362,7 +368,13 @@ function parse(source, options) {
     { treeAdapter: parse5.treeAdapters.default, locationInfo: true },
     options.filePath
   )
-  const output = { result: {}, log: [], depFiles: [], isLite: !!options.lite }
+  const output = {
+    result: {},
+    log: [],
+    depFiles: [],
+    isCard: !!options.card,
+    isLite: !!options.lite
+  }
 
   // 模板为空或解析失败
   /* istanbul ignore if */
diff --git a/packages/hap-compiler/src/template/validator.js b/packages/hap-compiler/src/template/validator.js
index 4c747dc1..2723baf2 100644
--- a/packages/hap-compiler/src/template/validator.js
+++ b/packages/hap-compiler/src/template/validator.js
@@ -1420,7 +1420,13 @@ function checkTagName(node, output, options = {}) {
  */
 function checkId(id, output) {
   if (id) {
-    output.result.id = exp.isExpr(id) ? exp(id, true, output.isLite) : id
+    const isLite = output.isLite
+    const isCard = output.isCard
+    output.result.id = exp.isExpr(id) ? exp(id, true, isLite, isCard) : id
+    output.result.idExpr = true
+    if (isCard && !isLite) {
+      output.result.idRaw = id
+    }
   }
 }
 
@@ -1456,7 +1462,8 @@ function checkClass(className, output) {
   let classList = []
 
   className = className.trim()
-
+  const isLite = output.isLite
+  const isCard = output.isCard
   if (className) {
     let start = 0
     let end = 0
@@ -1477,7 +1484,6 @@ function checkClass(className, output) {
     }
     segs.push(className.slice(start)) // trailing static classes
 
-    const isLite = output.isLite
     classList = segs.reduce((list, seg) => {
       if (exp.isExpr(seg)) {
         hasBinding = true
@@ -1500,14 +1506,19 @@ function checkClass(className, output) {
         err.expression = className
         throw err
       }
-      output.result.class = className
       output.result.classList = classList
     } else if (hasBinding) {
-      const code = '(function () {return [' + classList.join(', ') + ']})'
       try {
-        /* eslint-disable no-eval */
-        output.result.classList = eval(code)
-        /* eslint-enable no-eval */
+        let code = ''
+        if (isCard) {
+          code = 'function () {return [' + classList.join(', ') + ']}'
+          output.result.classList = code
+        } else {
+          code = '(function () {return [' + classList.join(', ') + ']})'
+          /* eslint-disable no-eval */
+          output.result.classList = eval(code)
+          /* eslint-enable no-eval */
+        }
       } catch (err) {
         err.isExpressionError = true
         err.expression = className
@@ -1520,6 +1531,12 @@ function checkClass(className, output) {
       )
     }
   }
+  if (isCard) {
+    output.result.class = className
+    if (!isLite) {
+      output.result.classListRaw = className
+    }
+  }
 }
 
 /**
@@ -1532,9 +1549,11 @@ function checkClass(className, output) {
  */
 function checkStyle(cssText, output, locationInfo, options) {
   let style = {}
+  let styleRaw = {}
   const log = output.log
   if (cssText) {
     const isLite = output.isLite
+    const isCard = output.isCard
     if (exp.singleExpr(cssText)) {
       // 检测是否嵌套{{}}
       const incText = exp.removeExprffix(cssText)
@@ -1545,9 +1564,12 @@ function checkStyle(cssText, output, locationInfo, options) {
           reason: 'ERROR: style 属性不能嵌套多层{{}}'
         })
       } else {
-        style = exp(cssText, true, isLite)
+        style = exp(cssText, true, isLite, isCard)
       }
       output.result.style = style
+      if (isCard && !isLite) {
+        output.result.styleRaw = cssText
+      }
       return
     }
     // 如果是 a: {{}}; b: {{}};, 则分解处理
@@ -1563,13 +1585,18 @@ function checkStyle(cssText, output, locationInfo, options) {
         k = pair[0].trim()
         k = hyphenedToCamelCase(k)
         v = pair[1].trim()
-        v = exp(v, true, isLite) // 处理值表达式
+
+        const valueRaw = v
+        v = exp(v, true, isLite, isCard) // 处理值表达式
         vResult = styler.validateDelaration(k, v, options)
         v = vResult.value
         v.forEach((t) => {
           // 如果校验成功，则保存转换后的属性值
           if (isValidValue(t.v) || typeof t.v === 'function') {
             style[t.n] = t.v
+            if (isCard && !isLite) {
+              styleRaw[t.n] = valueRaw
+            }
           }
         })
         if (vResult.log) {
@@ -1590,6 +1617,9 @@ function checkStyle(cssText, output, locationInfo, options) {
       }
     }
     output.result.style = style
+    if (isCard && !isLite) {
+      output.result.styleRaw = styleRaw
+    }
   }
 }
 
@@ -1604,9 +1634,14 @@ function checkIs(value, output, locationInfo) {
   if (value) {
     // 如果没有，补充上{{}}
     value = exp.addExprffix(value)
+    const isLite = output.isLite
+    const isCard = output.isCard
 
     // 将表达式转换为function
-    output.result.is = exp(value, true, output.isLite)
+    output.result.is = exp(value, true, isLite, isCard)
+    if (isCard && !isLite) {
+      output.result.isRaw = value
+    }
   } else {
     log.push({
       line: locationInfo.line || 1,
@@ -1628,6 +1663,7 @@ function checkIf(value, output, not, locationInfo, conditionList) {
     // 如果没有，补充上{{}}
     value = exp.addExprffix(value)
     const isLite = output.isLite
+    const isCard = output.isCard
     if (not) {
       value = '{{' + buildConditionExp(conditionList) + '}}'
     } else {
@@ -1636,7 +1672,10 @@ function checkIf(value, output, not, locationInfo, conditionList) {
       conditionList.push(`${value.substr(2, value.length - 4)}`)
     }
     // 将表达式转换为function
-    output.result.shown = isLite ? value : exp(value, true)
+    output.result.shown = isLite ? value : exp(value, true, isLite, isCard)
+    if (isCard && !isLite) {
+      output.result.shownRaw = value
+    }
   } else {
     if (!not) {
       log.push({
@@ -1674,11 +1713,15 @@ function checkElif(value, cond, output, locationInfo, conditionList) {
     value = exp.addExprffix(value)
     cond = exp.addExprffix(cond)
     const isLite = output.isLite
+    const isCard = output.isCard
     newcond =
       '{{(' + value.substr(2, value.length - 4) + ') && ' + buildConditionExp(conditionList) + '}}'
 
     // 将表达式转换为function
-    output.result.shown = isLite ? newcond : exp(newcond)
+    output.result.shown = isLite ? newcond : exp(newcond, true, isLite, isCard)
+    if (isCard && !isLite) {
+      output.result.shownRaw = newcond
+    }
     conditionList.push(`${value.substr(2, value.length - 4)}`)
   } else {
     log.push({
@@ -1719,12 +1762,15 @@ function checkFor(value, output, locationInfo) {
     value = '{{' + value + '}}'
 
     const isLite = output.isLite
-    let repeat
+    const isCard = output.isCard
+    let repeat, repeatRaw
     if (!key && !val) {
-      repeat = exp(value, true, isLite)
+      repeat = exp(value, true, isLite, isCard)
+      repeatRaw = value
     } else {
       // 如果指定key,value
-      repeat = { exp: exp(value, true, isLite) }
+      repeat = { exp: exp(value, true, isLite, isCard) }
+      repeatRaw = { expRaw: value }
       if (key) {
         repeat.key = key
       }
@@ -1733,6 +1779,9 @@ function checkFor(value, output, locationInfo) {
       }
     }
     output.result.repeat = repeat
+    if (isCard && !isLite) {
+      output.result.repeatRaw = repeatRaw
+    }
   } else {
     log.push({
       line: locationInfo.line || 1,
@@ -1775,11 +1824,15 @@ function checkEvent(name, value, output) {
       value = '{{' + funcName + '(' + params.join(',') + ')}}'
       try {
         // 将事件转换为函数对象
-        /* eslint-disable no-eval */
-        value = output.isLite
-          ? value
-          : eval('(function (evt) { return ' + exp(value, false).replace('this.evt', 'evt') + '})')
-        /* eslint-enable no-eval */
+        if (output.isCard) {
+          value = 'function (evt) { return ' + exp(value, false).replace('this.evt', 'evt') + '}'
+        } else if (!output.isLite) {
+          /* eslint-disable no-eval */
+          value = eval(
+            '(function (evt) { return ' + exp(value, false).replace('this.evt', 'evt') + '})'
+          )
+          /* eslint-enable no-eval */
+        }
       } catch (err) {
         err.isExpressionError = true
         err.expression = originValue
@@ -1809,7 +1862,7 @@ function checkCustomDirective(name, value, output, node) {
   output.result.directives = output.result.directives || []
   output.result.directives.push({
     name: dirName,
-    value: exp.isExpr(value) ? exp(value, true, output.isLite) : value
+    value: exp.isExpr(value) ? exp(value, true, output.isLite, output.isCard) : value
   })
 }
 
@@ -1840,8 +1893,13 @@ function checkAttr(name, value, output, tagName, locationInfo, options) {
       value = resolvePath(value, options.filePath)
       output.depFiles.push(value)
     }
+    const isLite = output.isLite
+    const isCard = output.isCard
     output.result.attr = output.result.attr || {}
-    output.result.attr[hyphenedToCamelCase(name)] = exp(value, true, output.isLite)
+    output.result.attr[hyphenedToCamelCase(name)] = exp(value, true, isLite, isCard)
+    if (isCard && !isLite) {
+      output.result.attr[hyphenedToCamelCase(name) + 'Raw'] = value
+    }
     if (name === 'value' && tagName === 'text') {
       output.log.push({
         line: locationInfo.line,
@@ -1982,6 +2040,9 @@ function hasIfOrFor(nodes) {
   return flag
 }
 
+/**
+ * 检查class数组是否为常量和变量混合的方式，如 "clazz1 {{myClass}}"
+ */
 function isValidClassArray(arr) {
   const filterArr = arr.filter((clazz) => clazz.length > 0)
 
diff --git a/packages/hap-dsl-xvm/src/loaders/ux-fragment-utils.js b/packages/hap-dsl-xvm/src/loaders/ux-fragment-utils.js
index 0d95ce15..2f5cc9a3 100644
--- a/packages/hap-dsl-xvm/src/loaders/ux-fragment-utils.js
+++ b/packages/hap-dsl-xvm/src/loaders/ux-fragment-utils.js
@@ -263,12 +263,14 @@ function makeLoaderString(type, config, uxType) {
  * @param $loader
  * @param imports - 外部导入的组件列表
  * @param importNames - 外部导入的组件名列表
- * @param {number} lite 1:轻卡; 0:普通卡
+ * @param {number} card 1:卡片
+ * @param {number} lite 1:轻卡
  * @returns {string}
  */
-function processImportFrag($loader, imports, importNames, lite) {
+function processImportFrag($loader, imports, importNames, card, lite) {
   let retStr = ''
   if (imports.length) {
+    const cardParam = card ? `&card=${card}` : ''
     const liteParam = lite ? `&lite=${lite}` : ''
     for (let i = 0; i < imports.length; i++) {
       const imp = imports[i]
@@ -306,7 +308,7 @@ function processImportFrag($loader, imports, importNames, lite) {
       let reqStr = makeRequireString(
         $loader,
         makeLoaderString(FRAG_TYPE.IMPORT),
-        `${importSrc}?uxType=${ENTRY_TYPE.COMP}&name=${importName}${liteParam}`
+        `${importSrc}?uxType=${ENTRY_TYPE.COMP}&name=${importName}${cardParam}${liteParam}`
       )
 
       if (compileOptionsObject.stats) {
@@ -326,9 +328,10 @@ function processImportFrag($loader, imports, importNames, lite) {
  * @param templates
  * @param uxType
  * @param importNames
- * @param {number} lite 1:轻卡; 0:普通卡
+ * @param {number} card 1:卡片
+ * @param {number} lite 1:轻卡
  */
-function processTemplateFrag($loader, templates, uxType, importNames, lite) {
+function processTemplateFrag($loader, templates, uxType, importNames, card, lite) {
   let retStr = '{}'
   if (!templates.length) {
     $loader.emitError(new Error('需要模板 <template> 片段'))
@@ -343,7 +346,9 @@ function processTemplateFrag($loader, templates, uxType, importNames, lite) {
       src = fragAttrsSrc
     }
 
+    const cardParam = card ? `&card=${card}` : ''
     const liteParam = lite ? `&lite=${lite}` : ''
+    const pathParam = card ? `&uxPath=${src}` : ''
     // 解析成类似url中key[]=xxx 的形式，便于loader-utils解析
     importNames = importNames.map((item) => 'importNames[]=' + item)
     retStr = makeRequireString(
@@ -351,7 +356,7 @@ function processTemplateFrag($loader, templates, uxType, importNames, lite) {
       makeLoaderString(FRAG_TYPE.TEMPLATE, {
         alone: !!fragAttrsSrc
       }),
-      `${src}?uxType=${uxType}&${importNames.join(',')}${liteParam}`
+      `${src}?uxType=${uxType}&${importNames.join(',')}${cardParam}${liteParam}${pathParam}`
     )
   }
   return retStr
@@ -362,9 +367,10 @@ function processTemplateFrag($loader, templates, uxType, importNames, lite) {
  * @param $loader
  * @param styles
  * @param uxType
- * @param {number} lite 1:轻卡; 0:普通卡
+ * @param {number} card 1:卡片
+ * @param {number} lite 1:轻卡
  */
-function processStyleFrag($loader, styles, uxType, lite) {
+function processStyleFrag($loader, styles, uxType, card, lite) {
   let code = '{}'
   if (styles.length) {
     // 有且仅有一个<style>片段
@@ -380,14 +386,16 @@ function processStyleFrag($loader, styles, uxType, lite) {
     print({
       style: src
     })
+    const cardParam = card ? `&card=${card}` : ''
     const liteParam = lite ? `&lite=${lite}` : ''
+    const pathParam = card ? `&uxPath=${src}` : ''
     code = makeRequireString(
       $loader,
       makeLoaderString(FRAG_TYPE.STYLE, {
         alone: !!fragAttrsSrc,
         lang: fragAttrsLang
       }),
-      `${src}?uxType=${uxType}${liteParam}`
+      `${src}?uxType=${uxType}${cardParam}${liteParam}${pathParam}`
     )
   }
   return code
diff --git a/packages/hap-dsl-xvm/src/loaders/ux-loader.js b/packages/hap-dsl-xvm/src/loaders/ux-loader.js
index b4214c3a..f948a9b8 100644
--- a/packages/hap-dsl-xvm/src/loaders/ux-loader.js
+++ b/packages/hap-dsl-xvm/src/loaders/ux-loader.js
@@ -31,12 +31,12 @@ const { validator } = templater
  * @param lite 1: 轻卡; 0: 普通卡
  * @return {String}
  */
-function assemble($loader, frags, name, uxType, lite) {
+function assemble($loader, frags, name, uxType, card, lite) {
   const isUseTreeShaking = !!globalConfig.useTreeShaking
   // 外部导入的组件列表
   const importNames = []
   // 处理导入的组件
-  const importFrag = processImportFrag($loader, frags.import, importNames, lite)
+  const importFrag = processImportFrag($loader, frags.import, importNames, card, lite)
 
   let moduleExports = `     $app_script$($app_module$, $app_exports$, $app_require$)
         if ($app_exports$.__esModule && $app_exports$.default) {
@@ -66,6 +66,7 @@ function assemble($loader, frags, name, uxType, lite) {
       frags.template,
       uxType,
       importNames,
+      card,
       lite
     )}\n`
   // $app_define$ function content
@@ -74,6 +75,7 @@ function assemble($loader, frags, name, uxType, lite) {
       $loader,
       frags.style,
       uxType,
+      card,
       lite
     )}\n`
   }
@@ -137,6 +139,7 @@ export default function uxLoader(source) {
   // 文件类型
   const uxType = resourceQuery.uxType
   // lite card
+  const card = resourceQuery.card
   const lite = resourceQuery.lite
 
   // 使用原有文件名（不包含扩展名）
@@ -158,7 +161,7 @@ export default function uxLoader(source) {
 
   parseImportList(this, frags.import)
     .then(() => {
-      return assemble(this, frags, name, uxType, lite)
+      return assemble(this, frags, name, uxType, card, lite)
     })
     .then((result) => {
       callback(null, result)
diff --git a/packages/hap-packager/src/common/utils.js b/packages/hap-packager/src/common/utils.js
index fcfe49c2..fd10a5a7 100644
--- a/packages/hap-packager/src/common/utils.js
+++ b/packages/hap-packager/src/common/utils.js
@@ -5,11 +5,8 @@
 
 import fs from 'fs'
 import path from 'path'
-import crypto from 'crypto'
 import { sync as resolveSync } from 'resolve'
 
-import { colorconsole } from '@hap-toolkit/shared-utils'
-
 /**
  * 获取要使用 babel.config.js 的路径
  * @param {string} cwd - 项目地址
@@ -132,17 +129,6 @@ export function isPlainObject(obj) {
   return toString.call(obj) === OBJECT_STRING
 }
 
-/**
- * 获取 SHA256 摘要
- * @param {Buffer} buffer - buffer
- * @string {String<hex-string>} - hash 值
- */
-export function calcDataDigest(buffer) {
-  const hash = crypto.createHash('SHA256')
-  hash.update(buffer)
-  return hash.digest()
-}
-
 /**
  * 获取入口页面所需的骨架屏文件
  * @param {Object} skeletonConf - 骨架屏配置
@@ -242,7 +228,7 @@ export function getLastLoaderPath(reqPath) {
   }
   reqPath = reqPath.replace(/\\/g, '/')
   const reqArr = reqPath.split('!')
-  let lastLoader = reqArr[0] // inline loader reversed by '!'
+  let lastLoader = reqArr.find((str) => str !== '') // inline loader reversed by '!'
   if (lastLoader && lastLoader.indexOf('?') > 0) {
     // remove params if exist
     lastLoader = lastLoader.split('?')[0]
diff --git a/packages/hap-packager/src/plugins/lite-card-plugin.js b/packages/hap-packager/src/plugins/card-plugin.js
similarity index 69%
rename from packages/hap-packager/src/plugins/lite-card-plugin.js
rename to packages/hap-packager/src/plugins/card-plugin.js
index 2706a00d..727223d3 100644
--- a/packages/hap-packager/src/plugins/lite-card-plugin.js
+++ b/packages/hap-packager/src/plugins/card-plugin.js
@@ -5,14 +5,16 @@
 
 import Compilation from 'webpack/lib/Compilation'
 import path from 'path'
-import { getLastLoaderPath, calcDataDigest } from '../common/utils'
+import { getLastLoaderPath } from '../common/utils'
+import { getStyleObjectId } from '@hap-toolkit/shared-utils'
+
 import {
   LOADER_INFO_LIST,
   LOADER_PATH_UX,
   LOADER_PATH_STYLE,
   LOADER_PATH_TEMPLATE
 } from '../common/constant'
-import { postHandleLiteCardRes } from '../post-handler'
+import { postHandleLiteCardRes, postHandleJSCardRes } from '../post-handler'
 
 const SUFFIX_UX = '.ux'
 const CARD_ENTRY = '#entry'
@@ -22,17 +24,17 @@ const STYLE_OBJECT_ID = 'styleObjectId'
 /**
  * Generate build output for light card.
  */
-class LiteCardPlugin {
+class CardPlugin {
   constructor(options = {}) {
     this.options = options || {}
   }
 
   apply(compiler) {
     let ConcatSource = compiler.webpack.sources.ConcatSource
-    compiler.hooks.compilation.tap('LiteCardPlugin', (compilation) => {
+    compiler.hooks.compilation.tap('CardPlugin', (compilation) => {
       compilation.hooks.processAssets.tap(
         {
-          name: 'LiteCardPlugin',
+          name: 'CardPlugin',
           stage: Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
         },
         () => {
@@ -45,26 +47,56 @@ class LiteCardPlugin {
               continue
             }
             const { rawRequest: entryRawRequest, request } = entryModule
-            if (this.isLightCard(entryRawRequest)) {
-              const { templateFileName, cssFileName, bundleFilePath } = this.getLightCardBuildPath(
+            if (this.isCard(entryRawRequest)) {
+              const { templateFileName, cssFileName, bundleFilePath } = this.getCardBuildPath(
                 request,
                 pathSrc
               )
-              const liteCardRes = {
+              const templateRes = {
                 [CARD_ENTRY]: {}
               }
               const styleRes = {}
               this.findOutgoingModules(
                 moduleGraph,
                 entryModule,
-                liteCardRes,
-                liteCardRes,
+                templateRes,
+                templateRes,
                 styleRes,
                 pathSrc,
                 bundleFilePath
               )
-              const templateJsonStr = postHandleLiteCardRes(liteCardRes)
+              let handledTemplateCardRes
+              if (this.isLiteCard(entryRawRequest)) {
+                handledTemplateCardRes = postHandleLiteCardRes(templateRes)
+              } else {
+                handledTemplateCardRes = postHandleJSCardRes(templateRes)
+              }
+
+              // 用于修改 template 的 key 的 stringify 的顺序，type放第一个，children放最后一个
+              let templateKeys = []
+              recordKeys(handledTemplateCardRes, templateKeys)
+
+              templateKeys = [...new Set(templateKeys.sort())]
+                .filter(
+                  (key) =>
+                    key !== 'children' && key !== 'type' && key !== 'template' && key !== 'data'
+                )
+                .concat('children')
+              templateKeys.unshift('type', 'template', 'data')
+
+              // 自定义组件 template 抽取成独立 JSON —— 卡片不采用该方式
+              // Object.keys(handledTemplateCardRes).forEach((key) => {
+              //   const res = handledTemplateCardRes[key]
+              //   const fileName = key === CARD_ENTRY ? templateFileName : `${key}.template.json`
+              //   const templateJsonStr = JSON.stringify(res, templateKeys)
+              //   compilation.assets[fileName] = new ConcatSource(templateJsonStr)
+              // })
+
+              // 处理 template
+              const templateJsonStr = JSON.stringify(handledTemplateCardRes, templateKeys)
               compilation.assets[templateFileName] = new ConcatSource(templateJsonStr)
+
+              // 处理 css
               compilation.assets[cssFileName] = new ConcatSource(JSON.stringify(styleRes))
             }
           }
@@ -74,11 +106,11 @@ class LiteCardPlugin {
   }
 
   /**
-   * Generate bundle JSON result for lite card
+   * Generate bundle JSON result for card
    * @param {*} moduleGraph webpack moduleGraph
    * @param {*} currModule current module
    * @param {*} currCompRes JSON result for current ux component
-   * @param {*} liteCardRes JSON result for lite card
+   * @param {*} templateCardRes JSON result for card
    * @param {*} styleRes JSON result for style
    * @param {*} pathSrc src path for current quickapp project
    * @param {*} compPath card ux component path
@@ -87,7 +119,7 @@ class LiteCardPlugin {
     moduleGraph,
     currModule,
     currCompRes,
-    liteCardRes,
+    templateCardRes,
     styleRes,
     pathSrc,
     compPath
@@ -97,7 +129,7 @@ class LiteCardPlugin {
     if (moduleGraphConnection !== undefined) {
       for (const m of moduleGraphConnection.keys()) {
         const { rawRequest, _source, request } = m
-        if (!rawRequest) {
+        if (!this.isValidJsonModule(rawRequest)) {
           continue
         }
         const { _valueAsString, _valueAsBuffer } = _source || {}
@@ -124,7 +156,7 @@ class LiteCardPlugin {
         const isCardRes = !!currCompRes['#entry']
         if (type === LOADER_PATH_UX.type) {
           const { compName, relativeSrcPath } = this.getComponentName(reqPath, pathSrc)
-          // console.log('LiteCardPlugin >>> compName, reqPath, relativeSrcPath:', compName, reqPath, relativeSrcPath)
+          // console.log('CardPlugin >>> compName, reqPath, relativeSrcPath:', compName, reqPath, relativeSrcPath)
           if (!compName) {
             throw new Error(`Build failed, invalid component name, path: ${reqPath}`)
           }
@@ -142,18 +174,18 @@ class LiteCardPlugin {
             }
             currCompRes[TYPE_IMPORT][compName] = relativeSrcPath
           }
-          if (liteCardRes[relativeSrcPath]) {
+          if (templateCardRes[relativeSrcPath]) {
             // console.log(`'Component ${compName} already resolved, relativeSrcPath=${relativeSrcPath}, uxPath=${uxPath}`)
             continue
           }
 
           const compRes = {}
-          liteCardRes[relativeSrcPath] = compRes
+          templateCardRes[relativeSrcPath] = compRes
           this.findOutgoingModules(
             moduleGraph,
             m,
             compRes,
-            liteCardRes,
+            templateCardRes,
             styleRes,
             pathSrc,
             relativeSrcPath
@@ -219,18 +251,41 @@ class LiteCardPlugin {
     return relativeSrcPathStr
   }
 
-  // chunk.entryModule.rawRequest: ./src/cards/card/index.ux?uxType=card&lite=1
-  isLightCard(requestPath) {
+  // chunk.entryModule.rawRequest: ./src/cards/card/index.ux?uxType=card&card=1&lite=1
+  isCard(requestPath) {
     if (requestPath && requestPath.lastIndexOf('?') > 0) {
       const pathParamIndex = requestPath.lastIndexOf('?')
       const paramStr = requestPath.substring(pathParamIndex + 1)
       const paramArr = paramStr.split('&')
-      return paramArr && paramArr.indexOf('lite=1') >= 0 && paramArr.indexOf('uxType=card') >= 0
+      return paramArr && paramArr.indexOf('card=1') >= 0 && paramArr.indexOf('uxType=card') >= 0
     }
     return false
   }
 
-  getLightCardBuildPath(requestPath, pathSrc) {
+  // chunk.entryModule.rawRequest: ./src/cards/card/index.ux?uxType=card&card=1&lite=1
+  isLiteCard(requestPath) {
+    if (requestPath && requestPath.lastIndexOf('?') > 0) {
+      const pathParamIndex = requestPath.lastIndexOf('?')
+      const paramStr = requestPath.substring(pathParamIndex + 1)
+      const paramArr = paramStr.split('&')
+      return (
+        paramArr &&
+        paramArr.indexOf('card=1') >= 0 &&
+        paramArr.indexOf('lite=1') >= 0 &&
+        paramArr.indexOf('uxType=card') >= 0
+      )
+    }
+    return false
+  }
+
+  isValidJsonModule(request) {
+    const pathParamIndex = request.indexOf('?')
+    const paramStr = request.substring(pathParamIndex + 1)
+    const paramArr = paramStr.split('&')
+    return paramArr && !paramArr.some((ele) => ele.indexOf('type=script') >= 0)
+  }
+
+  getCardBuildPath(requestPath, pathSrc) {
     if (!requestPath || !pathSrc) {
       throw new Error(`Invalid request path or src path:\n${requestPath}\n${pathSrc}`)
     }
@@ -252,7 +307,7 @@ class LiteCardPlugin {
       uxRelativePath.length - SUFFIX_UX.length
     )}`
     return {
-      bundleFilePath,
+      bundleFilePath: bundleFilePath.replace(/\\/g, '/'),
       templateFileName: `${bundleFilePath}.template.json`,
       cssFileName: `${bundleFilePath}.css.json`
     }
@@ -270,30 +325,18 @@ class LiteCardPlugin {
   }
 }
 
-const componentIdMap = new Map()
-const componentPathMap = new Map()
-function getStyleObjectId(compPath) {
-  if (!componentPathMap.get(compPath)) {
-    const compId = getHash(compPath)
-    componentIdMap.set(compId, compPath)
-    componentPathMap.set(compPath, compId)
-  }
-  return componentPathMap.get(compPath)
-}
+function recordKeys(liteCardRes, templateKeys) {
+  const helper = function (obj) {
+    if (!obj || typeof obj !== 'object') return
 
-function getHash(compPath) {
-  const digest = calcDataDigest(Buffer.from(compPath, 'utf-8'))
-  const digestStr = digest.toString('hex')
-  const len = Math.min(6, digestStr.length)
-  let res = compPath
-  for (let i = len; i < digestStr.length; i++) {
-    res = digestStr.substring(0, i)
-    if (componentIdMap.has(res)) {
-      continue
-    }
-    break
+    const keys = Object.keys(obj)
+    templateKeys.push(...keys)
+    keys.forEach((key) => {
+      return helper(obj[key], templateKeys)
+    })
   }
-  return res
+
+  helper(liteCardRes, templateKeys)
 }
 
-export { LiteCardPlugin }
+export { CardPlugin }
diff --git a/packages/hap-packager/src/plugins/card-script-handle-plugin.js b/packages/hap-packager/src/plugins/card-script-handle-plugin.js
new file mode 100644
index 00000000..2665e93c
--- /dev/null
+++ b/packages/hap-packager/src/plugins/card-script-handle-plugin.js
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2024-present, the hapjs-platform Project Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import path from 'path'
+import Compilation from 'webpack/lib/Compilation'
+import { getStyleObjectId } from '@hap-toolkit/shared-utils'
+import loaderUtils from 'loader-utils'
+
+const PLUGIN_NAME = 'CardScriptHandlePlugin'
+const SUFFIX_UX = '.ux'
+const CARD_ENTRY = '#entry'
+
+class CardScriptHandlePlugin {
+  constructor(options = {}) {
+    this.options = options || {}
+  }
+
+  apply(compiler) {
+    let ConcatSource = compiler.webpack.sources.ConcatSource
+    compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+      compilation.hooks.processAssets.tap(
+        {
+          name: PLUGIN_NAME,
+          stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE
+        },
+        () => {
+          let { pathSrc } = this.options
+          pathSrc = pathSrc.replace(/\\/g, '/')
+          for (const chunk of compilation.chunks) {
+            const entryModule = this.getEntryModule(compilation, chunk)
+            if (!entryModule) {
+              continue
+            }
+            const { rawRequest: entryRawRequest, request } = entryModule
+            if (this.isJsCard(entryRawRequest)) {
+              const { templateFileName, cssFileName } = this.getCardBuildPath(request, pathSrc)
+              const jsAssetesName = this.getJsAssetsName(request, pathSrc)
+              const sourceSplit = compilation.assets[jsAssetesName].source().split('\n')
+
+              let newSource = ''
+              for (let i = sourceSplit.length - 1; i >= 0; i--) {
+                const str = sourceSplit[i]
+                if (this.isStyleStr(str)) {
+                  sourceSplit.splice(i, 1, this.getStyleExportsString(str, cssFileName, pathSrc))
+                }
+                if (this.isTemplateStr(str)) {
+                  sourceSplit.splice(
+                    i,
+                    1,
+                    this.getTemplateExportsString(str, templateFileName, pathSrc)
+                  )
+                }
+              }
+              newSource += sourceSplit.join('\n')
+              compilation.assets[jsAssetesName] = new ConcatSource(newSource)
+            }
+          }
+        }
+      )
+    })
+  }
+  getEntryModule(compilation, chunk) {
+    const chunkModules = compilation.chunkGraph.getChunkModules(chunk)
+    for (let i = 0; i < chunkModules.length; i++) {
+      const module = chunkModules[i]
+      if (compilation.chunkGraph.isEntryModuleInChunk(module, chunk)) {
+        return module
+      }
+    }
+    return null
+  }
+  getCardBuildPath(requestPath, pathSrc) {
+    if (!requestPath || !pathSrc) {
+      throw new Error(`Invalid request path or src path:\n${requestPath}\n${pathSrc}`)
+    }
+    requestPath = requestPath.replace(/\\/g, '/')
+    // pathSrc = pathSrc.replace(/\\/g, '/')
+    // const requestPathNormal = path.normalize(requestPath)
+    const reqPathArr = requestPath.split('!')
+    let uxPathStr = reqPathArr[reqPathArr.length - 1]
+    if (uxPathStr.indexOf('?') > 0) {
+      uxPathStr = uxPathStr.substring(0, uxPathStr.indexOf('?'))
+    }
+    const uxRelativePath = path.relative(pathSrc, uxPathStr)
+
+    if (!uxRelativePath.endsWith(SUFFIX_UX)) {
+      throw new Error(`Invalid relative path for ux:\n${uxRelativePath}`)
+    }
+    const bundleFilePath = `${uxRelativePath.substring(
+      0,
+      uxRelativePath.length - SUFFIX_UX.length
+    )}`
+    return {
+      bundleFilePath: bundleFilePath.replace(/\\/g, '/'),
+      templateFileName: `${bundleFilePath}.template.json`.replace(/\\/g, '/'),
+      cssFileName: `${bundleFilePath}.css.json`.replace(/\\/g, '/')
+    }
+  }
+  // chunk.entryModule.rawRequest: ./src/cards/card/index.ux?uxType=card&card=1&lite=1
+  isJsCard(requestPath) {
+    if (requestPath && requestPath.lastIndexOf('?') > 0) {
+      const pathParamIndex = requestPath.lastIndexOf('?')
+      const paramStr = requestPath.substring(pathParamIndex + 1)
+      const paramArr = paramStr.split('&')
+      return (
+        paramArr &&
+        paramArr.indexOf('card=1') >= 0 &&
+        paramArr.indexOf('uxType=card') >= 0 &&
+        paramArr.indexOf('lite=1') < 0
+      )
+    }
+    return false
+  }
+  getTemplateExportsString(str, templateFileName, pathSrc) {
+    const compPath = this.getCompPath(str, pathSrc)
+    let templatePath = compPath
+    if (templateFileName === `${compPath}.template.json`) {
+      templatePath = CARD_ENTRY
+    }
+    return `$app_module$.exports.template = $json_require$("${templateFileName}", { "componentPath": "${templatePath}" })`
+  }
+  getStyleExportsString(str, cssFileName, pathSrc) {
+    const compPath = this.getCompPath(str, pathSrc)
+    const styleObjId = getStyleObjectId(compPath)
+    return `$app_module$.exports.style = { "@info": { "styleObjectId": "${styleObjId}" }, "extracted": true, "jsonPath": "${cssFileName}" }`
+  }
+  getJsAssetsName(requestPath, pathSrc) {
+    if (!requestPath || !pathSrc) {
+      throw new Error(`Invalid request path or src path:\n${requestPath}\n${pathSrc}`)
+    }
+    requestPath = requestPath.replace(/\\/g, '/')
+    // pathSrc = pathSrc.replace(/\\/g, '/')
+    // const requestPathNormal = path.normalize(requestPath)
+    const reqPathArr = requestPath.split('!')
+    let uxPathStr = reqPathArr[reqPathArr.length - 1]
+    if (uxPathStr.indexOf('?') > 0) {
+      uxPathStr = uxPathStr.substring(0, uxPathStr.indexOf('?'))
+    }
+    const uxRelativePath = path.relative(pathSrc, uxPathStr)
+
+    if (!uxRelativePath.endsWith(SUFFIX_UX)) {
+      throw new Error(`Invalid relative path for ux:\n${uxRelativePath}`)
+    }
+    const bundleFilePath = `${uxRelativePath.substring(
+      0,
+      uxRelativePath.length - SUFFIX_UX.length
+    )}`
+    return `${bundleFilePath}.js`
+  }
+  isTemplateStr(str) {
+    return str.indexOf('type=template') >= 0 && str.indexOf('__webpack_require__') >= 0
+  }
+  isStyleStr(str) {
+    return str.indexOf('type=style') >= 0 && str.indexOf('__webpack_require__') >= 0
+  }
+  getRelativeCompPath(pathSrc, uxPath) {
+    let relativeSrcPathStr = path.relative(pathSrc, uxPath)
+    relativeSrcPathStr = relativeSrcPathStr.replace(/\\/g, '/')
+    if (relativeSrcPathStr && relativeSrcPathStr.endsWith('.ux')) {
+      return relativeSrcPathStr.substring(0, relativeSrcPathStr.length - SUFFIX_UX.length)
+    }
+    return relativeSrcPathStr
+  }
+  getCompPath(str, pathSrc) {
+    const regex = /__webpack_require__\("([^"]+)"\)/
+    const match = str.match(regex)
+
+    if (match && match[1]) {
+      const request = match[1]
+      const reqArr = request.split('!')
+      const lastItem = reqArr[reqArr.length - 1]
+      const pathArr = lastItem.split('?')
+      const query = pathArr[pathArr.length - 1]
+      const resourceQuery = loaderUtils.parseQuery(query ? `?${query}` : '?')
+
+      const uxPath = resourceQuery.uxPath
+      return this.getRelativeCompPath(pathSrc, uxPath)
+    } else {
+      return ''
+    }
+  }
+}
+
+export { CardScriptHandlePlugin }
diff --git a/packages/hap-packager/src/plugins/index.js b/packages/hap-packager/src/plugins/index.js
index 6d28e8d4..738e1401 100644
--- a/packages/hap-packager/src/plugins/index.js
+++ b/packages/hap-packager/src/plugins/index.js
@@ -1,6 +1,6 @@
 export * from './copy-dsl-plugin'
 export * from './device-type-plugin'
-export * from './lite-card-plugin'
+export * from './card-plugin'
 export * from './handler-plugin'
 export * from './notify-plugin'
 export * from './resource-plugin'
@@ -8,3 +8,5 @@ export * from './sourcemap-fix-plugin'
 export * from './splitchunks-adapt-plugin'
 export * from './zip-plugin'
 export * from './widget-fingerprint-plugin'
+export * from './remove-modules-plugin'
+export * from './card-script-handle-plugin'
diff --git a/packages/hap-packager/src/plugins/remove-modules-plugin.js b/packages/hap-packager/src/plugins/remove-modules-plugin.js
new file mode 100644
index 00000000..124dd59c
--- /dev/null
+++ b/packages/hap-packager/src/plugins/remove-modules-plugin.js
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2024-present, the hapjs-platform Project Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  LOADER_INFO_LIST,
+  LOADER_PATH_UX,
+  LOADER_PATH_STYLE,
+  LOADER_PATH_TEMPLATE
+} from '../common/constant'
+import { getLastLoaderPath } from '../common/utils'
+
+class RemoveModulesPlugin {
+  constructor(options) {
+    this.options = options
+  }
+
+  apply(compiler) {
+    compiler.hooks.compilation.tap('RemoveModulesPlugin', (compilation) => {
+      // 在生成资源之前，遍历所有模块，删除 jscard 的 template 和 style 模块
+      compilation.hooks.optimizeModules.tap('RemoveModulesPlugin', (modules) => {
+        modules.forEach((module) => {
+          const { _source, request } = module
+          if (this.isCardAndCardcomp(request)) {
+            const { _valueAsString, _valueAsBuffer } = _source || {}
+            const moduleSource = _valueAsString || _valueAsBuffer?.toString() || ''
+            const type = this.getRequestType(request)
+            if (type === LOADER_PATH_UX.type) {
+              // 从 chunk 中删除对 template 和 style 模块的依赖
+              if (typeof moduleSource === 'string') {
+                this.updateUXDependency(module)
+              }
+            }
+          }
+        })
+      })
+      // 在生成资源之前，遍历所有模块，删除 jscard 的 template 和 style 模块
+      compilation.hooks.optimizeChunks.tap('RemoveModulesPlugin', (chunks) => {
+        chunks.forEach((chunk) => {
+          const chunkGraph = compilation.chunkGraph
+          // 遍历模块
+          const chunkModules = chunkGraph.getChunkModules(chunk)
+
+          chunkModules.forEach((module) => {
+            const { request } = module
+            if (this.isCardAndCardcomp(request)) {
+              const type = this.getRequestType(request)
+              const typeArr = LOADER_INFO_LIST.map((item) => item.type)
+              if (
+                typeArr.includes(type) &&
+                (type === LOADER_PATH_TEMPLATE.type || type === LOADER_PATH_STYLE.type)
+              ) {
+                // 从 chunk 中删除 template 和 style 模块内容
+                chunkGraph.disconnectChunkAndModule(chunk, module)
+              }
+            }
+          })
+        })
+      })
+    })
+  }
+  getRequestType(request) {
+    const reqPath = request.replace(/\\/g, '/')
+    const loaderPath = getLastLoaderPath(reqPath)
+    let type = ''
+    if (loaderPath) {
+      const loaderItem = LOADER_INFO_LIST.find((item) => item.path === loaderPath)
+      type = (loaderItem && loaderItem.type) || ''
+    }
+    return type
+  }
+  updateUXDependency(module) {
+    const dependencies = module.dependencies
+    const templateDeps = dependencies.filter((dep) => {
+      // 检查 ux 模块依赖，过滤对 template 模块的依赖
+      const depRequest = dep.request
+      const depRequestType = this.getRequestType(depRequest)
+      return (
+        depRequestType === LOADER_PATH_TEMPLATE.type || depRequestType === LOADER_PATH_STYLE.type
+      )
+    })
+
+    // 更新模块的依赖列表
+    templateDeps.forEach((dep) => {
+      module.removeDependency(dep)
+    })
+  }
+  // chunk.entryModule.rawRequest: ./src/cards/card/index.ux?uxType=card&card=1&lite=1
+  isCardAndCardcomp(requestPath) {
+    if (requestPath && requestPath.lastIndexOf('?') > 0) {
+      const pathParamIndex = requestPath.lastIndexOf('?')
+      const paramStr = requestPath.substring(pathParamIndex + 1)
+      const paramArr = paramStr.split('&')
+      return (
+        paramArr &&
+        paramArr.indexOf('card=1') >= 0 &&
+        (paramArr.indexOf('uxType=card') >= 0 || paramArr.indexOf('uxType=comp') >= 0)
+      )
+    }
+    return false
+  }
+}
+
+export { RemoveModulesPlugin }
diff --git a/packages/hap-packager/src/plugins/resource-plugin.js b/packages/hap-packager/src/plugins/resource-plugin.js
index 5347b219..35d3fa83 100644
--- a/packages/hap-packager/src/plugins/resource-plugin.js
+++ b/packages/hap-packager/src/plugins/resource-plugin.js
@@ -129,13 +129,12 @@ function minifyWidgetI18nJSONFiles(targetDir) {
       widgetsOption[key].path = key
     }
     const widgetPath = widgetsOption[key].path
-    const needFlatten = widgetsOption[key].type === 'lite'
     const dir = path.join(targetDir, widgetPath, 'i18n')
     if (fs.existsSync(dir)) {
       const jsonFiles = getFiles('*.json', dir)
       jsonFiles.forEach((filePath) => {
         arr.push(filePath)
-        minifyJson(filePath, filePath, needFlatten)
+        minifyJson(filePath, filePath, true)
       })
     }
   }
diff --git a/packages/hap-packager/src/plugins/widget-fingerprint-plugin.js b/packages/hap-packager/src/plugins/widget-fingerprint-plugin.js
index 24736fba..8e59f7fc 100644
--- a/packages/hap-packager/src/plugins/widget-fingerprint-plugin.js
+++ b/packages/hap-packager/src/plugins/widget-fingerprint-plugin.js
@@ -5,7 +5,9 @@
 
 import fs from 'fs-extra'
 import path from 'path'
-import { calcDataDigest, getLastLoaderPath } from '../common/utils'
+import { getLastLoaderPath } from '../common/utils'
+import { calcDataDigest } from '@hap-toolkit/shared-utils'
+
 import {
   LOADER_INFO_LIST,
   LOADER_PATH_UX,
diff --git a/packages/hap-packager/src/post-handler/index.js b/packages/hap-packager/src/post-handler/index.js
index 37483e77..64ad3f41 100644
--- a/packages/hap-packager/src/post-handler/index.js
+++ b/packages/hap-packager/src/post-handler/index.js
@@ -1,424 +1,4 @@
-import { templateValueToCardCode } from '@aiot-toolkit/card-expression'
-import { templater } from '@hap-toolkit/compiler'
-const { validator } = templater
+import { postHandleLiteCardRes } from './lite-card-post'
+import { postHandleJSCardRes } from './js-card-post'
 
-const CARD_ENTRY = '#entry'
-const TYPE_IMPORT = 'import'
-// 需要进行后处理的模块key
-const TEMPLATE_KEY = 'template'
-const ACTIONS_KEY = 'actions'
-const SIMPLE_EXPR_MODIFIERS = ['$', '.', '[]', '~', '{}']
-
-// 节点标记，同一节点可能同时符合多个kind定义，按priority高的进行标记
-const ENUM_KIND_TYPE = {
-  ELEMENT: {
-    // 普通动态节点、事件节点、带id属性的节点
-    kind: 1,
-    priority: 1
-  },
-  COMPONENT: {
-    // 自定义组件节点
-    kind: 3,
-    priority: 2
-  },
-  FRAGMENT: {
-    // if/for 动态节点
-    kind: 2,
-    priority: 3
-  }
-}
-
-// 处理 actions 中的字段，增加标记和处理表达式
-function postHandleActions(actions) {
-  if (!isObject(actions)) return
-
-  markType(actions)
-  markUrl(actions)
-  markMethod(actions)
-  markParams(actions)
-}
-
-function markType(actions) {
-  if (isExpr(actions.type)) {
-    let { rawExpr, prefixExpr } = getPrefixExpr(actions.type)
-    delete actions.type
-    actions['$type'] = rawExpr
-    actions['#type'] = prefixExpr
-  }
-}
-
-function markUrl(actions) {
-  // url 可能为字符串，也可能为数组
-  // 如为数组，则遍历数组进行表达式处理
-  if (typeof actions.url === 'string') {
-    if (isExpr(actions.url)) {
-      let { rawExpr, prefixExpr } = getPrefixExpr(actions.url)
-      delete actions.url
-      actions['$url'] = rawExpr
-      actions['#url'] = prefixExpr
-    }
-  } else if (Array.isArray(actions.url)) {
-    let hasBinding = false
-    const rawUrlList = actions.url.map((url) => {
-      if (isExpr(url)) {
-        hasBinding = true
-        let { rawExpr } = getPrefixExpr(url)
-        return `{{${rawExpr}}}`
-      }
-      return url
-    })
-
-    const prefixUrlList = actions.url.map((url) => {
-      if (isExpr(url)) {
-        hasBinding = true
-        let { prefixExpr } = getPrefixExpr(url)
-        return prefixExpr
-      }
-      return url
-    })
-
-    if (hasBinding) {
-      delete actions.url
-      actions['$url'] = rawUrlList
-      actions['#url'] = prefixUrlList
-    }
-  }
-}
-function markMethod(actions) {
-  if (isExpr(actions.method)) {
-    let { rawExpr, prefixExpr } = getPrefixExpr(actions.method)
-    delete actions.method
-    actions['$method'] = rawExpr
-    actions['#method'] = prefixExpr
-  }
-}
-
-function markParams(actions) {
-  if (!isObject(actions.params)) return
-
-  // 标准只支持一级结构中绑定变量，做一级结构的key遍历即可
-  Object.keys(actions.params).forEach((key) => {
-    const value = actions.params[key]
-    if (isExpr(value)) {
-      let { rawExpr, prefixExpr } = getPrefixExpr(value)
-      delete actions.params[key]
-      actions.params['$' + key] = rawExpr
-      actions.params['#' + key] = prefixExpr
-    }
-  })
-}
-
-// 处理 template 中的字段，增加标记和处理表达式
-function postHandleTemplate(template, liteCardRes) {
-  if (!isObject(template)) return
-
-  markStyle(template)
-  markClass(template)
-  markClassList(template)
-  markAttr(template)
-  markEvents(template)
-  markId(template)
-  markIs(template)
-  markIf(template)
-  markFor(template)
-  markCustomComp(template, liteCardRes)
-
-  const children = template.children
-  if (children && Array.isArray(children)) {
-    for (let i = 0; i < children.length; i++) {
-      const child = children[i]
-      postHandleTemplate(child, liteCardRes)
-    }
-  }
-}
-
-// 获取kind值对应的优先级
-function getPriority(kind) {
-  let prioity = kind
-  Object.keys(ENUM_KIND_TYPE).some((key) => {
-    const item = ENUM_KIND_TYPE[key]
-    if (item.kind === kind) {
-      prioity = item.priority
-      return true
-    }
-  })
-  return prioity
-}
-
-// 根据优先级标记节点的 kind 值
-function markKind(oldKind, newKind) {
-  if (!oldKind) return newKind
-
-  const oldPriority = getPriority(oldKind)
-  const newPriority = getPriority(newKind)
-  if (oldPriority < newPriority) return newKind
-
-  return oldKind
-}
-
-function markCustomComp(template, liteCardRes) {
-  if (!isObject(liteCardRes[CARD_ENTRY][TYPE_IMPORT])) return
-
-  const importList = Object.keys(liteCardRes[CARD_ENTRY][TYPE_IMPORT])
-
-  if (importList.includes(template.type)) {
-    template.kind = markKind(template.kind, ENUM_KIND_TYPE.COMPONENT.kind)
-  }
-}
-
-function markIf(template) {
-  if (!template.shown) return
-
-  if (isExpr(template.shown)) {
-    let { rawExpr, prefixExpr } = getPrefixExpr(template.shown)
-    delete template.shown
-    template['$shown'] = rawExpr
-    template['#shown'] = prefixExpr
-  }
-  template.kind = markKind(template.kind, ENUM_KIND_TYPE.FRAGMENT.kind)
-}
-
-function markIs(template) {
-  if (!template.is) return
-
-  if (isExpr(template.is)) {
-    let { rawExpr, prefixExpr } = getPrefixExpr(template.is)
-    delete template.is
-    template['$is'] = rawExpr
-    template['#is'] = prefixExpr
-    template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
-  }
-}
-
-function markId(template) {
-  if (!template.id) return
-
-  if (isExpr(template.id)) {
-    let { rawExpr, prefixExpr } = getPrefixExpr(template.id)
-    delete template.id
-    template['$id'] = rawExpr
-    template['#id'] = prefixExpr
-  }
-  // 节点有id属性，标记为kind 为 1
-  template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
-}
-
-function markFor(template) {
-  if (!template.repeat) return
-
-  if (isObject(template.repeat)) {
-    if (isExpr(template.repeat.exp)) {
-      /**
-       * example 1:
-        <div for="{{(index, item) in ItemList}}">   ->
-        "repeat": {
-          "$exp": "ItemList",
-          "#exp": ["$", "ItemList"],
-          "key": "index",
-          "value": "item"
-        },
-
-        example 2:
-        <div for="{{(index, item) in [1,2,3]}}">   ->
-        "repeat": {
-          "$exp": "[1, 2, 3]",
-          "#exp": "[\"~\",1,2,3]",
-          "key": "index",
-          "value": "item"
-        },
-      */
-      let { rawExpr, prefixExpr } = getPrefixExpr(template.repeat.exp)
-      delete template.repeat.exp
-      template.repeat['$exp'] = rawExpr
-      template.repeat['#exp'] = prefixExpr
-    }
-  } else if (isExpr(template.repeat)) {
-    /**
-      <div for="{{ItemList}}">   ->
-      "$repeat": "ItemList",
-      "#repeat": ["$", "ItemList"],
-    */
-    let { rawExpr, prefixExpr } = getPrefixExpr(template.repeat)
-    delete template.repeat
-    template['$repeat'] = rawExpr
-    template['#repeat'] = prefixExpr
-  }
-  template.kind = markKind(template.kind, ENUM_KIND_TYPE.FRAGMENT.kind)
-}
-
-function markStyle(template) {
-  if (!template.style) return
-
-  const style = template.style
-  if (typeof style === 'object') {
-    Object.keys(style).forEach((key) => {
-      const value = style[key]
-      if (isExpr(value)) {
-        let { rawExpr, prefixExpr } = getPrefixExpr(value)
-        delete template.style[key]
-        template.style['$' + key] = rawExpr
-        template.style['#' + key] = prefixExpr
-        template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
-      }
-    })
-  } else {
-    if (isExpr(style)) {
-      let { rawExpr, prefixExpr } = getPrefixExpr(style)
-      delete template.style
-      template['$style'] = rawExpr
-      template['#style'] = prefixExpr
-      template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
-    }
-  }
-}
-
-function markClass(template) {
-  if (!template.class || template.class.length === 0) return
-
-  if (isExpr(template.class)) {
-    let { rawExpr, prefixExpr } = getPrefixExpr(template.class)
-    delete template.class
-    template['$class'] = rawExpr
-    template['#class'] = prefixExpr
-    template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
-  }
-}
-
-function markClassList(template) {
-  if (!template.classList || template.classList.length === 0) return
-
-  let hasBinding = false
-  const prefixExprList = template.classList.map((classEle) => {
-    if (isExpr(classEle)) {
-      hasBinding = true
-      let { prefixExpr } = getPrefixExpr(classEle)
-      return prefixExpr
-    }
-    return classEle
-  })
-
-  if (hasBinding) {
-    // 如果 classList 元素有表达式
-    delete template.classList
-    template['#classList'] = prefixExprList
-    template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT)
-  }
-}
-
-function markEvents(template) {
-  if (template.events) {
-    template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
-  }
-}
-
-function markAttr(template) {
-  if (!template.attr) return
-
-  const attr = template.attr
-  if (isObject(attr)) {
-    Object.keys(attr).forEach((attrKey) => {
-      const attrValue = attr[attrKey]
-      if (isExpr(attrValue)) {
-        let { rawExpr, prefixExpr } = getPrefixExpr(attrValue)
-        delete attr[attrKey]
-        attr['$' + attrKey] = rawExpr
-        attr['#' + attrKey] = prefixExpr
-        template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
-      }
-    })
-  }
-}
-
-function isExpr(val) {
-  if (!val) return false
-  return validator.isExpr(val)
-}
-
-function isObject(obj) {
-  return obj && Object.prototype.toString.call(obj) === '[object Object]' && obj !== null
-}
-
-function getPrefixExpr(expr) {
-  const res = templateValueToCardCode(expr)
-  const parsed = JSON.parse(res)
-  if (isSimpleExpr(parsed)) {
-    // 简单表达式
-    // 目前只有 {{name}}、{{title.name}}、{{title[0]}}、{{[1,2,3]}}、{{ {a: 1} }} 算作简单表达式
-    return {
-      rawExpr: validator.parseText(expr)[0].value, // {{ name }} -> name
-      prefixExpr: parsed // {{ name }} -> ['$', 'name']
-    }
-  } else {
-    // 复杂表达式
-    return {
-      rawExpr: expr, // {{ a + b }} -> {{ a + b }}
-      prefixExpr: parsed // {{ a + b }} -> ["+",["$","a"],["$","b"]]
-    }
-  }
-}
-
-// 根据操作符来判断是否为简单表达式
-function isSimpleExpr(expr) {
-  if (!expr || !Array.isArray(expr)) return false
-
-  const modifierList = []
-  getAllModifiers(expr, modifierList)
-  return modifierList.every((modifier) => SIMPLE_EXPR_MODIFIERS.includes(modifier))
-}
-
-function getAllModifiers(exprList, modifierList) {
-  modifierList.push(exprList[0])
-  for (let i = 1; i < exprList.length; i++) {
-    if (Array.isArray(exprList[i])) {
-      // 如果当前元素是数组，递归调用，找出所有的操作符
-      getAllModifiers(exprList[i], modifierList)
-    }
-  }
-  return modifierList
-}
-
-function recordKeys(liteCardRes, templateKeys) {
-  const helper = function (obj) {
-    if (!obj || typeof obj !== 'object') return
-
-    const keys = Object.keys(obj)
-    templateKeys.push(...keys)
-    keys.forEach((key) => {
-      return helper(obj[key], templateKeys)
-    })
-  }
-
-  helper(liteCardRes, templateKeys)
-}
-
-export function postHandleLiteCardRes(liteCardRes) {
-  const uxList = Object.keys(liteCardRes)
-
-  // template
-  for (let i = 0; i < uxList.length; i++) {
-    const compName = uxList[i]
-    postHandleTemplate(liteCardRes[compName][TEMPLATE_KEY], liteCardRes)
-  }
-
-  // actions
-  for (let i = 0; i < uxList.length; i++) {
-    const compName = uxList[i]
-    const actionEvents = liteCardRes[compName][ACTIONS_KEY]
-    if (actionEvents) {
-      Object.keys(actionEvents).forEach((eventName) => {
-        postHandleActions(actionEvents[eventName])
-      })
-    }
-  }
-
-  // 用于修改 template 的 key 的 stringify 的顺序，type放第一个，children放最后一个
-  let templateKeys = []
-  recordKeys(liteCardRes, templateKeys)
-
-  templateKeys = [...new Set(templateKeys.sort())]
-    .filter((key) => key !== 'children' && key !== 'type')
-    .concat('children')
-    .unshift('type')
-
-  return JSON.stringify(liteCardRes, templateKeys)
-}
+export { postHandleLiteCardRes, postHandleJSCardRes }
diff --git a/packages/hap-packager/src/post-handler/js-card-post.js b/packages/hap-packager/src/post-handler/js-card-post.js
new file mode 100644
index 00000000..2ad47e0e
--- /dev/null
+++ b/packages/hap-packager/src/post-handler/js-card-post.js
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2024-present, the hapjs-platform Project Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { templater } from '@hap-toolkit/compiler'
+const { validator } = templater
+
+const CARD_ENTRY = '#entry'
+const TYPE_IMPORT = 'import'
+// 需要进行后处理的模块key
+const TEMPLATE_KEY = 'template'
+
+const pathTestRE =
+  /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['.*?'\]|\[".*?"\]|\[\d+\]|\[[A-Za-z_$][\w$]*\])*$/
+
+const literalValueRE = /^(?:true|false|null|undefined|Infinity|NaN)$/
+
+// 节点标记，同一节点可能同时符合多个kind定义，按priority高的进行标记
+const ENUM_KIND_TYPE = {
+  ELEMENT: {
+    // 普通动态节点、事件节点、带id属性的节点
+    kind: 1,
+    priority: 1
+  },
+  COMPONENT: {
+    // 自定义组件节点
+    kind: 3,
+    priority: 2
+  },
+  FRAGMENT: {
+    // if/for 动态节点
+    kind: 2,
+    priority: 3
+  }
+}
+
+// 处理 template 中的字段，增加标记和处理表达式
+function postHandleTemplate(template, JsCardRes) {
+  if (!isObject(template)) return
+
+  markStyle(template)
+  markClass(template)
+  markAttr(template)
+  markEvents(template)
+  markId(template)
+  markIs(template)
+  markIf(template)
+  markFor(template)
+  markCustomComp(template, JsCardRes)
+
+  const children = template.children
+  if (children && Array.isArray(children)) {
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i]
+      postHandleTemplate(child, JsCardRes)
+    }
+  }
+}
+
+// 获取kind值对应的优先级
+function getPriority(kind) {
+  let prioity = kind
+  Object.keys(ENUM_KIND_TYPE).some((key) => {
+    const item = ENUM_KIND_TYPE[key]
+    if (item.kind === kind) {
+      prioity = item.priority
+      return true
+    }
+  })
+  return prioity
+}
+
+// 根据优先级标记节点的 kind 值
+function markKind(oldKind, newKind) {
+  if (!oldKind) return newKind
+
+  const oldPriority = getPriority(oldKind)
+  const newPriority = getPriority(newKind)
+  if (oldPriority < newPriority) return newKind
+
+  return oldKind
+}
+
+function markCustomComp(template, JsCardRes) {
+  if (!isObject(JsCardRes[CARD_ENTRY][TYPE_IMPORT])) return
+
+  const importList = Object.keys(JsCardRes[CARD_ENTRY][TYPE_IMPORT])
+
+  if (importList.includes(template.type)) {
+    template.import = JsCardRes[CARD_ENTRY][TYPE_IMPORT][template.type]
+    template.kind = markKind(template.kind, ENUM_KIND_TYPE.COMPONENT.kind)
+    delete JsCardRes[CARD_ENTRY][TYPE_IMPORT]
+  }
+}
+
+function markIf(template) {
+  if (!template.shown) return
+
+  if (isExpr(template.shownRaw)) {
+    template['$shown'] = getExprRes(template.shownRaw, template.shown)
+    delete template.shown
+  }
+  delete template.shownRaw
+  template.kind = markKind(template.kind, ENUM_KIND_TYPE.FRAGMENT.kind)
+}
+
+function markIs(template) {
+  if (!template.is) return
+
+  if (isExpr(template.isRaw)) {
+    template['$is'] = getExprRes(template.isRaw, template.is)
+    delete template.is
+    template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+  }
+  delete template.isRaw
+}
+
+function markId(template) {
+  if (!template.id) return
+
+  if (isExpr(template.idRaw)) {
+    template['$id'] = getExprRes(template.idRaw, template.id)
+    delete template.id
+  }
+  delete template.idRaw
+  // 节点有id属性，标记为kind 为 1
+  template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+}
+
+function markFor(template) {
+  if (!template.repeat) return
+
+  if (isObject(template.repeat)) {
+    if (isExpr(template.repeatRaw.expRaw)) {
+      /**
+       * example 1:
+        <div for="{{(index, item) in ItemList}}">   ->
+        "repeat": {
+          "$exp": "ItemList",
+          "key": "index",
+          "value": "item"
+        },
+
+        example 2:
+        <div for="{{(index, item) in [1,2,3]}}">   ->
+        "repeat": {
+          "$exp": "[1, 2, 3]",
+          "key": "index",
+          "value": "item"
+        },
+      */
+      template.repeat['$exp'] = getExprRes(template.repeatRaw.expRaw, template.repeat.exp)
+      delete template.repeat.exp
+    }
+  } else {
+    if (isExpr(template.repeatRaw)) {
+      /**
+        <div for="{{ItemList}}">   ->
+        "$repeat": "ItemList",
+      */
+      template['$repeat'] = getExprRes(template.repeatRaw, template.repeat)
+      delete template.repeat
+    }
+    delete template.repeatRaw
+  }
+  delete template.repeatRaw
+  template.kind = markKind(template.kind, ENUM_KIND_TYPE.FRAGMENT.kind)
+}
+
+function markStyle(template) {
+  if (!template.style) return
+  const styleRaw = template.styleRaw
+  const style = template.style
+  if (typeof style === 'object') {
+    Object.keys(style).forEach((key) => {
+      if (isExpr(styleRaw[key])) {
+        template.style['$' + key] = getExprRes(styleRaw[key], style[key])
+        delete template.style[key]
+        template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+      }
+    })
+  } else {
+    if (isExpr(styleRaw)) {
+      template['$style'] = getExprRes(styleRaw, template.style)
+      delete template.style
+      template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+    }
+  }
+  delete template.styleRaw
+}
+
+function markClass(template) {
+  if (!template.class || template.class.length === 0) return
+
+  if (isExpr(template.classListRaw)) {
+    template['$class'] = getExprRes(template.classListRaw, template.classList)
+    template['$classList'] = getExprRes(template.classListRaw, template.classList)
+    delete template.classList
+    delete template.class
+    template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+  }
+  delete template.classListRaw
+}
+
+function markEvents(template) {
+  if (template.events) {
+    template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+  }
+}
+
+function markAttr(template) {
+  if (!template.attr) return
+
+  const attr = template.attr
+  if (isObject(attr)) {
+    Object.keys(attr).forEach((attrKey) => {
+      const attrValueRaw = attr[attrKey + 'Raw']
+      if (isExpr(attrValueRaw)) {
+        attr['$' + attrKey] = getExprRes(attrValueRaw, attr[attrKey])
+        delete attr[attrKey]
+        template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+      }
+      delete attr[attrKey + 'Raw']
+    })
+  }
+}
+
+function isExpr(val) {
+  if (!val) return false
+  return validator.isExpr(val)
+}
+
+function isObject(obj) {
+  return obj && Object.prototype.toString.call(obj) === '[object Object]' && obj !== null
+}
+
+function getExprRes(exprRaw, expr) {
+  const tokens = validator.parseText(exprRaw.trim())
+  if (tokens.length > 1) {
+    return expr
+  }
+
+  const parsed = tokens[0].value
+  if (isObjOrArray(parsed) || (isSimplePath(parsed) && isSimpleArr(parsed))) {
+    // 简单表达式
+    // 目前只有 {{name}}、{{title.name}}、{{title[0]}}、{{[1,2,3]}}、{{ {a: 1} }} 算作简单表达式
+    return parsed // {{ name }} -> name
+  } else {
+    // 复杂表达式，返回function形式的表达式结果
+    return expr // {{a + b}} -> function () { return this.a + this.b }
+  }
+}
+
+function isObjOrArray(exp) {
+  return Object.prototype.toString.call(exp) === '[object Object]' || Array.isArray(exp)
+}
+function isSimpleArr(exp) {
+  // eslint-disable-next-line no-useless-escape
+  const regex = /\[([^\[\]]+)\]/g
+  let match
+  const results = []
+
+  while ((match = regex.exec(exp)) !== null) {
+    results.push(match[1])
+  }
+
+  let res = true
+  // 检查所有[]匹配项是否全部为数字
+  results.forEach((content) => {
+    if (!/^\d+$/.test(content)) {
+      res = false
+    }
+  })
+  return res
+}
+function isSimplePath(exp) {
+  return (
+    pathTestRE.test(exp) &&
+    // true/false/null/undefined/Infinity/NaN
+    !literalValueRE.test(exp) &&
+    // Math常量
+    exp.slice(0, 5) !== 'Math.'
+  )
+}
+
+export function postHandleJSCardRes(JsCardRes) {
+  const uxList = Object.keys(JsCardRes)
+
+  // template
+  for (let i = 0; i < uxList.length; i++) {
+    const compName = uxList[i]
+    postHandleTemplate(JsCardRes[compName][TEMPLATE_KEY], JsCardRes)
+  }
+
+  return JsCardRes
+}
diff --git a/packages/hap-packager/src/post-handler/lite-card-post.js b/packages/hap-packager/src/post-handler/lite-card-post.js
new file mode 100644
index 00000000..e7d28b9c
--- /dev/null
+++ b/packages/hap-packager/src/post-handler/lite-card-post.js
@@ -0,0 +1,407 @@
+/*
+ * Copyright (c) 2024-present, the hapjs-platform Project Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { templateValueToCardCode } from '@aiot-toolkit/card-expression'
+import { templater } from '@hap-toolkit/compiler'
+const { validator } = templater
+
+const TYPE_IMPORT = 'import'
+// 需要进行后处理的模块key
+const TEMPLATE_KEY = 'template'
+const ACTIONS_KEY = 'actions'
+const SIMPLE_EXPR_MODIFIERS = ['$', '.', '[]', '~', '{}']
+
+// 节点标记，同一节点可能同时符合多个kind定义，按priority高的进行标记
+const ENUM_KIND_TYPE = {
+  ELEMENT: {
+    // 普通动态节点、事件节点、带id属性的节点
+    kind: 1,
+    priority: 1
+  },
+  COMPONENT: {
+    // 自定义组件节点
+    kind: 3,
+    priority: 2
+  },
+  FRAGMENT: {
+    // if/for 动态节点
+    kind: 2,
+    priority: 3
+  }
+}
+
+// 处理 actions 中的字段，增加标记和处理表达式
+function postHandleActions(actions) {
+  if (!isObject(actions)) return
+
+  markType(actions)
+  markUrl(actions)
+  markMethod(actions)
+  markParams(actions)
+}
+
+function markType(actions) {
+  if (isExpr(actions.type)) {
+    let { rawExpr, prefixExpr } = getPrefixExpr(actions.type)
+    delete actions.type
+    actions['$type'] = rawExpr
+    actions['#type'] = prefixExpr
+  }
+}
+
+function markUrl(actions) {
+  // url 可能为字符串，也可能为数组
+  // 如为数组，则遍历数组进行表达式处理
+  if (typeof actions.url === 'string') {
+    if (isExpr(actions.url)) {
+      let { rawExpr, prefixExpr } = getPrefixExpr(actions.url)
+      delete actions.url
+      actions['$url'] = rawExpr
+      actions['#url'] = prefixExpr
+    }
+  } else if (Array.isArray(actions.url)) {
+    let hasBinding = false
+    const rawUrlList = actions.url.map((url) => {
+      if (isExpr(url)) {
+        hasBinding = true
+        let { rawExpr } = getPrefixExpr(url)
+        return `{{${rawExpr}}}`
+      }
+      return url
+    })
+
+    const prefixUrlList = actions.url.map((url) => {
+      if (isExpr(url)) {
+        hasBinding = true
+        let { prefixExpr } = getPrefixExpr(url)
+        return prefixExpr
+      }
+      return url
+    })
+
+    if (hasBinding) {
+      delete actions.url
+      actions['$url'] = rawUrlList
+      actions['#url'] = prefixUrlList
+    }
+  }
+}
+function markMethod(actions) {
+  if (isExpr(actions.method)) {
+    let { rawExpr, prefixExpr } = getPrefixExpr(actions.method)
+    delete actions.method
+    actions['$method'] = rawExpr
+    actions['#method'] = prefixExpr
+  }
+}
+
+function markParams(actions) {
+  if (!isObject(actions.params)) return
+
+  // 标准只支持一级结构中绑定变量，做一级结构的key遍历即可
+  Object.keys(actions.params).forEach((key) => {
+    const value = actions.params[key]
+    if (isExpr(value)) {
+      let { rawExpr, prefixExpr } = getPrefixExpr(value)
+      delete actions.params[key]
+      actions.params['$' + key] = rawExpr
+      actions.params['#' + key] = prefixExpr
+    }
+  })
+}
+
+// 处理 template 中的字段，增加标记和处理表达式
+function postHandleCompTemplate(template, liteCardRes, compName) {
+  if (!isObject(template)) return
+
+  markStyle(template)
+  markClass(template)
+  markClassList(template)
+  markAttr(template)
+  markEvents(template)
+  markId(template)
+  markIs(template)
+  markIf(template)
+  markFor(template)
+  markCustomComp(template, liteCardRes, compName)
+
+  const children = template.children
+  if (children && Array.isArray(children)) {
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i]
+      postHandleCompTemplate(child, liteCardRes, compName)
+    }
+  }
+}
+
+// 获取kind值对应的优先级
+function getPriority(kind) {
+  let prioity = kind
+  Object.keys(ENUM_KIND_TYPE).some((key) => {
+    const item = ENUM_KIND_TYPE[key]
+    if (item.kind === kind) {
+      prioity = item.priority
+      return true
+    }
+  })
+  return prioity
+}
+
+// 根据优先级标记节点的 kind 值
+function markKind(oldKind, newKind) {
+  if (!oldKind) return newKind
+
+  const oldPriority = getPriority(oldKind)
+  const newPriority = getPriority(newKind)
+  if (oldPriority < newPriority) return newKind
+
+  return oldKind
+}
+
+function markCustomComp(template, liteCardRes, compName) {
+  if (!isObject(liteCardRes[compName][TYPE_IMPORT])) return
+
+  const importList = Object.keys(liteCardRes[compName][TYPE_IMPORT])
+
+  if (importList.includes(template.type)) {
+    template.import = liteCardRes[compName][TYPE_IMPORT][template.type]
+    template.kind = markKind(template.kind, ENUM_KIND_TYPE.COMPONENT.kind)
+  }
+}
+
+function markIf(template) {
+  if (!template.shown) return
+
+  if (isExpr(template.shown)) {
+    let { rawExpr, prefixExpr } = getPrefixExpr(template.shown)
+    delete template.shown
+    template['$shown'] = rawExpr
+    template['#shown'] = prefixExpr
+  }
+  template.kind = markKind(template.kind, ENUM_KIND_TYPE.FRAGMENT.kind)
+}
+
+function markIs(template) {
+  if (!template.is) return
+
+  if (isExpr(template.is)) {
+    let { rawExpr, prefixExpr } = getPrefixExpr(template.is)
+    delete template.is
+    template['$is'] = rawExpr
+    template['#is'] = prefixExpr
+    template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+  }
+}
+
+function markId(template) {
+  if (!template.id) return
+
+  if (isExpr(template.id)) {
+    let { rawExpr, prefixExpr } = getPrefixExpr(template.id)
+    delete template.id
+    template['$id'] = rawExpr
+    template['#id'] = prefixExpr
+  }
+  // 节点有id属性，标记为kind 为 1
+  template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+}
+
+function markFor(template) {
+  if (!template.repeat) return
+
+  if (isObject(template.repeat)) {
+    if (isExpr(template.repeat.exp)) {
+      /**
+       * example 1:
+        <div for="{{(index, item) in ItemList}}">   ->
+        "repeat": {
+          "$exp": "ItemList",
+          "#exp": ["$", "ItemList"],
+          "key": "index",
+          "value": "item"
+        },
+
+        example 2:
+        <div for="{{(index, item) in [1,2,3]}}">   ->
+        "repeat": {
+          "$exp": "[1, 2, 3]",
+          "#exp": "[\"~\",1,2,3]",
+          "key": "index",
+          "value": "item"
+        },
+      */
+      let { rawExpr, prefixExpr } = getPrefixExpr(template.repeat.exp)
+      delete template.repeat.exp
+      template.repeat['$exp'] = rawExpr
+      template.repeat['#exp'] = prefixExpr
+    }
+  } else if (isExpr(template.repeat)) {
+    /**
+      <div for="{{ItemList}}">   ->
+      "$repeat": "ItemList",
+      "#repeat": ["$", "ItemList"],
+    */
+    let { rawExpr, prefixExpr } = getPrefixExpr(template.repeat)
+    delete template.repeat
+    template['$repeat'] = rawExpr
+    template['#repeat'] = prefixExpr
+  }
+  template.kind = markKind(template.kind, ENUM_KIND_TYPE.FRAGMENT.kind)
+}
+
+function markStyle(template) {
+  if (!template.style) return
+
+  const style = template.style
+  if (typeof style === 'object') {
+    Object.keys(style).forEach((key) => {
+      const value = style[key]
+      if (isExpr(value)) {
+        let { rawExpr, prefixExpr } = getPrefixExpr(value)
+        delete template.style[key]
+        template.style['$' + key] = rawExpr
+        template.style['#' + key] = prefixExpr
+        template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+      }
+    })
+  } else {
+    if (isExpr(style)) {
+      let { rawExpr, prefixExpr } = getPrefixExpr(style)
+      delete template.style
+      template['$style'] = rawExpr
+      template['#style'] = prefixExpr
+      template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+    }
+  }
+}
+
+function markClass(template) {
+  if (!template.class || template.class.length === 0) return
+
+  if (isExpr(template.class)) {
+    let { rawExpr, prefixExpr } = getPrefixExpr(template.class)
+    delete template.class
+    template['$class'] = rawExpr
+    template['#class'] = prefixExpr
+    template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+  }
+}
+
+function markClassList(template) {
+  if (!template.classList || template.classList.length === 0) return
+
+  let hasBinding = false
+  const prefixExprList = template.classList.map((classEle) => {
+    if (isExpr(classEle)) {
+      hasBinding = true
+      let { prefixExpr } = getPrefixExpr(classEle)
+      return prefixExpr
+    }
+    return classEle
+  })
+
+  if (hasBinding) {
+    // 如果 classList 元素有表达式
+    delete template.classList
+    template['#classList'] = prefixExprList
+    template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT)
+  }
+}
+
+function markEvents(template) {
+  if (template.events) {
+    template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+  }
+}
+
+function markAttr(template) {
+  if (!template.attr) return
+
+  const attr = template.attr
+  if (isObject(attr)) {
+    Object.keys(attr).forEach((attrKey) => {
+      const attrValue = attr[attrKey]
+      if (isExpr(attrValue)) {
+        let { rawExpr, prefixExpr } = getPrefixExpr(attrValue)
+        delete attr[attrKey]
+        attr['$' + attrKey] = rawExpr
+        attr['#' + attrKey] = prefixExpr
+        template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+      }
+    })
+  }
+}
+
+function isExpr(val) {
+  if (!val) return false
+  return validator.isExpr(val)
+}
+
+function isObject(obj) {
+  return obj && Object.prototype.toString.call(obj) === '[object Object]' && obj !== null
+}
+
+function getPrefixExpr(expr) {
+  const res = templateValueToCardCode(expr)
+  const parsed = JSON.parse(res)
+  if (isSimpleExpr(parsed)) {
+    // 简单表达式
+    // 目前只有 {{name}}、{{title.name}}、{{title[0]}}、{{[1,2,3]}}、{{ {a: 1} }} 算作简单表达式
+    return {
+      rawExpr: validator.parseText(expr)[0].value, // {{ name }} -> name
+      prefixExpr: parsed // {{ name }} -> ['$', 'name']
+    }
+  } else {
+    // 复杂表达式
+    return {
+      rawExpr: expr, // {{ a + b }} -> {{ a + b }}
+      prefixExpr: parsed // {{ a + b }} -> ["+",["$","a"],["$","b"]]
+    }
+  }
+}
+
+// 根据操作符来判断是否为简单表达式
+function isSimpleExpr(expr) {
+  if (!expr || !Array.isArray(expr)) return false
+
+  const modifierList = []
+  getAllModifiers(expr, modifierList)
+  return modifierList.every((modifier) => SIMPLE_EXPR_MODIFIERS.includes(modifier))
+}
+
+function getAllModifiers(exprList, modifierList) {
+  modifierList.push(exprList[0])
+  for (let i = 1; i < exprList.length; i++) {
+    if (Array.isArray(exprList[i])) {
+      // 如果当前元素是数组，递归调用，找出所有的操作符
+      getAllModifiers(exprList[i], modifierList)
+    }
+  }
+  return modifierList
+}
+
+export function postHandleLiteCardRes(liteCardRes) {
+  const uxList = Object.keys(liteCardRes)
+
+  // template
+  for (let i = 0; i < uxList.length; i++) {
+    const compName = uxList[i]
+    postHandleCompTemplate(liteCardRes[compName][TEMPLATE_KEY], liteCardRes, compName)
+    delete liteCardRes[compName][TYPE_IMPORT]
+  }
+
+  // actions
+  for (let i = 0; i < uxList.length; i++) {
+    const compName = uxList[i]
+    const actionEvents = liteCardRes[compName][ACTIONS_KEY]
+    if (actionEvents) {
+      Object.keys(actionEvents).forEach((eventName) => {
+        postHandleActions(actionEvents[eventName])
+      })
+    }
+  }
+
+  return liteCardRes
+}
diff --git a/packages/hap-packager/src/signature/index.js b/packages/hap-packager/src/signature/index.js
index fd79f10f..1c108436 100644
--- a/packages/hap-packager/src/signature/index.js
+++ b/packages/hap-packager/src/signature/index.js
@@ -5,7 +5,7 @@
 
 import path from 'path'
 
-import { calcDataDigest } from '../common/utils'
+import { calcDataDigest } from '@hap-toolkit/shared-utils'
 
 import { DIGEST_ZIP_PATH, DIGEST_HASH_JSON } from '../common/constant'
 
diff --git a/packages/hap-packager/src/subpackages/service.js b/packages/hap-packager/src/subpackages/service.js
index 80d3ab68..4e054968 100644
--- a/packages/hap-packager/src/subpackages/service.js
+++ b/packages/hap-packager/src/subpackages/service.js
@@ -6,8 +6,7 @@
 import fs from 'fs'
 import path from 'path'
 
-import { compileOptionsMeta, readJson } from '@hap-toolkit/shared-utils'
-import { calcDataDigest } from '../common/utils'
+import { compileOptionsMeta, readJson, calcDataDigest } from '@hap-toolkit/shared-utils'
 import { createFullPackage, createSubPackages } from './package'
 import { BUILD_INFO_FILE } from '../common/constant'
 
diff --git a/packages/hap-packager/src/webpack.post.js b/packages/hap-packager/src/webpack.post.js
index 74e4e4f2..5678dafa 100644
--- a/packages/hap-packager/src/webpack.post.js
+++ b/packages/hap-packager/src/webpack.post.js
@@ -10,14 +10,16 @@ import { globalConfig, readJson, compileOptionsObject } from '@hap-toolkit/share
 import {
   WidgetFingerprintPlugin,
   CopyDslPlugin,
-  LiteCardPlugin,
+  CardPlugin,
   HandlerPlugin,
   ResourcePlugin,
   DeviceTypePlugin,
   ZipPlugin,
   NotifyPlugin,
   SourcemapFixPlugin,
-  SplitChunksAdaptPlugin
+  SplitChunksAdaptPlugin,
+  RemoveModulesPlugin,
+  CardScriptHandlePlugin
 } from './plugins'
 import { genPriorities, getBabelConfigJsPath } from './common/utils'
 import { getSkeletonConfig } from './common/info'
@@ -124,7 +126,9 @@ function postHook(webpackConf, defaultsOptions, quickappConfig = {}) {
   }
 
   webpackConf.plugins.push(
-    new LiteCardPlugin({ pathSrc }),
+    new CardScriptHandlePlugin({ pathSrc }),
+    new RemoveModulesPlugin(),
+    new CardPlugin({ pathSrc }),
     // 框架Handler包装
     new HandlerPlugin({
       pathSrc: pathSrc,
diff --git a/packages/hap-shared-utils/src/index.js b/packages/hap-shared-utils/src/index.js
index 987867cb..1350de38 100644
--- a/packages/hap-shared-utils/src/index.js
+++ b/packages/hap-shared-utils/src/index.js
@@ -12,6 +12,7 @@ import chalk from 'chalk'
 import qrTerminal from 'qrcode-terminal'
 import globalConfig from './config'
 import BuildModeManager from './buildMode/BuildModeManager.js'
+import crypto from 'crypto'
 
 export { BuildModeManager, globalConfig }
 export { getLaunchPage } from './buildMode/util'
@@ -397,3 +398,40 @@ export function readJson(jsonpath) {
     }
   }
 }
+
+/**
+ * 获取 SHA256 摘要
+ * @param {Buffer} buffer - buffer
+ * @string {String<hex-string>} - hash 值
+ */
+export function calcDataDigest(buffer) {
+  const hash = crypto.createHash('SHA256')
+  hash.update(buffer)
+  return hash.digest()
+}
+
+const componentIdMap = new Map()
+const componentPathMap = new Map()
+export function getStyleObjectId(compPath) {
+  if (!componentPathMap.get(compPath)) {
+    const compId = getHash(compPath)
+    componentIdMap.set(compId, compPath)
+    componentPathMap.set(compPath, compId)
+  }
+  return componentPathMap.get(compPath)
+}
+
+function getHash(compPath) {
+  const digest = calcDataDigest(Buffer.from(compPath, 'utf-8'))
+  const digestStr = digest.toString('hex')
+  const len = Math.min(6, digestStr.length)
+  let res = compPath
+  for (let i = len; i < digestStr.length; i++) {
+    res = digestStr.substring(0, i)
+    if (componentIdMap.has(res)) {
+      continue
+    }
+    break
+  }
+  return res
+}
diff --git a/packages/hap-toolkit/src/utils.js b/packages/hap-toolkit/src/utils.js
index 464b39da..f03df1fc 100644
--- a/packages/hap-toolkit/src/utils.js
+++ b/packages/hap-toolkit/src/utils.js
@@ -107,8 +107,11 @@ export function resolveEntries(manifest, basedir, cwd) {
       let sourceFile = path.relative(cwd, filepath)
       sourceFile = './' + sourceFile + `?uxType=${type}`
       sourceFile = sourceFile.replace(/\\/g, '/')
-      if (type === ENTRY_TYPE.CARD && conf.type === 'lite') {
-        sourceFile += '&lite=1' // lite card
+      if (type === ENTRY_TYPE.CARD) {
+        sourceFile += '&card=1' // lite card
+        if (conf.type === 'lite') {
+          sourceFile += '&lite=1' // lite card
+        }
       }
       entries[entryKey] = sourceFile
     })

From 8c72def7a1185d085b9250cfb7071ab3782b97f4 Mon Sep 17 00:00:00 2001
From: lileirjyb <lileirjyb@vivo.com>
Date: Tue, 21 Jan 2025 18:22:47 +0800
Subject: [PATCH 2/9] feat: add support for model and dir for new jscard
 package

Signed-off-by: lileirjyb <lileirjyb@vivo.com>
---
 packages/hap-compiler/src/template/index.js   |   6 -
 packages/hap-compiler/src/template/model.js   | 175 +++++++++++++-----
 .../hap-compiler/src/template/validator.js    |  27 ++-
 .../ux/__snapshots__/component.test.js.snap   |  28 +--
 .../src/post-handler/js-card-post.js          |  24 ++-
 .../__snapshots__/appchunks.test.js.snap      |  12 +-
 .../__snapshots__/compile.test.js.snap        |  22 ++-
 .../splitChunksWithSubPkg.test.js.snap        |   4 +
 ...lication.demo.__preview__.debug.1.0.0.rpks | Bin 0 -> 22190 bytes
 9 files changed, 204 insertions(+), 94 deletions(-)
 create mode 100644 packages/hap-toolkit/fixtures/com.application.demo.__preview__.debug.1.0.0.rpks

diff --git a/packages/hap-compiler/src/template/index.js b/packages/hap-compiler/src/template/index.js
index 0e3f905b..828e4238 100644
--- a/packages/hap-compiler/src/template/index.js
+++ b/packages/hap-compiler/src/template/index.js
@@ -128,15 +128,9 @@ function traverse(node, output, previousNode, conditionList, options) {
           if (name.match(/^model:/)) {
             // 解析model指令，model指令格式：model:name="{{youName}}"
             validator.checkModel(name, value, output, node, locationInfo, options)
-            if (output.isCard) {
-              throw new Error('卡片不支持 model 指令')
-            }
           } else if (name.match(/^dir:/)) {
             // 解析自定义指令，自定义指令格式：dir:指令名称="{{data}}"
             validator.checkCustomDirective(name, value, output, node)
-            if (output.isCard) {
-              throw new Error('卡片不支持自定义指令')
-            }
           } else {
             // 其余为普通属性
             validator.checkAttr(name, value, output, node.tagName, locationInfo, options)
diff --git a/packages/hap-compiler/src/template/model.js b/packages/hap-compiler/src/template/model.js
index 4ab6dd4a..e8cf07fc 100644
--- a/packages/hap-compiler/src/template/model.js
+++ b/packages/hap-compiler/src/template/model.js
@@ -102,9 +102,16 @@ function genCheckboxModel(node, attrName, value, output) {
       ${expValue} = checked ? ${trueValueBinding} : ${falseValueBinding}
     }`
 
-  addAttr(output.result, attrName, eval(`(function() {${attrCheckedCode}})`))
-  addHandler(output.result, 'change', eval(`(function(evt) {${eventChangeCode}})`))
-
+  const isCard = output.isCard
+  const isLite = output.isLite
+  if (isCard && !isLite) {
+    addAttr(output.result, attrName, `(function() {${attrCheckedCode}})`)
+    addAttr(output.result, attrName + 'Raw', value)
+    addHandler(output.result, 'change', `function(evt) {${eventChangeCode}}`)
+  } else {
+    addAttr(output.result, attrName, eval(`(function() {${attrCheckedCode}})`))
+    addHandler(output.result, 'change', eval(`(function(evt) {${eventChangeCode}})`))
+  }
   return {
     attr: { checked: attrCheckedCode },
     events: { change: eventChangeCode }
@@ -125,8 +132,16 @@ function genRadioModel(node, attrName, value, output) {
   const attrCheckedCode = `return ${exp(value, false)} === ${valueBinding}`
   const eventChangeCode = `${exp(value, false)} = ${valueBinding}`
 
-  addAttr(output.result, attrName, eval(`(function() {${attrCheckedCode}})`))
-  addHandler(output.result, 'change', eval(`(function(evt) {${eventChangeCode}})`))
+  const isCard = output.isCard
+  const isLite = output.isLite
+  if (isCard && !isLite) {
+    addAttr(output.result, attrName, `(function() {${attrCheckedCode}})`)
+    addAttr(output.result, attrName + 'Raw', value)
+    addHandler(output.result, 'change', `function(evt) {${eventChangeCode}}`)
+  } else {
+    addAttr(output.result, attrName, eval(`(function() {${attrCheckedCode}})`))
+    addHandler(output.result, 'change', eval(`(function(evt) {${eventChangeCode}})`))
+  }
 
   return {
     attr: { checked: attrCheckedCode },
@@ -140,11 +155,17 @@ function genRadioModel(node, attrName, value, output) {
  * @param {object} output 构建的输出结果
  */
 function genSelectModel(value, output) {
-  addHandler(
-    output.result,
-    'change',
-    eval(`(function(evt) { ${exp(value, false)} = evt.newValue})`)
-  )
+  const isCard = output.isCard
+  const isLite = output.isLite
+  if (isCard && !isLite) {
+    addHandler(output.result, 'change', `function(evt) { ${exp(value, false)} = evt.newValue}`)
+  } else {
+    addHandler(
+      output.result,
+      'change',
+      eval(`(function(evt) { ${exp(value, false)} = evt.newValue})`)
+    )
+  }
 }
 
 /**
@@ -156,10 +177,16 @@ function genSelectModel(value, output) {
  */
 function genDefaultModel(attrName, value, output) {
   const eventChangeCode = `${exp(value, false)} = evt.target.value`
-
-  addAttr(output.result, attrName, exp(value))
-  addHandler(output.result, 'change', eval(`(function(evt) {${eventChangeCode}})`))
-
+  const isCard = output.isCard
+  const isLite = output.isLite
+  if (isCard && !isLite) {
+    addAttr(output.result, attrName, exp(value, true, isLite, isCard))
+    addAttr(output.result, attrName + 'Raw', value)
+    addHandler(output.result, 'change', `function(evt) {${eventChangeCode}}`)
+  } else {
+    addAttr(output.result, attrName, exp(value))
+    addHandler(output.result, 'change', eval(`(function(evt) {${eventChangeCode}})`))
+  }
   return { events: { change: eventChangeCode } }
 }
 
@@ -176,12 +203,22 @@ function genComponentModel(node, attrName, value, output, locationInfo, options)
   // 自定义组件model指令绑定的属性，依然作为普通属性处理
   validator.checkAttr(attrName, value, output, node.tagName, locationInfo, options)
 
-  // 为自定义组件绑定update:${attrName}事件，接收组件内部emit的update:${attrName}事件
-  addHandler(
-    output.result,
-    `update:${attrName}`,
-    eval(`(function(evt) { ${exp(value, false)} = evt.detail})`)
-  )
+  const isCard = output.isCard
+  const isLite = output.isLite
+  if (isCard && !isLite) {
+    addHandler(
+      output.result,
+      `update:${attrName}`,
+      `function(evt) { ${exp(value, false)} = evt.detail}`
+    )
+  } else {
+    // 为自定义组件绑定update:${attrName}事件，接收组件内部emit的update:${attrName}事件
+    addHandler(
+      output.result,
+      `update:${attrName}`,
+      eval(`(function(evt) { ${exp(value, false)} = evt.detail})`)
+    )
+  }
 }
 
 /**
@@ -196,40 +233,76 @@ function genDynamicModel(node, attrName, value, output, expType) {
   const checkboxCode = genCheckboxModel(node, attrName, value, output)
   const radioCode = genRadioModel(node, attrName, value, output)
   const textCode = genDefaultModel(attrName, value, output)
+  const isCard = output.isCard
+  const isLite = output.isLite
+  if (isCard && !isLite) {
+    addAttr(output.result, attrName, exp(value, true, isLite, isCard))
+    addAttr(output.result, attrName + 'Raw', value)
 
-  addAttr(output.result, attrName, exp(value))
+    addAttr(
+      output.result,
+      'checked',
+      `(function() { 
+        if (${expType} === 'checkbox') {
+          ${checkboxCode.attr.checked}
+        } else if (${expType} === 'radio') {
+          ${radioCode.attr.checked}
+        } else {
+          return false
+        }
+      })
+    `
+    )
 
-  addAttr(
-    output.result,
-    'checked',
-    eval(`
-    (function() { 
-      if (${expType} === 'checkbox') {
-        ${checkboxCode.attr.checked}
-      } else if (${expType} === 'radio') {
-        ${radioCode.attr.checked}
-      } else {
-        return false
-      }
-    })
-  `)
-  )
+    addAttr(output.result, 'checkedRaw', value)
+    addHandler(
+      output.result,
+      'change',
+      `function(evt) {
+        if (${expType} === 'checkbox') {
+          ${checkboxCode.events.change}
+        } else if (${expType} === 'radio') {
+          ${radioCode.events.change}
+        } else {
+          ${textCode.events.change}
+        }
+      }`
+    )
+  } else {
+    addAttr(output.result, attrName, exp(value))
 
-  addHandler(
-    output.result,
-    'change',
-    eval(`
-    (function(evt) {
-      if (${expType} === 'checkbox') {
-        ${checkboxCode.events.change}
-      } else if (${expType} === 'radio') {
-        ${radioCode.events.change}
-      } else {
-        ${textCode.events.change}
-      }
-    })
-  `)
-  )
+    addAttr(
+      output.result,
+      'checked',
+      eval(`
+      (function() { 
+        if (${expType} === 'checkbox') {
+          ${checkboxCode.attr.checked}
+        } else if (${expType} === 'radio') {
+          ${radioCode.attr.checked}
+        } else {
+          return false
+        }
+      })
+    `)
+    )
+
+    addHandler(
+      output.result,
+      'change',
+      eval(`
+      (function(evt) {
+        if (${expType} === 'checkbox') {
+          ${checkboxCode.events.change}
+        } else if (${expType} === 'radio') {
+          ${radioCode.events.change}
+        } else {
+          ${textCode.events.change}
+        }
+      })
+    `)
+    )
+  }
 }
 
 /**
diff --git a/packages/hap-compiler/src/template/validator.js b/packages/hap-compiler/src/template/validator.js
index 2723baf2..74e0ec4e 100644
--- a/packages/hap-compiler/src/template/validator.js
+++ b/packages/hap-compiler/src/template/validator.js
@@ -1423,7 +1423,6 @@ function checkId(id, output) {
     const isLite = output.isLite
     const isCard = output.isCard
     output.result.id = exp.isExpr(id) ? exp(id, true, isLite, isCard) : id
-    output.result.idExpr = true
     if (isCard && !isLite) {
       output.result.idRaw = id
     }
@@ -1824,9 +1823,9 @@ function checkEvent(name, value, output) {
       value = '{{' + funcName + '(' + params.join(',') + ')}}'
       try {
         // 将事件转换为函数对象
-        if (output.isCard) {
+        if (output.isCard && !output.isLite) {
           value = 'function (evt) { return ' + exp(value, false).replace('this.evt', 'evt') + '}'
-        } else if (!output.isLite) {
+        } else {
           /* eslint-disable no-eval */
           value = eval(
             '(function (evt) { return ' + exp(value, false).replace('this.evt', 'evt') + '})'
@@ -1858,12 +1857,24 @@ function checkCustomDirective(name, value, output, node) {
     colorconsole.warn(`\`${node.tagName}\` 组件自定义指令名称不能为空`)
     return false
   }
-
+  const isCard = output.isCard
+  const isLite = output.isLite
   output.result.directives = output.result.directives || []
-  output.result.directives.push({
-    name: dirName,
-    value: exp.isExpr(value) ? exp(value, true, output.isLite, output.isCard) : value
-  })
+  if (isCard && !isLite) {
+    // 补全绑定值的双花括号，如：dir:指令名称="data"补全为dir:指令名称="{{data}}"
+    value = exp.addExprffix(value)
+
+    output.result.directives.push({
+      name: dirName,
+      value: exp.isExpr(value) ? exp(value, true, output.isLite, output.isCard) : value,
+      valueRaw: value
+    })
+  } else {
+    output.result.directives.push({
+      name: dirName,
+      value: exp.isExpr(value) ? exp(value, true, output.isLite, output.isCard) : value
+    })
+  }
 }
 
 /**
diff --git a/packages/hap-dsl-xvm/test/unit/ux/__snapshots__/component.test.js.snap b/packages/hap-dsl-xvm/test/unit/ux/__snapshots__/component.test.js.snap
index 95ac40b7..97a7e798 100644
--- a/packages/hap-dsl-xvm/test/unit/ux/__snapshots__/component.test.js.snap
+++ b/packages/hap-dsl-xvm/test/unit/ux/__snapshots__/component.test.js.snap
@@ -4951,24 +4951,24 @@ exports[`Component 编译测试 ux components: ../../../lib/loaders/template-loa
                 \\"type\\": function () {return this.dynamicType},
                 \\"value\\": \\"test dynamic type\\",
                 \\"checked\\": function() { 
-      if (this.dynamicType === 'checkbox') {
-        
+        if (this.dynamicType === 'checkbox') {
+          
     if (Array.isArray(this.dynamicValue)) {
       return this.dynamicValue.indexOf(\\"test dynamic type\\") > -1
     } else {
       return this.dynamicValue
     }
-      } else if (this.dynamicType === 'radio') {
-        return this.dynamicValue === \\"test dynamic type\\"
-      } else {
-        return false
+        } else if (this.dynamicType === 'radio') {
+          return this.dynamicValue === \\"test dynamic type\\"
+        } else {
+          return false
+        }
       }
-    }
               },
               \\"events\\": {
                 \\"change\\": function(evt) {
-      if (this.dynamicType === 'checkbox') {
-        
+        if (this.dynamicType === 'checkbox') {
+          
     const checked = evt.target.checked;
     if (Array.isArray(this.dynamicValue)) {
       const index = this.dynamicValue.indexOf(\\"test dynamic type\\")
@@ -4980,12 +4980,12 @@ exports[`Component 编译测试 ux components: ../../../lib/loaders/template-loa
     } else {
       this.dynamicValue = checked ? true : false
     }
-      } else if (this.dynamicType === 'radio') {
-        this.dynamicValue = \\"test dynamic type\\"
-      } else {
-        this.dynamicValue = evt.target.value
+        } else if (this.dynamicType === 'radio') {
+          this.dynamicValue = \\"test dynamic type\\"
+        } else {
+          this.dynamicValue = evt.target.value
+        }
       }
-    }
               }
             },
             {
diff --git a/packages/hap-packager/src/post-handler/js-card-post.js b/packages/hap-packager/src/post-handler/js-card-post.js
index 2ad47e0e..d2af2785 100644
--- a/packages/hap-packager/src/post-handler/js-card-post.js
+++ b/packages/hap-packager/src/post-handler/js-card-post.js
@@ -205,6 +205,13 @@ function markClass(template) {
 
 function markEvents(template) {
   if (template.events) {
+    Object.keys(template.events).forEach((eventName) => {
+      const eventStr = template.events[eventName]
+      if (isFunctionStr(eventStr)) {
+        template.events['$' + eventName] = eventStr
+        delete template.events[eventName]
+      }
+    })
     template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
   }
 }
@@ -216,12 +223,14 @@ function markAttr(template) {
   if (isObject(attr)) {
     Object.keys(attr).forEach((attrKey) => {
       const attrValueRaw = attr[attrKey + 'Raw']
-      if (isExpr(attrValueRaw)) {
-        attr['$' + attrKey] = getExprRes(attrValueRaw, attr[attrKey])
-        delete attr[attrKey]
-        template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+      if (attrValueRaw !== undefined) {
+        if (isExpr(attrValueRaw)) {
+          attr['$' + attrKey] = getExprRes(attrValueRaw, attr[attrKey])
+          delete attr[attrKey]
+          template.kind = markKind(template.kind, ENUM_KIND_TYPE.ELEMENT.kind)
+        }
+        delete attr[attrKey + 'Raw']
       }
-      delete attr[attrKey + 'Raw']
     })
   }
 }
@@ -231,6 +240,11 @@ function isExpr(val) {
   return validator.isExpr(val)
 }
 
+function isFunctionStr(str) {
+  const pattern = /^\s*function\s*\([\w\s,$]*\)\s*\{[\s\S]*\}\s*$/
+  return pattern.test(str.trim())
+}
+
 function isObject(obj) {
   return obj && Object.prototype.toString.call(obj) === '[object Object]' && obj !== null
 }
diff --git a/packages/hap-toolkit/__tests__/__snapshots__/appchunks.test.js.snap b/packages/hap-toolkit/__tests__/__snapshots__/appchunks.test.js.snap
index 8a574267..df5325f8 100644
--- a/packages/hap-toolkit/__tests__/__snapshots__/appchunks.test.js.snap
+++ b/packages/hap-toolkit/__tests__/__snapshots__/appchunks.test.js.snap
@@ -44,8 +44,8 @@ $app_define$('@app-component/index', [], function($app_require$, $app_exports$,
         if ($app_exports$.__esModule && $app_exports$.default) {
           $app_module$.exports = $app_exports$.default
         }
-    $app_module$.exports.template = require(\\"!../../../../../hap-dsl-xvm/lib/loaders/template-loader.js!../../../../../hap-dsl-xvm/lib/loaders/fragment-loader.js?index=0&type=template!./index.ux?uxType=card&\\")
-    $app_module$.exports.style = require(\\"!../../../../../hap-dsl-xvm/lib/loaders/style-loader.js?index=0&type=style!../../../../../hap-dsl-xvm/lib/loaders/fragment-loader.js?index=0&type=style!./index.ux?uxType=card\\")
+    $app_module$.exports.template = require(\\"!../../../../../hap-dsl-xvm/lib/loaders/template-loader.js!../../../../../hap-dsl-xvm/lib/loaders/fragment-loader.js?index=0&type=template!./index.ux?uxType=card&&card=1&uxPath=<project-root>/src/CardDemo/index.ux\\")
+    $app_module$.exports.style = require(\\"!../../../../../hap-dsl-xvm/lib/loaders/style-loader.js?index=0&type=style!../../../../../hap-dsl-xvm/lib/loaders/fragment-loader.js?index=0&type=style!./index.ux?uxType=card&card=1&uxPath=<project-root>/src/CardDemo/index.ux\\")
 });
 $app_bootstrap$('@app-component/index',{ packagerVersion: QUICKAPP_TOOLKIT_VERSION });"
 `;
@@ -251,17 +251,21 @@ exports[`split common component on a project build results include split chunks
   \\"classList\\": [
     \\"demo-page\\"
   ],
+  \\"class\\": \\"demo-page\\",
+  \\"classListRaw\\": \\"demo-page\\",
   \\"children\\": [
     {
       \\"type\\": \\"text\\",
       \\"attr\\": {
-        \\"value\\": function () {return this.text}
+        \\"value\\": \\"function () {return this.text}\\",
+        \\"valueRaw\\": \\"{{text}}\\"
       }
     },
     {
       \\"type\\": \\"text\\",
       \\"attr\\": {
-        \\"value\\": function () {return this.des}
+        \\"value\\": \\"function () {return this.des}\\",
+        \\"valueRaw\\": \\"{{des}}\\"
       }
     }
   ]
diff --git a/packages/hap-toolkit/__tests__/__snapshots__/compile.test.js.snap b/packages/hap-toolkit/__tests__/__snapshots__/compile.test.js.snap
index 22df0610..18aa009b 100644
--- a/packages/hap-toolkit/__tests__/__snapshots__/compile.test.js.snap
+++ b/packages/hap-toolkit/__tests__/__snapshots__/compile.test.js.snap
@@ -50,8 +50,8 @@ $app_define$('@app-component/index', [], function($app_require$, $app_exports$,
         if ($app_exports$.__esModule && $app_exports$.default) {
           $app_module$.exports = $app_exports$.default
         }
-    $app_module$.exports.template = require(\\"!../../../../../hap-dsl-xvm/lib/loaders/template-loader.js!../../../../../hap-dsl-xvm/lib/loaders/fragment-loader.js?index=0&type=template!./index.ux?uxType=card&\\")
-    $app_module$.exports.style = require(\\"!../../../../../hap-dsl-xvm/lib/loaders/style-loader.js?index=0&type=style!../../../../../hap-dsl-xvm/lib/loaders/fragment-loader.js?index=0&type=style!./index.ux?uxType=card\\")
+    $app_module$.exports.template = require(\\"!../../../../../hap-dsl-xvm/lib/loaders/template-loader.js!../../../../../hap-dsl-xvm/lib/loaders/fragment-loader.js?index=0&type=template!./index.ux?uxType=card&&card=1&uxPath=<project-root>/src/CardDemo/index.ux\\")
+    $app_module$.exports.style = require(\\"!../../../../../hap-dsl-xvm/lib/loaders/style-loader.js?index=0&type=style!../../../../../hap-dsl-xvm/lib/loaders/fragment-loader.js?index=0&type=style!./index.ux?uxType=card&card=1&uxPath=<project-root>/src/CardDemo/index.ux\\")
 });
 $app_bootstrap$('@app-component/index',{ packagerVersion: QUICKAPP_TOOLKIT_VERSION });"
 `;
@@ -257,17 +257,21 @@ exports[`测试compile compile build devtool=false 12`] = `
   \\"classList\\": [
     \\"demo-page\\"
   ],
+  \\"class\\": \\"demo-page\\",
+  \\"classListRaw\\": \\"demo-page\\",
   \\"children\\": [
     {
       \\"type\\": \\"text\\",
       \\"attr\\": {
-        \\"value\\": function () {return this.text}
+        \\"value\\": \\"function () {return this.text}\\",
+        \\"valueRaw\\": \\"{{text}}\\"
       }
     },
     {
       \\"type\\": \\"text\\",
       \\"attr\\": {
-        \\"value\\": function () {return this.des}
+        \\"value\\": \\"function () {return this.des}\\",
+        \\"valueRaw\\": \\"{{des}}\\"
       }
     }
   ]
@@ -290,6 +294,8 @@ Array [
   "CardDemo/index.js",
   "app.js",
   "workers/request/index.js",
+  "CardDemo/index.template.json",
+  "CardDemo/index.css.json",
 ]
 `;
 
@@ -314,7 +320,7 @@ versionCode 字段必须为 Integer 类型
 
 [LOG] ### App Loader ### 'com.application.demo.__preview__.base.srpk' 大小为 16 KB
 
-[LOG] ### App Loader ### 'com.application.demo.__preview___CardDemo.rpk' 大小为 10 KB
+[LOG] ### App Loader ### 'com.application.demo.__preview___CardDemo.rpk' 大小为 11 KB
 
 [LOG] ### App Loader ### 项目构建并生成文件：com.application.demo.__preview__.debug.1.0.0.rpks
 
@@ -326,8 +332,10 @@ exports[`测试compile compile build devtool=source-map 1`] = `
 Array [
   "app.js",
   "app.js.map",
+  "CardDemo/index.css.json",
   "CardDemo/index.js",
   "CardDemo/index.js.map",
+  "CardDemo/index.template.json",
   "Common/logo.png",
   "Common/tu.9.png",
   "Demo/index.js",
@@ -341,7 +349,9 @@ Array [
 exports[`测试compile compile release 1`] = `
 Array [
   "app.js",
+  "CardDemo/index.css.json",
   "CardDemo/index.js",
+  "CardDemo/index.template.json",
   "Common/logo.png",
   "Common/tu.9.png",
   "Demo/index.js",
@@ -352,7 +362,7 @@ Array [
 
 exports[`测试compile generate webpack config 1`] = `
 Object {
-  "CardDemo/index": "./src/CardDemo/index.ux?uxType=card",
+  "CardDemo/index": "./src/CardDemo/index.ux?uxType=card&card=1",
   "Demo/index": "./src/Demo/index.ux?uxType=page",
   "app": "./src/app.ux?uxType=app",
   "workers/request/index": "./src/workers/request/index.js",
diff --git a/packages/hap-toolkit/__tests__/__snapshots__/splitChunksWithSubPkg.test.js.snap b/packages/hap-toolkit/__tests__/__snapshots__/splitChunksWithSubPkg.test.js.snap
index e05130ef..de33a63b 100644
--- a/packages/hap-toolkit/__tests__/__snapshots__/splitChunksWithSubPkg.test.js.snap
+++ b/packages/hap-toolkit/__tests__/__snapshots__/splitChunksWithSubPkg.test.js.snap
@@ -4,6 +4,10 @@ exports[`split chunks on a project split chunks with subpackages 1`] = `
 Array [
   "app-chunks.json",
   "base/page-chunks.json",
+  "Card/CardDemo1/index.css.json",
+  "Card/CardDemo1/index.template.json",
+  "Card/CardDemo2/index.css.json",
+  "Card/CardDemo2/index.template.json",
   "manifest.json",
   "page-chunks.json",
   "Sub2/page-chunks.json",
diff --git a/packages/hap-toolkit/fixtures/com.application.demo.__preview__.debug.1.0.0.rpks b/packages/hap-toolkit/fixtures/com.application.demo.__preview__.debug.1.0.0.rpks
new file mode 100644
index 0000000000000000000000000000000000000000..c05e2064ded26def3fe1220796fe434ec34e8405
GIT binary patch
literal 22190
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

literal 0
HcmV?d00001


From f57ca27f033e30fd3854477a9375ce71668906f4 Mon Sep 17 00:00:00 2001
From: lileirjyb <lileirjyb@vivo.com>
Date: Fri, 24 Jan 2025 12:03:53 +0800
Subject: [PATCH 3/9] fix: adapt for enable-extract-css option and fix for
 litecard h5 render in ide

Signed-off-by: lileirjyb <lileirjyb@vivo.com>
---
 .../hap-dsl-xvm/src/loaders/style-loader.js   |  3 +-
 .../src/loaders/ux-fragment-utils.js          | 38 ++++++++++++-------
 packages/hap-dsl-xvm/src/loaders/ux-loader.js |  2 +-
 .../src/plugins/remove-modules-plugin.js      |  7 ++--
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/packages/hap-dsl-xvm/src/loaders/style-loader.js b/packages/hap-dsl-xvm/src/loaders/style-loader.js
index 9adf42db..ae12c6d8 100644
--- a/packages/hap-dsl-xvm/src/loaders/style-loader.js
+++ b/packages/hap-dsl-xvm/src/loaders/style-loader.js
@@ -30,6 +30,7 @@ const componentId = (() => {
 
 export default function styleLoader(code) {
   const self = this
+  const options = loaderUtils.parseQuery(this.resourceQuery)
   const loaderQuery = loaderUtils.parseQuery(this.query)
   const suppresslogs = !!getWebpackOptions(this).suppresslogs
   const resourcePath = this.resourcePath // 当前文件绝对路径
@@ -40,7 +41,7 @@ export default function styleLoader(code) {
     query: loaderQuery
   })
 
-  if (compileOptionsObject.enableExtractCss) {
+  if (compileOptionsObject.enableExtractCss && !options.card) {
     componentId.add(resourcePath)
     if (jsonStyle) {
       jsonStyle[`@info`] = {
diff --git a/packages/hap-dsl-xvm/src/loaders/ux-fragment-utils.js b/packages/hap-dsl-xvm/src/loaders/ux-fragment-utils.js
index 2f5cc9a3..e6486996 100644
--- a/packages/hap-dsl-xvm/src/loaders/ux-fragment-utils.js
+++ b/packages/hap-dsl-xvm/src/loaders/ux-fragment-utils.js
@@ -51,7 +51,7 @@ const defaultLoaders = {
  * @param uxType
  * @returns {*}
  */
-function makeLoaderString(type, config, uxType) {
+function makeLoaderString(type, config, isCard, uxType) {
   config = config || {}
   let loaders
 
@@ -146,10 +146,11 @@ function makeLoaderString(type, config, uxType) {
       }
     ]
 
-    compileOptionsObject.enableExtractCss &&
+    if (compileOptionsObject.enableExtractCss && !isCard) {
       loaders.unshift({
         name: defaultLoaders['extract-css']
       })
+    }
 
     let lang = config.lang
     if (lang && lang !== 'css') {
@@ -307,7 +308,7 @@ function processImportFrag($loader, imports, importNames, card, lite) {
       })
       let reqStr = makeRequireString(
         $loader,
-        makeLoaderString(FRAG_TYPE.IMPORT),
+        makeLoaderString(FRAG_TYPE.IMPORT, null, card),
         `${importSrc}?uxType=${ENTRY_TYPE.COMP}&name=${importName}${cardParam}${liteParam}`
       )
 
@@ -353,9 +354,13 @@ function processTemplateFrag($loader, templates, uxType, importNames, card, lite
     importNames = importNames.map((item) => 'importNames[]=' + item)
     retStr = makeRequireString(
       $loader,
-      makeLoaderString(FRAG_TYPE.TEMPLATE, {
-        alone: !!fragAttrsSrc
-      }),
+      makeLoaderString(
+        FRAG_TYPE.TEMPLATE,
+        {
+          alone: !!fragAttrsSrc
+        },
+        card
+      ),
       `${src}?uxType=${uxType}&${importNames.join(',')}${cardParam}${liteParam}${pathParam}`
     )
   }
@@ -391,10 +396,14 @@ function processStyleFrag($loader, styles, uxType, card, lite) {
     const pathParam = card ? `&uxPath=${src}` : ''
     code = makeRequireString(
       $loader,
-      makeLoaderString(FRAG_TYPE.STYLE, {
-        alone: !!fragAttrsSrc,
-        lang: fragAttrsLang
-      }),
+      makeLoaderString(
+        FRAG_TYPE.STYLE,
+        {
+          alone: !!fragAttrsSrc,
+          lang: fragAttrsLang
+        },
+        card
+      ),
       `${src}?uxType=${uxType}${cardParam}${liteParam}${pathParam}`
     )
   }
@@ -408,7 +417,7 @@ function processStyleFrag($loader, styles, uxType, card, lite) {
  * @param uxType
  * @returns {string}
  */
-function processScriptFrag($loader, scripts, uxType) {
+function processScriptFrag($loader, scripts, uxType, card) {
   let code = 'null'
   if (scripts.length) {
     // 有且仅有一个<script>节点
@@ -427,6 +436,7 @@ function processScriptFrag($loader, scripts, uxType) {
           alone: !!fragAttrsSrc,
           path: $loader.resourcePath
         },
+        card,
         uxType
       ),
       `${src}?uxType=${uxType}`
@@ -455,7 +465,7 @@ function processDataFrag($loader, datas, uxType) {
     }
     code = makeRequireString(
       $loader,
-      makeLoaderString(FRAG_TYPE.DATA, {}, uxType),
+      makeLoaderString(FRAG_TYPE.DATA, {}, true, uxType),
       `${src}?index=0&lite=1`
     )
   }
@@ -482,7 +492,7 @@ function processActionFrag($loader, datas, uxType) {
     }
     code = makeRequireString(
       $loader,
-      makeLoaderString(FRAG_TYPE.ACTIONS, {}, uxType),
+      makeLoaderString(FRAG_TYPE.ACTIONS, {}, true, uxType),
       `${src}?index=0&lite=1`
     )
   }
@@ -509,7 +519,7 @@ function processPropsFrag($loader, datas, uxType) {
     }
     code = makeRequireString(
       $loader,
-      makeLoaderString(FRAG_TYPE.PROPS, {}, uxType),
+      makeLoaderString(FRAG_TYPE.PROPS, {}, true, uxType),
       `${src}?index=0&lite=1`
     )
   }
diff --git a/packages/hap-dsl-xvm/src/loaders/ux-loader.js b/packages/hap-dsl-xvm/src/loaders/ux-loader.js
index f948a9b8..ba7d9b8f 100644
--- a/packages/hap-dsl-xvm/src/loaders/ux-loader.js
+++ b/packages/hap-dsl-xvm/src/loaders/ux-loader.js
@@ -56,7 +56,7 @@ function assemble($loader, frags, name, uxType, card, lite) {
   let content = `${importFrag}\n`
   if (!lite) {
     // process script for JS card
-    content += `var $app_script$ = ${processScriptFrag($loader, frags.script, uxType)}\n`
+    content += `var $app_script$ = ${processScriptFrag($loader, frags.script, uxType, card)}\n`
   }
   content +=
     `$app_define$('@app-component/${name}', [], function($app_require$, $app_exports$, $app_module$) {\n` +
diff --git a/packages/hap-packager/src/plugins/remove-modules-plugin.js b/packages/hap-packager/src/plugins/remove-modules-plugin.js
index 124dd59c..54228c27 100644
--- a/packages/hap-packager/src/plugins/remove-modules-plugin.js
+++ b/packages/hap-packager/src/plugins/remove-modules-plugin.js
@@ -22,7 +22,7 @@ class RemoveModulesPlugin {
       compilation.hooks.optimizeModules.tap('RemoveModulesPlugin', (modules) => {
         modules.forEach((module) => {
           const { _source, request } = module
-          if (this.isCardAndCardcomp(request)) {
+          if (this.isJsCardAndCardcomp(request)) {
             const { _valueAsString, _valueAsBuffer } = _source || {}
             const moduleSource = _valueAsString || _valueAsBuffer?.toString() || ''
             const type = this.getRequestType(request)
@@ -44,7 +44,7 @@ class RemoveModulesPlugin {
 
           chunkModules.forEach((module) => {
             const { request } = module
-            if (this.isCardAndCardcomp(request)) {
+            if (this.isJsCardAndCardcomp(request)) {
               const type = this.getRequestType(request)
               const typeArr = LOADER_INFO_LIST.map((item) => item.type)
               if (
@@ -87,7 +87,7 @@ class RemoveModulesPlugin {
     })
   }
   // chunk.entryModule.rawRequest: ./src/cards/card/index.ux?uxType=card&card=1&lite=1
-  isCardAndCardcomp(requestPath) {
+  isJsCardAndCardcomp(requestPath) {
     if (requestPath && requestPath.lastIndexOf('?') > 0) {
       const pathParamIndex = requestPath.lastIndexOf('?')
       const paramStr = requestPath.substring(pathParamIndex + 1)
@@ -95,6 +95,7 @@ class RemoveModulesPlugin {
       return (
         paramArr &&
         paramArr.indexOf('card=1') >= 0 &&
+        paramArr.indexOf('lite=1') < 0 &&
         (paramArr.indexOf('uxType=card') >= 0 || paramArr.indexOf('uxType=comp') >= 0)
       )
     }

From 71752b51f45026c5f48a0cf4656c534c926907e5 Mon Sep 17 00:00:00 2001
From: lileirjyb <lileirjyb@vivo.com>
Date: Fri, 7 Feb 2025 20:06:38 +0800
Subject: [PATCH 4/9] fix: fit for watch mode and add some comments

Signed-off-by: lileirjyb <lileirjyb@vivo.com>
---
 packages/hap-compiler/src/style/process.js                  | 2 +-
 packages/hap-packager/src/plugins/card-plugin.js            | 2 +-
 .../hap-packager/src/plugins/card-script-handle-plugin.js   | 6 ++++++
 packages/hap-packager/src/plugins/remove-modules-plugin.js  | 4 ++--
 packages/hap-packager/src/post-handler/js-card-post.js      | 4 ++--
 packages/hap-toolkit/src/gen-webpack-conf/index.js          | 6 ++++--
 packages/hap-toolkit/src/utils.js                           | 2 +-
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/hap-compiler/src/style/process.js b/packages/hap-compiler/src/style/process.js
index 149b1c4d..c21f3bdd 100644
--- a/packages/hap-compiler/src/style/process.js
+++ b/packages/hap-compiler/src/style/process.js
@@ -141,7 +141,7 @@ function processImport(csscode, dir, log, depList) {
  * @param {String} filePath - 文件路径
  * @param {Array} depFiles - 使用到的资源集合
  */
-function processSingleClass(rule, jsonStyle, ruleResult, log, filePath, depFiles, options) {
+function processSingleClass(rule, jsonStyle, ruleResult, log, filePath, depFiles) {
   rule.declarations.forEach(function (declaration) {
     const subType = declaration.type
 
diff --git a/packages/hap-packager/src/plugins/card-plugin.js b/packages/hap-packager/src/plugins/card-plugin.js
index 727223d3..1ede8579 100644
--- a/packages/hap-packager/src/plugins/card-plugin.js
+++ b/packages/hap-packager/src/plugins/card-plugin.js
@@ -72,7 +72,7 @@ class CardPlugin {
                 handledTemplateCardRes = postHandleJSCardRes(templateRes)
               }
 
-              // 用于修改 template 的 key 的 stringify 的顺序，type放第一个，children放最后一个
+              // 用于修改 template 的 key 的 stringify 的顺序，type 放第一个，children 放最后一个
               let templateKeys = []
               recordKeys(handledTemplateCardRes, templateKeys)
 
diff --git a/packages/hap-packager/src/plugins/card-script-handle-plugin.js b/packages/hap-packager/src/plugins/card-script-handle-plugin.js
index 2665e93c..68d58b5a 100644
--- a/packages/hap-packager/src/plugins/card-script-handle-plugin.js
+++ b/packages/hap-packager/src/plugins/card-script-handle-plugin.js
@@ -12,6 +12,11 @@ const PLUGIN_NAME = 'CardScriptHandlePlugin'
 const SUFFIX_UX = '.ux'
 const CARD_ENTRY = '#entry'
 
+/**
+ * 修改输出的 js 的内容：
+ * 1. 增加 $json_require$方法，用于配合引擎读取 template.json 的内容
+ * 2. style 通过 @info 来标记，用于配合引擎读取 css.json 的内容
+ */
 class CardScriptHandlePlugin {
   constructor(options = {}) {
     this.options = options || {}
@@ -163,6 +168,7 @@ class CardScriptHandlePlugin {
     }
     return relativeSrcPathStr
   }
+  // 通过匹配__webpack_require__('xxxx')中的值来获取组件名
   getCompPath(str, pathSrc) {
     const regex = /__webpack_require__\("([^"]+)"\)/
     const match = str.match(regex)
diff --git a/packages/hap-packager/src/plugins/remove-modules-plugin.js b/packages/hap-packager/src/plugins/remove-modules-plugin.js
index 54228c27..fa03c83d 100644
--- a/packages/hap-packager/src/plugins/remove-modules-plugin.js
+++ b/packages/hap-packager/src/plugins/remove-modules-plugin.js
@@ -18,7 +18,7 @@ class RemoveModulesPlugin {
 
   apply(compiler) {
     compiler.hooks.compilation.tap('RemoveModulesPlugin', (compilation) => {
-      // 在生成资源之前，遍历所有模块，删除 jscard 的 template 和 style 模块
+      // 在生成资源之前，遍历所有模块，删除 jscard 的 template 和 style 模块，保证输出的 js 中不包含 template 和 style
       compilation.hooks.optimizeModules.tap('RemoveModulesPlugin', (modules) => {
         modules.forEach((module) => {
           const { _source, request } = module
@@ -35,7 +35,7 @@ class RemoveModulesPlugin {
           }
         })
       })
-      // 在生成资源之前，遍历所有模块，删除 jscard 的 template 和 style 模块
+      // 在生成资源之前，遍历所有模块，删除 jscard 的 template 和 style 模块，保证输出的 js 中不包含 template 和 style
       compilation.hooks.optimizeChunks.tap('RemoveModulesPlugin', (chunks) => {
         chunks.forEach((chunk) => {
           const chunkGraph = compilation.chunkGraph
diff --git a/packages/hap-packager/src/post-handler/js-card-post.js b/packages/hap-packager/src/post-handler/js-card-post.js
index d2af2785..1abbf9a0 100644
--- a/packages/hap-packager/src/post-handler/js-card-post.js
+++ b/packages/hap-packager/src/post-handler/js-card-post.js
@@ -280,9 +280,9 @@ function isSimpleArr(exp) {
   }
 
   let res = true
-  // 检查所有[]匹配项是否全部为数字
+  // 检查所有[]匹配项是否全部为数字或常量字符串
   results.forEach((content) => {
-    if (!/^\d+$/.test(content)) {
+    if (!/^\d+$/.test(content) && !/^('|")(.*)\1$/.test(content)) {
       res = false
     }
   })
diff --git a/packages/hap-toolkit/src/gen-webpack-conf/index.js b/packages/hap-toolkit/src/gen-webpack-conf/index.js
index d805e2ae..11697f73 100644
--- a/packages/hap-toolkit/src/gen-webpack-conf/index.js
+++ b/packages/hap-toolkit/src/gen-webpack-conf/index.js
@@ -193,8 +193,10 @@ export default async function genWebpackConf(launchOptions, mode) {
   globalConfig.isSmartMode =
     compileOptionsObject.splitChunksMode === compileOptionsMeta.splitChunksModeEnum.SMART
 
+  // JS 卡由于将js assets中template和style抽取出来，如果使用缓存会编译错误。故卡片不使用缓存。
+  const isCard = Object.values(entries).some((entry) => entry.indexOf('card=1') > -1)
   let cache =
-    isJest ||
+    (isJest ||
     isProduction ||
     compileOptionsObject.disableCache ||
     // 提取公共 css 时不支持使用缓存，toolkit 内部的 cssModule 不支持缓存
@@ -210,7 +212,7 @@ export default async function genWebpackConf(launchOptions, mode) {
             config: [__filename, path.resolve(__dirname, '../../package.json')]
           },
           version: TOOLKIT_VERSION + ''
-        }
+        }) && !isCard
 
   const webpackConf = {
     context: cwd,
diff --git a/packages/hap-toolkit/src/utils.js b/packages/hap-toolkit/src/utils.js
index f03df1fc..52316b38 100644
--- a/packages/hap-toolkit/src/utils.js
+++ b/packages/hap-toolkit/src/utils.js
@@ -108,7 +108,7 @@ export function resolveEntries(manifest, basedir, cwd) {
       sourceFile = './' + sourceFile + `?uxType=${type}`
       sourceFile = sourceFile.replace(/\\/g, '/')
       if (type === ENTRY_TYPE.CARD) {
-        sourceFile += '&card=1' // lite card
+        sourceFile += '&card=1' // card
         if (conf.type === 'lite') {
           sourceFile += '&lite=1' // lite card
         }

From 610ab1225b9efa54c267f3ce4faeaee621e4581b Mon Sep 17 00:00:00 2001
From: lileirjyb <lileirjyb@vivo.com>
Date: Sat, 8 Feb 2025 14:23:49 +0800
Subject: [PATCH 5/9] feat: add style validator for themeColor

Signed-off-by: lileirjyb <lileirjyb@vivo.com>
---
 packages/hap-compiler/src/style/validator.js | 19 ++++++++++++++++++-
 packages/integration-tests/hap.test.js       |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/hap-compiler/src/style/validator.js b/packages/hap-compiler/src/style/validator.js
index 3a3c6e82..862b99f9 100755
--- a/packages/hap-compiler/src/style/validator.js
+++ b/packages/hap-compiler/src/style/validator.js
@@ -2656,7 +2656,24 @@ const validatorMap = {
   starSecondary: validator.url,
   // font
   fontSrc: validator.fontSrc,
-  fontFamily: validator.fontFamily
+  fontFamily: validator.fontFamily,
+  themeColor: makeEnumValidator([
+    'uxCardColorTheme',
+    'uxCardColorAccent',
+    'uxCardColorPrimary',
+    'uxCardColorSecondary',
+    'uxCardColorSecondaryVariant',
+    'uxCardColorTertiary',
+    'uxCardColorQuaternary',
+    'uxCardColorContainer',
+    'uxCardBackground',
+    'uxCardColorHue',
+    'uxCardColorHueSecondary',
+    'uxIconColorAccent',
+    'uxIconColorPrimary',
+    'uxIconColorSecondary',
+    'uxIconColorBackground'
+  ])
 }
 
 /**
diff --git a/packages/integration-tests/hap.test.js b/packages/integration-tests/hap.test.js
index 863dedcc..8b13bd47 100644
--- a/packages/integration-tests/hap.test.js
+++ b/packages/integration-tests/hap.test.js
@@ -53,7 +53,7 @@ describe('hap-toolkit', () => {
       expect(stderr.toString()).toMatch(/Please pick a new name/)
       await del([targetdirForExist, targetdirForNonExist], { force: true })
     },
-    10 * 60 * 1000
+    100 * 60 * 1000
   )
 
   it(

From bd817e909ab9673b6959133a25261a2e85d4e3c8 Mon Sep 17 00:00:00 2001
From: lileirjyb <lileirjyb@vivo.com>
Date: Thu, 13 Feb 2025 19:49:49 +0800
Subject: [PATCH 6/9] fix: fit for release mode

Signed-off-by: lileirjyb <lileirjyb@vivo.com>
---
 .../src/plugins/card-script-handle-plugin.js  | 179 ++++++++++++++----
 .../hap-toolkit/src/gen-webpack-conf/index.js |   1 +
 2 files changed, 146 insertions(+), 34 deletions(-)

diff --git a/packages/hap-packager/src/plugins/card-script-handle-plugin.js b/packages/hap-packager/src/plugins/card-script-handle-plugin.js
index 68d58b5a..1b984f88 100644
--- a/packages/hap-packager/src/plugins/card-script-handle-plugin.js
+++ b/packages/hap-packager/src/plugins/card-script-handle-plugin.js
@@ -5,8 +5,12 @@
 
 import path from 'path'
 import Compilation from 'webpack/lib/Compilation'
-import { getStyleObjectId } from '@hap-toolkit/shared-utils'
+import { getStyleObjectId, globalConfig } from '@hap-toolkit/shared-utils'
 import loaderUtils from 'loader-utils'
+import { parse } from '@babel/parser'
+import traverse from '@babel/traverse'
+import generate from '@babel/generator'
+import * as t from '@babel/types'
 
 const PLUGIN_NAME = 'CardScriptHandlePlugin'
 const SUFFIX_UX = '.ux'
@@ -42,23 +46,16 @@ class CardScriptHandlePlugin {
             if (this.isJsCard(entryRawRequest)) {
               const { templateFileName, cssFileName } = this.getCardBuildPath(request, pathSrc)
               const jsAssetesName = this.getJsAssetsName(request, pathSrc)
-              const sourceSplit = compilation.assets[jsAssetesName].source().split('\n')
-
-              let newSource = ''
-              for (let i = sourceSplit.length - 1; i >= 0; i--) {
-                const str = sourceSplit[i]
-                if (this.isStyleStr(str)) {
-                  sourceSplit.splice(i, 1, this.getStyleExportsString(str, cssFileName, pathSrc))
-                }
-                if (this.isTemplateStr(str)) {
-                  sourceSplit.splice(
-                    i,
-                    1,
-                    this.getTemplateExportsString(str, templateFileName, pathSrc)
-                  )
-                }
+              const source = compilation.assets[jsAssetesName].source()
+              let newSource = source
+              if (globalConfig.mode === 'development') {
+                // 开发模式用字符串替换的方式，可以确保sourcemap行数对应正确
+                newSource = this.getDevNewSource(source, cssFileName, templateFileName, pathSrc)
+              } else {
+                // 生产模式无需sourcemap，而字符串匹配替换方式失效，用ast分析的方式
+                newSource = this.getProdNewSource(source, cssFileName, templateFileName, pathSrc)
               }
-              newSource += sourceSplit.join('\n')
+
               compilation.assets[jsAssetesName] = new ConcatSource(newSource)
             }
           }
@@ -118,19 +115,6 @@ class CardScriptHandlePlugin {
     }
     return false
   }
-  getTemplateExportsString(str, templateFileName, pathSrc) {
-    const compPath = this.getCompPath(str, pathSrc)
-    let templatePath = compPath
-    if (templateFileName === `${compPath}.template.json`) {
-      templatePath = CARD_ENTRY
-    }
-    return `$app_module$.exports.template = $json_require$("${templateFileName}", { "componentPath": "${templatePath}" })`
-  }
-  getStyleExportsString(str, cssFileName, pathSrc) {
-    const compPath = this.getCompPath(str, pathSrc)
-    const styleObjId = getStyleObjectId(compPath)
-    return `$app_module$.exports.style = { "@info": { "styleObjectId": "${styleObjId}" }, "extracted": true, "jsonPath": "${cssFileName}" }`
-  }
   getJsAssetsName(requestPath, pathSrc) {
     if (!requestPath || !pathSrc) {
       throw new Error(`Invalid request path or src path:\n${requestPath}\n${pathSrc}`)
@@ -154,12 +138,139 @@ class CardScriptHandlePlugin {
     )}`
     return `${bundleFilePath}.js`
   }
+  getDevNewSource(source, cssFileName, templateFileName, pathSrc) {
+    const sourceSplit = source.split('\n')
+    let newSource = ''
+    for (let i = sourceSplit.length - 1; i >= 0; i--) {
+      const str = sourceSplit[i]
+      if (devUtils.isStyleStr(str)) {
+        sourceSplit.splice(i, 1, devUtils.getStyleExportsString(str, cssFileName, pathSrc))
+      }
+      if (devUtils.isTemplateStr(str)) {
+        sourceSplit.splice(i, 1, devUtils.getTemplateExportsString(str, templateFileName, pathSrc))
+      }
+    }
+    newSource += sourceSplit.join('\n')
+    return newSource
+  }
+  getProdNewSource(source, cssFileName, templateFileName, pathSrc) {
+    let newSource = ''
+    const ast = parse(source, {
+      sourceType: 'module'
+    })
+
+    // 用于在遍历 AST 时修改节点
+    const visitor = {
+      CallExpression(path) {
+        const firstArg = path.node.arguments[0]
+        if (prodUtils.isTemplateStr(firstArg)) {
+          prodUtils.replaceTemplateStr(path, firstArg.value, templateFileName, pathSrc)
+        } else if (prodUtils.isStyleStr(firstArg)) {
+          prodUtils.replaceStyleStr(path, firstArg.value, cssFileName, pathSrc)
+        }
+      }
+    }
+
+    // 遍历 AST 并修改 exports.template 和 exports.style
+    traverse(ast, visitor)
+
+    // 生成修改后的代码
+    newSource = generate(
+      ast,
+      {
+        compact: true // 设置紧凑模式，省略多余的空格和换行
+      },
+      source
+    ).code
+    return prodUtils.replacePlaceHolder(newSource)
+  }
+}
+
+const prodUtils = {
+  isTemplateStr(firstArg) {
+    if (!firstArg) return false
+    return t.isStringLiteral(firstArg) && firstArg.value.includes('type=template')
+  },
+  isStyleStr(firstArg) {
+    if (!firstArg) return false
+    return t.isStringLiteral(firstArg) && firstArg.value.includes('type=style')
+  },
+  replaceTemplateStr(path, templateStr, templateFileName, pathSrc) {
+    const compPath = this.getCompPath(templateStr, pathSrc)
+    let templatePath = compPath
+    if (templateFileName === `${compPath}.template.json`) {
+      templatePath = CARD_ENTRY
+    }
+    const uniquePlaceHolder = `_START_PLACE_HOLDER_TEMPLATE_${templateFileName}_${templatePath}_END_`
+    path.replaceWith(t.stringLiteral(uniquePlaceHolder))
+  },
+  replaceStyleStr(path, styleStr, cssFileName, pathSrc) {
+    const compPath = this.getCompPath(styleStr, pathSrc)
+    const styleObjId = getStyleObjectId(compPath)
+    const uniquePlaceHolder = `_START_PLACE_HOLDER_CSS_${cssFileName}_${styleObjId}_END_`
+    path.replaceWith(t.stringLiteral(uniquePlaceHolder))
+  },
+  replacePlaceHolder(code) {
+    // 正则表达式匹配_idX_valY_place_holder_格式的字符串
+    const regexTemplate = /["'`]_START_PLACE_HOLDER_TEMPLATE_([^_\s]+)_([^_\s]+)_END_["'`]/g
+
+    // 替换 template 的 placeholder
+    code = code.replace(regexTemplate, function (match, templateFileName, templatePath) {
+      return `$json_require$("${templateFileName}",{"componentPath":"${templatePath}"})`
+    })
+    const regexCss = /["'`]_START_PLACE_HOLDER_CSS_([^_\s]+)_([^_\s]+)_END_["'`]/g
+
+    // 替换 css 的 placeholder
+    code = code.replace(regexCss, function (match, cssFileName, styleObjId) {
+      return JSON.stringify({
+        '@info': { styleObjectId: styleObjId },
+        extracted: true,
+        jsonPath: cssFileName
+      })
+    })
+
+    return code
+  },
+  getRelativeCompPath(pathSrc, uxPath) {
+    let relativeSrcPathStr = path.relative(pathSrc, uxPath)
+    relativeSrcPathStr = relativeSrcPathStr.replace(/\\/g, '/')
+    if (relativeSrcPathStr && relativeSrcPathStr.endsWith('.ux')) {
+      return relativeSrcPathStr.substring(0, relativeSrcPathStr.length - SUFFIX_UX.length)
+    }
+    return relativeSrcPathStr
+  },
+  getCompPath(request, pathSrc) {
+    const reqArr = request.split('!')
+    const lastItem = reqArr[reqArr.length - 1]
+    const pathArr = lastItem.split('?')
+    const query = pathArr[pathArr.length - 1]
+    const resourceQuery = loaderUtils.parseQuery(query ? `?${query}` : '?')
+
+    const uxPath = resourceQuery.uxPath
+    return this.getRelativeCompPath(pathSrc, uxPath)
+  }
+}
+
+const devUtils = {
   isTemplateStr(str) {
     return str.indexOf('type=template') >= 0 && str.indexOf('__webpack_require__') >= 0
-  }
+  },
   isStyleStr(str) {
     return str.indexOf('type=style') >= 0 && str.indexOf('__webpack_require__') >= 0
-  }
+  },
+  getTemplateExportsString(str, templateFileName, pathSrc) {
+    const compPath = this.getCompPath(str, pathSrc)
+    let templatePath = compPath
+    if (templateFileName === `${compPath}.template.json`) {
+      templatePath = CARD_ENTRY
+    }
+    return `$app_module$.exports.template = $json_require$("${templateFileName}", { "componentPath": "${templatePath}" })`
+  },
+  getStyleExportsString(str, cssFileName, pathSrc) {
+    const compPath = this.getCompPath(str, pathSrc)
+    const styleObjId = getStyleObjectId(compPath)
+    return `$app_module$.exports.style = { "@info": { "styleObjectId": "${styleObjId}" }, "extracted": true, "jsonPath": "${cssFileName}" }`
+  },
   getRelativeCompPath(pathSrc, uxPath) {
     let relativeSrcPathStr = path.relative(pathSrc, uxPath)
     relativeSrcPathStr = relativeSrcPathStr.replace(/\\/g, '/')
@@ -167,9 +278,9 @@ class CardScriptHandlePlugin {
       return relativeSrcPathStr.substring(0, relativeSrcPathStr.length - SUFFIX_UX.length)
     }
     return relativeSrcPathStr
-  }
+  },
   // 通过匹配__webpack_require__('xxxx')中的值来获取组件名
-  getCompPath(str, pathSrc) {
+  getCompPath: function (str, pathSrc) {
     const regex = /__webpack_require__\("([^"]+)"\)/
     const match = str.match(regex)
 
diff --git a/packages/hap-toolkit/src/gen-webpack-conf/index.js b/packages/hap-toolkit/src/gen-webpack-conf/index.js
index 11697f73..a5f77500 100644
--- a/packages/hap-toolkit/src/gen-webpack-conf/index.js
+++ b/packages/hap-toolkit/src/gen-webpack-conf/index.js
@@ -97,6 +97,7 @@ export default async function genWebpackConf(launchOptions, mode) {
     launchOptions = Object.assign({}, launchOptions.ideConfig.cli, launchOptions)
   }
   globalConfig.launchOptions = launchOptions
+  globalConfig.mode = mode
 
   // 源代码目录
   const SRC_DIR = path.resolve(cwd, globalConfig.sourceRoot)

From b46a5fd8082989821e4e893616082f0c10ddac5a Mon Sep 17 00:00:00 2001
From: lileirjyb <lileirjyb@vivo.com>
Date: Tue, 18 Feb 2025 19:35:57 +0800
Subject: [PATCH 7/9] fix: add error msg for events with params for lite widget

Signed-off-by: lileirjyb <lileirjyb@vivo.com>
---
 packages/hap-compiler/src/template/validator.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/hap-compiler/src/template/validator.js b/packages/hap-compiler/src/template/validator.js
index 74e0ec4e..1b540f54 100644
--- a/packages/hap-compiler/src/template/validator.js
+++ b/packages/hap-compiler/src/template/validator.js
@@ -1807,6 +1807,12 @@ function checkEvent(name, value, output) {
     // 如果表达式形式为XXX(xxxx)
     const paramsMatch = value.match(/(.*)\((.*)\)/)
     if (paramsMatch) {
+      if (output.isLite) {
+        const err = new Error('轻卡不支持带参数的事件')
+        err.isExpressionError = true
+        err.expression = value
+        throw err
+      }
       const funcName = paramsMatch[1]
       let params = paramsMatch[2]
       // 解析','分隔的参数

From 8d404e7c0d908b34bf4aeab2874d66cf3d69f76f Mon Sep 17 00:00:00 2001
From: lileirjyb <lileirjyb@vivo.com>
Date: Tue, 18 Feb 2025 19:37:02 +0800
Subject: [PATCH 8/9] fix: fix some js widget and lite widget expression result
 bugs

Signed-off-by: lileirjyb <lileirjyb@vivo.com>
---
 .../src/post-handler/js-card-post.js          | 69 ++++---------------
 .../src/post-handler/lite-card-post.js        | 64 +++++++----------
 .../hap-packager/src/post-handler/utils.js    | 63 +++++++++++++++++
 3 files changed, 100 insertions(+), 96 deletions(-)
 create mode 100644 packages/hap-packager/src/post-handler/utils.js

diff --git a/packages/hap-packager/src/post-handler/js-card-post.js b/packages/hap-packager/src/post-handler/js-card-post.js
index 1abbf9a0..5368d06e 100644
--- a/packages/hap-packager/src/post-handler/js-card-post.js
+++ b/packages/hap-packager/src/post-handler/js-card-post.js
@@ -2,7 +2,14 @@
  * Copyright (c) 2024-present, the hapjs-platform Project Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
-
+import {
+  isExpr,
+  isFunctionStr,
+  isObject,
+  isConstObjOrArray,
+  isSimpleArr,
+  isSimplePath
+} from './utils'
 import { templater } from '@hap-toolkit/compiler'
 const { validator } = templater
 
@@ -11,11 +18,6 @@ const TYPE_IMPORT = 'import'
 // 需要进行后处理的模块key
 const TEMPLATE_KEY = 'template'
 
-const pathTestRE =
-  /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['.*?'\]|\[".*?"\]|\[\d+\]|\[[A-Za-z_$][\w$]*\])*$/
-
-const literalValueRE = /^(?:true|false|null|undefined|Infinity|NaN)$/
-
 // 节点标记，同一节点可能同时符合多个kind定义，按priority高的进行标记
 const ENUM_KIND_TYPE = {
   ELEMENT: {
@@ -235,20 +237,6 @@ function markAttr(template) {
   }
 }
 
-function isExpr(val) {
-  if (!val) return false
-  return validator.isExpr(val)
-}
-
-function isFunctionStr(str) {
-  const pattern = /^\s*function\s*\([\w\s,$]*\)\s*\{[\s\S]*\}\s*$/
-  return pattern.test(str.trim())
-}
-
-function isObject(obj) {
-  return obj && Object.prototype.toString.call(obj) === '[object Object]' && obj !== null
-}
-
 function getExprRes(exprRaw, expr) {
   const tokens = validator.parseText(exprRaw.trim())
   if (tokens.length > 1) {
@@ -256,9 +244,12 @@ function getExprRes(exprRaw, expr) {
   }
 
   const parsed = tokens[0].value
-  if (isObjOrArray(parsed) || (isSimplePath(parsed) && isSimpleArr(parsed))) {
-    // 简单表达式
-    // 目前只有 {{name}}、{{title.name}}、{{title[0]}}、{{[1,2,3]}}、{{ {a: 1} }} 算作简单表达式
+  if (isConstObjOrArray(parsed)) {
+    // 简单表达式 {{ [1,2,3] }}、{{ {a: 1} }}
+    // eslint-disable-next-line no-eval
+    return eval(`(${parsed})`)
+  } else if (isSimplePath(parsed) && isSimpleArr(parsed)) {
+    // 简单表达式 {{name}}、{{title.name}}、{{title['name']}}、{{title[0]}}
     return parsed // {{ name }} -> name
   } else {
     // 复杂表达式，返回function形式的表达式结果
@@ -266,38 +257,6 @@ function getExprRes(exprRaw, expr) {
   }
 }
 
-function isObjOrArray(exp) {
-  return Object.prototype.toString.call(exp) === '[object Object]' || Array.isArray(exp)
-}
-function isSimpleArr(exp) {
-  // eslint-disable-next-line no-useless-escape
-  const regex = /\[([^\[\]]+)\]/g
-  let match
-  const results = []
-
-  while ((match = regex.exec(exp)) !== null) {
-    results.push(match[1])
-  }
-
-  let res = true
-  // 检查所有[]匹配项是否全部为数字或常量字符串
-  results.forEach((content) => {
-    if (!/^\d+$/.test(content) && !/^('|")(.*)\1$/.test(content)) {
-      res = false
-    }
-  })
-  return res
-}
-function isSimplePath(exp) {
-  return (
-    pathTestRE.test(exp) &&
-    // true/false/null/undefined/Infinity/NaN
-    !literalValueRE.test(exp) &&
-    // Math常量
-    exp.slice(0, 5) !== 'Math.'
-  )
-}
-
 export function postHandleJSCardRes(JsCardRes) {
   const uxList = Object.keys(JsCardRes)
 
diff --git a/packages/hap-packager/src/post-handler/lite-card-post.js b/packages/hap-packager/src/post-handler/lite-card-post.js
index e7d28b9c..ae9e3016 100644
--- a/packages/hap-packager/src/post-handler/lite-card-post.js
+++ b/packages/hap-packager/src/post-handler/lite-card-post.js
@@ -4,6 +4,7 @@
  */
 
 import { templateValueToCardCode } from '@aiot-toolkit/card-expression'
+import { isExpr, isObject, isConstObjOrArray, isSimpleArr, isSimplePath } from './utils'
 import { templater } from '@hap-toolkit/compiler'
 const { validator } = templater
 
@@ -11,7 +12,6 @@ const TYPE_IMPORT = 'import'
 // 需要进行后处理的模块key
 const TEMPLATE_KEY = 'template'
 const ACTIONS_KEY = 'actions'
-const SIMPLE_EXPR_MODIFIERS = ['$', '.', '[]', '~', '{}']
 
 // 节点标记，同一节点可能同时符合多个kind定义，按priority高的进行标记
 const ENUM_KIND_TYPE = {
@@ -334,52 +334,34 @@ function markAttr(template) {
   }
 }
 
-function isExpr(val) {
-  if (!val) return false
-  return validator.isExpr(val)
-}
-
-function isObject(obj) {
-  return obj && Object.prototype.toString.call(obj) === '[object Object]' && obj !== null
-}
+function getExprRes(exprRaw) {
+  const tokens = validator.parseText(exprRaw.trim())
+  if (tokens.length > 1) {
+    return exprRaw
+  }
 
-function getPrefixExpr(expr) {
-  const res = templateValueToCardCode(expr)
-  const parsed = JSON.parse(res)
-  if (isSimpleExpr(parsed)) {
-    // 简单表达式
-    // 目前只有 {{name}}、{{title.name}}、{{title[0]}}、{{[1,2,3]}}、{{ {a: 1} }} 算作简单表达式
-    return {
-      rawExpr: validator.parseText(expr)[0].value, // {{ name }} -> name
-      prefixExpr: parsed // {{ name }} -> ['$', 'name']
-    }
+  const parsed = tokens[0].value
+  if (isConstObjOrArray(parsed)) {
+    // 简单表达式 {{ [1,2,3] }}、{{ {a: 1} }}
+    // eslint-disable-next-line no-eval
+    return eval(`(${parsed})`)
+  } else if (isSimplePath(parsed) && isSimpleArr(parsed)) {
+    // 简单表达式 {{name}}、{{title.name}}、{{title['name']}}、{{title[0]}}
+    return parsed // {{ name }} -> name
   } else {
-    // 复杂表达式
-    return {
-      rawExpr: expr, // {{ a + b }} -> {{ a + b }}
-      prefixExpr: parsed // {{ a + b }} -> ["+",["$","a"],["$","b"]]
-    }
+    // 复杂表达式，返回function形式的表达式结果
+    return exprRaw // {{a + b}} -> function () { return this.a + this.b }
   }
 }
 
-// 根据操作符来判断是否为简单表达式
-function isSimpleExpr(expr) {
-  if (!expr || !Array.isArray(expr)) return false
-
-  const modifierList = []
-  getAllModifiers(expr, modifierList)
-  return modifierList.every((modifier) => SIMPLE_EXPR_MODIFIERS.includes(modifier))
-}
-
-function getAllModifiers(exprList, modifierList) {
-  modifierList.push(exprList[0])
-  for (let i = 1; i < exprList.length; i++) {
-    if (Array.isArray(exprList[i])) {
-      // 如果当前元素是数组，递归调用，找出所有的操作符
-      getAllModifiers(exprList[i], modifierList)
-    }
+function getPrefixExpr(exprRaw) {
+  const res = templateValueToCardCode(exprRaw)
+  const parsed = JSON.parse(res)
+  const rawExpr = getExprRes(exprRaw)
+  return {
+    rawExpr: rawExpr, // {{ name }} -> name
+    prefixExpr: parsed // {{ name }} -> ['$', 'name']
   }
-  return modifierList
 }
 
 export function postHandleLiteCardRes(liteCardRes) {
diff --git a/packages/hap-packager/src/post-handler/utils.js b/packages/hap-packager/src/post-handler/utils.js
new file mode 100644
index 00000000..ae2ec143
--- /dev/null
+++ b/packages/hap-packager/src/post-handler/utils.js
@@ -0,0 +1,63 @@
+import { templater } from '@hap-toolkit/compiler'
+const { validator } = templater
+
+const pathTestRE =
+  /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['.*?'\]|\[".*?"\]|\[\d+\]|\[[A-Za-z_$][\w$]*\])*$/
+
+const literalValueRE = /^(?:true|false|null|undefined|Infinity|NaN)$/
+
+export function isExpr(val) {
+  if (!val) return false
+  return validator.isExpr(val)
+}
+
+export function isFunctionStr(str) {
+  const pattern = /^\s*function\s*\([\w\s,$]*\)\s*\{[\s\S]*\}\s*$/
+  return pattern.test(str.trim())
+}
+
+export function isObject(obj) {
+  return obj && Object.prototype.toString.call(obj) === '[object Object]' && obj !== null
+}
+
+export function isConstObjOrArray(exp) {
+  try {
+    // "[1, 2, 3]"、"{a: 1}" 常量作为模板内容时
+    // eslint-disable-next-line no-eval
+    eval(`(${exp})`)
+    return true
+  } catch (e) {
+    return false
+  }
+}
+
+export function isSimpleArr(exp) {
+  // a.b.c，或 a['b']['c'] 返回 true
+  // eslint-disable-next-line no-useless-escape
+  const regex = /\[([^\[\]]+)\]/g
+  let match
+  const results = []
+
+  while ((match = regex.exec(exp)) !== null) {
+    results.push(match[1])
+  }
+
+  let res = true
+  // 检查所有[]匹配项是否全部为数字或常量字符串
+  results.forEach((content) => {
+    if (!/^\d+$/.test(content) && !/^('|"|`)(.*)\1$/.test(content)) {
+      res = false
+    }
+  })
+  return res
+}
+
+export function isSimplePath(exp) {
+  return (
+    pathTestRE.test(exp) &&
+    // true/false/null/undefined/Infinity/NaN
+    !literalValueRE.test(exp) &&
+    // Math常量
+    exp.slice(0, 5) !== 'Math.'
+  )
+}

From b362a76b207653962efd8a56d51f17f31d4a97ec Mon Sep 17 00:00:00 2001
From: lileirjyb <lileirjyb@vivo.com>
Date: Thu, 20 Feb 2025 10:14:15 +0800
Subject: [PATCH 9/9] feat: compatibility with older js widget

Signed-off-by: lileirjyb <lileirjyb@vivo.com>
---
 packages/hap-packager/src/common/shared.js    |  5 ++++
 .../hap-packager/src/plugins/card-plugin.js   | 22 +++++++++-------
 packages/hap-packager/src/webpack.post.js     | 11 +++++---
 .../hap-toolkit/src/gen-webpack-conf/index.js |  7 ++++--
 packages/hap-toolkit/src/utils.js             | 25 +++++++++++++++++++
 5 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/packages/hap-packager/src/common/shared.js b/packages/hap-packager/src/common/shared.js
index 786f0c84..7e17e79c 100644
--- a/packages/hap-packager/src/common/shared.js
+++ b/packages/hap-packager/src/common/shared.js
@@ -228,6 +228,11 @@ function populateWidgetFields(widgetsObj) {
         `WARN: manifest.json 文件中 widgets 字段 ${key} 缺少 type 属性，默认设置为 js`
       )
     }
+    if (widgetsObj[key].type === 'js' && widgetsObj[key].minCardPlatformVersion) {
+      // 写了 minCardPlatformVersion 字段
+      // 赋值给 minPlatformVersion（兼容旧引擎），引导引擎升级
+      widgetsObj[key].minPlatformVersion = widgetsObj[key].minCardPlatformVersion
+    }
   })
 }
 
diff --git a/packages/hap-packager/src/plugins/card-plugin.js b/packages/hap-packager/src/plugins/card-plugin.js
index 1ede8579..88ac32bf 100644
--- a/packages/hap-packager/src/plugins/card-plugin.js
+++ b/packages/hap-packager/src/plugins/card-plugin.js
@@ -38,7 +38,7 @@ class CardPlugin {
           stage: Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
         },
         () => {
-          let { pathSrc } = this.options
+          let { pathSrc, isCardMinVersion } = this.options
           pathSrc = pathSrc.replace(/\\/g, '/')
           const moduleGraph = compilation.moduleGraph
           for (const chunk of compilation.chunks) {
@@ -52,7 +52,7 @@ class CardPlugin {
                 request,
                 pathSrc
               )
-              const templateRes = {
+              let templateRes = {
                 [CARD_ENTRY]: {}
               }
               const styleRes = {}
@@ -65,16 +65,20 @@ class CardPlugin {
                 pathSrc,
                 bundleFilePath
               )
-              let handledTemplateCardRes
+
               if (this.isLiteCard(entryRawRequest)) {
-                handledTemplateCardRes = postHandleLiteCardRes(templateRes)
+                templateRes = postHandleLiteCardRes(templateRes)
+              } else if (isCardMinVersion) {
+                // 快应用 2.0 标准的 JS 卡，输出 .template.json 和 .css.json
+                templateRes = postHandleJSCardRes(templateRes)
               } else {
-                handledTemplateCardRes = postHandleJSCardRes(templateRes)
+                // 非快应用 2.0 标准的 JS 卡，不输出 .template.json 和 .css.json
+                continue
               }
 
               // 用于修改 template 的 key 的 stringify 的顺序，type 放第一个，children 放最后一个
               let templateKeys = []
-              recordKeys(handledTemplateCardRes, templateKeys)
+              recordKeys(templateRes, templateKeys)
 
               templateKeys = [...new Set(templateKeys.sort())]
                 .filter(
@@ -85,15 +89,15 @@ class CardPlugin {
               templateKeys.unshift('type', 'template', 'data')
 
               // 自定义组件 template 抽取成独立 JSON —— 卡片不采用该方式
-              // Object.keys(handledTemplateCardRes).forEach((key) => {
-              //   const res = handledTemplateCardRes[key]
+              // Object.keys(templateRes).forEach((key) => {
+              //   const res = templateRes[key]
               //   const fileName = key === CARD_ENTRY ? templateFileName : `${key}.template.json`
               //   const templateJsonStr = JSON.stringify(res, templateKeys)
               //   compilation.assets[fileName] = new ConcatSource(templateJsonStr)
               // })
 
               // 处理 template
-              const templateJsonStr = JSON.stringify(handledTemplateCardRes, templateKeys)
+              const templateJsonStr = JSON.stringify(templateRes, templateKeys)
               compilation.assets[templateFileName] = new ConcatSource(templateJsonStr)
 
               // 处理 css
diff --git a/packages/hap-packager/src/webpack.post.js b/packages/hap-packager/src/webpack.post.js
index 5678dafa..904ff7b7 100644
--- a/packages/hap-packager/src/webpack.post.js
+++ b/packages/hap-packager/src/webpack.post.js
@@ -48,7 +48,8 @@ function postHook(webpackConf, defaultsOptions, quickappConfig = {}) {
     subpackages,
     workers,
     originType,
-    useTreeShaking
+    useTreeShaking,
+    isCardMinVersion
   } = defaultsOptions
 
   const manifestObj = readJson(path.join(pathSrc, 'manifest.json'))
@@ -125,10 +126,12 @@ function postHook(webpackConf, defaultsOptions, quickappConfig = {}) {
     )
   }
 
+  if (isCardMinVersion) {
+    // 如果工程中有卡片配置为快应用 2.0 卡片，则使用插件抽取 template 和 style 的 json
+    webpackConf.plugins.push(new CardScriptHandlePlugin({ pathSrc }), new RemoveModulesPlugin())
+  }
   webpackConf.plugins.push(
-    new CardScriptHandlePlugin({ pathSrc }),
-    new RemoveModulesPlugin(),
-    new CardPlugin({ pathSrc }),
+    new CardPlugin({ pathSrc, isCardMinVersion }),
     // 框架Handler包装
     new HandlerPlugin({
       pathSrc: pathSrc,
diff --git a/packages/hap-toolkit/src/gen-webpack-conf/index.js b/packages/hap-toolkit/src/gen-webpack-conf/index.js
index a5f77500..54c47056 100644
--- a/packages/hap-toolkit/src/gen-webpack-conf/index.js
+++ b/packages/hap-toolkit/src/gen-webpack-conf/index.js
@@ -23,7 +23,7 @@ import {
 import { name, postHook as packagerPostHook } from '@hap-toolkit/packager'
 import { postHook as xvmPostHook } from '@hap-toolkit/dsl-xvm'
 import ManifestWatchPlugin from '../plugins/manifest-watch-plugin'
-import { resolveEntries } from '../utils'
+import { resolveEntries, resolveCardMinVersion } from '../utils'
 import getDevtool from './get-devtool'
 import {
   getConfigPath,
@@ -154,6 +154,8 @@ export default async function genWebpackConf(launchOptions, mode) {
   // 页面文件
   const entries = resolveEntries(manifest, SRC_DIR, cwd)
 
+  const isCardMinVersion = resolveCardMinVersion(manifest)
+
   // 环境变量
   const env = {
     // 平台：native
@@ -496,7 +498,8 @@ export default async function genWebpackConf(launchOptions, mode) {
         workers,
         cwd,
         originType: compileOptionsObject.originType,
-        ideConfig: launchOptions.ideConfig
+        ideConfig: launchOptions.ideConfig,
+        isCardMinVersion
       },
       quickappConfig
     )
diff --git a/packages/hap-toolkit/src/utils.js b/packages/hap-toolkit/src/utils.js
index 52316b38..33c850fb 100644
--- a/packages/hap-toolkit/src/utils.js
+++ b/packages/hap-toolkit/src/utils.js
@@ -126,3 +126,28 @@ export function resolveEntries(manifest, basedir, cwd) {
   }
   return entries
 }
+export function resolveCardMinVersion(manifest) {
+  if (!manifest.router) {
+    throw Error('manifest.json 中未配置路由！')
+  }
+  let isCardMinVersion = false
+  // 卡片配置
+  const widgetsConf = manifest.router.widgets || {}
+
+  for (let key in widgetsConf) {
+    if (!widgetsConf[key].type || widgetsConf[key].type === 'js') {
+      // 针对 JS 卡的兼容
+      if (widgetsConf[key].minCardPlatformVersion) {
+        // 任意有一个 JS 卡写了 minCardPlatformVersion 字段
+        isCardMinVersion = true
+      } else {
+        // 没有 JS 卡写 minCardPlatformVersion 字段，说明是旧的 JS 卡片包
+        if (!widgetsConf[key].minPlatformVersion) {
+          // 同时没有写 minPlatformVersion 字段，提示补齐 minCardPlatformVersion
+          throw new Error(`manifest.json 中 widgets 必须包含 minCardPlatformVersion 字段`)
+        }
+      }
+    }
+  }
+  return isCardMinVersion
+}