@tarojs/plugin-platform-harmony-ets 4.0.0-beta.19 → 4.0.0-beta.20

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

@@ -1,36 +1,17 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 
-import commonStyleModify from './style'
+import { rowModify, columnModify } from './style'
 import PseduoChildren from './pseudo'
-import { createLazyChildren } from './render'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { FlexManager } from './utils/flexManager'
-import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroViewElement, TaroStyleType, TaroAny } from '@tarojs/runtime'
-
-@Extend(Row)
-function rowAttrs (style: TaroStyleType) {
-  .constraintSize({
-    minWidth: style.minWidth || style.width,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-}
-
-@Extend(Column)
-function columnAttrs (style: TaroStyleType) {
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight || style.height,
-    maxHeight: style.maxHeight
-  })
-}
+import type { TaroViewElement, TaroAny } from '@tarojs/runtime'
 
 @Component
 export default struct TaroView {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroViewElement) => void = this.customBuilder
   @ObjectLink node: TaroViewElement
 
   build () {
@@ -38,13 +19,12 @@ export default struct TaroView {
       if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
         Row() {
           if (this.node._pseudo_before || this.node._pseudo_after) {
-            PseduoChildren(this.node)
+            PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
           } else {
-            createLazyChildren(this.node)
+            this.createLazyChildren(this.node)
           }
         }
-        .attributeModifier(commonStyleModify.setNode(this.node))
-        .rowAttrs(getNormalAttributes(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) => {
@@ -56,13 +36,12 @@ export default struct TaroView {
       } else {
         Column() {
           if (this.node._pseudo_before || this.node._pseudo_after) {
-            PseduoChildren(this.node)
+            PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
           } else {
-            createLazyChildren(this.node)
+            this.createLazyChildren(this.node)
           }
         }
-        .attributeModifier(commonStyleModify.setNode(this.node))
-        .columnAttrs(getNormalAttributes(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) => {

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

@@ -16,6 +16,8 @@ interface IError {
 
 @Component
 export default struct TaroWebView {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroWebViewElement) => void = this.customBuilder
   @ObjectLink node: TaroWebViewElement
 
   build () {
@@ -43,7 +45,7 @@ export default struct TaroWebView {
         })
         .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']))

package/dist/index.d.ts

@@ -53,6 +53,7 @@ declare class Harmony extends TaroPlatformHarmony {
     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;
@@ -64,6 +65,7 @@ declare class Harmony extends TaroPlatformHarmony {
         RegExp,
         string?
     ][];
+    harmonyScope: RegExp[];
     indexOfLibraries(lib: string): number;
     removeFromLibraries(lib: string): void;
     moveLibraries(lib: string, target?: string, basedir?: string, sync?: boolean): void;

package/dist/index.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var helper = require('@tarojs/helper');
 var path = require('node:path');
 var runnerUtils = require('@tarojs/runner-utils');
-var shared = require('@tarojs/shared');
 var service = require('@tarojs/service');
 var _package = require('@tarojs/service/dist/utils/package');
+var shared = require('@tarojs/shared');
 var webpackSources = require('webpack-sources');
 var template = require('@tarojs/shared/dist/template');
 
@@ -317,6 +317,7 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
             ['react', /^react$|react[\\/]cjs/],
             ['react/jsx-runtime', /^react[\\/]jsx-runtime$/], // Note: React 环境下自动注入，避免重复
         ];
+        this.harmonyScope = [...HARMONY_SCOPES];
         const that = this;
         this.setupTransaction.addWrapper({
             close() {
@@ -337,6 +338,11 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
     get apiLibrary() {
         return path__namespace.resolve(__dirname, './apis');
     }
+    get apiEntry() {
+        return [
+            /(@tarojs[\\/]plugin-platform-harmony-ets|taro-platform-harmony)[\\/]dist[\\/]apis[\\/]index\.ts/,
+        ];
+    }
     get componentLibrary() {
         return path__namespace.resolve(__dirname, './components-harmony-ets');
     }
@@ -475,8 +481,7 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
         }
         else if (stat.isFile()) {
             let code = helper.fs.readFileSync(lib, { encoding: 'utf8' });
-            // TODO: 后续这部分代码应该根据使用的框架抽离到对应的平台插件处
-            if ([/(@tarojs[\\/]plugin-platform-harmony-ets|taro-platform-harmony)[\\/]dist[\\/]apis[\\/]index\.ts/].some(e => e.test(lib))) {
+            if (this.apiEntry.some(e => e.test(lib))) {
                 code = apiLoader(code);
             }
             if (this.extensions.includes(path__namespace.extname(lib))) {
@@ -485,7 +490,7 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                     const { outputRoot } = this.ctx.runOpts.config;
                     const targetPath = path__namespace.join(outputRoot, helper.NODE_MODULES, p1);
                     const relativePath = parseRelativePath(path__namespace.dirname(target), targetPath);
-                    if (HARMONY_SCOPES.every(e => !e.test(p1))) {
+                    if (this.harmonyScope.every(e => !e.test(p1))) {
                         if (this.indexOfLibraries(p1) === -1 && !/\.(d\.ts|flow\.js)$/.test(lib)) {
                             this.externalDeps.push([p1, new RegExp(`^${p1.replace(/([-\\/$])/g, '\\$1')}$`)]);
                             this.moveLibraries(p1, targetPath, path__namespace.dirname(lib), true);
@@ -579,7 +584,7 @@ declare global {
             ]);
         }
         const externals = Object.keys(ohPackage.dependencies || []).concat(Object.keys(ohPackage.devDependencies || []));
-        function modifyResolveId({ source = '', importer = '', options = {}, name = 'modifyResolveId', resolve }) {
+        function modifyResolveId({ source = '', name = 'modifyResolveId' }) {
             if (externals.includes(source)) {
                 return {
                     external: true,
@@ -594,11 +599,6 @@ declare global {
                     resolvedBy: name,
                 };
             }
-            if (shared.isFunction(resolve)) {
-                if (source === that.runtimePath || that.runtimePath.includes(source)) {
-                    return resolve('@tarojs/runtime', importer, options);
-                }
-            }
             // Note: 映射 Taro 相关依赖到注入 taro 目录
             if (that.indexOfLibraries(source) > -1) {
                 return {