@tarojs/plugin-platform-harmony-ets 4.0.0-alpha.43 → 4.0.0-alpha.45

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

@@ -1,6 +1,6 @@
 import commonStyleModify from './style'
 
-import type { TaroViewElement, TaroAny } from '@tarojs/runtime'
+import type { TaroAny, TaroViewElement } from '@tarojs/runtime'
 
 @Reusable
 @Component
@@ -22,10 +22,11 @@ export default struct TaroListView {
 
   build() {
     ListItem() {
-      Stack() {
+      Column() {
         this.createLazyChildren(this.node, 0)
       }
     }
     .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+    .zIndex(0)
   }
 }

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

@@ -1,9 +1,9 @@
-import type { TaroAny, TaroMovableAreaElement, TaroMovableViewElement } from '@tarojs/runtime'
 import { isTaroMovableViewElement } from '@tarojs/runtime'
 import commonStyleModify, { rowModify, columnModify } from './style'
 
 import { FlexManager } from './utils/flexManager'
-import { isUndefined } from '@tarojs/shared'
+
+import type { TaroAny, TaroMovableAreaElement } from '@tarojs/runtime'
 
 @Component
 export default struct TaroMovableArea {
@@ -123,4 +123,4 @@ function sizeChangeHandle(node: TaroMovableAreaElement, newValue: Area | SizeOpt
       }
     }
   })
-}
+}

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

@@ -1,4 +1,4 @@
-import { eventCenter } from '@tarojs/runtime/dist/runtime.esm'
+import { eventCenter } from '@tarojs/runtime'
 
 import { isTagFirstChild } from './utils/helper'
 

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

@@ -1,4 +1,4 @@
-import { APP, eventCenter } from '@tarojs/runtime/dist/runtime.esm'
+import { APP, eventCenter } from '@tarojs/runtime'
 import { getCurrentInstance, pageScrollTo } from '@tarojs/taro'
 
 import { isTagFirstChild } from './utils/helper'

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

@@ -1,7 +1,7 @@
 import { getFontAttributes } from './utils/helper'
 import { pseudoModify } from './style'
 
