@atlaskit/editor-synced-block-provider 2.10.4 → 2.10.6

package/dist/esm/index.js

@@ -15,7 +15,7 @@ export { getConfluencePageAri, getLocalIdFromConfluencePageAri, getPageARIFromCo
 // providers
 export { useMemoizedBlockServiceAPIProviders } from './providers/block-service/blockServiceAPI';
 export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders } from './providers/confluence/confluenceContentAPI';
-export { fetchConfluenceSourceInfo } from './clients/confluence/sourceInfo';
+export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
 // store managers
 export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';

package/dist/esm/providers/block-service/blockServiceAPI.js

@@ -89,20 +89,6 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
       }
       return fetchData;
     }()
-  }, {
-    key: "retrieveSourceInfoFetchData",
-    value: function retrieveSourceInfoFetchData(resourceId, pageARI) {
-      var sourceLocalId;
-      try {
-        sourceLocalId = getLocalIdFromBlockResourceId(resourceId);
-      } catch (error) {
-        // EDITOR-1921: log analytic here, safe to continue
-      }
-      return {
-        pageARI: pageARI,
-        sourceLocalId: sourceLocalId
-      };
-    }
   }]);
 }();
 /**

package/dist/esm/providers/confluence/confluenceContentAPI.js

@@ -7,7 +7,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useMemo } from 'react';
-import { getConfluencePageAri, getPageARIFromContentPropertyResourceId, getLocalIdFromConfluencePageAri, getPageIdAndTypeFromConfluencePageAri, resourceIdFromConfluencePageSourceIdAndLocalId } from '../../clients/confluence/ari';
+import { getConfluencePageAri, getLocalIdFromConfluencePageAri, getPageIdAndTypeFromConfluencePageAri, resourceIdFromConfluencePageSourceIdAndLocalId } from '../../clients/confluence/ari';
 import { getContentProperty, createContentProperty, updateContentProperty, deleteContentProperty } from '../../clients/confluence/contentProperty';
 import { isBlogPageType } from '../../clients/confluence/utils';
 import { SyncBlockError } from '../../common/types';
@@ -140,21 +140,6 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
       }
       return fetchData;
     }()
-  }, {
-    key: "retrieveSourceInfoFetchData",
-    value: function retrieveSourceInfoFetchData(resourceId) {
-      var pageARI = getPageARIFromContentPropertyResourceId(resourceId);
-      var sourceLocalId;
-      try {
-        sourceLocalId = getLocalIdFromConfluencePageAri(resourceId);
-      } catch (error) {
-        // EDITOR-1921: log analytic here, safe to continue
-      }
-      return {
-        pageARI: pageARI,
-        sourceLocalId: sourceLocalId
-      };
-    }
   }]);
 }();
 /**

package/dist/esm/providers/syncBlockProvider.js

@@ -11,7 +11,7 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { useMemo } from 'react';
 import { getPageIdAndTypeFromConfluencePageAri } from '../clients/confluence/ari';
-import { fetchConfluenceSourceInfo } from '../clients/confluence/sourceInfo';
+import { fetchConfluencePageInfo } from '../clients/confluence/sourceInfo';
 import { SyncBlockError } from '../common/types';
 import { SyncBlockDataProvider } from '../providers/types';
 export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
@@ -202,34 +202,28 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
     }
 
     /**
-     * Retrieve the source info from the source id
+     * Fetch the source info from the source id
      *
-     * @param node
+     * @param params
+     * @param params.sourceAri - The source ARI
+     * @param params.sourceProduct - The source product. e.g. 'confluence-page', 'jira-work-item'
      *
      * @returns The source info
      */
   }, {
-    key: "retrieveSyncBlockSourceInfo",
-    value: function retrieveSyncBlockSourceInfo(node) {
-      // with content API, this is the concatenation of the page ARI and the block's localId.
-      // with block service, this is the ARI of the block.
-      // this can be cleaned up from the specific providers and placed here after platform_synced_blocks_block_service_provider
-      var resourceId = node.attrs.resourceId;
-      var pageARI;
-      var sourceLocalId;
-      if (resourceId && typeof resourceId === 'string') {
-        try {
-          var fetchData = this.fetchProvider.retrieveSourceInfoFetchData(resourceId, this.sourceId);
-          pageARI = fetchData.pageARI;
-          sourceLocalId = fetchData.sourceLocalId;
-        } catch (error) {
-          return Promise.reject(error);
-        }
+    key: "fetchSyncBlockSourceInfo",
+    value: function fetchSyncBlockSourceInfo(localId, sourceAri, sourceProduct) {
+      if (!sourceAri || !sourceProduct) {
+        return Promise.resolve(undefined);
+      }
+      switch (sourceProduct) {
+        case 'confluence-page':
+          return fetchConfluencePageInfo(sourceAri, localId);
+        case 'jira-work-item':
+          return Promise.reject(new Error('Jira work item source product not supported'));
+        default:
+          return Promise.reject(new Error("".concat(sourceProduct, " source product not supported")));
       }
-
-      // TODO: EDITOR-3312 - based on the source sync block product,
-      // execute fetchConfluenceSourceInfo or fetchJiraItemSourceInfo or similar...
-      return pageARI ? fetchConfluenceSourceInfo(pageARI, sourceLocalId) : Promise.resolve(undefined);
     }
   }, {
     key: "generateResourceId",
@@ -251,32 +245,28 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
     /**
      * Retrieve the parent info for the sync block
      *
-     * @param resourceId
-     * @param syncBlockInstance
+     * @param sourceAri - The source ARI
+     * @param sourceProduct - The source product. e.g. 'confluence-page', 'jira-work-item'
      *
      * @returns The parent info for the sync block
      */
   }, {
     key: "retrieveSyncBlockParentInfo",
-    value: function retrieveSyncBlockParentInfo(syncBlockInstance) {
-      if (!syncBlockInstance || !syncBlockInstance.data) {
+    value: function retrieveSyncBlockParentInfo(sourceAri, sourceProduct) {
+      if (!sourceAri || !sourceProduct) {
         return undefined;
       }
-      var _syncBlockInstance$da = syncBlockInstance.data,
-        sourceAri = _syncBlockInstance$da.sourceAri,
-        product = _syncBlockInstance$da.product;
-      if (!sourceAri || !product) {
-        return undefined;
+      switch (sourceProduct) {
+        case 'confluence-page':
+          return {
+            contentId: getPageIdAndTypeFromConfluencePageAri(sourceAri).id,
+            contentProduct: sourceProduct
+          };
+        case 'jira-work-item':
+          throw new Error('Jira work item source product not supported');
+        default:
+          throw new Error("".concat(sourceProduct, " source product not supported"));
       }
-
-      // TODO: EDITOR-3312 - based on the source sync block product,
-      // execute getPageIdAndTypeFromConfluencePageAri or getJiraItemIdAndTypeFromJiraItemAri or similar...
-      var _getPageIdAndTypeFrom = getPageIdAndTypeFromConfluencePageAri(sourceAri),
-        contentId = _getPageIdAndTypeFrom.id;
-      return {
-        contentId: contentId,
-        contentProduct: product
-      };
     }
   }]);
 }(SyncBlockDataProvider);

package/dist/esm/store-manager/referenceSyncBlockStoreManager.js

@@ -115,35 +115,45 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       return refreshSubscriptions;
     }())
   }, {
-    key: "retrieveSyncBlockSourceInfo",
-    value: function retrieveSyncBlockSourceInfo(resourceId) {
-      var _this = this;
+    key: "fetchSyncBlockSourceInfo",
+    value: function fetchSyncBlockSourceInfo(resourceId) {
+      var _existingSyncBlock$da,
+        _existingSyncBlock$da2,
+        _this = this;
       if (!resourceId || !this.dataProvider) {
         return;
       }
+      if (this.syncBlockURLRequests.get(resourceId)) {
+        return;
+      }
+      this.syncBlockURLRequests.set(resourceId, true);
+      var existingSyncBlock = this.getFromCache(resourceId);
+      if (!existingSyncBlock) {
+        return;
+      }
 
-      // TODO: EDITOR-3312 - retrieve the source info based on the source sync block product
-
-      // if the sync block is a reference block, we need to fetch the URL to the source
-      // we could optimise this further by checking if the sync block is on the same page as the source
-      if (!this.syncBlockURLRequests.get(resourceId)) {
-        this.syncBlockURLRequests.set(resourceId, true);
-        this.dataProvider.retrieveSyncBlockSourceInfo(createSyncBlockNode('', resourceId)).then(function (sourceInfo) {
-          var existingSyncBlock = _this.getFromCache(resourceId);
-          if (existingSyncBlock && existingSyncBlock.data) {
-            existingSyncBlock.data = _objectSpread(_objectSpread({}, existingSyncBlock.data), {}, {
-              sourceURL: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url,
-              sourceTitle: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.title
-            });
-            _this.updateCache(existingSyncBlock);
-            if (sourceInfo !== null && sourceInfo !== void 0 && sourceInfo.title) {
-              _this.updateSourceTitleSubscriptions(existingSyncBlock.resourceId, sourceInfo.title);
-            }
-          }
-        }).finally(function () {
-          _this.syncBlockURLRequests.set(resourceId, false);
-        });
+      // skip if source URL and title are already present
+      if ((_existingSyncBlock$da = existingSyncBlock.data) !== null && _existingSyncBlock$da !== void 0 && _existingSyncBlock$da.sourceURL && (_existingSyncBlock$da2 = existingSyncBlock.data) !== null && _existingSyncBlock$da2 !== void 0 && _existingSyncBlock$da2.sourceTitle) {
+        return;
       }
+      var _ref = existingSyncBlock.data || {},
+        sourceAri = _ref.sourceAri,
+        product = _ref.product,
+        blockInstanceId = _ref.blockInstanceId;
+      if (!sourceAri || !product || !blockInstanceId) {
+        return;
+      }
+      this.dataProvider.fetchSyncBlockSourceInfo(blockInstanceId, sourceAri, product).then(function (sourceInfo) {
+        if (!sourceInfo) {
+          return;
+        }
+        _this.updateCacheWithSourceInfo(resourceId, sourceInfo);
+        if (sourceInfo.title) {
+          _this.updateSourceTitleSubscriptions(resourceId, sourceInfo.title);
+        }
+      }).finally(function () {
+        _this.syncBlockURLRequests.delete(resourceId);
+      });
     }
 
     /**
@@ -194,7 +204,6 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
             case 11:
               resolvedData = [];
               data.forEach(function (syncBlockInstance) {
-                var _resolvedSyncBlockIns, _resolvedSyncBlockIns2;
                 if (!syncBlockInstance.resourceId) {
                   return;
                 }
@@ -207,11 +216,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
                 var resolvedSyncBlockInstance = existingSyncBlock ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
                 _this2.updateCache(resolvedSyncBlockInstance);
                 resolvedData.push(resolvedSyncBlockInstance);
-
-                // fetch source URL and title if not already present
-                if ((!((_resolvedSyncBlockIns = resolvedSyncBlockInstance.data) !== null && _resolvedSyncBlockIns !== void 0 && _resolvedSyncBlockIns.sourceURL) || !((_resolvedSyncBlockIns2 = resolvedSyncBlockInstance.data) !== null && _resolvedSyncBlockIns2 !== void 0 && _resolvedSyncBlockIns2.sourceTitle)) && resolvedSyncBlockInstance.resourceId) {
-                  _this2.retrieveSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
-                }
+                _this2.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
               });
               return _context3.abrupt("return", [].concat(resolvedData, blocksWithNotFoundError));
             case 14:
@@ -225,6 +230,19 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       }
       return fetchSyncBlocksData;
     }())
+  }, {
+    key: "updateCacheWithSourceInfo",
+    value: function updateCacheWithSourceInfo(resourceId, sourceInfo) {
+      var existingSyncBlock = this.getFromCache(resourceId);
+      if (existingSyncBlock && existingSyncBlock.data) {
+        existingSyncBlock.data.sourceURL = sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url;
+        existingSyncBlock.data = _objectSpread(_objectSpread({}, existingSyncBlock.data), {}, {
+          sourceURL: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url,
+          sourceTitle: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.title
+        });
+        this.updateCache(existingSyncBlock);
+      }
+    }
   }, {
     key: "updateCache",
     value: function updateCache(syncBlock) {
@@ -380,6 +398,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "retrieveDynamicProviders",
     value: function retrieveDynamicProviders(resourceId, providerFactory, providerCreator) {
+      var _syncBlock$data2, _syncBlock$data3, _syncBlock$data4, _syncBlock$data5;
       if (!this.dataProvider) {
         return;
       }
@@ -388,7 +407,11 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       if (hasMediaProvider && hasEmojiProvider) {
         return;
       }
-      var parentInfo = this.dataProvider.retrieveSyncBlockParentInfo(this.syncBlockCache.get(resourceId));
+      var syncBlock = this.getFromCache(resourceId);
+      if (!syncBlock || !((_syncBlock$data2 = syncBlock.data) !== null && _syncBlock$data2 !== void 0 && _syncBlock$data2.sourceAri) || !((_syncBlock$data3 = syncBlock.data) !== null && _syncBlock$data3 !== void 0 && _syncBlock$data3.product)) {
+        return;
+      }
+      var parentInfo = this.dataProvider.retrieveSyncBlockParentInfo((_syncBlock$data4 = syncBlock.data) === null || _syncBlock$data4 === void 0 ? void 0 : _syncBlock$data4.sourceAri, (_syncBlock$data5 = syncBlock.data) === null || _syncBlock$data5 === void 0 ? void 0 : _syncBlock$data5.product);
       if (!parentInfo) {
         return;
       }

package/dist/types/clients/confluence/sourceInfo.d.ts

@@ -1,2 +1,2 @@
 import type { SyncBlockSourceInfo } from '../../providers/types';
-export declare const fetchConfluenceSourceInfo: (pageAri: string, localId?: string) => Promise<SyncBlockSourceInfo | undefined>;
+export declare const fetchConfluencePageInfo: (pageAri: string, localId?: string) => Promise<SyncBlockSourceInfo | undefined>;

package/dist/types/index.d.ts

@@ -1,6 +1,6 @@
 export { rebaseTransaction } from './common/rebase-transaction';
 export { SyncBlockError } from './common/types';
-export type { SyncBlockData, SyncBlockNode } from './common/types';
+export type { SyncBlockData, SyncBlockNode, SyncBlockProduct, BlockInstanceId, } from './common/types';
 export { useFetchSyncBlockData, type UseFetchSyncBlockDataResult, } from './hooks/useFetchSyncBlockData';
 export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
@@ -8,7 +8,7 @@ export { blockResourceIdFromSourceAndLocalId, getLocalIdFromBlockResourceId, } f
 export { getConfluencePageAri, getLocalIdFromConfluencePageAri, getPageARIFromContentPropertyResourceId, getPageIdAndTypeFromConfluencePageAri, resourceIdFromConfluencePageSourceIdAndLocalId, } from './clients/confluence/ari';
 export { useMemoizedBlockServiceAPIProviders } from './providers/block-service/blockServiceAPI';
 export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders, } from './providers/confluence/confluenceContentAPI';
-export { fetchConfluenceSourceInfo } from './clients/confluence/sourceInfo';
+export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider, } from './providers/syncBlockProvider';
 export type { ADFFetchProvider, ADFWriteProvider, SyncBlockDataProvider, SyncBlockInstance, MediaEmojiProviderOptions, SyncedBlockRendererProviderOptions, SyncBlockRendererProviderCreator, } from './providers/types';
 export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';

package/dist/types/providers/block-service/blockServiceAPI.d.ts

@@ -1,11 +1,10 @@
-import { type ResourceId, type SyncBlockData } from '../../common/types';
-import type { ADFFetchProvider, ADFWriteProvider, DeleteSyncBlockResult, SourceInfoFetchData, SyncBlockInstance, WriteSyncBlockResult } from '../types';
+import { type SyncBlockData } from '../../common/types';
+import type { ADFFetchProvider, ADFWriteProvider, DeleteSyncBlockResult, SyncBlockInstance, WriteSyncBlockResult } from '../types';
 /**
  * ADFFetchProvider implementation that fetches synced block data from Block Service API
  */
 declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
     fetchData(resourceId: string): Promise<SyncBlockInstance>;
-    retrieveSourceInfoFetchData(resourceId: ResourceId, pageARI: string): SourceInfoFetchData;
 }
 /**
  * ADFWriteProvider implementation that writes synced block data to Block Service API

package/dist/types/providers/confluence/confluenceContentAPI.d.ts

@@ -1,5 +1,5 @@
-import { type ResourceId, type SyncBlockData } from '../../common/types';
-import type { ADFFetchProvider, ADFWriteProvider, DeleteSyncBlockResult, SourceInfoFetchData, SyncBlockInstance, WriteSyncBlockResult } from '../types';
+import { type SyncBlockData } from '../../common/types';
+import type { ADFFetchProvider, ADFWriteProvider, DeleteSyncBlockResult, SyncBlockInstance, WriteSyncBlockResult } from '../types';
 /**
  * Configuration for Content API providers
  */
@@ -14,7 +14,6 @@ declare class ConfluenceADFFetchProvider implements ADFFetchProvider {
     private config;
     constructor(config: ContentAPIConfig);
     fetchData(resourceId: string): Promise<SyncBlockInstance>;
-    retrieveSourceInfoFetchData(resourceId: ResourceId): SourceInfoFetchData;
 }
 /**
  * ADFWriteProvider implementation that writes synced block data to Confluence Content API

package/dist/types/providers/syncBlockProvider.d.ts

@@ -1,5 +1,5 @@
 import type { JSONNode } from '@atlaskit/editor-json-transformer/types';
-import { type SyncBlockData, type SyncBlockNode } from '../common/types';
+import { type BlockInstanceId, type ResourceId, type SyncBlockData, type SyncBlockNode, type SyncBlockProduct } from '../common/types';
 import { SyncBlockDataProvider, type ADFFetchProvider, type ADFWriteProvider, type DeleteSyncBlockResult, type SyncBlockInstance, type SyncBlockParentInfo, type SyncBlockSourceInfo, type SyncedBlockRendererProviderOptions, type WriteSyncBlockResult } from '../providers/types';
 export declare class SyncBlockProvider extends SyncBlockDataProvider {
     name: string;
@@ -57,7 +57,7 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
      *
      * @returns Array of {resourceId?: string, error?: string}.
      */
-    deleteNodesData(resourceIds: string[]): Promise<Array<DeleteSyncBlockResult>>;
+    deleteNodesData(resourceIds: ResourceId[]): Promise<Array<DeleteSyncBlockResult>>;
     /**
      * Get the source id
      *
@@ -65,14 +65,16 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
      */
     getSourceId(): string;
     /**
-     * Retrieve the source info from the source id
+     * Fetch the source info from the source id
      *
-     * @param node
+     * @param params
+     * @param params.sourceAri - The source ARI
+     * @param params.sourceProduct - The source product. e.g. 'confluence-page', 'jira-work-item'
      *
      * @returns The source info
      */
-    retrieveSyncBlockSourceInfo(node: SyncBlockNode): Promise<SyncBlockSourceInfo | undefined>;
-    generateResourceId(sourceId: string, localId: string): string;
+    fetchSyncBlockSourceInfo(localId: BlockInstanceId, sourceAri: string, sourceProduct: SyncBlockProduct): Promise<SyncBlockSourceInfo | undefined>;
+    generateResourceId(sourceId: string, localId: BlockInstanceId): string;
     /**
      * Get the synced block renderer provider options
      *
@@ -82,11 +84,11 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
     /**
      * Retrieve the parent info for the sync block
      *
-     * @param resourceId
-     * @param syncBlockInstance
+     * @param sourceAri - The source ARI
+     * @param sourceProduct - The source product. e.g. 'confluence-page', 'jira-work-item'
      *
      * @returns The parent info for the sync block
      */
-    retrieveSyncBlockParentInfo(syncBlockInstance: SyncBlockInstance | undefined): SyncBlockParentInfo | undefined;
+    retrieveSyncBlockParentInfo(sourceAri: string, sourceProduct: SyncBlockProduct): SyncBlockParentInfo | undefined;
 }
 export declare const useMemoizedSyncedBlockProvider: (fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string, providerOptions: SyncedBlockRendererProviderOptions) => SyncBlockProvider;

package/dist/types/providers/types.d.ts

@@ -3,7 +3,7 @@ import type { EmojiProvider } from '@atlaskit/emoji';
 import type { MentionProvider } from '@atlaskit/mention/types';
 import { NodeDataProvider } from '@atlaskit/node-data-provider';
 import type { TaskDecisionProvider } from '@atlaskit/task-decision/types';
-import type { SyncBlockData, ResourceId, SyncBlockError, SyncBlockNode, SyncBlockProduct } from '../common/types';
+import type { SyncBlockData, ResourceId, SyncBlockError, SyncBlockNode, SyncBlockProduct, BlockInstanceId } from '../common/types';
 /**
  * The instance of a sync block, containing its data and metadata.
  * Mainly used for representing the state of a sync block after fetching from a data provider.
@@ -12,11 +12,11 @@ import type { SyncBlockData, ResourceId, SyncBlockError, SyncBlockNode, SyncBloc
 export type SyncBlockInstance = {
     data?: SyncBlockData;
     error?: SyncBlockError;
-    resourceId: string;
+    resourceId: ResourceId;
 };
 export type DeleteSyncBlockResult = {
     error?: string;
-    resourceId: string;
+    resourceId: ResourceId;
     success: boolean;
 };
 export type SyncBlockSourceInfo = {
@@ -29,7 +29,7 @@ export type SyncBlockParentInfo = {
 };
 export type WriteSyncBlockResult = {
     error?: string;
-    resourceId?: string;
+    resourceId?: ResourceId;
 };
 export type SourceInfoFetchData = {
     pageARI: string;
@@ -37,10 +37,9 @@ export type SourceInfoFetchData = {
 };
 export interface ADFFetchProvider {
     fetchData: (resourceId: ResourceId) => Promise<SyncBlockInstance>;
-    retrieveSourceInfoFetchData: (resourceId: ResourceId, pageAri: string) => SourceInfoFetchData;
 }
 export interface ADFWriteProvider {
-    deleteData: (resourceId: string) => Promise<DeleteSyncBlockResult>;
+    deleteData: (resourceId: ResourceId) => Promise<DeleteSyncBlockResult>;
     generateResourceId: (sourceId: string, localId: string) => ResourceId;
     writeData: (data: SyncBlockData) => Promise<WriteSyncBlockResult>;
 }
@@ -65,16 +64,16 @@ export declare abstract class SyncBlockDataProvider extends NodeDataProvider<Syn
     abstract writeNodesData(nodes: SyncBlockNode[], data: SyncBlockData[]): Promise<Array<WriteSyncBlockResult>>;
     abstract deleteNodesData(resourceIds: string[]): Promise<Array<DeleteSyncBlockResult>>;
     abstract getSourceId(): ResourceId;
-    abstract retrieveSyncBlockSourceInfo(node: SyncBlockNode): Promise<SyncBlockSourceInfo | undefined>;
+    abstract fetchSyncBlockSourceInfo(localId: BlockInstanceId, sourceAri: string, sourceProduct: SyncBlockProduct): Promise<SyncBlockSourceInfo | undefined>;
     abstract getSyncedBlockRendererProviderOptions(): SyncedBlockRendererProviderOptions;
-    abstract retrieveSyncBlockParentInfo(syncBlockInstance: SyncBlockInstance | undefined): SyncBlockParentInfo | undefined;
+    abstract retrieveSyncBlockParentInfo(sourceAri: string, sourceProduct: SyncBlockProduct): SyncBlockParentInfo | undefined;
     /**
      * Generates a resource ID from a source ID and local ID.
      * @param sourceId - The source document ID (e.g., page ARI)
      * @param localId - The local block ID (usually a UUID)
      * @returns The generated resource ID
      */
-    abstract generateResourceId(sourceId: ResourceId, localId: string): ResourceId;
+    abstract generateResourceId(sourceId: ResourceId, localId: BlockInstanceId): ResourceId;
 }
 export type SubscriptionCallback = (data: SyncBlockInstance) => void;
 export type TitleSubscriptionCallback = (title: string) => void;

