@etsoo/appscript 1.3.94 → 1.3.95

package/lib/cjs/business/ShoppingCart.d.ts

@@ -128,26 +128,40 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * @param storage Storage
      */
     static clearWith(currency: string, storage?: IStorage): void;
+    /**
+     * Get cart data
+     * 获取购物篮数据
+     * @param storage Storage
+     * @param id Cart id
+     * @returns Result
+     */
+    static getCartData<D extends ShoppingCartItem>(storage: IStorage, id: string): ShoppingCartData<D> | undefined;
+    _owner?: ShoppingCartOwner;
     /**
      * Owner data
      * 所有者信息
      */
-    owner?: ShoppingCartOwner;
+    get owner(): ShoppingCartOwner | undefined;
+    set owner(value: ShoppingCartOwner | undefined);
     /**
      * ISO currency id
      * 标准货币编号
      */
     readonly currency: string;
+    _items: T[];
     /**
      * Items
      * 项目
      */
-    readonly items: T[];
+    get items(): T[];
+    private set items(value);
+    _promotions: ShoppingPromotion[];
     /**
      * Order level promotions
      * 订单层面促销
      */
-    readonly promotions: ShoppingPromotion[];
+    get promotions(): ShoppingPromotion[];
+    private set promotions(value);
     /**
      * Related form data
      * 关联的表单数据
@@ -162,7 +176,13 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * Cart identifier
      * 购物篮标识
      */
-    private readonly identifier;
+    get identifier(): string;
+    /**
+     * All data keys
+     * 所有的数据键
+     */
+    get keys(): string[];
+    set keys(items: string[]);
     /**
      * Lines count
      * 项目数量
@@ -198,7 +218,6 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * 构造函数
      * @param currency Currency ISO code
      * @param storage Data storage
-     * @param key Additional key
      */
     constructor(currency: string, storage?: IStorage, key?: string);
     /**
@@ -206,9 +225,9 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * 构造函数
      * @param state Initialization state
      * @param storage Data storage
-     * @param key Additional key
      */
     constructor(state: ShoppingCartData<T>, storage?: IStorage, key?: string);
+    private setCartData;
     private doChange;
     /**
      * Add item

package/lib/cjs/business/ShoppingCart.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShoppingCart = void 0;
 const shared_1 = require("@etsoo/shared");
+const ShoppingCartKeyField = 'ETSOO-CART-KEYS';
 /**
  * Shopping cart
  * 购物篮
@@ -42,6 +43,77 @@ class ShoppingCart {
         const identifier = this.createKey(currency);
         this.clear(identifier, storage);
     }
+    /**
+     * Get cart data
+     * 获取购物篮数据
+     * @param storage Storage
+     * @param id Cart id
+     * @returns Result
+     */
+    static getCartData(storage, id) {
+        var _a;
+        try {
+            return ((_a = storage.getPersistedObject(id)) !== null && _a !== void 0 ? _a : storage.getObject(id));
+        }
+        catch (error) {
+            console.log('ShoppingCart constructor', error);
+        }
+    }
+    /**
+     * Owner data
+     * 所有者信息
+     */
+    get owner() {
+        return this._owner;
+    }
+    set owner(value) {
+        var _a;
+        if (((_a = this._owner) === null || _a === void 0 ? void 0 : _a.id) === (value === null || value === void 0 ? void 0 : value.id))
+            return;
+        this._owner = value;
+        if (value) {
+            const data = ShoppingCart.getCartData(this.storage, this.identifier);
+            this.setCartData(data);
+        }
+    }
+    /**
+     * Items
+     * 项目
+     */
+    get items() {
+        return this._items;
+    }
+    set items(value) {
+        this._items = value;
+    }
+    /**
+     * Order level promotions
+     * 订单层面促销
+     */
+    get promotions() {
+        return this._promotions;
+    }
+    set promotions(value) {
+        this._promotions = value;
+    }
+    /**
+     * Cart identifier
+     * 购物篮标识
+     */
+    get identifier() {
+        const o = this.owner;
+        return ShoppingCart.createKey(this.currency, o ? `${o.isSupplier ? 'S' : 'C'}${o.id}` : undefined);
+    }
+    /**
+     * All data keys
+     * 所有的数据键
+     */
+    get keys() {
+        return this.storage.getPersistedData(ShoppingCartKeyField, []);
+    }
+    set keys(items) {
+        this.storage.setPersistedData(ShoppingCartKeyField, items);
+    }
     /**
      * Lines count
      * 项目数量
@@ -79,34 +151,26 @@ class ShoppingCart {
      * 构造函数
      * @param currency Currency ISO code
      * @param storage Data storage
-     * @param key Additional key
      */
