@peabody-soft/mbs-model-ts 1.7.1 → 1.8.0

package/dist/Catalog.d.ts

@@ -1,13 +1,15 @@
 import Item from "./Item";
 import Package from "./Package";
+import Price from "./Price";
 import PriceList from "./PriceList";
 import Product from "./Product";
 import ProductCategory from "./ProductCategory";
 export default class Catalog {
-    private readonly _priceList;
-    constructor(categories: ReadonlyArray<ProductCategory>, products: ReadonlyArray<Product>, _priceList: PriceList | null);
+    constructor(categories: ReadonlyArray<ProductCategory>, products: ReadonlyArray<Product>, packages: ReadonlyArray<Package>, priceLists: ReadonlyArray<PriceList>, prices: ReadonlyArray<Price>);
     get categories(): ReadonlyArray<ProductCategory>;
     get products(): ReadonlyArray<Product>;
+    get currentSalePriceListId(): bigint;
+    private set currentSalePriceListId(value);
     get priceList(): PriceList | null;
     get productCount(): number;
     get packageCount(): number;
@@ -19,10 +21,20 @@ export default class Catalog {
     private static compareNames;
     private static compareIds;
     private static comparePrices;
+    private applySalePriceList;
     static readonly EMPTY: Catalog;
-    private readonly _categories;
-    private readonly _products;
-    private readonly _categoryMap;
-    private readonly _productMap;
-    private readonly _packageMap;
+    private readonly _allCategories;
+    private readonly _allProducts;
+    private readonly _uncategorized;
+    private readonly _candidatePackages;
+    private readonly _priceListMap;
+    private _currentSalePriceListId;
+    private _categories;
+    private _products;
+    private _categoryMap;
+    private _productMap;
+    private _packageMap;
+}
+export interface UpdatableCatalog {
+    set currentSalePriceListId(value: bigint);
 }

package/dist/Catalog.js

@@ -1,51 +1,70 @@
 import { Constants as proto_Constants } from "./generated/Constants";
-import { EntityHeader } from "./Entity";
+import { DEFAULT_SALE_PRICE_LIST_ID } from "./Constants";
+import { EntityHeader, UpdatableEntity } from "./Entity";
 import ProductCategory from "./ProductCategory";
 // The catalog of a business: its categories and the products in them. Not an entity and not on the
-// wire. The sync layer rebuilds it from the flat item entities of a sync response.
+// wire. The sync layer builds it from the flat item entities of a sync response, as the merchant
+// app's Catalog is built.
+//
+// The constructor links what it is given: a package to its product, a price to its price list and a
+// price list to its parent. It does not depend on any price list being present. Packages are priced
+// from currentSalePriceListId, so setting that id decides which packages and products are buyable.
 class Catalog {
-    constructor(categories, products, _priceList) {
-        this._priceList = _priceList;
+    constructor(categories, products, packages, priceLists, prices) {
+        // Every package that has a product, by that product's id, whether it can be bought or not
+        this._candidatePackages = new Map();
+        this._priceListMap = new Map();
+        this._currentSalePriceListId = DEFAULT_SALE_PRICE_LIST_ID;
+        // What a customer can reach, rebuilt by applySalePriceList
+        this._categories = Object.freeze([]);
+        this._products = Object.freeze([]);
         this._categoryMap = new Map();
         this._productMap = new Map();
         this._packageMap = new Map();
+        this._allCategories = categories;
+        this._allProducts = products;
         // A dummy category for products whose parentItemId is Constants.ENTITY_ID_NULL. Its id is also
         // ENTITY_ID_NULL, so getCategory(product.productCategoryId) resolves it like a real category.
-        // It is left out below like any other category when it has no products.
-        const uncategorized = new ProductCategory(new EntityHeader(BigInt(proto_Constants.ENTITY_ID_NULL), 0n, 0n, 0n, 0n), "", null, BigInt(proto_Constants.ENTITY_ID_NULL), false);
-        // Only a buyable product is part of a catalog: enabled, not sold only offline, with at least one
-        // buyable package. Any other is left out of products, getProduct and its categories, and its
-        // packages are unreachable by id. Enforced here so no builder can expose a product that cannot
-        // be bought.
-        const buyableProducts = [];
-        const productsByCategory = new Map();
-        for (const product of products) {
-            if (!product.isBuyable)
+        // It is left out like any other category when it has no buyable products.
+        this._uncategorized = new ProductCategory(new EntityHeader(BigInt(proto_Constants.ENTITY_ID_NULL), 0n, 0n, 0n, 0n), "", null, BigInt(proto_Constants.ENTITY_ID_NULL), false);
+        // A package with no product is dropped
+        const productsById = new Map();
+        for (const product of products)
+            productsById.set(product.id, product);
+        for (const pkg of packages) {
+            const product = productsById.get(pkg.productId);
+            if (product === undefined)
                 continue;
-            buyableProducts.push(product);
-            this._productMap.set(product.id, product);
-            const productsOfCategory = productsByCategory.get(product.productCategoryId);
-            if (productsOfCategory === undefined)
-                productsByCategory.set(product.productCategoryId, [product]);
+            UpdatableEntity.setParent(pkg, product);
+            const productPackages = this._candidatePackages.get(product.id);
+            if (productPackages === undefined)
+                this._candidatePackages.set(product.id, [pkg]);
             else
-                productsOfCategory.push(product);
-            for (const pkg of product.packages)
-                this._packageMap.set(pkg.id, pkg);
+                productPackages.push(pkg);
         }
-        this._products = Object.freeze(buyableProducts);
-        // A category with no buyable products is left out instead of being kept empty. This includes
-        // the dummy category.
-        const nonEmptyCategories = [];
-        for (const category of [...categories, uncategorized]) {
-            const categoryProducts = productsByCategory.get(category.id);
-            if (categoryProducts === undefined)
+        // The first of two price lists with one id is kept. A price with no price list is dropped, and a
+        // list holds one price per package, the first to arrive.
+        for (const priceList of priceLists)
+            if (!this._priceListMap.has(priceList.id))
+                this._priceListMap.set(priceList.id, priceList);
+        const pricesByList = new Map();
+        for (const price of prices) {
+            if (!this._priceListMap.has(price.priceListId))
                 continue;
-            category.products = Object.freeze(categoryProducts);
-            nonEmptyCategories.push(category);
+            const listPrices = pricesByList.get(price.priceListId);
+            if (listPrices === undefined)
+                pricesByList.set(price.priceListId, new Map([[price.packageId, price]]));
+            else if (!listPrices.has(price.packageId))
+                listPrices.set(price.packageId, price);
         }
-        this._categories = Object.freeze(nonEmptyCategories);
-        for (const category of this._categories)
-            this._categoryMap.set(category.id, category);
+        // A parent that was not read, or a list that names itself, leaves the list without a parent
+        for (const priceList of this._priceListMap.values()) {
+            const updatable = priceList;
+            updatable.prices = pricesByList.get(priceList.id) ?? new Map();
+            const parent = this._priceListMap.get(priceList.parentPriceListId) ?? null;
+            updatable.parentPriceList = parent === priceList ? null : parent;
+        }
+        this.applySalePriceList();
     }
     // In no particular order - a UI orders these for display
     get categories() {
@@ -55,11 +74,22 @@ class Catalog {
     get products() {
         return this._products;
     }
-    // The one price list a storefront sells from (MeraBills Online). Null until it arrives. Every
-    // price in this catalog belongs to it, and prices in other lists are left out. A shopping list
+    // The id of the price list packages are priced from, DEFAULT_SALE_PRICE_LIST_ID until the sync
+    // layer sets it. Setting it prices every package from that list, or from its parent where the list
+    // has no price, and keeps the packages, products and categories that can then be bought. An id
+    // that names no list prices nothing, so the catalog holds nothing.
+    get currentSalePriceListId() {
+        return this._currentSalePriceListId;
+    }
+    set currentSalePriceListId(value) {
+        this._currentSalePriceListId = value;
+        this.applySalePriceList();
+    }
+    // The price list packages are priced from (MeraBills Online for a storefront). Null when the
+    // catalog has no list with the current id, as before the catalog has arrived. A shopping list
     // built from this catalog carries its id, or MERABILLS_ONLINE_PRICE_LIST_ID while it is null.
     get priceList() {
-        return this._priceList;
+        return this._priceListMap.get(this._currentSalePriceListId) ?? null;
     }
     get productCount() {
         return this._products.length;
@@ -75,7 +105,8 @@ class Catalog {
         return this._productMap.get(productId) ?? null;
     }
     // Null for the four reserved package ids a shopping list uses for its charge and summary lines
-    // (see Ids.isReservedPackageId), and for a package whose product was deleted or is not buyable
+    // (see Ids.isReservedPackageId), and for a package that is not buyable or whose product is not
+    // buyable
     getPackage(packageId) {
         return this._packageMap.get(packageId) ?? null;
     }
@@ -111,7 +142,56 @@ class Catalog {
             return -1;
         return left.offerPrice - right.offerPrice;
     }
+    // Prices the packages from the current sale price list, then rebuilds what a customer can reach.
+    // Only a buyable product is part of a catalog: enabled, not sold only offline, with at least one
+    // buyable package. Any other is left out of products, getProduct and its categories, and its
+    // packages are unreachable by id. A category with no buyable products is left out too, the dummy
+    // one included.
+    applySalePriceList() {
+        const salePriceList = this.priceList;
+        const buyableProducts = [];
+        const productMap = new Map();
+        const packageMap = new Map();
+        const productsByCategory = new Map();
+        for (const product of this._allProducts) {
+            const candidates = this._candidatePackages.get(product.id) ?? [];
+            for (const pkg of candidates) {
+                const price = salePriceList === null ? null : salePriceList.getPrice(pkg.id);
+                pkg.price = price;
+                if (price !== null)
+                    UpdatableEntity.setParent(price, pkg);
+            }
+            // The product keeps only the buyable ones, and is judged by them
+            product.packages = candidates;
+            if (!product.isBuyable)
+                continue;
+            buyableProducts.push(product);
+            productMap.set(product.id, product);
+            const productsOfCategory = productsByCategory.get(product.productCategoryId);
+            if (productsOfCategory === undefined)
+                productsByCategory.set(product.productCategoryId, [product]);
+            else
+                productsOfCategory.push(product);
+            for (const pkg of product.packages)
+                packageMap.set(pkg.id, pkg);
+        }
+        const nonEmptyCategories = [];
+        const categoryMap = new Map();
+        for (const category of [...this._allCategories, this._uncategorized]) {
+            const categoryProducts = productsByCategory.get(category.id);
+            category.products = Object.freeze(categoryProducts ?? []);
+            if (categoryProducts === undefined)
+                continue;
+            nonEmptyCategories.push(category);
+            categoryMap.set(category.id, category);
+        }
+        this._products = Object.freeze(buyableProducts);
+        this._categories = Object.freeze(nonEmptyCategories);
+        this._productMap = productMap;
+        this._packageMap = packageMap;
+        this._categoryMap = categoryMap;
+    }
 }
 // A business whose catalog has not arrived yet
-Catalog.EMPTY = new Catalog(Object.freeze([]), Object.freeze([]), null);
+Catalog.EMPTY = new Catalog([], [], [], [], []);
 export default Catalog;

package/dist/Constants.d.ts

@@ -1,5 +1,6 @@
 export { Constants } from "./generated/Constants";
 export declare function buildPriceListId(priceList: number): bigint;
+export declare const DEFAULT_SALE_PRICE_LIST_ID: bigint;
 export declare const MERABILLS_ONLINE_PRICE_LIST_ID: bigint;
 export declare const MAX_SCALED_AMOUNT: bigint;
 export declare function amountFromScaledValue(scaledAmount: bigint): number;

package/dist/Constants.js

@@ -11,9 +11,11 @@ export { Constants } from "./generated/Constants";
 export function buildPriceListId(priceList) {
     return Ids.buildId(proto_Constants.PRICE_LIST_ENTITY_TYPE_ID, BigInt(priceList));
 }
-// The only price list this library reads. A business prices a package in several lists (over the
-// counter, on a marketplace), and only this one is the storefront's. Prices in other lists are
-// skipped, see ProtoMap.buildBusiness.
+// The list a catalog sells from until another is set, as in the merchant app's Catalog
+export const DEFAULT_SALE_PRICE_LIST_ID = buildPriceListId(proto_Constants.DEFAULT_SALE_PRICE_LIST);
+// The list a storefront sells from. A business prices a package in several lists (over the counter,
+// on a marketplace), and a response can carry any of its public ones. ProtoMap.buildBusiness sets
+// the catalog to sell from this one, and a package with no price in it is priced from its parent.
 export const MERABILLS_ONLINE_PRICE_LIST_ID = buildPriceListId(proto_Constants.MERABILLS_ONLINE_PRICE_LIST);
 // The largest amount the protocol can carry (Java Transaction.MAX_AMOUNT). Kept here because it does
 // not fit a protobuf enum value. It is 2^44 - 1, well below 2^53, so an amount is safe as a number.

package/dist/Enums.d.ts

@@ -5,6 +5,7 @@ export { BusinessIdentifierType } from "./generated/BusinessIdentifierType";
 export { DimensionUnit } from "./generated/DimensionUnit";
 export { FulfillmentMode } from "./generated/FulfillmentMode";
 export { MessageType } from "./generated/MessageType";
+export { OnlineStoreTheme } from "./generated/OnlineStoreTheme";
 export { OrderStatus } from "./generated/OrderStatus";
 export { PackageIdentifierType } from "./generated/PackageIdentifierType";
 export { PaymentMethod } from "./generated/PaymentMethod";

package/dist/Enums.js

@@ -8,6 +8,7 @@ export { BusinessIdentifierType } from "./generated/BusinessIdentifierType";
 export { DimensionUnit } from "./generated/DimensionUnit";
 export { FulfillmentMode } from "./generated/FulfillmentMode";
 export { MessageType } from "./generated/MessageType";
+export { OnlineStoreTheme } from "./generated/OnlineStoreTheme";
 export { OrderStatus } from "./generated/OrderStatus";
 export { PackageIdentifierType } from "./generated/PackageIdentifierType";
 export { PaymentMethod } from "./generated/PaymentMethod";

package/dist/GeneralSettings.d.ts

@@ -1,4 +1,5 @@
 import { FulfillmentMode as proto_FulfillmentMode } from "./generated/FulfillmentMode";
+import { OnlineStoreTheme as proto_OnlineStoreTheme } from "./generated/OnlineStoreTheme";
 import { AddressList } from "./Address";
 import BusinessIdentifier from "./BusinessIdentifier";
 import LatLong from "./LatLong";
@@ -22,10 +23,10 @@ export default class GeneralSettings {
     private readonly _primaryStoreLocation;
     private readonly _googleBusinessCategoryId;
     private readonly _googleBusinessCategoryName;
-    private readonly _onlineStoreThemeId;
+    private readonly _onlineStoreTheme;
     private readonly _onlineShoppingEnabled;
-    static fromScaledValues(paymentMethodDetails: ReadonlyArray<PaymentMethodDetail>, customerServicePhone: string | null, isWhatsAppSupported: boolean, isSmsSupported: boolean, businessAddresses: AddressList, businessIdentifiers: ReadonlyArray<BusinessIdentifier>, fulfillmentModes: ReadonlyArray<proto_FulfillmentMode>, scaledDeliveryCharge: bigint, deliveryChargeTaxes: ReadonlyArray<Tax>, scaledFreeDeliveryTotal: bigint, deliveryRadiusKilometres: number, storeTagline: string | null, workingDays: WorkingDays, primaryStoreLocation: LatLong | null, googleBusinessCategoryId: string | null, googleBusinessCategoryName: string | null, onlineStoreThemeId: string | null, onlineShoppingEnabled: boolean): GeneralSettings;
-    constructor(_paymentMethodDetails: ReadonlyArray<PaymentMethodDetail>, _customerServicePhone: string | null, _isWhatsAppSupported: boolean, _isSmsSupported: boolean, _businessAddresses: AddressList, _businessIdentifiers: ReadonlyArray<BusinessIdentifier>, _fulfillmentModes: ReadonlyArray<proto_FulfillmentMode>, _deliveryCharge: number, _deliveryChargeTaxes: ReadonlyArray<Tax>, _freeDeliveryTotal: number, _deliveryRadiusKilometres: number, _storeTagline: string | null, _workingDays: WorkingDays, _primaryStoreLocation: LatLong | null, _googleBusinessCategoryId: string | null, _googleBusinessCategoryName: string | null, _onlineStoreThemeId: string | null, _onlineShoppingEnabled: boolean);
+    static fromScaledValues(paymentMethodDetails: ReadonlyArray<PaymentMethodDetail>, customerServicePhone: string | null, isWhatsAppSupported: boolean, isSmsSupported: boolean, businessAddresses: AddressList, businessIdentifiers: ReadonlyArray<BusinessIdentifier>, fulfillmentModes: ReadonlyArray<proto_FulfillmentMode>, scaledDeliveryCharge: bigint, deliveryChargeTaxes: ReadonlyArray<Tax>, scaledFreeDeliveryTotal: bigint, deliveryRadiusKilometres: number, storeTagline: string | null, workingDays: WorkingDays, primaryStoreLocation: LatLong | null, googleBusinessCategoryId: string | null, googleBusinessCategoryName: string | null, onlineStoreTheme: proto_OnlineStoreTheme | null, onlineShoppingEnabled: boolean): GeneralSettings;
+    constructor(_paymentMethodDetails: ReadonlyArray<PaymentMethodDetail>, _customerServicePhone: string | null, _isWhatsAppSupported: boolean, _isSmsSupported: boolean, _businessAddresses: AddressList, _businessIdentifiers: ReadonlyArray<BusinessIdentifier>, _fulfillmentModes: ReadonlyArray<proto_FulfillmentMode>, _deliveryCharge: number, _deliveryChargeTaxes: ReadonlyArray<Tax>, _freeDeliveryTotal: number, _deliveryRadiusKilometres: number, _storeTagline: string | null, _workingDays: WorkingDays, _primaryStoreLocation: LatLong | null, _googleBusinessCategoryId: string | null, _googleBusinessCategoryName: string | null, _onlineStoreTheme: proto_OnlineStoreTheme | null, _onlineShoppingEnabled: boolean);
     get paymentMethodDetails(): ReadonlyArray<PaymentMethodDetail>;
     get customerServicePhone(): string | null;
     get isWhatsAppSupported(): boolean;
@@ -42,7 +43,7 @@ export default class GeneralSettings {
     get primaryStoreLocation(): LatLong | null;
     get googleBusinessCategoryId(): string | null;
     get googleBusinessCategoryName(): string | null;
-    get onlineStoreThemeId(): string | null;
+    get onlineStoreTheme(): proto_OnlineStoreTheme | null;
     get onlineShoppingEnabled(): boolean;
     static readonly EMPTY: GeneralSettings;
 }

package/dist/GeneralSettings.js

@@ -7,10 +7,10 @@ import WorkingDays from "./WorkingDays";
 // merchant-only fields are absent.
 class GeneralSettings {
     // For ProtoMap, which sees amounts still multiplied by Constants.AMOUNT_FACTOR.
-    static fromScaledValues(paymentMethodDetails, customerServicePhone, isWhatsAppSupported, isSmsSupported, businessAddresses, businessIdentifiers, fulfillmentModes, scaledDeliveryCharge, deliveryChargeTaxes, scaledFreeDeliveryTotal, deliveryRadiusKilometres, storeTagline, workingDays, primaryStoreLocation, googleBusinessCategoryId, googleBusinessCategoryName, onlineStoreThemeId, onlineShoppingEnabled) {
-        return new GeneralSettings(paymentMethodDetails, customerServicePhone, isWhatsAppSupported, isSmsSupported, businessAddresses, businessIdentifiers, fulfillmentModes, amountFromScaledValue(scaledDeliveryCharge), deliveryChargeTaxes, amountFromScaledValue(scaledFreeDeliveryTotal), deliveryRadiusKilometres, storeTagline, workingDays, primaryStoreLocation, googleBusinessCategoryId, googleBusinessCategoryName, onlineStoreThemeId, onlineShoppingEnabled);
+    static fromScaledValues(paymentMethodDetails, customerServicePhone, isWhatsAppSupported, isSmsSupported, businessAddresses, businessIdentifiers, fulfillmentModes, scaledDeliveryCharge, deliveryChargeTaxes, scaledFreeDeliveryTotal, deliveryRadiusKilometres, storeTagline, workingDays, primaryStoreLocation, googleBusinessCategoryId, googleBusinessCategoryName, onlineStoreTheme, onlineShoppingEnabled) {
+        return new GeneralSettings(paymentMethodDetails, customerServicePhone, isWhatsAppSupported, isSmsSupported, businessAddresses, businessIdentifiers, fulfillmentModes, amountFromScaledValue(scaledDeliveryCharge), deliveryChargeTaxes, amountFromScaledValue(scaledFreeDeliveryTotal), deliveryRadiusKilometres, storeTagline, workingDays, primaryStoreLocation, googleBusinessCategoryId, googleBusinessCategoryName, onlineStoreTheme, onlineShoppingEnabled);
     }
-    constructor(_paymentMethodDetails, _customerServicePhone, _isWhatsAppSupported, _isSmsSupported, _businessAddresses, _businessIdentifiers, _fulfillmentModes, _deliveryCharge, _deliveryChargeTaxes, _freeDeliveryTotal, _deliveryRadiusKilometres, _storeTagline, _workingDays, _primaryStoreLocation, _googleBusinessCategoryId, _googleBusinessCategoryName, _onlineStoreThemeId, _onlineShoppingEnabled) {
+    constructor(_paymentMethodDetails, _customerServicePhone, _isWhatsAppSupported, _isSmsSupported, _businessAddresses, _businessIdentifiers, _fulfillmentModes, _deliveryCharge, _deliveryChargeTaxes, _freeDeliveryTotal, _deliveryRadiusKilometres, _storeTagline, _workingDays, _primaryStoreLocation, _googleBusinessCategoryId, _googleBusinessCategoryName, _onlineStoreTheme, _onlineShoppingEnabled) {
         this._paymentMethodDetails = _paymentMethodDetails;
         this._customerServicePhone = _customerServicePhone;
         this._isWhatsAppSupported = _isWhatsAppSupported;
@@ -27,7 +27,7 @@ class GeneralSettings {
         this._primaryStoreLocation = _primaryStoreLocation;
         this._googleBusinessCategoryId = _googleBusinessCategoryId;
         this._googleBusinessCategoryName = _googleBusinessCategoryName;
-        this._onlineStoreThemeId = _onlineStoreThemeId;
+        this._onlineStoreTheme = _onlineStoreTheme;
         this._onlineShoppingEnabled = _onlineShoppingEnabled;
     }
     get paymentMethodDetails() {
@@ -93,10 +93,11 @@ class GeneralSettings {
     get googleBusinessCategoryName() {
         return this._googleBusinessCategoryName;
     }
-    // Which of the storefront's own themes this business picked. The storefront defines what an id
-    // means. This library does not interpret it. Null when none was picked.
-    get onlineStoreThemeId() {
-        return this._onlineStoreThemeId;
+    // Which of the storefront's themes this business picked. Null when none was picked. A theme that a
+    // newer app added, which this version of the library has no entry for, is returned as it came: a
+    // number that is not a member of the enum. A caller that maps themes must have a fallback.
+    get onlineStoreTheme() {
+        return this._onlineStoreTheme;
     }
     // Whether the business has turned online shopping on. The server sends the business either way.
     // Model throws a NotFoundException, after reading everything it was sent, when the settings it

package/dist/Item.js

@@ -17,7 +17,8 @@ export default class Item extends Entity {
     get description() {
         return this._description;
     }
-    // Constants.ENTITY_ID_NULL when this item has no parent (e.g. an uncategorized product, or a price list).
+    // Constants.ENTITY_ID_NULL when this item has no parent (e.g. an uncategorized product, or a price
+    // list with no parent list).
     get parentItemId() {
         return this._parentItemId;
     }

package/dist/Package.d.ts

@@ -11,8 +11,7 @@ export default class Package extends Item {
     private readonly _dimensions;
     private readonly _weight;
     private readonly _photos;
-    private readonly _price;
-    constructor(header: EntityHeader, name: string, description: string | null, productId: bigint, isDisabled: boolean, _isSoldLoose: boolean, _itemCode: bigint, _identifiers: ReadonlyArray<PackageIdentifier>, _dimensions: Dimensions | null, _weight: Weight | null, _photos: ReadonlyArray<Photo>, _price: Price | null);
+    constructor(header: EntityHeader, name: string, description: string | null, productId: bigint, isDisabled: boolean, _isSoldLoose: boolean, _itemCode: bigint, _identifiers: ReadonlyArray<PackageIdentifier>, _dimensions: Dimensions | null, _weight: Weight | null, _photos: ReadonlyArray<Photo>);
     get productId(): bigint;
     get isSoldLoose(): boolean;
     get itemCode(): bigint;
@@ -21,5 +20,10 @@ export default class Package extends Item {
     get weight(): Weight | null;
     get photos(): ReadonlyArray<Photo>;
     get price(): Price | null;
+    private set price(value);
     get isBuyable(): boolean;
+    private _price;
+}
+export interface UpdatablePackage {
+    set price(value: Price | null);
 }

package/dist/Package.js

@@ -1,8 +1,9 @@
 import Item from "./Item";
 // A package, or variant, of a product (a 500 gram bottle of mango pickle, say) and the thing a
-// customer buys. Built complete, with photos and price resolved, so everything here is readonly.
+// customer buys. Built with its photos. Catalog sets the price, once the price list to sell from is
+// known.
 export default class Package extends Item {
-    constructor(header, name, description, productId, isDisabled, _isSoldLoose, _itemCode, _identifiers, _dimensions, _weight, _photos, _price) {
+    constructor(header, name, description, productId, isDisabled, _isSoldLoose, _itemCode, _identifiers, _dimensions, _weight, _photos) {
         super(header, name, description, productId, isDisabled);
         this._isSoldLoose = _isSoldLoose;
         this._itemCode = _itemCode;
@@ -10,7 +11,7 @@ export default class Package extends Item {
         this._dimensions = _dimensions;
         this._weight = _weight;
         this._photos = _photos;
-        this._price = _price;
+        this._price = null;
     }
     // The product this package is a variant of, which is the parent id every item has
     get productId() {
@@ -37,11 +38,15 @@ export default class Package extends Item {
     get photos() {
         return this._photos;
     }
-    // What this package costs, with the taxes of its product included (Product.taxes). Null when the
-    // business has not priced it, so it cannot be bought.
+    // What this package costs, with the taxes of its product included (Product.taxes). It is the
+    // price in the catalog's sale price list, or in that list's parent. Null when neither has one, so
+    // the package cannot be bought.
     get price() {
         return this._price;
     }
+    set price(value) {
+        this._price = value;
+    }
     // True when this package is enabled and has an enabled price. Checked here because a
     // product-level filter does not guarantee that every package, or every price, of an otherwise
     // visible product is enabled.

package/dist/PriceList.d.ts

@@ -1,3 +1,16 @@
 import Item from "./Item";
+import Price from "./Price";
 export default class PriceList extends Item {
+    get parentPriceListId(): bigint;
+    get parentPriceList(): PriceList | null;
+    private set parentPriceList(value);
+    get prices(): ReadonlyMap<bigint, Price>;
+    private set prices(value);
+    getPrice(packageId: bigint): Price | null;
+    private _parentPriceList;
+    private _prices;
+}
+export interface UpdatablePriceList {
+    set parentPriceList(value: PriceList | null);
+    set prices(value: ReadonlyMap<bigint, Price>);
 }

package/dist/PriceList.js

@@ -1,5 +1,37 @@
 import Item from "./Item";
-// A named list of prices. A storefront sells from one, so no package has two prices to choose
-// between. Catalog.priceList holds it, and CartEditor names its id on the carts it builds.
+// A named list of prices, at most one per package. A list can have a parent, named by its
+// parentItemId. A package with no price in the list is priced from the parent. Catalog sets the
+// prices and the parent, once every price list and price has been read.
 export default class PriceList extends Item {
+    constructor() {
+        super(...arguments);
+        this._parentPriceList = null;
+        this._prices = new Map();
+    }
+    // The id of the list whose prices are used for the packages this list has no price for, or
+    // Constants.ENTITY_ID_NULL when this list has no parent
+    get parentPriceListId() {
+        return this.parentItemId;
+    }
+    // Null when this list has no parent, or when the parent was not read. Not Entity.parent, which is
+    // the business.
+    get parentPriceList() {
+        return this._parentPriceList;
+    }
+    set parentPriceList(value) {
+        this._parentPriceList = value;
+    }
+    // The prices of this list itself, by package id. getPrice also looks in the parent.
+    get prices() {
+        return this._prices;
+    }
+    set prices(value) {
+        this._prices = value;
+    }
+    // The price of a package: this list's own, else the parent's own, else null. Only the parent is
+    // consulted, not its parent. A price is returned even when disabled, so a package with a disabled
+    // price here is not priced from the parent.
+    getPrice(packageId) {
+        return this._prices.get(packageId) ?? this._parentPriceList?._prices.get(packageId) ?? null;
+    }
 }

package/dist/Product.d.ts

@@ -16,7 +16,7 @@ export default class Product extends Item {
     private readonly _features;
     private readonly _isForOfflineSaleOnly;
     private readonly _photos;
-    constructor(header: EntityHeader, name: string, description: string | null, productCategoryId: bigint, isDisabled: boolean, _productType: proto_ProductType, _brand: string | null, _isManufacturedByBusiness: boolean, _manufacturer: string | null, _manufacturerAddress: Address | null, _taxes: ReadonlyArray<Tax>, _features: ReadonlyArray<string>, _isForOfflineSaleOnly: boolean, _photos: ReadonlyArray<Photo>, packages: ReadonlyArray<Package>);
+    constructor(header: EntityHeader, name: string, description: string | null, productCategoryId: bigint, isDisabled: boolean, _productType: proto_ProductType, _brand: string | null, _isManufacturedByBusiness: boolean, _manufacturer: string | null, _manufacturerAddress: Address | null, _taxes: ReadonlyArray<Tax>, _features: ReadonlyArray<string>, _isForOfflineSaleOnly: boolean, _photos: ReadonlyArray<Photo>);
     get productCategoryId(): bigint;
     get productType(): proto_ProductType;
     get brand(): string | null;
@@ -28,8 +28,12 @@ export default class Product extends Item {
     get isForOfflineSaleOnly(): boolean;
     get photos(): ReadonlyArray<Photo>;
     get packages(): ReadonlyArray<Package>;
+    private set packages(value);
     get lowestPrice(): Price | null;
     get isOnOffer(): boolean;
     get isBuyable(): boolean;
-    private readonly _packages;
+    private _packages;
+}
+export interface UpdatableProduct {
+    set packages(value: ReadonlyArray<Package>);
 }

package/dist/Product.js

@@ -1,8 +1,8 @@
 import Item from "./Item";
-// A product in the catalog: goods, a service, a raw material or a fixed asset. Built complete
-// (photos and packages resolved first), so everything here is readonly.
+// A product in the catalog: goods, a service, a raw material or a fixed asset. Built with its
+// photos. Catalog sets its packages, once their prices are known.
 export default class Product extends Item {
-    constructor(header, name, description, productCategoryId, isDisabled, _productType, _brand, _isManufacturedByBusiness, _manufacturer, _manufacturerAddress, _taxes, _features, _isForOfflineSaleOnly, _photos, packages) {
+    constructor(header, name, description, productCategoryId, isDisabled, _productType, _brand, _isManufacturedByBusiness, _manufacturer, _manufacturerAddress, _taxes, _features, _isForOfflineSaleOnly, _photos) {
         super(header, name, description, productCategoryId, isDisabled);
         this._productType = _productType;
         this._brand = _brand;
@@ -13,8 +13,7 @@ export default class Product extends Item {
         this._features = _features;
         this._isForOfflineSaleOnly = _isForOfflineSaleOnly;
         this._photos = _photos;
-        // A package that cannot be bought is dropped, whatever the caller passes in
-        this._packages = Object.freeze(packages.filter((pkg) => pkg.isBuyable));
+        this._packages = Object.freeze([]);
     }
     // The category this product is in, or Constants.ENTITY_ID_NULL when it is in none
     get productCategoryId() {
@@ -61,6 +60,10 @@ export default class Product extends Item {
     get packages() {
         return this._packages;
     }
+    // Keeps the buyable packages among those given, and drops the rest
+    set packages(value) {
+        this._packages = Object.freeze(value.filter((pkg) => pkg.isBuyable));
+    }
     // The cheapest final price across variants (what a listing shows as "from"), or null if there
     // are no variants. Compares final price, since that is what a customer pays. Every variant is
     // taxed at this product's rates, so comparing prices with taxes gives the same order as

package/dist/ProtoMap.js

@@ -13,6 +13,7 @@ import { Entity as proto_Entity } from "./generated/Entity";
 import { FulfillmentMode as proto_FulfillmentMode } from "./generated/FulfillmentMode";
 import { Message as proto_Message } from "./generated/Message";
 import { MessageType as proto_MessageType } from "./generated/MessageType";
+import { OnlineStoreTheme as proto_OnlineStoreTheme } from "./generated/OnlineStoreTheme";
 import { OrderStatus as proto_OrderStatus } from "./generated/OrderStatus";
 import { Package as proto_Package } from "./generated/Package";
 import { PartyPreferencesPayload as proto_PartyPreferencesPayload } from "./generated/PartyPreferencesPayload";
@@ -692,57 +693,39 @@ export function buildBusiness(response) {
         updatableBusiness.settings = generalSettingsFromProto(generalSettings, countryCode);
     // The photos of the store itself
     updatableBusiness.photos = takePhotos(attachmentsByOwner, business.id, attachmentBaseUrl);
-    // Prices, by the package each applies to. This storefront uses only the MeraBills Online list. A
-    // business prices a package in several lists, and a price from another list is not what it sells at
-    // here, so it is skipped. A package has one price in that list. If a second arrives, the first is
-    // kept.
-    const pricesByPackage = new Map();
+    // The catalog's items, each built alone. Catalog links them and drops what it cannot (a package
+    // with no product, a price with no list) and what cannot be bought. Photos go to packages and
+    // products here. A tombstone is skipped, and the business is the containment parent of the items
+    // that sit directly under it. Catalog parents the rest.
+    const prices = [];
     for (const priceProto of response.prices) {
         if (isDeletedItem(priceProto.item))
             continue;
-        const price = priceFromProto(priceProto);
-        if (price.priceListId !== MERABILLS_ONLINE_PRICE_LIST_ID)
+        prices.push(priceFromProto(priceProto));
+    }
+    const priceLists = [];
+    for (const priceListProto of response.priceLists) {
+        if (isDeletedItem(priceListProto.item))
             continue;
-        if (!pricesByPackage.has(price.packageId))
-            pricesByPackage.set(price.packageId, price);
+        const priceList = priceListFromProto(priceListProto);
+        UpdatableEntity.setParent(priceList, business);
+        priceLists.push(priceList);
     }
-    // Packages, by the product each belongs to, built with their photos and price. A package that is not
-    // buyable (disabled, unpriced, or priced with a disabled price) is left out. A product-level filter
-    // alone would not guarantee that every package of a visible product is enabled.
-    const packagesByProduct = new Map();
+    const packages = [];
     for (const packageProto of response.packages) {
         if (isDeletedItem(packageProto.item))
             continue;
-        const packageId = getItemId(packageProto.item);
-        const packagePhotos = takePhotos(attachmentsByOwner, packageId, attachmentBaseUrl);
-        const pkg = packageFromProto(packageProto, packagePhotos, pricesByPackage.get(packageId) ?? null);
-        if (!pkg.isBuyable)
-            continue;
-        const price = pkg.price;
-        if (price !== null)
-            UpdatableEntity.setParent(price, pkg);
-        const siblings = packagesByProduct.get(pkg.productId);
-        if (siblings === undefined)
-            packagesByProduct.set(pkg.productId, [pkg]);
-        else
-            siblings.push(pkg);
+        const packagePhotos = takePhotos(attachmentsByOwner, getItemId(packageProto.item), attachmentBaseUrl);
+        packages.push(packageFromProto(packageProto, packagePhotos));
     }
-    // Products, built with their photos and buyable packages, and parented to the business (their
-    // category only groups them). A product that is not buyable is left out: disabled, sold only offline
-    // (the server sends those, flagged), or left with no buyable package by the filtering above.
+    // A product's category only groups it, so its containment parent is the business
     const products = [];
     for (const productProto of response.products) {
         if (isDeletedItem(productProto.item))
             continue;
-        const productId = getItemId(productProto.item);
-        const packages = packagesByProduct.get(productId) ?? [];
-        const productPhotos = takePhotos(attachmentsByOwner, productId, attachmentBaseUrl);
-        const product = productFromProto(productProto, productPhotos, Object.freeze([...packages]), countryCode);
-        if (!product.isBuyable)
-            continue;
+        const productPhotos = takePhotos(attachmentsByOwner, getItemId(productProto.item), attachmentBaseUrl);
+        const product = productFromProto(productProto, productPhotos, countryCode);
         UpdatableEntity.setParent(product, business);
-        for (const pkg of product.packages)
-            UpdatableEntity.setParent(pkg, product);
         products.push(product);
     }
     const productCategories = [];
@@ -753,20 +736,11 @@ export function buildBusiness(response) {
         UpdatableEntity.setParent(productCategory, business);
         productCategories.push(productCategory);
     }
-    // A storefront sells from the MeraBills Online list only, picked by id since the same sync can
-    // carry others. The catalog must hold the list the prices above came from. Otherwise a cart would
-    // name a list that does not contain them.
-    let priceList = null;
-    for (const priceListProto of response.priceLists) {
-        if (isDeletedItem(priceListProto.item))
-            continue;
-        if (getItemId(priceListProto.item) !== MERABILLS_ONLINE_PRICE_LIST_ID)
-            continue;
-        priceList = priceListFromProto(priceListProto);
-        UpdatableEntity.setParent(priceList, business);
-        break;
-    }
-    updatableBusiness.catalog = new Catalog(productCategories, products, priceList);
+    // A storefront sells from the MeraBills Online list, picked by id because a response can carry
+    // other public lists. A package with no price in that list is priced from the list's parent.
+    const catalog = new Catalog(productCategories, products, packages, priceLists, prices);
+    catalog.currentSalePriceListId = MERABILLS_ONLINE_PRICE_LIST_ID;
+    updatableBusiness.catalog = catalog;
     // The orders of this customer, and their party preferences (the cart and the fulfillment mode to
     // default the next order to). A message of any other payload type is dropped. The business completes
     // an order by deleting its message, and the server sends that message whole, so the orders include
@@ -1119,6 +1093,11 @@ function getItemId(item) {
 function stringFromProto(value) {
     return value === undefined ? null : value;
 }
+// The enum's zero means no theme was picked. A number the enum has no entry for (a theme that a newer
+// app added) is kept as it came, so the caller decides what to show.
+function onlineStoreThemeFromProto(value) {
+    return value === proto_OnlineStoreTheme.UNSPECIFIED_ONLINE_STORE_THEME ? null : value;
+}
 // The reverse of stringFromProto. An empty string goes out absent too: the two mean the same, and
 // sending one could bring the field back as the other.
 function stringToProto(value) {
@@ -1209,7 +1188,7 @@ function shoppingListFromProto(shoppingList, countryCode) {
     return ShoppingList.fromScaledValues(shoppingList.isFinal, shoppingList.autoAddDeliveryCharge, shoppingList.autoAddServiceCharge, shoppingList.inventoryLocationId, shoppingList.priceListId, shoppingList.totalAmountBeforeDiscount, shoppingList.discount, shoppingList.existingItemCount, shoppingList.deletedItemCount, Object.freeze(shoppingList.existingItems.map((item) => shoppingListItemFromProto(item, countryCode))), Object.freeze(shoppingList.deletedItems.map((item) => shoppingListItemFromProto(item, countryCode))));
 }
 function generalSettingsFromProto(settings, countryCode) {
-    return GeneralSettings.fromScaledValues(Object.freeze(settings.paymentMethodDetails.map(paymentMethodDetailFromProto)), stringFromProto(settings.customerServicePhone), settings.isWhatsAppSupported, settings.isSmsSupported, addressListFromProto(settings.businessAddresses), Object.freeze(settings.businessIdentifiers.map(businessIdentifierFromProto)), Object.freeze([...settings.fulfillmentModes]), settings.deliveryCharge, Object.freeze(settings.deliveryChargeTaxes.map((tax) => taxFromProto(tax, countryCode))), settings.freeDeliveryTotal, settings.deliveryRadiusKms, stringFromProto(settings.storeTagline), workingDaysFromProto(settings.workingDays), latLongFromProto(settings.primaryStoreLocation), stringFromProto(settings.googleBusinessCategoryId), stringFromProto(settings.googleBusinessCategoryName), stringFromProto(settings.onlineStoreThemeId), settings.onlineShoppingEnabled);
+    return GeneralSettings.fromScaledValues(Object.freeze(settings.paymentMethodDetails.map(paymentMethodDetailFromProto)), stringFromProto(settings.customerServicePhone), settings.isWhatsAppSupported, settings.isSmsSupported, addressListFromProto(settings.businessAddresses), Object.freeze(settings.businessIdentifiers.map(businessIdentifierFromProto)), Object.freeze([...settings.fulfillmentModes]), settings.deliveryCharge, Object.freeze(settings.deliveryChargeTaxes.map((tax) => taxFromProto(tax, countryCode))), settings.freeDeliveryTotal, settings.deliveryRadiusKms, stringFromProto(settings.storeTagline), workingDaysFromProto(settings.workingDays), latLongFromProto(settings.primaryStoreLocation), stringFromProto(settings.googleBusinessCategoryId), stringFromProto(settings.googleBusinessCategoryName), onlineStoreThemeFromProto(settings.onlineStoreTheme), settings.onlineShoppingEnabled);
 }
 // #endregion
 // #region Entities
@@ -1249,18 +1228,18 @@ function priceFromProto(priceProto) {
     const entity = getEntity(item.entity);
     return Price.fromScaledValues(toEntityHeader(entity), item.name, stringFromProto(item.description), item.parentItemId, item.isDisabled, priceProto.packageId, priceProto.regularPrice, priceProto.offerPrice);
 }
-function packageFromProto(packageProto, photos, price) {
+function packageFromProto(packageProto, photos) {
     const item = getItem(packageProto.item);
     const entity = getEntity(item.entity);
-    return new Package(toEntityHeader(entity), item.name, stringFromProto(item.description), item.parentItemId, item.isDisabled, packageProto.isSoldLoose, packageProto.itemCode, Object.freeze(packageProto.identifiers.map(packageIdentifierFromProto)), dimensionsFromProto(packageProto.dimensions), weightFromProto(packageProto.weight), photos, price);
+    return new Package(toEntityHeader(entity), item.name, stringFromProto(item.description), item.parentItemId, item.isDisabled, packageProto.isSoldLoose, packageProto.itemCode, Object.freeze(packageProto.identifiers.map(packageIdentifierFromProto)), dimensionsFromProto(packageProto.dimensions), weightFromProto(packageProto.weight), photos);
 }
-function productFromProto(productProto, photos, packages, countryCode) {
+function productFromProto(productProto, photos, countryCode) {
     const item = getItem(productProto.item);
     const entity = getEntity(item.entity);
     return new Product(toEntityHeader(entity), item.name, stringFromProto(item.description), item.parentItemId, item.isDisabled, productProto.productType, stringFromProto(productProto.brand), productProto.isManufacturedByBusiness ?? true, // Absent means true (Product.proto)
     stringFromProto(productProto.manufacturer), productProto.manufacturerAddress === undefined
         ? null
-        : addressFromProto(productProto.manufacturerAddress), Object.freeze(productProto.taxes.map((tax) => taxFromProto(tax, countryCode))), Object.freeze([...productProto.features]), productProto.forOfflineSaleOnly, photos, packages);
+        : addressFromProto(productProto.manufacturerAddress), Object.freeze(productProto.taxes.map((tax) => taxFromProto(tax, countryCode))), Object.freeze([...productProto.features]), productProto.forOfflineSaleOnly, photos);
 }
 function orderFromProto(message, salesOrder, countryCode) {
     const entity = getEntity(message.entity);

package/dist/ShoppingList.js

@@ -58,9 +58,10 @@ class ShoppingList {
     get inventoryLocationId() {
         return this._inventoryLocationId;
     }
-    // The id of the price list these prices came from. A storefront sells from
-    // Constants.MERABILLS_ONLINE_PRICE_LIST_ID, the list in Catalog.priceList, and CartEditor falls
-    // back to that id when the catalog has no price list.
+    // The id of the price list the cart is priced from. A storefront names
+    // Constants.MERABILLS_ONLINE_PRICE_LIST_ID, the list in Catalog.priceList, for every line, including
+    // one priced from that list's parent. CartEditor falls back to that id when the catalog has no
+    // price list.
     get priceListId() {
         return this._priceListId;
     }

package/dist/generated/BusinessSyncOutResponse.d.ts

@@ -21,7 +21,10 @@ import { AuthTokens } from "./AuthTokens";
  * Item.parentItemId, Attachment.owningEntityId and Price.packageId, processing the arrays below in
  * order (parent before child). An absent/empty field means that type has not changed; a tombstone
  * (updateNumber's update-type bits = Constants.UPDATE_TYPE_DELETED) means the entity, and what it
- * owned, was deleted. At most Constants.SYNC_OUT_LIMIT entities arrive together - that many means
+ * owned, was deleted; it is sent as it is held, like any entity - but for an item (a product, package, price,
+ * price list or product category), which is only its Entity - and a client reads nothing of it but its
+ * Entity - but for a Message, which holds the order that the business completed, if it was one (see
+ * Message). At most Constants.SYNC_OUT_LIMIT entities arrive together - that many means
  * call again with the raised cursors.
  * There is no response, but a 404 (NotFoundException), when the business is not one a storefront can
  * open: it does not exist or has been deleted, or it does not allow customers to join it. Both are

package/dist/generated/Constants.d.ts

@@ -242,10 +242,6 @@ export declare enum Constants {
      * @generated from protobuf enum value: GOOGLE_BUSINESS_CATEGORY_NAME_MAX_LENGTH = 256;
      */
     GOOGLE_BUSINESS_CATEGORY_NAME_MAX_LENGTH = 256,
-    /**
-     * @generated from protobuf enum value: BUSINESS_ID_MAX_LENGTH = 64;
-     */
-    ONLINE_STORE_THEME_ID_MAX_LENGTH = 64,
     /**
      * PaymentMethodDetail.data
      *

package/dist/generated/Constants.js

@@ -247,10 +247,6 @@ export var Constants;
      * @generated from protobuf enum value: GOOGLE_BUSINESS_CATEGORY_NAME_MAX_LENGTH = 256;
      */
     Constants[Constants["GOOGLE_BUSINESS_CATEGORY_NAME_MAX_LENGTH"] = 256] = "GOOGLE_BUSINESS_CATEGORY_NAME_MAX_LENGTH";
-    /**
-     * @generated from protobuf enum value: BUSINESS_ID_MAX_LENGTH = 64;
-     */
-    Constants[Constants["ONLINE_STORE_THEME_ID_MAX_LENGTH"] = 64] = "ONLINE_STORE_THEME_ID_MAX_LENGTH";
     /**
      * PaymentMethodDetail.data
      *

package/dist/generated/GeneralSettings.d.ts

@@ -4,6 +4,7 @@ import type { BinaryReadOptions } from "@protobuf-ts/runtime";
 import type { IBinaryReader } from "@protobuf-ts/runtime";
 import type { PartialMessage } from "@protobuf-ts/runtime";
 import { MessageType } from "@protobuf-ts/runtime";
+import { OnlineStoreTheme } from "./OnlineStoreTheme";
 import { LatLong } from "./LatLong";
 import { WorkingDays } from "./WorkingDays";
 import { Tax } from "./Tax";
@@ -122,12 +123,12 @@ export interface GeneralSettings {
      */
     googleBusinessCategoryName?: string;
     /**
-     * Id of the visual theme applied to the online store
-     * (at most Constants.ONLINE_STORE_THEME_ID_MAX_LENGTH)
+     * Visual theme applied to the online store. UNSPECIFIED_ONLINE_STORE_THEME means no theme is set.
+     * A client must treat a number it has no entry for as no theme: a newer app may have added one.
      *
-     * @generated from protobuf field: optional string onlineStoreThemeId = 17
+     * @generated from protobuf field: com.merabills.storefront.OnlineStoreTheme onlineStoreTheme = 17
      */
-    onlineStoreThemeId?: string;
+    onlineStoreTheme: OnlineStoreTheme;
     /**
      * True if the business has turned online shopping on. The server does not refuse a business that has
      * not: it is for the client to, once it has read all it is sent (see BusinessSyncOutResponse). A

package/dist/generated/GeneralSettings.js

@@ -2,6 +2,7 @@ import { UnknownFieldHandler } from "@protobuf-ts/runtime";
 import { WireType } from "@protobuf-ts/runtime";
 import { reflectionMergePartial } from "@protobuf-ts/runtime";
 import { MessageType } from "@protobuf-ts/runtime";
+import { OnlineStoreTheme } from "./OnlineStoreTheme";
 import { LatLong } from "./LatLong";
 import { WorkingDays } from "./WorkingDays";
 import { Tax } from "./Tax";
@@ -29,7 +30,7 @@ class GeneralSettings$Type extends MessageType {
             { no: 14, name: "primaryStoreLocation", kind: "message", T: () => LatLong },
             { no: 15, name: "googleBusinessCategoryId", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
             { no: 16, name: "googleBusinessCategoryName", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
-            { no: 17, name: "onlineStoreThemeId", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
+            { no: 17, name: "onlineStoreTheme", kind: "enum", T: () => ["com.merabills.storefront.OnlineStoreTheme", OnlineStoreTheme] },
             { no: 18, name: "onlineShoppingEnabled", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
         ]);
     }
@@ -44,6 +45,7 @@ class GeneralSettings$Type extends MessageType {
         message.deliveryChargeTaxes = [];
         message.freeDeliveryTotal = 0n;
         message.deliveryRadiusKms = 0;
+        message.onlineStoreTheme = 0;
         message.onlineShoppingEnabled = false;
         if (value !== undefined)
             reflectionMergePartial(this, message, value);
@@ -106,8 +108,8 @@ class GeneralSettings$Type extends MessageType {
                 case /* optional string googleBusinessCategoryName */ 16:
                     message.googleBusinessCategoryName = reader.string();
                     break;
-                case /* optional string onlineStoreThemeId */ 17:
-                    message.onlineStoreThemeId = reader.string();
+                case /* com.merabills.storefront.OnlineStoreTheme onlineStoreTheme */ 17:
+                    message.onlineStoreTheme = reader.int32();
                     break;
                 case /* bool onlineShoppingEnabled */ 18:
                     message.onlineShoppingEnabled = reader.bool();
@@ -176,9 +178,9 @@ class GeneralSettings$Type extends MessageType {
         /* optional string googleBusinessCategoryName = 16; */
         if (message.googleBusinessCategoryName !== undefined)
             writer.tag(16, WireType.LengthDelimited).string(message.googleBusinessCategoryName);
-        /* optional string onlineStoreThemeId = 17; */
-        if (message.onlineStoreThemeId !== undefined)
-            writer.tag(17, WireType.LengthDelimited).string(message.onlineStoreThemeId);
+        /* com.merabills.storefront.OnlineStoreTheme onlineStoreTheme = 17; */
+        if (message.onlineStoreTheme !== 0)
+            writer.tag(17, WireType.Varint).int32(message.onlineStoreTheme);
         /* bool onlineShoppingEnabled = 18; */
         if (message.onlineShoppingEnabled !== false)
             writer.tag(18, WireType.Varint).bool(message.onlineShoppingEnabled);

package/dist/generated/Item.d.ts

@@ -17,9 +17,10 @@ export interface Item {
      */
     entity?: Entity;
     /**
-     * Id of the parent of this item - the category of a product, the product of a package, or the
-     * price list of a price - or 0 when it has none. A client rebuilds the catalog hierarchy by
-     * grouping items on this id, since nothing nests on the wire.
+     * Id of the parent of this item - the category of a product, the product of a package, the
+     * price list of a price, or the parent price list of a price list - or 0 when it has none. A
+     * client rebuilds the catalog hierarchy by grouping items on this id, since nothing nests on the
+     * wire.
      *
      * @generated from protobuf field: int64 parentItemId = 2
      */

package/dist/generated/Message.d.ts

@@ -13,6 +13,11 @@ import { Entity } from "./Entity";
  * A message sent to a business: an order (SalesOrderPayload) or a customer's shopping cart
  * (PartyPreferencesPayload), typed here rather than left as the serialized string Java stores.
  * MONEY_TRANSFER messages have no payload in this protocol.
+ * A message that has been deleted (see Entity.updateNumber) is converted as it is held, as every entity
+ * is, deleted or not, but for the items of the catalog. The merchant app completes an order, by fulfilling or cancelling it, by deleting
+ * its message, so, a deleted message that carries a sales order is an order that the business has
+ * completed, and is the whole of what a customer is shown of it afterwards. A deleted message is not
+ * a cart, whatever it carries.
  *
  * @generated from protobuf message com.merabills.storefront.Message
  */

package/dist/generated/OnlineStoreTheme.d.ts

@@ -0,0 +1,33 @@
+/**
+ * A visual theme of the online store. The palettes ship with the online store, so a business picks
+ * one of these and cannot mix colours. Values match the ids of the corresponding Java enum entries
+ * and must never be changed.
+ *
+ * @generated from protobuf enum com.merabills.storefront.OnlineStoreTheme
+ */
+export declare enum OnlineStoreTheme {
+    /**
+     * Java has no zero value: it treats a theme of zero as not set
+     *
+     * @generated from protobuf enum value: UNSPECIFIED_ONLINE_STORE_THEME = 0;
+     */
+    UNSPECIFIED_ONLINE_STORE_THEME = 0,
+    /**
+     * Deep forest brand, terracotta accent, warm paper
+     *
+     * @generated from protobuf enum value: FOREST = 1;
+     */
+    FOREST = 1,
+    /**
+     * Indigo brand, rust accent, cooler paper
+     *
+     * @generated from protobuf enum value: INDIGO = 2;
+     */
+    INDIGO = 2,
+    /**
+     * Brick brand, amber accent, the warmest paper
+     *
+     * @generated from protobuf enum value: BRICK = 3;
+     */
+    BRICK = 3
+}

package/dist/generated/OnlineStoreTheme.js

@@ -0,0 +1,38 @@
+// @ts-nocheck
+// @generated by protobuf-ts 2.11.1 with parameter long_type_bigint
+// @generated from protobuf file "OnlineStoreTheme.proto" (package "com.merabills.storefront", syntax proto3)
+// tslint:disable
+/**
+ * A visual theme of the online store. The palettes ship with the online store, so a business picks
+ * one of these and cannot mix colours. Values match the ids of the corresponding Java enum entries
+ * and must never be changed.
+ *
+ * @generated from protobuf enum com.merabills.storefront.OnlineStoreTheme
+ */
+export var OnlineStoreTheme;
+(function (OnlineStoreTheme) {
+    /**
+     * Java has no zero value: it treats a theme of zero as not set
+     *
+     * @generated from protobuf enum value: UNSPECIFIED_ONLINE_STORE_THEME = 0;
+     */
+    OnlineStoreTheme[OnlineStoreTheme["UNSPECIFIED_ONLINE_STORE_THEME"] = 0] = "UNSPECIFIED_ONLINE_STORE_THEME";
+    /**
+     * Deep forest brand, terracotta accent, warm paper
+     *
+     * @generated from protobuf enum value: FOREST = 1;
+     */
+    OnlineStoreTheme[OnlineStoreTheme["FOREST"] = 1] = "FOREST";
+    /**
+     * Indigo brand, rust accent, cooler paper
+     *
+     * @generated from protobuf enum value: INDIGO = 2;
+     */
+    OnlineStoreTheme[OnlineStoreTheme["INDIGO"] = 2] = "INDIGO";
+    /**
+     * Brick brand, amber accent, the warmest paper
+     *
+     * @generated from protobuf enum value: BRICK = 3;
+     */
+    OnlineStoreTheme[OnlineStoreTheme["BRICK"] = 3] = "BRICK";
+})(OnlineStoreTheme || (OnlineStoreTheme = {}));

package/dist/generated/PriceList.d.ts

@@ -6,8 +6,9 @@ import type { PartialMessage } from "@protobuf-ts/runtime";
 import { MessageType } from "@protobuf-ts/runtime";
 import { Item } from "./Item";
 /**
- * A named list of prices; has no parent, so its own Item.parentItemId is 0. Contains nothing - its
- * prices are the Price entities whose Item.parentItemId is this price list's id.
+ * A named list of prices. Item.parentItemId is the id of its parent price list, or 0 when it has
+ * none. A package that has no price in a list is priced from the parent list. Contains
+ * nothing - its prices are the Price entities whose Item.parentItemId is this price list's id.
  * Excluded: isPurchasePriceList - a purchase price list is never sent, so the flag would always be
  * false.
  *

package/dist/generated/ProfileSyncOutRequest.d.ts

@@ -34,21 +34,22 @@ export interface ProfileSyncOutRequest {
     /**
      * The business to join as a customer, if the caller is not already linked to it. 0 means none, and
      * anything else has to be the id of a business: one that is not is refused, not ignored.
-     * A call that carries a valid link token of this business is from a member of it already, and nothing is
-     * joined: the response is what the cursors above return, as for a call that joins nothing, and it is not
-     * refused for the business no longer allowing customers to join it. A link token that is not valid is
-     * refused (401), and one of another business says nothing of this one.
-     * Otherwise the response always carries the BusinessLink and the Business that a join returns, even
-     * where the cursors above would not return them.
-     * An invitation to this business for the caller (looked for by their phone number) takes precedence: it is
-     * accepted in the role and party that the invitation names, which may be those of a manager or an owner as
-     * well as of a customer, whether or not the business allows customers to join without an invitation, and
-     * the invitation is deleted. Only when there is none does the business decide.
-     * The call fails with 404 (NotFoundException) if there is no such business, or if the caller has no
-     * invitation to it and it does not allow customers to join it, and the caller does not hold a valid link
-     * token of it. It is the link token that is tested, and not membership: a member that does not hold one (on
-     * a new device, say) of a business that has since stopped allowing customers to join is refused in the same
-     * way, and then the whole call is a 404 - nothing of the profile is returned either, and not only no join.
+     * A member of the business is not joined again, and is not refused if the business no longer allows
+     * customers to join it. Nothing is changed for a member, so the response is what the cursors above
+     * return, as for a call that joins nothing.
+     * A call that does join makes a new BusinessLink. It is newer than the link cursor, so the response
+     * carries it, and the Business that it names whatever the business cursor is.
+     * An invitation to this business for the caller (looked for by their phone number) that names a party takes
+     * precedence: the newest one is accepted in the role and party that the invitation names, which may be those
+     * of a manager or an owner as well as of a customer, whether or not the business allows customers to join
+     * without an invitation, and the invitation is deleted. The call is refused if another member has that party.
+     * Only when there is no such invitation does the business decide.
+     * Without an invitation the caller joins as a customer: as the customer party of the business that has their
+     * phone number, if there is one, else as a new customer party. A caller that was a member before gets a new
+     * link and, unless a party has their phone number, a new party.
+     * The call fails with 404 (NotFoundException) if there is no such business, or if the caller is not a member,
+     * has no invitation to it, and it does not allow customers to join it. The whole call is then a 404:
+     * nothing of the profile is returned either.
      *
      * @generated from protobuf field: int64 joinBusinessId = 4
      */

package/dist/generated/ProfileSyncOutResponse.d.ts

@@ -11,9 +11,8 @@ import { AuthTokens } from "./AuthTokens";
 /**
  * The answer to a ProfileSyncOutRequest: who the caller is, the businesses they are linked to, and
  * those businesses. Nothing is nested - match BusinessLink.businessId against Business.entity.id.
- * Every field is absent/empty unless that type has changed, but for the caller's own user, which is
- * sent with every response; a tombstone (updateNumber's update-type bits =
- * Constants.UPDATE_TYPE_DELETED) means the entity, and what it owned, was deleted.
+ * Every field is absent/empty unless that type has changed. A tombstone (updateNumber's update-type
+ * bits = Constants.UPDATE_TYPE_DELETED) means the entity, and what it owned, was deleted.
  *
  * @generated from protobuf message com.merabills.storefront.ProfileSyncOutResponse
  */
@@ -26,9 +25,8 @@ export interface ProfileSyncOutResponse {
      */
     authTokens?: AuthTokens;
     /**
-     * The caller. Sent with every response, whatever userUpdateNumber is: a client keeps the copy it holds
-     * when it is as new as this one. The only user a response ever carries: nobody else's, such as the
-     * owner of a business, is sent to a customer.
+     * The caller, if the user has changed since userUpdateNumber. The only user a response ever carries:
+     * nobody else's, such as the owner of a business, is sent to a customer.
      *
      * @generated from protobuf field: com.merabills.storefront.User user = 2
      */

package/dist/generated/SalesOrderPayload.d.ts

@@ -27,19 +27,22 @@ export interface SalesOrderPayload {
      */
     fulfillmentMode: FulfillmentMode;
     /**
-     * What was ordered
+     * What was ordered. Absent for an order that an older version of the merchant app completed: that
+     * version moved the list out of the order, into the record of the sale, which a storefront is never
+     * sent. A client shows such an order with its total and count alone.
      *
      * @generated from protobuf field: com.merabills.storefront.ShoppingList shoppingList = 3
      */
     shoppingList?: ShoppingList;
     /**
-     * Total of the shopping list, multiplied by Constants.AMOUNT_FACTOR
+     * Total of the shopping list, multiplied by Constants.AMOUNT_FACTOR. Sent whether or not the list is
+     * (see above), so, it is all there is of what an order of that kind came to.
      *
      * @generated from protobuf field: int64 shoppingListTotal = 4
      */
     shoppingListTotal: bigint;
     /**
-     * Number of items in the shopping list
+     * Number of items in the shopping list. Sent whether or not the list is, as the total is.
      *
      * @generated from protobuf field: int32 shoppingListCount = 5
      */

package/dist/index.d.ts

@@ -14,13 +14,17 @@ export { default as Business } from "./Business";
 export type { UpdatableBusiness } from "./Business";
 export { default as CartEditor, CartLine } from "./CartEditor";
 export { default as Catalog } from "./Catalog";
+export type { UpdatableCatalog } from "./Catalog";
 export { default as GeneralSettings } from "./GeneralSettings";
 export { default as Order } from "./Order";
 export { default as Package } from "./Package";
+export type { UpdatablePackage } from "./Package";
 export { default as Photo } from "./Photo";
 export { default as Price } from "./Price";
 export { default as PriceList } from "./PriceList";
+export type { UpdatablePriceList } from "./PriceList";
 export { default as Product } from "./Product";
+export type { UpdatableProduct } from "./Product";
 export { default as ProductCategory } from "./ProductCategory";
 export type { UpdatableProductCategory } from "./ProductCategory";
 export { default as Profile } from "./Profile";

package/dist/index.js

@@ -48,8 +48,8 @@ export { default as ShoppingList, ItemChange, ShoppingListItem } from "./Shoppin
 export { default as Tax, TaxAmount } from "./Tax";
 export { default as WorkingDays, WorkingHours, WorkingHoursRange } from "./WorkingDays";
 // The enums of the protocol, the limits it obeys, and how an id is read. The price list a
-// storefront sells from is exported because a UI that builds a cart must name it, and
-// Catalog.priceList is null until the catalog has arrived.
+// storefront sells from is exported because a UI that builds a cart must name it. Catalog.priceList
+// is null until the catalog has arrived, and when the response did not carry that list.
 export * from "./Enums";
 export { Constants, MERABILLS_ONLINE_PRICE_LIST_ID, buildPriceListId } from "./Constants";
 export { default as Ids } from "./Ids";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peabody-soft/mbs-model-ts",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "MeraBills storefront client-side model (TypeScript)",
   "author": "Peabody Soft",
   "license": "AGPL-3.0-or-later",
@@ -49,7 +49,7 @@
     "typescript": "^7.0.2"
   },
   "dependencies": {
-    "@peabody-soft/mbs-protos": "^1.11.0",
+    "@peabody-soft/mbs-protos": "^1.12.1",
     "@protobuf-ts/runtime": "^2.11.1"
   }
 }