-import type { TaroViewElement, TaroStyleType, TaroTextStyleType, TaroAny } from '@tarojs/runtime'
+import type { TaroAny, TaroStyleType, TaroTextStyleType, TaroViewElement } from '@tarojs/runtime'
 
 @Extend(Flex)
 function flexAttrs (style: TaroStyleType) {

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

@@ -1,12 +1,11 @@
-import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
+import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
 import commonStyleModify, { rowModify, columnModify } from './style'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { FlexManager } from './utils/flexManager'
 import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import { TaroEvent, TaroAny, HarmonyType, TaroRadioGroupElement, TaroRadioElement } from '@tarojs/runtime'
-import { isUndefined } from '@tarojs/shared'
+import type { HarmonyType, TaroAny, TaroEvent, TaroRadioElement, TaroRadioGroupElement } from '@tarojs/runtime'
 
 interface RadioAttrs {
   radioStyle?: HarmonyType.RadioStyle

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

@@ -4,7 +4,7 @@ import commonStyleModify from './style'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroScrollViewElement, TaroAny, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroEvent, TaroScrollViewElement } from '@tarojs/runtime'
 
 interface ScrollViewAttrs {
   scrollBar: BarState
@@ -33,7 +33,12 @@ function getAttributes (node: TaroScrollViewElement): ScrollViewAttrs {
 }
 
 function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', scrollOffset?: number) {
+  if (!node || !node.scroller) return
+  
   const currentOffset = node.scroller.currentOffset() as ScrollViewCurrentOffset
+
+  if (!currentOffset) return
+
   const currentXOffset = currentOffset?.xOffset || 0
   const currentYOffset = currentOffset?.yOffset || 0
   const value: ScrollViewEvent = {
@@ -62,7 +67,7 @@ export default struct TaroScrollList {
     }
   }
 
-  handleScroll = (scrollOffset: number) => { 
+  handleScroll = (scrollOffset: number) => {
     handleScrollEvent(this.node, 'scroll', scrollOffset)
   }
 

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

@@ -6,7 +6,7 @@ import { FlexManager } from './utils/flexManager'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { getNodeThresholds, getStyleAttr, shouldBindEvent } from './utils/helper'
 
-import type { TaroAny, TaroScrollViewElement, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroEvent, TaroScrollViewElement } from '@tarojs/runtime'
 
 interface ScrollViewAttrs {
   scrollBar: BarState
@@ -41,7 +41,12 @@ function getScrollable (node: TaroScrollViewElement) {
 }
 
 function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', xOffset?: number, yOffset?: number) {
+  if (!node || !node.scroller) return
+  
   const currentOffset = node.scroller.currentOffset() as ScrollViewCurrentOffset
+  
+  if (!currentOffset) return
+  
   const currentXOffset = currentOffset.xOffset
   const currentYOffset = currentOffset.yOffset
   const value: ScrollViewEvent = {

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

@@ -3,7 +3,7 @@ import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBL
 import commonStyleModify from './style'
 import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroAny, TaroSliderElement, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroEvent, TaroSliderElement } from '@tarojs/runtime'
 
 interface SliderAttrs {
   selectedColor?: ResourceColor

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

@@ -1,4 +1,5 @@
 import commonStyleModify from './style'
+import TaroListView from './listView'
 
 import type { TaroViewElement, TaroElement, TaroAny } from '@tarojs/runtime'
 
@@ -32,10 +33,9 @@ export default struct TaroStickySection {
     }) {
       ForEach(this.node.children, (item: TaroElement) => {
         if (item.tagName === 'LIST-VIEW') {
-          this.createLazyChildren(item as TaroViewElement, 0)
+          TaroListView({ node: item as TaroAny, createLazyChildren: this.createLazyChildren }).reuseId(item._nid.toString())
         }
       }, (item: TaroElement) => `${item._nid}-${item._nodeInfo?.layer || 0}`)
-
     }
     .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
   }

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

@@ -1,4 +1,3 @@
-import type { TaroAny, HarmonyStyle, TaroElement, TaroStyleType, TaroTextElement }  from '@tarojs/runtime'
 import { ObjectAssign }  from '@tarojs/runtime'
 import { isUndefined } from '@tarojs/shared'
 import { computeBackgroundPosition, convertVp2Px } from './utils'
@@ -6,6 +5,8 @@ import { getNormalAttributes } from './utils/helper'
 import { isMaxWidthView } from './utils/styles'
 import { FlexManager } from './utils/flexManager'
 
+import type { HarmonyStyle, TaroAny, TaroElement, TaroStyleType, TaroTextElement }  from '@tarojs/runtime'
+
 class TextStyleModify implements AttributeModifier<TextAttribute> {
   initStyle?: TaroStyleType
   node: TaroTextElement | null = null
@@ -81,7 +82,7 @@ class CommonStyleModify implements AttributeModifier<CommonAttribute> {
     }
     return this
   }
-  
+
   setAnimationStyle (overwriteStyle: Record<string, TaroAny>) {
     this.overwriteStyle = overwriteStyle
     if (this.style && this.overwriteStyle && Object.keys(this.overwriteStyle).length) {
@@ -248,9 +249,9 @@ export function setNormalAttributeIntoInstance(instance: CommonAttribute, style:
     instance.key(style.id)
   }
   if (!isUndefined(style.display) || !isUndefined(style.visibility)) {
-    instance.visibility(style.display === 'none' 
-      ? Visibility.None : 
-      !isUndefined(style.visibility) 
+    instance.visibility(style.display === 'none'
+      ? Visibility.None :
+      !isUndefined(style.visibility)
         ? (style.visibility === 'hidden' ? Visibility.Hidden :  Visibility.Visible)
         : Visibility.Visible
     )
@@ -407,4 +408,4 @@ export const rowModify = new RowStyleModify()
 export const columnModify = new ColumnStyleModify()
 export const textModify = new TextStyleModify()
 
-export default new CommonStyleModify()
+export default new CommonStyleModify()

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

@@ -3,7 +3,7 @@ import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBL
 import commonStyleModify from './style'
 import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroSwiperElement, TaroEvent, TaroAny } from '@tarojs/runtime'
+import type { TaroAny, TaroEvent, TaroSwiperElement } from '@tarojs/runtime'
 
 interface SwiperAttrs {
   index?: number

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

@@ -3,7 +3,7 @@ import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBL
 import commonStyleModify from './style'
 import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroAny, TaroSwitchElement, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroEvent, TaroSwitchElement } from '@tarojs/runtime'
 
 interface SwitchAttrs {
   selectedColor?: ResourceColor

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

@@ -7,7 +7,7 @@ import { getImageMode } from './image'
 import { BUTTON_THEME_COLOR } from './utils/constant/style'
 import { getNodeThresholds, getStyleAttr, shouldBindEvent, getNormalAttributes } from './utils/helper'
 
-import type { TaroButtonElement, TaroElement, TaroTextElement, TaroAny, HarmonyStyle } from '@tarojs/runtime'
+import type { HarmonyStyle, TaroAny, TaroButtonElement, TaroElement, TaroTextElement } from '@tarojs/runtime'
 
 function getButtonFontSize (node: TaroButtonElement): string | number {
   const isMini = node._attrs.size === 'mini'
@@ -125,4 +125,4 @@ class SpanStyleModify implements AttributeModifier<SpanAttribute> {
   }
 }
 
-const spanModify = new SpanStyleModify()
+const spanModify = new SpanStyleModify()

package/dist/components-harmony-ets/utils/helper.ets

@@ -1,8 +1,8 @@
-import { VIEW } from '@tarojs/runtime/dist/runtime.esm'
+import { VIEW } from '@tarojs/runtime'
 
 import { getNormalAttributes, getFontAttributes, getStyleAttr } from './styles'
 
-import type { TaroElement, TaroNode, TaroAny } from '@tarojs/runtime'
+import type { TaroAny, TaroElement, TaroNode } from '@tarojs/runtime'
 
 export const parseStyles = (styles = ''): Record<string, string> => {
   const styleObj: Record<string, string> = {}

package/dist/components-harmony-ets/utils/styles.ets

@@ -4,7 +4,7 @@ import { ObjectAssign } from '@tarojs/runtime'
 import { FlexManager } from './flexManager'
 
 import type { StandardProps, TextProps } from '@tarojs/components/types'
-import type { TaroAny, TaroElement, TaroStyleType, TaroTextStyleType, HarmonyStyle } from '@tarojs/runtime'
+import type { TaroAny, TaroElement, TaroTextStyleType, HarmonyStyle } from '@tarojs/runtime'
 
 export function getFontAttributes (node: TaroElement): TaroTextStyleType {
   let hmStyle = getNormalAttributes(node)
@@ -20,7 +20,7 @@ export function getFontAttributes (node: TaroElement): TaroTextStyleType {
   let WebkitLineClamp = attrs.maxLines || hmStyle.WebkitLineClamp || Infinity
   if (hmStyle.textOverflow && !isUndefined(hmStyle.textOverflow.overflow)) {
     switch (hmStyle.textOverflow.overflow) {
-      case TextOverflow.Clip: 
+      case TextOverflow.Clip:
       case TextOverflow.Ellipsis:
       case TextOverflow.None: WebkitLineClamp = WebkitLineClamp || 1; break
       default: break
@@ -90,9 +90,8 @@ export function isMaxWidthView (node: TaroElement) {
 
 export function getNormalAttributes (node: TaroElement, initStyle?: HarmonyStyle): HarmonyStyle {
   if (!node) return {}
-   
+
   const hmStyle = node.hmStyle
-  
   if (!hmStyle) return {}
 
   const _nid = node._nid
@@ -182,7 +181,7 @@ function getPseudoClass (node: TaroElement): HarmonyStyle | null {
 function parseNthChild(selector: string): [number, number] | null {
   const regex = /nth-child\((?:(-?\d*)n\s*)?([+-]?\s*\d+)?\)/;
   const match = selector.match(regex);
-  
+
   if (match) {
       const a = match[1] ? parseInt(match[1]) : 0;
       const b = match[2] ? parseInt(match[2]) : 0;
@@ -202,4 +201,4 @@ export function getStyleAttr(node: TaroElement | null, key: string): TaroAny {
     return isMaxWidthView(node) && isUndefined(hmStyle.width) ? '100%' : hmStyle.width
   }
   return hmStyle[key]
-}
+}

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

@@ -4,7 +4,7 @@ import commonStyleModify from './style'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroAny, TaroVideoElement, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroEvent, TaroVideoElement } from '@tarojs/runtime'
 
 export interface VideoOptions {
   src?: string | Resource

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

@@ -6,8 +6,7 @@ import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { FlexManager } from './utils/flexManager'
 import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroViewElement, TaroAny } from '@tarojs/runtime'
-import { isUndefined } from '@tarojs/shared'
+import type { TaroAny, TaroViewElement } from '@tarojs/runtime'
 
 @Component
 export default struct TaroView {

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

@@ -3,7 +3,7 @@ import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBL
 import commonStyleModify from './style'
 import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroAny, TaroWebViewElement, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroEvent, TaroWebViewElement } from '@tarojs/runtime'
 
 interface IPageLoad {
   url: string

package/dist/index.d.ts

@@ -51,14 +51,14 @@ declare class Harmony extends TaroPlatformHarmony {
     taroComponentsPath: string;
     apiEntryList: RegExp[];
     constructor(ctx: IPluginContext, config: TConfig);
-    get framework(): "solid" | "vue3" | "react" | "preact" | "none";
+    get framework(): "solid" | "vue3" | "react" | "preact";
     get aliasFramework(): string;
     get apiLibrary(): string;
     get apiEntry(): RegExp[];
     get componentLibrary(): string;
     get runtimeLibrary(): string;
     get runtimeFrameworkLibrary(): string;
-    get defineConstants(): Record<string, string> | undefined;
+    get defineConstants(): Record<string, string>;
     extensions: string[];
     excludeLibraries: (string | RegExp)[];
     externalDeps: [

package/dist/index.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var path = require('node:path');
 var helper = require('@tarojs/helper');
+var path = require('node:path');
 var service = require('@tarojs/service');
 var _package = require('@tarojs/service/dist/utils/package');
 var shared = require('@tarojs/shared');
@@ -364,6 +364,7 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
         env.forEach(([key, value]) => {
             __classPrivateFieldGet(this, _Harmony_defineConstants, "f")[`process.env.${key}`] = JSON.stringify(value);
         });
+        return __classPrivateFieldGet(this, _Harmony_defineConstants, "f");
     }
     indexOfLibraries(lib) {
         return this.externalDeps.findIndex(([_, rgx]) => rgx.test(lib));
@@ -486,6 +487,8 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                 code = apiLoader(code);
             }
             if (this.extensions.includes(path__namespace.extname(lib))) {
+                // Note: 移除 onpm 不能装载的类型，新版本会导致 ets-loader 抛出 resolvedFileName 异常
+                code = code.replace(/\/{3}\s*<reference\s+types=['"]([^'"\s]+)['"]\s*\/>\n*/g, '');
                 // Note: 查询 externals 内的依赖，并将它们添加到 externalDeps 中
                 code = code.replace(/(?:import\s|from\s|require\()['"]([^\\/.][^'"\s]+)['"]\)?/g, (src, p1 = '') => {
                     if (p1.startsWith('node:') || p1.endsWith('.so'))