@firebase/analytics 0.7.10-canary.efe2000fc → 0.7.11-canary.280c25605

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @firebase/analytics
 
+## 0.7.11
+
+### Patch Changes
+
+- [`835f1d46a`](https://github.com/firebase/firebase-js-sdk/commit/835f1d46a6780535bc660ef7dc23293350d5fe43) [#6357](https://github.com/firebase/firebase-js-sdk/pull/6357) - Fix typo in GtagConfigParams
+
+- Updated dependencies [[`efe2000fc`](https://github.com/firebase/firebase-js-sdk/commit/efe2000fc499e2c85c4e5e0fef6741ff3bad2eb0)]:
+  - @firebase/util@1.6.2
+  - @firebase/component@0.5.16
+  - @firebase/installations@0.5.11
+
 ## 0.7.10
 
 ### Patch Changes

package/dist/analytics-public.d.ts

@@ -650,6 +650,15 @@ export declare function setAnalyticsCollectionEnabled(analyticsInstance: Analyti
  */
 export declare function setCurrentScreen(analyticsInstance: Analytics, screenName: string, options?: AnalyticsCallOptions): void;
 
+/**
+ * Adds data that will be set on every event logged from the SDK, including automatic ones.
+ * With gtag's "set" command, the values passed persist on the current page and are passed with
+ * all subsequent events.
+ * @public
+ * @param customParams Any custom params the user may pass to gtag.js.
+ */
+export declare function setDefaultEventParameters(customParams: CustomParams): void;
+
 /**
  * Configures Firebase Analytics to use custom `gtag` or `dataLayer` names.
  * Intended to be used if `gtag.js` script has been installed on

package/dist/analytics.d.ts

@@ -650,6 +650,15 @@ export declare function setAnalyticsCollectionEnabled(analyticsInstance: Analyti
  */
 export declare function setCurrentScreen(analyticsInstance: Analytics, screenName: string, options?: AnalyticsCallOptions): void;
 
+/**
+ * Adds data that will be set on every event logged from the SDK, including automatic ones.
+ * With gtag's "set" command, the values passed persist on the current page and are passed with
+ * all subsequent events.
+ * @public
+ * @param customParams Any custom params the user may pass to gtag.js.
+ */
+export declare function setDefaultEventParameters(customParams: CustomParams): void;
+
 /**
  * Configures Firebase Analytics to use custom `gtag` or `dataLayer` names.
  * Intended to be used if `gtag.js` script has been installed on

package/dist/esm/index.esm.js

@@ -536,53 +536,55 @@ retryData, timeoutMillis) {
  */
 function attemptFetchDynamicConfigWithRetry(appFields, _a, signal, retryData // for testing
 ) {
+    var _b, _c;
     var throttleEndTimeMillis = _a.throttleEndTimeMillis, backoffCount = _a.backoffCount;
     if (retryData === void 0) { retryData = defaultRetryData; }
     return __awaiter(this, void 0, void 0, function () {
-        var appId, measurementId, e_1, response, e_2, backoffMillis, throttleMetadata;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var appId, measurementId, e_1, response, e_2, error, backoffMillis, throttleMetadata;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     appId = appFields.appId, measurementId = appFields.measurementId;
-                    _b.label = 1;
+                    _d.label = 1;
                 case 1:
-                    _b.trys.push([1, 3, , 4]);
+                    _d.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, setAbortableTimeout(signal, throttleEndTimeMillis)];
                 case 2:
-                    _b.sent();
+                    _d.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    e_1 = _b.sent();
+                    e_1 = _d.sent();
                     if (measurementId) {
                         logger.warn("Timed out fetching this Firebase app's measurement ID from the server." +
                             (" Falling back to the measurement ID " + measurementId) +
-                            (" provided in the \"measurementId\" field in the local Firebase config. [" + e_1.message + "]"));
+                            (" provided in the \"measurementId\" field in the local Firebase config. [" + ((_b = e_1) === null || _b === void 0 ? void 0 : _b.message) + "]"));
                         return [2 /*return*/, { appId: appId, measurementId: measurementId }];
                     }
                     throw e_1;
                 case 4:
-                    _b.trys.push([4, 6, , 7]);
+                    _d.trys.push([4, 6, , 7]);
                     return [4 /*yield*/, fetchDynamicConfig(appFields)];
                 case 5:
-                    response = _b.sent();
+                    response = _d.sent();
                     // Note the SDK only clears throttle state if response is success or non-retriable.
                     retryData.deleteThrottleMetadata(appId);
                     return [2 /*return*/, response];
                 case 6:
-                    e_2 = _b.sent();
-                    if (!isRetriableError(e_2)) {
+                    e_2 = _d.sent();
+                    error = e_2;
+                    if (!isRetriableError(error)) {
                         retryData.deleteThrottleMetadata(appId);
                         if (measurementId) {
                             logger.warn("Failed to fetch this Firebase app's measurement ID from the server." +
                                 (" Falling back to the measurement ID " + measurementId) +
-                                (" provided in the \"measurementId\" field in the local Firebase config. [" + e_2.message + "]"));
+                                (" provided in the \"measurementId\" field in the local Firebase config. [" + (error === null || error === void 0 ? void 0 : error.message) + "]"));
                             return [2 /*return*/, { appId: appId, measurementId: measurementId }];
                         }
                         else {
                             throw e_2;
                         }
                     }
-                    backoffMillis = Number(e_2.customData.httpStatus) === 503
+                    backoffMillis = Number((_c = error === null || error === void 0 ? void 0 : error.customData) === null || _c === void 0 ? void 0 : _c.httpStatus) === 503
                         ? calculateBackoffMillis(backoffCount, retryData.intervalMillis, LONG_RETRY_FACTOR)
                         : calculateBackoffMillis(backoffCount, retryData.intervalMillis);
                     throttleMetadata = {
@@ -660,6 +662,175 @@ var AnalyticsAbortSignal = /** @class */ (function () {
     return AnalyticsAbortSignal;
 }());
 
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Event parameters to set on 'gtag' during initialization.
+ */
+var defaultEventParametersForInit;
+/**
+ * Logs an analytics event through the Firebase SDK.
+ *
+ * @param gtagFunction Wrapped gtag function that waits for fid to be set before sending an event
+ * @param eventName Google Analytics event name, choose from standard list or use a custom string.
+ * @param eventParams Analytics event parameters.
+ */
+function logEvent$1(gtagFunction, initializationPromise, eventName, eventParams, options) {
+    return __awaiter(this, void 0, void 0, function () {
+        var measurementId, params;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!(options && options.global)) return [3 /*break*/, 1];
+                    gtagFunction("event" /* EVENT */, eventName, eventParams);
+                    return [2 /*return*/];
+                case 1: return [4 /*yield*/, initializationPromise];
+                case 2:
+                    measurementId = _a.sent();
+                    params = __assign(__assign({}, eventParams), { 'send_to': measurementId });
+                    gtagFunction("event" /* EVENT */, eventName, params);
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+/**
+ * Set screen_name parameter for this Google Analytics ID.
+ *
+ * @deprecated Use {@link logEvent} with `eventName` as 'screen_view' and add relevant `eventParams`.
+ * See {@link https://firebase.google.com/docs/analytics/screenviews | Track Screenviews}.
+ *
+ * @param gtagFunction Wrapped gtag function that waits for fid to be set before sending an event
+ * @param screenName Screen name string to set.
+ */
+function setCurrentScreen$1(gtagFunction, initializationPromise, screenName, options) {
+    return __awaiter(this, void 0, void 0, function () {
+        var measurementId;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!(options && options.global)) return [3 /*break*/, 1];
+                    gtagFunction("set" /* SET */, { 'screen_name': screenName });
+                    return [2 /*return*/, Promise.resolve()];
+                case 1: return [4 /*yield*/, initializationPromise];
+                case 2:
+                    measurementId = _a.sent();
+                    gtagFunction("config" /* CONFIG */, measurementId, {
+                        update: true,
+                        'screen_name': screenName
+                    });
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+/**
+ * Set user_id parameter for this Google Analytics ID.
+ *
+ * @param gtagFunction Wrapped gtag function that waits for fid to be set before sending an event
+ * @param id User ID string to set
+ */
+function setUserId$1(gtagFunction, initializationPromise, id, options) {
+    return __awaiter(this, void 0, void 0, function () {
+        var measurementId;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!(options && options.global)) return [3 /*break*/, 1];
+                    gtagFunction("set" /* SET */, { 'user_id': id });
+                    return [2 /*return*/, Promise.resolve()];
+                case 1: return [4 /*yield*/, initializationPromise];
+                case 2:
+                    measurementId = _a.sent();
+                    gtagFunction("config" /* CONFIG */, measurementId, {
+                        update: true,
+                        'user_id': id
+                    });
+                    _a.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+/**
+ * Set all other user properties other than user_id and screen_name.
+ *
+ * @param gtagFunction Wrapped gtag function that waits for fid to be set before sending an event
+ * @param properties Map of user properties to set
+ */
+function setUserProperties$1(gtagFunction, initializationPromise, properties, options) {
+    return __awaiter(this, void 0, void 0, function () {
+        var flatProperties, _i, _a, key, measurementId;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    if (!(options && options.global)) return [3 /*break*/, 1];
+                    flatProperties = {};
+                    for (_i = 0, _a = Object.keys(properties); _i < _a.length; _i++) {
+                        key = _a[_i];
+                        // use dot notation for merge behavior in gtag.js
+                        flatProperties["user_properties." + key] = properties[key];
+                    }
+                    gtagFunction("set" /* SET */, flatProperties);
+                    return [2 /*return*/, Promise.resolve()];
+                case 1: return [4 /*yield*/, initializationPromise];
+                case 2:
+                    measurementId = _b.sent();
+                    gtagFunction("config" /* CONFIG */, measurementId, {
+                        update: true,
+                        'user_properties': properties
+                    });
+                    _b.label = 3;
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}
+/**
+ * Set whether collection is enabled for this ID.
+ *
+ * @param enabled If true, collection is enabled for this ID.
+ */
+function setAnalyticsCollectionEnabled$1(initializationPromise, enabled) {
+    return __awaiter(this, void 0, void 0, function () {
+        var measurementId;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, initializationPromise];
+                case 1:
+                    measurementId = _a.sent();
+                    window["ga-disable-" + measurementId] = !enabled;
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+/**
+ * Sets the variable `defaultEventParametersForInit` for use in the initialization of
+ * analytics.
+ *
+ * @param customParams Any custom params the user may pass to gtag.js.
+ */
+function _setDefaultEventParametersForInit(customParams) {
+    defaultEventParametersForInit = customParams;
+}
+
 /**
  * @license
  * Copyright 2020 Google LLC
@@ -777,6 +948,11 @@ function _initializeAnalytics(app, dynamicConfigPromisesList, measurementIdToApp
                     // Note: This will trigger a page_view event unless 'send_page_view' is set to false in
                     // `configProperties`.
                     gtagCore("config" /* CONFIG */, dynamicConfig.measurementId, configProperties);
+                    // Detects if there is data that will be set on every event logged from the SDK.
+                    if (defaultEventParametersForInit) {
+                        gtagCore("set" /* SET */, defaultEventParametersForInit);
+                        _setDefaultEventParametersForInit(undefined);
+                    }
                     return [2 /*return*/, dynamicConfig.measurementId];
             }
         });
@@ -941,162 +1117,6 @@ function factory(app, installations, options) {
     return analyticsInstance;
 }
 
-/**
- * @license
- * Copyright 2019 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Logs an analytics event through the Firebase SDK.
- *
- * @param gtagFunction Wrapped gtag function that waits for fid to be set before sending an event
- * @param eventName Google Analytics event name, choose from standard list or use a custom string.
- * @param eventParams Analytics event parameters.
- */
-function logEvent$1(gtagFunction, initializationPromise, eventName, eventParams, options) {
-    return __awaiter(this, void 0, void 0, function () {
-        var measurementId, params;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!(options && options.global)) return [3 /*break*/, 1];
-                    gtagFunction("event" /* EVENT */, eventName, eventParams);
-                    return [2 /*return*/];
-                case 1: return [4 /*yield*/, initializationPromise];
-                case 2:
-                    measurementId = _a.sent();
-                    params = __assign(__assign({}, eventParams), { 'send_to': measurementId });
-                    gtagFunction("event" /* EVENT */, eventName, params);
-                    _a.label = 3;
-                case 3: return [2 /*return*/];
-            }
-        });
-    });
-}
-/**
- * Set screen_name parameter for this Google Analytics ID.
- *
- * @deprecated Use {@link logEvent} with `eventName` as 'screen_view' and add relevant `eventParams`.
- * See {@link https://firebase.google.com/docs/analytics/screenviews | Track Screenviews}.
- *
- * @param gtagFunction Wrapped gtag function that waits for fid to be set before sending an event
- * @param screenName Screen name string to set.
- */
-function setCurrentScreen$1(gtagFunction, initializationPromise, screenName, options) {
-    return __awaiter(this, void 0, void 0, function () {
-        var measurementId;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!(options && options.global)) return [3 /*break*/, 1];
-                    gtagFunction("set" /* SET */, { 'screen_name': screenName });
-                    return [2 /*return*/, Promise.resolve()];
-                case 1: return [4 /*yield*/, initializationPromise];
-                case 2:
-                    measurementId = _a.sent();
-                    gtagFunction("config" /* CONFIG */, measurementId, {
-                        update: true,
-                        'screen_name': screenName
-                    });
-                    _a.label = 3;
-                case 3: return [2 /*return*/];
-            }
-        });
-    });
-}
-/**
- * Set user_id parameter for this Google Analytics ID.
- *
- * @param gtagFunction Wrapped gtag function that waits for fid to be set before sending an event
- * @param id User ID string to set
- */
-function setUserId$1(gtagFunction, initializationPromise, id, options) {
-    return __awaiter(this, void 0, void 0, function () {
-        var measurementId;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!(options && options.global)) return [3 /*break*/, 1];
-                    gtagFunction("set" /* SET */, { 'user_id': id });
-                    return [2 /*return*/, Promise.resolve()];
-                case 1: return [4 /*yield*/, initializationPromise];
-                case 2:
-                    measurementId = _a.sent();
-                    gtagFunction("config" /* CONFIG */, measurementId, {
-                        update: true,
-                        'user_id': id
-                    });
-                    _a.label = 3;
-                case 3: return [2 /*return*/];
-            }
-        });
-    });
-}
-/**
- * Set all other user properties other than user_id and screen_name.
- *
- * @param gtagFunction Wrapped gtag function that waits for fid to be set before sending an event
- * @param properties Map of user properties to set
- */
-function setUserProperties$1(gtagFunction, initializationPromise, properties, options) {
-    return __awaiter(this, void 0, void 0, function () {
-        var flatProperties, _i, _a, key, measurementId;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (!(options && options.global)) return [3 /*break*/, 1];
-                    flatProperties = {};
-                    for (_i = 0, _a = Object.keys(properties); _i < _a.length; _i++) {
-                        key = _a[_i];
-                        // use dot notation for merge behavior in gtag.js
-                        flatProperties["user_properties." + key] = properties[key];
-                    }
-                    gtagFunction("set" /* SET */, flatProperties);
-                    return [2 /*return*/, Promise.resolve()];
-                case 1: return [4 /*yield*/, initializationPromise];
-                case 2:
-                    measurementId = _b.sent();
-                    gtagFunction("config" /* CONFIG */, measurementId, {
-                        update: true,
-                        'user_properties': properties
-                    });
-                    _b.label = 3;
-                case 3: return [2 /*return*/];
-            }
-        });
-    });
-}
-/**
- * Set whether collection is enabled for this ID.
- *
- * @param enabled If true, collection is enabled for this ID.
- */
-function setAnalyticsCollectionEnabled$1(initializationPromise, enabled) {
-    return __awaiter(this, void 0, void 0, function () {
-        var measurementId;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, initializationPromise];
-                case 1:
-                    measurementId = _a.sent();
-                    window["ga-disable-" + measurementId] = !enabled;
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * Returns an {@link Analytics} instance for the given app.
@@ -1228,6 +1248,22 @@ function setAnalyticsCollectionEnabled(analyticsInstance, enabled) {
     analyticsInstance = getModularInstance(analyticsInstance);
     setAnalyticsCollectionEnabled$1(initializationPromisesMap[analyticsInstance.app.options.appId], enabled).catch(function (e) { return logger.error(e); });
 }
+/**
+ * Adds data that will be set on every event logged from the SDK, including automatic ones.
+ * With gtag's "set" command, the values passed persist on the current page and are passed with
+ * all subsequent events.
+ * @public
+ * @param customParams Any custom params the user may pass to gtag.js.
+ */
+function setDefaultEventParameters(customParams) {
+    // Check if reference to existing gtag function on window object exists
+    if (wrappedGtagFunction) {
+        wrappedGtagFunction("set" /* SET */, customParams);
+    }
+    else {
+        _setDefaultEventParametersForInit(customParams);
+    }
+}
 /**
  * Sends a Google Analytics event with given `eventParams`. This method
  * automatically associates this logged event with this Firebase web
@@ -1245,7 +1281,7 @@ function logEvent(analyticsInstance, eventName, eventParams, options) {
 }
 
 var name = "@firebase/analytics";
-var version = "0.7.10-canary.efe2000fc";
+var version = "0.7.11-canary.280c25605";
 
 /**
  * Firebase Analytics
@@ -1282,5 +1318,5 @@ function registerAnalytics() {
 }
 registerAnalytics();
 
-export { getAnalytics, initializeAnalytics, isSupported, logEvent, setAnalyticsCollectionEnabled, setCurrentScreen, setUserId, setUserProperties, settings };
+export { getAnalytics, initializeAnalytics, isSupported, logEvent, setAnalyticsCollectionEnabled, setCurrentScreen, setDefaultEventParameters, setUserId, setUserProperties, settings };
 //# sourceMappingURL=index.esm.js.map