@atlaskit/editor-synced-block-provider 2.12.2 → 2.13.0

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

@@ -3,17 +3,29 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+/* eslint-disable require-unicode-regexp  */
 import { useMemo } from 'react';
-import { blockResourceIdFromSourceAndLocalId, getLocalIdFromBlockResourceId } from '../../clients/block-service/ari';
+import { generateBlockAri, generateBlockAriFromReference } from '../../clients/block-service/ari';
 import { BlockError, createSyncedBlock, deleteSyncedBlock, getReferenceSyncedBlocks, getSyncedBlockContent, updateSyncedBlock } from '../../clients/block-service/blockService';
 import { SyncBlockError } from '../../common/types';
 import { stringifyError } from '../../utils/errorHandling';
 var mapBlockError = function mapBlockError(error) {
   switch (error.status) {
+    case 400:
+    case 401:
+      return SyncBlockError.InvalidRequest;
     case 403:
       return SyncBlockError.Forbidden;
     case 404:
       return SyncBlockError.NotFound;
+    case 409:
+      return SyncBlockError.Conflict;
+    case 429:
+      return SyncBlockError.RateLimited;
+    case 500:
+    case 503:
+    case 504:
+      return SyncBlockError.ServerError;
   }
   return SyncBlockError.Errored;
 };
