@tarojs/plugin-platform-harmony-ets 4.0.0-beta.16 → 4.0.0-beta.18

package/dist/components-harmony-ets/swiper.ets

@@ -45,23 +45,25 @@ export default struct TaroSwiper {
   @ObjectLink node: TaroSwiperElement
 
   build () {
-    Swiper(this.node.controller) {
-      createLazyChildren(this.node)
+    if (this.node.hmStyle?.display !== 'none') {
+      Swiper(this.node.controller) {
+        createLazyChildren(this.node)
+      }
+        .attributeModifier(commonStyleModify.setNode(this.node))
+        .swiperAttr(getSwiperAttributes(this.node))
+        .indicatorStyle({
+          color: this.node.getAttribute('indicatorColor'),
+          selectedColor:  this.node.getAttribute('indicatorActiveColor')
+        })
+        .onChange((index: number) => {
+          const event: TaroEvent = createTaroEvent('change', { detail: { current: index } }, this.node)
+          eventHandler(event, 'change', this.node)
+        })
+        .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+        .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+          this.node._nodeInfo.areaInfo = res[1]
+        }))
+        .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
     }
-      .attributeModifier(commonStyleModify.setNode(this.node))
-      .swiperAttr(getSwiperAttributes(this.node))
-      .indicatorStyle({
-        color: this.node.getAttribute('indicatorColor'),
-        selectedColor:  this.node.getAttribute('indicatorActiveColor')
-      })
-      .onChange((index: number) => {
-        const event: TaroEvent = createTaroEvent('change', { detail: { current: index } }, this.node)
-        eventHandler(event, 'change', this.node)
-      })
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-        this.node._nodeInfo.areaInfo = res[1]
-      }))
-      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
   }
 }

package/dist/components-harmony-ets/switch.ets

@@ -38,7 +38,7 @@ export default struct TaroSwitch {
   }
 
   build () {
-    if (this.node) {
+    if (this.node && this.node.hmStyle?.display !== 'none') {
       Toggle({
         type: this.node._attrs.type !== 'checkbox' ? ToggleType.Switch : ToggleType.Checkbox,
         isOn: this.node.checked,

package/dist/components-harmony-ets/text.ets

@@ -60,15 +60,17 @@ export default struct TaroText {
         }
       }
     } else {
-      Text(this.node.textContent)
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-      .attributeModifier(commonStyleModify.setNode(this.node))
-      .textNormalFontStyle(getNormalAttributes(this.node))
-      .textSpecialFontStyle(getFontAttributes(this.node))
-      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-        this.node._nodeInfo.areaInfo = res[1]
-      }))
+      if (this.node.hmStyle?.display !== 'none') {
+        Text(this.node.textContent)
+        .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+        .attributeModifier(commonStyleModify.setNode(this.node))
+        .textNormalFontStyle(getNormalAttributes(this.node))
+        .textSpecialFontStyle(getFontAttributes(this.node))
+        .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+        .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+          this.node._nodeInfo.areaInfo = res[1]
+        }))
+      }
     }
   }
 }

package/dist/components-harmony-ets/textArea.ets

@@ -45,7 +45,7 @@ export default struct TaroTextArea {
   }
 
   build () {
-    if (this.node) {
+    if (this.node && this.node.hmStyle?.display !== 'none') {
       TextArea({ text: this.value, placeholder: this.node._attrs?.placeholder || '', controller: this.node.controller })
         .key(this.node._nid)
         .maxLength(Number(this.node._attrs?.maxlength) || null)

package/dist/components-harmony-ets/utils/DynamicCenter.ts

@@ -36,4 +36,4 @@ export class DynamicCenter {
       this.bindComponentToNodeWithDFS(node.childNodes[i] as TaroElement, component)
     }
   }
-}
+}

package/dist/components-harmony-ets/utils/htmlParser/HarmonyHTMLParser.ts

@@ -99,5 +99,4 @@ function parseTag(htmlString, startIndex) {
   return tag
 }
 
-
-export default parseHTML
+export default parseHTML

package/dist/components-harmony-ets/utils/index.ts

@@ -1,6 +1,9 @@
 import { convertNumber2VP } from '@tarojs/runtime'
 import { isNumber } from '@tarojs/shared'
 
+import type { RichTextProps } from '@tarojs/components/types/RichText'
+import type { TaroRichTextElement } from '@tarojs/runtime'
+
 export function getSingleSelector(range, rangeKey): any[] {
   return range.map((data) => data[rangeKey])
 }
@@ -81,3 +84,26 @@ export function getNodeMarginOrPaddingData (dataValue: string) {
     }
   })
 }