package/dist/types/store-manager/referenceSyncBlockStoreManager.d.ts

@@ -16,13 +16,14 @@ export declare class ReferenceSyncBlockStoreManager {
      * @returns {Promise<void>}
      */
     refreshSubscriptions(): Promise<void>;
-    private retrieveSyncBlockSourceInfo;
+    private fetchSyncBlockSourceInfo;
     /**
      * Fetch sync block data for a given array of sync block nodes.
      * @param syncBlockNodes - The array of sync block nodes to fetch data for
      * @returns The fetched sync block data results
      */
     fetchSyncBlocksData(syncBlockNodes: SyncBlockNode[]): Promise<SyncBlockInstance[]>;
+    private updateCacheWithSourceInfo;
     private updateCache;
     private updateSourceTitleSubscriptions;
     private getFromCache;

package/dist/types-ts4.5/clients/confluence/sourceInfo.d.ts

@@ -1,2 +1,2 @@
 import type { SyncBlockSourceInfo } from '../../providers/types';
-export declare const fetchConfluenceSourceInfo: (pageAri: string, localId?: string) => Promise<SyncBlockSourceInfo | undefined>;
+export declare const fetchConfluencePageInfo: (pageAri: string, localId?: string) => Promise<SyncBlockSourceInfo | undefined>;

package/dist/types-ts4.5/index.d.ts

@@ -1,6 +1,6 @@
 export { rebaseTransaction } from './common/rebase-transaction';
 export { SyncBlockError } from './common/types';
-export type { SyncBlockData, SyncBlockNode } from './common/types';
+export type { SyncBlockData, SyncBlockNode, SyncBlockProduct, BlockInstanceId, } from './common/types';
 export { useFetchSyncBlockData, type UseFetchSyncBlockDataResult, } from './hooks/useFetchSyncBlockData';
 export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
@@ -8,7 +8,7 @@ export { blockResourceIdFromSourceAndLocalId, getLocalIdFromBlockResourceId, } f
 export { getConfluencePageAri, getLocalIdFromConfluencePageAri, getPageARIFromContentPropertyResourceId, getPageIdAndTypeFromConfluencePageAri, resourceIdFromConfluencePageSourceIdAndLocalId, } from './clients/confluence/ari';
 export { useMemoizedBlockServiceAPIProviders } from './providers/block-service/blockServiceAPI';
 export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders, } from './providers/confluence/confluenceContentAPI';
