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

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

@@ -0,0 +1,113 @@
+import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
+
+import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
+
+import type { TaroAny, TaroWebViewElement, TaroStyleType, TaroEvent } from '@tarojs/runtime'
+
+interface IPageLoad {
+  url: string
+}
+
+interface IError {
+  request: WebResourceRequest
+  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))
+}

package/dist/index.js

@@ -44,7 +44,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise */
+/* global Reflect, Promise, SuppressedError, Symbol */
 
 
 function __awaiter(thisArg, _arguments, P, generator) {
@@ -68,6 +68,91 @@ function __classPrivateFieldSet(receiver, state, value, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
+function apiLoader(str) {
+    return `import {
+  useAddToFavorites,
+  useDidHide,
+  useDidShow,
+  useError,
+  useLaunch,
+  useLoad,
+  useOptionMenuClick,
+  usePageNotFound,
+  usePageScroll,
+  usePullDownRefresh,
+  usePullIntercept,
+  useReachBottom,
+  useReady,
+  useResize,
+  useRouter,
+  useSaveExitState,
+  useShareAppMessage,
+  useShareTimeline,
+  useTabItemTap,
+  useTitleClick,
+  useScope,
+  useUnhandledRejection,
+  useUnload
+} from '@tarojs/plugin-framework-react/dist/runtime'
+${str}
+
+taro.useAddToFavorites = useAddToFavorites
+taro.useDidHide = useDidHide
+taro.useDidShow = useDidShow
+taro.useError = useError
+taro.useLaunch = useLaunch
+taro.useLoad = useLoad
+taro.useOptionMenuClick = useOptionMenuClick
+taro.usePageNotFound = usePageNotFound
+taro.usePageScroll = usePageScroll
+taro.usePullDownRefresh = usePullDownRefresh
+taro.usePullIntercept = usePullIntercept
+taro.useReachBottom = useReachBottom
+taro.useReady = useReady
+taro.useResize = useResize
+taro.useRouter = useRouter
+taro.useSaveExitState = useSaveExitState
+taro.useShareAppMessage = useShareAppMessage
+taro.useShareTimeline = useShareTimeline
+taro.useTabItemTap = useTabItemTap
+taro.useTitleClick = useTitleClick
+taro.useScope = useScope
+taro.useUnhandledRejection = useUnhandledRejection
+taro.useUnload = useUnload
+
+export {
+  useAddToFavorites,
+  useDidHide,
+  useDidShow,
+  useError,
+  useLaunch,
+  useLoad,
+  useOptionMenuClick,
+  usePageNotFound,
+  usePageScroll,
+  usePullDownRefresh,
+  usePullIntercept,
+  useReachBottom,
+  useReady,
+  useResize,
+  useRouter,
+  useSaveExitState,
+  useShareAppMessage,
+  useShareTimeline,
+  useTabItemTap,
+  useTitleClick,
+  useScope,
+  useUnhandledRejection,
+  useUnload
+}
+`;
 }
 
 const PLATFORM_NAME = 'harmony';
@@ -364,8 +449,16 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                         ? path__namespace.join(path__namespace.dirname(target), `${basename}${ext}`)
                         : path__namespace.join(target, `index${isDTS ? '.d.ts' : ext}`);
                 }
-                else if (libDir !== path__namespace.relative(targetPath, target)) {
-                    target = path__namespace.join(targetPath, libDir);
+                else {
+                    const libPath = path__namespace.relative(targetPath, target);
+                    if (libDir !== libPath) {
+                        if (path__namespace.relative(libPath, libDir).startsWith('.')) {
+                            target = path__namespace.join(targetPath, libDir);
+                        }
+                        else {
+                            target = path__namespace.join(targetPath, libName, `index${ext}`);
+                        }
+                    }
                 }
             }
         }
@@ -380,6 +473,10 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
         }
         else if (stat.isFile()) {
             let code = helper.fs.readFileSync(lib, { encoding: 'utf8' });
+            // TODO: 后续这部分代码应该根据使用的框架抽离到对应的平台插件处
+            if ([/taro-platform-harmony[\\/]dist[\\/]apis[\\/]index\.ts/].some(e => e.test(lib))) {
+                code = apiLoader(code);
+            }
             if (this.extensions.includes(path__namespace.extname(lib))) {
                 code = code.replace(/(?:import\s|from\s|require\()['"]([^.][^'"\s]+)['"]\)?/g, (src, p1) => {
                     const { outputRoot } = this.ctx.runOpts.config;
@@ -552,7 +649,7 @@ function App(props) {
             isFile: (file) => {
                 try {
                     const stat = helper.fs.lstatSync(file);
-                    return stat.isFile() || (file.endsWith(mediaPath) && stat.isDirectory());
+                    return stat.isFile() || (file.endsWith(mediaPath.replace('/', path__namespace.sep)) && stat.isDirectory());
                 }
                 catch (_) { } // eslint-disable-line no-empty
                 return false;