@tarojs/plugin-platform-harmony-ets 4.0.0-beta.40 → 4.0.0-beta.42

package/dist/runtime-utils.js

@@ -28,11 +28,10 @@ import http from '@ohos.net.http';
 import webSocket from '@ohos.net.webSocket';
 import router from '@ohos.router';
 import bundleManager from '@ohos.bundle.bundleManager';
-import dataPreferences from '@ohos.data.preferences';
-import hilog from '@ohos.hilog';
+import distributedKVStore from '@ohos.data.distributedKVStore';
 import matrix4 from '@ohos.matrix4';
 import prompt from '@ohos.prompt';
-import { pxTransformHelper } from '@tarojs/taro';
+import { pxTransformHelper as pxTransformHelper$1 } from '@tarojs/taro';
 
 class MethodHandler {
     constructor({ name, success, fail, complete }) {
@@ -3234,28 +3233,48 @@ const createCacheManager = /* @__PURE__ */ temporarilyNotSupport('createCacheMan
  * https://developer.harmonyos.com/cn/docs/documentation/doc-references-V3/js-apis-data-preferences-0000001427745052-V3
 */
 let context;
-let preferences;
+let kvManager;
+let kvStore;
 Current.contextPromise.then((ctx) => {
     context = ctx;
-    return context;
-});
-function getPreferences() {
+    const kvManagerConfig = {
+        context: context,
+        bundleName: 'com.example.taro'
+    };
     try {
-        if (!preferences && context) {
-            const data = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION);
-            preferences = dataPreferences.getPreferencesSync(context, { name: `${data.appInfo.uid}Store` });
-        }
+        // 创建KVManager实例
+        kvManager = distributedKVStore.createKVManager(kvManagerConfig);
+        // 继续创建获取数据库
+        const options = {
+            createIfMissing: true,
+            encrypt: false,
+            backup: false,
+            autoSync: false,
+            // kvStoreType不填时，默认创建多设备协同数据库
+            kvStoreType: distributedKVStore.KVStoreType.SINGLE_VERSION,
+            // 多设备协同数据库：kvStoreType: distributedKVStore.KVStoreType.DEVICE_COLLABORATION,
+            securityLevel: distributedKVStore.SecurityLevel.S1
+        };
+        const data = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION);
+        kvManager.getKVStore(`${data.appInfo.uid}Store`, options, (err, store) => {
+            if (err) {
+                console.error(`Failed to get KVStore: Code:${err.code},message:${err.message}`);
+                return;
+            }
+            kvStore = store;
+            // 请确保获取到键值数据库实例后，再进行相关数据操作
+        });
     }
-    catch (error) {
-        hilog.error(0x0000, 'TaroFailedTag', 'Failed to load the storage. Cause: %{public}s', error.code ? JSON.stringify(error) : error.message || error);
+    catch (e) {
+        console.error(`Failed to create KVManager. Code:${e.code},message:${e.message}`);
     }
-    return preferences;
-}
+    return context;
+});
 const storageSchema = {
     key: 'String'
 };
 function checkContextExist(api, isAsync = false) {
-    if (!context) {
+    if (!context || !kvStore) {
         const message = `${api} 调用失败，Taro 不支持过早地调用 ${api}，请确保页面已经渲染完成再调用此 API`;
         if (isAsync) {
             return {
@@ -3290,39 +3309,16 @@ function getStorage(options) {
             const res = { errMsg: error.message };
             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 });
-        }
+        kvStore = kvStore;
+        kvStore.get(key, (err, data) => {
+            if (err) {
+                handle.fail({ errMsg: `Failed to get data. Code:${err.code},message:${err.message}` }, { resolve, reject });
+                return;
+            }
+            handle.success({ data }, { resolve, reject });
+        });
     });
 }
