@atlaskit/react-ufo 3.3.3 → 3.4.1

package/dist/esm/create-payload/index.js

@@ -25,6 +25,7 @@ import { getPageVisibilityState } from '../hidden-timing';
 import * as initialPageLoadExtraTiming from '../initial-page-load-extra-timing';
 import { interactionSpans as atlaskitInteractionSpans } from '../interaction-metrics';
 import * as resourceTiming from '../resource-timing';
+import { filterResourceTimings } from '../resource-timing/common/utils/resource-timing-buffer';
 import { roundEpsilon } from '../round-number';
 import * as ssr from '../ssr';
 import { buildSegmentTree, labelStackStartWith, optimizeLabelStack, sanitizeUfoName, stringifyLabelStackFully } from './common/utils';
@@ -246,18 +247,19 @@ function getSSRProperties(type) {
     'ssr:featureFlags': getSSRFeatureFlags(type)
   };
 }
-var getAssetsMetrics = function getAssetsMetrics(interaction, resourceTimings) {
+var getAssetsMetrics = function getAssetsMetrics(interaction, SSRDoneTime) {
   try {
     var config = getConfig();
     var type = interaction.type;
     var allowedTypes = ['page_load', 'transition'];
-    var assetsClassification = config === null || config === void 0 ? void 0 : config.assetsClassification;
-    if (!allowedTypes.includes(type) || !assetsClassification) {
+    var assetsConfig = config === null || config === void 0 ? void 0 : config.assetsConfig;
+    if (!allowedTypes.includes(type) || !assetsConfig) {
       // Skip if: type not allowed or assetsClassification isn't configured
       return {};
     }
     var reporter = new CHRReporter();
-    var assets = reporter.get(resourceTimings, assetsClassification);
+    var resourceTimings = filterResourceTimings(interaction.start, interaction.end);
+    var assets = reporter.get(resourceTimings, assetsConfig, SSRDoneTime);
     if (assets) {
       // Only add assets in case it exists
       return {
@@ -636,7 +638,7 @@ function createInteractionMetricsPayload(_x, _x2, _x3) {
 function _createInteractionMetricsPayload() {
   _createInteractionMetricsPayload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(interaction, interactionId, experimental) {
     var _window$location, _config$additionalPay;
-    var interactionPayloadStart, config, end, start, ufoName, knownSegments, rate, type, abortReason, routeName, featureFlags, previousInteractionName, isPreviousInteractionAborted, abortedByInteractionName, pageVisibilityAtTTI, pageVisibilityAtTTAI, segments, segmentTree, isDetailedPayload, isPageLoad, calculatePageVisibilityFromTheStartOfPageLoad, moreAccuratePageVisibilityAtTTI, moreAccuratePageVisibilityAtTTAI, labelStack, getPageLoadInteractionMetrics, getDetailedInteractionMetrics, getPageLoadDetailedInteractionMetrics, newUFOName, resourceTimings, _yield$Promise$all, _yield$Promise$all2, vcMetrics, experimentalMetrics, payload;
+    var interactionPayloadStart, config, end, start, ufoName, knownSegments, rate, type, abortReason, routeName, featureFlags, previousInteractionName, isPreviousInteractionAborted, abortedByInteractionName, pageVisibilityAtTTI, pageVisibilityAtTTAI, segments, segmentTree, isDetailedPayload, isPageLoad, calculatePageVisibilityFromTheStartOfPageLoad, moreAccuratePageVisibilityAtTTI, moreAccuratePageVisibilityAtTTAI, labelStack, getInitialPageLoadSSRMetrics, pageLoadInteractionMetrics, getDetailedInteractionMetrics, getPageLoadDetailedInteractionMetrics, newUFOName, resourceTimings, _yield$Promise$all, _yield$Promise$all2, vcMetrics, experimentalMetrics, payload;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -663,7 +665,7 @@ function _createInteractionMetricsPayload() {
           labelStack = interaction.labelStack ? {
             labelStack: optimizeLabelStack(interaction.labelStack, getReactUFOVersion(interaction.type))
           } : {}; // Page Load
-          getPageLoadInteractionMetrics = function getPageLoadInteractionMetrics() {
+          getInitialPageLoadSSRMetrics = function getInitialPageLoadSSRMetrics() {
             var _config$ssr;
             if (!isPageLoad) {
               return {};
@@ -677,7 +679,8 @@ function _createInteractionMetricsPayload() {
               isBM3ConfigSSRDoneAsFmp: interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp,
               isUFOConfigSSRDoneAsFmp: interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp || !!(config !== null && config !== void 0 && (_config$ssr = config.ssr) !== null && _config$ssr !== void 0 && _config$ssr.getSSRDoneTime)
             });
-          }; // Detailed payload. Page visibility = visible
+          };
+          pageLoadInteractionMetrics = getInitialPageLoadSSRMetrics(); // Detailed payload. Page visibility = visible
           getDetailedInteractionMetrics = function getDetailedInteractionMetrics(resourceTimings) {
             if (experimental || window.__UFO_COMPACT_PAYLOAD__ || !isDetailedPayload) {
               return {};
@@ -720,9 +723,9 @@ function _createInteractionMetricsPayload() {
           }
           newUFOName = sanitizeUfoName(ufoName);
           resourceTimings = getResourceTimings(start, end);
-          _context.next = 23;
+          _context.next = 24;
           return Promise.all([getVCMetrics(interaction), experimental ? getExperimentalVCMetrics(interaction) : Promise.resolve(undefined)]);
-        case 23:
+        case 24:
           _yield$Promise$all = _context.sent;
           _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
           vcMetrics = _yield$Promise$all2[0];
@@ -747,7 +750,7 @@ function _createInteractionMetricsPayload() {
                 'event:region': config.region || 'unknown',
                 'experience:key': experimental ? 'custom.experimental-interaction-metrics' : 'custom.interaction-metrics',
                 'experience:name': newUFOName
-              }, getBrowserMetadata()), getSSRProperties(type)), getAssetsMetrics(interaction, resourceTimings)), getPPSMetrics(interaction)), getPaintMetrics(type)), getNavigationMetrics(type)), vcMetrics), experimentalMetrics), (_config$additionalPay = config.additionalPayloadData) === null || _config$additionalPay === void 0 ? void 0 : _config$additionalPay.call(config, interaction)), getTracingContextData(interaction)), getStylesheetMetrics()), getErrorCounts(interaction)), {}, {
+              }, getBrowserMetadata()), getSSRProperties(type)), getAssetsMetrics(interaction, pageLoadInteractionMetrics === null || pageLoadInteractionMetrics === void 0 ? void 0 : pageLoadInteractionMetrics.SSRDoneTime)), getPPSMetrics(interaction)), getPaintMetrics(type)), getNavigationMetrics(type)), vcMetrics), experimentalMetrics), (_config$additionalPay = config.additionalPayloadData) === null || _config$additionalPay === void 0 ? void 0 : _config$additionalPay.call(config, interaction)), getTracingContextData(interaction)), getStylesheetMetrics()), getErrorCounts(interaction)), {}, {
                 interactionMetrics: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                   namePrefix: config.namePrefix || '',
                   segmentPrefix: config.segmentPrefix || '',
@@ -779,7 +782,7 @@ function _createInteractionMetricsPayload() {
                   marks: optimizeMarks(interaction.marks, getReactUFOVersion(interaction.type)),
                   customData: optimizeCustomData(interaction),
                   reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start, getReactUFOVersion(interaction.type))
-                }, labelStack), getPageLoadInteractionMetrics()), getDetailedInteractionMetrics(resourceTimings)), getPageLoadDetailedInteractionMetrics()), getBm3TrackerTimings(interaction)), {}, {
+                }, labelStack), pageLoadInteractionMetrics), getDetailedInteractionMetrics(resourceTimings)), getPageLoadDetailedInteractionMetrics()), getBm3TrackerTimings(interaction)), {}, {
                   'metric:ttai': experimental ? regularTTAI || expTTAI : undefined,
                   'metric:experimental:ttai': expTTAI
                 }),
