ng-miam 8.8.15 → 8.8.17

package/bundles/ng-miam.umd.js

@@ -3329,6 +3329,8 @@
           this.generatingAuthlessId$ = new rxjs.BehaviorSubject(false);
           this.userCoordinates$ = new rxjs.BehaviorSubject(undefined);
           this.userInfo$ = new rxjs.BehaviorSubject(undefined);
+          /** In-flight authless POST shared by concurrent callers (replaces debounce-only coalescing). */
+          this.authlessInFlight$ = null;
           this.userRoles$ = new rxjs.BehaviorSubject([]);
           this.userProvider$ = new rxjs.BehaviorSubject(undefined);
           this.userSupplier$ = new rxjs.BehaviorSubject(undefined);
@@ -3389,14 +3391,38 @@
           this.userProvider$.next(null);
           this.userSupplier$.next(null);
       };
+      /**
+       * Ensures API calls that need `Authorization: user_id …` have either a logged user id or an authless id
+       * (same rule as MiamInterceptor: Bearer token, else user_id from `_miam/userId` or `_miam/authlessId`).
+       */
+      UserService.prototype.ensureAnonymousUserIdIfMissing = function () {
+          if (localStorage.getItem('_miam/userToken') || localStorage.getItem('_miam/userId')) {
+              return rxjs.of(void 0);
+          }
+          return this.generateAnonymousUserId().pipe(operators.map(function () { return void 0; }));
+      };
       UserService.prototype.generateAnonymousUserId = function () {
           var _this = this;
+          var existing = localStorage.getItem('_miam/authlessId');
+          if (existing) {
+              return rxjs.of(existing);
+          }
+          if (this.authlessInFlight$) {
+              return this.authlessInFlight$;
+          }
           var url = environment$1.miamAPI + "/api/v1/users/authless";
           this.generatingAuthlessId$.next(true);
-          return this.http.post(url, {}).pipe(operators.map(function (result) { return result['authless_id']; }), operators.tap(function (anonymousUserId) {
+          this.authlessInFlight$ = this.http.post(url, {}).pipe(operators.map(function (result) { return result.authless_id; }), operators.tap(function (anonymousUserId) {
               localStorage.setItem('_miam/authlessId', anonymousUserId);
               _this.generatingAuthlessId$.next(false);
-          }));
+          }), operators.catchError(function (err) {
+              _this.generatingAuthlessId$.next(false);
+              _this.authlessInFlight$ = null;
+              return rxjs.throwError(err);
+          }), operators.finalize(function () {
+              _this.authlessInFlight$ = null;
+          }), operators.shareReplay(1));
+          return this.authlessInFlight$;
       };
       UserService.prototype.setPreference = function (pref, state) {
           var _this = this;
@@ -3856,9 +3882,71 @@
       return RecipeLike;
   }(i2$2.Resource));
 