-export { fetchConfluenceSourceInfo } from './clients/confluence/sourceInfo';
+export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider, } from './providers/syncBlockProvider';
 export type { ADFFetchProvider, ADFWriteProvider, SyncBlockDataProvider, SyncBlockInstance, MediaEmojiProviderOptions, SyncedBlockRendererProviderOptions, SyncBlockRendererProviderCreator, } from './providers/types';
 export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';

package/dist/types-ts4.5/providers/block-service/blockServiceAPI.d.ts

@@ -1,11 +1,10 @@
-import { type ResourceId, type SyncBlockData } from '../../common/types';
-import type { ADFFetchProvider, ADFWriteProvider, DeleteSyncBlockResult, SourceInfoFetchData, SyncBlockInstance, WriteSyncBlockResult } from '../types';
+import { type SyncBlockData } from '../../common/types';
+import type { ADFFetchProvider, ADFWriteProvider, DeleteSyncBlockResult, SyncBlockInstance, WriteSyncBlockResult } from '../types';
 /**
  * ADFFetchProvider implementation that fetches synced block data from Block Service API
  */
 declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
     fetchData(resourceId: string): Promise<SyncBlockInstance>;
-    retrieveSourceInfoFetchData(resourceId: ResourceId, pageARI: string): SourceInfoFetchData;
 }
 /**
  * ADFWriteProvider implementation that writes synced block data to Block Service API

package/dist/types-ts4.5/providers/confluence/confluenceContentAPI.d.ts

@@ -1,5 +1,5 @@
-import { type ResourceId, type SyncBlockData } from '../../common/types';
-import type { ADFFetchProvider, ADFWriteProvider, DeleteSyncBlockResult, SourceInfoFetchData, SyncBlockInstance, WriteSyncBlockResult } from '../types';
+import { type SyncBlockData } from '../../common/types';
+import type { ADFFetchProvider, ADFWriteProvider, DeleteSyncBlockResult, SyncBlockInstance, WriteSyncBlockResult } from '../types';
 /**
  * Configuration for Content API providers
  */