-function getStorageSync(key) {
-    const name = 'getStorageSync';
-    const { isExist, error } = checkContextExist(name, false);
-    if (!isExist) {
-        return error;
-    }
-    if (!key) {
-        throw new Error(`${name}:fail parameter error: parameter should be String`);
-    }
-    const preferences = getPreferences();
-    if (!preferences) {
-        throw new Error(`${name}: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 name = 'setStorage';
     const { isExist, error } = checkContextExist(name, true);
@@ -3339,30 +3335,16 @@ function setStorage(options) {
             const res = { errMsg: error.message };
             return handle.fail(res, { resolve, reject });
         }
-        const preferences = getPreferences();
-        if (!preferences)
-            return handle.fail({}, { resolve, reject });
-        preferences.putSync(key, data);
-        preferences.flush();
-        return handle.success({}, { resolve, reject });
+        kvStore = kvStore;
+        kvStore.put(key, data, (err) => {
+            if (err) {
+                handle.fail({ errMsg: `Failed to put data. Code:${err.code},message:${err.message}` }, { resolve, reject });
+                return;
+            }
+            handle.success({}, { resolve, reject });
+        });
     });
 }
-function setStorageSync(key, data) {
-    const name = 'setStorageSync';
-    const { isExist, error } = checkContextExist(name, false);
-    if (!isExist) {
-        return error;
-    }
-    if (!key) {
-        throw new Error(`${name}:fail key error: key should be String`);
-    }
-    const preferences = getPreferences();
-    if (!preferences) {
-        throw new Error(`${name}:fail:preferences is null`);
-    }
-    preferences.putSync(key, data);
-    preferences.flush();
-}
 function removeStorage(options) {
     const name = 'removeStorage';
     const { isExist, error } = checkContextExist(name, true);
@@ -3379,60 +3361,16 @@ function removeStorage(options) {
             const res = { errMsg: error.message };
             return handle.fail(res, { resolve, reject });
         }
-        const preferences = getPreferences();
-        if (!preferences)
-            return handle.fail({}, { resolve, reject });
-        preferences.deleteSync(key);
-        preferences.flush();
-        return handle.success({}, { resolve, reject });
-    });
-}
-function removeStorageSync(key) {
-    const name = 'removeStorageSync';
-    const { isExist, error } = checkContextExist(name, false);
-    if (!isExist) {
-        return error;
-    }
-    if (!key) {
-        throw new Error(`${name}:fail key error: key should be String`);
-    }
-    const preferences = getPreferences();
-    if (!preferences) {
-        throw new Error(`${name}:fail:preferences is null`);
-    }
-    preferences.deleteSync(key);
-    preferences.flush();
-}
-function clearStorage(options) {
-    const name = 'clearStorage';
-    const { isExist, error } = checkContextExist(name, true);
-    if (!isExist) {
-        return error;
-    }
-    const { success, fail, complete } = options || {};
-    const handle = new MethodHandler({ name, 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 });
+        kvStore = kvStore;
+        kvStore.delete(key, (err) => {
+            if (err) {
+                handle.fail({ errMsg: `Failed to delete data. Code:${err.code},message:${err.message}` }, { resolve, reject });
+                return;
+            }
+            handle.success({}, { resolve, reject });
+        });
     });
 }
-function clearStorageSync() {
-    const name = 'clearStorageSync';
-    const { isExist, error } = checkContextExist(name, false);
-    if (!isExist) {
-        return error;
-    }
-    const preferences = getPreferences();
-    if (!preferences) {
-        throw new Error(`${name}:fail:preferences is null`);
-    }
-    preferences.clearSync();
-    preferences.flush();
-}
 const getStorageInfoSync = temporarilyNotSupport('getStorageInfoSync');
 const getStorageInfo = temporarilyNotSupport('getStorageInfo');
 const createBufferURL = /* @__PURE__ */ temporarilyNotSupport('createBufferURL');
@@ -3441,6 +3379,11 @@ const batchSetStorageSync = /* @__PURE__ */ temporarilyNotSupport('batchSetStora
 const batchSetStorage = /* @__PURE__ */ temporarilyNotSupport('batchSetStorage');
 const batchGetStorageSync = /* @__PURE__ */ temporarilyNotSupport('batchGetStorageSync');
 const batchGetStorage = /* @__PURE__ */ temporarilyNotSupport('batchGetStorage');
+const clearStorage = temporarilyNotSupport('removeStorageSync');
+const getStorageSync = temporarilyNotSupport('getStorageSync', 'getStorage');
+const setStorageSync = temporarilyNotSupport('setStorageSync', 'setStorage');
+const clearStorageSync = temporarilyNotSupport('clearStorageSync', 'clearStorage');
+const removeStorageSync = temporarilyNotSupport('removeStorageSync', 'removeStorage');
 
 class Animation {
     constructor({ duration = 400, delay = 0, timingFunction = 'linear', transformOrigin = '50% 50% 0', unit = 'px' } = {}) {
@@ -3880,7 +3823,7 @@ const pageScrollTo = (options) => {
             scroller = getPageScrollerOrNode(scroller, page);
             const { yOffset } = scroller.currentOffset();
             if (areaInfo) {
-                scrollValue = areaInfo.globalPosition.y + yOffset + pxTransformHelper(offsetTop, 'px', true);
+                scrollValue = areaInfo.globalPosition.y + yOffset + pxTransformHelper$1(offsetTop, 'px', true);
             }
         }
         const { xOffset } = scroller.currentOffset();
@@ -4880,7 +4823,49 @@ function initPxTransform({ designWidth = defaultDesignWidth, deviceRatio = defau
     }
 }
 const display = _display.getDefaultDisplaySync();
-display.width;
+let displayWidth = display.width;
+let ratioCache = false;
+let designWidthFunc;
+let designWidth = defaultDesignWidth;
+let deviceRatio = defaultDesignRatio;
+function getRatio(value) {
+    var _a;
+    // Note: 提前调用 display 可能无法获取正确值
+    if (ratioCache === false || displayWidth !== display.width) {
+        const config = ((_a = Current.taro) === null || _a === void 0 ? void 0 : _a.config) || {};
+        if (!isFunction(designWidthFunc)) {
+            designWidthFunc = isFunction(config.designWidth)
+                ? config.designWidth
+                : () => config.designWidth;
+            designWidth = designWidthFunc(value) || defaultDesignWidth;
+            deviceRatio = config.deviceRatio || defaultDesignRatio;
+            if (!(designWidth in deviceRatio)) {
+                throw new Error(`deviceRatio 配置中不存在 ${designWidth} 的设置！`);
+            }
+        }
+        displayWidth = display.width;
+        ratioCache = Math.min(display.width, display.height) / designWidth;
+    }
+    return ratioCache;
+}
+// Note: 设置为 style 单位时会自动完成设计稿转换，设计开发者调用 API 时也许抹平差异，例如 pageScrollTo[option.offsetTop]
+function pxTransformHelper(size, unit, isNumber = false) {
+    var _a;
+    const config = ((_a = Current.taro) === null || _a === void 0 ? void 0 : _a.config) || {};
+    const targetUnit = unit || config.targetUnit || defaultTargetUnit;
+    if (targetUnit === 'PX') {
+        return px2vp(size * display.scaledDensity) + 'vp';
+    }
+    const ratio = getRatio(size);
+    let val = size * ratio;
+    switch (targetUnit) {
+        case 'vp':
+            // Note: 在应用创建前调用无效
+            val = px2vp(val);
+            break;
+    }
+    return isNumber ? val : val + targetUnit;
+}
 function pxTransform(size) {
     var _a;
     const config = ((_a = Current.taro) === null || _a === void 0 ? void 0 : _a.config) || {};
@@ -4888,8 +4873,7 @@ function pxTransform(size) {
     const val = size;
     switch (targetUnit) {
         case 'vp':
-            // return pxTransformHelper(size, 'px')
-            return `${size}lpx`;
+            return pxTransformHelper(size, 'px');
         // NOTE: 鸿蒙环境下 style 会自动完成设计稿转换，无需在方法内二次调整
     }
     return val + targetUnit;