@pisell/pisellos 0.0.10 → 0.0.11

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

@@ -21,7 +21,9 @@ export declare class AccountModule extends BaseModule implements Module, Account
     isLoggedIn(): boolean;
     resetPassword(email: string): Promise<void>;
     updatePassword(oldPassword: string, newPassword: string): Promise<void>;
-    getLoginStatus(): Promise<boolean>;
-    getAccount(): Promise<Account | null>;
+    getLoginStatus(): boolean;
+    getAccount(): Account | null;
     setAccountInfo(account: Account): void;
+    setActive(active: boolean): void;
+    isActive(): boolean;
 }

package/dist/modules/Account/index.js

@@ -32,7 +32,8 @@ export var AccountModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "isGuest", false);
     _defineProperty(_assertThisInitialized(_this), "store", {
       currentAccount: null,
-      isLoggedIn: false
+      isLoggedIn: false,
+      active: false
     });
     return _this;
   }
@@ -45,7 +46,8 @@ export var AccountModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options === null || options === void 0 ? void 0 : options.store;
-            case 2:
+              this.store.isLoggedIn = false;
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -216,46 +218,31 @@ export var AccountModule = /*#__PURE__*/function (_BaseModule) {
     }()
   }, {
     key: "getLoginStatus",
-    value: function () {
-      var _getLoginStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
-            case 0:
-              return _context8.abrupt("return", this.store.isLoggedIn);
-            case 1:
-            case "end":
-              return _context8.stop();
-          }
-        }, _callee8, this);
-      }));
-      function getLoginStatus() {
-        return _getLoginStatus.apply(this, arguments);
-      }
-      return getLoginStatus;
-    }()
+    value: function getLoginStatus() {
+      return this.store.isLoggedIn;
+    }
   }, {
     key: "getAccount",
-    value: function () {
-      var _getAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
-            case 0:
-              return _context9.abrupt("return", this.store.currentAccount);
-            case 1:
-            case "end":
-              return _context9.stop();
-          }
-        }, _callee9, this);
-      }));
-      function getAccount() {
-        return _getAccount.apply(this, arguments);
-      }
-      return getAccount;
-    }()
+    value: function getAccount() {
+      return this.store.currentAccount;
+    }
   }, {
     key: "setAccountInfo",
     value: function setAccountInfo(account) {
       this.store.currentAccount = account;
+      if (account.isGuest) {
+        this.isGuest = true;
+      }
+    }
+  }, {
+    key: "setActive",
+    value: function setActive(active) {
+      this.store.active = active;
+    }
+  }, {
+    key: "isActive",
+    value: function isActive() {
+      return this.store.active;
     }
   }]);
   return AccountModule;

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

