@fire-spark/core 0.8.3 → 0.9.0

package/dist/index.d.ts

@@ -280,8 +280,15 @@ declare const reorderOrder: (id: string, body?: OrderReorderInput, options?: Ser
  * unpaid order, cancels it (`VOIDED`) and returns the new `OPEN` order with
  * the same content. Rejects with `StorefrontHttpError` 400
  * (`details.code: "ORDER_PAYMENT_CAPTURED"`) when a payment was captured.
+ * Optional `body.order_id` must be an id `genId` can produce (`isGenId`;
+ * `genOrderId` is one option, including `BB2192100000001`) and becomes
+ * the new order id.
+ * `400` `ORDER_ID_INVALID` when the format is wrong. `409`
+ * `ORDER_ID_EXISTS` when that id is already taken.
  */
-declare const reopenOrder: (id: string, options?: ServiceHttpOptions) => Promise<Order$1>;
+declare const reopenOrder: (id: string, options?: ServiceHttpOptions, body?: {
+  order_id?: string;
+}) => Promise<Order$1>;
 declare const validateOrder: (body: OrderValidateInput, options?: ServiceHttpOptions) => Promise<OrderValidateOutput>;
 //#endregion
 //#region src/order/payments/orchestrator.d.ts
@@ -382,6 +389,11 @@ type PayIntentResult = {
 };
 type ReverseAllOptions = {
   onProgress?: PaymentProgressListener;
+  /**
+   * Only these tenders (e.g. `device_reversal.pending` of a failed
+   * checkout); omitted = every charged tender. An empty list voids none.
+   */
+  tenderIds?: readonly string[];
 };
 /** Settled tenders plus PENDING `confirm_after_inject`, order currency. */
 declare const coveredAmount: (intents: Intents) => number;
@@ -561,11 +573,19 @@ declare class Order {
    * `OPEN` order with the same content. This instance is closed afterwards;
    * replace it with the returned `Order` (same HTTP options and listener).
    *
+   * Pass `orderId` from `genId` (or `genOrderId`) to set the new order id.
+   * The request body field is `order_id`. Any id `isGenId` accepts is
+   * valid, including a literal glued to the hash
+   * (`genId().literal("BB21921").hash(8, "numeric").build()`). Omit it
+   * and the server generates one.
+   * `400` `ORDER_ID_INVALID` when the format is wrong. `409`
+   * `ORDER_ID_EXISTS` when that id is already taken.
+   *
    * Rejects with `StorefrontHttpError` 400 and
    * `details.code: "ORDER_PAYMENT_CAPTURED"` when a payment was already
    * captured; nothing changes then and this instance stays usable.
    */
-  reopen(): Promise<Order>;
+  reopen(orderId?: string): Promise<Order>;
   refundOrder(): Promise<void>;
   validateOrder(): Promise<void>;
   /**
@@ -1295,6 +1315,12 @@ interface VerifyWebhookSignatureInput {
 declare const verifyWebhookSignature: (input: VerifyWebhookSignatureInput) => Promise<boolean>;
 //#endregion
 //#region src/shared/genId.d.ts
+declare const ID_HASH_FORMATS: readonly ["alphanumeric", "numeric", "alphabetic"];
+type IdHashFormat = (typeof ID_HASH_FORMATS)[number];
+interface GenOrderIdOptions {
+  length?: number;
+  format?: IdHashFormat;
+}
 type IdBuilder = {
   /**
    * Keeps only `[A-Za-z0-9]`, cut to 32 characters. `fallback` is used only
@@ -1303,19 +1329,35 @@ type IdBuilder = {
   literal: (value: string | null | undefined, fallback?: string) => IdBuilder;
   /** Appends `-`, the only separator allowed. */
   separator: () => IdBuilder;
-  /** Cryptographically random `[0-9a-z]`; at least 12 characters. */
-  hash: (length?: number) => IdBuilder;
+  /**
+   * Cryptographically random hash of `length` characters (at least 8,
+   * default 12). `format` is `alphanumeric` (`0-9a-z`, default),
+   * `numeric` (`0-9`), or `alphabetic` (`a-z`).
+   */
+  hash: (length?: number, format?: IdHashFormat) => IdBuilder;
   /** New id on every call; throws when the shape is unsafe. */
   build: () => string;
 };
 /**
- * Safe id builder: `genId().literal("ord").separator().hash(12).build()`.
- * Literals are cleaned to `[A-Za-z0-9]`; `-` is the only separator and a
- * random hash of at least 12 characters is required.
+ * Safe id builder: `genId().literal("ord").separator().hash().build()`.
+ * Literals are cleaned to `[A-Za-z0-9]`; `-` is the only separator. A
+ * random hash of at least 8 characters is required (default 12). Parts
+ * join with `""`, so a literal can sit directly against the hash.
  */
 declare const genId: () => IdBuilder;
-/** `ord-<store>-<hash>`; `nostore` when the store id is blank. */
-declare const genOrderId: (storeId?: string | null) => string;
+/**
+ * Always `ord-<store>-<hash>`; `nostore` when the store id is blank.
+ * Omitted length and format stay at 12 lowercase alphanumeric characters.
+ * `length` may be as short as 8.
+ */
+declare const genOrderId: (storeId?: string | null, options?: GenOrderIdOptions) => string;
+/**
+ * True for an id {@link genId} can produce. The whole value is
+ * `[A-Za-z0-9-]`, at most 64 characters, with no leading, trailing, or
+ * doubled `-`, and it contains a run of at least 8 `[0-9a-z]`. A literal
+ * may sit directly against that run (`BB2192100000001`).
+ */
+declare const isGenId: (value: string) => boolean;
 //#endregion
 //#region src/rules/RulesEngine.d.ts
 declare class RulesEngine {
@@ -1512,4 +1554,4 @@ declare const validateCardholderName: (value: string) => CardholderNameError | n
  */
 declare const cardPreviewGroups: (value: string) => CardPreviewSlot[][];
 //#endregion
-export { type ApplyRedeemInput, type AuthConfigureOptions, CARD_BRANDS, type CardBrand, type CardBrandSpec, type CardCvcError, type CardExpiry, type CardExpiryError, type CardNumberError, type CardPreviewSlot, type CardholderNameError, type CreateOrderOptions, type CreateSessionOptions, type CustomizationPath, type CustomizationSession, DEFAULT_RECOMMENDATION_TYPES, type ExchangeOptions, type FailedCharge, type FlatMenuCategory, type GroupDisplayType, type IdBuilder, type ListMenusStreamOptions, type ListPaymentsOptions, type Menu, type MenuCategoryNode, type MenuLookup, type MilestoneSteps, type MilestoneTrackItem, type ModifierControlType, type ModifierCtx, type ModifierGroupCtx, type NestedMenuCategory, Order, type OrderCustomerSource, type OrderDeviceCredential, type OrderDraft, type OrderIssue, type OrderIssueCode, type OrderLineDiff, type OrderLineIssue, type OrderLineIssueCode, OrderPaymentRequiredError, type OrderScope, OrderSyncPendingError, OrderSyncRejectedError, OrderValidationError, type OrderValidationResult, type PayIntentOptions, type PayIntentResult, type PayOptions, type PaymentCardBrand, type PaymentProgressEvent, type PaymentProgressListener, type PaymentRunOptions, type PaymentSessionOptions, type PricingModifier, type Product, type ProductCtx, type QuantitiesByPath, type RecommendationType, RecurringDateCron, type RedeemPaymentRow, type RemoveRedeemInput, type ReorderOrderOptions, type ResetOptions, type ReversalOutcome, type ReverseAllOptions, RulesEngine, type ScheduleWindow, type SelectionStatus, type SelectionsByPath, type SerializedError, type ServiceHttpOptions, type SimpleTenderPayment, type Snapshot, type StorefrontAccessToken, type StorefrontErrorDetails, StorefrontHttpError, type TrackWorkflow, type ValidateOptions, type ValidateOrderAgainstMenuInput, type Variant, type VariantGroup, type VariantGroupCtx, type VariantOptionCtx, type VariantSelection, type VerifyWebhookSignatureInput, type VisitedState, addLines, auth, buildCustomerSnapshot, capRedeems, cappedRedeems, cardBrandSpec, cardDigits, cardNumberGaps, cardNumberMaxLength, cardPreviewGroups, caretAfterDigits, collectOrderLineDiffs, computeStartingPrice, countCartProducts, coveredAmount, createSession, currentNodes, cvcMaxLength, defaultConditionError, detectCardBrand, fitRedeems, flattenMenuCategories, flushLogs, formatCardNumber, formatCvc, formatExpiry, fromOrderLines, genId, genOrderId, getLogContext, getScheduleWindow, indexMenu, isCardNumberComplete, isCardNumberDefinitelyInvalid, isCheckoutFieldFilled, isCvcComplete, isDeviceCharged, isDeviceNotLinked, isExpiryComplete, isKioskUnauthorized, isMilestoneStepDone, isOnSchedule, isOrderPaymentRequiredError, isOrderValidationError, isPosDeviceNotLinked, isPosUnauthorized, isRealPaymentMethod, isStorefrontNotFound, isVariantBase, linePayableTotal, listMenusStream, localizePosError, log, logError, luhnCheck, matchAbsoluteDateOperator, matchBooleanOperator, matchCurrencyOperator, matchEnumOperator, matchNumberOperator, matchRecurringDateOperator, matchRelativeDateOperator, matchStringOperator, milestoneSteps, milestoneTrack, nestMenuCategories, normalizeCardholderName, orderPayableTotal, orderRedeemedTotal, orderRedeems, parseExpiry, paymentMatchesClientConditions, rebuildRootGroups, recomputeTotals, redeemedTotal, redemptionCap, redemptionSteps, remainingAmount, removeLine, replaceLine, resolveCheckout, resolveModifierImageUrl, reversePayment, runPaymentAttempt, selectablePayments, serializeError, services, setLineQuantity, storefrontJson, toOrderLines, toPaymentCardBrand, validateCardNumber, validateCardholderName, validateCvc, validateExpiry, validateOrderAgainstMenu, verifyWebhookSignature, visitedStates };
+export { type ApplyRedeemInput, type AuthConfigureOptions, CARD_BRANDS, type CardBrand, type CardBrandSpec, type CardCvcError, type CardExpiry, type CardExpiryError, type CardNumberError, type CardPreviewSlot, type CardholderNameError, type CreateOrderOptions, type CreateSessionOptions, type CustomizationPath, type CustomizationSession, DEFAULT_RECOMMENDATION_TYPES, type ExchangeOptions, type FailedCharge, type FlatMenuCategory, type GenOrderIdOptions, type GroupDisplayType, ID_HASH_FORMATS, type IdBuilder, type IdHashFormat, type ListMenusStreamOptions, type ListPaymentsOptions, type Menu, type MenuCategoryNode, type MenuLookup, type MilestoneSteps, type MilestoneTrackItem, type ModifierControlType, type ModifierCtx, type ModifierGroupCtx, type NestedMenuCategory, Order, type OrderCustomerSource, type OrderDeviceCredential, type OrderDraft, type OrderIssue, type OrderIssueCode, type OrderLineDiff, type OrderLineIssue, type OrderLineIssueCode, OrderPaymentRequiredError, type OrderScope, OrderSyncPendingError, OrderSyncRejectedError, OrderValidationError, type OrderValidationResult, type PayIntentOptions, type PayIntentResult, type PayOptions, type PaymentCardBrand, type PaymentProgressEvent, type PaymentProgressListener, type PaymentRunOptions, type PaymentSessionOptions, type PricingModifier, type Product, type ProductCtx, type QuantitiesByPath, type RecommendationType, RecurringDateCron, type RedeemPaymentRow, type RemoveRedeemInput, type ReorderOrderOptions, type ResetOptions, type ReversalOutcome, type ReverseAllOptions, RulesEngine, type ScheduleWindow, type SelectionStatus, type SelectionsByPath, type SerializedError, type ServiceHttpOptions, type SimpleTenderPayment, type Snapshot, type StorefrontAccessToken, type StorefrontErrorDetails, StorefrontHttpError, type TrackWorkflow, type ValidateOptions, type ValidateOrderAgainstMenuInput, type Variant, type VariantGroup, type VariantGroupCtx, type VariantOptionCtx, type VariantSelection, type VerifyWebhookSignatureInput, type VisitedState, addLines, auth, buildCustomerSnapshot, capRedeems, cappedRedeems, cardBrandSpec, cardDigits, cardNumberGaps, cardNumberMaxLength, cardPreviewGroups, caretAfterDigits, collectOrderLineDiffs, computeStartingPrice, countCartProducts, coveredAmount, createSession, currentNodes, cvcMaxLength, defaultConditionError, detectCardBrand, fitRedeems, flattenMenuCategories, flushLogs, formatCardNumber, formatCvc, formatExpiry, fromOrderLines, genId, genOrderId, getLogContext, getScheduleWindow, indexMenu, isCardNumberComplete, isCardNumberDefinitelyInvalid, isCheckoutFieldFilled, isCvcComplete, isDeviceCharged, isDeviceNotLinked, isExpiryComplete, isGenId, isKioskUnauthorized, isMilestoneStepDone, isOnSchedule, isOrderPaymentRequiredError, isOrderValidationError, isPosDeviceNotLinked, isPosUnauthorized, isRealPaymentMethod, isStorefrontNotFound, isVariantBase, linePayableTotal, listMenusStream, localizePosError, log, logError, luhnCheck, matchAbsoluteDateOperator, matchBooleanOperator, matchCurrencyOperator, matchEnumOperator, matchNumberOperator, matchRecurringDateOperator, matchRelativeDateOperator, matchStringOperator, milestoneSteps, milestoneTrack, nestMenuCategories, normalizeCardholderName, orderPayableTotal, orderRedeemedTotal, orderRedeems, parseExpiry, paymentMatchesClientConditions, rebuildRootGroups, recomputeTotals, redeemedTotal, redemptionCap, redemptionSteps, remainingAmount, removeLine, replaceLine, resolveCheckout, resolveModifierImageUrl, reversePayment, runPaymentAttempt, selectablePayments, serializeError, services, setLineQuantity, storefrontJson, toOrderLines, toPaymentCardBrand, validateCardNumber, validateCardholderName, validateCvc, validateExpiry, validateOrderAgainstMenu, verifyWebhookSignature, visitedStates };

package/dist/index.js

@@ -2514,10 +2514,15 @@ const listOrders = (input = {}, options) => {
 	return storefrontJson(listQuery(input), {}, options);
 };
 const createOrder = (body, options) => {
-	return storefrontJson(orderPath(), {
+	const init = {
 		method: "POST",
 		body: JSON.stringify(body)
-	}, options);
+	};
+	return storefrontJson(...[
+		orderPath(),
+		init,
+		options
+	]);
 };
 const getOrder = (id, options) => {
 	return storefrontJson(orderPath(id), {}, options);
@@ -2602,17 +2607,23 @@ const listOrderFulfillments = async (ids, options) => {
 	const unique = [...new Set(ids)];
 	const pages = [];
 	for (let i = 0; i < unique.length; i += LIST_FULFILLMENT_LIMIT) pages.push(unique.slice(i, i + LIST_FULFILLMENT_LIMIT));
-	return (await Promise.all(pages.map((page) => {
+	const load = (page) => {
 		const params = new URLSearchParams();
 		params.set("ids", page.join(","));
 		return storefrontJson(`${orderPath()}/fulfillments?${params.toString()}`, {}, options);
-	}))).flat();
+	};
+	return (await Promise.all(pages.map(load))).flat();
 };
 const updateOrder = (id, body, options) => {
-	return storefrontJson(orderPath(id), {
+	const init = {
 		method: "PATCH",
 		body: JSON.stringify(body)
-	}, options);
+	};
+	return storefrontJson(...[
+		orderPath(id),
+		init,
+		options
+	]);
 };
 const cancelOrder = (id, options) => {
 	return storefrontJson(`${orderPath(id)}/cancel`, { method: "POST" }, options);
@@ -2631,9 +2642,21 @@ const reorderOrder = (id, body = {}, options) => {
 * unpaid order, cancels it (`VOIDED`) and returns the new `OPEN` order with
 * the same content. Rejects with `StorefrontHttpError` 400
 * (`details.code: "ORDER_PAYMENT_CAPTURED"`) when a payment was captured.
+* Optional `body.order_id` must be an id `genId` can produce (`isGenId`;
+* `genOrderId` is one option, including `BB2192100000001`) and becomes
+* the new order id.
+* `400` `ORDER_ID_INVALID` when the format is wrong. `409`
+* `ORDER_ID_EXISTS` when that id is already taken.
 */
-const reopenOrder = (id, options) => {
-	return storefrontJson(`${orderPath(id)}/reopen`, { method: "POST" }, options);
+const reopenOrder = (id, options, body) => {
+	const path = `${orderPath(id)}/reopen`;
+	const method = "POST";
+	const orderId = body?.order_id;
+	if (orderId === void 0) return storefrontJson(path, { method }, options);
+	return storefrontJson(path, {
+		method,
+		body: JSON.stringify({ order_id: orderId })
+	}, options);
 };
 const parseValidationDetails = (body) => {
 	if (!body || typeof body !== "object") return null;
@@ -2647,10 +2670,15 @@ const parseValidationDetails = (body) => {
 	};
 };
 const validateOrder = async (body, options) => {
-	const response = await storefrontRequest(orderPath("validate"), {
+	const init = {
 		method: "POST",
 		body: JSON.stringify(body)
-	}, options);
+	};
+	const response = await storefrontRequest(...[
+		orderPath("validate"),
+		init,
+		options
+	]);
 	if (response.ok) {
 		const json = await response.json();
 		if (json.data === void 0) throw new Error("Storefront response missing data");
@@ -3118,9 +3146,44 @@ const services = {
 		localizeError: localizePosError
 	}
 };
+const DEFAULT_ID_HASH_LENGTH = 12;
+const ID_HASH_FORMATS = [
+	"alphanumeric",
+	"numeric",
+	"alphabetic"
+];
 const DISALLOWED = /[^A-Za-z0-9]/g;
-const ALPHABET = "0123456789abcdefghijklmnopqrstuvwxyz";
-const BYTE_LIMIT = 252;
+const alnum = "0123456789abcdefghijklmnopqrstuvwxyz";
+const digits = "0123456789";
+const letters = "abcdefghijklmnopqrstuvwxyz";
+const b1 = {
+	alphanumeric: alnum,
+	numeric: digits
+};
+const b2 = { alphabetic: letters };
+const ALPHABETS = {
+	...b1,
+	...b2
+};
+const ORDER_ID_PREFIX = "ord";
+const ORDER_ID_STORE_FALLBACK = "nostore";
+const NUMERIC_WARN_LENGTH = 16;
+/** Largest multiple of `size` that is still below 256. */
+const byteLimit = (size) => Math.floor(255 / size) * size;
+const hashFormat = (value) => {
+	const known = ID_HASH_FORMATS.find((item) => item === value);
+	if (known) return known;
+	throw new Error(`Unknown id hash format: ${value}`);
+};
+const warnShortHash = (length, format) => {
+	if (length < DEFAULT_ID_HASH_LENGTH) {
+		const head = `Id hash is ${length} characters`;
+		console.warn(`${head}; ${`hashes shorter than ${DEFAULT_ID_HASH_LENGTH} are easier to guess`}`);
+	}
+	if (format !== "numeric" || length >= NUMERIC_WARN_LENGTH) return;
+	const head = `Numeric id hash is ${length} digits`;
+	console.warn(`${head}; ${`hashes shorter than ${NUMERIC_WARN_LENGTH} are easier to guess`}`);
+};
 const toLiteral = (value, fallback) => {
 	const trimmed = (value ?? "").trim();
 	const source = trimmed === "" ? fallback : trimmed;
@@ -3129,16 +3192,17 @@ const toLiteral = (value, fallback) => {
 	if (cleaned === "") throw new Error(`Id literal has no alphanumeric characters: "${source}"`);
 	return cleaned.slice(0, 32);
 };
-const randomChars = (length) => {
+const randomChars = (length, alphabet) => {
 	const c = globalThis.crypto;
 	if (typeof c?.getRandomValues !== "function") throw new Error("crypto.getRandomValues is required");
+	const limit = byteLimit(alphabet.length);
 	let out = "";
 	const bytes = new Uint8Array(length * 2);
 	while (out.length < length) {
 		c.getRandomValues(bytes);
 		for (const byte of bytes) {
-			if (byte >= BYTE_LIMIT) continue;
-			out += ALPHABET[byte % 36];
+			if (byte >= limit) continue;
+			out += alphabet[byte % alphabet.length];
 			if (out.length === length) break;
 		}
 	}
@@ -3158,7 +3222,7 @@ const assertShape = (parts) => {
 const render = (part) => {
 	if (part.kind === "literal") return part.value;
 	if (part.kind === "separator") return "-";
-	return randomChars(part.length);
+	return randomChars(part.length, ALPHABETS[part.format]);
 };
 const builder = (parts) => {
 	return {
@@ -3170,12 +3234,16 @@ const builder = (parts) => {
 			return builder([...parts, literal]);
 		},
 		separator: () => builder([...parts, { kind: "separator" }]),
-		hash: (length = 12) => {
-			if (!Number.isInteger(length) || length < 12) throw new Error(`Id hash must be an integer ≥ 12, got ${length}`);
-			return builder([...parts, {
+		hash: (length = DEFAULT_ID_HASH_LENGTH, format = "alphanumeric") => {
+			if (!Number.isInteger(length) || length < 8) throw new Error(`Id hash must be an integer ≥ 8, got ${length}`);
+			const kind = hashFormat(format);
+			warnShortHash(length, kind);
+			const part = {
 				kind: "hash",
-				length
-			}]);
+				length,
+				format: kind
+			};
+			return builder([...parts, part]);
 		},
 		build: () => {
 			assertShape(parts);
@@ -3186,14 +3254,37 @@ const builder = (parts) => {
 	};
 };
 /**
-* Safe id builder: `genId().literal("ord").separator().hash(12).build()`.
-* Literals are cleaned to `[A-Za-z0-9]`; `-` is the only separator and a
-* random hash of at least 12 characters is required.
+* Safe id builder: `genId().literal("ord").separator().hash().build()`.
+* Literals are cleaned to `[A-Za-z0-9]`; `-` is the only separator. A
+* random hash of at least 8 characters is required (default 12). Parts
+* join with `""`, so a literal can sit directly against the hash.
 */
 const genId = () => builder([]);
-/** `ord-<store>-<hash>`; `nostore` when the store id is blank. */
-const genOrderId = (storeId) => {
-	return genId().literal("ord").separator().literal(storeId, "nostore").separator().hash().build();
+/**
+* Always `ord-<store>-<hash>`; `nostore` when the store id is blank.
+* Omitted length and format stay at 12 lowercase alphanumeric characters.
+* `length` may be as short as 8.
+*/
+const genOrderId = (storeId, options) => {
+	return genId().literal(ORDER_ID_PREFIX).separator().literal(storeId, ORDER_ID_STORE_FALLBACK).separator().hash(options?.length, options?.format).build();
+};
+const ID_BODY = /^[A-Za-z0-9-]+$/;
+const HASH_RUN = new RegExp(`[0-9a-z]{8,}`);
+/**
+* True for an id {@link genId} can produce. The whole value is
+* `[A-Za-z0-9-]`, at most 64 characters, with no leading, trailing, or
+* doubled `-`, and it contains a run of at least 8 `[0-9a-z]`. A literal
+* may sit directly against that run (`BB2192100000001`).
+*/
+const isGenId = (value) => {
+	if (value.length < 8) return false;
+	if (value.length > 64) return false;
+	if (!ID_BODY.test(value)) return false;
+	const doubled = `--`;
+	const starts = value.startsWith("-");
+	const ends = value.endsWith("-");
+	if (starts || ends || value.includes(doubled)) return false;
+	return HASH_RUN.test(value);
 };
 //#endregion
 //#region src/order/OrderPaymentRequiredError.ts
@@ -4634,7 +4725,9 @@ var PaymentSession = class {
 	async reverseAll(options = {}) {
 		const intents = this.deps.getOrder().payment_intents;
 		const outcomes = [];
+		const only = options.tenderIds ? new Set(options.tenderIds) : null;
 		for (const tender of chargedTenders(intents)) {
+			if (only && !only.has(tender.id)) continue;
 			if (tender.status === "IDLE") continue;
 			const found = await this.contextFor(tender);
 			if (!found) continue;
@@ -5335,34 +5428,16 @@ const buildLocalDraft = (insert) => {
 		issued_at: null,
 		resolved_at: null
 	};
-	const p12 = {
+	return {
 		...b1,
-		...b2
-	};
-	const p34 = {
+		...b2,
 		...b3,
-		...b4
-	};
-	const p56 = {
+		...b4,
 		...b5,
-		...b6
-	};
-	const p78 = {
+		...b6,
 		...b7,
 		...b8
 	};
-	const p1234 = {
-		...p12,
-		...p34
-	};
-	const p5678 = {
-		...p56,
-		...p78
-	};
-	return {
-		...p1234,
-		...p5678
-	};
 };
 const sameBrand = (left, right) => {
 	return (optionalBrandId(left) ?? null) === (optionalBrandId(right) ?? null);
@@ -5370,14 +5445,22 @@ const sameBrand = (left, right) => {
 /** Newest OPEN order for customer + scope, if any. */
 const findOpenOrder = async (scope, http) => {
 	const brandId = optionalBrandId(scope.brand_id);
-	return (await services.orders.list({
+	const b1 = {
 		store_id: scope.store_id,
-		channel_id: scope.channel_id,
+		channel_id: scope.channel_id
+	};
+	const b2 = {
 		fulfillment_id: scope.fulfillment_id,
-		...brandId ? { brand_id: brandId } : {},
-		status: "OPEN",
+		status: "OPEN"
+	};
+	const brand = brandId ? { brand_id: brandId } : {};
+	const query = {
+		...b1,
+		...b2,
+		...brand,
 		limit: 20
-	}, http)).find((order) => sameBrand(order.brand_id, brandId)) ?? null;
+	};
+	return (await services.orders.list(query, http)).find((order) => sameBrand(order.brand_id, brandId)) ?? null;
 };
 var Order = class Order {
 	draft;
@@ -5409,32 +5492,59 @@ var Order = class Order {
 		this.debounceMs = config.debounceMs;
 		this.device = config.device;
 		this.externalNotify = notify;
-		this.flush = createFlushController({
+		const b1 = {
 			getDraft: () => this.draft,
-			setDraft: (next) => {
-				this.replaceDraft(next);
-			},
-			getSynced: () => this.synced,
-			setSynced: (next) => {
-				this.synced = next;
-			},
-			isDeleted: () => this.deleted,
-			isPersisted: () => this.persisted,
-			setPersisted: (next) => {
-				this.persisted = next;
-			},
+			getSynced: () => this.synced
+		};
+		const setDraft = (next) => {
+			this.replaceDraft(next);
+		};
+		const setSynced = (next) => {
+			this.synced = next;
+		};
+		const b2 = { setDraft };
+		const b3 = { setSynced };
+		const b4 = { isDeleted: () => this.deleted };
+		const b5 = { isPersisted: () => this.persisted };
+		const setPersisted = (next) => {
+			this.persisted = next;
+		};
+		const b6 = { setPersisted };
+		const b7 = {
 			notify: () => this.notify(),
-			http: this.http,
-			debounceMs: config.debounceMs,
+			http: this.http
+		};
+		const b8 = { debounceMs: config.debounceMs };
+		const b9 = {
 			fresh: config.fresh ?? false,
 			sleep: config.sleep
-		});
-		this.payments = new PaymentSession({
+		};
+		const flush = {
+			...b1,
+			...b2,
+			...b3,
+			...b4,
+			...b5,
+			...b6,
+			...b7,
+			...b8,
+			...b9
+		};
+		this.flush = createFlushController(flush);
+		const c1 = {
 			getOrder: () => this.draft,
-			placeOrder: (input) => this.placeOrder(input),
-			applyOrder: (next) => this.applyServerOrder(next),
 			http: this.http
-		});
+		};
+		const place = (input) => this.placeOrder(input);
+		const apply = (next) => this.applyServerOrder(next);
+		const c2 = { placeOrder: place };
+		const c3 = { applyOrder: apply };
+		const pay = {
+			...c1,
+			...c2,
+			...c3
+		};
+		this.payments = new PaymentSession(pay);
 	}
 	/**
 	* Opens a cart session: reuses an existing OPEN order for the scope, or a
@@ -5472,13 +5582,19 @@ var Order = class Order {
 			persisted: true,
 			device: options.device
 		}, notify);
-		return new Order({
+		const d1 = {
 			order: buildLocalDraft(body),
 			http,
 			debounceMs,
-			persisted: false,
+			persisted: false
+		};
+		const d2 = {
 			fresh: !reuse,
 			device: options.device
+		};
+		return new Order({
+			...d1,
+			...d2
 		}, notify);
 	}
 	static async reorder(orderId, options = {}, notify) {
@@ -5501,12 +5617,18 @@ var Order = class Order {
 	}
 	/** @internal test hook — create without POST */
 	static fromExisting(config, notify) {
-		return new Order({
+		const debounceMs = config.debounceMs ?? 300;
+		const persisted = config.persisted ?? true;
+		const d1 = {
 			order: config.order,
 			http: config.http,
-			debounceMs: config.debounceMs ?? 300,
-			persisted: config.persisted ?? true,
-			sleep: config.sleep
+			debounceMs,
+			persisted
+		};
+		const d2 = { sleep: config.sleep };
+		return new Order({
+			...d1,
+			...d2
 		}, notify);
 	}
 	/** Whether this session has a server row yet. */
@@ -5666,12 +5788,22 @@ var Order = class Order {
 	}
 	setScope(scope) {
 		if (this.deleted) return;
-		this.draft = {
+		const store_id = scope.store_id ?? this.draft.store_id;
+		const channel_id = scope.channel_id ?? this.draft.channel_id;
+		const prevFulfillment = this.draft.fulfillment_id;
+		const fulfillment_id = scope.fulfillment_id ?? prevFulfillment;
+		const kept = scope.brand_id === void 0;
+		const nextBrand = optionalBrandId(scope.brand_id);
+		const brand_id = kept ? this.draft.brand_id : nextBrand;
+		const b1 = {
 			...this.draft,
-			store_id: scope.store_id ?? this.draft.store_id,
-			channel_id: scope.channel_id ?? this.draft.channel_id,
-			fulfillment_id: scope.fulfillment_id ?? this.draft.fulfillment_id,
-			brand_id: scope.brand_id === void 0 ? this.draft.brand_id : optionalBrandId(scope.brand_id)
+			store_id,
+			channel_id,
+			fulfillment_id
+		};
+		this.draft = {
+			...b1,
+			brand_id
 		};
 		this.rememberLogScope();
 		this.scheduleAfterMutate();
@@ -5741,15 +5873,24 @@ var Order = class Order {
 	* `OPEN` order with the same content. This instance is closed afterwards;
 	* replace it with the returned `Order` (same HTTP options and listener).
 	*
+	* Pass `orderId` from `genId` (or `genOrderId`) to set the new order id.
+	* The request body field is `order_id`. Any id `isGenId` accepts is
+	* valid, including a literal glued to the hash
+	* (`genId().literal("BB21921").hash(8, "numeric").build()`). Omit it
+	* and the server generates one.
+	* `400` `ORDER_ID_INVALID` when the format is wrong. `409`
+	* `ORDER_ID_EXISTS` when that id is already taken.
+	*
 	* Rejects with `StorefrontHttpError` 400 and
 	* `details.code: "ORDER_PAYMENT_CAPTURED"` when a payment was already
 	* captured; nothing changes then and this instance stays usable.
 	*/
-	async reopen() {
+	async reopen(orderId) {
 		if (!this.persisted) throw new Error("Only a placed order is reopened");
 		this.flush.cancel();
+		const body = orderId !== void 0 ? { order_id: orderId } : void 0;
 		const c1 = {
-			order: await services.orders.reopen(this.draft.id, this.http),
+			order: await services.orders.reopen(this.draft.id, this.http, body),
 			http: this.http,
 			debounceMs: this.debounceMs
 		};
@@ -5959,8 +6100,13 @@ var Order = class Order {
 			idempotency_key,
 			reason
 		} : { idempotency_key };
-		const id = this.draft.id;
-		const next = await services.orders.voidTender(id, tenderId, body, this.http);
+		const p1 = [
+			this.draft.id,
+			tenderId,
+			body,
+			this.http
+		];
+		const next = await services.orders.voidTender(...p1);
 		this.applyServerOrder(next);
 		return this.getOrder();
 	}
@@ -8791,4 +8937,4 @@ const cardPreviewGroups = (value) => {
 	return groups;
 };
 //#endregion
-export { CARD_BRANDS, DEFAULT_RECOMMENDATION_TYPES, Order, OrderPaymentRequiredError, OrderSyncPendingError, OrderSyncRejectedError, OrderValidationError, RecurringDateCron, RulesEngine, StorefrontHttpError, addLines, auth, buildCustomerSnapshot, capRedeems, cappedRedeems, cardBrandSpec, cardDigits, cardNumberGaps, cardNumberMaxLength, cardPreviewGroups, caretAfterDigits, collectOrderLineDiffs, computeStartingPrice, countCartProducts, coveredAmount, createSession, currentNodes, cvcMaxLength, defaultConditionError, detectCardBrand, fitRedeems, flattenMenuCategories, flushLogs, formatCardNumber, formatCvc, formatExpiry, fromOrderLines, genId, genOrderId, getLogContext, getScheduleWindow, indexMenu, isCardNumberComplete, isCardNumberDefinitelyInvalid, isCheckoutFieldFilled, isCvcComplete, isDeviceCharged, isDeviceNotLinked, isExpiryComplete, isKioskUnauthorized, isMilestoneStepDone, isOnSchedule, isOrderPaymentRequiredError, isOrderValidationError, isPosDeviceNotLinked, isPosUnauthorized, isRealPaymentMethod, isStorefrontNotFound, isVariantBase, linePayableTotal, listMenusStream, localizePosError, log, logError, luhnCheck, matchAbsoluteDateOperator, matchBooleanOperator, matchCurrencyOperator, matchEnumOperator, matchNumberOperator, matchRecurringDateOperator, matchRelativeDateOperator, matchStringOperator, milestoneSteps, milestoneTrack, nestMenuCategories, normalizeCardholderName, orderPayableTotal, orderRedeemedTotal, orderRedeems, parseExpiry, paymentMatchesClientConditions, rebuildRootGroups, recomputeTotals, redeemedTotal, redemptionCap, redemptionSteps, remainingAmount, removeLine, replaceLine, resolveCheckout, resolveModifierImageUrl, reversePayment, runPaymentAttempt, selectablePayments, serializeError, services, setLineQuantity, storefrontJson, toOrderLines, toPaymentCardBrand, validateCardNumber, validateCardholderName, validateCvc, validateExpiry, validateOrderAgainstMenu, verifyWebhookSignature, visitedStates };
+export { CARD_BRANDS, DEFAULT_RECOMMENDATION_TYPES, ID_HASH_FORMATS, Order, OrderPaymentRequiredError, OrderSyncPendingError, OrderSyncRejectedError, OrderValidationError, RecurringDateCron, RulesEngine, StorefrontHttpError, addLines, auth, buildCustomerSnapshot, capRedeems, cappedRedeems, cardBrandSpec, cardDigits, cardNumberGaps, cardNumberMaxLength, cardPreviewGroups, caretAfterDigits, collectOrderLineDiffs, computeStartingPrice, countCartProducts, coveredAmount, createSession, currentNodes, cvcMaxLength, defaultConditionError, detectCardBrand, fitRedeems, flattenMenuCategories, flushLogs, formatCardNumber, formatCvc, formatExpiry, fromOrderLines, genId, genOrderId, getLogContext, getScheduleWindow, indexMenu, isCardNumberComplete, isCardNumberDefinitelyInvalid, isCheckoutFieldFilled, isCvcComplete, isDeviceCharged, isDeviceNotLinked, isExpiryComplete, isGenId, isKioskUnauthorized, isMilestoneStepDone, isOnSchedule, isOrderPaymentRequiredError, isOrderValidationError, isPosDeviceNotLinked, isPosUnauthorized, isRealPaymentMethod, isStorefrontNotFound, isVariantBase, linePayableTotal, listMenusStream, localizePosError, log, logError, luhnCheck, matchAbsoluteDateOperator, matchBooleanOperator, matchCurrencyOperator, matchEnumOperator, matchNumberOperator, matchRecurringDateOperator, matchRelativeDateOperator, matchStringOperator, milestoneSteps, milestoneTrack, nestMenuCategories, normalizeCardholderName, orderPayableTotal, orderRedeemedTotal, orderRedeems, parseExpiry, paymentMatchesClientConditions, rebuildRootGroups, recomputeTotals, redeemedTotal, redemptionCap, redemptionSteps, remainingAmount, removeLine, replaceLine, resolveCheckout, resolveModifierImageUrl, reversePayment, runPaymentAttempt, selectablePayments, serializeError, services, setLineQuantity, storefrontJson, toOrderLines, toPaymentCardBrand, validateCardNumber, validateCardholderName, validateCvc, validateExpiry, validateOrderAgainstMenu, verifyWebhookSignature, visitedStates };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fire-spark/core",
-  "version": "0.8.3",
+  "version": "0.9.0",
   "description": "Fire Spark headless SDK",
   "type": "module",
   "sideEffects": false,
@@ -20,8 +20,8 @@
     "big.js": "6.2.1",
     "dayjs": "1.11.9",
     "@types/big.js": "6.2.2",
-    "@fire-spark/payments": "^0.8.3",
-    "@fire-spark/types": "^0.8.3"
+    "@fire-spark/payments": "^0.9.0",
+    "@fire-spark/types": "^0.9.0"
   },
   "devDependencies": {
     "tsdown": "^0.22.14",