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

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. That list can follow its parent (see PriceList.getPrice).
+    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
@@ -787,7 +761,8 @@ export function buildBusiness(response) {
     let defaultFulfillmentMode = proto_FulfillmentMode.DELIVERY;
     if (partyPreferences !== null && partyPreferences.payload.oneofKind === "partyPreferences") {
         // An emptied cart is a message whose payload has no shopping list, which is what placing an order
-        // leaves. The cart is null then, the same as for a customer who never had one.
+        // leaves. A list with no items is the same: the merchant app stores its cart whether or not it holds
+        // anything. The cart is null then, the same as for a customer who never had one.
         cart = cartShoppingListFromProto(partyPreferences.payload.partyPreferences, countryCode);
         // Taken as the message has it. DELIVERY comes only from the fallback above, even when the message
         // holds UNSPECIFIED_FULFILLMENT_MODE.
@@ -850,8 +825,9 @@ export function buildShoppingList(message, countryCode) {
 // fulfillment mode. An existing message is amended, since its payload can carry fields a storefront
 // cannot read, and dropping them would overwrite that data. Its id is kept, as the server holds the
 // preferences under it. The derived id is used only when there is nothing to amend.
-// A list with no items is pushed as no list, as Java serializeShoppingList returns null below one
-// item. An emptied cart and a cart never created look the same on the wire.
+// A list with no items is pushed as no list. The merchant app stores its cart with no items too, and
+// both read as no cart (cartShoppingListFromProto), so an emptied cart, a cart with no items and a cart
+// never created are one state to a storefront.
 // fulfillmentMode null keeps the existing value, the ordinary case: a storefront treats that field
 // as the merchant app's data and leaves it alone. createOrder sets it to the mode of the order that
 // emptied the cart.
@@ -951,11 +927,18 @@ function inPackageIdOrder(list) {
         deletedItems: [...list.deletedItems].sort(byPackageId),
     });
 }
-// The list inside a cart message, or absent for an emptied cart
+// The list inside a cart message, or absent for an emptied cart. A list with no items is absent too,
+// as the merchant app stores its cart whether or not it holds anything (see cartShoppingListFromProto)
 function getCartShoppingList(message) {
-    return message.payload.oneofKind === "partyPreferences"
-        ? message.payload.partyPreferences.shoppingList
-        : undefined;
+    if (message.payload.oneofKind !== "partyPreferences")
+        return undefined;
+    const shoppingList = message.payload.partyPreferences.shoppingList;
+    return shoppingList === undefined || holdsNothing(shoppingList) ? undefined : shoppingList;
+}
+// Whether a list on the wire has no items. The items are what is judged, not the counts, as in
+// pushedShoppingList
+function holdsNothing(shoppingList) {
+    return shoppingList.existingItems.length === 0 && shoppingList.deletedItems.length === 0;
 }
 // A shopping list to push, or absent when it holds nothing - see buildPartyPreferencesMessage.
 // Emptiness is judged by the items sent, not the counts, for the reason given at shoppingListToProto.
@@ -1119,6 +1102,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 +1197,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
@@ -1247,32 +1235,36 @@ function priceListFromProto(priceListProto) {
 function priceFromProto(priceProto) {
     const item = getItem(priceProto.item);
     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);
+    return Price.fromScaledValues(toEntityHeader(entity), item.name, stringFromProto(item.description), item.parentItemId, item.isDisabled, priceProto.packageId, priceProto.regularPrice, priceProto.offerPrice, priceProto.isPlaceholder);
 }
-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);
     return Order.fromScaledValues(toEntityHeader(entity), message.senderId, message.status, stringFromProto(message.senderName), stringFromProto(message.senderPhone), salesOrder.status, salesOrder.fulfillmentMode, shoppingListFromProto(salesOrder.shoppingList, countryCode), salesOrder.shoppingListTotal, salesOrder.shoppingListCount, salesOrder.deliveryAddressId, salesOrder.deliveryAddress === undefined ? null : addressFromProto(salesOrder.deliveryAddress), salesOrder.creationDate, stringFromProto(salesOrder.note), salesOrder.paymentReceived);
 }
 // The one part of a cart message a customer is shown. Null when the cart holds nothing, so a cart