@@ -14,7 +14,6 @@ declare class ConfluenceADFFetchProvider implements ADFFetchProvider {
     private config;
     constructor(config: ContentAPIConfig);
     fetchData(resourceId: string): Promise<SyncBlockInstance>;
-    retrieveSourceInfoFetchData(resourceId: ResourceId): SourceInfoFetchData;
 }
 /**
  * ADFWriteProvider implementation that writes synced block data to Confluence Content API

package/dist/types-ts4.5/providers/syncBlockProvider.d.ts

@@ -1,5 +1,5 @@
 import type { JSONNode } from '@atlaskit/editor-json-transformer/types';
-import { type SyncBlockData, type SyncBlockNode } from '../common/types';
+import { type BlockInstanceId, type ResourceId, type SyncBlockData, type SyncBlockNode, type SyncBlockProduct } from '../common/types';
 import { SyncBlockDataProvider, type ADFFetchProvider, type ADFWriteProvider, type DeleteSyncBlockResult, type SyncBlockInstance, type SyncBlockParentInfo, type SyncBlockSourceInfo, type SyncedBlockRendererProviderOptions, type WriteSyncBlockResult } from '../providers/types';
 export declare class SyncBlockProvider extends SyncBlockDataProvider {
     name: string;
@@ -57,7 +57,7 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
      *
      * @returns Array of {resourceId?: string, error?: string}.
      */
