@pisell/pisellos 0.0.18 → 0.0.20

package/dist/modules/AccountList/index.d.ts

@@ -1,7 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { AccountModule, Account } from '../Account';
 import { BaseModule } from '../BaseModule';
-import { AccountListState } from './types';
 export declare class AccountListModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -17,7 +16,6 @@ export declare class AccountListModule extends BaseModule implements Module {
     getAccounts(): AccountModule[];
     getAccount(id: string): AccountModule | null;
     clearAccounts(): Promise<void>;
-    getState(): AccountListState;
     setActiveAccount(id: string | number): void;
     getActiveAccount(): AccountModule | null;
     storeChange(): void;

package/dist/modules/AccountList/index.js

@@ -1,6 +1,4 @@
 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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -23,6 +21,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 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); }
+import { cloneDeep } from 'lodash-es';
 import { AccountModule } from "../Account";
 import { BaseModule } from "../BaseModule";
 import { AccountListHooks } from "./types";
@@ -62,14 +61,14 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options === null || options === void 0 ? void 0 : options.store;
-              this.store.accounts = [];
-              this.store.accountList = [];
               if (Array.isArray(options === null || options === void 0 || (_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.accountList)) {
-                recordList = options.initialState.accountList || [];
+                recordList = cloneDeep(options.initialState.accountList || []);
+                this.store.accounts = [];
                 recordList.forEach(function (account) {
                   _this2.addAccount(account);
                 });
               } else {
+                this.store.accounts = [];
                 this.store.accountList = [];
               }
               if (options !== null && options !== void 0 && (_options$otherParams = options.otherParams) !== null && _options$otherParams !== void 0 && _options$otherParams.cacheId) {
@@ -79,7 +78,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
               if (options !== null && options !== void 0 && (_options$otherParams2 = options.otherParams) !== null && _options$otherParams2 !== void 0 && _options$otherParams2.fatherModule) {
                 this.fatherModule = options.otherParams.fatherModule;
               }
-            case 7:
+            case 5:
             case "end":
               return _context.stop();
           }
@@ -113,7 +112,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
               accountModule = new AccountModule("account_".concat(account.id));
               this.core.registerModule(accountModule);
               accountModule.setAccountInfo(account);
-              this.store.accounts = [].concat(_toConsumableArray(this.store.accounts), [accountModule]);
+              this.store.accounts = [].concat(_toConsumableArray(this.store.accounts || []), [accountModule]);
               _context2.next = 13;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
             case 13:
@@ -221,7 +220,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
               throw new Error("Account with id ".concat(id, " not found"));
             case 6:
               this.store.accounts[index].destory();
-              this.store.accounts = [].concat(_toConsumableArray(this.store.accounts.slice(0, index)), _toConsumableArray(this.store.accounts.slice(index + 1)));
+              this.store.accounts = [].concat(_toConsumableArray((this.store.accounts || []).slice(0, index)), _toConsumableArray((this.store.accounts || []).slice(index + 1)));
               this.store.accountList = this.store.accountList.filter(function (account) {
                 return account.id !== id;
               });
@@ -254,7 +253,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAccounts",
     value: function getAccounts() {
-      return _toConsumableArray(this.store.accounts);
+      return _toConsumableArray(this.store.accounts || []);
     }
   }, {
     key: "getAccount",
@@ -300,11 +299,6 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
       }
       return clearAccounts;
     }()
-  }, {
-    key: "getState",
-    value: function getState() {
-      return _objectSpread({}, this.store);
-    }
   }, {
     key: "setActiveAccount",
     value: function setActiveAccount(id) {
@@ -331,7 +325,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
           cacheId: this.cacheId,
           fatherModule: this.fatherModule,
           store: this.store,
-          cacheKey: ['accounts', 'accountList']
+          cacheKey: ['accountList']
         });
       }
     }

package/dist/modules/AccountList/types.d.ts

@@ -34,5 +34,4 @@ export interface AccountListModuleAPI {
     getAccount: (id: string) => AccountModule | null;
     clearAccounts: () => Promise<void>;
     addAccounts: (accounts: AccountModule[]) => Promise<void>;
-    getState: () => AccountListState;
 }

package/dist/solution/BookingByStep/index.js