@@ -97,24 +109,26 @@ export var fetchReferences = /*#__PURE__*/function () {
  * ADFFetchProvider implementation that fetches synced block data from Block Service API
  */
 var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
-  function BlockServiceADFFetchProvider() {
+  function BlockServiceADFFetchProvider(sourceAri) {
     _classCallCheck(this, BlockServiceADFFetchProvider);
+    this.sourceAri = sourceAri;
   }
+
+  // resourceId of the reference synced block.
+  // the ARI must be constructed to call the block service API
   return _createClass(BlockServiceADFFetchProvider, [{
     key: "fetchData",
-    value: // 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
-    function () {
+    value: function () {
       var _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resourceId) {
-        var localId, blockContentResponse, value, syncedBlockData;
+        var blockAri, blockContentResponse, value, syncedBlockData;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              localId = getLocalIdFromBlockResourceId(resourceId);
+              blockAri = generateBlockAriFromReference(this.sourceAri, resourceId);
               _context2.prev = 1;
               _context2.next = 4;
               return getSyncedBlockContent({
-                blockAri: resourceId
+                blockAri: blockAri
               });
             case 4:
               blockContentResponse = _context2.sent;
@@ -133,8 +147,9 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
               return _context2.abrupt("return", {
                 data: {
                   content: syncedBlockData,
-                  resourceId: resourceId,
-                  blockInstanceId: localId,
+                  resourceId: blockAri,
+                  blockInstanceId: blockContentResponse.blockInstanceId,
+                  // this was the node's localId, but has become the resourceId.
                   sourceAri: blockContentResponse.sourceAri,
                   product: blockContentResponse.product
                 },
@@ -160,7 +175,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[1, 12]]);
+        }, _callee2, this, [[1, 12]]);
       }));
       function fetchData(_x2) {
         return _fetchData.apply(this, arguments);
@@ -184,42 +199,43 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
     key: "writeData",
     value: function () {
       var _writeData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(data) {
-        var resourceId;
+        var resourceId, blockAri;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               resourceId = data.resourceId;
-              _context3.prev = 1;
-              _context3.next = 4;
+              blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
+              _context3.prev = 2;
+              _context3.next = 5;
               return updateSyncedBlock({
-                blockAri: resourceId,
+                blockAri: blockAri,
                 content: JSON.stringify(data.content)
               });
-            case 4:
+            case 5:
               return _context3.abrupt("return", {
                 resourceId: resourceId
               });
-            case 7:
-              _context3.prev = 7;
-              _context3.t0 = _context3["catch"](1);
+            case 8:
+              _context3.prev = 8;
+              _context3.t0 = _context3["catch"](2);
               if (!(_context3.t0 instanceof BlockError)) {
-                _context3.next = 11;
+                _context3.next = 12;
                 break;
               }
               return _context3.abrupt("return", {
                 error: mapBlockError(_context3.t0),
                 resourceId: resourceId
               });
-            case 11:
+            case 12:
               return _context3.abrupt("return", {
                 error: stringifyError(_context3.t0),
                 resourceId: resourceId
               });
-            case 12:
+            case 13:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, null, [[1, 7]]);
+        }, _callee3, this, [[2, 8]]);
       }));
       function writeData(_x3) {
         return _writeData.apply(this, arguments);
@@ -230,45 +246,46 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
     key: "createData",
     value: function () {
       var _createData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(data) {
-        var resourceId;
+        var resourceId, blockAri;
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               resourceId = data.resourceId;
-              _context4.prev = 1;
-              _context4.next = 4;
+              blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
+              _context4.prev = 2;
+              _context4.next = 5;
               return createSyncedBlock({
-                blockAri: resourceId,
+                blockAri: blockAri,
                 blockInstanceId: data.blockInstanceId,
                 sourceAri: this.sourceAri,
                 product: this.product,
                 content: JSON.stringify(data.content)
               });
-            case 4:
+            case 5:
               return _context4.abrupt("return", {
                 resourceId: resourceId
               });
-            case 7:
-              _context4.prev = 7;
-              _context4.t0 = _context4["catch"](1);
+            case 8:
+              _context4.prev = 8;
+              _context4.t0 = _context4["catch"](2);
               if (!(_context4.t0 instanceof BlockError)) {
-                _context4.next = 11;
+                _context4.next = 12;
                 break;
               }
               return _context4.abrupt("return", {
                 error: mapBlockError(_context4.t0),
                 resourceId: resourceId
               });
-            case 11:
+            case 12:
               return _context4.abrupt("return", {
                 error: stringifyError(_context4.t0),
                 resourceId: resourceId
               });
-            case 12:
+            case 13:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[1, 7]]);
+        }, _callee4, this, [[2, 8]]);
       }));
       function createData(_x4) {
         return _createData.apply(this, arguments);
@@ -279,25 +296,27 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
     key: "deleteData",
     value: function () {
       var _deleteData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(resourceId) {
+        var blockAri;
         return _regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context5.prev = 0;
-              _context5.next = 3;
+              blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
+              _context5.prev = 1;
+              _context5.next = 4;
               return deleteSyncedBlock({
-                blockAri: resourceId
+                blockAri: blockAri
               });
-            case 3:
+            case 4:
               return _context5.abrupt("return", {
                 resourceId: resourceId,
                 success: true,
                 error: undefined
               });
-            case 6:
-              _context5.prev = 6;
-              _context5.t0 = _context5["catch"](0);
+            case 7:
+              _context5.prev = 7;
+              _context5.t0 = _context5["catch"](1);
               if (!(_context5.t0 instanceof BlockError)) {
-                _context5.next = 10;
+                _context5.next = 11;
                 break;
               }
               return _context5.abrupt("return", {
@@ -305,27 +324,37 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
                 success: false,
                 error: mapBlockError(_context5.t0)
               });
-            case 10:
+            case 11:
               return _context5.abrupt("return", {
                 resourceId: resourceId,
                 success: false,
                 error: stringifyError(_context5.t0)
               });
-            case 11:
+            case 12:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, null, [[0, 6]]);
+        }, _callee5, this, [[1, 7]]);
       }));
       function deleteData(_x5) {
         return _deleteData.apply(this, arguments);
       }
       return deleteData;
-    }()
+    }() // the sourceId is the resourceId of the source synced block.
+  }, {
+    key: "generateResourceIdForReference",
+    value: function generateResourceIdForReference(sourceId) {
+      var match = this.sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
+      if (!(match !== null && match !== void 0 && match[1])) {
+        throw new Error("Invalid source ARI: ".concat(this.sourceAri));
+      }
+      var pageId = match[3];
+      return "".concat(this.product, "/").concat(pageId, "/").concat(sourceId);
+    }
   }, {
     key: "generateResourceId",
-    value: function generateResourceId(sourceAri, localId) {
-      return blockResourceIdFromSourceAndLocalId(sourceAri, localId);
+    value: function generateResourceId() {
+      return crypto.randomUUID();
     }
   }]);
 }();