@@ -23,6 +23,7 @@ export interface Account {
 export interface AccountState {
     currentAccount: Account | null;
     isLoggedIn: boolean;
+    active: boolean;
 }
 /**
  * 账户模块 API

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

@@ -15,4 +15,6 @@ export declare class AccountListModule extends BaseModule implements Module {
     getAccount(id: string): AccountModule | null;
     clearAccounts(): Promise<void>;
     getState(): AccountListState;
+    setActiveAccount(id: string | number): void;
+    getActiveAccount(): AccountModule | null;
 }

package/dist/modules/AccountList/index.js

@@ -84,27 +84,32 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
             case 5:
               accountModule = new AccountModule("account_".concat(account.id));
               this.core.registerModule(accountModule);
+              accountModule.setAccountInfo(account);
               this.store.accounts = [].concat(_toConsumableArray(this.store.accounts), [accountModule]);
-              _context2.next = 10;
+              _context2.next = 11;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
-            case 10:
-              _context2.next = 17;
+            case 11:
+              if (this.store.accounts.length === 1) {
+                this.setActiveAccount(accountModule.getId());
+              }
+              _context2.next = 20;
               break;
-            case 12:
-              _context2.prev = 12;
+            case 14:
+              _context2.prev = 14;
               _context2.t0 = _context2["catch"](0);
+              console.error(_context2.t0);
               this.store.error = _context2.t0 instanceof Error ? _context2.t0.message : 'Failed to add account';
-              _context2.next = 17;
+              _context2.next = 20;
               return this.core.effects.emit(AccountListHooks.OnAccountListError, this.store.error);
-            case 17:
-              _context2.prev = 17;
-              this.store.isLoading = false;
-              return _context2.finish(17);
             case 20:
+              _context2.prev = 20;
+              this.store.isLoading = false;
+              return _context2.finish(20);
+            case 23:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[0, 12, 17, 20]]);
+        }, _callee2, this, [[0, 14, 20, 23]]);
       }));
       function addAccount(_x3) {
         return _addAccount.apply(this, arguments);
@@ -259,6 +264,24 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
     value: function getState() {
       return _objectSpread({}, this.store);
     }
+  }, {
+    key: "setActiveAccount",
+    value: function setActiveAccount(id) {
+      this.store.accounts.forEach(function (account) {
+        if (account.getId() === id) {
+          account.setActive(true);
+        } else {
+          account.setActive(false);
+        }
+      });
+    }
+  }, {
+    key: "getActiveAccount",
+    value: function getActiveAccount() {
+      return this.store.accounts.find(function (account) {
+        return account.isActive();
+      }) || null;
+    }
   }]);
   return AccountListModule;
 }(BaseModule);

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

@@ -1,7 +1,7 @@
-import { Module, PisellCore, ModuleOptions } from '../../types';
-import { BaseModule } from '../BaseModule';
-import { CartItem, CartModuleAPI } from './types';
-export * from './types';
+import { Module, PisellCore, ModuleOptions } from "../../types";
+import { BaseModule } from "../BaseModule";
+import { CartItem, CartModuleAPI, IAddItemParams, IUpdateItemParams } from "./types";
+export * from "./types";
 /**
  * 购物车模块实现
  */
@@ -18,18 +18,24 @@ export declare class CartModule extends BaseModule implements Module {
      */
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
-     * 模块销毁
+     * 添加商品到购物车
      */
-    destroy(): Promise<void>;
+    addItem(params: IAddItemParams): Promise<void>;
     /**
-     * 添加商品到购物车
+     * 更新购物车信息
+     */
+    updateItem(params: IUpdateItemParams): Promise<void>;
+    /**
+     * 批量设置购物车数据
      */
-    addItem(item: CartItem): Promise<void>;
+    batchSetItems(items: CartItem[]): Promise<void>;
     getItemCount(): number;
     getTotalPrice(): number;
-    getItems(): Promise<CartItem[]>;
-    updateItem(id: string, item: CartItem): Promise<void>;
+    getItems(): CartItem[];
     removeItem(id: string): Promise<void>;
     storeTemp(key: string, value: any): Promise<void>;
-    getTemp(key?: string): Promise<any>;
+    getTemp(key?: string): any;
+    clear(): void;
+    clearCartByAccount(account_id: string): void;
+    getCartByAccount(account_id: string | number): CartItem[];
 }

package/dist/modules/Cart/index.js

@@ -23,6 +23,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { BaseModule } from "../BaseModule";
 import { CartHooks } from "./types";
+import { createCartItemOrigin, formatAccountToCartItem, formatProductToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
 export * from "./types";
 
 /**
@@ -36,8 +37,8 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
     _classCallCheck(this, CartModule);
     _this = _super.call(this, name, version);
     // 提供给 baseModule 用的默认名称 和 默认版本
-    _defineProperty(_assertThisInitialized(_this), "defaultName", 'cart');
-    _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
+    _defineProperty(_assertThisInitialized(_this), "defaultName", "cart");
+    _defineProperty(_assertThisInitialized(_this), "defaultVersion", "1.0.0");
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
@@ -65,25 +66,26 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options.store;
+              this.store.list = [];
 
               // 获取依赖的插件
-              this.request = core.getPlugin('request');
-              this.window = core.getPlugin('window');
+              this.request = core.getPlugin("request");
+              this.window = core.getPlugin("window");
               if (this.request) {
-                _context.next = 6;
+                _context.next = 7;
                 break;
               }
-              throw new Error('购物车模块需要 request 插件支持');
-            case 6:
+              throw new Error("购物车模块需要 request 插件支持");
+            case 7:
               if (this.window) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
-              throw new Error('购物车模块需要 window 插件支持');
-            case 8:
+              throw new Error("购物车模块需要 window 插件支持");
+            case 9:
               this.store.temp = {};
-              console.log('[CartModule] 初始化完成');
-            case 10:
+              console.log("[CartModule] 初始化完成");
+            case 11:
             case "end":
               return _context.stop();
           }
@@ -95,139 +97,191 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
       return initialize;
     }()
     /**
-     * 模块销毁
+     * 添加商品到购物车
      */
     )
   }, {
-    key: "destroy",
+    key: "addItem",
     value: (function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _addItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+        var account, product, bundle, options, cartItem, items;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              console.log('[CartModule] 已销毁');
-            case 1:
+              account = params.account, product = params.product, bundle = params.bundle, options = params.options; // 生成一个唯一的 ID
+              cartItem = {
+                _id: getUniqueId(),
+                _origin: createCartItemOrigin(),
+                _productOrigin: product
+              };
+              if (product) {
+                cartItem = formatProductToCartItem({
+                  cartItem: cartItem,
+                  product: product,
+                  bundle: bundle,
+                  options: options
+                });
+              }
+              if (account) {
+                cartItem = formatAccountToCartItem({
+                  cartItem: cartItem,
+                  account: account
+                });
+              }
+
+              // 更新购物车数据
+              items = [].concat(_toConsumableArray(this.store.list), [cartItem]);
+              this.store.list = items;
+
+              // 触发事件
+              _context2.next = 8;
+              return this.core.effects.emit(CartHooks.OnAddItem, cartItem);
+            case 8:
+              _context2.next = 10;
+              return this.core.effects.emit("".concat(this.name, ":changed"), items);
+            case 10:
             case "end":
               return _context2.stop();
           }
-        }, _callee2);
+        }, _callee2, this);
       }));
