@pisell/core 1.0.4 → 1.0.6

package/es/locales/index.d.ts

@@ -13,27 +13,27 @@ export declare class Locales {
         [key in Locale]: LibraryItem;
     };
     constructor(app: App, options?: LocalesOptions);
-    getLocale(): string;
-    getCurrentTexts(locale?: Locale): {
+    getLocale: () => string;
+    getCurrentTexts: (locale?: Locale) => {
         [key: string]: string;
     };
-    setLocale(locale: Locale, reload?: boolean): void;
-    getText(id: string, locale?: Locale): string;
-    isCN(): boolean;
+    setLocale: (locale: Locale, reload?: boolean) => void;
+    getText: (id: string, locale?: Locale) => string;
+    isCN: () => boolean;
     loadLibraryByUrl: (urls: LoadLibraryByUrlParams) => Promise<{
         [x: string]: LibraryItem;
     }>;
     loadLibraryByItems(libraryList: LibraryItem[]): void;
-    loadLibrary(urls: LoadLibraryByUrlParams): Promise<{
+    loadLibrary: (urls: LoadLibraryByUrlParams) => Promise<{
         [x: string]: LibraryItem;
     }>;
-    translation(text: string | {
-        [key: Locale]: string;
-    }, locale?: Locale): string | number;
-    getLibraryByData(data: LibraryItem[]): LibraryItem;
-    createTextsByLibrary(id: string, library?: {
-        [key in Locale]: LibraryItem;
-    }): {
+    translation: (text: string | {
+        [key: string]: string;
+    }, locale?: Locale) => string | number;
+    getLibraryByData: (data: LibraryItem[]) => LibraryItem;
+    createTextsByLibrary: (id: string, library?: {
+        [x: string]: LibraryItem;
+    } | undefined) => {
         [x: string]: string;
     };
 }

package/es/locales/index.js

@@ -32,6 +32,28 @@ export var Locales = /*#__PURE__*/function () {
       pre[cur.locale] = cur;
       return pre;
     }, {}));
+    _defineProperty(this, "getLocale", function () {
+      return _this.locale;
+    });
+    _defineProperty(this, "getCurrentTexts", function (locale) {
+      return _this.library[locale || _this.locale].translations;
+    });
+    _defineProperty(this, "setLocale", function (locale) {
+      var reload = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      _this.locale = locale;
+      if (reload) {
+        window.location.reload();
+        return;
+      }
+    });
+    _defineProperty(this, "getText", function (id, locale) {
+      var _this$getCurrentTexts;
+      return ((_this$getCurrentTexts = _this.getCurrentTexts(locale)) === null || _this$getCurrentTexts === void 0 ? void 0 : _this$getCurrentTexts[id]) || id;
+    });
+    _defineProperty(this, "isCN", function () {
+      var locale = _this.getLocale();
+      return locale === "zh-CN" || locale === "zh-HK";
+    });
     _defineProperty(this, "loadLibraryByUrl", /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(urls) {
         var fetchList, res, library, _iterator, _step, item, _item;
@@ -121,87 +143,29 @@ export var Locales = /*#__PURE__*/function () {
         return _ref.apply(this, arguments);
       };
     }());