@@ -333,7 +362,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
  * Factory function to create both providers with shared configuration
  */
 var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(sourceAri, product) {
-  var fetchProvider = new BlockServiceADFFetchProvider();
+  var fetchProvider = new BlockServiceADFFetchProvider(sourceAri);
   var writeProvider = new BlockServiceADFWriteProvider(sourceAri, product);
   return {
     fetchProvider: fetchProvider,

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

@@ -149,6 +149,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
   function ConfluenceADFWriteProvider(config) {
     var _this = this;
     _classCallCheck(this, ConfluenceADFWriteProvider);
+    _defineProperty(this, "product", 'confluence-page');
     _defineProperty(this, "createNewContentProperty", /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(pageId, key, value, pageType) {
         var options, _contentProperty$data3, contentProperty, _contentProperty2$dat, _contentProperty2;
@@ -397,6 +398,11 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
     value: function generateResourceId(sourceId, localId) {
       return resourceIdFromConfluencePageSourceIdAndLocalId(sourceId, localId);
     }
+  }, {
+    key: "generateResourceIdForReference",
+    value: function generateResourceIdForReference(sourceId) {
+      return sourceId;
+    }
   }]);
 }();
 /**

package/dist/esm/providers/syncBlockProvider.js

@@ -36,16 +36,21 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
     _this.providerOptions = providerOptions;
     return _this;
   }
-
-  /**
-   * Check if the node is supported by the provider
-   *
-   * @param node
-   *
-   * @returns True if the node is supported, false otherwise
-   */
   _inherits(SyncBlockProvider, _SyncBlockDataProvide);
   return _createClass(SyncBlockProvider, [{
+    key: "getProduct",
+    value: function getProduct() {
+      return this.writeProvider.product;
+    }
+
+    /**
+     * Check if the node is supported by the provider
+     *
+     * @param node
+     *
+     * @returns True if the node is supported, false otherwise
+     */
+  }, {
     key: "isNodeSupported",
     value: function isNodeSupported(node) {
       return node.type === 'syncBlock' || node.type === 'bodiedSyncBlock';
@@ -241,6 +246,11 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
     value: function generateResourceId(sourceId, localId) {
       return this.writeProvider.generateResourceId(sourceId, localId);
     }
+  }, {
+    key: "generateResourceIdForReference",
+    value: function generateResourceIdForReference(sourceId) {
+      return this.writeProvider.generateResourceIdForReference(sourceId);
+    }
 
     /**
      * Get the synced block renderer provider options

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

@@ -34,6 +34,14 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     this.fireAnalyticsEvent = fireAnalyticsEvent;
   }
   return _createClass(ReferenceSyncBlockStoreManager, [{
+    key: "generateResourceIdForReference",
+    value: function generateResourceIdForReference(sourceId) {
+      if (!this.dataProvider) {
+        throw new Error('Data provider not set');
+      }
+      return this.dataProvider.generateResourceIdForReference(sourceId);
+    }
+  }, {
     key: "updateFireAnalyticsEvent",
     value: function updateFireAnalyticsEvent(fireAnalyticsEvent) {
       this.fireAnalyticsEvent = fireAnalyticsEvent;

package/dist/esm/utils/resolveSyncBlockInstance.js

@@ -19,10 +19,10 @@ export var resolveSyncBlockInstance = function resolveSyncBlockInstance(oldResul
     return newResult;
   } else if (!newResult.data) {
     // return the old result if there was an error, e.g. network error, but not if not found or forbidden
-    if (newResult.error === SyncBlockError.Errored) {
-      return oldResult;
-    } else {
+    if (newResult.error === SyncBlockError.NotFound || newResult.error === SyncBlockError.Forbidden) {
       return newResult;
+    } else {
+      return oldResult;
     }
   }
 

package/dist/esm/utils/retry.js

@@ -0,0 +1,60 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+var parseRetryAfter = function parseRetryAfter(retryAfter) {
+  var newDelay;
+
+  // retryAfter can either be in ms or HTTP date
+  var parsedRetryAfter = parseInt(retryAfter);
+  if (!isNaN(parsedRetryAfter)) {
+    newDelay = parsedRetryAfter * 1000;
+  } else {
+    var retryDate = new Date(retryAfter);
+    var delayFromDate = retryDate.getTime() - Date.now();
+    if (delayFromDate > 0) {
+      newDelay = delayFromDate;
+    }
+  }
+  return newDelay;
+};
+var _fetchWithRetry = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(url, options) {
+    var retriesRemaining,
+      delay,
+      response,
+      shouldRetry,
+      retryAfter,
+      _args = arguments;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          retriesRemaining = _args.length > 2 && _args[2] !== undefined ? _args[2] : 3;
+          delay = _args.length > 3 && _args[3] !== undefined ? _args[3] : 1000;
+          _context.next = 4;
+          return fetch(url, options);
+        case 4:
+          response = _context.sent;
+          shouldRetry = !response.ok && response.status === 429 && retriesRemaining > 1;
+          if (shouldRetry) {
+            _context.next = 8;
+            break;
+          }
+          return _context.abrupt("return", response);
+        case 8:
+          retryAfter = response.headers.get('Retry-After');
+          _context.next = 11;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, retryAfter ? parseRetryAfter(retryAfter) : delay);
+          });
+        case 11:
+          return _context.abrupt("return", _fetchWithRetry(url, options, retriesRemaining - 1, delay * 2));
+        case 12:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function fetchWithRetry(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export { _fetchWithRetry as fetchWithRetry };

package/dist/types/clients/block-service/ari.d.ts

@@ -1,10 +1,18 @@
+import { type SyncBlockProduct } from "../../common/types";
 /**
- * Generates a unique block ARI from a source ARI and a local ID.
- * @param sourceId - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
- * @param localId - the localId of the block node. A randomly generated UUID
- * @returns the block ARI. E.G ari:cloud:blocks:cloudId:synced-block/localId
+ * Generates the block ARI from the source page ARI and the source block's resource ID.
+ * @param sourceAri - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
+ * @param resourceId - the resource ID of the block node. A randomly generated UUID
+ * @returns the block ARI. E.G ari:cloud:blocks:<cloudId>:synced-block/<product>/<pageId>/<resourceId>
  */
-export declare const blockResourceIdFromSourceAndLocalId: (sourceId: string, localId: string) => string;
+export declare const generateBlockAri: (sourceAri: string, resourceId: string, product: SyncBlockProduct) => string;
+/**
+ *
+ * @param sourceAri - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
+ * @param resourceId - the resource ID of the reference synced block. E.G confluence-page/pageId/sourceResourceId
+ * @returns the block ARI. E.G ari:cloud:blocks:<cloudId>:synced-block/<product>/<pageId>/<resourceId>
+ */
+export declare const generateBlockAriFromReference: (sourceAri: string, resourceId: string) => string;
 /**
  * Extracts the local ID from a block ARI.
  * @param ari - the block ARI. E.G ari:cloud:blocks:cloudId:synced-block/localId

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

@@ -16,6 +16,10 @@ export declare enum SyncBlockError {
     Errored = "errored",
     NotFound = "not_found",
     Forbidden = "forbidden",
+    InvalidRequest = "invalid_request",
+    RateLimited = "rate_limited",
+    Conflict = "conflict",// attempt to create block that already exists
+    ServerError = "server_error",
     InvalidContent = "invalid_content"
 }
 export interface SyncBlockData {
@@ -25,6 +29,9 @@ export interface SyncBlockData {
     createdBy?: string;
     isSynced?: boolean;
     product?: SyncBlockProduct;
+    /**
+     * The ARI of the block. E.G ari:cloud:blocks:<cloudId>:synced-block/<product>/<pageId>/<resourceId>
+     */
     resourceId: ResourceId;
     sourceAri?: string;
     sourceTitle?: string;

package/dist/types/index.d.ts

@@ -4,7 +4,7 @@ export type { SyncBlockData, SyncBlockNode, SyncBlockProduct, BlockInstanceId, }
 export { useFetchSyncBlockData, type UseFetchSyncBlockDataResult, } from './hooks/useFetchSyncBlockData';
 export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
-export { blockResourceIdFromSourceAndLocalId, getLocalIdFromBlockResourceId, } from './clients/block-service/ari';
+export { generateBlockAri, generateBlockAriFromReference, getLocalIdFromBlockResourceId, } from './clients/block-service/ari';
 export { getConfluencePageAri, getLocalIdFromConfluencePageAri, getPageARIFromContentPropertyResourceId, getPageIdAndTypeFromConfluencePageAri, resourceIdFromConfluencePageSourceIdAndLocalId, } from './clients/confluence/ari';
 export { useMemoizedBlockServiceAPIProviders } from './providers/block-service/blockServiceAPI';
 export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders, } from './providers/confluence/confluenceContentAPI';

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

@@ -1,10 +1,12 @@
-import { SyncBlockError, type SyncBlockData, type SyncBlockProduct } from '../../common/types';
+import { SyncBlockError, type ResourceId, type SyncBlockData, type SyncBlockProduct } from '../../common/types';
 import type { ADFFetchProvider, ADFWriteProvider, DeleteSyncBlockResult, SyncBlockInstance, WriteSyncBlockResult } from '../types';
 export declare const fetchReferences: (documentAri: string) => Promise<SyncBlockInstance[] | SyncBlockError>;
 /**
  * ADFFetchProvider implementation that fetches synced block data from Block Service API
  */
 declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
+    private sourceAri;
+    constructor(sourceAri: string);
     fetchData(resourceId: string): Promise<SyncBlockInstance>;
 }
 /**
@@ -12,12 +14,13 @@ declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
  */
 declare class BlockServiceADFWriteProvider implements ADFWriteProvider {
     private sourceAri;
-    private product;
+    product: SyncBlockProduct;
     constructor(sourceAri: string, product: SyncBlockProduct);
     writeData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     createData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     deleteData(resourceId: string): Promise<DeleteSyncBlockResult>;
-    generateResourceId(sourceAri: string, localId: string): string;
+    generateResourceIdForReference(sourceId: ResourceId): ResourceId;
+    generateResourceId(): ResourceId;
 }
 export declare const useMemoizedBlockServiceAPIProviders: (sourceAri: string, product: SyncBlockProduct) => {
     fetchProvider: BlockServiceADFFetchProvider;

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

@@ -1,4 +1,4 @@
-import { type SyncBlockData } from '../../common/types';
+import { type ResourceId, type SyncBlockData, type SyncBlockProduct } from '../../common/types';
 import type { ADFFetchProvider, ADFWriteProvider, DeleteSyncBlockResult, SyncBlockInstance, WriteSyncBlockResult } from '../types';
 /**
  * Configuration for Content API providers
@@ -20,12 +20,14 @@ declare class ConfluenceADFFetchProvider implements ADFFetchProvider {
  */
 declare class ConfluenceADFWriteProvider implements ADFWriteProvider {
     private config;
+    product: SyncBlockProduct;
     constructor(config: ContentAPIConfig);
     private createNewContentProperty;
     writeData(syncBlockData: SyncBlockData): Promise<WriteSyncBlockResult>;
     createData(syncBlockData: SyncBlockData): Promise<WriteSyncBlockResult>;
     deleteData(resourceId: string): Promise<DeleteSyncBlockResult>;
     generateResourceId(sourceId: string, localId: string): string;
+    generateResourceIdForReference(sourceId: ResourceId): ResourceId;
 }
 /**
  * Convenience function to create providers with default content property key

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

@@ -17,6 +17,7 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
      * @param nestedRendererDataProviders
      */
     constructor(fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string, providerOptions: SyncedBlockRendererProviderOptions);
+    getProduct(): SyncBlockProduct | undefined;
     /**
      * Check if the node is supported by the provider
      *
@@ -77,6 +78,7 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
      */
     fetchSyncBlockSourceInfo(localId: BlockInstanceId, sourceAri: string, sourceProduct: SyncBlockProduct, fireAnalyticsEvent?: (payload: RendererSyncBlockEventPayload) => void): Promise<SyncBlockSourceInfo | undefined>;
     generateResourceId(sourceId: string, localId: BlockInstanceId): string;
+    generateResourceIdForReference(sourceId: ResourceId): ResourceId;
     /**
      * Get the synced block renderer provider options
      *

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

@@ -13,6 +13,9 @@ import type { SyncBlockData, ResourceId, SyncBlockError, SyncBlockNode, SyncBloc
 export type SyncBlockInstance = {
     data?: SyncBlockData;
     error?: SyncBlockError;
+    /**
+     *  The resourceId in the attrs of the block
+     */
     resourceId: ResourceId;
 };
 export type DeleteSyncBlockResult = {
@@ -43,6 +46,8 @@ export interface ADFWriteProvider {
     createData: (data: SyncBlockData) => Promise<WriteSyncBlockResult>;
     deleteData: (resourceId: ResourceId) => Promise<DeleteSyncBlockResult>;
     generateResourceId: (sourceId: string, localId: string) => ResourceId;
+    generateResourceIdForReference: (sourceId: ResourceId) => ResourceId;
+    product: SyncBlockProduct;
     writeData: (data: SyncBlockData) => Promise<WriteSyncBlockResult>;
 }
 export type MediaEmojiProviderOptions = {
@@ -67,6 +72,7 @@ export declare abstract class SyncBlockDataProvider extends NodeDataProvider<Syn
     abstract createNodeData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     abstract deleteNodesData(resourceIds: string[]): Promise<Array<DeleteSyncBlockResult>>;
     abstract getSourceId(): ResourceId;
+    abstract getProduct(): SyncBlockProduct | undefined;
     abstract fetchSyncBlockSourceInfo(localId: BlockInstanceId, sourceAri: string, sourceProduct: SyncBlockProduct, fireAnalyticsEvent?: (payload: RendererSyncBlockEventPayload) => void): Promise<SyncBlockSourceInfo | undefined>;
     abstract getSyncedBlockRendererProviderOptions(): SyncedBlockRendererProviderOptions;
     abstract retrieveSyncBlockParentInfo(sourceAri: string, sourceProduct: SyncBlockProduct): SyncBlockParentInfo | undefined;
@@ -77,6 +83,7 @@ export declare abstract class SyncBlockDataProvider extends NodeDataProvider<Syn
      * @returns The generated resource ID
      */
     abstract generateResourceId(sourceId: ResourceId, localId: BlockInstanceId): ResourceId;
+    abstract generateResourceIdForReference(sourceId: ResourceId): ResourceId;
 }
 export type SubscriptionCallback = (data: SyncBlockInstance) => void;
 export type TitleSubscriptionCallback = (title: string) => void;

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

@@ -13,6 +13,7 @@ export declare class ReferenceSyncBlockStoreManager {
     private syncBlockURLRequests;
     private isRefreshingSubscriptions;
     constructor(dataProvider?: SyncBlockDataProvider, fireAnalyticsEvent?: (payload: RendererSyncBlockEventPayload) => void);
+    generateResourceIdForReference(sourceId: ResourceId): ResourceId;
     updateFireAnalyticsEvent(fireAnalyticsEvent?: (payload: RendererSyncBlockEventPayload) => void): void;
     /**
      * Refreshes the subscriptions for all sync blocks.

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

@@ -0,0 +1 @@
+export declare const fetchWithRetry: (url: string, options: RequestInit, retriesRemaining?: number, delay?: number) => Promise<Response>;

package/dist/types-ts4.5/clients/block-service/ari.d.ts

@@ -1,10 +1,18 @@
+import { type SyncBlockProduct } from "../../common/types";
 /**
- * Generates a unique block ARI from a source ARI and a local ID.
- * @param sourceId - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
- * @param localId - the localId of the block node. A randomly generated UUID
- * @returns the block ARI. E.G ari:cloud:blocks:cloudId:synced-block/localId
+ * Generates the block ARI from the source page ARI and the source block's resource ID.
+ * @param sourceAri - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
+ * @param resourceId - the resource ID of the block node. A randomly generated UUID
+ * @returns the block ARI. E.G ari:cloud:blocks:<cloudId>:synced-block/<product>/<pageId>/<resourceId>
  */
-export declare const blockResourceIdFromSourceAndLocalId: (sourceId: string, localId: string) => string;
+export declare const generateBlockAri: (sourceAri: string, resourceId: string, product: SyncBlockProduct) => string;
+/**
+ *
+ * @param sourceAri - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
+ * @param resourceId - the resource ID of the reference synced block. E.G confluence-page/pageId/sourceResourceId
+ * @returns the block ARI. E.G ari:cloud:blocks:<cloudId>:synced-block/<product>/<pageId>/<resourceId>
+ */
+export declare const generateBlockAriFromReference: (sourceAri: string, resourceId: string) => string;
 /**
  * Extracts the local ID from a block ARI.
  * @param ari - the block ARI. E.G ari:cloud:blocks:cloudId:synced-block/localId