@@ -793,7 +796,7 @@ function _createInteractionMetricsPayload() {
           }
           payload.attributes.properties['event:sizeInKb'] = getPayloadSize(payload.attributes.properties);
           return _context.abrupt("return", payload);
-        case 31:
+        case 32:
         case "end":
           return _context.stop();
       }

package/dist/esm/vc/vc-observer-new/get-element-name.js

@@ -55,8 +55,7 @@ function getUniqueSelector(selectorConfig, element) {
   } else if (!isSelectorUnique(potentialSelector)) {
     var parentElement = element.parentElement;
     if (parentElement) {
-      var siblingIndex = Array.from(parentElement.children).indexOf(element) + 1;
-      return "".concat(potentialSelector, ":nth-child(").concat(siblingIndex, ")");
+      return "".concat(potentialSelector, ":nth-child"); // NOTE: invalid DOM selector, but enough information for VC
     }
   }
   return potentialSelector;

package/dist/types/assets/index.d.ts

@@ -1,5 +1,5 @@
-import type { AssetsClassification, AssetsData, AssetsReporter } from '../common';
-import type { ResourceTiming, ResourceTimings } from '../resource-timing';
+import type { AssetsConfig, AssetsData, AssetsReporter } from '../common';
+import type { ResourceEntry } from '../resource-timing/common/types';
 export declare class CHRSummary {
     bundles: {
         mem: number;
@@ -13,13 +13,13 @@ export declare class CHRSummary {
         net: number;
     };
     sizeTotal: number;
-    add(asset: ResourceTiming): void;
+    add(asset: ResourceEntry): void;
     static makePayload(summary: CHRSummary): AssetsReporter;
 }
 export declare class CHRReporter {
     all: CHRSummary;
     allAtlassian: CHRSummary;
     preloaded: CHRSummary;
-    constructor();
-    get(resourceTimings: ResourceTimings, assetsClassification: AssetsClassification): AssetsData | null;
+    defaultAllowedTypes: string[];
+    get(resourceTimings: ResourceEntry[] | null, assetsConfig: AssetsConfig, SSRDoneTime: number | undefined): AssetsData | null;
 }

package/dist/types/assets/utils.d.ts

@@ -1,6 +1,9 @@
+import type { ResourceEntry } from '../resource-timing/common/types';
 export declare const cacheableTypes: string[];
 export declare const MEMORY_KEY = "mem";
 export declare const DISK_KEY = "disk";
 export declare const NETWORK_KEY = "net";
-export declare const calculateTransferType: (type: string, duration: number, size: number | undefined) => "disk" | "mem" | "net" | null;
+export declare const calculateTransferType: (name: string, type: string, duration: number, size: number | undefined) => "disk" | "mem" | "net" | null;
+export declare const getTypeOfRequest: ({ name, initiatorType: type }: ResourceEntry) => string;
+export declare const checkIfTimingsAvailable: (entry: ResourceEntry) => boolean;
 export declare const round: (n: number) => number;

package/dist/types/common/assets/types.d.ts

@@ -1,12 +1,18 @@
-import type { ResourceTiming } from '../../resource-timing';
-export type AssetResourceEntry = {
-    label: string;
-    entry: ResourceTiming;
+import type { ResourceEntry } from '../../resource-timing/common/types';
+export type AssetsConfigAllAtlassianArgs = {
+    entry: ResourceEntry;
 };
-export type AssetsClassification = {
-    all: boolean;
-    allAtlassian: (entry: AssetResourceEntry) => boolean;
-    preloaded: (entry: AssetResourceEntry) => boolean;
+export type AssetsConfigPreloadedArgs = {
+    entry: ResourceEntry;
+    SSRDoneTime?: number;
+};
+export type AssetsConfig = {
+    allowedTypes: string[];
+    classification: {
+        all: boolean;
+        allAtlassian: (args: AssetsConfigAllAtlassianArgs) => boolean;
+        preloaded: (args: AssetsConfigPreloadedArgs) => boolean;
+    };
 };
 export type AssetsReporter = {
     size: number | null;

package/dist/types/common/index.d.ts

@@ -1,4 +1,14 @@
-export type { AssetResourceEntry, AssetsClassification, AssetsData, AssetsReporter, } from './assets/types';
+/**
+ * @private
+ * @deprecated API - clean up with next reactUFO major version
+ */
+export type AssetResourceEntry = any;
+/**
+ * @private
+ * @deprecated API - clean up with next reactUFO major version
+ */
+export type AssetsClassification = any;
+export type { AssetsConfig, AssetsData, AssetsReporter, AssetsConfigAllAtlassianArgs, AssetsConfigPreloadedArgs, } from './assets/types';
 export type { LifecycleMarkType, MarkType, SpanType, InteractionType, AbortReasonType, CustomTiming, HoldInfo, LoadProfilerEventInfo, ReactProfilerTiming, Span, Mark, InteractionError, RequestInfo, ApdexType, SegmentInfo, CustomData, HoldActive, Redirect, InteractionMetrics, EnhancedUFOInteractionContextType, BM3Event, PostInteractionLogOutput, LastInteractionFinishInfo, } from './common/types';
 export type { MultiHeatmapPayload } from './vc/types';
 /**

package/dist/types/config/index.d.ts

@@ -57,7 +57,12 @@ export type Config = {
         readonly getSSRTimings?: () => SSRTiming[];
         readonly getSSRDoneTime?: () => number | undefined;
     };
+    /**
+     * @private
+     * @deprecated remove me with next major release
+     */
     readonly assetsClassification?: AssetsClassification;
+    readonly assetsConfig?: AssetsClassification;
     readonly enableBetterPageVisibilityApi?: boolean;
     readonly vc?: {
         readonly enabled?: boolean;