@atlaskit/editor-synced-block-provider 2.10.2 → 2.10.3

package/dist/cjs/store-manager/sourceSyncBlockStoreManager.js

@@ -14,6 +14,11 @@ var _uuid = _interopRequireDefault(require("uuid"));
 var _rebaseTransaction2 = require("../common/rebase-transaction");
 var _utils = require("../utils/utils");
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
+// A store manager responsible for the lifecycle and state management of source sync blocks in an editor instance.
+// Designed to manage local in-memory state and synchronize with an external data provider.
+// Supports create, flush, and delete operations for source sync blocks.
+// Handles caching, debouncing updates, and publish/subscribe for local changes.
+// Ensures consistency between local and remote state, and can be used in both editor and renderer contexts.
 var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PURE__*/function () {
   function SourceSyncBlockStoreManager(dataProvider) {
     var _this = this;
@@ -27,14 +32,22 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
     this.dataProvider = dataProvider;
     this.syncBlockCache = new Map();
   }
-
-  /**
-   * Add/update a sync block node to/from the local cache
-   * @param syncBlockNode - The sync block node to update
-   */
   return (0, _createClass2.default)(SourceSyncBlockStoreManager, [{
+    key: "isSourceBlock",
+    value: function isSourceBlock(node) {
+      return node.type.name === 'bodiedSyncBlock';
+    }
+
+    /**
+     * Add/update a sync block node to/from the local cache
+     * @param syncBlockNode - The sync block node to update
+     */
+  }, {
     key: "updateSyncBlockData",
     value: function updateSyncBlockData(syncBlockNode) {
+      if (!this.isSourceBlock(syncBlockNode)) {
+        throw new Error('Invalid sync block node type provided for updateSyncBlockData');
+      }
       var _syncBlockNode$attrs = syncBlockNode.attrs,
         localId = _syncBlockNode$attrs.localId,
         resourceId = _syncBlockNode$attrs.resourceId;
@@ -52,9 +65,9 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
      * @returns true if saving all nodes successfully, false if fail to save some/all nodes
      */
   }, {
-    key: "flushBodiedSyncBlocks",
+    key: "flush",
     value: (function () {
-      var _flushBodiedSyncBlocks = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var _flush = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -104,10 +117,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
           }
         }, _callee, this, [[0, 14]]);
       }));
-      function flushBodiedSyncBlocks() {
-        return _flushBodiedSyncBlocks.apply(this, arguments);
+      function flush() {
+        return _flush.apply(this, arguments);
       }
-      return flushBodiedSyncBlocks;
+      return flush;
     }())
   }, {
     key: "setEditorView",
@@ -119,6 +132,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
     value: function registerPendingCreation(resourceId) {
       this.pendingResourceId = resourceId;
     }
+
+    /**
+     * Register callback function (which inserts node, handles focus etc) to be used later when creation to backend succeed
+     */
   }, {
     key: "registerCreationCallback",
     value: function registerCreationCallback(callback) {
@@ -138,6 +155,11 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
       this.pendingResourceId = undefined;
       this.creationCallback = undefined;
     }
+
+    /**
+     *
+     * @returns true if waiting for the result of saving new bodiedSyncBlock to backend
+     */
   }, {
     key: "hasPendingCreation",
     value: function hasPendingCreation() {
@@ -157,6 +179,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
     value: function requireConfirmationBeforeDelete() {
       return !!this.confirmationCallback;
     }
+
+    /**
+     * @returns attributes for a new bodiedSyncBlock node
+     */
   }, {
     key: "generateBodiedSyncBlockAttrs",
     value: function generateBodiedSyncBlockAttrs() {
@@ -173,6 +199,11 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
         localId: localId
       };
     }
+
+    /**
+     * Create a bodiedSyncBlock node with empty content to backend
+     * @param attrs attributes Ids of the node
+     */
   }, {
     key: "createBodiedSyncBlockNode",
     value: function createBodiedSyncBlockNode(attrs) {
@@ -291,5 +322,16 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
       }
       this.confirmationTransaction = (0, _rebaseTransaction2.rebaseTransaction)(this.confirmationTransaction, incomingTr, state);
     }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      this.syncBlockCache.clear();
