@pisell/core 1.0.46 → 1.0.47

package/es/app/index.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 import App, { AppOptions } from "./app";
-type AppContextType = {
+declare type AppContextType = {
     globalData: any;
     setGlobalData: React.Dispatch<React.SetStateAction<any>>;
     app: App;

package/es/cmd/const.d.ts

@@ -1,9 +1,9 @@
 export declare enum CMDCoreEnum {
-    CMD_CONNECT = "cmd.connect",
-    CMD_DISCONNECT = "cmd.disconnect",
-    CMD_RECONNECT = "cmd.reconnect",
-    CMD_MESSAGE = "cmd.message",
-    CMD_ERROR = "cmd.error"
+    CMD_CONNECT,
+    CMD_DISCONNECT,
+    CMD_RECONNECT,
+    CMD_MESSAGE,
+    CMD_ERROR
 }
 declare const _default: {
     CMDCoreEnum: typeof CMDCoreEnum;

package/es/hooks/useStore/index.d.ts

@@ -1,6 +1,6 @@
 import { ModelsState } from "../../models";
 declare const useStore: <T extends "global", D extends keyof ModelsState[T]>(props: {
     models: T;
-    key?: D;
+    key?: D | undefined;
 }) => D extends undefined ? ModelsState[T] : ModelsState[T][D];
 export default useStore;

package/es/indexDB/index.js

@@ -326,17 +326,15 @@ var IndexDBManager = /*#__PURE__*/function () {
                     case 10:
                       _context3.prev = 10;
                       _context3.t0 = _context3["catch"](3);
-                      if (log) {
-                        _this4.app.logger.addLog({
-                          type: 'error',
-                          title: uuid,
-                          metadata: {
-                            msg: '添加数据失败',
-                            error: _context3.t0.message
-                          }
-                        });
-                      }
-                      throw new Error('添加数据失败');
+                      _this4.app.logger.addLog({
+                        type: 'error',
+                        title: uuid,
+                        metadata: {
+                          msg: '添加数据失败',
+                          error: _context3.t0.message
+                        }
+                      });
+                      throw new Error(_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.message);
                     case 14:
                     case "end":
                       return _context3.stop();
@@ -611,17 +609,15 @@ var IndexDBManager = /*#__PURE__*/function () {
                     case 10:
                       _context9.prev = 10;
                       _context9.t0 = _context9["catch"](3);
-                      if (log) {
-                        _this7.app.logger.addLog({
-                          type: 'error',
-                          title: uuid,
-                          metadata: {
-                            msg: '数据更新失败',
-                            error: _context9.t0.message
-                          }
-                        });
-                      }
-                      throw new Error('更新数据失败');
+                      _this7.app.logger.addLog({
+                        type: 'error',
+                        title: uuid,
+                        metadata: {
+                          msg: '数据更新失败',
+                          error: _context9.t0.message
+                        }
+                      });
+                      throw new Error(_context9.t0 === null || _context9.t0 === void 0 ? void 0 : _context9.t0.message);
                     case 14:
                     case "end":
                       return _context9.stop();
@@ -1110,8 +1106,16 @@ var IndexDBManager = /*#__PURE__*/function () {
                     case 9:
                       _context23.prev = 9;
                       _context23.t0 = _context23["catch"](2);
-                      throw new Error('获取所有数据失败');
-                    case 12:
+                      _this14.app.logger.addLog({
+                        type: 'error',
+                        title: "[ IndexDB ] ERROR: - getAll(".concat(storeName, ")"),
+                        metadata: {
+                          msg: '获取所有数据失败',
+                          error: _context23.t0.message
+                        }
+                      });
+                      throw new Error(_context23.t0 === null || _context23.t0 === void 0 ? void 0 : _context23.t0.message);
+                    case 13:
                     case "end":
                       return _context23.stop();
                   }

package/es/locales/type.d.ts

@@ -1,5 +1,5 @@
-export type Locale = 'original' | 'en' | 'zh-CN' | 'zh-HK' | string;
-export type MultiLanguage = {
+export declare type Locale = 'original' | 'en' | 'zh-CN' | 'zh-HK' | string;
+export declare type MultiLanguage = {
     [key in Locale]: string;
 };
 export interface LibraryItem {
@@ -16,4 +16,4 @@ export interface LocaleConfig {
         [key in Locale]: LibraryItem;
     };
 }
-export type LoadLibraryByUrlParams = (string | Promise<LibraryItem> | (() => Promise<LibraryItem>) | LibraryItem)[];
+export declare type LoadLibraryByUrlParams = (string | Promise<LibraryItem> | (() => Promise<LibraryItem>) | LibraryItem)[];

package/es/logger/index.js

@@ -325,8 +325,9 @@ var LoggerManager = /*#__PURE__*/function () {
 
               // 将buffer中的metadata转换为对象
               buffer = (_this$logBuffer = this.logBuffer) === null || _this$logBuffer === void 0 ? void 0 : _this$logBuffer.map(function (item) {
-                item.metadata = JSON.parse(item.metadata || "{}");
-                return item;
+                return _objectSpread(_objectSpread({}, item || {}), {}, {
+                  metadata: JSON.parse(item.metadata || "{}")
+                });
               });
               bufferIds = buffer.map(function (item) {
                 return item.logId;

package/es/models/index.d.ts

@@ -1,7 +1,7 @@
 import hooks from '../hooks';
 import { Provider as StoreProvider } from "react-redux";
 declare const models: import("./global").GlobalModal[];
-type ModalsType = (typeof models[number]);
+declare type ModalsType = (typeof models[number]);
 export interface Store {
     getDataByModel: typeof getDataByModel;
     useStore: typeof hooks.useStore;
@@ -10,8 +10,8 @@ export interface Store {
     dispatch: any;
     getState: any;
 }
-export type ModelsNames = ModalsType['namespace'];
-export type ModelsState = {
+export declare type ModelsNames = ModalsType['namespace'];
+export declare type ModelsState = {
     [K in (ModalsType['namespace'])]: Extract<ModalsType, {
         namespace: K;
     }>['state'];
@@ -25,7 +25,7 @@ export type ModelsState = {
  * @Author: zhiwei.Wang
  * @Date: 2024-09-03 11:07
  */
-declare const getDataByModel: <T extends "global", D extends keyof ModelsState[T]>(model: string, key?: D) => D extends undefined ? ModelsState[T] : ModelsState[T][D];
+declare const getDataByModel: <T extends "global", D extends keyof ModelsState[T]>(model: string, key?: D | undefined) => D extends undefined ? ModelsState[T] : ModelsState[T][D];
 /**
  * @title: 设置数据到store
  * @description:

package/es/pubsub/index.d.ts

@@ -2,7 +2,7 @@
  * 发布订阅模块
  * 用于组件/服务间的事件通信
  */
-type EventCallback = (...args: any[]) => void;
+declare type EventCallback = (...args: any[]) => void;
 interface EventSubscription {
     unsubscribe: () => void;
 }

package/es/request/cache.d.ts

@@ -1,5 +1,5 @@
 import { CacheProps } from './type';
-export type CacheType = 'memory' | 'storage' | 'indexDB';
+export declare type CacheType = 'memory' | 'storage' | 'indexDB';
 /**
  * @title: 设置缓存
  * @description:

package/es/request/pisell2Request.d.ts

@@ -1,4 +1,4 @@
-type RequestMethod = any;
+declare type RequestMethod = any;
 declare const pisell2Get: RequestMethod;
 declare const pisell2Post: RequestMethod;
 declare const pisell2Put: RequestMethod;

package/es/routes/index.d.ts

@@ -20,9 +20,9 @@ export declare class RouterManager {
     get(name: string): RouteType;
     has(name: string): boolean;
     remove(name: string): void;
-    renderComponent(item: RouteType, children?: React.ReactNode): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
+    renderComponent(item: RouteType, children?: React.ReactNode): string | number | boolean | JSX.Element | React.ReactFragment | null | undefined;
     getPageByRoute(route: string): ApplicationInterface | undefined;
     getRouterComponent({ fallback }: {
         fallback?: React.ReactNode;
-    }): React.JSX.Element[];
+    }): JSX.Element[];
 }

package/es/socket/types.d.ts

@@ -76,7 +76,7 @@ export interface ReconnectOptions {
 /**
  * 事件处理函数类型
  */
-export type EventHandler = (...args: any[]) => void;
+export declare type EventHandler = (...args: any[]) => void;
 /**
  * 事件处理函数映射
  */

package/es/tasks/type.d.ts

@@ -1,4 +1,4 @@
-export type TaskRunStatus = "pending" | "in-progress" | "success" | "failure";
+export declare type TaskRunStatus = "pending" | "in-progress" | "success" | "failure";
 export interface Task {
     id?: string;
     type?: "local" | "cloud";
@@ -37,9 +37,9 @@ export interface Task {
 export interface TaskConfig {
     tasks: Task[];
 }
-type TaskModuleName = string;
-type TaskQueueName = string;
-type TaskStatus = "uncompleted" | "completed";
+declare type TaskModuleName = string;
+declare type TaskQueueName = string;
+declare type TaskStatus = "uncompleted" | "completed";
 export interface TaskQueue {
     status: TaskStatus;
     tasks: Task[];

package/es/variables/index.d.ts

@@ -1,6 +1,6 @@
-export type VariableMap = Record<string, string>;
+export declare type VariableMap = Record<string, string>;
 declare const _default: {
-    setConfig: (newConfig: Partial<import("@").VariablesConfig>) => void;
-    getConfig: () => import("@").VariablesConfig;
+    setConfig: (newConfig: Partial<import("./type").VariablesConfig>) => void;
+    getConfig: () => import("./type").VariablesConfig;
 };
 export default _default;

package/lib/app/index.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 import App, { AppOptions } from "./app";
-type AppContextType = {
+declare type AppContextType = {
     globalData: any;
     setGlobalData: React.Dispatch<React.SetStateAction<any>>;
     app: App;

package/lib/aws/index.js

@@ -32,6 +32,9 @@ var defaultUploadParams = {
   // 设置ACL权限为公共读取
 };
 var AWS = class {
+  s3Client;
+  app;
+  config;
   constructor(app, options) {
     this.app = app;
     if (options) {

package/lib/cmd/const.d.ts

@@ -1,9 +1,9 @@
 export declare enum CMDCoreEnum {
-    CMD_CONNECT = "cmd.connect",
-    CMD_DISCONNECT = "cmd.disconnect",
-    CMD_RECONNECT = "cmd.reconnect",
-    CMD_MESSAGE = "cmd.message",
-    CMD_ERROR = "cmd.error"
+    CMD_CONNECT,
+    CMD_DISCONNECT,
+    CMD_RECONNECT,
+    CMD_MESSAGE,
+    CMD_ERROR
 }
 declare const _default: {
     CMDCoreEnum: typeof CMDCoreEnum;

package/lib/cmd/const.js

@@ -25,11 +25,11 @@ __export(const_exports, {
 module.exports = __toCommonJS(const_exports);
 var prefix = "cmd";
 var CMDCoreEnum = ((CMDCoreEnum2) => {
-  CMDCoreEnum2[CMDCoreEnum2["CMD_CONNECT"] = `${prefix}.connect`] = "CMD_CONNECT";
-  CMDCoreEnum2[CMDCoreEnum2["CMD_DISCONNECT"] = `${prefix}.disconnect`] = "CMD_DISCONNECT";
-  CMDCoreEnum2[CMDCoreEnum2["CMD_RECONNECT"] = `${prefix}.reconnect`] = "CMD_RECONNECT";
-  CMDCoreEnum2[CMDCoreEnum2["CMD_MESSAGE"] = `${prefix}.message`] = "CMD_MESSAGE";
-  CMDCoreEnum2[CMDCoreEnum2["CMD_ERROR"] = `${prefix}.error`] = "CMD_ERROR";
+  CMDCoreEnum2["CMD_CONNECT"] = `${prefix}.connect`;
+  CMDCoreEnum2["CMD_DISCONNECT"] = `${prefix}.disconnect`;
+  CMDCoreEnum2["CMD_RECONNECT"] = `${prefix}.reconnect`;
+  CMDCoreEnum2["CMD_MESSAGE"] = `${prefix}.message`;
+  CMDCoreEnum2["CMD_ERROR"] = `${prefix}.error`;
   return CMDCoreEnum2;
 })(CMDCoreEnum || {});
 var const_default = { CMDCoreEnum };

package/lib/cmd/index.js

@@ -36,6 +36,8 @@ module.exports = __toCommonJS(cmd_exports);
 var import_socket = __toESM(require("../socket"));
 var import_const = require("./const");
 var CMD = class {
+  app;
+  options;
   constructor(app, options) {
     this.app = app;
     this.options = options;

package/lib/cookie/index.js

@@ -35,10 +35,8 @@ function getCookie(name) {
   const ca = document.cookie.split(";");
   for (let i = 0; i < ca.length; i++) {
     let c = ca[i];
-    while (c.charAt(0) === " ")
-      c = c.substring(1, c.length);
-    if (c.indexOf(nameEQ) === 0)
-      return c.substring(nameEQ.length, c.length);
+    while (c.charAt(0) === " ") c = c.substring(1, c.length);
+    if (c.indexOf(nameEQ) === 0) return c.substring(nameEQ.length, c.length);
   }
   return null;
 }

package/lib/data/index.js

@@ -23,6 +23,9 @@ __export(data_exports, {
 });
 module.exports = __toCommonJS(data_exports);
 var Data = class {
+  app;
+  storage;
+  store;
   constructor(app) {
     this.app = app;
     this.storage = app.storage;

package/lib/hooks/useStore/index.d.ts

@@ -1,6 +1,6 @@
 import { ModelsState } from "../../models";
 declare const useStore: <T extends "global", D extends keyof ModelsState[T]>(props: {
     models: T;
-    key?: D;
+    key?: D | undefined;
 }) => D extends undefined ? ModelsState[T] : ModelsState[T][D];
 export default useStore;

package/lib/indexDB/index.js

@@ -220,14 +220,12 @@ var IndexDBManager = class _IndexDBManager {
           }
           return data;
         } catch (error) {
-          if (log) {
-            this.app.logger.addLog({
-              type: "error",
-              title: uuid,
-              metadata: { msg: "添加数据失败", error: error.message }
-            });
-          }
-          throw new Error("添加数据失败");
+          this.app.logger.addLog({
+            type: "error",
+            title: uuid,
+            metadata: { msg: "添加数据失败", error: error.message }
+          });
+          throw new Error(error == null ? void 0 : error.message);
         }
       })(),
       `add(${storeName})`
@@ -344,14 +342,12 @@ var IndexDBManager = class _IndexDBManager {
           }
           return data;
         } catch (error) {
-          if (log) {
-            this.app.logger.addLog({
-              type: "error",
-              title: uuid,
-              metadata: { msg: "数据更新失败", error: error.message }
-            });
-          }
-          throw new Error("更新数据失败");
+          this.app.logger.addLog({
+            type: "error",
+            title: uuid,
+            metadata: { msg: "数据更新失败", error: error.message }
+          });
+          throw new Error(error == null ? void 0 : error.message);
         }
       })(),
       `update(${storeName})`
@@ -550,7 +546,12 @@ var IndexDBManager = class _IndexDBManager {
           const results = await this.db.table(storeName).toArray();
           return results;
         } catch (error) {
-          throw new Error("获取所有数据失败");
+          this.app.logger.addLog({
+            type: "error",
+            title: `[ IndexDB ] ERROR: - getAll(${storeName})`,
+            metadata: { msg: "获取所有数据失败", error: error.message }
+          });
+          throw new Error(error == null ? void 0 : error.message);
         }
       })(),
       `getAll(${storeName})`

package/lib/locales/index.js

@@ -39,101 +39,15 @@ var import_zh_CN = __toESM(require("./zh-CN"));
 var import_zh_HK = __toESM(require("./zh-HK"));
 var import_original = __toESM(require("./original"));
 var Locales = class {
+  app;
+  // 当前语言 本地语言 > 英文语言包
+  locale = import_en.default.locale;
+  //  语言包
+  library = [import_original.default, import_en.default, import_zh_CN.default, import_zh_HK.default].reduce((pre, cur) => {
+    pre[cur.locale] = cur;
+    return pre;
+  }, {});
   constructor(app, options) {
-    // 当前语言 本地语言 > 英文语言包
-    this.locale = import_en.default.locale;
-    //  语言包
-    this.library = [import_original.default, import_en.default, import_zh_CN.default, import_zh_HK.default].reduce((pre, cur) => {
-      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) => {
-          if (typeof item === "string") {
-            return fetch(item);
-          }
-          if (typeof item === "function") {
-            return item();
-          }
-          if (typeof item === "object" && item !== null && "locale" in item) {
-            return Promise.resolve(item);
-          }
-          return item;
-        });
-        let res = await Promise.all(fetchList);
-        let library = { ...this.library };
-        for (const item of res) {
-          const _item = item instanceof Response ? await item.json() : item;
-          library = {
-            ...library,
-            [_item.locale]: import_lodash.default.mergeWith(library[_item.locale] || {}, _item)
-          };
-        }
-        this.library = library;
-        return library;
-      } catch (err) {
-        console.log(err);
-        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) => {
@@ -141,6 +55,57 @@ 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";
+  };
+  loadLibraryByUrl = async (urls) => {
+    try {
+      let fetchList = urls.map((item) => {
+        if (typeof item === "string") {
+          return fetch(item);
+        }
+        if (typeof item === "function") {
+          return item();
+        }
+        if (typeof item === "object" && item !== null && "locale" in item) {
+          return Promise.resolve(item);
+        }
+        return item;
+      });
+      let res = await Promise.all(fetchList);
+      let library = { ...this.library };
+      for (const item of res) {
+        const _item = item instanceof Response ? await item.json() : item;
+        library = {
+          ...library,
+          [_item.locale]: import_lodash.default.mergeWith(library[_item.locale] || {}, _item)
+        };
+      }
+      this.library = library;
+      return library;
+    } catch (err) {
+      console.log(err);
+      throw err;
+    }
+  };
   loadLibraryByItems(libraryList) {
     let library = { ...this.library };
     libraryList.forEach((item) => {
@@ -151,6 +116,42 @@ 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/locales/type.d.ts

@@ -1,5 +1,5 @@
-export type Locale = 'original' | 'en' | 'zh-CN' | 'zh-HK' | string;
-export type MultiLanguage = {
+export declare type Locale = 'original' | 'en' | 'zh-CN' | 'zh-HK' | string;
+export declare type MultiLanguage = {
     [key in Locale]: string;
 };
 export interface LibraryItem {
@@ -16,4 +16,4 @@ export interface LocaleConfig {
         [key in Locale]: LibraryItem;
     };
 }
-export type LoadLibraryByUrlParams = (string | Promise<LibraryItem> | (() => Promise<LibraryItem>) | LibraryItem)[];
+export declare type LoadLibraryByUrlParams = (string | Promise<LibraryItem> | (() => Promise<LibraryItem>) | LibraryItem)[];

package/lib/logger/index.js

@@ -219,8 +219,10 @@ var LoggerManager = class {
       const fileName = await this.createAWSFileName(urgent);
       console.log("-------- 存储日志到AWS 开始", fileName);
       const buffer = (_a = this.logBuffer) == null ? void 0 : _a.map((item) => {
-        item.metadata = JSON.parse(item.metadata || "{}");
-        return item;
+        return {
+          ...item || {},
+          metadata: JSON.parse(item.metadata || "{}")
+        };
       });
       const bufferIds = buffer.map((item) => item.logId);
       const logs = JSON.stringify(buffer, null, 2);