@atlaskit/editor-synced-block-provider 2.12.3 → 2.13.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.13.1
+
+### Patch Changes
+
+- [`d04179e359d44`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d04179e359d44) -
+  EDITOR-2484 fix flush return on error
+
+## 2.13.0
+
+### Minor Changes
+
+- [`676d28a61e356`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/676d28a61e356) -
+  Add runtime blockAri generation for endpoint calls, update resourceId generation for create
+  reference from toolbar
+
 ## 2.12.3
 
 ### Patch Changes

package/dist/cjs/clients/block-service/ari.js

@@ -3,21 +3,38 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLocalIdFromBlockResourceId = exports.blockResourceIdFromSourceAndLocalId = void 0;
+exports.getLocalIdFromBlockResourceId = exports.generateBlockAriFromReference = exports.generateBlockAri = void 0;
 /* eslint-disable require-unicode-regexp */
+
+/**
+ * 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>
+ */
+var generateBlockAri = exports.generateBlockAri = function generateBlockAri(sourceAri, resourceId, product) {
+  var match = sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
+  if (!(match !== null && match !== void 0 && match[1])) {
+    throw new Error("Invalid source ARI: ".concat(sourceAri));
+  }
+  var cloudId = match[1];
+  var pageId = match[3];
+  return "ari:cloud:blocks:".concat(cloudId, ":synced-block/").concat(product, "/").concat(pageId, "/").concat(resourceId);
+};
+
 /**
- * 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
+ *
+ * @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>
  */