+
+export function generateText (node: TaroRichTextElement): string {
+  return parseHtmlNode(node._attrs.nodes || '')
+}
+
+// 将nodeTree转换成harmony需要的string结构
+function nodeToHtml(node: RichTextProps.Text | RichTextProps.HTMLElement): string {
+  if (node.type === 'text') {
+    return node.text;
+  }
+  if (node.attrs) {
+    const attributes = Object.entries(node.attrs)
+      .map((item: [string, string]) => `${item[0]}="${item[1]}"`)
+      .join(' ');
+    const childrenHtml: string = typeof node.children === 'string' ? node.children : (node.children || []).map((child: RichTextProps.Text | RichTextProps.HTMLElement) => nodeToHtml(child)).join('');
+    return `<${node.name}${attributes ? ' ' + attributes : ''}>${childrenHtml}</${node.name}>`;
+  }
+  return ''
+}
+
+function parseHtmlNode (nodes: Array<RichTextProps.Text | RichTextProps.HTMLElement> | string) {
+  return typeof nodes === 'string' ? nodes: `<div>${nodes.map(node => nodeToHtml(node)).join('')}</div>`
+}

package/dist/components-harmony-ets/video.ets

@@ -83,7 +83,8 @@ export default struct TaroVideo {
   @ObjectLink node: TaroVideoElement
 
   build () {
-    Video(getVideoData(this.node))
+    if (this.node.hmStyle?.display !== 'none') {
+      Video(getVideoData(this.node))
       .attributeModifier(commonStyleModify.setNode(this.node))
       .props(getVideoProps(this.node))
       .aspectRatio(4 / 3)
@@ -102,6 +103,7 @@ export default struct TaroVideo {
         this.node._nodeInfo.areaInfo = res[1]
       }))
       .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+    }
   }
 
 }

package/dist/components-harmony-ets/view.ets

@@ -33,34 +33,36 @@ export default struct TaroView {
   @ObjectLink node: TaroViewElement
 
   build () {
-    if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
-      Row() {
-        PseduoChildren(this.node)
+    if (this.node.hmStyle?.display !== 'none') {
+      if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
+        Row() {
+          PseduoChildren(this.node)
+        }
+        .attributeModifier(commonStyleModify.setNode(this.node))
+        .rowAttrs(getNormalAttributes(this.node))
+        .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+        .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
+        .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+          this.node._nodeInfo.areaInfo = res[1]
+        }))
+        .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+        .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
+        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+      } else {
+        Column() {
+          PseduoChildren(this.node)
+        }
+        .attributeModifier(commonStyleModify.setNode(this.node))
+        .columnAttrs(getNormalAttributes(this.node))
+        .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+        .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
+        .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+          this.node._nodeInfo.areaInfo = res[1]
+        }))
+        .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+        .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
+        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
       }
-      .attributeModifier(commonStyleModify.setNode(this.node))
-      .rowAttrs(getNormalAttributes(this.node))
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-      .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
-      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-        this.node._nodeInfo.areaInfo = res[1]
-      }))
-      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-      .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
-      .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
-    } else {
-      Column() {
-        PseduoChildren(this.node)
-      }
-      .attributeModifier(commonStyleModify.setNode(this.node))
-      .columnAttrs(getNormalAttributes(this.node))
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-      .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
-      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-        this.node._nodeInfo.areaInfo = res[1]
-      }))
-      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-      .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
-      .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
     }
   }
 }

package/dist/components-harmony-ets/webView.ets

@@ -1,9 +1,9 @@
 import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
 import commonStyleModify from './style'
