@tarojs/plugin-platform-harmony-ets 4.0.0-beta.2 → 4.0.0-beta.21

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

@@ -1,169 +1,56 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 
-import { createLazyChildren } from './render'
+import { rowModify, columnModify } from './style'
+import PseduoChildren from './pseudo'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { FlexManager } from './utils/FlexManager'
-import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
+import { FlexManager } from './utils/flexManager'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroViewElement, TaroAny, TaroStyleType } from '@tarojs/runtime'
+import type { TaroViewElement, TaroAny } from '@tarojs/runtime'
 
-@Extend(Column)
-function columnAttrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .padding({
-    top: style.paddingTop,
-    right: style.paddingRight,
-    bottom: style.paddingBottom,
-    left: style.paddingLeft
-  })
-  .margin({
-    top: style.marginTop,
-    right: style.marginRight,
-    bottom: style.marginBottom,
-    left: style.marginLeft
-  })
-  .width(style.width)
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundSize)
-  .backgroundImagePosition(style.backgroundPosition)
-  .borderStyle({
-    top: style.borderTopStyle,
-    right: style.borderRightStyle,
-    bottom: style.borderBottomStyle,
-    left: style.borderLeftStyle
-  })
-  .borderWidth({
-    top: style.borderTopWidth,
-    right: style.borderRightWidth,
-    bottom: style.borderBottomWidth,
-    left: style.borderLeftWidth
-  })
-  .borderColor({
-    top: style.borderTopColor,
-    right: style.borderRightColor,
-    bottom: style.borderBottomColor,
-    left: style.borderLeftColor
-  })
-  .borderRadius({
-    topLeft: style.borderTopLeftRadius,
-    topRight: style.borderTopRightRadius,
-    bottomLeft: style.borderBottomLeftRadius,
-    bottomRight: style.borderBottomRightRadius
-  })
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .linearGradient(style.linearGradient)
-  .clip(style.overflow)
-  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
-  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
-  .transform(style.transform)
-}
-
-@Extend(Row)
-function rowAttrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .padding({
-    top: style.paddingTop,
-    right: style.paddingRight,
-    bottom: style.paddingBottom,
-    left: style.paddingLeft
-  })
-  .margin({
-    top: style.marginTop,
-    right: style.marginRight,
-    bottom: style.marginBottom,
-    left: style.marginLeft
-  })
-  .width(style.width)
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundSize)
-  .backgroundImagePosition(style.backgroundPosition)
-  .borderStyle({
-    top: style.borderTopStyle,
-    right: style.borderRightStyle,
-    bottom: style.borderBottomStyle,
-    left: style.borderLeftStyle
-  })
-  .borderWidth({
-    top: style.borderTopWidth,
-    right: style.borderRightWidth,
-    bottom: style.borderBottomWidth,
-    left: style.borderLeftWidth
-  })
-  .borderColor({
-    top: style.borderTopColor,
-    right: style.borderRightColor,
-    bottom: style.borderBottomColor,
-    left: style.borderLeftColor
-  })
-  .borderRadius({
-    topLeft: style.borderTopLeftRadius,
-    topRight: style.borderTopRightRadius,
-    bottomLeft: style.borderBottomLeftRadius,
-    bottomRight: style.borderBottomRightRadius
-  })
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .linearGradient(style.linearGradient)
-  .clip(style.overflow)
-  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
-  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
-  .transform(style.transform)
-}
+@Component
+export default struct TaroView {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroViewElement) => void = this.customBuilder
+  @ObjectLink node: TaroViewElement
 
