ng-miam 8.8.16 → 8.8.18

package/bundles/ng-miam.umd.js

@@ -3882,9 +3882,71 @@
       return RecipeLike;
   }(i2$2.Resource));
 
+  var VERSION = '8.8.18';
+
+  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';
@@ -3913,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) {
@@ -4050,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
               });
           });
       };
@@ -4058,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,
@@ -5154,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([]);
@@ -5332,22 +5381,30 @@
               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.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 basketLoad$ = (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(); }));
@@ -5385,13 +5442,22 @@
       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
+          }), operators.catchError(function (err) {
+              // Keep the id on abort/cancel (status 0) so a raced refresh cannot drop a real pending transfer.
+              // Clear it on a completed API error so a leftover empty authless id cannot block later confirms.
+              if (err.status >= 400) {
+                  localStorage.removeItem('_miam/authlessId');
+              }
               return _this.fetchCurrentBasket(posId);
+          }), operators.finalize(function () {
+              _this.authlessTransferInProgress = false;
           }));
       };
       BasketsService.prototype.fetchCurrentBasket = function (posId) {
@@ -5444,13 +5510,16 @@
           }), operators.take(1));
       };
       BasketsService.prototype.eventProps = function (basket, totalPrice) {
+          var _a, _b, _c, _d;
           return {
               // if you have a basket you have a pos...
               pos_id: this.posService.pos$.getValue().id,
               pos_name: this.posService.pos$.getValue().attributes.name,
               basket_id: basket.id,
               miam_amount: basket.totalPrice,
-              total_amount: totalPrice
+              total_amount: totalPrice,
+              recipe_count: (_b = (_a = basket.recipeInfos) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0,
+              miam_products: (_d = (_c = basket.completion) === null || _c === void 0 ? void 0 : _c.total) !== null && _d !== void 0 ? _d : 0
           };
       };
       /** ******************************************************* ACTIONS ON ENTRIES ******************************************************* **/
@@ -5547,8 +5616,8 @@
           var _this = this;
           if (include === void 0) { include = []; }
           if (isSchoolList === void 0) { isSchoolList = false; }
-          return this.waitForBasket.pipe(operators.switchMap(function (basket) { return _this.posService.waitForPos.pipe(operators.take(1), operators.map(function (pos) { return [basket, pos]; })); }), operators.switchMap(function (_b) {
-              var _c = __read(_b, 2), basket = _c[0], pos = _c[1];
+          return this.waitForBasket.pipe(operators.switchMap(function (basket) { return _this.posService.waitForPos.pipe(operators.take(1), operators.map(function (pos) { return [basket, pos]; })); }), operators.switchMap(function (_e) {
+              var _f = __read(_e, 2), basket = _f[0], pos = _f[1];
               var url;
               if (isSchoolList) {
                   url = environment$1.miamAPI + "/api/v1/baskets/school-list?fields[baskets]=" + BASKET_SPARSE_FIELDS.baskets.join(',') +
@@ -6952,16 +7021,8 @@
               this.posService.waitForPos.pipe(operators.take(1))
           ]).subscribe(function (res) {
               var basket = res[0];
-              var pos = res[1];
               if (basket.totalPrice > 0) {
-                  var props = {
-                      pos_id: pos.id,
-                      pos_name: pos.attributes.name,
-                      basket_id: basket.id,
-                      miam_amount: basket.totalPrice,
-                      total_amount: totalPrice
-                  };
-                  _this.analyticsService.sendEventWhenReady(eventType, null, props);
+                  _this.analyticsService.sendEventWhenReady(eventType, null, _this.basketsService.eventProps(basket, totalPrice));
               }
           });
       };
@@ -6970,12 +7031,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);
@@ -8757,7 +8823,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.18',
               'miam-front-type': 'web',
               'miam-api-version': '4.7.0'
           };
@@ -26752,6 +26818,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 });