-var blockResourceIdFromSourceAndLocalId = exports.blockResourceIdFromSourceAndLocalId = function blockResourceIdFromSourceAndLocalId(sourceId, localId) {
-  var match = sourceId.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/.*/);
+var generateBlockAriFromReference = exports.generateBlockAriFromReference = function generateBlockAriFromReference(sourceAri, resourceId) {
+  var match = sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
   if (!(match !== null && match !== void 0 && match[1])) {
-    throw new Error("Invalid source ARI: ".concat(sourceId));
+    throw new Error("Invalid source ARI: ".concat(sourceAri));
   }
   var cloudId = match[1];
-  return "ari:cloud:blocks:".concat(cloudId, ":synced-block/").concat(localId);
+  return "ari:cloud:blocks:".concat(cloudId, ":synced-block/").concat(resourceId);
 };
 
 /**

package/dist/cjs/index.js

@@ -27,12 +27,6 @@ Object.defineProperty(exports, "SyncedBlockProvider", {
     return _syncBlockProvider.SyncBlockProvider;
   }
 });
-Object.defineProperty(exports, "blockResourceIdFromSourceAndLocalId", {
-  enumerable: true,
-  get: function get() {
-    return _ari.blockResourceIdFromSourceAndLocalId;
-  }
-});
 Object.defineProperty(exports, "convertPMNodesToSyncBlockNodes", {
   enumerable: true,
   get: function get() {
@@ -75,6 +69,18 @@ Object.defineProperty(exports, "fetchReferences", {
     return _blockServiceAPI.fetchReferences;
   }
 });
+Object.defineProperty(exports, "generateBlockAri", {
+  enumerable: true,
+  get: function get() {
+    return _ari.generateBlockAri;
+  }
+});
+Object.defineProperty(exports, "generateBlockAriFromReference", {
+  enumerable: true,
+  get: function get() {
+    return _ari.generateBlockAriFromReference;
+  }
+});
 Object.defineProperty(exports, "getConfluencePageAri", {
   enumerable: true,
   get: function get() {

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

@@ -15,6 +15,8 @@ var _ari = require("../../clients/block-service/ari");
 var _blockService = require("../../clients/block-service/blockService");
 var _types = require("../../common/types");
 var _errorHandling = require("../../utils/errorHandling");
+/* eslint-disable require-unicode-regexp  */
+
 var mapBlockError = function mapBlockError(error) {
   switch (error.status) {
     case 400:
@@ -115,24 +117,26 @@ var fetchReferences = exports.fetchReferences = /*#__PURE__*/function () {
  * ADFFetchProvider implementation that fetches synced block data from Block Service API
  */
 var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
-  function BlockServiceADFFetchProvider() {
+  function BlockServiceADFFetchProvider(sourceAri) {
     (0, _classCallCheck2.default)(this, BlockServiceADFFetchProvider);
+    this.sourceAri = sourceAri;
   }
+
+  // resourceId of the reference synced block.
+  // the ARI must be constructed to call the block service API
   return (0, _createClass2.default)(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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(resourceId) {
-        var localId, blockContentResponse, value, syncedBlockData;
+        var blockAri, blockContentResponse, value, syncedBlockData;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              localId = (0, _ari.getLocalIdFromBlockResourceId)(resourceId);
+              blockAri = (0, _ari.generateBlockAriFromReference)(this.sourceAri, resourceId);
               _context2.prev = 1;
               _context2.next = 4;
               return (0, _blockService.getSyncedBlockContent)({
-                blockAri: resourceId
+                blockAri: blockAri
               });
             case 4:
               blockContentResponse = _context2.sent;
@@ -151,8 +155,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
                 },
@@ -178,7 +183,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);
@@ -202,42 +207,43 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
     key: "writeData",
     value: function () {
       var _writeData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(data) {
-        var resourceId;
+        var resourceId, blockAri;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               resourceId = data.resourceId;
-              _context3.prev = 1;
-              _context3.next = 4;
+              blockAri = (0, _ari.generateBlockAri)(this.sourceAri, resourceId, this.product);
+              _context3.prev = 2;
+              _context3.next = 5;
               return (0, _blockService.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 _blockService.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: (0, _errorHandling.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);
@@ -248,45 +254,46 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
     key: "createData",
     value: function () {
       var _createData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(data) {
-        var resourceId;
+        var resourceId, blockAri;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               resourceId = data.resourceId;
-              _context4.prev = 1;
-              _context4.next = 4;
+              blockAri = (0, _ari.generateBlockAri)(this.sourceAri, resourceId, this.product);
+              _context4.prev = 2;
+              _context4.next = 5;
               return (0, _blockService.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 _blockService.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: (0, _errorHandling.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);
@@ -297,25 +304,27 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
     key: "deleteData",
     value: function () {
       var _deleteData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(resourceId) {
+        var blockAri;
         return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context5.prev = 0;
-              _context5.next = 3;
+              blockAri = (0, _ari.generateBlockAri)(this.sourceAri, resourceId, this.product);
+              _context5.prev = 1;
+              _context5.next = 4;
               return (0, _blockService.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 _blockService.BlockError)) {
-                _context5.next = 10;
+                _context5.next = 11;
                 break;
               }
               return _context5.abrupt("return", {
@@ -323,27 +332,37 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
                 success: false,
                 error: mapBlockError(_context5.t0)
               });
-            case 10:
+            case 11:
               return _context5.abrupt("return", {
                 resourceId: resourceId,
                 success: false,
                 error: (0, _errorHandling.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 (0, _ari.blockResourceIdFromSourceAndLocalId)(sourceAri, localId);
+    value: function generateResourceId() {
+      return crypto.randomUUID();
     }
   }]);
 }();
@@ -351,7 +370,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/cjs/providers/confluence/confluenceContentAPI.js

@@ -155,6 +155,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
   function ConfluenceADFWriteProvider(config) {
     var _this = this;
     (0, _classCallCheck2.default)(this, ConfluenceADFWriteProvider);
+    (0, _defineProperty2.default)(this, "product", 'confluence-page');
     (0, _defineProperty2.default)(this, "createNewContentProperty", /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(pageId, key, value, pageType) {
         var options, _contentProperty$data3, contentProperty, _contentProperty2$dat, _contentProperty2;
@@ -403,6 +404,11 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
     value: function generateResourceId(sourceId, localId) {
       return (0, _ari.resourceIdFromConfluencePageSourceIdAndLocalId)(sourceId, localId);
     }
+  }, {
+    key: "generateResourceIdForReference",
+    value: function generateResourceIdForReference(sourceId) {
+      return sourceId;
+    }
   }]);
 }();
 /**

package/dist/cjs/providers/syncBlockProvider.js

@@ -43,16 +43,21 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
     _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
-   */
   (0, _inherits2.default)(SyncBlockProvider, _SyncBlockDataProvide);
   return (0, _createClass2.default)(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';
@@ -248,6 +253,11 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
     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/cjs/store-manager/referenceSyncBlockStoreManager.js

@@ -40,6 +40,14 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     this.fireAnalyticsEvent = fireAnalyticsEvent;
   }
   return (0, _createClass2.default)(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/cjs/store-manager/sourceSyncBlockStoreManager.js

@@ -117,7 +117,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
             case 10:
               writeResults = _context.sent;
               if (!writeResults.every(function (result) {
-                return result.resourceId !== undefined;
+                return !result.error;
               })) {
                 _context.next = 15;
                 break;
@@ -125,7 +125,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
               return _context.abrupt("return", true);
             case 15:
               writeResults.filter(function (result) {
-                return result.resourceId === undefined;
+                return result.error;
               }).forEach(function (result) {
                 var _this2$fireAnalyticsE;
                 (_this2$fireAnalyticsE = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE === void 0 || _this2$fireAnalyticsE.call(_this2, (0, _errorHandling.updateErrorPayload)(result.error || 'Failed to write data'));

package/dist/es2019/clients/block-service/ari.js

@@ -1,17 +1,34 @@
 /* eslint-disable require-unicode-regexp */
+
+/**
+ * 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 const generateBlockAri = (sourceAri, resourceId, product) => {
+  const match = sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
+  if (!(match !== null && match !== void 0 && match[1])) {
+    throw new Error(`Invalid source ARI: ${sourceAri}`);
+  }
+  const cloudId = match[1];
+  const pageId = match[3];
+  return `ari:cloud:blocks:${cloudId}:synced-block/${product}/${pageId}/${resourceId}`;
+};
+
 /**
- * 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
+ *
+ * @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 const blockResourceIdFromSourceAndLocalId = (sourceId, localId) => {
-  const match = sourceId.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/.*/);
+export const generateBlockAriFromReference = (sourceAri, resourceId) => {
+  const match = sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
   if (!(match !== null && match !== void 0 && match[1])) {
-    throw new Error(`Invalid source ARI: ${sourceId}`);
+    throw new Error(`Invalid source ARI: ${sourceAri}`);
   }
   const cloudId = match[1];
-  return `ari:cloud:blocks:${cloudId}:synced-block/${localId}`;
+  return `ari:cloud:blocks:${cloudId}:synced-block/${resourceId}`;
 };
 
 /**

package/dist/es2019/index.js

@@ -9,7 +9,7 @@ export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
 
 // clients
-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';
 
 // providers

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

@@ -1,5 +1,6 @@
+/* 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';
@@ -81,13 +82,17 @@ export const fetchReferences = async documentAri => {
  * ADFFetchProvider implementation that fetches synced block data from Block Service API
  */
 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
+  constructor(sourceAri) {
+    this.sourceAri = sourceAri;
+  }
+
+  // resourceId of the reference synced block.
+  // the ARI must be constructed to call the block service API
   async fetchData(resourceId) {
-    const localId = getLocalIdFromBlockResourceId(resourceId);
+    const blockAri = generateBlockAriFromReference(this.sourceAri, resourceId);
     try {
       const blockContentResponse = await getSyncedBlockContent({
-        blockAri: resourceId
+        blockAri
       });
       const value = blockContentResponse.content;
       if (!value) {
@@ -102,8 +107,9 @@ class BlockServiceADFFetchProvider {
       return {
         data: {
           content: syncedBlockData,
-          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
         },
@@ -138,10 +144,11 @@ class BlockServiceADFWriteProvider {
     const {
       resourceId
     } = data;
+    const blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
     try {
       // Try update existing block's content
       await updateSyncedBlock({
-        blockAri: resourceId,
+        blockAri,
         content: JSON.stringify(data.content)
       });
       return {
@@ -164,9 +171,10 @@ class BlockServiceADFWriteProvider {
     const {
       resourceId
     } = data;
+    const blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
     try {
       await createSyncedBlock({
-        blockAri: resourceId,
+        blockAri,
         blockInstanceId: data.blockInstanceId,
         sourceAri: this.sourceAri,
         product: this.product,
@@ -191,9 +199,10 @@ class BlockServiceADFWriteProvider {
 
   // soft deletes the source synced block
   async deleteData(resourceId) {
+    const blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
     try {
       await deleteSyncedBlock({
-        blockAri: resourceId
+        blockAri
       });
       return {
         resourceId,
@@ -215,8 +224,18 @@ class BlockServiceADFWriteProvider {
       };
     }
   }
-  generateResourceId(sourceAri, localId) {
-    return blockResourceIdFromSourceAndLocalId(sourceAri, localId);
+
+  // the sourceId is the resourceId of the source synced block.
+  generateResourceIdForReference(sourceId) {
+    const match = this.sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
+    if (!(match !== null && match !== void 0 && match[1])) {
+      throw new Error(`Invalid source ARI: ${this.sourceAri}`);
+    }
+    const pageId = match[3];
+    return `${this.product}/${pageId}/${sourceId}`;
+  }
+  generateResourceId() {
+    return crypto.randomUUID();
   }
 }
 
@@ -224,7 +243,7 @@ class BlockServiceADFWriteProvider {
  * Factory function to create both providers with shared configuration
  */
 const createBlockServiceAPIProviders = (sourceAri, product) => {
-  const fetchProvider = new BlockServiceADFFetchProvider();
+  const fetchProvider = new BlockServiceADFFetchProvider(sourceAri);
   const writeProvider = new BlockServiceADFWriteProvider(sourceAri, product);
   return {
     fetchProvider,

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

@@ -115,6 +115,7 @@ class ConfluenceADFFetchProvider {
  */
 class ConfluenceADFWriteProvider {
   constructor(config) {
+    _defineProperty(this, "product", 'confluence-page');
     _defineProperty(this, "createNewContentProperty", async (pageId, key, value, pageType) => {
       const options = {
         pageId,
@@ -271,6 +272,9 @@ class ConfluenceADFWriteProvider {
   generateResourceId(sourceId, localId) {
     return resourceIdFromConfluencePageSourceIdAndLocalId(sourceId, localId);
   }
+  generateResourceIdForReference(sourceId) {
+    return sourceId;
+  }
 }
 
 /**