@tarojs/plugin-platform-harmony-cpp 4.1.2 → 4.1.3-beta.0

package/dist/index.d.ts

@@ -0,0 +1,32 @@
+import { HarmonyOS_ArkTS } from '@tarojs/plugin-platform-harmony-ets/dist';
+import { IPluginContext, TConfig } from '@tarojs/service';
+import { IHarmonyConfig } from '@tarojs/taro/types/compile';
+
+declare class Harmony extends HarmonyOS_ArkTS {
+    option: IOptions;
+    platform: string;
+    runtimePath: string;
+    useETS: boolean;
+    useJSON5: boolean;
+    get context(): IPluginContext;
+    constructor(ctx: IPluginContext, config: TConfig, option: IOptions);
+    get harmonyPluginPath(): string;
+    get harmonyCppPluginPath(): string;
+    get apiLibrary(): string;
+    get componentLibrary(): string;
+    get runtimeLibrary(): string;
+    get runtimeFrameworkLibrary(): string;
+    get runtimeFrameworkReconciler(): string;
+    modifyPageConfig(): void;
+    updateModulePackage(outputRoot: string, ohPackage?: Exclude<IHarmonyConfig['ohPackage'], undefined>, ohpm?: string): void;
+}
+
+interface IOptions {
+    useConfigName?: string;
+    /** @default "local" */
+    useChoreLibrary?: 'local' | 'remote' | false | string;
+}
+declare const _default: (ctx: IPluginContext, options?: IOptions) => void;
+
+export { Harmony as HarmonyCPP, _default as default };
+export type { IOptions };

package/dist/index.js

@@ -15,12 +15,13 @@ var utils = require('@tarojs/vite-runner/dist/utils');
 var parseCssToStylesheet = require('@tarojs/parse-css-to-stylesheet');
 var constants = require('@tarojs/vite-runner/dist/harmony/postcss/constants');
 
-var version = "4.1.2";
+var version = "4.1.3-beta.0";
 
 const PKG_NAME = '@taro-oh/library';
 const PKG_VERSION = version;
 const PROJECT_DEPENDENCIES_NAME = [];
 const PKG_DEPENDENCIES = {};
+const STATIC_FOLDER_NAME = 'static';
 
 /* eslint-disable no-console */
 const PLATFORM_NAME = 'harmony_cpp';
@@ -169,16 +170,15 @@ function appPlugin () {
     };
 }
 
