@etsoo/appscript 1.4.45 → 1.4.47

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

@@ -0,0 +1,21 @@
+/**
+ * Culture item for multilingual labels
+ */
+export type CultureItem = {
+    /**
+     * Target id
+     */
+    id: number;
+    /**
+     * Culture, like zh-Hans
+     */
+    culture: string;
+    /**
+     * Title /  label
+     */
+    title: string;
+    /**
+     * JSON data related
+     */
+    jsonData?: string;
+};

package/lib/cjs/business/CultureItem.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,17 +1,21 @@
 import { DataTypes, IStorage } from '@etsoo/shared';
+import { Currency } from './Currency';
 /**
  * Shopping cart owner
  * 购物篮所有人
  */
 export type ShoppingCartOwner = DataTypes.IdNameItem & {
     isSupplier?: boolean;
+    culture?: string;
+    currency?: Currency;
 };
 /**
  * Shopping cart data
  * 购物篮数据
  */
 export type ShoppingCartData<T extends ShoppingCartItem> = {
-    currency: string;
+    culture: string;
+    currency: Currency;
     owner: ShoppingCartOwner;
     items: T[];
     promotions: ShoppingPromotion[];
@@ -110,10 +114,11 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * Create identifier key
      * 创建识别键
      * @param currency Currency
+     * @param culture Culture
      * @param key Additional key
      * @returns Result
      */
-    static createKey(currency: string, key?: string): string;
+    static createKey(currency: Currency, culture: string, key?: string): string;
     /**
      * Clear shopping cart
      * 清除购物篮
@@ -125,9 +130,10 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * Clear shopping cart
      * 清除购物篮
      * @param currency Currency
+     * @param culture Culture
      * @param storage Storage
      */
-    static clearWith(currency: string, storage?: IStorage): void;
+    static clearWith(currency: Currency, culture: string, storage?: IStorage): void;
     /**
      * Get cart data
      * 获取购物篮数据
@@ -147,7 +153,12 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * ISO currency id
      * 标准货币编号
      */
-    readonly currency: string;
+    readonly currency: Currency;
+    /**
+     * ISO culture id, like zh-Hans
+     * 标准语言文化编号
+     */
+    readonly culture: string;
     _items: T[];
     /**
      * Items
@@ -216,10 +227,10 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
     /**
      * Constructor
      * 构造函数
-     * @param currency Currency ISO code
+     * @param init Currency & culture ISO code array
      * @param storage Data storage
      */
-    constructor(currency: string, storage?: IStorage);
+    constructor(init: [Currency, string], storage?: IStorage);
     /**
      * Constructor
      * 构造函数

package/lib/cjs/business/ShoppingCart.js

@@ -12,11 +12,12 @@ class ShoppingCart {
      * Create identifier key
      * 创建识别键
      * @param currency Currency
+     * @param culture Culture
      * @param key Additional key
      * @returns Result
      */
-    static createKey(currency, key = 'KEY') {
-        return `ETSOO-CART-${key}-${currency}`;
+    static createKey(currency, culture, key = 'KEY') {
+        return `ETSOO-CART-${culture}-${key}-${currency}`;
     }
     /**
      * Clear shopping cart
@@ -37,10 +38,11 @@ class ShoppingCart {
      * Clear shopping cart
      * 清除购物篮
      * @param currency Currency
+     * @param culture Culture
      * @param storage Storage
      */
-    static clearWith(currency, storage = new shared_1.WindowStorage()) {
-        const identifier = this.createKey(currency);
+    static clearWith(currency, culture, storage = new shared_1.WindowStorage()) {
+        const identifier = this.createKey(currency, culture);
         this.clear(identifier, storage);
     }
     /**
@@ -103,7 +105,7 @@ class ShoppingCart {
      */
     get identifier() {
         const o = this.owner;
-        return ShoppingCart.createKey(this.currency, o ? `${o.isSupplier ? 'S' : 'C'}${o.id}` : undefined);
+        return ShoppingCart.createKey(this.currency, this.culture, o ? `${o.isSupplier ? 'S' : 'C'}${o.id}` : undefined);
     }
     /**
      * All data keys
@@ -162,12 +164,14 @@ class ShoppingCart {
          * 缓存的价格
          */
         this.prices = {};
-        if (typeof currencyOrState === 'string') {
-            this.currency = currencyOrState;
+        if (Array.isArray(currencyOrState)) {
+            this.currency = currencyOrState[0];
+            this.culture = currencyOrState[1];
         }
         else {
             this.setCartData(currencyOrState);
             this.currency = currencyOrState.currency;
+            this.culture = currencyOrState.culture;
         }
         this.symbol = shared_1.NumberUtils.getCurrencySymbol(this.currency);
     }
@@ -261,9 +265,10 @@ class ShoppingCart {
     save(persisted = true) {
         if (this.owner == null)
             return;
-        const { currency, owner, items, promotions, formData } = this;
+        const { currency, culture, owner, items, promotions, formData } = this;
         const data = {
             currency,
+            culture,
             owner,
             items,
             promotions,

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

@@ -0,0 +1,21 @@
+/**
+ * Culture item for multilingual labels
+ */
+export type CultureItem = {
+    /**
+     * Target id
+     */
+    id: number;
+    /**
+     * Culture, like zh-Hans
+     */
+    culture: string;
+    /**
+     * Title /  label
+     */
+    title: string;
+    /**
+     * JSON data related
+     */
+    jsonData?: string;
+};

package/lib/mjs/business/CultureItem.js

@@ -0,0 +1 @@
+export {};

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

@@ -1,17 +1,21 @@
 import { DataTypes, IStorage } from '@etsoo/shared';
+import { Currency } from './Currency';
 /**
  * Shopping cart owner
  * 购物篮所有人
  */
 export type ShoppingCartOwner = DataTypes.IdNameItem & {
     isSupplier?: boolean;
+    culture?: string;
+    currency?: Currency;
 };
 /**
  * Shopping cart data
  * 购物篮数据
  */
 export type ShoppingCartData<T extends ShoppingCartItem> = {
-    currency: string;
+    culture: string;
+    currency: Currency;
     owner: ShoppingCartOwner;
     items: T[];
     promotions: ShoppingPromotion[];
@@ -110,10 +114,11 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * Create identifier key
      * 创建识别键
      * @param currency Currency
+     * @param culture Culture
      * @param key Additional key
      * @returns Result
      */
-    static createKey(currency: string, key?: string): string;
+    static createKey(currency: Currency, culture: string, key?: string): string;
     /**
      * Clear shopping cart
      * 清除购物篮
@@ -125,9 +130,10 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * Clear shopping cart
      * 清除购物篮
      * @param currency Currency
+     * @param culture Culture
      * @param storage Storage
      */
-    static clearWith(currency: string, storage?: IStorage): void;
+    static clearWith(currency: Currency, culture: string, storage?: IStorage): void;
     /**
      * Get cart data
      * 获取购物篮数据
@@ -147,7 +153,12 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
      * ISO currency id
      * 标准货币编号
      */
-    readonly currency: string;
+    readonly currency: Currency;
+    /**
+     * ISO culture id, like zh-Hans
+     * 标准语言文化编号
+     */
+    readonly culture: string;
     _items: T[];
     /**
      * Items
@@ -216,10 +227,10 @@ export declare class ShoppingCart<T extends ShoppingCartItem> {
     /**
      * Constructor
      * 构造函数
-     * @param currency Currency ISO code
+     * @param init Currency & culture ISO code array
      * @param storage Data storage
      */
-    constructor(currency: string, storage?: IStorage);
+    constructor(init: [Currency, string], storage?: IStorage);
     /**
      * Constructor
      * 构造函数

package/lib/mjs/business/ShoppingCart.js

@@ -9,11 +9,12 @@ export class ShoppingCart {
      * Create identifier key
      * 创建识别键
      * @param currency Currency
+     * @param culture Culture
      * @param key Additional key
      * @returns Result
      */
-    static createKey(currency, key = 'KEY') {
-        return `ETSOO-CART-${key}-${currency}`;
+    static createKey(currency, culture, key = 'KEY') {
+        return `ETSOO-CART-${culture}-${key}-${currency}`;
     }
     /**
      * Clear shopping cart
@@ -34,10 +35,11 @@ export class ShoppingCart {
      * Clear shopping cart
      * 清除购物篮
      * @param currency Currency
+     * @param culture Culture
      * @param storage Storage
      */
-    static clearWith(currency, storage = new WindowStorage()) {
-        const identifier = this.createKey(currency);
+    static clearWith(currency, culture, storage = new WindowStorage()) {
+        const identifier = this.createKey(currency, culture);
         this.clear(identifier, storage);
     }
     /**
@@ -100,7 +102,7 @@ export class ShoppingCart {
      */
     get identifier() {
         const o = this.owner;
-        return ShoppingCart.createKey(this.currency, o ? `${o.isSupplier ? 'S' : 'C'}${o.id}` : undefined);
+        return ShoppingCart.createKey(this.currency, this.culture, o ? `${o.isSupplier ? 'S' : 'C'}${o.id}` : undefined);
     }
     /**
      * All data keys
@@ -159,12 +161,14 @@ export class ShoppingCart {
          * 缓存的价格
          */
         this.prices = {};
-        if (typeof currencyOrState === 'string') {
-            this.currency = currencyOrState;
+        if (Array.isArray(currencyOrState)) {
+            this.currency = currencyOrState[0];
+            this.culture = currencyOrState[1];
         }
         else {
             this.setCartData(currencyOrState);
             this.currency = currencyOrState.currency;
+            this.culture = currencyOrState.culture;
         }
         this.symbol = NumberUtils.getCurrencySymbol(this.currency);
     }
@@ -258,9 +262,10 @@ export class ShoppingCart {
     save(persisted = true) {
         if (this.owner == null)
             return;
-        const { currency, owner, items, promotions, formData } = this;
+        const { currency, culture, owner, items, promotions, formData } = this;
         const data = {
             currency,
+            culture,
             owner,
             items,
             promotions,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.45",
+    "version": "1.4.47",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -65,8 +65,8 @@
         "@babel/runtime-corejs3": "^7.22.15",
         "@types/crypto-js": "^4.1.2",
         "@types/jest": "^29.5.4",
-        "jest": "^29.6.4",
-        "jest-environment-jsdom": "^29.6.4",
+        "jest": "^29.7.0",
+        "jest-environment-jsdom": "^29.7.0",
         "ts-jest": "^29.1.1",
         "typescript": "^5.2.2"
     }

package/src/business/CultureItem.ts

@@ -0,0 +1,24 @@
+/**
+ * Culture item for multilingual labels
+ */
+export type CultureItem = {
+    /**
+     * Target id
+     */
+    id: number;
+
+    /**
+     * Culture, like zh-Hans
+     */
+    culture: string;
+
+    /**
+     * Title /  label
+     */
+    title: string;
+
+    /**
+     * JSON data related
+     */
+    jsonData?: string;
+};

package/src/business/ShoppingCart.ts

@@ -1,4 +1,5 @@
 import { DataTypes, IStorage, NumberUtils, WindowStorage } from '@etsoo/shared';
+import { Currency } from './Currency';
 
 /**
  * Shopping cart owner
@@ -6,6 +7,8 @@ import { DataTypes, IStorage, NumberUtils, WindowStorage } from '@etsoo/shared';
  */
 export type ShoppingCartOwner = DataTypes.IdNameItem & {
     isSupplier?: boolean;
+    culture?: string;
+    currency?: Currency;
 };
 
 /**
@@ -13,7 +16,8 @@ export type ShoppingCartOwner = DataTypes.IdNameItem & {
  * 购物篮数据
  */
 export type ShoppingCartData<T extends ShoppingCartItem> = {
-    currency: string;
+    culture: string;
+    currency: Currency;
     owner: ShoppingCartOwner;
     items: T[];
     promotions: ShoppingPromotion[];
@@ -132,11 +136,12 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      * Create identifier key
      * 创建识别键
      * @param currency Currency
+     * @param culture Culture
      * @param key Additional key
      * @returns Result
      */
-    static createKey(currency: string, key: string = 'KEY') {
-        return `ETSOO-CART-${key}-${currency}`;
+    static createKey(currency: Currency, culture: string, key: string = 'KEY') {
+        return `ETSOO-CART-${culture}-${key}-${currency}`;
     }
 
     /**
@@ -158,13 +163,15 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      * Clear shopping cart
      * 清除购物篮
      * @param currency Currency
+     * @param culture Culture
      * @param storage Storage
      */
     static clearWith(
-        currency: string,
+        currency: Currency,
+        culture: string,
         storage: IStorage = new WindowStorage()
     ) {
-        const identifier = this.createKey(currency);
+        const identifier = this.createKey(currency, culture);
         this.clear(identifier, storage);
     }
 
@@ -213,7 +220,13 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      * ISO currency id
      * 标准货币编号
      */
-    readonly currency: string;
+    readonly currency: Currency;
+
+    /**
+     * ISO culture id, like zh-Hans
+     * 标准语言文化编号
+     */
+    readonly culture: string;
 
     _items: T[] = [];
 
@@ -260,6 +273,7 @@ export class ShoppingCart<T extends ShoppingCartItem> {
         const o = this.owner;
         return ShoppingCart.createKey(
             this.currency,
+            this.culture,
             o ? `${o.isSupplier ? 'S' : 'C'}${o.id}` : undefined
         );
     }
@@ -331,10 +345,10 @@ export class ShoppingCart<T extends ShoppingCartItem> {
     /**
      * Constructor
      * 构造函数
-     * @param currency Currency ISO code
+     * @param init Currency & culture ISO code array
      * @param storage Data storage
      */
-    constructor(currency: string, storage?: IStorage);
+    constructor(init: [Currency, string], storage?: IStorage);
 
     /**
      * Constructor
@@ -351,14 +365,16 @@ export class ShoppingCart<T extends ShoppingCartItem> {
      * @param storage Data storage
      */
     constructor(
-        currencyOrState: string | ShoppingCartData<T>,
+        currencyOrState: [Currency, string] | ShoppingCartData<T>,
         private readonly storage: IStorage = new WindowStorage()
     ) {
-        if (typeof currencyOrState === 'string') {
-            this.currency = currencyOrState;
+        if (Array.isArray(currencyOrState)) {
+            this.currency = currencyOrState[0];
+            this.culture = currencyOrState[1];
         } else {
             this.setCartData(currencyOrState);
             this.currency = currencyOrState.currency;
+            this.culture = currencyOrState.culture;
         }
         this.symbol = NumberUtils.getCurrencySymbol(this.currency);
     }
@@ -463,9 +479,10 @@ export class ShoppingCart<T extends ShoppingCartItem> {
     save(persisted: boolean = true) {
         if (this.owner == null) return;
 
-        const { currency, owner, items, promotions, formData } = this;
+        const { currency, culture, owner, items, promotions, formData } = this;
         const data: ShoppingCartData<T> = {
             currency,
+            culture,
             owner,
             items,
             promotions,