@@ -90,10 +90,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               moduleArr.forEach(function (step) {
                 var targetModule = createModule(step, _this2.name);
                 if (targetModule) {
-                  var _this2$otherParams, _this2$otherParams2;
+                  var _targetCacheData, _this2$otherParams, _this2$otherParams2;
                   _this2.store[step] = targetModule;
                   _this2.core.registerModule(targetModule, {
-                    initialState: targetCacheData[targetModule.name],
+                    initialState: (_targetCacheData = targetCacheData) === null || _targetCacheData === void 0 ? void 0 : _targetCacheData[targetModule.name],
                     otherParams: _objectSpread(_objectSpread({}, _this2.otherParams), {}, {
                       fatherModule: _this2.name,
                       openCache: (_this2$otherParams = _this2.otherParams) !== null && _this2$otherParams !== void 0 && _this2$otherParams.cacheId ? true : false,

package/dist/solution/ShopDiscount/index.js

@@ -154,7 +154,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "registerDependentModules",
     value: function registerDependentModules() {
-      var _this$options$otherPa, _this$options$otherPa2, _this$options$otherPa3, _this$options$otherPa4, _this$options$otherPa5;
+      var _this$options$otherPa, _targetCacheData, _this$options$otherPa2, _this$options$otherPa3, _this$options$otherPa4, _this$options$otherPa5;
       // 如果有传 cacheid，默认需要收集上面这些模块里用户操作选中的数据
       // 并且在上面 registerModule 的时候，读取 sessionStroage 里的数据，塞进默认值
       var targetCacheData = {};
@@ -169,7 +169,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       // 注册优惠模块
       var discount = new DiscountModule("".concat(this.name, "_discount"));
       this.core.registerModule(discount, {
-        initialState: targetCacheData[discount.name],
+        initialState: (_targetCacheData = targetCacheData) === null || _targetCacheData === void 0 ? void 0 : _targetCacheData[discount.name],
         hooks: (_this$options$otherPa2 = this.options.otherParams) === null || _this$options$otherPa2 === void 0 || (_this$options$otherPa2 = _this$options$otherPa2.discount) === null || _this$options$otherPa2 === void 0 ? void 0 : _this$options$otherPa2.hooks,
         otherParams: {
           fatherModule: this.name,

package/lib/modules/AccountList/index.d.ts

@@ -1,7 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { AccountModule, Account } from '../Account';
 import { BaseModule } from '../BaseModule';
-import { AccountListState } from './types';
 export declare class AccountListModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -17,7 +16,6 @@ export declare class AccountListModule extends BaseModule implements Module {
     getAccounts(): AccountModule[];
     getAccount(id: string): AccountModule | null;
     clearAccounts(): Promise<void>;
-    getState(): AccountListState;
     setActiveAccount(id: string | number): void;
     getActiveAccount(): AccountModule | null;
     storeChange(): void;

package/lib/modules/AccountList/index.js

@@ -22,6 +22,7 @@ __export(AccountList_exports, {
   AccountListModule: () => AccountListModule
 });
 module.exports = __toCommonJS(AccountList_exports);
+var import_lodash_es = require("lodash-es");
 var import_Account = require("../Account");
 var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
@@ -44,14 +45,14 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
     var _a, _b, _c;
     this.core = core;
     this.store = options == null ? void 0 : options.store;
-    this.store.accounts = [];
-    this.store.accountList = [];
     if (Array.isArray((_a = options == null ? void 0 : options.initialState) == null ? void 0 : _a.accountList)) {
-      const recordList = options.initialState.accountList || [];
+      const recordList = (0, import_lodash_es.cloneDeep)(options.initialState.accountList || []);
+      this.store.accounts = [];
       recordList.forEach((account) => {
         this.addAccount(account);
       });
     } else {
+      this.store.accounts = [];
       this.store.accountList = [];
     }
     if ((_b = options == null ? void 0 : options.otherParams) == null ? void 0 : _b.cacheId) {
@@ -74,7 +75,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       const accountModule = new import_Account.AccountModule(`account_${account.id}`);
       this.core.registerModule(accountModule);
       accountModule.setAccountInfo(account);
-      this.store.accounts = [...this.store.accounts, accountModule];
+      this.store.accounts = [...this.store.accounts || [], accountModule];
       await this.core.effects.emit(import_types.AccountListHooks.OnAccountListUpdate, this.store);
       if (this.store.accounts.length === 1) {
         this.setActiveAccount(accountModule.getId());
@@ -118,8 +119,8 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       }
       this.store.accounts[index].destory();
       this.store.accounts = [
-        ...this.store.accounts.slice(0, index),
-        ...this.store.accounts.slice(index + 1)
+        ...(this.store.accounts || []).slice(0, index),
+        ...(this.store.accounts || []).slice(index + 1)
       ];
       this.store.accountList = this.store.accountList.filter((account) => account.id !== id);
       await this.core.effects.emit(import_types.AccountListHooks.OnAccountListUpdate, this.store);
@@ -131,7 +132,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
     }
   }
   getAccounts() {
-    return [...this.store.accounts];
+    return [...this.store.accounts || []];
   }
   getAccount(id) {
     return this.store.accounts.find((account) => account.getId() === id) || null;
@@ -149,9 +150,6 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       this.store.isLoading = false;
     }
   }
-  getState() {
-    return { ...this.store };
-  }
   setActiveAccount(id) {
     this.store.accounts.forEach((account) => {
       if (account.getId() === id) {
@@ -166,7 +164,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
   }
   storeChange() {
     if (this.openCache) {
-      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["accounts", "accountList"] });
+      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["accountList"] });
     }
   }
 };

package/lib/modules/AccountList/types.d.ts

@@ -34,5 +34,4 @@ export interface AccountListModuleAPI {
     getAccount: (id: string) => AccountModule | null;
     clearAccounts: () => Promise<void>;
     addAccounts: (accounts: AccountModule[]) => Promise<void>;
-    getState: () => AccountListState;
 }

package/lib/solution/BookingByStep/index.js

@@ -82,7 +82,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const targetModule = (0, import_types.createModule)(step, this.name);
       if (targetModule) {
         this.store[step] = targetModule;
-        this.core.registerModule(targetModule, { initialState: targetCacheData[targetModule.name], otherParams: {
+        this.core.registerModule(targetModule, { initialState: targetCacheData == null ? void 0 : targetCacheData[targetModule.name], otherParams: {
           ...this.otherParams,
           fatherModule: this.name,
           openCache: ((_a2 = this.otherParams) == null ? void 0 : _a2.cacheId) ? true : false,

package/lib/solution/ShopDiscount/index.js

@@ -93,7 +93,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     }
     const discount = new import_Discount.DiscountModule(`${this.name}_discount`);
     this.core.registerModule(discount, {
-      initialState: targetCacheData[discount.name],
+      initialState: targetCacheData == null ? void 0 : targetCacheData[discount.name],
       hooks: (_c = (_b = this.options.otherParams) == null ? void 0 : _b.discount) == null ? void 0 : _c.hooks,
       otherParams: {
         fatherModule: this.name,

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",