-    this.app = app;
-    this.locale = (options === null || options === void 0 ? void 0 : options.locale) || this.app.storage.getStorage('locale') || en.locale;
-    this.library = (options === null || options === void 0 ? void 0 : options.library) || [original, en, zhCN, zhHK].reduce(function (pre, cur) {
-      pre[cur.locale] = cur;
-      return pre;
-    }, {});
-  }
-  _createClass(Locales, [{
-    key: "getLocale",
-    value: function getLocale() {
-      return this.locale;
-    }
-  }, {
-    key: "getCurrentTexts",
-    value: function getCurrentTexts(locale) {
-      return this.library[locale || this.locale].translations;
-    }
-  }, {
-    key: "setLocale",
-    value: function setLocale(locale) {
-      var reload = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      this.locale = locale;
-      if (reload) {
-        window.location.reload();
-        return;
-      }
-    }
-  }, {
-    key: "getText",
-    value: function getText(id, locale) {
-      var _this$getCurrentTexts;
-      return ((_this$getCurrentTexts = this.getCurrentTexts(locale)) === null || _this$getCurrentTexts === void 0 ? void 0 : _this$getCurrentTexts[id]) || id;
-    }
-  }, {
-    key: "isCN",
-    value: function isCN() {
-      var locale = this.getLocale();
-      return locale === "zh-CN" || locale === "zh-HK";
-    }
-  }, {
-    key: "loadLibraryByItems",
-    value: function loadLibraryByItems(libraryList) {
-      var library = _objectSpread({}, this.library);
-      libraryList.forEach(function (item) {
-        library = _objectSpread(_objectSpread({}, library), {}, _defineProperty({}, item.locale, _.mergeWith(library[item.locale] || {}, item)));
-      });
-
-      // 设置
-      this.library = library;
-    }
-  }, {
-    key: "loadLibrary",
-    value: function loadLibrary(urls) {
-      return this.loadLibraryByUrl(urls);
-    }
-  }, {
-    key: "translation",
-    value: function translation(text, locale) {
+    _defineProperty(this, "loadLibrary", function (urls) {
+      return _this.loadLibraryByUrl(urls);
+    });
+    _defineProperty(this, "translation", function (text, locale) {
       if (!text) {
         return "";
       }
       if (isString(text) || isNumber(text)) {
         return text;
       }
-      var primary = locale || this.getLocale();
+      var primary = locale || _this.getLocale();
       if (typeof text === 'string') {
         return text;
       }
       return text[primary] || text["original"] || text["en"] || text["zh-CN"] || text["zh-HK"];
-    }
-  }, {
-    key: "getLibraryByData",
-    value: function getLibraryByData(data) {
+    });
+    _defineProperty(this, "getLibraryByData", function (data) {
       return data.reduce(function (pre, next) {
         return _objectSpread(_objectSpread({}, pre), {}, _defineProperty({}, next.locale, next));
       }, {});
-    }
-  }, {
-    key: "createTextsByLibrary",
-    value: function createTextsByLibrary(id, library) {
-      var _library = library || this.library;
+    });
+    _defineProperty(this, "createTextsByLibrary", function (id, library) {
+      var _library = library || _this.library;
       return Object.keys(_library).reduce(function (pre, next) {
         var _library$next$transla;
         var _pre = _objectSpread({}, pre);
@@ -211,6 +175,24 @@ export var Locales = /*#__PURE__*/function () {
         }
         return _pre;
       }, {});
+    });
+    this.app = app;
+    this.locale = (options === null || options === void 0 ? void 0 : options.locale) || this.app.storage.getStorage('locale') || en.locale;
+    this.library = (options === null || options === void 0 ? void 0 : options.library) || [original, en, zhCN, zhHK].reduce(function (pre, cur) {
+      pre[cur.locale] = cur;
+      return pre;
+    }, {});
+  }
+  _createClass(Locales, [{
+    key: "loadLibraryByItems",
+    value: function loadLibraryByItems(libraryList) {
+      var library = _objectSpread({}, this.library);
+      libraryList.forEach(function (item) {
+        library = _objectSpread(_objectSpread({}, library), {}, _defineProperty({}, item.locale, _.mergeWith(library[item.locale] || {}, item)));
+      });
+
+      // 设置
+      this.library = library;
     }
   }]);
   return Locales;

package/es/routes/index.js

@@ -121,7 +121,10 @@ export var RouterManager = /*#__PURE__*/function () {
           firstRoute = path;
         }
         var component = this.renderComponent(item);
-        routes.push( /*#__PURE__*/React.createElement(Route, {
+        routes.push(
+        /*#__PURE__*/
+        //@ts-ignore
+        React.createElement(Route, {
           path: path,
           key: path,
           exact: true

package/es/storage/index.d.ts

@@ -9,9 +9,9 @@ export declare class Storage {
     private app?;
     private options;
     constructor(app?: App, options?: StorageOptions);
-    createKey(key: string): string;
-    setStorage(key: string, value: string): void;
-    getStorage(key: string): string | null;
-    removeStorage(key: string): void;
-    clear(): void;
+    createKey: (key: string) => string;
+    setStorage: (key: string, value: string) => void;
+    getStorage: (key: string) => string | null;
+    removeStorage: (key: string) => void;
+    clear: () => void;
 }

package/es/storage/index.js

@@ -1,56 +1,43 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-export var Storage = /*#__PURE__*/function () {
-  function Storage(app, options) {
-    _classCallCheck(this, Storage);
-    _defineProperty(this, "storageKey", 'CapacitorStorage.native_');
-    _defineProperty(this, "app", void 0);
-    _defineProperty(this, "options", {});
-    this.app = app;
-    if (options) {
-      this.options = options;
-    }
-    if (options !== null && options !== void 0 && options.storageKey) {
-      this.storageKey = options.storageKey;
+export var Storage = /*#__PURE__*/_createClass(function Storage(app, options) {
+  var _this = this;
+  _classCallCheck(this, Storage);
+  _defineProperty(this, "storageKey", 'CapacitorStorage.native_');
+  _defineProperty(this, "app", void 0);
+  _defineProperty(this, "options", {});
+  _defineProperty(this, "createKey", function (key) {
+    if (key.indexOf(_this.storageKey) !== -1) {
+      return key;
     }
+    return _this.storageKey + key;
+  });
+  _defineProperty(this, "setStorage", function (key, value) {
+    var _this$options, _this$options$setStor;
+    localStorage.setItem(_this.createKey(key), value);
+    (_this$options = _this.options) === null || _this$options === void 0 || (_this$options$setStor = _this$options.setStorageAfter) === null || _this$options$setStor === void 0 || _this$options$setStor.call(_this$options, key, value);
+  });
+  _defineProperty(this, "getStorage", function (key) {
+    return localStorage.getItem(_this.createKey(key));
+  });
+  _defineProperty(this, "removeStorage", function (key) {
+    var _this$options2, _this$options2$remove;
+    localStorage.removeItem(_this.createKey(key));
+    (_this$options2 = _this.options) === null || _this$options2 === void 0 || (_this$options2$remove = _this$options2.removeStorageAfter) === null || _this$options2$remove === void 0 || _this$options2$remove.call(_this$options2, key);
+  });
+  _defineProperty(this, "clear", function () {
+    localStorage.clear();
+  });
+  this.app = app;
+  if (options) {
+    this.options = options;
   }
-  _createClass(Storage, [{
-    key: "createKey",
-    value: function createKey(key) {
-      if (key.indexOf(this.storageKey) !== -1) {
-        return key;
-      }
-      return this.storageKey + key;
-    }
-  }, {
-    key: "setStorage",
-    value: function setStorage(key, value) {
-      var _this$options, _this$options$setStor;
-      localStorage.setItem(this.createKey(key), value);
-      (_this$options = this.options) === null || _this$options === void 0 || (_this$options$setStor = _this$options.setStorageAfter) === null || _this$options$setStor === void 0 || _this$options$setStor.call(_this$options, key, value);
-    }
-  }, {
-    key: "getStorage",
-    value: function getStorage(key) {
-      return localStorage.getItem(this.createKey(key));
-    }
-  }, {
-    key: "removeStorage",
-    value: function removeStorage(key) {
-      var _this$options2, _this$options2$remove;
-      localStorage.removeItem(this.createKey(key));
-      (_this$options2 = this.options) === null || _this$options2 === void 0 || (_this$options2$remove = _this$options2.removeStorageAfter) === null || _this$options2$remove === void 0 || _this$options2$remove.call(_this$options2, key);
-    }
-  }, {
-    key: "clear",
-    value: function clear() {
-      localStorage.clear();
-    }
-  }]);
-  return Storage;
-}();
+  if (options !== null && options !== void 0 && options.storageKey) {
+    this.storageKey = options.storageKey;
+  }
+});

package/lib/locales/index.d.ts

@@ -13,27 +13,27 @@ export declare class Locales {
         [key in Locale]: LibraryItem;
     };
     constructor(app: App, options?: LocalesOptions);
-    getLocale(): string;
-    getCurrentTexts(locale?: Locale): {
+    getLocale: () => string;
+    getCurrentTexts: (locale?: Locale) => {
         [key: string]: string;
     };
-    setLocale(locale: Locale, reload?: boolean): void;
-    getText(id: string, locale?: Locale): string;
-    isCN(): boolean;
+    setLocale: (locale: Locale, reload?: boolean) => void;
+    getText: (id: string, locale?: Locale) => string;
+    isCN: () => boolean;
     loadLibraryByUrl: (urls: LoadLibraryByUrlParams) => Promise<{
         [x: string]: LibraryItem;
     }>;
     loadLibraryByItems(libraryList: LibraryItem[]): void;
-    loadLibrary(urls: LoadLibraryByUrlParams): Promise<{
+    loadLibrary: (urls: LoadLibraryByUrlParams) => Promise<{
         [x: string]: LibraryItem;
     }>;
-    translation(text: string | {
-        [key: Locale]: string;
-    }, locale?: Locale): string | number;
-    getLibraryByData(data: LibraryItem[]): LibraryItem;
-    createTextsByLibrary(id: string, library?: {
-        [key in Locale]: LibraryItem;
-    }): {
+    translation: (text: string | {
+        [key: string]: string;
+    }, locale?: Locale) => string | number;
+    getLibraryByData: (data: LibraryItem[]) => LibraryItem;
+    createTextsByLibrary: (id: string, library?: {
+        [x: string]: LibraryItem;
+    } | undefined) => {
         [x: string]: string;
     };
 }

package/lib/locales/index.js

@@ -47,6 +47,27 @@ var Locales = class {
       pre[cur.locale] = cur;
       return pre;
     }, {});
+    this.getLocale = () => {
+      return this.locale;
+    };
+    this.getCurrentTexts = (locale) => {
+      return this.library[locale || this.locale].translations;
+    };
+    this.setLocale = (locale, reload = false) => {
+      this.locale = locale;
+      if (reload) {
+        window.location.reload();
+        return;
+      }
+    };
+    this.getText = (id, locale) => {
+      var _a;
+      return ((_a = this.getCurrentTexts(locale)) == null ? void 0 : _a[id]) || id;
+    };
+    this.isCN = () => {
+      let locale = this.getLocale();
+      return locale === "zh-CN" || locale === "zh-HK";
+    };
     this.loadLibraryByUrl = async (urls) => {
       try {
         let fetchList = urls.map((item) => {
@@ -77,6 +98,42 @@ var Locales = class {
         throw err;
       }
     };
+    this.loadLibrary = (urls) => {
+      return this.loadLibraryByUrl(urls);
+    };
+    this.translation = (text, locale) => {
+      if (!text) {
+        return "";
+      }
+      if ((0, import_utils.isString)(text) || (0, import_utils.isNumber)(text)) {
+        return text;
+      }
+      let primary = locale || this.getLocale();
+      if (typeof text === "string") {
+        return text;
+      }
+      return text[primary] || text["original"] || text["en"] || text["zh-CN"] || text["zh-HK"];
+    };
+    this.getLibraryByData = (data) => {
+      return data.reduce((pre, next) => {
+        return {
+          ...pre,
+          [next.locale]: next
+        };
+      }, {});
+    };
+    this.createTextsByLibrary = (id, library) => {
+      const _library = library || this.library;
+      return Object.keys(_library).reduce((pre, next) => {
+        var _a;
+        let _pre = { ...pre };
+        let cur = (_a = _library[next].translations) == null ? void 0 : _a[id];
+        if (cur) {
+          _pre[_library[next].locale] = cur;
+        }
+        return _pre;
+      }, {});
+    };
     this.app = app;
     this.locale = (options == null ? void 0 : options.locale) || this.app.storage.getStorage("locale") || import_en.default.locale;
     this.library = (options == null ? void 0 : options.library) || [import_original.default, import_en.default, import_zh_CN.default, import_zh_HK.default].reduce((pre, cur) => {
@@ -84,27 +141,6 @@ var Locales = class {
       return pre;
     }, {});
   }
-  getLocale() {
-    return this.locale;
-  }
-  getCurrentTexts(locale) {
-    return this.library[locale || this.locale].translations;
-  }
-  setLocale(locale, reload = false) {
-    this.locale = locale;
-    if (reload) {
-      window.location.reload();
-      return;
-    }
-  }
-  getText(id, locale) {
-    var _a;
-    return ((_a = this.getCurrentTexts(locale)) == null ? void 0 : _a[id]) || id;
-  }
-  isCN() {
-    let locale = this.getLocale();
-    return locale === "zh-CN" || locale === "zh-HK";
-  }
   loadLibraryByItems(libraryList) {
     let library = { ...this.library };
     libraryList.forEach((item) => {
@@ -115,42 +151,6 @@ var Locales = class {
     });
     this.library = library;
   }
-  loadLibrary(urls) {
-    return this.loadLibraryByUrl(urls);
-  }
-  translation(text, locale) {
-    if (!text) {
-      return "";
-    }
-    if ((0, import_utils.isString)(text) || (0, import_utils.isNumber)(text)) {
-      return text;
-    }
-    let primary = locale || this.getLocale();
-    if (typeof text === "string") {
-      return text;
-    }
-    return text[primary] || text["original"] || text["en"] || text["zh-CN"] || text["zh-HK"];
-  }
-  getLibraryByData(data) {
-    return data.reduce((pre, next) => {
-      return {
-        ...pre,
-        [next.locale]: next
-      };
-    }, {});
-  }
-  createTextsByLibrary(id, library) {
-    const _library = library || this.library;
-    return Object.keys(_library).reduce((pre, next) => {
-      var _a;
-      let _pre = { ...pre };
-      let cur = (_a = _library[next].translations) == null ? void 0 : _a[id];
-      if (cur) {
-        _pre[_library[next].locale] = cur;
-      }
-      return _pre;
-    }, {});
-  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/routes/index.js

@@ -106,6 +106,7 @@ var RouterManager = class {
       }
       const component = this.renderComponent(item);
       routes.push(
+        //@ts-ignore
         /* @__PURE__ */ import_react.default.createElement(import_react_router_dom.Route, { path, key: path, exact: true }, /* @__PURE__ */ import_react.default.createElement(import_react.Suspense, { fallback: fallback || /* @__PURE__ */ import_react.default.createElement("div", null) }, component))
       );
     }

package/lib/storage/index.d.ts

@@ -9,9 +9,9 @@ export declare class Storage {
     private app?;
     private options;
     constructor(app?: App, options?: StorageOptions);
-    createKey(key: string): string;
-    setStorage(key: string, value: string): void;
-    getStorage(key: string): string | null;
-    removeStorage(key: string): void;
-    clear(): void;
+    createKey: (key: string) => string;
+    setStorage: (key: string, value: string) => void;
+    getStorage: (key: string) => string | null;
+    removeStorage: (key: string) => void;
+    clear: () => void;
 }

package/lib/storage/index.js

@@ -26,6 +26,28 @@ var Storage = class {
   constructor(app, options) {
     this.storageKey = "CapacitorStorage.native_";
     this.options = {};
+    this.createKey = (key) => {
+      if (key.indexOf(this.storageKey) !== -1) {
+        return key;
+      }
+      return this.storageKey + key;
+    };
+    this.setStorage = (key, value) => {
+      var _a, _b;
+      localStorage.setItem(this.createKey(key), value);
+      (_b = (_a = this.options) == null ? void 0 : _a.setStorageAfter) == null ? void 0 : _b.call(_a, key, value);
+    };
+    this.getStorage = (key) => {
+      return localStorage.getItem(this.createKey(key));
+    };
+    this.removeStorage = (key) => {
+      var _a, _b;
+      localStorage.removeItem(this.createKey(key));
+      (_b = (_a = this.options) == null ? void 0 : _a.removeStorageAfter) == null ? void 0 : _b.call(_a, key);
+    };
+    this.clear = () => {
+      localStorage.clear();
+    };
     this.app = app;
     if (options) {
       this.options = options;
@@ -34,28 +56,6 @@ var Storage = class {
       this.storageKey = options.storageKey;
     }
   }
-  createKey(key) {
-    if (key.indexOf(this.storageKey) !== -1) {
-      return key;
-    }
-    return this.storageKey + key;
-  }
-  setStorage(key, value) {
-    var _a, _b;
-    localStorage.setItem(this.createKey(key), value);
-    (_b = (_a = this.options) == null ? void 0 : _a.setStorageAfter) == null ? void 0 : _b.call(_a, key, value);
-  }
-  getStorage(key) {
-    return localStorage.getItem(this.createKey(key));
-  }
-  removeStorage(key) {
-    var _a, _b;
-    localStorage.removeItem(this.createKey(key));
-    (_b = (_a = this.options) == null ? void 0 : _a.removeStorageAfter) == null ? void 0 : _b.call(_a, key);
-  }
-  clear() {
-    localStorage.clear();
-  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/core",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",