@stamprally/core 0.18.0 → 0.19.0

package/README.md

@@ -1,4 +1,4 @@
-# @stamprally/core v0.18.0
+# @stamprally/core v0.19.0
 
 Dependency-free domain models, immutable state transitions, storage adapters, browser detectors, and safe configuration parsers.
 
@@ -7,7 +7,7 @@ import { InMemoryStorage, StampRallyClient, type PublicRallyConfig } from "@stam
 
 const config: PublicRallyConfig = {
   id: "city-tour",
-  version: "0.18.0",
+  version: "0.19.0",
   title: "City Tour",
   spots: [{ id: "station", orderIndex: 0, name: "Central Station", conditions: [{ type: "passcode" }] }],
   rewards: [],
@@ -28,8 +28,7 @@ The browser detectors `getCurrentGeoContext`, `readNfcContext`, and `readQrConte
 Configure `OfflineQueue` with `rallyId` and `userId` to persist pending work under
 `stamprally:queue:<rallyId>:<userId-or-anonymous>`. `switchUser` loads the other
 user's queue. The default `authoritative_replay` policy uses the server state as
-the conflict baseline; `merge` is retained only as an explicit compatibility
-option, and `server_wins` uses the server state unchanged. Sync adapters may return `ACCEPTED`, `REJECTED_PERMANENT`,
+the conflict baseline; it is the only supported conflict policy. Sync adapters may return `ACCEPTED`, `REJECTED_PERMANENT`,
 or `RETRYABLE_ERROR`; only the first two remove an operation.
 
 When no authenticated user is supplied, the client creates a persistent UUID v4

package/dist/index.cjs

@@ -1581,9 +1581,10 @@ var OfflineQueue = class {
     );
     if (spot2 === void 0) return false;
     const failedSpots = new Set(
-      this.#rejectedHistory.filter((entry) => entry.operation.kind === "checkIn").map(
-        (entry) => entry.operation.kind === "checkIn" ? entry.operation.request.spotId : void 0
-      ).filter((spotId) => spotId !== void 0)
+      [
+        ...this.#rejectedHistory.map((entry) => entry.operation),
+        ...this.#operations.filter((candidate) => candidate.status === "REJECTED_PERMANENT")
+      ].filter((candidate) => candidate.kind === "checkIn").map((candidate) => candidate.kind === "checkIn" ? candidate.request.spotId : void 0).filter((spotId) => spotId !== void 0)
     );
     if (!spot2.prerequisites?.some((prerequisite) => failedSpots.has(prerequisite))) return false;
     const error = {
@@ -1794,18 +1795,18 @@ function applyInventoryDelta(state, previous, optimistic) {
     if (before !== void 0 && after !== void 0)
       rewardRemaining[key] = Math.max(0, (currentRewards[key] ?? before) + after - before);
   }
-  return {
-    ...state,
-    inventory: {
-      ...currentInventory.sharedRemaining === void 0 || sharedDelta === void 0 ? {} : { sharedRemaining: Math.max(0, currentInventory.sharedRemaining + sharedDelta) },
-      ...Object.keys(rewardRemaining).length === 0 ? {} : { rewardRemaining }
-    }
+  const nextInventory = {
+    ...currentInventory.sharedRemaining === void 0 || sharedDelta === void 0 ? optimisticInventory.sharedRemaining === void 0 || sharedDelta === void 0 ? {} : { sharedRemaining: Math.max(0, optimisticInventory.sharedRemaining) } : { sharedRemaining: Math.max(0, currentInventory.sharedRemaining + sharedDelta) },
+    ...Object.keys(rewardRemaining).length === 0 ? {} : { rewardRemaining }
   };
+  return { ...state, inventory: nextInventory };
 }
-function applyOperation(state, operation, config) {
+function applyOperation(state, operation, config, rejectedCheckIns) {
   if (operation.kind === "checkIn") {
     const spot2 = config?.spots.find((candidate) => candidate.id === operation.request.spotId);
-    if (spot2?.prerequisites?.some((id2) => !state.records.some((record2) => record2.stampId === id2)))
+    if (spot2?.prerequisites?.some(
+      (id2) => rejectedCheckIns.has(id2) || !state.records.some((record2) => record2.stampId === id2)
+    ))
       return { state, prerequisiteFailed: true };
     if (state.records.some((record2) => record2.stampId === operation.request.spotId))
       return { state, prerequisiteFailed: false };
@@ -1852,11 +1853,21 @@ function rebuildUserStateFromLog(baselineOrOptions, operationsArgument, configAr
 function rebuildUserStateLog(baseline, operations, config) {
   let state = cloneState(baseline);
   const rejectedOperationIds = [];
+  const rejectedCheckIns = new Set(
+    operations.filter(
+      (operation) => operation.status === "REJECTED_PERMANENT" && operation.kind === "checkIn"
+    ).map((operation) => operation.kind === "checkIn" ? operation.request.spotId : void 0).filter((spotId) => spotId !== void 0)
+  );
   for (const operation of operations) {
+    if (operation.status === "REJECTED_PERMANENT") {
+      if (operation.kind === "checkIn") rejectedCheckIns.add(operation.request.spotId);
+      continue;
+    }
     if (!isReplayable(operation)) continue;
-    const replay = applyOperation(state, operation, config);
+    const replay = applyOperation(state, operation, config, rejectedCheckIns);
     if (replay.prerequisiteFailed) {
       rejectedOperationIds.push(operationId(operation));
+      if (operation.kind === "checkIn") rejectedCheckIns.add(operation.request.spotId);
       continue;
     }
     state = replay.state;
@@ -1904,6 +1915,30 @@ function emptyState(config, userId, now) {
     updatedAt: now
   };
 }
+function applyOptimisticRewardClaim(state, rewardId, reward2, now) {
+  if (reward2.claimTicketNumber === void 0 || state.inventory === void 0)
+    return {
+      ...state,
+      rewards: state.rewards.map((item) => item.rewardId === rewardId ? reward2 : item),
+      updatedAt: now
+    };
+  const currentInventory = state.inventory;
+  const currentRewardRemaining = currentInventory.rewardRemaining?.[rewardId];
+  return {
+    ...state,
+    rewards: state.rewards.map((item) => item.rewardId === rewardId ? reward2 : item),
+    updatedAt: now,
+    inventory: {
+      ...currentInventory.sharedRemaining === void 0 ? {} : { sharedRemaining: Math.max(0, currentInventory.sharedRemaining - 1) },
+      ...currentInventory.rewardRemaining === void 0 || currentRewardRemaining === void 0 ? {} : {
+        rewardRemaining: {
+          ...currentInventory.rewardRemaining,
+          [rewardId]: Math.max(0, currentRewardRemaining - 1)
+        }
+      }
+    }
+  };
+}
 function errorMessage(error, fallback) {
   return error !== void 0 && "message" in error && typeof error.message === "string" ? error.message : fallback;
 }
@@ -1931,6 +1966,9 @@ var StampRallyClient = class {
     this.#offlineQueue = this.#options.offlineQueue;
     this.#offlineQueue?.setReplayConfig(config);
     this.#offlineQueue?.setSyncResultListener((event) => this.#handleOfflineSyncResult(event));
+    this.#offlineQueue?.setCapabilityWarningListener(
+      (warning) => this.#emitEvent({ type: "storageCapabilityWarning", warning })
+    );
     this.#offlineQueue?.setChangeListener(() => {
       this.#syncRevision += 1;
       if (this.#state !== null) this.#emit(this.#state);
@@ -2161,23 +2199,13 @@ var StampRallyClient = class {
           return result.ok ? this.#commitClaim(result) : this.#fail(result.error);
         } catch (error) {
           if (this.#offlineQueue === void 0) throw error;
-          const next2 = {
-            ...current,
-            rewards: current.rewards.map(
-              (item) => item.rewardId === rewardId ? local.value : item
-            ),
-            updatedAt: now
-          };
+          const next2 = applyOptimisticRewardClaim(current, rewardId, local.value, now);
           await this.#offlineQueue.enqueueClaimReward(request, next2);
           await this.#storage.save(next2);
           return this.#commitClaim({ ok: true, value: { state: next2, reward: local.value } });
         }
       }
-      const next = {
-        ...current,
-        rewards: current.rewards.map((item) => item.rewardId === rewardId ? local.value : item),
-        updatedAt: now
-      };
+      const next = applyOptimisticRewardClaim(current, rewardId, local.value, now);
       await this.#storage.save(next);
       return this.#commitClaim({ ok: true, value: { state: next, reward: local.value } });
     });
@@ -3251,7 +3279,7 @@ function validateRallyConfigRelations(config) {
       ["stockKey", reward2.stockKey],
       ["secondaryStockKey", reward2.secondaryStockKey]
     ]) {
-      if (key !== void 0 && key !== "__shared__" && inventory?.[key] === void 0)
+      if (key !== void 0 && (key === "__shared__" && inventory?.sharedStock === void 0 || key !== "__shared__" && inventory?.[key] === void 0))
         add(
           errors,
           `rewards[${index}].${field}`,
@@ -3259,13 +3287,6 @@ function validateRallyConfigRelations(config) {
           "missing_inventory_key"
         );
     }
-    if (reward2.stockKey === "__shared__" && inventory?.sharedStock === void 0)
-      add(
-        errors,
-        `rewards[${index}].stockKey`,
-        "sharedStock is not defined.",
-        "missing_inventory_key"
-      );
   });
   const visiting = /* @__PURE__ */ new Set();
   const visited = /* @__PURE__ */ new Set();