+  var VERSION = '8.8.17';
+
+  var _eventEmitter = new i0.EventEmitter();
+  /** Maps SDK 8.8 legacy names to canonical mealz-shared-analytics@4.13 event names. */
+  var LEGACY_EVENT_NAME_MAP = {
+      'entry.add': 'entry.added',
+      'entry.delete': 'entry.deleted',
+      'entry.replace': 'entry.replaced',
+      'pos.selected': 'locator.select',
+      'search.store': 'locator.search',
+      'planner.confirmed': 'planner.confirm',
+      'recipe.print': 'recipe.show'
+  };
+  /** Maps SDK 8.8 legacy prop keys to canonical shared-analytics keys. */
+  var LEGACY_PROP_KEY_MAP = {
+      recipes_count: 'recipe_count',
+      new_ext_item_id: 'new_item_ext_id',
+      old_ext_item_id: 'old_item_ext_id'
+  };
+  /** Legacy marker event; reset is already tracked via subsequent recipe.remove events. */
+  var LEGACY_EVENTS_SKIPPED = new Set(['recipe.reset']);
+  function mapLegacyEventName(name) {
+      var _a;
+      return (_a = LEGACY_EVENT_NAME_MAP[name]) !== null && _a !== void 0 ? _a : name;
+  }
+  function shouldSkipLegacyEvent(name) {
+      return LEGACY_EVENTS_SKIPPED.has(name);
+  }
+  function normalizeLegacyProps(props) {
+      if (!props) {
+          return {};
+      }
+      var normalized = {};
+      Object.keys(props).forEach(function (key) {
+          var _a;
+          var value = props[key];
+          if (value === undefined || value === null) {
+              return;
+          }
+          var normalizedKey = (_a = LEGACY_PROP_KEY_MAP[key]) !== null && _a !== void 0 ? _a : key;
+          normalized[normalizedKey] = String(value);
+      });
+      return normalized;
+  }
+  var getAnalyticsEnvironment = function () { return environment$1.env === 'prod' ? 'prod' : 'uat'; };
+  // Exported for unit tests
+  // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
+  function url(path) {
+      if (path) {
+          return "" + location.origin + path;
+      }
+      return location.href;
+  }
+  // Exported for unit tests
+  // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
+  function _onEmit(event) {
+      _eventEmitter.emit(JSON.stringify({
+          name: event.name,
+          path: event.url,
+          props: event.props
+      }));
+  }
   var AnalyticsService = /** @class */ (function () {
       function AnalyticsService() {
-          this.EVENT_PAGEVIEW = 'pageview'; // GA4 is page_view -> use this one on ga to autotrack some fields
+          this.EVENT_PAGEVIEW = 'pageview';
           this.EVENT_SEARCH = 'search';
           this.EVENT_RECIPE_SHOW = 'recipe.show';
           this.EVENT_RECIPE_DISPLAY = 'recipe.display';
@@ -3887,69 +3975,54 @@
           this.EVENT_ONBOARDING_CLOSE = 'onboarding.close';
           this.EVENT_ONBOARDING_ACTION = 'onboarding.action';
           this.ready$ = new rxjs.BehaviorSubject(false);
-          this.eventEmitter = new i0.EventEmitter();
+          this.eventEmitter = _eventEmitter;
+          this.alreadyInitialized = false;
       }
       // DEPRECATED: optimizeKey parameter to be removed with next major version
       AnalyticsService.prototype.init = function (domain, _optimizeKey) {
-          this._injectPlausible(domain);
-      };
-      /**
-       * Set the identifier of the ABTest experience if one is running
-       * It will then be added as props to all events sent
-       * @param key A unique identifier for the ABTest experience
-       */
-      AnalyticsService.prototype.setAbTestKey = function (key) {
-          this.abTestkey = key;
-      };
-      AnalyticsService.prototype.event = function (name, path, props) {
           var _a;
-          if (this.abTestkey) {
-              props.abTestKey = this.abTestkey;
+          if (this.alreadyInitialized || !domain) {
+              return;
+          }
+          mealzSharedAnalytics.initSharedAnalytics(domain, VERSION, _onEmit, getAnalyticsEnvironment());
+          var storedAbTestKey = localStorage.getItem('_miam/ab');
+          if ((storedAbTestKey === null || storedAbTestKey === void 0 ? void 0 : storedAbTestKey.length) > 0) {
+              mealzSharedAnalytics.setABTestKey(storedAbTestKey);
+          }
+          else if (this.pendingAbTestKey !== undefined) {
+              mealzSharedAnalytics.setABTestKey(this.pendingAbTestKey);
           }
           if (((_a = localStorage.getItem('_miam/affiliate')) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-              props.affiliate = localStorage.getItem('_miam/affiliate');
-          }
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-          plausible(name, { u: this.url(path), props: props });
-          this.eventEmitter.emit(JSON.stringify({
-              name: name,
-              path: this.url(path),
-              props: props
-          }));
+              mealzSharedAnalytics.setAffiliate(localStorage.getItem('_miam/affiliate'));
+          }
+          this.alreadyInitialized = true;
+          this.ready$.next(true);
+      };
+      AnalyticsService.prototype.setAbTestKey = function (key) {
+          this.pendingAbTestKey = key;
+          if (this.alreadyInitialized) {
+              mealzSharedAnalytics.setABTestKey(key);
+          }
       };
       AnalyticsService.prototype.sendEventWhenReady = function (name, path, props) {
           var _this = this;
           if (this.ready$.getValue()) {
-              return this.event(name, path, props);
+              this.sendAnalyticsEvent(name, path, props);
+              return;
           }
-          this.ready$.pipe(operators.filter(function (ready) { return ready; }), operators.take(1)).subscribe(function () { return _this.event(name, path, props); });
+          this.ready$.pipe(operators.filter(function (ready) { return ready; }), operators.take(1)).subscribe(function () { return _this.sendAnalyticsEvent(name, path, props); });
       };
-      AnalyticsService.prototype.url = function (path) {
-          if (path) {
-              return "" + location.origin + path;
+      AnalyticsService.prototype.sendAnalyticsEvent = function (name, path, props) {
+          if (shouldSkipLegacyEvent(name)) {
+              return;
           }
-          return location.href;
-      };
-      AnalyticsService.prototype._injectPlausible = function (domain) {
-          var _this = this;
-          var script = document.createElement('script');
-          if (domain === 'miam.test') {
-              // In development, charge the "local" extension to make sure events can be routed from localhost to miam.test domain
-              script.src = 'https://plausible.io/js/plausible.local.manual.js';
+          var eventName = mapLegacyEventName(name);
+          try {
+              mealzSharedAnalytics.sendEvent(eventName, url(path), '', normalizeLegacyProps(props));
           }
-          else {
-              // Use manual script to limit the number of pageviews
-              // Don't trigger pageviews automatically. Also allows you to specify custom locations to redact URLs with identifiers.
-              // You can also use it to track custom query parameters
-              script.src = 'https://plausible.io/js/plausible.manual.js';
+          catch (error) {
+              console.error('[Miam] Error sending analytics event', error);
           }
-          script.defer = true;
-          script.setAttribute('data-domain', domain);
-          script.onload = function () {
-              console.debug("[Miam] Analytics ready for domain: " + JSON.stringify(domain));
-              _this.ready$.next(true);
-          };
-          document.head.appendChild(script);
       };
       /** ************************************************* SEND EVENT FOR BASKET ACTIONS ************************************************* **/
       AnalyticsService.prototype.sendRemoveRecipesEvents = function (actions) {
@@ -4024,7 +4097,7 @@
                   item_id: action.params.basketEntry.selectedItem.id,
                   ext_item_id: action.params.basketEntry.selectedItem.attributes['ext-id'],
                   item_ean: action.params.basketEntry.selectedItem.ean,
-                  diff: action.params.newQuantity - action.params.basketEntry.quantity
+                  product_quantity: action.params.newQuantity
               });
           });
       };
@@ -4032,6 +4105,7 @@
           this.sendEventWhenReady(this.EVENT_ENTRY_REPLACE, action.params.eventTrace.originPath, {
               recipe_id: action.params.recipeId,
               entry_name: action.params.basketEntry.name,
+              product_quantity: action.params.basketEntry.quantity,
               new_item_id: action.params.basketEntry.selectedItem.id,
               new_ext_item_id: action.params.basketEntry.selectedItem.attributes['ext-id'],
               new_item_ean: action.params.basketEntry.selectedItem.ean,
@@ -4628,7 +4702,7 @@
   var MIAM_API_HOST$2 = environment$1.miamAPI + "/api/v1/";
   var RecipesService = /** @class */ (function (_super) {
       __extends(RecipesService, _super);
-      function RecipesService(http, providerService, statusService, typeService, suppliersService, posService, ingredientsService, recipeStepsService, sponsorService, packageService, tagsService, recipeLikesService, seoService, preferencesService, storeLocatorService) {
+      function RecipesService(http, providerService, statusService, typeService, suppliersService, posService, ingredientsService, recipeStepsService, sponsorService, packageService, tagsService, recipeLikesService, seoService, preferencesService, storeLocatorService, userService) {
           var _this = _super.call(this) || this;
           _this.http = http;
           _this.providerService = providerService;
@@ -4645,6 +4719,7 @@
           _this.seoService = seoService;
           _this.preferencesService = preferencesService;
           _this.storeLocatorService = storeLocatorService;
+          _this.userService = userService;
           _this.resource = Recipe;
           _this.type = 'recipes';
           _this.displayedRecipe$ = new rxjs.BehaviorSubject(null);
@@ -5011,14 +5086,14 @@
               return;
           }
           var queuedContexts = Array.from(this.pendingContexts.values());
-          rxjs.combineLatest([
-              this.suppliersService.supplier$,
-              this.posService.posWasInitialized().pipe(operators.skipWhile(function (wasInitialized) { return !wasInitialized; }), operators.switchMap(function () { return _this.posService.pos$; }))
+          this.userService.ensureAnonymousUserIdIfMissing().pipe(operators.switchMap(function () { return rxjs.combineLatest([
+              _this.suppliersService.supplier$,
+              _this.posService.posWasInitialized().pipe(operators.skipWhile(function (wasInitialized) { return !wasInitialized; }), operators.switchMap(function () { return _this.posService.pos$; }))
           ]).pipe(operators.skipWhile(function (results) { return !results[0]; }), operators.take(1), operators.switchMap(function (results) {
               var url = _this.buildSuggestionsBatchUrl(results[0], results[1]);
               var body = _this.buildSuggestionsBatchBody(queuedContexts);
               return _this.http.post(url, body);
-          }), operators.catchError(function (error) {
+          })); }), operators.catchError(function (error) {
               _this.handleBatchSuggestionsError(error);
               return rxjs.of(null);
           })).subscribe(function (returnedRecipes) {
@@ -5091,7 +5166,7 @@
       };
       return RecipesService;
   }(i2$2.Service));
-  RecipesService.ɵfac = function RecipesService_Factory(t) { return new (t || RecipesService)(i0__namespace.ɵɵinject(i1__namespace.HttpClient), i0__namespace.ɵɵinject(RecipeProviderService), i0__namespace.ɵɵinject(RecipeStatusService), i0__namespace.ɵɵinject(RecipeTypeService), i0__namespace.ɵɵinject(SuppliersService), i0__namespace.ɵɵinject(PointOfSalesService), i0__namespace.ɵɵinject(IngredientsService), i0__namespace.ɵɵinject(RecipeStepsService), i0__namespace.ɵɵinject(SponsorService), i0__namespace.ɵɵinject(PackageService), i0__namespace.ɵɵinject(TagsService), i0__namespace.ɵɵinject(RecipeLikesService), i0__namespace.ɵɵinject(SeoService), i0__namespace.ɵɵinject(PreferencesService), i0__namespace.ɵɵinject(StoreLocatorService)); };
+  RecipesService.ɵfac = function RecipesService_Factory(t) { return new (t || RecipesService)(i0__namespace.ɵɵinject(i1__namespace.HttpClient), i0__namespace.ɵɵinject(RecipeProviderService), i0__namespace.ɵɵinject(RecipeStatusService), i0__namespace.ɵɵinject(RecipeTypeService), i0__namespace.ɵɵinject(SuppliersService), i0__namespace.ɵɵinject(PointOfSalesService), i0__namespace.ɵɵinject(IngredientsService), i0__namespace.ɵɵinject(RecipeStepsService), i0__namespace.ɵɵinject(SponsorService), i0__namespace.ɵɵinject(PackageService), i0__namespace.ɵɵinject(TagsService), i0__namespace.ɵɵinject(RecipeLikesService), i0__namespace.ɵɵinject(SeoService), i0__namespace.ɵɵinject(PreferencesService), i0__namespace.ɵɵinject(StoreLocatorService), i0__namespace.ɵɵinject(UserService)); };
   RecipesService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: RecipesService, factory: RecipesService.ɵfac, providedIn: 'root' });
   (function () {
       (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(RecipesService, [{
@@ -5099,7 +5174,7 @@
               args: [{
                       providedIn: 'root'
                   }]
-          }], function () { return [{ type: i1__namespace.HttpClient }, { type: RecipeProviderService }, { type: RecipeStatusService }, { type: RecipeTypeService }, { type: SuppliersService }, { type: PointOfSalesService }, { type: IngredientsService }, { type: RecipeStepsService }, { type: SponsorService }, { type: PackageService }, { type: TagsService }, { type: RecipeLikesService }, { type: SeoService }, { type: PreferencesService }, { type: StoreLocatorService }]; }, null);
+          }], function () { return [{ type: i1__namespace.HttpClient }, { type: RecipeProviderService }, { type: RecipeStatusService }, { type: RecipeTypeService }, { type: SuppliersService }, { type: PointOfSalesService }, { type: IngredientsService }, { type: RecipeStepsService }, { type: SponsorService }, { type: PackageService }, { type: TagsService }, { type: RecipeLikesService }, { type: SeoService }, { type: PreferencesService }, { type: StoreLocatorService }, { type: UserService }]; }, null);
   })();
 
   var BASKET_SPARSE_FIELDS = {
@@ -5127,6 +5202,7 @@
           _this.basketPreviewIsCalculating = false;
           _this.basketInitCalled = false;
           _this.confirming = new rxjs.BehaviorSubject(false);
+          _this.authlessTransferInProgress = false;
           _this.basketActionsQueue = new rxjs.BehaviorSubject([]);
           _this._entries$ = new rxjs.BehaviorSubject([]);
           _this.actionsBeingProcessed = new rxjs.BehaviorSubject([]);
@@ -5305,30 +5381,51 @@
               this.loadPreview().subscribe();
           }
       };
+      /** Marks basket as initialized and loads preview only (no loadBasket) — used before authless→logged-in transfer. */
+      BasketsService.prototype.initBasketPreviewOnly = function () {
+          if (!this.basketInitCalled) {
+              this.basketInitCalled = true;
+              this.loadPreview().subscribe();
+          }
+      };
       BasketsService.prototype.refreshCurrentBasket = function () {
           var _this = this;
-          this.currentAndPreviewFetching.next(true);
-          return this.posService.waitForPos.pipe(operators.take(1), operators.switchMap(function (pos) {
+          return this.usersService.ensureAnonymousUserIdIfMissing().pipe(operators.switchMap(function () { return _this.posService.waitForPos.pipe(operators.take(1), operators.switchMap(function (pos) {
               console.debug('[Miam] refreshing basket');
               var authlessId = localStorage.getItem('_miam/authlessId');
               var userId = localStorage.getItem('_miam/userId');
+              var willTransfer = !!(authlessId && userId);
+              if (_this.authlessTransferInProgress) {
+                  return _this._basket$;
+              }
+              _this.currentAndPreviewFetching.next(true);
               if (_this.currentSubscription) {
                   _this.currentSubscription.unsubscribe();
               }
-              var basketObservable = (authlessId && userId)
+              var basketLoad$ = willTransfer
                   ? _this.transferAuthlessBasket(pos.id, authlessId)
                   : _this.fetchCurrentBasket(pos.id);
-              if (authlessId && userId) {
-                  localStorage.removeItem('_miam/authlessId');
-              }
+              var basketObservable = basketLoad$.pipe(
+              // Affiliated requires a basket to exist server-side; run only after current basket fetch/update completes.
+              operators.tap(function () { return _this.checkIfIsAffiliated(); }));
               _this.currentSubscription = basketObservable.subscribe();
-              _this.checkIfIsAffiliated();
               return _this._basket$;
-          }));
+          })); }));
       };
       BasketsService.prototype.checkIfIsAffiliated = function () {
           var getAffiliatedUrl = environment$1.miamAPI + "/api/v1/baskets/affiliated";
-          this.http.get(getAffiliatedUrl).pipe(operators.take(1)).subscribe(function (response) {
+          this.http
+              .get(getAffiliatedUrl)
+              .pipe(operators.retryWhen(function (errors) { return errors.pipe(operators.mergeMap(function (err, attempt) {
+              var body = err === null || err === void 0 ? void 0 : err.error;
+              var msg = typeof (body === null || body === void 0 ? void 0 : body.error) === 'string' ? body.error : '';
+              var transientBasket = /no basket found/i.test(msg);
+              if (transientBasket && attempt < 4) {
+                  return rxjs.timer(350 + attempt * 150);
+              }
+              return rxjs.throwError(err);
+          })); }), operators.take(1))
+              .subscribe(function (response) {
               var affiliated = response === null || response === void 0 ? void 0 : response.affiliated;
               if (affiliated) {
                   localStorage.setItem('_miam/affiliated', affiliated);
@@ -5338,18 +5435,25 @@
                   localStorage.removeItem('_miam/affiliated');
                   mealzSharedAnalytics.setAffiliate(null);
               }
+          }, function () {
+              /* keep previous affiliate state on failure */
           });
       };
       BasketsService.prototype.transferAuthlessBasket = function (posId, authlessId) {
           var _this = this;
           var transferAuthlessBasketUrl = environment$1.miamAPI + "/api/v1/baskets/transfer_authless?point_of_sale_id=" + posId + "&authless_user_id=" + authlessId;
-          return this.http.patch(transferAuthlessBasketUrl, {}).pipe(operators.switchMap(function (response) {
+          this.authlessTransferInProgress = true;
+          return this.http.patch(transferAuthlessBasketUrl, {}).pipe(operators.tap(function () {
+              localStorage.removeItem('_miam/authlessId');
+          }), operators.switchMap(function (response) {
               var confirmedBasket = _this.new();
               confirmedBasket.fill(response);
               return _this.updateLocalBasket(confirmedBasket);
           }), operators.catchError(function () {
               // If authless transfer returned an error, there might be something wrong with the basketId in localStorage, thus we fetchCurrent
               return _this.fetchCurrentBasket(posId);
+          }), operators.finalize(function () {
+              _this.authlessTransferInProgress = false;
           }));
       };
       BasketsService.prototype.fetchCurrentBasket = function (posId) {
@@ -6928,12 +7032,17 @@
           if (tokenOrId) {
               this.userService.toggleIsLogged(true);
           }
+          var pendingAuthlessTransfer = !!localStorage.getItem('_miam/authlessId');
           // if initBasket is set to false, the basket & list will not be initialised until the first time they are needed
-          if (initBasket) {
+          if (initBasket && !pendingAuthlessTransfer) {
               this.basketsService.initBasket();
           }
+          else if (initBasket && pendingAuthlessTransfer) {
+              // reloadBasket below runs transfer_authless — skip loadBasket to avoid a concurrent refreshCurrentBasket
+              this.basketsService.initBasketPreviewOnly();
+          }
           return this.userService.generatingAuthlessId$.pipe(operators.skipWhile(function (generating) { return generating; }), operators.take(1), operators.switchMap(function () {
-              if (!!localStorage.getItem('_miam/authlessId')) {
+              if (pendingAuthlessTransfer) {
                   return _this.basketsService.reloadBasket();
               }
               return rxjs.of(null);
@@ -6946,13 +7055,11 @@
           document.head.appendChild(storeLocatorScript);
       };
       ContextService.prototype.generateAuthlessIdIfNecessary = function () {
-          var _this = this;
-          return this.userService.generatingAuthlessId$.pipe(operators.debounceTime(800), operators.take(1), operators.switchMap(function (isGenerating) {
-              if (isGenerating || _this.loggedOnSession || !!localStorage.getItem('_miam/authlessId')) {
-                  return rxjs.of(null);
-              }
-              return _this.userService.generateAnonymousUserId();
-          }));
+          if (this.loggedOnSession || !!localStorage.getItem('_miam/authlessId')) {
+              return rxjs.of(void 0);
+          }
+          // Emit the authless id string so callers like user.reset can branch on a truthy value after creation.
+          return this.userService.generateAnonymousUserId();
       };
       return ContextService;
   }());
@@ -8717,7 +8824,7 @@
       MiamInterceptor.prototype.setMiamHeaders = function (request) {
           var headersToAdd = {
               'miam-origin': this.context.origin.value,
-              'miam-front-version': '8.8.10',
+              'miam-front-version': '8.8.17',
               'miam-front-type': 'web',
               'miam-api-version': '4.7.0'
           };
@@ -26712,6 +26819,11 @@
   exports.WEB_COMPONENTS_NAMES = WEB_COMPONENTS_NAMES;
   exports.WarningStoreLocatorComponent = WarningStoreLocatorComponent;
   exports.WebComponentsModule = WebComponentsModule;
+  exports._onEmit = _onEmit;
+  exports.mapLegacyEventName = mapLegacyEventName;
+  exports.normalizeLegacyProps = normalizeLegacyProps;
+  exports.shouldSkipLegacyEvent = shouldSkipLegacyEvent;
+  exports.url = url;
 
   Object.defineProperty(exports, '__esModule', { value: true });