-@Builder
-export default function TaroView (node: TaroViewElement) {
-  if (FlexManager.isFlexNode(node) && FlexManager.flexOptions(node).direction !== FlexDirection.Column) {
-    Row() {
-      createLazyChildren(node)
-    }
-    .rowAttrs(getNormalAttributes(node))
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
-    .alignItems(FlexManager.flexOptions(node).alignItems as VerticalAlign)
-    .justifyContent(FlexManager.flexOptions(node).justifyContent)
-  } else {
-    Column() {
-      createLazyChildren(node)
+  build () {
+    if (this.node.hmStyle?.display !== 'none') {
+      if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
+        Row() {
+          if (this.node._pseudo_before || this.node._pseudo_after) {
+            PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
+          } else {
+            this.createLazyChildren(this.node)
+          }
+        }
+        .attributeModifier(rowModify.setNode(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() {
+          if (this.node._pseudo_before || this.node._pseudo_after) {
+            PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
+          } else {
+            this.createLazyChildren(this.node)
+          }
+        }
+        .attributeModifier(columnModify.setNode(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)
+      }
     }
-    .columnAttrs(getNormalAttributes(node))
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
-    .alignItems(FlexManager.flexOptions(node).alignItems as HorizontalAlign)
-    .justifyContent(FlexManager.flexOptions(node).justifyContent)
   }
 }

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

@@ -1,8 +1,9 @@
 import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
+import commonStyleModify from './style'
+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
@@ -13,101 +14,45 @@ interface IError {
   error: WebResourceError
 }
 
-@Extend(Web)
-function attrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .padding({
-    top: style.paddingTop,
-    right: style.paddingRight,
-    bottom: style.paddingBottom,
-    left: style.paddingLeft
-  })
-  .margin({
-    top: style.marginTop,
-    right: style.marginRight,
-    bottom: style.marginBottom,
-    left: style.marginLeft
-  })
-  .width(style.width)
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundSize)
-  .backgroundImagePosition(style.backgroundPosition)
-  .borderStyle({
-    top: style.borderTopStyle,
-    right: style.borderRightStyle,
-    bottom: style.borderBottomStyle,
-    left: style.borderLeftStyle
-  })
-  .borderWidth({
-    top: style.borderTopWidth,
-    right: style.borderRightWidth,
-    bottom: style.borderBottomWidth,
-    left: style.borderLeftWidth
-  })
-  .borderColor({
-    top: style.borderTopColor,
-    right: style.borderRightColor,
-    bottom: style.borderBottomColor,
-    left: style.borderLeftColor
-  })
-  .borderRadius({
-    topLeft: style.borderTopLeftRadius,
-    topRight: style.borderTopRightRadius,
-    bottomLeft: style.borderBottomLeftRadius,
-    bottomRight: style.borderBottomRightRadius
-  })
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .clip(style.overflow)
-  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
-  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
-  .transform(style.transform)
-}
-
-@Builder
-export default function TaroWebView (node: TaroWebViewElement) {
-  Web({ src: node._attrs.src, controller: node.controller })
-    .attrs(getNormalAttributes(node))
-    .onPageEnd((e: IPageLoad) => {
-      // 1. 创建消息端口
-      node.ports = node.controller.createWebMessagePorts(true)
-      // 2. 发送端口1到HTML5
-      node.controller.postMessage('init_web_messageport', [node.ports[1]], '*');
-      // 3. 保存端口0到本地
-      node.nativePort = node.ports[0]
-      // 4. 设置回调函数
-      node.nativePort.onMessageEventExt((result) => {
-        const message = node.handleMessageFromWeb(result)
-        const messageEvent: TaroEvent = createTaroEvent('message', { detail: { data: message } }, node)
-
-        eventHandler(messageEvent, 'message', node)
-      })
-
-      const onLoadEvent: TaroEvent = createTaroEvent('load', { detail: { src: node._attrs.src } }, node)
-
-      eventHandler(onLoadEvent, 'load', node)
-    })
-    .onErrorReceive(shouldBindEvent((e: IError) => {
-      const event: TaroEvent = createTaroEvent('error', { detail: { url: node._attrs.src, fullUrl: e.request.getRequestUrl() } }, node)
-      
-      eventHandler(event, 'error', node)
-    }, node, ['error']))
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+@Component
+export default struct TaroWebView {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroWebViewElement) => void = this.customBuilder
+  @ObjectLink node: TaroWebViewElement
+
+  build () {
+    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)
+        })
+        .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,151 @@
+/* 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 apiEntry(): RegExp[];
+    get componentLibrary(): string;
+    get runtimeLibrary(): string;
+    get runtimeFrameworkLibrary(): string;
+    get defineConstants(): Record<string, string> | undefined;
+    extensions: string[];
+    excludeLibraries: (string | RegExp)[];
+    externalDeps: [
+        string,
+        RegExp,
+        string?
+    ][];
+    harmonyScope: RegExp[];
+    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 };