-    constructor(currencyOrState, storage = new shared_1.WindowStorage(), key) {
-        var _a;
+    constructor(currencyOrState, storage = new shared_1.WindowStorage()) {
         this.storage = storage;
+        this._items = [];
+        this._promotions = [];
         /**
          * Cached prices
          * 缓存的价格
          */
         this.prices = {};
-        const isCurrency = typeof currencyOrState === 'string';
-        this.currency = isCurrency ? currencyOrState : currencyOrState.currency;
-        const id = ShoppingCart.createKey(this.currency, key);
-        this.identifier = id;
-        this.symbol = shared_1.NumberUtils.getCurrencySymbol(this.currency);
-        let state;
-        if (isCurrency) {
-            try {
-                state =
-                    (_a = storage.getPersistedObject(id)) !== null && _a !== void 0 ? _a : storage.getObject(id);
-            }
-            catch (error) {
-                console.log('ShoppingCart constructor', error);
-            }
+        if (typeof currencyOrState === 'string') {
+            this.currency = currencyOrState;
         }
         else {
-            state = currencyOrState;
+            this.setCartData(currencyOrState);
+            this.currency = currencyOrState.currency;
         }
+        this.symbol = shared_1.NumberUtils.getCurrencySymbol(this.currency);
+    }
+    setCartData(state) {
         const { owner, items = [], promotions = [], formData } = state !== null && state !== void 0 ? state : {};
         this.owner = owner;
         this.items = items;
@@ -153,6 +217,12 @@ class ShoppingCart {
         }
         else {
             ShoppingCart.clear(this.identifier, this.storage);
+            const keys = this.keys;
+            const index = keys.indexOf(this.identifier);
+            if (index !== -1) {
+                keys.splice(index, 1);
+                this.keys = keys;
+            }
         }
         this.doChange('clear', []);
     }
@@ -199,6 +269,11 @@ class ShoppingCart {
         try {
             if (persisted) {
                 this.storage.setPersistedData(this.identifier, data);
+                const keys = this.keys;
+                if (!keys.includes(this.identifier)) {
+                    keys.push(this.identifier);
+                    this.keys = keys;
+                }
             }
             else {
                 this.storage.setData(this.identifier, data);

package/lib/mjs/business/ShoppingCart.d.ts

@@ -128,26 +128,40 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * @param storage Storage
      */
     static clearWith(currency: string, storage?: IStorage): void;
+    /**
+     * Get cart data
+     * 获取购物篮数据
+     * @param storage Storage
+     * @param id Cart id
+     * @returns Result
+     */
+    static getCartData<D extends ShoppingCartItem>(storage: IStorage, id: string): ShoppingCartData<D> | undefined;
+    _owner?: ShoppingCartOwner;
     /**
      * Owner data
      * 所有者信息
      */
-    owner?: ShoppingCartOwner;
+    get owner(): ShoppingCartOwner | undefined;
+    set owner(value: ShoppingCartOwner | undefined);
     /**
      * ISO currency id
      * 标准货币编号
      */
     readonly currency: string;
+    _items: T[];
     /**
      * Items
      * 项目
      */
-    readonly items: T[];
+    get items(): T[];
+    private set items(value);
+    _promotions: ShoppingPromotion[];
     /**
      * Order level promotions
      * 订单层面促销
      */
-    readonly promotions: ShoppingPromotion[];
+    get promotions(): ShoppingPromotion[];
+    private set promotions(value);
     /**
      * Related form data
      * 关联的表单数据
@@ -162,7 +176,13 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * Cart identifier
      * 购物篮标识
      */
-    private readonly identifier;
+    get identifier(): string;
+    /**
+     * All data keys
+     * 所有的数据键
+     */
+    get keys(): string[];
+    set keys(items: string[]);
     /**
      * Lines count
      * 项目数量
@@ -198,7 +218,6 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * 构造函数
      * @param currency Currency ISO code
      * @param storage Data storage
-     * @param key Additional key
      */
     constructor(currency: string, storage?: IStorage, key?: string);
     /**
@@ -206,9 +225,9 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * 构造函数
      * @param state Initialization state
      * @param storage Data storage
-     * @param key Additional key
      */
     constructor(state: ShoppingCartData<T>, storage?: IStorage, key?: string);
+    private setCartData;
     private doChange;
     /**
      * Add item

package/lib/mjs/business/ShoppingCart.js

@@ -1,4 +1,5 @@
 import { NumberUtils, WindowStorage } from '@etsoo/shared';
+const ShoppingCartKeyField = 'ETSOO-CART-KEYS';
 /**
  * Shopping cart
  * 购物篮
@@ -39,6 +40,77 @@ export class ShoppingCart {
         const identifier = this.createKey(currency);
         this.clear(identifier, storage);
     }
+    /**
+     * Get cart data
+     * 获取购物篮数据
+     * @param storage Storage
+     * @param id Cart id
+     * @returns Result
+     */
+    static getCartData(storage, id) {
+        var _a;
+        try {
+            return ((_a = storage.getPersistedObject(id)) !== null && _a !== void 0 ? _a : storage.getObject(id));
+        }
+        catch (error) {
+            console.log('ShoppingCart constructor', error);
+        }
+    }
+    /**
+     * Owner data
+     * 所有者信息
+     */
+    get owner() {
+        return this._owner;
+    }
+    set owner(value) {
+        var _a;
+        if (((_a = this._owner) === null || _a === void 0 ? void 0 : _a.id) === (value === null || value === void 0 ? void 0 : value.id))
+            return;
+        this._owner = value;
+        if (value) {
+            const data = ShoppingCart.getCartData(this.storage, this.identifier);
+            this.setCartData(data);
+        }
+    }
+    /**
+     * Items
+     * 项目
+     */
+    get items() {
+        return this._items;
+    }
+    set items(value) {
+        this._items = value;
+    }
+    /**
+     * Order level promotions
+     * 订单层面促销
+     */
+    get promotions() {
+        return this._promotions;
+    }
+    set promotions(value) {
+        this._promotions = value;
+    }
+    /**
+     * Cart identifier
+     * 购物篮标识
+     */
+    get identifier() {
+        const o = this.owner;
+        return ShoppingCart.createKey(this.currency, o ? `${o.isSupplier ? 'S' : 'C'}${o.id}` : undefined);
+    }
+    /**
+     * All data keys
+     * 所有的数据键
+     */
+    get keys() {
+        return this.storage.getPersistedData(ShoppingCartKeyField, []);
+    }
+    set keys(items) {
+        this.storage.setPersistedData(ShoppingCartKeyField, items);
+    }
     /**
      * Lines count
      * 项目数量
@@ -76,34 +148,26 @@ export class ShoppingCart {
      * 构造函数
      * @param currency Currency ISO code
      * @param storage Data storage
-     * @param key Additional key
      */
-    constructor(currencyOrState, storage = new WindowStorage(), key) {
-        var _a;
+    constructor(currencyOrState, storage = new WindowStorage()) {
         this.storage = storage;
+        this._items = [];
+        this._promotions = [];
         /**
          * Cached prices
          * 缓存的价格
          */
         this.prices = {};
-        const isCurrency = typeof currencyOrState === 'string';
-        this.currency = isCurrency ? currencyOrState : currencyOrState.currency;
-        const id = ShoppingCart.createKey(this.currency, key);
-        this.identifier = id;
-        this.symbol = NumberUtils.getCurrencySymbol(this.currency);
-        let state;
-        if (isCurrency) {
-            try {
-                state =
-                    (_a = storage.getPersistedObject(id)) !== null && _a !== void 0 ? _a : storage.getObject(id);
-            }
-            catch (error) {
-                console.log('ShoppingCart constructor', error);
-            }
+        if (typeof currencyOrState === 'string') {
+            this.currency = currencyOrState;
         }
         else {
-            state = currencyOrState;
+            this.setCartData(currencyOrState);
+            this.currency = currencyOrState.currency;
         }
+        this.symbol = NumberUtils.getCurrencySymbol(this.currency);
+    }
+    setCartData(state) {
         const { owner, items = [], promotions = [], formData } = state !== null && state !== void 0 ? state : {};
         this.owner = owner;
         this.items = items;
@@ -150,6 +214,12 @@ export class ShoppingCart {
         }
         else {
             ShoppingCart.clear(this.identifier, this.storage);
+            const keys = this.keys;
+            const index = keys.indexOf(this.identifier);
+            if (index !== -1) {
+                keys.splice(index, 1);
+                this.keys = keys;
+            }
         }
         this.doChange('clear', []);
     }
@@ -196,6 +266,11 @@ export class ShoppingCart {
         try {
             if (persisted) {
                 this.storage.setPersistedData(this.identifier, data);
+                const keys = this.keys;
+                if (!keys.includes(this.identifier)) {
+                    keys.push(this.identifier);
+                    this.keys = keys;
+                }
             }
             else {
                 this.storage.setData(this.identifier, data);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.94",
+    "version": "1.3.95",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -64,7 +64,7 @@
         "@babel/plugin-transform-runtime": "^7.21.4",
         "@babel/preset-env": "^7.21.4",
         "@babel/runtime-corejs3": "^7.21.0",
-        "@types/jest": "^29.5.0",
+        "@types/jest": "^29.5.1",
         "jest": "^29.5.0",
         "jest-environment-jsdom": "^29.5.0",
         "ts-jest": "^29.1.0",

package/src/business/ShoppingCart.ts

@@ -121,6 +121,8 @@ export type ShoppingCartChangeReason =
     | 'title'
     | 'update';
 
+const ShoppingCartKeyField = 'ETSOO-CART-KEYS';
+
 /**
  * Shopping cart
  * 购物篮
@@ -166,11 +168,46 @@ export class ShoppingCart<T extends ShoppingCartItem> {
         this.clear(identifier, storage);
     }
 
+    /**
+     * Get cart data
+     * 获取购物篮数据
+     * @param storage Storage
+     * @param id Cart id
+     * @returns Result
+     */
+    static getCartData<D extends ShoppingCartItem>(
+        storage: IStorage,
+        id: string
+    ) {
+        try {
+            return (
+                storage.getPersistedObject<ShoppingCartData<D>>(id) ??
+                storage.getObject<ShoppingCartData<D>>(id)
+            );
+        } catch (error) {
+            console.log('ShoppingCart constructor', error);
+        }
+    }
+
+    _owner?: ShoppingCartOwner;
     /**
      * Owner data
      * 所有者信息
      */
-    owner?: ShoppingCartOwner;
+    get owner() {
+        return this._owner;
+    }
+    set owner(value) {
+        if (this._owner?.id === value?.id) return;
+        this._owner = value;
+        if (value) {
+            const data = ShoppingCart.getCartData<T>(
+                this.storage,
+                this.identifier
+            );
+            this.setCartData(data);
+        }
+    }
 
     /**
      * ISO currency id
@@ -178,17 +215,30 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      */
     readonly currency: string;
 
+    _items: T[] = [];
+
     /**
      * Items
      * 项目
      */
-    readonly items: T[];
+    get items() {
+        return this._items;
+    }
+    private set items(value) {
+        this._items = value;
+    }
 
+    _promotions: ShoppingPromotion[] = [];
     /**
      * Order level promotions
      * 订单层面促销
      */
-    readonly promotions: ShoppingPromotion[];
+    get promotions() {
+        return this._promotions;
+    }
+    private set promotions(value) {
+        this._promotions = value;
+    }
 
     /**
      * Related form data
@@ -206,7 +256,27 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      * Cart identifier
      * 购物篮标识
      */
-    private readonly identifier: string;
+    get identifier() {
+        const o = this.owner;
+        return ShoppingCart.createKey(
+            this.currency,
+            o ? `${o.isSupplier ? 'S' : 'C'}${o.id}` : undefined
+        );
+    }
+
+    /**
+     * All data keys
+     * 所有的数据键
+     */
+    get keys() {
+        return this.storage.getPersistedData<string[]>(
+            ShoppingCartKeyField,
+            []
+        );
+    }
+    set keys(items: string[]) {
+        this.storage.setPersistedData(ShoppingCartKeyField, items);
+    }
 
     /**
      * Lines count
@@ -263,7 +333,6 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      * 构造函数
      * @param currency Currency ISO code
      * @param storage Data storage
-     * @param key Additional key
      */
     constructor(currency: string, storage?: IStorage, key?: string);
 
@@ -272,7 +341,6 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      * 构造函数
      * @param state Initialization state
      * @param storage Data storage
-     * @param key Additional key
      */
     constructor(state: ShoppingCartData<T>, storage?: IStorage, key?: string);
 
@@ -281,35 +349,22 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      * 构造函数
      * @param currency Currency ISO code
      * @param storage Data storage
-     * @param key Additional key
      */
     constructor(
         currencyOrState: string | ShoppingCartData<T>,
-        private readonly storage: IStorage = new WindowStorage(),
-        key?: string
+        private readonly storage: IStorage = new WindowStorage()
     ) {
-        const isCurrency = typeof currencyOrState === 'string';
-        this.currency = isCurrency ? currencyOrState : currencyOrState.currency;
-
-        const id = ShoppingCart.createKey(this.currency, key);
-        this.identifier = id;
-        this.symbol = NumberUtils.getCurrencySymbol(this.currency);
-
-        let state: ShoppingCartData<T> | undefined;
-        if (isCurrency) {
-            try {
-                state =
-                    storage.getPersistedObject<ShoppingCartData<T>>(id) ??
-                    storage.getObject<ShoppingCartData<T>>(id);
-            } catch (error) {
-                console.log('ShoppingCart constructor', error);
-            }
+        if (typeof currencyOrState === 'string') {
+            this.currency = currencyOrState;
         } else {
-            state = currencyOrState;
+            this.setCartData(currencyOrState);
+            this.currency = currencyOrState.currency;
         }
+        this.symbol = NumberUtils.getCurrencySymbol(this.currency);
+    }
 
+    private setCartData(state: ShoppingCartData<T> | undefined) {
         const { owner, items = [], promotions = [], formData } = state ?? {};
-
         this.owner = owner;
         this.items = items;
         this.promotions = promotions;
@@ -359,6 +414,13 @@ export class ShoppingCart<T extends ShoppingCartItem> {
             this.save();
         } else {
             ShoppingCart.clear(this.identifier, this.storage);
+
+            const keys = this.keys;
+            const index = keys.indexOf(this.identifier);
+            if (index !== -1) {
+                keys.splice(index, 1);
+                this.keys = keys;
+            }
         }
 
         this.doChange('clear', []);
@@ -411,6 +473,12 @@ export class ShoppingCart<T extends ShoppingCartItem> {
         try {
             if (persisted) {
                 this.storage.setPersistedData(this.identifier, data);
+
+                const keys = this.keys;
+                if (!keys.includes(this.identifier)) {
+                    keys.push(this.identifier);
+                    this.keys = keys;
+                }
             } else {
                 this.storage.setData(this.identifier, data);
             }