-      function destroy() {
-        return _destroy.apply(this, arguments);
+      function addItem(_x3) {
+        return _addItem.apply(this, arguments);
       }
-      return destroy;
+      return addItem;
     }()
     /**
-     * 添加商品到购物车
+     * 更新购物车信息
      */
     )
   }, {
-    key: "addItem",
+    key: "updateItem",
     value: (function () {
-      var _addItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(item) {
-        var items;
+      var _updateItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+        var _tempCartItem$_origin;
+        var _id, cartItem, account, product, resources, note, tempCartItem, items;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              items = [].concat(_toConsumableArray(this.store.list), [item]);
+              _id = params._id, cartItem = params.cartItem, account = params.account, product = params.product, resources = params.resources, note = params.note;
+              tempCartItem = this.store.list.find(function (i) {
+                return i._id === _id;
+              });
+              if (tempCartItem) {
+                _context3.next = 5;
+                break;
+              }
+              console.warn("[CartModule] 更新购物车商品失败，商品不存在");
+              return _context3.abrupt("return");
+            case 5:
+              if (cartItem) {
+                tempCartItem = cartItem;
+              }
+              if (product) {
+                tempCartItem = formatProductToCartItem({
+                  cartItem: tempCartItem,
+                  product: product
+                });
+              }
+              if (account) {
+                tempCartItem = formatAccountToCartItem({
+                  cartItem: tempCartItem,
+                  account: account
+                });
+              }
+              if (resources) {
+                tempCartItem = formatResourceToCartItem({
+                  cartItem: tempCartItem,
+                  resources: resources
+                });
+              }
+              if (note && (_tempCartItem$_origin = tempCartItem._origin) !== null && _tempCartItem$_origin !== void 0 && _tempCartItem$_origin.product) {
+                tempCartItem.note = note;
+                tempCartItem._origin.product.note = note;
+              }
+
+              // 更新购物车数据
+              items = this.store.list.map(function (item) {
+                var _tempCartItem;
+                if (item._id === ((_tempCartItem = tempCartItem) === null || _tempCartItem === void 0 ? void 0 : _tempCartItem._id)) {
+                  return tempCartItem;
+                }
+                return item;
+              });
               this.store.list = items;
-              _context3.next = 4;
-              return this.core.effects.emit(CartHooks.OnAddItem, item);
-            case 4:
-              _context3.next = 6;
-              return this.core.effects.emit(CartHooks.OnCartChange, items);
-            case 6:
+
+              // 触发事件
+              _context3.next = 14;
+              return this.core.effects.emit("".concat(this.name, ":changed"), items);
+            case 14:
             case "end":
               return _context3.stop();
           }
         }, _callee3, this);
       }));