-import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroAny, TaroWebViewElement, TaroStyleType, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroWebViewElement, TaroEvent } from '@tarojs/runtime'
 
 interface IPageLoad {
   url: string
@@ -19,37 +19,38 @@ export default struct TaroWebView {
   @ObjectLink node: TaroWebViewElement
 
   build () {
-    Web({ src: this.node._attrs.src, controller: this.node.controller })
-      .attributeModifier(commonStyleModify.setNode(this.node))
-      .onPageEnd((e: IPageLoad) => {
-        // 1. 创建消息端口
-        this.node.ports = this.node.controller.createWebMessagePorts(true)
-        // 2. 发送端口1到HTML5
-        this.node.controller.postMessage('init_web_messageport', [this.node.ports[1]], '*');
-        // 3. 保存端口0到本地
-        this.node.nativePort = this.node.ports[0]
-        // 4. 设置回调函数
-        this.node.nativePort.onMessageEventExt((result) => {
-          const message = this.node.handleMessageFromWeb(result)
-          const messageEvent: TaroEvent = createTaroEvent('message', { detail: { data: message } }, this.node)
-
-          eventHandler(messageEvent, 'message', this.node)
+    if (this.node.hmStyle?.display !== 'none') {
+      Web({ src: this.node._attrs.src, controller: this.node.controller })
+        .attributeModifier(commonStyleModify.setNode(this.node))
+        .onPageEnd((e: IPageLoad) => {
+          // 1. 创建消息端口
+          this.node.ports = this.node.controller.createWebMessagePorts(true)
+          // 2. 发送端口1到HTML5
+          this.node.controller.postMessage('init_web_messageport', [this.node.ports[1]], '*');
+          // 3. 保存端口0到本地
+          this.node.nativePort = this.node.ports[0]
+          // 4. 设置回调函数
+          this.node.nativePort.onMessageEventExt((result) => {
+            const message = this.node.handleMessageFromWeb(result)
+            const messageEvent: TaroEvent = createTaroEvent('message', { detail: { data: message } }, this.node)
+
+            eventHandler(messageEvent, 'message', this.node)
+          })
+
+          const onLoadEvent: TaroEvent = createTaroEvent('load', { detail: { src: this.node._attrs.src } }, this.node)
+
+          eventHandler(onLoadEvent, 'load', this.node)
         })
-
-        const onLoadEvent: TaroEvent = createTaroEvent('load', { detail: { src: this.node._attrs.src } }, this.node)
-
-        eventHandler(onLoadEvent, 'load', this.node)
-      })
-      .onErrorReceive(shouldBindEvent((e: IError) => {
-        const event: TaroEvent = createTaroEvent('error', { detail: { url: this.node._attrs.src, fullUrl: e.request.getRequestUrl() } }, this.node)
-        
-        eventHandler(event, 'error', this.node)
-      }, this.node, ['error']))
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-        this.node._nodeInfo.areaInfo = res[1]
-      }))
-      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-  
+        .onErrorReceive(shouldBindEvent((e: IError) => {
+          const event: TaroEvent = createTaroEvent('error', { detail: { url: this.node._attrs.src, fullUrl: e.request.getRequestUrl() } }, this.node)
+          
+          eventHandler(event, 'error', this.node)
+        }, this.node, ['error']))
+        .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+        .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+          this.node._nodeInfo.areaInfo = res[1]
+        }))
+        .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+    }
   }
 }

package/dist/index.d.ts

