ditch generateDocumentId and generateParentDocumentId

Author: slavaleleka

packages/tswebextension/src/lib/mv2/background/tabs/tabs-api.ts

@@ -120,57 +120,10 @@ export class TabsApi extends TabsApiCommon<FrameMV2, TabContext> {
      *
      * @returns ID as a string based on tab and frame IDs.
      */
-    private static generateId(tabId: number, frameId: number): string {
+    public static generateId(tabId: number, frameId: number): string {
         return `${tabId}-${frameId}`;
     }
 
-    /**
-     * Calculates document ID.
-     *
-     * @param tabId Tab ID.
-     * @param frameId Frame ID.
-     * @param documentId Document ID, may be undefined.
-     *
-     * @returns Calculated document ID:
-     * - `documentId` if passed value is defined;
-     * - generated ID based on tab and frame IDs.
-     */
-    public static generateDocumentId(
-        tabId: number,
-        frameId: number,
-        documentId?: string,
-    ): string {
-        return typeof documentId === 'undefined'
-            ? TabsApi.generateId(tabId, frameId)
-            : documentId;
-    }
-
-    /**
-     * Calculates parent document ID.
-     *
-     * @param tabId Tab ID.
-     * @param parentFrameId Parent frame ID.
-     * @param parentDocumentId Parent document ID, may be undefined.
-     *
-     * @returns Calculated parent document ID:
-     * - `parentDocumentId` if passed value is defined;
-     * - `undefined` if parent frame is a document-level frame so no parent document;
-     * - generated ID based on tab and frame IDs.
-     */
-    public static generateParentDocumentId(
-        tabId: number,
-        parentFrameId: number,
-        parentDocumentId: string | undefined,
-    ): string | undefined {
-        if (typeof parentDocumentId !== 'undefined') {
-            return parentDocumentId;
-        }
-
-        return TabsApi.isDocumentLevelFrame(parentFrameId)
-            ? undefined
-            : TabsApi.generateId(tabId, parentFrameId);
-    }
-
     // TODO: do the same in MV3 (AG-39527)
     // since cosmetic rules should not be applied in the assistant frame (AG-9829)
     /**

packages/tswebextension/src/lib/mv2/background/tabs/tabs-cosmetic-injector.ts

@@ -92,8 +92,17 @@ export class TabsCosmeticInjector {
                 documentId,
             } = frameDetails;
 
-            const calculatedParentDocumentId = TabsApi.generateParentDocumentId(tabId, parentFrameId, parentDocumentId);
-            const calculatedDocumentId = TabsApi.generateDocumentId(tabId, frameId, documentId);
+            /**
+             * Use parentDocumentId if it is defined, otherwise:
+             * - if parent frame is a document-level frame, use undefined
+             * - else generate parentDocumentId based on tabId and parentFrameId.
+             */
+            const calculatedParentDocumentId = parentDocumentId
+                || (TabsApi.isDocumentLevelFrame(parentFrameId)
+                    ? undefined
+                    : TabsApi.generateId(tabId, parentFrameId));
+
+            const calculatedDocumentId = documentId || TabsApi.generateId(tabId, frameId);
 
             this.tabsApi.setFrameContext(tabId, frameId, new FrameMV2({
                 tabId,

packages/tswebextension/src/lib/mv2/background/web-request-api.ts

@@ -701,7 +701,15 @@ export class WebRequestApi {
             frameId,
             url,
             timeStamp,
-            parentDocumentId: TabsApi.generateParentDocumentId(tabId, parentFrameId, parentDocumentId),
+            /**
+             * Use parentDocumentId if it is defined, otherwise:
+             * - if parent frame is a document-level frame, use undefined
+             * - else generate parentDocumentId based on tabId and parentFrameId.
+             */
+            parentDocumentId: parentDocumentId
+                || (TabsApi.isDocumentLevelFrame(parentFrameId)
+                    ? undefined
+                    : TabsApi.generateId(tabId, parentFrameId)),
         });
     }
 
@@ -727,7 +735,7 @@ export class WebRequestApi {
             tabId,
             frameId,
             {
-                documentId: TabsApi.generateDocumentId(tabId, frameId, documentId),
+                documentId: documentId || TabsApi.generateId(tabId, frameId),
             },
         );
 
@@ -781,7 +789,7 @@ export class WebRequestApi {
             tabId,
             frameId,
             {
-                documentId: TabsApi.generateDocumentId(tabId, frameId, documentId),
+                documentId: documentId || TabsApi.generateId(tabId, frameId),
             },
         );