增加轻卡data属性中honor特有字段 (#136)

* 增加轻卡honor特有字段

* 修改App属性为全小写

---------

Co-authored-by: z00029491 <[email protected]>

Author: zhushuaiCUMT

packages/hap-dsl-xvm/src/loaders/command-loader.js

@@ -0,0 +1,13 @@
+ /* Copyright (c) 2024-present, the hapjs-platform Project Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export default function commandLoader(source) {
+  let jsonObj = {}
+  try {
+    const obj = JSON.parse(source)
+    jsonObj = obj.commands || {}
+  } catch (e) {
+    throw new Error(`${this.resourcePath} 中的 <data> 解析失败，请检查是否为标准的 JSON 格式\n${e}`)
+  }
+  return `module.exports = ${JSON.stringify(jsonObj)}`
+}

packages/hap-dsl-xvm/src/loaders/common/utils.js

@@ -248,5 +248,9 @@ export const FRAG_TYPE = {
   SCRIPT: 'script',
   DATA: 'data',
   ACTIONS: 'actions',
-  PROPS: 'props'
+  PROPS: 'props',
+  // honor frag
+  DATAPP: 'app',
+  COMMANDS: 'commands'
+  // end honor frag
 }

packages/hap-dsl-xvm/src/loaders/datapp-loader.js

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2024-present, the hapjs-platform Project Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export default function dataAppLoader(source) {
+  let jsonObj = {}
+  try {
+    const obj = JSON.parse(source)
+    jsonObj = obj.app || {}
+  } catch (e) {
+    throw new Error(`${this.resourcePath} 中的 <data> 解析失败，请检查是否为标准的 JSON 格式\n${e}`)
+  }
+  return `module.exports = ${JSON.stringify(jsonObj)}`
+}

packages/hap-dsl-xvm/src/loaders/ux-fragment-utils.js

@@ -41,7 +41,11 @@ const defaultLoaders = {
   mainfest: resolveSync('@hap-toolkit/packager/lib/loaders/manifest-loader.js'),
   // page
   access: resolveSync('./access-loader.js'),
-  'extract-css': resolveSync('./extract-css-loader.js')
+  'extract-css': resolveSync('./extract-css-loader.js'),
+  // honor loader
+  datapp: resolveSync('./datapp-loader.js'),
+  command: resolveSync('./command-loader.js'),
+  // end honor loader
 }
 
 /**
@@ -119,6 +123,40 @@ function makeLoaderString(type, config, newJSCard, uxType) {
     return stringifyLoaders(loaders)
   }
 
+  // honor loader
+  if (type === FRAG_TYPE.DATAPP) {
+    loaders = [
+      {
+        name: defaultLoaders.datapp
+      },
+      {
+        name: defaultLoaders.fragment,
+        query: {
+          index: 0,
+          type: FRAG_TYPE.DATA
+        }
+      }
+    ]
+    return stringifyLoaders(loaders)
+  }
+
+  if (type === FRAG_TYPE.COMMANDS) {
+    loaders = [
+      {
+        name: defaultLoaders.command
+      },
+      {
+        name: defaultLoaders.fragment,
+        query: {
+          index: 0,
+          type: FRAG_TYPE.DATA
+        }
+      }
+    ]
+    return stringifyLoaders(loaders)
+  }
+  // end honor loader
+
   if (type === FRAG_TYPE.PROPS) {
     loaders = [
       {
@@ -543,6 +581,60 @@ function processPropsFrag($loader, datas, uxType) {
   return code
 }
 
+/**
+ * 处理轻卡<data>片段中app(only honor)
+ * @param $loader
+ * @param scripts
+ * @param uxType
+ * @returns {string}
+ */
+function processDataAppFrag($loader, datas, uxType) {
+  let code = 'null'
+  if (datas.length) {
+    // 有且仅有一个<data>节点
+    const data = datas[0]
+    // 文件绝对路径
+    let src = $loader.resourcePath
+    const fragAttrsSrc = data.attrs.src
+    if (fragAttrsSrc) {
+      src = fragAttrsSrc
+    }
+    code = makeRequireString(
+      $loader,
+      makeLoaderString(FRAG_TYPE.DATAPP, {}, true, uxType),
+      `${src}?index=0&lite=1`
+    )
+  }
+  return code
+}
+
+/**
+ * 处理轻卡<data>片段中command(only honor)
+ * @param $loader
+ * @param scripts
+ * @param uxType
+ * @returns {string}
+ */
+function processCommandFrag($loader, datas, uxType) {
+  let code = 'null'
+  if (datas.length) {
+    // 有且仅有一个<data>节点
+    const data = datas[0]
+    // 文件绝对路径
+    let src = $loader.resourcePath
+    const fragAttrsSrc = data.attrs.src
+    if (fragAttrsSrc) {
+      src = fragAttrsSrc
+    }
+    code = makeRequireString(
+      $loader,
+      makeLoaderString(FRAG_TYPE.COMMANDS, {}, true, uxType),
+      `${src}?index=0&lite=1`
+    )
+  }
+  return code
+}
+
 /**
  * 统一解析全部后处理
  * @param $loader
@@ -591,5 +683,9 @@ export {
   processDataFrag,
   processActionFrag,
   processPropsFrag,
-  parseImportList
+  parseImportList,
+  // honor process frag
+  processDataAppFrag,
+  processCommandFrag,
+  // end honor process frag
 }

packages/hap-dsl-xvm/src/loaders/ux-loader.js

@@ -16,7 +16,11 @@ import {
   processDataFrag,
   processActionFrag,
   processPropsFrag,
-  parseImportList
+  parseImportList,
+  // honor process frag
+  processCommandFrag,
+  processDataAppFrag
+  // end honor process frag
 } from './ux-fragment-utils'
 import { getNameByPath, print, isUXRender, FRAG_TYPE } from './common/utils'
 
@@ -96,6 +100,20 @@ function assemble($loader, frags, name, queryOptions) {
       uxType,
       FRAG_TYPE.PROPS
     )}\n`
+    // process honor frag
+    content += `    $app_module$.exports.app = ${processDataAppFrag(
+      $loader,
+      frags.data,
+      uxType,
+      FRAG_TYPE.APP
+    )}\n`
+    content += `    $app_module$.exports.commands = ${processCommandFrag(
+      $loader,
+      frags.data,
+      uxType,
+      FRAG_TYPE.COMMANDS
+    )}\n`
+    // end process honor frag
     content += `    $app_data$($app_module$, $app_require$)\n`
   }
   content +=

packages/hap-packager/src/common/constant.js

@@ -74,7 +74,17 @@ const LOADER_INFO_LIST = [
   {
     path: '/props-loader.js',
     type: 'props'
+  },
+  // honor loader
+  {
+    path: '/datapp-loader.js',
+    type: 'app'
+  },
+  {
+    path: '/command-loader.js',
+    type: 'commands'
   }
+  // end honor loader
 ]
 
 export {