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

package/dist/runtime-utils.js

@@ -1,10 +1,10 @@
 import { isFunction, isString, isArray, isObject, isNull, isNumber, isUndefined, queryToJson, PLATFORM_TYPE, singleQuote, internalComponents } from '@tarojs/shared';
 import _display from '@ohos.display';
-import { Current, window, hooks, document as document$1, getPageScrollerOrNode, findChildNodeWithDFS, setNodeEventCallbackAndTriggerComponentUpdate, AREA_CHANGE_EVENT_NAME, disconnectEvent, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime';
+import { Current, window, hooks, document as document$1, getPageScrollerOrNode, findChildNodeWithDFS, setNodeEventCallbackAndTriggerComponentUpdate, AREA_CHANGE_EVENT_NAME, disconnectEvent, VISIBLE_CHANGE_EVENT_NAME, getCurrentInstance } from '@tarojs/runtime';
 import { eventCenter, Events, History } from '@tarojs/runtime/dist/runtime.esm';
+import ConfigurationConstant from '@ohos.app.ability.ConfigurationConstant';
 import deviceInfo from '@ohos.deviceInfo';
 import i18n from '@ohos.i18n';
-import deviceMethod from '@system.device';
 import errorManager from '@ohos.app.ability.errorManager';
 import sensor from '@ohos.sensor';
 import batteryInfo, { BatteryChargeState } from '@ohos.batteryInfo';
@@ -266,16 +266,49 @@ const preloadWebview = /* @__PURE__ */ temporarilyNotSupport('preloadWebview');
 const preloadSkylineView = /* @__PURE__ */ temporarilyNotSupport('preloadSkylineView');
 const preloadAssets = /* @__PURE__ */ temporarilyNotSupport('preloadAssets');
 
-// 设备信息,从 API Version 6 开始支持
-const display = _display.getDefaultDisplaySync();
-let device;
-deviceMethod.getInfo({
-    success: data => {
-        device = data;
-    }
+let display;
+let navigationIndicatorRect;
+let safeArea = null;
+let statusBarHeight;
+let windowRect;
+Current.contextPromise.then((context) => {
+    const win = window.__ohos.getLastWindow(context);
+    win.then(mainWindow => {
+        const topRect = mainWindow.getWindowAvoidArea(window.__ohos.AvoidAreaType.TYPE_SYSTEM).topRect;
+        navigationIndicatorRect = mainWindow.getWindowAvoidArea(window.__ohos.AvoidAreaType.TYPE_NAVIGATION_INDICATOR).bottomRect;
+        statusBarHeight = topRect.top + topRect.height;
+        windowRect = mainWindow.getWindowProperties().windowRect;
+        try {
+            display = _display.getDefaultDisplaySync();
+            // @ts-ignore
+            display.getCutoutInfo((err, { boundingRects = [], waterfallDisplayAreaRects = {} } = {}) => {
+                var _a, _b, _c, _d, _e, _f;
+                if (err === null || err === void 0 ? void 0 : err.code) {
+                    console.error('Failed to get cutout info', JSON.stringify(err));
+                    return;
+                }
+                const top = Math.max(...boundingRects.map(rect => rect.top + rect.height), ((_a = waterfallDisplayAreaRects.top) === null || _a === void 0 ? void 0 : _a.top) + ((_b = waterfallDisplayAreaRects.top) === null || _b === void 0 ? void 0 : _b.height), statusBarHeight);
+                const bottom = display.height - Math.min((_c = waterfallDisplayAreaRects.bottom) === null || _c === void 0 ? void 0 : _c.top, navigationIndicatorRect === null || navigationIndicatorRect === void 0 ? void 0 : navigationIndicatorRect.top);
+                const left = ((_d = waterfallDisplayAreaRects.left) === null || _d === void 0 ? void 0 : _d.left) + ((_e = waterfallDisplayAreaRects.left) === null || _e === void 0 ? void 0 : _e.width);
+                const right = display.width - ((_f = waterfallDisplayAreaRects.right) === null || _f === void 0 ? void 0 : _f.left);
+                safeArea = {
+                    top,
+                    bottom,
+                    left,
+                    right,
+                    height: bottom - top,
+                    width: right - left,
+                };
+            });
+        }
+        catch (e) {
+            console.error('Failed to get display', e);
+        }
+    });
 });
 /* 同步版本 */
 const getSystemInfoSync = function () {
+    var _a, _b;
     const res = {};
     res.SDKVersion = deviceInfo && deviceInfo.sdkApiVersion; // 客户端基础库版本 string
     res.albumAuthorized = false; // 允许使用相册的开关（仅 iOS 有效） boolean
@@ -285,7 +318,7 @@ const getSystemInfoSync = function () {
     res.cameraAuthorized = null; // 允许使用摄像头的开关 boolean
     res.enableDebug = null; // 是否已打开调试 boolean
     res.fontSizeSetting = null; // 用户字体大小（单位px） number
-    res.language = i18n && i18n.getSystemLanguage && i18n.getSystemLanguage(); // string
+    res.language = (_a = i18n === null || i18n === void 0 ? void 0 : i18n.getSystemLanguage) === null || _a === void 0 ? void 0 : _a.call(i18n); // string
     res.locationAuthorized = null; // 定位的开关 boolean
     res.locationEnabled = null; // 地理位置的系统开关 boolean
     res.microphoneAuthorized = null; // 麦克风的开关 boolean
@@ -296,17 +329,18 @@ const getSystemInfoSync = function () {
     res.notificationSoundAuthorized = false; // 通知带有声音的开关（仅 iOS 有效）boolean
     res.phoneCalendarAuthorized = null; // 使用日历的开关 boolean
     res.wifiEnabled = false; // Wi-Fi 的系统开关 boolean
-    res.pixelRatio = null; // 设备像素比,number
-    res.platform = 'android'; // 客户端平台 string
-    res.safeArea = null; // 在竖屏正方向下的安全区域 General.SafeAreaResult
-    res.screenHeight = display && display.height; // 屏幕高度，单位px number
-    res.screenWidth = display && display.width; // 屏幕宽度，单位px number
-    res.statusBarHeight = null; // 状态栏的高度，单位px number
-    res.system = deviceInfo && deviceInfo.osFullName; // 操作系统及版本 string
-    res.theme = null; // 系统当前主题，取值为light或dark 'light' | 'dark'
-    res.windowWidth = device && device.windowWidth; // 可使用窗口宽度，单位px number
-    res.windowHeight = device && device.windowHeight; // 可使用窗口高度，单位px number
-    res.version = deviceInfo && deviceInfo.displayVersion; // 版本号 string
+    res.pixelRatio = display && (Math.round(display.xDPI / display.width * 100) / 100); // 设备像素比,number
+    res.platform = 'harmony'; // 客户端平台 string
+    res.safeArea = safeArea; // 在竖屏正方向下的安全区域 General.SafeAreaResult
+    res.screenHeight = display === null || display === void 0 ? void 0 : display.height; // 屏幕高度，单位px number
+    res.screenWidth = display === null || display === void 0 ? void 0 : display.width; // 屏幕宽度，单位px number
+    res.statusBarHeight = statusBarHeight; // 状态栏的高度，单位px number
+    res.system = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.osFullName; // 操作系统及版本 string
+    // Note: 更新配置时才能记录
+    res.theme = ((_b = AppStorage.get('__TARO_APP_CONFIG')) === null || _b === void 0 ? void 0 : _b.colorMode) === ConfigurationConstant.ColorMode.COLOR_MODE_DARK ? 'dark' : 'light'; // 系统当前主题，取值为light或dark 'light' | 'dark'
+    res.windowHeight = windowRect === null || windowRect === void 0 ? void 0 : windowRect.height; // 可使用窗口高度，单位px number
+    res.windowWidth = windowRect === null || windowRect === void 0 ? void 0 : windowRect.width; // 可使用窗口宽度，单位px number
+    res.version = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.displayVersion; // 版本号 string
     return res;
 };
 /* 异步版本 */
@@ -1984,7 +2018,6 @@ function getEnv() {
 }
 // TODO
 const getCurrentPages = () => [];
-const getCurrentInstance = () => Current;
 const requirePlugin$1 = temporarilyNotSupport('requirePlugin');
 
 // @ts-nocheck
@@ -2611,10 +2644,10 @@ const request = function (options) {
             header['Content-Type'] = 'application/json';
         }
         // 检查 Header 是否有 Referer
-        if (isUndefined(header.Referer)) {
-            const error = { errMsg: 'request fail parameter error: the header doesn‘t support Referer property' };
-            callAsyncFail(reject, error, options);
-        }
+        // if (isUndefined(header.Referer)) {
+        //   const error = { errMsg: 'request fail parameter error: the header doesn‘t support Referer property' }
+        //   callAsyncFail(reject, error, options)
+        // }
         // 检查 method 是否正确
         if (method) {
             if (!METHOD.includes(method)) {
@@ -3060,6 +3093,19 @@ function parseURL(raw = '') {
     const [urlStr, queryStr = ''] = raw.split('?');
     const query = queryToJson(queryStr);
     let url = urlStr.replace(/^\//, '');
+    // 处理相对路径
+    if (url.indexOf('.') === 0) {
+        const page = router.getState();
+        const parts = page.path.split('/');
+        parts.pop();
+        url.split('/').forEach((item) => {
+            if (item === '.') {
+                return;
+            }
+            item === '..' ? parts.pop() : parts.push(item);
+        });
+        url = parts.join('/');
+    }
     if (isTabPage(url)) {
         query.$page = url;
         url = TARO_TABBAR_PAGE_PATH;
@@ -3177,107 +3223,152 @@ const getBackgroundFetchData = /* @__PURE__ */ temporarilyNotSupport('getBackgro
 // 周期性更新
 const createCacheManager = /* @__PURE__ */ temporarilyNotSupport('createCacheManager');
 
-const preferencesPromise = Current.contextPromise
-    .then((context) => {
-    return bundleManager
-        .getBundleInfoForSelf(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION)
-        .then(data => {
-        return dataPreferences
-            .getPreferences(context, `${data.appInfo.uid}Store`);
-    });
-})
-    .catch((error) => {
-    hilog.error(0x0000, 'TaroFailedTag', 'Failed to load the storage. Cause: %{public}s', error.code ? JSON.stringify(error) : error.message || error);
+/**
+ * 从API Version 6开始，该模块不再维护，可以使用模块@ohos.data.storage。在API Version 9后，推荐使用新模块@ohos.data.preferences。
+ * https://developer.harmonyos.com/cn/docs/documentation/doc-references-V3/js-apis-data-preferences-0000001427745052-V3
+*/
+let context;
+let preferences;
+Current.contextPromise.then((ctx) => {
+    context = ctx;
+    return context;
 });
-function getItem(key) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const preferences = yield preferencesPromise;
-            const item = yield preferences.get(key, null);
-            return { result: true, data: item };
-        }
-        catch (error) {
-            return { result: false };
+function getPreferences() {
+    try {
+        if (!preferences) {
+            const data = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION);
+            preferences = dataPreferences.getPreferencesSync(context, { name: `${data.appInfo.uid}Store` });
         }
-    });
+    }
+    catch (error) {
+        hilog.error(0x0000, 'TaroFailedTag', 'Failed to load the storage. Cause: %{public}s', error.code ? JSON.stringify(error) : error.message || error);
+    }
+    return preferences;
 }
 const storageSchema = {
     key: 'String'
 };
 function getStorage(options) {
+    const { key, success, fail, complete } = options || {};
+    const handle = new MethodHandler({ name: 'getStorage', success, fail, complete });
     return new Promise((resolve, reject) => {
         try {
             validateParams('getStorage', options, storageSchema);
         }
         catch (error) {
             const res = { errMsg: error.message };
-            return callAsyncFail(reject, res, options);
+            return handle.fail(res, { resolve, reject });
+        }
+        const preferences = getPreferences();
+        if (!preferences)
+            return handle.fail({}, { resolve, reject });
+        const data = preferences.getSync(key, null);
+        if (data) {
+            return handle.success({ data }, { resolve, reject });
+        }
+        else {
+            return handle.success({ errMsg: 'data not found' }, { resolve, reject });
         }
-        getItem(options.key).then(({ result, data }) => {
-            const res = { errMsg: 'getStorage:ok' };
-            if (result) {
-                res.data = data;
-                callAsyncSuccess(resolve, res, options);
-            }
-            else {
-                res.errMsg = 'getStorage:fail data not found';
-                callAsyncFail(reject, res, options);
-            }
-        });
     });
 }
+function getStorageSync(key) {
+    if (!key) {
+        throw new Error('getStorageSync:fail parameter error: parameter should be String');
+    }
+    const preferences = getPreferences();
+    if (!preferences) {
+        throw new Error('getStorageSync:fail:preferences is null');
+    }
+    const data = preferences.getSync(key, null);
+    if (data) {
+        return data;
+    }
+    else {
+        throw new Error('data not found');
+    }
+}
 function setStorage(options) {
+    const { key, data, success, fail, complete } = options || {};
+    const handle = new MethodHandler({ name: 'setStorage', success, fail, complete });
     return new Promise((resolve, reject) => {
         try {
             validateParams('setStorage', options, storageSchema);
         }
         catch (error) {
             const res = { errMsg: error.message };
-            return callAsyncFail(reject, res, options);
+            return handle.fail(res, { resolve, reject });
         }
-        const { key, data } = options;
-        const res = { errMsg: 'setStorage:ok' };
-        preferencesPromise.then((preferences) => __awaiter(this, void 0, void 0, function* () {
-            yield preferences.put(key, data);
-            yield preferences.flush();
-            callAsyncSuccess(resolve, res, options);
-        }));
+        const preferences = getPreferences();
+        if (!preferences)
+            return handle.fail({}, { resolve, reject });
+        preferences.putSync(key, data);
+        preferences.flush();
+        return handle.success({}, { resolve, reject });
     });
 }
+function setStorageSync(key, data) {
+    if (!key) {
+        throw new Error('setStorageSync:fail key error: key should be String');
+    }
+    const preferences = getPreferences();
+    if (!preferences) {
+        throw new Error('setStorageSync:fail:preferences is null');
+    }
+    preferences.putSync(key, data);
+    preferences.flush();
+}
 function removeStorage(options) {
+    const { key, success, fail, complete } = options || {};
+    const handle = new MethodHandler({ name: 'removeStorage', success, fail, complete });
     return new Promise((resolve, reject) => {
         try {
             validateParams('removeStorage', options, storageSchema);
         }
         catch (error) {
             const res = { errMsg: error.message };
-            return callAsyncFail(reject, res, options);
+            return handle.fail(res, { resolve, reject });
         }
-        const { key } = options;
-        preferencesPromise.then((preferences) => __awaiter(this, void 0, void 0, function* () {
-            yield preferences.delete(key);
-            yield preferences.flush();
-            const res = { errMsg: 'removeStorage:ok' };
-            callAsyncSuccess(resolve, res, options);
-        }));
+        const preferences = getPreferences();
+        if (!preferences)
+            return handle.fail({}, { resolve, reject });
+        preferences.deleteSync(key);
+        preferences.flush();
+        return handle.success({}, { resolve, reject });
     });
 }
+function removeStorageSync(key) {
+    if (!key) {
+        throw new Error('removeStorageSync:fail key error: key should be String');
+    }
+    const preferences = getPreferences();
+    if (!preferences) {
+        throw new Error('removeStorageSync:fail:preferences is null');
+    }
+    preferences.deleteSync(key);
+    preferences.flush();
+}
 function clearStorage(options) {
-    return new Promise(resolve => {
-        preferencesPromise.then((preferences) => __awaiter(this, void 0, void 0, function* () {
-            yield preferences.clear();
-            yield preferences.flush();
-            const res = { errMsg: 'clearStorage:ok' };
-            callAsyncSuccess(resolve, res, options);
-        }));
+    const { success, fail, complete } = options || {};
+    const handle = new MethodHandler({ name: 'clearStorage', success, fail, complete });
+    return new Promise((resolve, reject) => {
+        const preferences = getPreferences();
+        if (!preferences)
+            return handle.fail({}, { resolve, reject });
+        preferences.clearSync();
+        preferences.flush();
+        return handle.success({}, { resolve, reject });
     });
 }
+function clearStorageSync() {
+    const preferences = getPreferences();
+    if (!preferences) {
+        throw new Error('clearStorageSync:fail:preferences is null');
+    }
+    preferences.clearSync();
+    preferences.flush();
+}
 const getStorageInfoSync = temporarilyNotSupport('getStorageInfoSync');
 const getStorageInfo = temporarilyNotSupport('getStorageInfo');
-const getStorageSync = temporarilyNotSupport('getStorageSync', 'getStorage');
-const setStorageSync = temporarilyNotSupport('setStorageSync', 'setStorage');
-const clearStorageSync = temporarilyNotSupport('clearStorageSync', 'clearStorage');
-const removeStorageSync = temporarilyNotSupport('removeStorageSync', 'removeStorage');
 const createBufferURL = /* @__PURE__ */ temporarilyNotSupport('createBufferURL');
 const revokeBufferURL = /* @__PURE__ */ temporarilyNotSupport('revokeBufferURL');
 const batchSetStorageSync = /* @__PURE__ */ temporarilyNotSupport('batchSetStorageSync');
@@ -3908,13 +3999,12 @@ class IntersectionObserver {
         };
         const taro = Current.taro;
         const page = taro.getCurrentInstance().page;
-        const currentPage = getPageScrollerOrNode(page.node, page);
-        this._component = component || currentPage;
+        this._component = component || getPageScrollerOrNode(page === null || page === void 0 ? void 0 : page.node, page);
         Object.assign(this._options, options);
     }
     disconnect() {
         var _a;
-        if (this._observerNodes) {
+        if (this._observerNodes && this._component) {
             if (this._observerNodes instanceof Array) {
                 this._observerNodes.forEach((n) => {
                     var _a;
@@ -3935,6 +4025,8 @@ class IntersectionObserver {
     }
     observe(targetSelector, callback) {
         var _a;
+        if (!this._component)
+            return;
         const { observeAll, thresholds } = this._options;
         const node = findChildNodeWithDFS(this._component, targetSelector, observeAll);
         this._observerNodes = node;
@@ -4280,6 +4372,7 @@ var apis = /*#__PURE__*/Object.freeze({
   ENV_TYPE: ENV_TYPE,
   Events: Events,
   History: History,
+  IntersectionObserver: IntersectionObserver,
   addCard: addCard,
   addFileToFavorites: addFileToFavorites,
   addPhoneCalendar: addPhoneCalendar,
@@ -4669,7 +4762,7 @@ var apis = /*#__PURE__*/Object.freeze({
   writeBLECharacteristicValue: writeBLECharacteristicValue
 });
 
-Object.assign({}, apis);
+const taro = Object.assign({}, apis);
 const requirePlugin = /* @__PURE__ */ permanentlyNotSupport('requirePlugin');
 function initNativeApi(taro) {
     Current.taro = taro;
@@ -4693,7 +4786,7 @@ const defaultBaseFontSize = 20;
 const defaultUnitPrecision = 5;
 const defaultTargetUnit = 'vp';
 function getApp$1() {
-    return Current.app;
+    return Current.app || {};
 }
 function initPxTransform({ designWidth = defaultDesignWidth, deviceRatio = defaultDesignRatio, baseFontSize = defaultBaseFontSize, unitPrecision = defaultUnitPrecision, targetUnit = defaultTargetUnit }) {
     const taro = Current.taro;
@@ -4733,6 +4826,7 @@ function getAppInfo() {
         designWidth: config === null || config === void 0 ? void 0 : config.designWidth,
     };
 }
+initNativeApi(taro);
 
 const components = {
     Checkbox: {