-function injectEnv () {
-    const that = this;
+function injectEnv (platform) {
     const packageName = '@tarojs/taro';
     const bindingName = 'Taro';
-    const businessId = this.config.defineConstants?.LOCATION_APIKEY?.replace(/^['"]|['"]$/g, '');
+    const businessId = platform.getConfig().defineConstants?.LOCATION_APIKEY?.replace(/^['"]|['"]$/g, '');
     return {
         name: 'taro:vite-add-method-env',
         transform(code, id) {
             const pluginContext = this;
-            const { runnerUtils } = that.context;
+            const { runnerUtils } = platform.context;
             const { getViteHarmonyCompilerContext } = runnerUtils;
             const compiler = getViteHarmonyCompilerContext(pluginContext);
             const exts = Array.from(new Set(compiler?.frameworkExts.concat(helper.SCRIPT_EXT)));
@@ -299,7 +299,15 @@ function pagePlugin () {
             const pluginContext = this;
             const { runnerUtils, runOpts } = that.context;
             const isPureComp = (page) => {
-                return runOpts?.options?.args.pure || page.config?.entryOption === false;
+                if (page instanceof Array)
+                    return false;
+                if (runOpts?.options?.args.pure || page.config?.entryOption === false) {
+                    page.isPure = true;
+                }
+                else {
+                    page.isPure = false;
+                }
+                return page.isPure;
             };
             const { getViteHarmonyCompilerContext } = runnerUtils;
             const compiler = getViteHarmonyCompilerContext(pluginContext);
@@ -336,7 +344,7 @@ function pagePlugin () {
                 };
                 const oddModifyInstantiate = compiler.loaderMeta.modifyInstantiate;
                 compiler.loaderMeta.modifyInstantiate = function (code = '', type = '', page) {
-                    if (type === 'page') {
+                    if (type === 'page' && !(page instanceof Array)) {
                         const componentName = page.config?.componentName;
                         if (shared.isString(componentName)) {
                             code = code.replace(/export\sdefault\sstruct\sIndex/, `export struct ${componentName}`);
@@ -349,12 +357,20 @@ function pagePlugin () {
                         config.entryOption = {};
                     }
                     config.modifyPageImport = function (importStr, page) {
-                        if (!isPureComp(page)) {
+                        function fixPageEntry(meta) {
                             Object.assign(config.entryOption, {
-                                routeName: page.name,
+                                routeName: meta.name,
                             });
-                            if (shared.isObject(page.config?.entryOption)) {
-                                Object.assign(config.entryOption, page.config.entryOption);
+                            if (shared.isObject(meta.config?.entryOption)) {
+                                Object.assign(config.entryOption, meta.config.entryOption);
+                            }
+                        }
+                        if (!isPureComp(page)) {
+                            if (page instanceof Array) {
+                                page.forEach(fixPageEntry);
+                            }
+                            else {
+                                fixPageEntry(page);
                             }
                         }
                         importStr.unshift('import { navigateBack } from "@tarojs/taro"');
@@ -372,11 +388,11 @@ function pagePlugin () {
                             type: 'TaroAny',
                             foreach: () => 'null',
                             disabled: !this.buildConfig.isBuildNativeComp && isPure,
-                        }, this.isTabbarPage), this.renderState({
+                        }, false), this.renderState({
                             name: 'areaChange',
                             type: 'TaroAny',
                             foreach: () => 'null',
-                        }, this.isTabbarPage), this.renderState({
+                        }, false), this.renderState({
                             name: '__pageName',
                             type: 'TaroAny',
                             foreach: () => 'null',
@@ -387,7 +403,7 @@ function pagePlugin () {
                             type: 'TaroObject',
                             foreach: () => '{}',
                             disabled: !this.buildConfig.isBuildNativeComp && isPure,
-                        }, this.isTabbarPage), this.renderState({
+                        }, false), this.renderState({
                             decorator: 'State',
                             name: 'statusBarHeight',
                             type: 'number',
@@ -396,9 +412,18 @@ function pagePlugin () {
                             decorator: 'State',
                             name: 'isHideTitleBar',
                             type: 'boolean',
-                            foreach: () => this.appConfig.window?.navigationStyle === 'custom'
-                                ? `config.navigationStyle !== 'default'`
-                                : `config.navigationStyle === 'custom'`,
+                            foreach: (_, index) => {
+                                if (this.isTabbarPage) {
+                                    return this.appConfig.window?.navigationStyle === 'custom'
+                                        ? `config${index}.navigationStyle !== 'default'`
+                                        : `config${index}.navigationStyle === 'custom'`;
+                                }
+                                else {
+                                    return this.appConfig.window?.navigationStyle === 'custom'
+                                        ? `config.navigationStyle !== 'default'`
+                                        : `config.navigationStyle === 'custom'`;
+                                }
+                            },
                         }, this.isTabbarPage), this.renderState({
                             decorator: 'State',
                             name: 'isUseCache',
@@ -455,19 +480,40 @@ function pagePlugin () {
                                 `  Current.audioSessionManager = audioManager.getSessionManager()`,
                                 `}`,
                                 `this.activeAudioSession()`,
-                                `initEtsBuilder('${genUniPageId(page)}')`,
+                                ...(page instanceof Array ? [
+                                    ...page.map(p => `initEtsBuilder('${genUniPageId(p)}')`),
+                                    ...page.map((p, i) => `this.__pageName[${i}] = '${p.name}'`),
+                                ] : [
+                                    `initEtsBuilder('${genUniPageId(page)}')`,
+                                    `this.__pageName = '${page.name}'`,
+                                ]),
                                 'this.__layoutSize = this.params._layout_',
-                                `this.__pageName = '${page.name}'`,
                                 `systemContext.windowWidth = ${config.config.windowArea?.width || 'this.params._layout_?.width'}`,
                                 `systemContext.windowHeight = ${config.config.windowArea?.height || 'this.params._layout_?.height'}`,
-                                `TaroNativeModule.initStylesheet('${genUniPageId(page)}', styleJson, initStyleSheetConfig({ width: systemContext.windowWidth, height: systemContext.windowHeight}, this.getNavHeight()))`,
+                                ...(page instanceof Array ? [
+                                    ...page.map((p, i) => `TaroNativeModule.initStylesheet('${genUniPageId(p)}', styleJson${i}, initStyleSheetConfig({ width: systemContext.windowWidth, height: systemContext.windowHeight}, this.getNavHeight()))`),
+                                ] : [
+                                    `TaroNativeModule.initStylesheet('${genUniPageId(page)}', styleJson, initStyleSheetConfig({ width: systemContext.windowWidth, height: systemContext.windowHeight}, this.getNavHeight()))`,
+                                ]),
                             ];
                         if (!isPure) {
                             appearCode.push('Current.$r = (path: string): Resource => {', '  return $r(path)', '}', 'let currentSplit = false', 'let pendingAreaChange: TaroAny', `const resizeFn = (canSplit: boolean, size: TaroAny, sizeChange: boolean) => {`, `  const _display = display.getDefaultDisplaySync()`, `  const orientation = _display.orientation`, `  const idPortrait = orientation == display.Orientation.PORTRAIT || orientation == display.Orientation.PORTRAIT_INVERTED`, `  const _sysInfo: TaroAny = getSystemInfoSync()`, `  callFn(this.page?.onResize, this, {`, `    size: {`, 
                             // @ts-ignore
                             `      windowWidth: ${config.config.windowArea?.width || 'size?.width'},`, 
                             // @ts-ignore
-                            `      windowHeight: ${config.config.windowArea?.height || 'size?.height'},`, `      screenWidth: _sysInfo.screenWidth,`, `      screenHeight: _sysInfo.screenHeight,`, `    },`, `    deviceOrientation: idPortrait ? "portrait" : "landscape",`, `    foldDisplayMode: _sysInfo.foldDisplayMode,`, `    canSplit: canSplit,`, `    reason: sizeChange ? "size" : "statusBar"`, `  })`, `}`, `const avoidAreaChange = (res: TaroAny) => {`, `  const statusHeight: number = px2vp(res.area.topRect.height);`, `  this.statusBarHeight = statusHeight;`, `  TaroNativeModule.UpdateEnvRule('${genUniPageId(page)}', initStyleSheetConfig({ width: this.__layoutSize.width, height: this.__layoutSize.height}, this.getNavHeight()), this.node?._nid)`, `  resizeFn(currentSplit, this.__layoutSize, false)`, `}`, `const windowStage: TaroAny = AppStorage.get(WINDOW_STATE);`, 'this.areaChange = (res: TaroAny) => {', '  if (res.type !== oh_window.AvoidAreaType.TYPE_SYSTEM)  return;', '  if (!this.isShown) {', '    pendingAreaChange = () => { avoidAreaChange(res) }', '  } else {', '    avoidAreaChange(res)', '  }', '}', `windowStage.getMainWindowSync().on('avoidAreaChange', this.areaChange)`);
+                            `      windowHeight: ${config.config.windowArea?.height || 'size?.height'},`, `      screenWidth: _sysInfo.screenWidth,`, `      screenHeight: _sysInfo.screenHeight,`, `    },`, `    deviceOrientation: idPortrait ? "portrait" : "landscape",`, `    foldDisplayMode: _sysInfo.foldDisplayMode,`, `    canSplit: canSplit,`, `    reason: sizeChange ? "size" : "statusBar"`, `  })`, `}`, `const avoidAreaChange = (res: TaroAny) => {`, `  const statusHeight: number = px2vp(res.area.topRect.height)`, ...(page instanceof Array
+                                ? [
+                                    `  this.statusBarHeight = this.statusBarHeight.map(() => statusHeight)`,
+                                    `  this.node.forEach((item: TaroAny, i) => {`,
+                                    `    if (item?._nid) {`,
+                                    `      TaroNativeModule.UpdateEnvRule('${getProjectId()}:' + this.__pageName[i], initStyleSheetConfig({ width: this.__layoutSize.width, height: this.__layoutSize.height}, this.getNavHeight()), item._nid)`,
+                                    `    }`,
+                                    `  })`
+                                ]
+                                : [
+                                    `  this.statusBarHeight = statusHeight`,
+                                    `  TaroNativeModule.UpdateEnvRule('${genUniPageId(page)}', initStyleSheetConfig({ width: this.__layoutSize.width, height: this.__layoutSize.height}, this.getNavHeight()), this.node?._nid)`,
+                                ]), `  resizeFn(currentSplit, this.__layoutSize, false)`, `}`, `const windowStage: TaroAny = AppStorage.get(WINDOW_STATE)`, 'this.areaChange = (res: TaroAny) => {', '  if (res.type !== oh_window.AvoidAreaType.TYPE_SYSTEM)  return', '  if (!this.isShown) {', '    pendingAreaChange = () => { avoidAreaChange(res) }', '  } else {', '    avoidAreaChange(res)', '  }', '}', `windowStage.getMainWindowSync().on('avoidAreaChange', this.areaChange)`);
                         }
                         appearCode.push(appearStr);
                         return this.transArr2Str(appearCode.filter(Boolean));
@@ -477,7 +523,7 @@ function pagePlugin () {
                             `this.handlePageDetach()`,
                             'this.deactivateAudioSession()',
                             'if (this.areaChange) {',
-                            '  const windowStage: TaroAny = AppStorage.get(WINDOW_STATE);',
+                            '  const windowStage: TaroAny = AppStorage.get(WINDOW_STATE)',
                             `  windowStage.getMainWindowSync().off('avoidAreaChange', this.areaChange)`,
                             '}'
                         ]);
@@ -485,8 +531,15 @@ function pagePlugin () {
                     config.modifyPageBuild = function (_, page) {
                         const coreBuildCodeArray = [
                             'Stack() {',
-                            '  if (this.isReady) {',
-                            '    TaroXComponent({ pageId: (this.node as TaroAny)?._nid, data: this.nodeContent })',
+                            ...(this.isTabbarPage
+                                ? [
+                                    '  if (this.isReady[index]) {',
+                                    '    TaroXComponent({ pageId: (this.node[index] as TaroAny)?._nid, data: this.nodeContent[index] })',
+                                ]
+                                : [
+                                    '  if (this.isReady) {',
+                                    '    TaroXComponent({ pageId: (this.node as TaroAny)?._nid, data: this.nodeContent })',
+                                ]),
                             '  }',
                             '}',
                             '.align(Alignment.TopStart)',
@@ -497,7 +550,9 @@ function pagePlugin () {
                             '.onDetach(this.handlePageDetach)',
                         ];
                         if (!isPureComp(page)) {
-                            coreBuildCodeArray.push('.backgroundColor(this.pageBackgroundContentColor || this.pageBackgroundColor || "#FFFFFF")');
+                            coreBuildCodeArray.push(this.isTabbarPage
+                                ? '.backgroundColor(this.pageBackgroundContentColor[index] || this.pageBackgroundColor[index] || "#FFFFFF")'
+                                : '.backgroundColor(this.pageBackgroundContentColor || this.pageBackgroundColor || "#FFFFFF")');
                             if (this.enableRefresh === 1) {
                                 coreBuildCodeArray.forEach((code, idx) => coreBuildCodeArray.splice(idx, 1, `${' '.repeat(2)}${code}`));
                                 coreBuildCodeArray.unshift('Refresh({', '  refreshing: $$this.isRefreshing,', '  builder: this.customRefreshBuilder()', '}) {');
@@ -505,10 +560,17 @@ function pagePlugin () {
                             }
                             coreBuildCodeArray.forEach((code, idx) => coreBuildCodeArray.splice(idx, 1, `${' '.repeat(2)}${code}`));
                             coreBuildCodeArray.unshift('Navigation() {');
-                            coreBuildCodeArray.push('}', `.backgroundColor(this.pageBackgroundColor || '${this.appConfig?.window?.backgroundColor || '#FFFFFF'}')`, `.height('100%')`, `.width('100%')`, `.title({ builder: this.renderTitle, height: this.getNavHeight() })`, `.titleMode(NavigationTitleMode.Mini)`, `.hideTitleBar(this.isHideTitleBar)`, `.hideBackButton(true)`, 
+                            coreBuildCodeArray.push('}', this.isTabbarPage
+                                ? `.backgroundColor(this.pageBackgroundColor[index] || '${this.appConfig?.window?.backgroundColor || '#FFFFFF'}')`
+                                : `.backgroundColor(this.pageBackgroundColor || '${this.appConfig?.window?.backgroundColor || '#FFFFFF'}')`, `.height('100%')`, `.width('100%')`, `.title({ builder: this.renderTitle, height: this.getNavHeight() })`, `.titleMode(NavigationTitleMode.Mini)`, this.isTabbarPage ? `.hideTitleBar(this.isHideTitleBar[index])` : `.hideTitleBar(this.isHideTitleBar)`, `.hideBackButton(true)`, 
                             // `.expandSafeArea([SafeAreaType.SYSTEM])`,
                             `.mode(NavigationMode.Stack)`);
                         }
+                        if (this.isTabbarPage) {
+                            coreBuildCodeArray.forEach((code, idx) => coreBuildCodeArray.splice(idx, 1, `${' '.repeat(6)}${code}`));
+                            coreBuildCodeArray.unshift('Tabs({', `  barPosition: this.tabBarPosition !== 'top' ? BarPosition.End : BarPosition.Start,`, '  controller: this.tabBarController,', '  index: this.tabBarCurrentIndex,', '}) {', '  ForEach(this.tabBarList, (item: ITabBarItem, index) => {', '    TabContent() {');
+                            coreBuildCodeArray.push(`    }.tabBar(this.renderTabItemBuilder(index, item))`, `  }, (item: ITabBarItem, index) => \`\${item.key || index}\`)`, `}`, `.vertical(false)`, `.barMode(BarMode.Fixed)`, `.barHeight(this.isTabBarShow ? 56 : 0)`, `.animationDuration(this.tabBarAnimationDuration)`, `.onChange((index: number) => {`, `  if (this.tabBarCurrentIndex !== index) {`, `    callFn(this.page?.onHide, this)`, `    this.setTabBarCurrentIndex(index)`, `  }`, `  this.handlePageAppear()`, `  callFn(this.page?.onShow, this)`, `})`, `.backgroundColor(this.tabBarBackgroundColor)`, `.padding({`, `  bottom: px2vp(sysInfo.screenHeight - (sysInfo.safeArea?.bottom || 0)),`, `})`);
+                        }
                         return this.transArr2Str(coreBuildCodeArray);
                     };
                     config.modifyPageMethods = function (methods, page$1) {
@@ -517,11 +579,18 @@ function pagePlugin () {
                         if (handlePageAppearMethods) {
                             const methodsBodyList = handlePageAppearMethods.body?.split('\n') || [];
                             let insertIndex = methodsBodyList.findIndex((item) => item.startsWith('const params'));
-                            insertIndex = methodsBodyList.findIndex((item) => item.includes('this.node = instance'));
+                            if (this.isTabbarPage) {
+                                insertIndex = methodsBodyList.findIndex((item) => item.includes('this.node[index] = instance'));
+                            }
+                            else {
+                                insertIndex = methodsBodyList.findIndex((item) => item.includes('this.node = instance'));
+                            }
                             if (insertIndex >= 0) {
                                 methodsBodyList?.splice(insertIndex + 1, 0, ...[
-                                    '  TaroNativeModule.buildTaroNode(this.nodeContent, instance._nid)',
-                                    '  this.isReady = true',
+                                    this.isTabbarPage
+                                        ? '    TaroNativeModule.buildTaroNode(this.nodeContent[index], instance._nid)'
+                                        : '  TaroNativeModule.buildTaroNode(this.nodeContent, instance._nid)',
+                                    this.isTabbarPage ? '    this.isReady[index] = true' : '  this.isReady = true',
                                     isPure ? `  this.currentRouter = Current.router` : null,
                                     isPure ? `  eventCenter.on(this.currentRouter?.getEventName('onResize') || '', this.handlePageResizeEvent)` : null,
                                 ].filter(shared.isString));
@@ -552,15 +621,17 @@ function pagePlugin () {
                         });
                         methods.unshift({
                             name: 'getNavHeight',
-                            body: 'return this.isHideTitleBar ? 0 : 48 + this.statusBarHeight',
+                            body: this.isTabbarPage
+                                ? 'return this.isHideTitleBar[this.tabBarCurrentIndex] ? 0 : 48 + this.statusBarHeight[this.tabBarCurrentIndex]'
+                                : 'return this.isHideTitleBar ? 0 : 48 + this.statusBarHeight',
                         });
                         methods.push({
                             name: 'handlePageDetach',
                             type: 'arrow',
                             body: this.transArr2Str([
-                                `if (!this.isReady) return`,
+                                this.isTabbarPage ? `if (!this.isReady[this.tabBarCurrentIndex]) return` : `if (!this.isReady) return`,
                                 '',
-                                `this.isReady = false`,
+                                this.isTabbarPage ? `this.isReady[this.tabBarCurrentIndex] = false` : `this.isReady = false`,
                                 isPure
                                     ? `eventCenter.off(this.currentRouter?.getEventName('onResize'), this.handlePageResizeEvent)`
                                     : null,
@@ -928,10 +999,20 @@ function stylePlugin () {
                     }
                     const { outputRoot = 'dist', sourceRoot = 'src' } = this.buildConfig;
                     const targetRoot = path.resolve(this.appPath, sourceRoot);
-                    const styleName = `${page.originName}_style.json`;
-                    const styleJsonPath = path.resolve(targetRoot, styleName);
-                    importStr.push(`import styleJson from "${styleJsonPath}"`);
-                    PageMap.set(path.resolve(outputRoot, styleName), pluginContext.getModuleInfo(page.id));
+                    if (page instanceof Array) {
+                        page.forEach((p, i) => {
+                            const styleName = `${p.originName}_style.json`;
+                            const styleJsonPath = path.resolve(targetRoot, styleName);
+                            importStr.push(`import styleJson${i} from "${styleJsonPath}"`);
+                            PageMap.set(path.resolve(outputRoot, styleName), pluginContext.getModuleInfo(p.id));
+                        });
+                    }
+                    else {
+                        const styleName = `${page.originName}_style.json`;
+                        const styleJsonPath = path.resolve(targetRoot, styleName);
+                        importStr.push(`import styleJson from "${styleJsonPath}"`);
+                        PageMap.set(path.resolve(outputRoot, styleName), pluginContext.getModuleInfo(page.id));
+                    }
                 };
             };
             compiler?.pages?.forEach?.(modifyPageOrComp);
@@ -1127,10 +1208,9 @@ class Harmony extends dist.HarmonyOS_ArkTS {
 /* eslint-disable no-console */
 const argProjectPath = getProcessArg('lib');
 const argHapName = getProcessArg('hap');
-const staticDirname = 'static';
 let harName = `${PKG_NAME}-${PKG_VERSION}.har`;
-if (!helper.fs.existsSync(path.join(__dirname, '..', staticDirname, harName))) {
-    harName = require('fast-glob').sync('**/*.har', { cwd: path.join(__dirname, '..', staticDirname) })[0] || '';
+if (!helper.fs.existsSync(path.join(__dirname, '..', STATIC_FOLDER_NAME, harName))) {
+    harName = require('fast-glob').sync('**/*.har', { cwd: path.join(__dirname, '..', STATIC_FOLDER_NAME) })[0] || '';
 }
 var index = (ctx, options = {}) => {
     options.useChoreLibrary = options.useChoreLibrary ?? 'local';
@@ -1207,11 +1287,11 @@ var index = (ctx, options = {}) => {
                 }
             }
             else if (options.useChoreLibrary === 'local' && harName) {
-                const harPath = path.join(argProjectPath || projectPath, staticDirname, harName);
+                const harPath = path.join(argProjectPath || projectPath, STATIC_FOLDER_NAME, harName);
                 const harDir = path.dirname(harPath);
                 helper.fs.ensureDirSync(harDir);
                 helper.fs.emptyDirSync(harDir);
-                helper.fs.copyFileSync(path.join(program.harmonyCppPluginPath, staticDirname, harName), harPath);
+                helper.fs.copyFileSync(path.join(program.harmonyCppPluginPath, STATIC_FOLDER_NAME, harName), harPath);
             }
         }
     });
@@ -1233,4 +1313,5 @@ function assertHarmonyConfig(ctx, config) {
     }
 }
 
+exports.HarmonyCPP = Harmony;
 exports.default = index;