-      function addItem(_x3) {
-        return _addItem.apply(this, arguments);
+      function updateItem(_x4) {
+        return _updateItem.apply(this, arguments);
       }
-      return addItem;
-    }())
-  }, {
-    key: "getItemCount",
-    value: function getItemCount() {
-      return this.store.list.length;
-    }
-  }, {
-    key: "getTotalPrice",
-    value: function getTotalPrice() {
-      return this.store.list.reduce(function (total, item) {
-        return total + item.price * item.quantity;
-      }, 0);
-    }
+      return updateItem;
+    }()
+    /**
+     * 批量设置购物车数据
+     */
+    )
   }, {
-    key: "getItems",
-    value: function () {
-      var _getItems = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    key: "batchSetItems",
+    value: (function () {
+      var _batchSetItems = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(items) {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              return _context4.abrupt("return", this.store.list);
+              this.store.list = items || [];
             case 1:
             case "end":
               return _context4.stop();
           }
         }, _callee4, this);
       }));
-      function getItems() {
-        return _getItems.apply(this, arguments);
+      function batchSetItems(_x5) {
+        return _batchSetItems.apply(this, arguments);
       }
-      return getItems;
-    }()
+      return batchSetItems;
+    }())
   }, {
-    key: "updateItem",
-    value: function () {
-      var _updateItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(id, item) {
-        var items, itemIndex;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
-            case 0:
-              items = this.store.list;
-              itemIndex = items.findIndex(function (i) {
-                return i.id === id;
-              });
-              if (!(itemIndex !== -1)) {
-                _context5.next = 7;
-                break;
-              }
-              items[itemIndex] = item;
-              this.store.list = items;
-              _context5.next = 7;
-              return this.core.effects.emit(CartHooks.OnCartUpdateItem, items);
-            case 7:
-            case "end":
-              return _context5.stop();
-          }
-        }, _callee5, this);
-      }));
-      function updateItem(_x4, _x5) {
-        return _updateItem.apply(this, arguments);
-      }
-      return updateItem;
-    }()
+    key: "getItemCount",
+    value: function getItemCount() {
+      return this.store.list.length;
+    }
+  }, {
+    key: "getTotalPrice",
+    value: function getTotalPrice() {
+      // return this.store.list.reduce((total: number, item: CartItem) => total + item.price * item.quantity, 0);
+      return 0;
+    }
+  }, {
+    key: "getItems",
+    value: function getItems() {
+      return this.store.list;
+    }
   }, {
     key: "removeItem",
     value: function () {
-      var _removeItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id) {
+      var _removeItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(id) {
         var items;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               items = this.store.list.filter(function (i) {
-                return i.id !== id;
+                return i._id !== id;
               });
               this.store.list = items;
-              _context6.next = 4;
+              _context5.next = 4;
               return this.core.effects.emit(CartHooks.OnCartRemove, items);
             case 4:
             case "end":
-              return _context6.stop();
+              return _context5.stop();
           }
-        }, _callee6, this);
+        }, _callee5, this);
       }));
       function removeItem(_x6) {
         return _removeItem.apply(this, arguments);
@@ -237,16 +291,18 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "storeTemp",
     value: function () {
-      var _storeTemp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(key, value) {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _storeTemp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(key, value) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               this.store.temp[key] = value;
-            case 1:
+              _context6.next = 3;
+              return this.core.effects.emit("".concat(this.name, ":changed"), this.store.temp);
+            case 3:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
-        }, _callee7, this);
+        }, _callee6, this);
       }));
       function storeTemp(_x7, _x8) {
         return _storeTemp.apply(this, arguments);
@@ -255,29 +311,31 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
     }()
   }, {
     key: "getTemp",
-    value: function () {
-      var _getTemp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(key) {
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
-            case 0:
-              if (key) {
-                _context8.next = 2;
-                break;
-              }
-              return _context8.abrupt("return", this.store.temp);
-            case 2:
-              return _context8.abrupt("return", this.store.temp[key]);
-            case 3:
-            case "end":
-              return _context8.stop();
-          }
-        }, _callee8, this);
-      }));
-      function getTemp(_x9) {
-        return _getTemp.apply(this, arguments);
+    value: function getTemp(key) {
+      if (!key) {
+        return this.store.temp;
       }
-      return getTemp;
-    }()
+      return this.store.temp[key];
+    }
+  }, {
+    key: "clear",
+    value: function clear() {
+      this.store.list = [];
+    }
+  }, {
+    key: "clearCartByAccount",
+    value: function clearCartByAccount(account_id) {
+      this.store.list = this.store.list.filter(function (item) {
+        return item.holder_id !== account_id;
+      });
+    }
+  }, {
+    key: "getCartByAccount",
+    value: function getCartByAccount(account_id) {
+      return this.store.list.filter(function (item) {
+        return item.holder_id === account_id;
+      });
+    }
   }]);
   return CartModule;
 }(BaseModule);