@@ -0,0 +1,149 @@
+/* eslint-disable no-console */
+import { IFileType, TConfig, TaroPlatform, IPluginContext, TaroPlatformBase } from "@tarojs/service";
+import { PLATFORM_TYPE } from "@tarojs/shared";
+declare abstract class TaroPlatformHarmony<T extends TConfig = TConfig> extends TaroPlatform<T> {
+    platformType: PLATFORM_TYPE;
+    globalObject: string;
+    abstract fileType: IFileType;
+    abstract useETS: boolean;
+    abstract useJSON5: boolean;
+    taroComponentsPath: string;
+    /**
+     * 1. 清空 dist 文件夹
+     * 2. 输出编译提示
+     */
+    private setup;
+    private setupHarmonyApp;
+    protected printDevelopmentTip(): void;
+    /**
+     * 返回当前项目内的 runner 包
+     */
+    protected getRunner(): Promise<any>;
+    /**
+     * 准备 runner 参数
+     * @param extraOptions 需要额外合入 Options 的配置项
+     */
+    protected getOptions(extraOptions?: {}): any;
+    /**
+     * 调用 runner 开始编译
+     * @param extraOptions 需要额外传入 runner 的配置项
+     */
+    private build;
+    private buildHarmonyApp;
+    /**
+     * 调用 runner 开启编译
+     */
+    start(): Promise<void>;
+}
+declare class Harmony extends TaroPlatformHarmony {
+    #private;
+    platform: string;
+    globalObject: string;
+    fileType: {
+        templ: string;
+        style: string;
+        config: string;
+        script: string;
+    };
+    useETS: boolean;
+    useJSON5: boolean;
+    runtimePath: string[] | string;
+    taroComponentsPath: string;
+    constructor(ctx: IPluginContext, config: TConfig);
+    get framework(): "vue3" | "react" | "preact" | "nerv" | "vue";
+    get aliasFramework(): string;
+    get apiLibrary(): string;
+    get componentLibrary(): string;
+    get runtimeLibrary(): string;
+    get runtimeFrameworkLibrary(): string;
+    get defineConstants(): Record<string, string> | undefined;
+    extensions: string[];
+    excludeLibraries: (string | RegExp)[];
+    externalDeps: [
+        string,
+        RegExp,
+        string?
+    ][];
+    indexOfLibraries(lib: string): number;
+    removeFromLibraries(lib: string): void;
+    moveLibraries(lib: string, target?: string, basedir?: string, sync?: boolean): void;
+    replaceDefineValue(code: string, define: Record<string, string>): string;
+    /**
+     * 修改 Vite 配置
+     */
+    modifyViteConfig(): void;
+    handleResourceEmit(outDir: string, basedir?: string): void;
+}
+declare module HarmonyWrapper {
+    export { Harmony };
+}
+import HarmonyOS_ArkTS = HarmonyWrapper.Harmony;
+declare class Harmony$0 extends TaroPlatformBase {
+    platform: string;
+    globalObject: string;
+    runtimePath: string;
+    taroComponentsPath: string;
+    fileType: {
+        templ: string;
+        style: string;
+        config: string;
+        script: string;
+    };
+    template: any;
+    /**
+     * 1. setupTransaction - init
+     * 2. setup
+     * 3. setupTransaction - close
+     * 4. buildTransaction - init
+     * 5. build
+     * 6. buildTransaction - close
+     */
+    constructor(ctx: any, config: any);
+    /**
+     * 增加组件或修改组件属性
+     */
+    modifyComponents(): void;
+    /**
+     * 不需要转 rpx
+     */
+    modifyPostcssConfigs(config: Record<string, any>): void;
+    /**
+     * 模板自定义组件 js
+     * 等鸿蒙支持 template 后需要重构
+     */
+    addEntry(): void;
+    /**
+     * 把 app、pages、自定义组件的 js 改造为鸿蒙的 export default 导出形式
+     */
+    modifyTaroExport(): void;
+    /**
+     * 修改最终的编译产物
+     * 1. 生成模板自定义组件的 xml、css 文件
+     * 2. 删除多余的文件
+     * 3. 把 components-harmony 中被使用到的组件移动到输出目录
+     */
+    modifyBuildAssets(ctx: any, config: any): void;
+    modifyWebpackConfig(): void;
+    modifyHarmonyConfig(pages: any, { projectPath, hapName, name }: {
+        projectPath: any;
+        hapName: any;
+        name: any;
+    }): void;
+    modifyHostPackage({ projectPath, hapName }: {
+        projectPath: any;
+        hapName?: string | undefined;
+    }): Promise<any>;
+    getChunkEntryModule(compilation: any, chunk: any, compiler?: string): any;
+    checkMetaType(entryModule: any): boolean;
+    isHarmonyRequest(request: string): boolean;
+}
+declare module HarmonyWrapper {
+    export { Harmony$0 as Harmony };
+}
+import HarmonyOS_JSUI = HarmonyWrapper.Harmony;
+interface IOptions {
+    disableArkTS?: boolean;
+    useConfigName?: string;
+}
+declare const _default: (ctx: IPluginContext, options?: IOptions) => void;
+export { _default as default, HarmonyOS_ArkTS, HarmonyOS_JSUI, IOptions };

package/dist/index.js

@@ -248,7 +248,7 @@ class TaroPlatformHarmony extends service.TaroPlatform {
                 SUPPORT_TARO_POLYFILL: 'disabled',
             },
         });
-        return Object.assign(Object.assign(Object.assign({}, config), { buildAdapter: config.platform, fileType: this.fileType, platformType: this.platformType, useETS: this.useETS, useJSON5: this.useJSON5 }), extraOptions);
+        return Object.assign(Object.assign(Object.assign({}, config), { buildAdapter: config.platform, fileType: this.fileType, platformType: this.platformType, useETS: this.useETS, useNesting: config.useNesting, useJSON5: this.useJSON5 }), extraOptions);
     }
     /**
      * 调用 runner 开始编译
@@ -502,6 +502,11 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                 if (['.ts'].includes(ext)) {
                     code = '// @ts-nocheck\n' + code;
                 }
+                // 处理嵌套样式的编译，需要针对ReactElement进行props操作，dev模式下会Object.freeze，所以需要在开发模式下注入Object.freeze来覆盖解锁
+                // 处理的方法再taro-platform-harmony/src/runtime-ets/dom/cssNesting: ele.props.style = declaration
+                if (/react\/jsx-runtime/.test(lib) && process.env.NODE_ENV === 'development') {
+                    code = 'Object.freeze = (obj) => obj \n' + code;
+                }
             }
             // Note: 传入 chorePackagePrefix 时，不生成核心依赖库
             if (!chorePackagePrefix) {