-    deleteNodesData(resourceIds: string[]): Promise<Array<DeleteSyncBlockResult>>;
+    deleteNodesData(resourceIds: ResourceId[]): Promise<Array<DeleteSyncBlockResult>>;
     /**
      * Get the source id
      *
@@ -65,14 +65,16 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
      */
     getSourceId(): string;
     /**
-     * Retrieve the source info from the source id
+     * Fetch the source info from the source id
      *
-     * @param node
+     * @param params
+     * @param params.sourceAri - The source ARI
+     * @param params.sourceProduct - The source product. e.g. 'confluence-page', 'jira-work-item'
      *
      * @returns The source info
      */
-    retrieveSyncBlockSourceInfo(node: SyncBlockNode): Promise<SyncBlockSourceInfo | undefined>;
-    generateResourceId(sourceId: string, localId: string): string;
+    fetchSyncBlockSourceInfo(localId: BlockInstanceId, sourceAri: string, sourceProduct: SyncBlockProduct): Promise<SyncBlockSourceInfo | undefined>;
+    generateResourceId(sourceId: string, localId: BlockInstanceId): string;
     /**
      * Get the synced block renderer provider options
      *
@@ -82,11 +84,11 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
     /**
      * Retrieve the parent info for the sync block
      *
-     * @param resourceId
-     * @param syncBlockInstance
+     * @param sourceAri - The source ARI
+     * @param sourceProduct - The source product. e.g. 'confluence-page', 'jira-work-item'
      *
      * @returns The parent info for the sync block
      */
-    retrieveSyncBlockParentInfo(syncBlockInstance: SyncBlockInstance | undefined): SyncBlockParentInfo | undefined;
+    retrieveSyncBlockParentInfo(sourceAri: string, sourceProduct: SyncBlockProduct): SyncBlockParentInfo | undefined;
 }
 export declare const useMemoizedSyncedBlockProvider: (fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string, providerOptions: SyncedBlockRendererProviderOptions) => SyncBlockProvider;