@tarojs/plugin-platform-harmony-ets 4.0.0-beta.7 → 4.0.0-beta.70

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
@@ -14,37 +14,43 @@ interface IError {
   error: WebResourceError
 }
 
-@Builder
-export default function TaroWebView (node: TaroWebViewElement) {
-  Web({ src: node._attrs.src, controller: node.controller })
-    .attributeModifier(commonStyleModify.setNode(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)
+@Component
+export default struct TaroWebView {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroWebViewElement) => void = this.customBuilder
+  @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)
+        })
+
+        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: 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))
+      .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,152 @@
+/* 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;
+    apiEntryList: RegExp[];
+    constructor(ctx: IPluginContext, config: TConfig);
+    get framework(): "solid" | "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>, ext?: 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

@@ -4,10 +4,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');
 
@@ -303,6 +302,9 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
         this.useJSON5 = true;
         this.runtimePath = [];
         this.taroComponentsPath = `${PACKAGE_NAME}/dist/components-harmony-ets`;
+        this.apiEntryList = [
+            /(@tarojs[\\/]plugin-platform-harmony-ets|taro-platform-harmony)[\\/]dist[\\/]apis[\\/]index\.ts/,
+        ];
         _Harmony_defineConstants.set(this, {});
         this.extensions = ['.js', '.jsx', '.ts', '.tsx', '.cjs', '.mjs', '.mts', '.vue', '.ets', '.d.ts'];
         this.excludeLibraries = [];
@@ -317,14 +319,16 @@ 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() {
-                this.modifyViteConfig();
+                that.modifyViteConfig();
             },
         });
         ctx.onBuildFinish(() => {
             const outDir = path__namespace.resolve(process.cwd(), config.outputRoot);
-            this.handleResourceEmit(outDir);
+            that.handleResourceEmit(outDir);
         });
     }
     get framework() {
@@ -336,6 +340,9 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
     get apiLibrary() {
         return path__namespace.resolve(__dirname, './apis');
     }
+    get apiEntry() {
+        return this.apiEntryList;
+    }
     get componentLibrary() {
         return path__namespace.resolve(__dirname, './components-harmony-ets');
     }
@@ -372,8 +379,8 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
             return;
         if (this.excludeLibraries.some(e => typeof e === 'string' ? e === lib : e.test(lib)))
             return;
+        const { outputRoot, chorePackagePrefix } = this.ctx.runOpts.config;
         if (sync) {
-            const { outputRoot } = this.ctx.runOpts.config;
             const targetPath = path__namespace.join(outputRoot, helper.NODE_MODULES);
             // FIXME 不支持 alias 配置
             const libName = lib;
@@ -421,9 +428,10 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
             }
             if (ext) {
                 const code = helper.fs.readFileSync(lib, { encoding: 'utf8' });
-                if ((/(?:import\s|from\s|require\()['"]([\\/.][^'"\s]+)['"]\)?/g.test(code)
-                    || /\/{3}\s<reference\spath=['"][^'"\s]+['"]\s\/>/g.test(code))
-                    && `${libName}${path__namespace.extname(libDir)}` !== libDir) {
+                if ((/(?:import\s|from\s|require\()['"]([\\/.][^'"\s]+)['"]\)?/g.test(code) ||
+                    /\/{3}\s<reference\spath=['"][^'"\s]+['"]\s\/>/g.test(code)) &&
+                    `${libName}${path__namespace.extname(libDir)}` !== libDir) {
+                    // Note: 文件包含包内引用的依赖
                     const pkgPath = path__namespace.relative(libName, libDir);
                     if (new RegExp(`^index(${this.extensions.map(e => e.replace('.', '\\.')).join('|')})$`).test(pkgPath)) {
                         // Note: 入口为 index 场景
@@ -474,16 +482,16 @@ 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))) {
-                code = code.replace(/(?:import\s|from\s|require\()['"]([^.][^'"\s]+)['"]\)?/g, (src, p1) => {
+                // Note: 查询 externals 内的依赖，并将它们添加到 externalDeps 中
+                code = code.replace(/(?:import\s|from\s|require\()['"]([^\\/.][^'"\s]+)['"]\)?/g, (src, p1) => {
                     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);
@@ -492,18 +500,29 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                     }
                     return src;
                 });
-                const define = Object.assign({}, this.defineConstants);
+                const define = Object.assign(Object.assign({}, this.defineConstants), { 
+                    // Note: React 开发环境可能调用 stack 可能导致 appWrapper 实例变更
+                    'ReactDebugCurrentFrame.getCurrentStack': 'ReactDebugCurrentFrame.getCurrentStack$' });
                 if ([/(@tarojs[\\/]runtime|taro-runtime)[\\/]dist/].some(e => e.test(lib))) {
                     define.global = 'globalThis';
                 }
-                code = this.replaceDefineValue(code, define);
                 const ext = path__namespace.extname(target);
+                if (![/d\.e?tsx?$/, /\.(json|map|md)$/].some(e => e.test(target))) {
+                    code = this.replaceDefineValue(code, define, ext);
+                }
                 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;
+                }
             }
-            if (/tarojs[\\/]taro[\\/]types[\\/]index.d.ts/.test(target)) {
-                code = `/// <reference path="global.d.ts" />
+            // Note: 传入 chorePackagePrefix 时，不生成核心依赖库
+            if (!chorePackagePrefix) {
+                if (/tarojs[\\/]taro[\\/]types[\\/]index.d.ts/.test(target)) {
+                    code = `/// <reference path="global.d.ts" />
 
 /// <reference path="taro.api.d.ts" />
 /// <reference path="taro.component.d.ts" />
@@ -523,14 +542,15 @@ declare global {
   const defineAppConfig: (config: Taro.Config) => Taro.Config
   const definePageConfig: (config: Taro.Config) => Taro.Config
 }`;
-            }
-            try {
-                const targetPath = target.replace(new RegExp(`\\b${helper.NODE_MODULES}\\b`), 'npm');
-                helper.fs.ensureDirSync(path__namespace.dirname(targetPath));
-                helper.fs.writeFileSync(targetPath, code);
-            }
-            catch (e) {
-                console.error(`[taro-arkts] inject ${lib} to ${target} failed`, e);
+                }
+                try {
+                    const targetPath = target.replace(new RegExp(`\\b${helper.NODE_MODULES}\\b`), 'npm');
+                    helper.fs.ensureDirSync(path__namespace.dirname(targetPath));
+                    helper.fs.writeFileSync(targetPath, code);
+                }
+                catch (e) {
+                    console.error(`[taro-arkts] inject ${lib} to ${target} failed`, e);
+                }
             }
         }
         else if (stat.isSymbolicLink()) {
@@ -538,9 +558,13 @@ declare global {
             this.moveLibraries(realPath, target, basedir);
         }
     }
-    replaceDefineValue(code, define) {
+    replaceDefineValue(code, define, ext = '.js') {
         Object.keys(define).forEach(key => {
-            code = code.replace(new RegExp(`\\b${key}\\b`, 'g'), define[key]);
+            let value = define[key];
+            if (/^['"`].*['"`]$/.test(value) && ['.ts', '.tsx', '.ets'].includes(ext)) {
+                value = `(${value} as string)`;
+            }
+            code = code.replace(new RegExp(`\\b${key}\\b`, 'g'), value);
         });
         return code;
     }
@@ -552,15 +576,15 @@ declare global {
         const that = this;
         const { appPath } = that.ctx.paths;
         const { config } = that.ctx.runOpts;
-        const { outputRoot } = config;
+        const { outputRoot, ohPackage = {}, chorePackagePrefix } = config;
         if (!that.framework.includes('vue')) {
             that.excludeLibraries.push(/\bvue\b/);
         }
         // @ts-ignore
         if (that.framework === 'solid') {
             that.externalDeps.push([
-                '@tarojs/plugin-framework-react/dist/runtime/reconciler',
-                /^@tarojs\/plugin-framework-react\/dist\/runtime\/reconciler$/,
+                '@tarojs/plugin-framework-react/dist/reconciler',
+                /^@tarojs\/plugin-framework-react\/dist\/reconciler$/,
                 path__namespace.join(this.runtimeFrameworkLibrary, 'reconciler')
             ]);
             that.externalDeps.push([
@@ -568,11 +592,29 @@ declare global {
                 /^solid-js\/universal$/,
             ]);
         }
-        function modifyResolveId({ source = '', importer = '', options = {}, name = 'modifyResolveId', resolve }) {
-            if (shared.isFunction(resolve)) {
-                if (source === that.runtimePath || that.runtimePath.includes(source)) {
-                    return resolve('@tarojs/runtime', importer, options);
-                }
+        const externals = Object.keys(ohPackage.dependencies || []).concat(Object.keys(ohPackage.devDependencies || []));
+        function modifyResolveId({ source = '', name = 'modifyResolveId' }) {
+            if (externals.includes(source)) {
+                return {
+                    external: true,
+                    id: source,
+                    resolvedBy: name,
+                };
+            }
+            else if (source.includes('css_variables')) {
+                return {
+                    external: true,
+                    id: path__namespace.join(outputRoot, 'css_variables'),
+                    moduleSideEffects: 'no-treeshake',
+                    resolvedBy: name,
+                };
+            }
+            if (chorePackagePrefix && that.indexOfLibraries(source) > -1) {
+                return {
+                    external: true,
+                    id: path__namespace.join(chorePackagePrefix, source),
+                    resolvedBy: name,
+                };
             }
             // Note: 映射 Taro 相关依赖到注入 taro 目录
             if (that.indexOfLibraries(source) > -1) {
@@ -603,19 +645,18 @@ declare global {
             }
             function injectLoaderMeta() {
                 return {
-                    name: 'taro:vite-h5-loader-meta',
+                    name: 'taro:vite-loader-meta',
                     buildStart() {
                         return __awaiter(this, void 0, void 0, function* () {
-                            yield this.load({ id: runnerUtils.VITE_COMPILER_LABEL });
-                            const info = this.getModuleInfo(runnerUtils.VITE_COMPILER_LABEL);
-                            const compiler = info === null || info === void 0 ? void 0 : info.meta.viteCompilerContext;
+                            const { getViteHarmonyCompilerContext } = that.ctx.runnerUtils;
+                            const compiler = getViteHarmonyCompilerContext(this);
                             if (compiler) {
                                 switch (that.framework) {
                                     // @ts-ignore
                                     case 'solid':
                                         compiler.loaderMeta || (compiler.loaderMeta = {});
                                         compiler.loaderMeta.importFrameworkStatement = ``;
-                                        compiler.mockAppStatement = `
+                                        compiler.loaderMeta.mockAppStatement = `
 function App(props) {
   return null
 }
@@ -1151,7 +1192,7 @@ class Harmony extends service.TaroPlatformBase {
                 const outDir = path.join(compsOutDir, name);
                 helper.fs.copy(src, outDir);
             });
-            this.modifyHostPackageDep(outDir);
+            this.modifyHostPackage(config.harmony);
         });
     }
     modifyWebpackConfig() {
@@ -1214,13 +1255,13 @@ class Harmony extends service.TaroPlatformBase {
             console.warn(helper.chalk.red('设置鸿蒙 Hap 配置失败：', err));
         });
     }
-    modifyHostPackageDep(dest) {
+    modifyHostPackage({ projectPath, hapName = 'entry' }) {
         return __awaiter(this, void 0, void 0, function* () {
+            const packageJsonFile = path.join(projectPath, hapName, 'package.json');
             const hmsDeps = {
                 '@hmscore/hms-js-base': '^6.1.0-300',
                 '@hmscore/hms-jsb-account': '^1.0.300'
             };
-            const packageJsonFile = path.resolve(dest, '../../../../../package.json');
             const isExists = yield helper.fs.pathExists(packageJsonFile);
             if (!isExists)
                 return;
@@ -1237,6 +1278,7 @@ class Harmony extends service.TaroPlatformBase {
             }
             packageJson = JSON.stringify(packageJson);
             yield helper.fs.writeFile(packageJsonFile, packageJson);
+            return packageJson;
         });
     }
     getChunkEntryModule(compilation, chunk, compiler = 'webpack4') {
@@ -1305,6 +1347,7 @@ function assertHarmonyConfig(ctx, config) {
     }
 }
 
+exports.HarmonyOS_ArkTS = Harmony$1;
 exports.HarmonyOS_JSUI = Harmony;
 exports.default = index;
 //# sourceMappingURL=index.js.map