+      this.confirmationCallback = undefined;
+      this.confirmationTransaction = undefined;
+      this.pendingResourceId = undefined;
+      this.creationCallback = undefined;
+      this.dataProvider = undefined;
+      this.editorView = undefined;
+    }
   }]);
 }();

package/dist/cjs/store-manager/syncBlockStoreManager.js

@@ -7,180 +7,36 @@ Object.defineProperty(exports, "__esModule", {
 exports.SyncBlockStoreManager = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _utils = require("../utils/utils");
 var _referenceSyncBlockStoreManager = require("./referenceSyncBlockStoreManager");
 var _sourceSyncBlockStoreManager = require("./sourceSyncBlockStoreManager");
-// eslint-disable-next-line no-restricted-imports
-// A store manager responsible for the lifecycle and state management of sync blocks in an editor instance.
-// Supports create, read, update, and delete operations for sync blocks.
-// Designed to manage local in-memory state and synchronize with an external data provider.
-// Handles caching, debouncing updates, and publish/subscribe for local changes.
-// Ensures consistency between local and remote state, and can be used in both editor and renderer contexts.
+// A parent store manager responsible for the lifecycle and state management of sync blocks in an editor instance.
+// Contains two child store managers: ReferenceSyncBlockStoreManager and SourceSyncBlockStoreManager.
+// ReferenceSyncBlockStoreManager is responsible for the lifecycle and state management of reference sync blocks in an editor instance.
+// SourceSyncBlockStoreManager is responsible for the lifecycle and state management of source sync blocks in an editor instance.
+// Can be used in both editor and renderer contexts.
 var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/function () {
   function SyncBlockStoreManager(dataProvider) {
     (0, _classCallCheck2.default)(this, SyncBlockStoreManager);
-    this.referenceSyncBlockStoreManager = new _referenceSyncBlockStoreManager.ReferenceSyncBlockStoreManager(dataProvider);
+    // In future, if reference manager needs to reach to source manager and read it's current in memorey cache
+    // we can pass the source manager as a parameter to the reference manager constructor
     this.sourceSyncBlockStoreManager = new _sourceSyncBlockStoreManager.SourceSyncBlockStoreManager(dataProvider);
+    this.referenceSyncBlockStoreManager = new _referenceSyncBlockStoreManager.ReferenceSyncBlockStoreManager(dataProvider);
   }
-
-  /**
-   * Fetch sync block data for a given array of sync block nodes.
-   * @param nodes - The array of sync block nodes to fetch data for
-   * @returns The fetched sync block data results
-   */
   return (0, _createClass2.default)(SyncBlockStoreManager, [{
-    key: "fetchSyncBlocksData",
-    value: function fetchSyncBlocksData(nodes) {
-      var syncBlockNodes = nodes.map(function (node) {
-        return (0, _utils.convertPMNodeToSyncBlockNode)(node);
-      }).filter(function (node) {
-        return node !== undefined;
-      }) || [];
-      if (syncBlockNodes.length === 0) {
-        return Promise.resolve([]);
-      }
-      return this.referenceSyncBlockStoreManager.fetchSyncBlocksData(syncBlockNodes);
-    }
-  }, {
-    key: "getReferenceSyncBlockStoreManager",
-    value: function getReferenceSyncBlockStoreManager() {
+    key: "referenceManager",
+    get: function get() {
       return this.referenceSyncBlockStoreManager;
     }
-
-    /**
-     * Add/update a sync block node to/from the local cache
-     * @param syncBlockNode - The sync block node to update
-     */
-  }, {
-    key: "updateSyncBlockData",
-    value: function updateSyncBlockData(syncBlockNode) {
-      if (this.isSourceBlock(syncBlockNode)) {
-        return this.sourceSyncBlockStoreManager.updateSyncBlockData(syncBlockNode);
-      } else {
-        throw new Error('Invalid sync block node type provided for updateSyncBlockData');
-      }
-    }
-
-    /**
-     * Save content of bodiedSyncBlock nodes in local cache to backend
-     *
-     * @returns true if saving all nodes successfully, false if fail to save some/all nodes
-     */
-  }, {
-    key: "flushBodiedSyncBlocks",
-    value: function flushBodiedSyncBlocks() {
-      // only applicable to source sync block, for now (will be refactored further)
-      return this.sourceSyncBlockStoreManager.flushBodiedSyncBlocks();
-    }
-
-    /**
-     * Get the URL for a sync block.
-     * @param resourceId - The resource ID of the sync block to get the URL for
-     * @returns
-     */
-  }, {
-    key: "getSyncBlockURL",
-    value: function getSyncBlockURL(resourceId) {
-      // only applicable to reference sync block, for now (will be refactored further)
-      return this.referenceSyncBlockStoreManager.getSyncBlockURL(resourceId);
-    }
-  }, {
-    key: "setEditorView",
-    value: function setEditorView(editorView) {
-      this.sourceSyncBlockStoreManager.setEditorView(editorView);
-    }
-  }, {
-    key: "isSourceBlock",
-    value: function isSourceBlock(node) {
-      return node.type.name === 'bodiedSyncBlock';
-    }
-  }, {
-    key: "registerConfirmationCallback",
-    value: function registerConfirmationCallback(callback) {
-      // only applicable to source sync block, for now (will be refactored further)
-      return this.sourceSyncBlockStoreManager.registerConfirmationCallback(callback);
-    }
-  }, {
-    key: "requireConfirmationBeforeDelete",
-    value: function requireConfirmationBeforeDelete() {
-      // only applicable to source sync block, for now (will be refactored further)
-      return this.sourceSyncBlockStoreManager.requireConfirmationBeforeDelete();
-    }
-
-    /**
-     * Register callback function (which inserts node, handles focus etc) to be used later when creation to backend succeed
-     */
-  }, {
-    key: "registerCreationCallback",
-    value: function registerCreationCallback(callback) {
-      this.sourceSyncBlockStoreManager.registerCreationCallback(callback);
-    }
-
-    /**
-     *
-     * @returns true if waiting for the result of saving new bodiedSyncBlock to backend
-     */
-  }, {
-    key: "hasPendingCreation",
-    value: function hasPendingCreation() {
-      return this.sourceSyncBlockStoreManager.hasPendingCreation();
-    }
-
-    /**
-     * @returns attributes for a new bodiedSyncBlock node
-     */
-  }, {
-    key: "generateBodiedSyncBlockAttrs",
-    value: function generateBodiedSyncBlockAttrs() {
-      return this.sourceSyncBlockStoreManager.generateBodiedSyncBlockAttrs();
-    }
-
-    /**
-     * Save bodiedSyncBlock with empty content to backend
-     * @param attrs attributes Ids of the node
-     */
-  }, {
-    key: "createBodiedSyncBlockNode",
-    value: function createBodiedSyncBlockNode(attrs) {
-      // only applicable to source sync block, for now (will be refactored further)
-      return this.sourceSyncBlockStoreManager.createBodiedSyncBlockNode(attrs);
-    }
-  }, {
-    key: "subscribeToSyncBlockData",
-    value: function subscribeToSyncBlockData(node, callback) {
-      return this.referenceSyncBlockStoreManager.subscribe(node, callback);
-    }
-  }, {
-    key: "subscribeToSyncBlockSourceTitle",
-    value: function subscribeToSyncBlockSourceTitle(node, callback) {
-      return this.referenceSyncBlockStoreManager.subscribeToSourceTitle(node, callback);
-    }
-  }, {
-    key: "refreshSubscriptions",
-    value: function refreshSubscriptions() {
-      this.referenceSyncBlockStoreManager.refreshSubscriptions();
-    }
-  }, {
-    key: "deleteSyncBlocksWithConfirmation",
-    value: function deleteSyncBlocksWithConfirmation(tr, syncBlockIds) {
-      // only applicable to source sync block, for now (will be refactored further)
-      return this.sourceSyncBlockStoreManager.deleteSyncBlocksWithConfirmation(tr, syncBlockIds);
-    }
-  }, {
-    key: "rebaseTransaction",
-    value: function rebaseTransaction(incomingTr, state) {
-      // only applicable to source sync block, for now (will be refactored further)
-      this.sourceSyncBlockStoreManager.rebaseTransaction(incomingTr, state);
-    }
   }, {
-    key: "getReferenceSyncBlockProviderFactory",
-    value: function getReferenceSyncBlockProviderFactory(resourceId) {
-      return this.referenceSyncBlockStoreManager.getProviderFactory(resourceId);
+    key: "sourceManager",
+    get: function get() {
+      return this.sourceSyncBlockStoreManager;
     }
   }, {
     key: "destroy",
     value: function destroy() {
       this.referenceSyncBlockStoreManager.destroy();
+      this.sourceSyncBlockStoreManager.destroy();
     }
   }]);
 }();

package/dist/cjs/utils/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isBlogPageType = exports.createSyncBlockNode = exports.createBodiedSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodeToSyncBlockNode = void 0;
+exports.createSyncBlockNode = exports.createBodiedSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodesToSyncBlockNodes = exports.convertPMNodeToSyncBlockNode = void 0;
 var convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockPMNodeToSyncBlockData = function convertSyncBlockPMNodeToSyncBlockData(node) {
   return {
     blockInstanceId: node.attrs.localId,
@@ -11,9 +11,6 @@ var convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockPMNodeToSync
     resourceId: node.attrs.resourceId
   };
 };
-var isBlogPageType = exports.isBlogPageType = function isBlogPageType(pageType) {
-  return pageType === 'blogpost';
-};
 var createSyncBlockNode = exports.createSyncBlockNode = function createSyncBlockNode(localId, resourceId) {
   return {
     type: 'syncBlock',
@@ -44,4 +41,11 @@ var convertPMNodeToSyncBlockNode = exports.convertPMNodeToSyncBlockNode = functi
     return undefined;
   }
   return createSyncBlockNode(node.attrs.localId, node.attrs.resourceId);
+};
+var convertPMNodesToSyncBlockNodes = exports.convertPMNodesToSyncBlockNodes = function convertPMNodesToSyncBlockNodes(nodes) {
+  return nodes.map(function (node) {
+    return convertPMNodeToSyncBlockNode(node);
+  }).filter(function (node) {
+    return node !== undefined;
+  }) || [];
 };

package/dist/es2019/{providers → clients}/block-service/ari.js

@@ -19,7 +19,7 @@ export const blockResourceIdFromSourceAndLocalId = (sourceId, localId) => {
  * @param ari - the block ARI. E.G ari:cloud:blocks:cloudId:synced-block/localId
  * @returns the localId of the block node. A randomly generated UUID
  */
-export const getLocalIdFromResourceId = ari => {
+export const getLocalIdFromBlockResourceId = ari => {
   const match = ari.match(/ari:cloud:blocks:[^:]+:synced-block\/([a-zA-Z0-9-]+)/);
   if (match !== null && match !== void 0 && match[1]) {
     return match[1];

package/dist/es2019/{utils → clients/confluence}/ari.js

@@ -3,7 +3,7 @@
 export const getConfluencePageAri = (pageId, cloudId, pageType = 'page') => `ari:cloud:confluence:${cloudId}:${pageType}/${pageId}`;
 
 // For extracting from Page ARI and also the content property's version of resourceId
-export const getPageIdAndTypeFromAri = ari => {
+export const getPageIdAndTypeFromConfluencePageAri = ari => {
   const match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/);
   if (match !== null && match !== void 0 && match[2]) {
     return {
@@ -13,20 +13,20 @@ export const getPageIdAndTypeFromAri = ari => {
   }
   throw new Error(`Invalid page ARI: ${ari}`);
 };
-export const getLocalIdFromAri = ari => {
+export const getLocalIdFromConfluencePageAri = ari => {
   const match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/\d+\/([a-zA-Z0-9-]+)/);
   if (match !== null && match !== void 0 && match[2]) {
     return match[2];
   }
   throw new Error(`Invalid page ARI: ${ari}`);
 };
-export const getPageARIFromResourceId = resourceId => {
+export const getPageARIFromContentPropertyResourceId = resourceId => {
   const match = resourceId.match(/(ari:cloud:confluence:[^:]+:(page|blogpost)\/\d+)\/([a-zA-Z0-9-]+)$/);
   if (match !== null && match !== void 0 && match[1]) {
     return match[1];
   }
   throw new Error(`Invalid resourceId: ${resourceId}`);
 };
-export const resourceIdFromSourceAndLocalId = (sourceId, localId) => {
+export const resourceIdFromConfluencePageSourceIdAndLocalId = (sourceId, localId) => {
   return sourceId + '/' + localId;
 };

package/dist/es2019/{utils → clients/confluence}/sourceInfo.js

@@ -1,6 +1,6 @@
 /* eslint-disable require-unicode-regexp  */
 
-import { getPageIdAndTypeFromAri } from './ari';
+import { getPageIdAndTypeFromConfluencePageAri } from './ari';
 import { isBlogPageType } from './utils';
 const COMMON_HEADERS = {
   'Content-Type': 'application/json',
@@ -31,7 +31,7 @@ const GET_SOURCE_INFO_QUERY = `query ${GET_SOURCE_INFO_OPERATION_NAME} ($id: ID!
 		}
 	}
 }`;
-const getSourceInfo = async ari => {
+const getConfluenceSourceInfo = async ari => {
   const bodyData = {
     query: GET_SOURCE_INFO_QUERY,
     operationName: GET_SOURCE_INFO_OPERATION_NAME,
@@ -52,13 +52,13 @@ const getSourceInfo = async ari => {
   }
   return await response.json();
 };
-export const fetchSourceInfo = async (pageAri, localId) => {
+export const fetchConfluenceSourceInfo = async (pageAri, localId) => {
   try {
     var _response$data, _response$data$conten, _response$data$conten2, _contentData$space;
     const {
       type: pageType
-    } = getPageIdAndTypeFromAri(pageAri);
-    const response = await getSourceInfo(pageAri);
+    } = getPageIdAndTypeFromConfluencePageAri(pageAri);
+    const response = await getConfluenceSourceInfo(pageAri);
     const contentData = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$conten = _response$data.content) === null || _response$data$conten === void 0 ? void 0 : (_response$data$conten2 = _response$data$conten.nodes) === null || _response$data$conten2 === void 0 ? void 0 : _response$data$conten2[0];
     if (!contentData) {
       throw new Error(`Failed to get content data`);

package/dist/es2019/clients/confluence/utils.js

@@ -0,0 +1,3 @@
+export const isBlogPageType = pageType => {
+  return pageType === 'blogpost';
+};

package/dist/es2019/hooks/useFetchSyncBlockData.js

@@ -4,7 +4,6 @@ import { createSyncBlockNode } from '../utils/utils';
 export const useFetchSyncBlockData = (manager, resourceId, localId) => {
   const [syncBlockInstance, setSyncBlockInstance] = useState(null);
   const [isLoading, setIsLoading] = useState(true);
-  const referenceSyncBlockStoreManager = manager.getReferenceSyncBlockStoreManager();
   const reloadData = useCallback(async () => {
     if (isLoading) {
       return;
@@ -16,7 +15,7 @@ export const useFetchSyncBlockData = (manager, resourceId, localId) => {
     setIsLoading(true);
     try {
       // Fetch sync block data, the `subscribeToSyncBlock` will update the state once data is fetched
-      await referenceSyncBlockStoreManager.fetchSyncBlocksData([syncBlockNode]);
+      await manager.referenceManager.fetchSyncBlocksData([syncBlockNode]);
     } catch (error) {
       // Set error state if fetching fails
       setSyncBlockInstance({
@@ -25,19 +24,19 @@ export const useFetchSyncBlockData = (manager, resourceId, localId) => {
       });
     }
     setIsLoading(false);
-  }, [isLoading, localId, referenceSyncBlockStoreManager, resourceId]);
+  }, [isLoading, localId, manager.referenceManager, resourceId]);
   useEffect(() => {
-    const unsubscribe = referenceSyncBlockStoreManager.subscribeToSyncBlock(resourceId || '', localId || '', data => {
+    const unsubscribe = manager.referenceManager.subscribeToSyncBlock(resourceId || '', localId || '', data => {
       setSyncBlockInstance(data);
       setIsLoading(false);
     });
     return () => {
       unsubscribe();
     };
-  }, [localId, referenceSyncBlockStoreManager, resourceId]);
+  }, [localId, manager.referenceManager, resourceId]);
   return {
     isLoading,
-    providerFactory: referenceSyncBlockStoreManager.getProviderFactory(resourceId || ''),
+    providerFactory: manager.referenceManager.getProviderFactory(resourceId || ''),
     reloadData,
     syncBlockInstance
   };

package/dist/es2019/hooks/useFetchSyncBlockTitle.js

@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
 export const useFetchSyncBlockTitle = (manager, syncBlockNode) => {
   const [sourceTitle, setSourceTitle] = useState(undefined);
   useEffect(() => {
-    const unsubscribe = manager.subscribeToSyncBlockSourceTitle(syncBlockNode, title => {
+    const unsubscribe = manager.referenceManager.subscribeToSourceTitle(syncBlockNode, title => {
       setSourceTitle(title);
     });
     return () => {

package/dist/es2019/hooks/useHandleContentChanges.js

@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 export const useHandleContentChanges = (manager, syncBlockNode) => {
   useEffect(() => {
     try {
-      manager.updateSyncBlockData(syncBlockNode);
+      manager.sourceManager.updateSyncBlockData(syncBlockNode);
     } catch {
       //TODO: EDITOR-1921 - add error analytics
     }

package/dist/es2019/index.js

@@ -1,16 +1,26 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
 
+// common
 export { rebaseTransaction } from './common/rebase-transaction';
 export { SyncBlockError } from './common/types';
+// hooks
 export { useFetchSyncBlockData } from './hooks/useFetchSyncBlockData';
 export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
-export { blockResourceIdFromSourceAndLocalId, getLocalIdFromResourceId } from './providers/block-service/ari';
+
+// clients
+export { blockResourceIdFromSourceAndLocalId, getLocalIdFromBlockResourceId } from './clients/block-service/ari';
+export { getConfluencePageAri, getLocalIdFromConfluencePageAri, getPageARIFromContentPropertyResourceId, getPageIdAndTypeFromConfluencePageAri, resourceIdFromConfluencePageSourceIdAndLocalId } from './clients/confluence/ari';
+
+// providers
 export { useMemoizedBlockServiceAPIProviders } from './providers/block-service/blockServiceAPI';
 export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders } from './providers/confluence/confluenceContentAPI';
+export { fetchConfluenceSourceInfo } from './clients/confluence/sourceInfo';
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
+// store managers
 export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
 export { SyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
-export { getConfluencePageAri, getLocalIdFromAri, getPageARIFromResourceId, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId } from './utils/ari';
-export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode } from './utils/utils';
-export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';
+
+// utils
+export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';
+export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode, convertPMNodesToSyncBlockNodes } from './utils/utils';

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

@@ -1,8 +1,8 @@
 import { useMemo } from 'react';
+import { blockResourceIdFromSourceAndLocalId, getLocalIdFromBlockResourceId } from '../../clients/block-service/ari';
+import { BlockError, createSyncedBlock, deleteSyncedBlock, getSyncedBlockContent, updateSyncedBlock } from '../../clients/block-service/blockService';
 import { SyncBlockError } from '../../common/types';
-import { BlockError, createSyncedBlock, deleteSyncedBlock, getSyncedBlockContent, updateSyncedBlock } from '../../utils/blockService';
 import { stringifyError } from '../../utils/errorHandling';
-import { blockResourceIdFromSourceAndLocalId, getLocalIdFromResourceId } from './ari';
 const mapBlockError = error => {
   switch (error.status) {
     case 403:
@@ -20,7 +20,7 @@ class BlockServiceADFFetchProvider {
   // resourceId is the ARI of the block. E.G ari:cloud:blocks:site-123:synced-block/uuid-456
   // in the content API provider, this was the concatenation of the source document's ARI and the local ID. E.G ari:cloud:confluence:site-123:page/pageId/uuid-456
   async fetchData(resourceId) {
-    const localId = getLocalIdFromResourceId(resourceId);
+    const localId = getLocalIdFromBlockResourceId(resourceId);
     try {
       const blockContentResponse = await getSyncedBlockContent({
         blockAri: resourceId
@@ -59,7 +59,7 @@ class BlockServiceADFFetchProvider {
   retrieveSourceInfoFetchData(resourceId, pageARI) {
     let sourceLocalId;
     try {
-      sourceLocalId = getLocalIdFromResourceId(resourceId);
+      sourceLocalId = getLocalIdFromBlockResourceId(resourceId);
     } catch (error) {
       // EDITOR-1921: log analytic here, safe to continue
     }

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

@@ -1,10 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { useMemo } from 'react';
+import { getConfluencePageAri, getPageARIFromContentPropertyResourceId, 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';
-import { getConfluencePageAri, getPageARIFromResourceId, getLocalIdFromAri, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId } from '../../utils/ari';
-import { getContentProperty, createContentProperty, updateContentProperty, deleteContentProperty } from '../../utils/contentProperty';
 import { stringifyError } from '../../utils/errorHandling';
-import { isBlogPageType } from '../../utils/utils';
 
 /**
  * Configuration for Content API providers
@@ -51,8 +51,8 @@ class ConfluenceADFFetchProvider {
     const {
       id: pageId,
       type: pageType
-    } = getPageIdAndTypeFromAri(resourceId);
-    const localId = getLocalIdFromAri(resourceId);
+    } = getPageIdAndTypeFromConfluencePageAri(resourceId);
+    const localId = getLocalIdFromConfluencePageAri(resourceId);
     try {
       const key = getContentPropertyKey(this.config.contentPropertyKey, localId);
       const options = {
@@ -99,10 +99,10 @@ class ConfluenceADFFetchProvider {
     }
   }
   retrieveSourceInfoFetchData(resourceId) {
-    const pageARI = getPageARIFromResourceId(resourceId);
+    const pageARI = getPageARIFromContentPropertyResourceId(resourceId);
     let sourceLocalId;
     try {
-      sourceLocalId = getLocalIdFromAri(resourceId);
+      sourceLocalId = getLocalIdFromConfluencePageAri(resourceId);
     } catch (error) {
       // EDITOR-1921: log analytic here, safe to continue
     }
@@ -152,7 +152,7 @@ class ConfluenceADFWriteProvider {
       resourceId
     } = data;
     try {
-      match = getPageIdAndTypeFromAri(data.resourceId);
+      match = getPageIdAndTypeFromConfluencePageAri(data.resourceId);
     } catch (error) {
       return {
         error: stringifyError(error)
@@ -164,7 +164,7 @@ class ConfluenceADFWriteProvider {
     } = match;
     try {
       // Update existing content property
-      const localId = getLocalIdFromAri(resourceId);
+      const localId = getLocalIdFromConfluencePageAri(resourceId);
       const key = getContentPropertyKey(this.config.contentPropertyKey, localId);
       const sourceAri = getConfluencePageAri(pageId, this.config.cloudId, pageType);
       const syncBlockDataWithSourceDocumentAri = {
@@ -209,7 +209,7 @@ class ConfluenceADFWriteProvider {
   async deleteData(resourceId) {
     let deletePayload, deleteResult, match;
     try {
-      match = getPageIdAndTypeFromAri(resourceId);
+      match = getPageIdAndTypeFromConfluencePageAri(resourceId);
     } catch (error) {
       return {
         resourceId,
@@ -222,7 +222,7 @@ class ConfluenceADFWriteProvider {
       type: pageType
     } = match;
     try {
-      const localId = getLocalIdFromAri(resourceId);
+      const localId = getLocalIdFromConfluencePageAri(resourceId);
       const key = getContentPropertyKey(this.config.contentPropertyKey, localId);
       const options = {
         pageId,
@@ -247,7 +247,7 @@ class ConfluenceADFWriteProvider {
     };
   }
   generateResourceId(sourceId, localId) {
-    return resourceIdFromSourceAndLocalId(sourceId, localId);
+    return resourceIdFromConfluencePageSourceIdAndLocalId(sourceId, localId);
   }
 }