@tarojs/plugin-platform-harmony-ets 4.0.0-beta.30 → 4.0.0-beta.31

package/dist/runtime.js

@@ -3241,7 +3241,7 @@ Current.contextPromise.then((ctx) => {
 });
 function getPreferences() {
     try {
-        if (!preferences) {
+        if (!preferences && context) {
             const data = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION);
             preferences = dataPreferences.getPreferencesSync(context, { name: `${data.appInfo.uid}Store` });
         }
@@ -3254,12 +3254,37 @@ function getPreferences() {
 const storageSchema = {
     key: 'String'
 };
+function checkContextExist(api, isAsync = false) {
+    if (!context) {
+        const message = `${api} 调用失败，Taro 不支持过早地调用 ${api}，请确保页面已经渲染完成再调用此 API`;
+        if (isAsync) {
+            return {
+                isExist: false,
+                error: Promise.reject(new Error(message))
+            };
+        }
+        else {
+            console.warn(message);
+            return {
+                isExist: false,
+            };
+        }
+    }
+    return {
+        isExist: true,
+    };
+}
 function getStorage(options) {
+    const name = 'getStorage';
+    const { isExist, error } = checkContextExist(name, true);
+    if (!isExist) {
+        return error;
+    }
     const { key, success, fail, complete } = options || {};
-    const handle = new MethodHandler({ name: 'getStorage', success, fail, complete });
+    const handle = new MethodHandler({ name, success, fail, complete });
     return new Promise((resolve, reject) => {
         try {
-            validateParams('getStorage', options, storageSchema);
+            validateParams(name, options, storageSchema);
         }
         catch (error) {
             const res = { errMsg: error.message };
@@ -3278,12 +3303,17 @@ function getStorage(options) {
     });
 }
 function getStorageSync(key) {
+    const name = 'getStorageSync';
+    const { isExist, error } = checkContextExist(name, false);
+    if (!isExist) {
+        return error;
+    }
     if (!key) {
-        throw new Error('getStorageSync:fail parameter error: parameter should be String');
+        throw new Error(`${name}:fail parameter error: parameter should be String`);
     }
     const preferences = getPreferences();
     if (!preferences) {
-        throw new Error('getStorageSync:fail:preferences is null');
+        throw new Error(`${name}:fail:preferences is null`);
     }
     const data = preferences.getSync(key, null);
     if (data) {
@@ -3294,11 +3324,16 @@ function getStorageSync(key) {
     }
 }
 function setStorage(options) {
+    const name = 'setStorage';
+    const { isExist, error } = checkContextExist(name, true);
+    if (!isExist) {
+        return error;
+    }
     const { key, data, success, fail, complete } = options || {};
-    const handle = new MethodHandler({ name: 'setStorage', success, fail, complete });
+    const handle = new MethodHandler({ name, success, fail, complete });
     return new Promise((resolve, reject) => {
         try {
-            validateParams('setStorage', options, storageSchema);
+            validateParams(name, options, storageSchema);
         }
         catch (error) {
             const res = { errMsg: error.message };
@@ -3313,22 +3348,32 @@ function setStorage(options) {
     });
 }
 function setStorageSync(key, data) {
+    const name = 'setStorageSync';
+    const { isExist, error } = checkContextExist(name, false);
+    if (!isExist) {
+        return error;
+    }
     if (!key) {
-        throw new Error('setStorageSync:fail key error: key should be String');
+        throw new Error(`${name}:fail key error: key should be String`);
     }
     const preferences = getPreferences();
     if (!preferences) {
-        throw new Error('setStorageSync:fail:preferences is null');
+        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);
+    if (!isExist) {
+        return error;
+    }
     const { key, success, fail, complete } = options || {};
-    const handle = new MethodHandler({ name: 'removeStorage', success, fail, complete });
+    const handle = new MethodHandler({ name, success, fail, complete });
     return new Promise((resolve, reject) => {
         try {
-            validateParams('removeStorage', options, storageSchema);
+            validateParams(name, options, storageSchema);
         }
         catch (error) {
             const res = { errMsg: error.message };
@@ -3343,19 +3388,29 @@ function removeStorage(options) {
     });
 }
 function removeStorageSync(key) {
+    const name = 'removeStorageSync';
+    const { isExist, error } = checkContextExist(name, false);
+    if (!isExist) {
+        return error;
+    }
     if (!key) {
-        throw new Error('removeStorageSync:fail key error: key should be String');
+        throw new Error(`${name}:fail key error: key should be String`);
     }
     const preferences = getPreferences();
     if (!preferences) {
-        throw new Error('removeStorageSync:fail:preferences is null');
+        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: 'clearStorage', success, fail, complete });
+    const handle = new MethodHandler({ name, success, fail, complete });
     return new Promise((resolve, reject) => {
         const preferences = getPreferences();
         if (!preferences)
@@ -3366,9 +3421,14 @@ function clearStorage(options) {
     });
 }
 function clearStorageSync() {
+    const name = 'clearStorageSync';
+    const { isExist, error } = checkContextExist(name, false);
+    if (!isExist) {
+        return error;
+    }
     const preferences = getPreferences();
     if (!preferences) {
-        throw new Error('clearStorageSync:fail:preferences is null');
+        throw new Error(`${name}:fail:preferences is null`);
     }
     preferences.clearSync();
     preferences.flush();