fix: add rpk in watch mode and add validator for some csses and prope… (#115)

* fix: add rpk when in watch mode

Signed-off-by: lilei946 <[email protected]>

* feat: add validator for some csses and properties

Signed-off-by: lilei946 <[email protected]>

---------

Signed-off-by: lilei946 <[email protected]>

Author: lilei946

packages/hap-compiler/src/style/validator.js

@@ -579,6 +579,26 @@ const validator = {
       }
     }
   },
+  maxLength: function (v, units, defaultValueIfNotSupported) {
+    v = (v || '').toString().trim()
+    if (v === 'none') {
+      return {
+        value: v
+      }
+    } else {
+      return validator.length(v, units, defaultValueIfNotSupported)
+    }
+  },
+  minLength: function (v, units, defaultValueIfNotSupported) {
+    v = (v || '').toString().trim()
+    if (v === 'auto') {
+      return {
+        value: v
+      }
+    } else {
+      return validator.length(v, units, defaultValueIfNotSupported)
+    }
+  },
   /**
    * 颜色值校验, 支持 rgb, rgba, #fff, #ffffff, named-color #f0ff #ff00ff00
    * @param v
@@ -2418,6 +2438,16 @@ const validator = {
           )
         }
       }
+  },
+  letterSpacing: function (v, units, defaultValueIfNotSupported) {
+    v = (v || '').toString().trim()
+    if (v === 'normal') {
+      return {
+        value: v
+      }
+    } else {
+      return validator.length(v, units, defaultValueIfNotSupported)
+    }
   }
 }
 
@@ -2517,10 +2547,10 @@ const validatorMap = {
   transitionTimingFunction: validateTimingFunction,
   width: validator.length,
   height: validator.length,
-  minHeight: validator.length,
-  minWidth: validator.length,
-  maxHeight: validator.length,
-  maxWidth: validator.length,
+  minHeight: validator.minLength,
+  minWidth: validator.minLength,
+  maxHeight: validator.maxLength,
+  maxWidth: validator.maxLength,
   padding: makeAbbrAttrValidator('arraylength', [
     'paddingTop',
     'paddingRight',
@@ -2684,7 +2714,8 @@ const validatorMap = {
   themeThumbColor: makeEnumValidator(themeColors),
   themeTrackColor: makeEnumValidator(themeColors),
   themeSelectColor: makeEnumValidator(themeColors),
-  themeBlockColor: makeEnumValidator(themeColors)
+  themeBlockColor: makeEnumValidator(themeColors),
+  letterSpacing: validator.letterSpacing
 }
 
 /**

packages/hap-compiler/src/template/validator.js

@@ -91,6 +91,9 @@ const tagCommon = {
     },
     descendantfocusability: {
       enum: ['before', 'after', 'block']
+    },
+    overflow: {
+      enum: ['visible', 'hidden']
     }
   },
   children: ['block', 'slot', 'component'], // 通用控制组件

packages/hap-packager/src/process/index.js

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { colorconsole } from '@hap-toolkit/shared-utils'
+import { colorconsole, isNeedFullPackage } from '@hap-toolkit/shared-utils'
 
 import { SINGLE_PKG_SIZE, FULL_PKG_SIZE } from '../common/constant'
 
@@ -55,12 +55,12 @@ async function buildDebugModeProjectAndOutput(
   disableStreamPack
 ) {
   const { privatekey, certificate } = signConfig
-  const hasSubPackages = subPackages.length
+  const needFullPackage = isNeedFullPackage()
 
   let fullPackageBuffer
 
   // Step1. 生成整包rpk
-  if (!hasSubPackages) {
+  if (needFullPackage) {
     fullPackageBuffer = await createAndSignBuffer(fullPackage, privatekey, certificate)
   }
 
@@ -73,7 +73,7 @@ async function buildDebugModeProjectAndOutput(
 
   // Step3. 默认携带META，如果禁用流失打包，需要删除META
   if (disableStreamPack) {
-    if (!hasSubPackages) {
+    if (needFullPackage) {
       fullPackageBuffer = await removeMetaForRpkOrRpksFile(fullPackageBuffer)
     }
     subPackageBuffers = await Promise.all(subPackageBuffers.map(removeMetaForRpkOrRpksFile))

packages/hap-packager/src/router/routes.js

@@ -10,11 +10,11 @@ import moment from 'moment'
 
 import {
   colorconsole,
-  readJson,
   relateCwd,
   globalConfig,
   recordClient,
-  getRecordClient
+  getRecordClient,
+  isNeedFullPackage
 } from '@hap-toolkit/shared-utils'
 
 import {
@@ -64,26 +64,13 @@ async function bundle(context, next) {
     const projectName = projectInfo.projectName
     const projectVersion = projectInfo.projectVersion
     const platformVersion = context.request.query.platformVersion
-    let useAppRpk = false
-    // 应用模式下
+    let useFullPackage = false
+    // 调试器选择应用模式下
     if (parseInt(context.request.query.mode || 0) === 0) {
-      // 读取 manifest
-      let manifest
-      try {
-        manifest = readJson(path.join(projectPath, './src/manifest.json'))
-      } catch (err) {
-        manifest = null
-      }
-      // 不存在分包
-      if (manifest && manifest.router && (!manifest.subpackages || manifest.subpackages.length === 0)) {
-        // 存在卡片
-        if (manifest.router.widgets && Object.keys(manifest.router.widgets).length > 0) {
-          useAppRpk = true
-        }
-      }
+      useFullPackage = isNeedFullPackage(projectPath)
     }
-    
-    if (platformVersion && platformVersion >= RPKS_SUPPORT_VERSION_FROM && !useAppRpk) {
+
+    if (platformVersion && platformVersion >= RPKS_SUPPORT_VERSION_FROM && !useFullPackage) {
       distFile = getDistFilePath(projectDist, projectName, projectVersion, 'rpks')
     }
     if (!distFile) {

packages/hap-shared-utils/src/index.js

@@ -435,3 +435,28 @@ function getHash(compPath) {
   }
   return res
 }
+
+export function isNeedFullPackage() {
+  // 读取 manifest
+  let manifest
+  let needFullPackage = false
+  try {
+    manifest = readJson(path.join(globalConfig.projectPath, './src/manifest.json'))
+  } catch (err) {
+    manifest = null
+  }
+  // 快应用项目，不存在分包
+  if (
+    manifest &&
+    manifest.router &&
+    manifest.router.pages &&
+    manifest.router.pages.length > 0 &&
+    (!manifest.subpackages || manifest.subpackages.length === 0)
+  ) {
+    // 存在卡片
+    if (manifest.router.widgets && Object.keys(manifest.router.widgets).length > 0) {
+      needFullPackage = true
+    }
+  }
+  return needFullPackage
+}