-// emptied by placing an order and one never created both give null. The rest of the message is set by
-// the server or read elsewhere: who sent it, how far the business has read it, and the fulfillment
-// mode, which buildBusiness reads as defaultFulfillmentMode.
+// emptied by placing an order, one never created, and a list with no items (the merchant app stores
+// its cart even when it is empty, with the properties of the list) all give null. The properties of
+// a list with no items are not read: a cart is built again from its items. The rest of the message
+// is set by the server or read elsewhere: who sent it, how far the business has read it, and the
+// fulfillment mode, which buildBusiness reads as defaultFulfillmentMode.
 function cartShoppingListFromProto(partyPreferences, countryCode) {
     const shoppingList = partyPreferences.shoppingList;
-    return shoppingList === undefined ? null : shoppingListFromProto(shoppingList, countryCode);
+    return shoppingList === undefined || holdsNothing(shoppingList)
+        ? null
+        : shoppingListFromProto(shoppingList, countryCode);
 }
 // #endregion
 // #region Photos

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 with the amounts of 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/Price.d.ts

@@ -38,6 +38,15 @@ export interface Price {
      * @generated from protobuf field: int64 offerPrice = 4
      */
     offerPrice: bigint;
+    /**
+     * True when this price has no amounts of its own: the package has the amounts of the price that
+     * the parent of the price list has for it. regularPrice and offerPrice are a copy of those that
+     * can be out of date, so a client must not use them. Item.isDisabled says whether the package is
+     * in this price list. See PriceList.
+     *
+     * @generated from protobuf field: bool isPlaceholder = 5
+     */
+    isPlaceholder: boolean;
 }
 declare class Price$Type extends MessageType<Price> {
     constructor();

package/dist/generated/Price.js

@@ -10,7 +10,8 @@ class Price$Type extends MessageType {
             { no: 1, name: "item", kind: "message", T: () => Item },
             { no: 2, name: "packageId", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ },
             { no: 3, name: "regularPrice", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ },
-            { no: 4, name: "offerPrice", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }
+            { no: 4, name: "offerPrice", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ },
+            { no: 5, name: "isPlaceholder", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
         ]);
     }
     create(value) {
@@ -18,6 +19,7 @@ class Price$Type extends MessageType {
         message.packageId = 0n;
         message.regularPrice = 0n;
         message.offerPrice = 0n;
+        message.isPlaceholder = false;
         if (value !== undefined)
             reflectionMergePartial(this, message, value);
         return message;
@@ -39,6 +41,9 @@ class Price$Type extends MessageType {
                 case /* int64 offerPrice */ 4:
                     message.offerPrice = reader.int64().toBigInt();
                     break;
+                case /* bool isPlaceholder */ 5:
+                    message.isPlaceholder = reader.bool();
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -63,6 +68,9 @@ class Price$Type extends MessageType {
         /* int64 offerPrice = 4; */
         if (message.offerPrice !== 0n)
             writer.tag(4, WireType.Varint).int64(message.offerPrice);
+        /* bool isPlaceholder = 5; */
+        if (message.isPlaceholder !== false)
+            writer.tag(5, WireType.Varint).bool(message.isPlaceholder);
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);

package/dist/generated/PriceList.d.ts

@@ -6,8 +6,19 @@ 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. Contains nothing - its prices are the Price entities whose Item.parentItemId is this price
+ * list's id.
+ *
+ * A list with a parent follows it. Only the parent is consulted, never its parent.
+ * - A package with no price in the list has the parent's price: its amounts, and it is in the list
+ *   when that price is enabled.
+ * - A price of the list replaces the parent's price, both the amounts and whether it is enabled.
+ * - A placeholder (Price.isPlaceholder) replaces only whether the package is enabled. The amounts
+ *   are the parent's price: the placeholder holds a copy that can be out of date, so a client must
+ *   not use it.
+ * - A placeholder is no price at all when the parent has no price for the package.
+ *
  * 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
      */