@atlaskit/editor-synced-block-provider 2.8.0 → 2.9.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.9.0
+
+### Minor Changes
+
+- [`e0dc40edfc665`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e0dc40edfc665) -
+  Update the resource ID generation for blockAri format
+
 ## 2.8.0
 
 ### Minor Changes

package/dist/cjs/index.js

@@ -27,6 +27,12 @@ Object.defineProperty(exports, "SyncedBlockProvider", {
     return _syncBlockProvider.SyncBlockProvider;
   }
 });
+Object.defineProperty(exports, "blockResourceIdFromSourceAndLocalId", {
+  enumerable: true,
+  get: function get() {
+    return _ari.blockResourceIdFromSourceAndLocalId;
+  }
+});
 Object.defineProperty(exports, "convertSyncBlockJSONNodeToSyncBlockNode", {
   enumerable: true,
   get: function get() {
@@ -57,6 +63,24 @@ Object.defineProperty(exports, "getConfluencePageAri", {
     return _ari.getConfluencePageAri;
   }
 });
+Object.defineProperty(exports, "getLocalIdFromAri", {
+  enumerable: true,
+  get: function get() {
+    return _ari.getLocalIdFromAri;
+  }
+});
+Object.defineProperty(exports, "getLocalIdFromResourceId", {
+  enumerable: true,
+  get: function get() {
+    return _ari.getLocalIdFromResourceId;
+  }
+});
+Object.defineProperty(exports, "getPageARIFromResourceId", {
+  enumerable: true,
+  get: function get() {
+    return _ari.getPageARIFromResourceId;
+  }
+});
 Object.defineProperty(exports, "getPageIdAndTypeFromAri", {
   enumerable: true,
   get: function get() {
@@ -75,6 +99,12 @@ Object.defineProperty(exports, "resolveSyncBlockInstance", {
     return _resolveSyncBlockInstance.resolveSyncBlockInstance;
   }
 });
+Object.defineProperty(exports, "resourceIdFromSourceAndLocalId", {
+  enumerable: true,
+  get: function get() {
+    return _ari.resourceIdFromSourceAndLocalId;
+  }
+});
 Object.defineProperty(exports, "useFetchSyncBlockData", {
   enumerable: true,
   get: function get() {

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

@@ -34,21 +34,22 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
   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 () {
       var _fetchData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(resourceId) {
-        var localId, contentProperty, value, syncedBlockData;
+        var localId, blockContentResponse, value, syncedBlockData;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              localId = (0, _ari.getLocalIdFromAri)(resourceId);
+              localId = (0, _ari.getLocalIdFromResourceId)(resourceId);
               _context.prev = 1;
               _context.next = 4;
               return (0, _blockService.getSyncedBlockContent)({
                 blockAri: resourceId
               });
             case 4:
-              contentProperty = _context.sent;
-              value = contentProperty.content;
+              blockContentResponse = _context.sent;
+              value = blockContentResponse.content;
               if (value) {
                 _context.next = 8;
                 break;
@@ -58,7 +59,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                 resourceId: resourceId
               });
             case 8:
-              // Parse the synced block content from the property value
+              // Parse the synced block content from the response's content
               syncedBlockData = JSON.parse(value);
               return _context.abrupt("return", {
                 data: {
@@ -106,7 +107,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
   }
   return (0, _createClass2.default)(BlockServiceADFWriteProvider, [{
     key: "writeData",
-    value: // it will first try to update and if it can't (404) then it will try to create 
+    value: // it will first try to update and if it can't (404) then it will try to create
     function () {
       var _writeData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(data) {
         var resourceId;
@@ -137,7 +138,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
               }
               _context2.next = 13;
               return (0, _blockService.createSyncedBlock)({
-                blockAri: (0, _ari.resourceIdFromSourceAndLocalId)(resourceId, data.blockInstanceId),
+                blockAri: resourceId,
                 blockInstanceId: data.blockInstanceId,
                 sourceAri: resourceId,
                 product: 'confluence-page',
@@ -166,7 +167,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
         return _writeData.apply(this, arguments);
       }
       return writeData;
-    }() // soft deletes the source synced block 
+    }() // soft deletes the source synced block
   }, {
     key: "deleteData",
     value: function () {
@@ -214,6 +215,11 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
       }
       return deleteData;
     }()
+  }, {
+    key: "generateResourceId",
+    value: function generateResourceId(sourceId, localId) {
+      return (0, _ari.blockResourceIdFromSourceAndLocalId)(sourceId, localId);
+    }
   }]);
 }();
 /**

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

@@ -343,6 +343,11 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
       }
       return deleteData;
     }()
+  }, {
+    key: "generateResourceId",
+    value: function generateResourceId(sourceId, localId) {
+      return (0, _ari.resourceIdFromSourceAndLocalId)(sourceId, localId);
+    }
   }]);
 }();
 /**

package/dist/cjs/providers/syncBlockProvider.js

@@ -177,6 +177,11 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
       }
       return pageARI ? (0, _sourceInfo.fetchSourceInfo)(pageARI, sourceLocalId) : Promise.resolve(undefined);
     }
+  }, {
+    key: "generateResourceId",
+    value: function generateResourceId(sourceId, localId) {
+      return this.writeProvider.generateResourceId(sourceId, localId);
+    }
   }]);
 }(_types2.SyncBlockDataProvider);
 var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(fetchProvider, writeProvider, sourceId) {

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

@@ -12,7 +12,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _uuid = _interopRequireDefault(require("uuid"));
 var _rebaseTransaction2 = require("../common/rebase-transaction");
-var _ari = require("../utils/ari");
 var _utils = require("../utils/utils");
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PURE__*/function () {
@@ -165,12 +164,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
       // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       var localId = (0, _uuid.default)();
       var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
-      if (!sourceId) {
+      if (!this.dataProvider || !sourceId) {
         throw new Error('Provider of sync block plugin is not set');
       }
-
-      // This should be generated by the data provider implementation as it differs between data providers
-      var resourceId = (0, _ari.resourceIdFromSourceAndLocalId)(sourceId, localId);
+      var resourceId = this.dataProvider.generateResourceId(sourceId, localId);
       return {
         resourceId: resourceId,
         localId: localId

package/dist/cjs/utils/ari.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resourceIdFromSourceAndLocalId = exports.getPageIdAndTypeFromAri = exports.getPageARIFromResourceId = exports.getLocalIdFromAri = exports.getContentPropertyAri = exports.getConfluencePageAri = void 0;
+exports.resourceIdFromSourceAndLocalId = exports.getPageIdAndTypeFromAri = exports.getPageARIFromResourceId = exports.getLocalIdFromResourceId = exports.getLocalIdFromAri = exports.getConfluencePageAri = exports.blockResourceIdFromSourceAndLocalId = void 0;
 /* eslint-disable require-unicode-regexp  */
 
 var getConfluencePageAri = exports.getConfluencePageAri = function getConfluencePageAri(pageId, cloudId) {
@@ -34,9 +34,37 @@ var getPageARIFromResourceId = exports.getPageARIFromResourceId = function getPa
   }
   throw new Error("Invalid resourceId: ".concat(resourceId));
 };
-var getContentPropertyAri = exports.getContentPropertyAri = function getContentPropertyAri(contentPropertyId, cloudId) {
-  return "ari:cloud:confluence:".concat(cloudId, ":content/").concat(contentPropertyId);
-};
 var resourceIdFromSourceAndLocalId = exports.resourceIdFromSourceAndLocalId = function resourceIdFromSourceAndLocalId(sourceId, localId) {
   return sourceId + '/' + localId;
+};
+
+/**
+ * For the following functions, they are used for the block service API provider.
+ * The resourceId/blockResourceId always refers to the block ARI.
+ */
+
+/**
+ * @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
+ */
+var blockResourceIdFromSourceAndLocalId = exports.blockResourceIdFromSourceAndLocalId = function blockResourceIdFromSourceAndLocalId(sourceId, localId) {
+  var match = sourceId.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/.*/);
+  if (!(match !== null && match !== void 0 && match[1])) {
+    throw new Error("Invalid source ARI: ".concat(sourceId));
+  }
+  var cloudId = match[1];
+  return "ari:cloud:blocks:".concat(cloudId, ":synced-block/").concat(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
+ */
+var getLocalIdFromResourceId = exports.getLocalIdFromResourceId = function getLocalIdFromResourceId(ari) {
+  var 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: ".concat(ari));
 };

package/dist/es2019/index.js

@@ -10,6 +10,6 @@ export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
 export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
 export { SyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
-export { getConfluencePageAri, getPageIdAndTypeFromAri } from './utils/ari';
+export { blockResourceIdFromSourceAndLocalId, getConfluencePageAri, getLocalIdFromAri, getLocalIdFromResourceId, getPageARIFromResourceId, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId } from './utils/ari';
 export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode } from './utils/utils';
 export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';

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

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import { SyncBlockError } from '../../common/types';
-import { getLocalIdFromAri, resourceIdFromSourceAndLocalId } from '../../utils/ari';
+import { blockResourceIdFromSourceAndLocalId, getLocalIdFromResourceId } from '../../utils/ari';
 import { BlockError, createSyncedBlock, deleteSyncedBlock, getSyncedBlockContent, updateSyncedBlock } from '../../utils/blockService';
 import { stringifyError } from '../../utils/errorHandling';
 const mapBlockError = error => {
@@ -18,13 +18,14 @@ const mapBlockError = error => {
  */
 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 = getLocalIdFromAri(resourceId);
+    const localId = getLocalIdFromResourceId(resourceId);
     try {
-      const contentProperty = await getSyncedBlockContent({
+      const blockContentResponse = await getSyncedBlockContent({
         blockAri: resourceId
       });
-      const value = contentProperty.content;
+      const value = blockContentResponse.content;
       if (!value) {
         return {
           error: SyncBlockError.NotFound,
@@ -32,7 +33,7 @@ class BlockServiceADFFetchProvider {
         };
       }
 
-      // Parse the synced block content from the property value
+      // Parse the synced block content from the response's content
       const syncedBlockData = JSON.parse(value);
       return {
         data: {
@@ -61,7 +62,7 @@ class BlockServiceADFFetchProvider {
  * ADFWriteProvider implementation that writes synced block data to Block Service API
  */
 class BlockServiceADFWriteProvider {
-  // it will first try to update and if it can't (404) then it will try to create 
+  // it will first try to update and if it can't (404) then it will try to create
   async writeData(data) {
     const {
       resourceId
@@ -80,7 +81,7 @@ class BlockServiceADFWriteProvider {
         if (error.status === 404) {
           // Create the block
           await createSyncedBlock({
-            blockAri: resourceIdFromSourceAndLocalId(resourceId, data.blockInstanceId),
+            blockAri: resourceId,
             blockInstanceId: data.blockInstanceId,
             sourceAri: resourceId,
             product: 'confluence-page',
@@ -100,7 +101,7 @@ class BlockServiceADFWriteProvider {
     }
   }
 
-  // soft deletes the source synced block 
+  // soft deletes the source synced block
   async deleteData(resourceId) {
     try {
       await deleteSyncedBlock({
@@ -126,6 +127,9 @@ class BlockServiceADFWriteProvider {
       };
     }
   }
+  generateResourceId(sourceId, localId) {
+    return blockResourceIdFromSourceAndLocalId(sourceId, localId);
+  }
 }
 
 /**

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

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { useMemo } from 'react';
 import { SyncBlockError } from '../../common/types';
-import { getLocalIdFromAri, getPageIdAndTypeFromAri } from '../../utils/ari';
+import { getLocalIdFromAri, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId } from '../../utils/ari';
 import { getContentProperty, createContentProperty, updateContentProperty, deleteContentProperty } from '../../utils/contentProperty';
 import { stringifyError } from '../../utils/errorHandling';
 import { isBlogPageType } from '../../utils/utils';
@@ -227,6 +227,9 @@ class ConfluenceADFWriteProvider {
       error: deleteResult.errors.join()
     };
   }
+  generateResourceId(sourceId, localId) {
+    return resourceIdFromSourceAndLocalId(sourceId, localId);
+  }
 }
 
 /**

package/dist/es2019/providers/syncBlockProvider.js

@@ -99,6 +99,9 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
     }
     return pageARI ? fetchSourceInfo(pageARI, sourceLocalId) : Promise.resolve(undefined);
   }
+  generateResourceId(sourceId, localId) {
+    return this.writeProvider.generateResourceId(sourceId, localId);
+  }
 }
 export const useMemoizedSyncedBlockProvider = (fetchProvider, writeProvider, sourceId) => {
   return useMemo(() => {

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

@@ -2,7 +2,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid';
 import { rebaseTransaction } from '../common/rebase-transaction';
-import { resourceIdFromSourceAndLocalId } from '../utils/ari';
 import { convertSyncBlockPMNodeToSyncBlockData, createBodiedSyncBlockNode } from '../utils/utils';
 export class SourceSyncBlockStoreManager {
   constructor(dataProvider) {
@@ -106,12 +105,10 @@ export class SourceSyncBlockStoreManager {
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     const localId = uuid();
     const sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
-    if (!sourceId) {
+    if (!this.dataProvider || !sourceId) {
       throw new Error('Provider of sync block plugin is not set');
     }
-
-    // This should be generated by the data provider implementation as it differs between data providers
-    const resourceId = resourceIdFromSourceAndLocalId(sourceId, localId);
+    const resourceId = this.dataProvider.generateResourceId(sourceId, localId);
     return {
       resourceId,
       localId

package/dist/es2019/utils/ari.js

@@ -25,7 +25,37 @@ export const getPageARIFromResourceId = resourceId => {
   }
   throw new Error(`Invalid resourceId: ${resourceId}`);
 };
-export const getContentPropertyAri = (contentPropertyId, cloudId) => `ari:cloud:confluence:${cloudId}:content/${contentPropertyId}`;
 export const resourceIdFromSourceAndLocalId = (sourceId, localId) => {
   return sourceId + '/' + localId;
+};
+
+/**
+ * For the following functions, they are used for the block service API provider.
+ * The resourceId/blockResourceId always refers to the block ARI.
+ */
+
+/**
+ * @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
+ */
+export const blockResourceIdFromSourceAndLocalId = (sourceId, localId) => {
+  const match = sourceId.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/.*/);
+  if (!(match !== null && match !== void 0 && match[1])) {
+    throw new Error(`Invalid source ARI: ${sourceId}`);
+  }
+  const cloudId = match[1];
+  return `ari:cloud:blocks:${cloudId}:synced-block/${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 => {
+  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}`);
 };

package/dist/esm/index.js

@@ -10,6 +10,6 @@ export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
 export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
 export { SyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
-export { getConfluencePageAri, getPageIdAndTypeFromAri } from './utils/ari';
+export { blockResourceIdFromSourceAndLocalId, getConfluencePageAri, getLocalIdFromAri, getLocalIdFromResourceId, getPageARIFromResourceId, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId } from './utils/ari';
 export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode } from './utils/utils';
 export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';

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

@@ -4,7 +4,7 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useMemo } from 'react';
 import { SyncBlockError } from '../../common/types';
-import { getLocalIdFromAri, resourceIdFromSourceAndLocalId } from '../../utils/ari';
+import { blockResourceIdFromSourceAndLocalId, getLocalIdFromResourceId } from '../../utils/ari';
 import { BlockError, createSyncedBlock, deleteSyncedBlock, getSyncedBlockContent, updateSyncedBlock } from '../../utils/blockService';
 import { stringifyError } from '../../utils/errorHandling';
 var mapBlockError = function mapBlockError(error) {
@@ -27,21 +27,22 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
   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 () {
       var _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(resourceId) {
-        var localId, contentProperty, value, syncedBlockData;
+        var localId, blockContentResponse, value, syncedBlockData;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              localId = getLocalIdFromAri(resourceId);
+              localId = getLocalIdFromResourceId(resourceId);
               _context.prev = 1;
               _context.next = 4;
               return getSyncedBlockContent({
                 blockAri: resourceId
               });
             case 4:
-              contentProperty = _context.sent;
-              value = contentProperty.content;
+              blockContentResponse = _context.sent;
+              value = blockContentResponse.content;
               if (value) {
                 _context.next = 8;
                 break;
@@ -51,7 +52,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                 resourceId: resourceId
               });
             case 8:
-              // Parse the synced block content from the property value
+              // Parse the synced block content from the response's content
               syncedBlockData = JSON.parse(value);
               return _context.abrupt("return", {
                 data: {
@@ -99,7 +100,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
   }
   return _createClass(BlockServiceADFWriteProvider, [{
     key: "writeData",
-    value: // it will first try to update and if it can't (404) then it will try to create 
+    value: // it will first try to update and if it can't (404) then it will try to create
     function () {
       var _writeData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(data) {
         var resourceId;
@@ -130,7 +131,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
               }
               _context2.next = 13;
               return createSyncedBlock({
-                blockAri: resourceIdFromSourceAndLocalId(resourceId, data.blockInstanceId),
+                blockAri: resourceId,
                 blockInstanceId: data.blockInstanceId,
                 sourceAri: resourceId,
                 product: 'confluence-page',
@@ -159,7 +160,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
         return _writeData.apply(this, arguments);
       }
       return writeData;
-    }() // soft deletes the source synced block 
+    }() // soft deletes the source synced block
   }, {
     key: "deleteData",
     value: function () {
@@ -207,6 +208,11 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
       }
       return deleteData;
     }()
+  }, {
+    key: "generateResourceId",
+    value: function generateResourceId(sourceId, localId) {
+      return blockResourceIdFromSourceAndLocalId(sourceId, localId);
+    }
   }]);
 }();
 /**

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

@@ -6,7 +6,7 @@ import _typeof from "@babel/runtime/helpers/typeof";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useMemo } from 'react';
 import { SyncBlockError } from '../../common/types';
-import { getLocalIdFromAri, getPageIdAndTypeFromAri } from '../../utils/ari';
+import { getLocalIdFromAri, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId } from '../../utils/ari';
 import { getContentProperty, createContentProperty, updateContentProperty, deleteContentProperty } from '../../utils/contentProperty';
 import { stringifyError } from '../../utils/errorHandling';
 import { isBlogPageType } from '../../utils/utils';
@@ -337,6 +337,11 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
       }
       return deleteData;
     }()
+  }, {
+    key: "generateResourceId",
+    value: function generateResourceId(sourceId, localId) {
+      return resourceIdFromSourceAndLocalId(sourceId, localId);
+    }
   }]);
 }();
 /**

package/dist/esm/providers/syncBlockProvider.js

@@ -170,6 +170,11 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
       }
       return pageARI ? fetchSourceInfo(pageARI, sourceLocalId) : Promise.resolve(undefined);
     }
+  }, {
+    key: "generateResourceId",
+    value: function generateResourceId(sourceId, localId) {
+      return this.writeProvider.generateResourceId(sourceId, localId);
+    }
   }]);
 }(SyncBlockDataProvider);
 export var useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(fetchProvider, writeProvider, sourceId) {

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

@@ -6,7 +6,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid';
 import { rebaseTransaction as _rebaseTransaction } from '../common/rebase-transaction';
-import { resourceIdFromSourceAndLocalId } from '../utils/ari';
 import { convertSyncBlockPMNodeToSyncBlockData, createBodiedSyncBlockNode as _createBodiedSyncBlockNode } from '../utils/utils';
 export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
   function SourceSyncBlockStoreManager(dataProvider) {
@@ -158,12 +157,10 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
       // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       var localId = uuid();
       var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
-      if (!sourceId) {
+      if (!this.dataProvider || !sourceId) {
         throw new Error('Provider of sync block plugin is not set');
       }
-
-      // This should be generated by the data provider implementation as it differs between data providers
-      var resourceId = resourceIdFromSourceAndLocalId(sourceId, localId);
+      var resourceId = this.dataProvider.generateResourceId(sourceId, localId);
       return {
         resourceId: resourceId,
         localId: localId

package/dist/esm/utils/ari.js

@@ -28,9 +28,37 @@ export var getPageARIFromResourceId = function getPageARIFromResourceId(resource
   }
   throw new Error("Invalid resourceId: ".concat(resourceId));
 };
-export var getContentPropertyAri = function getContentPropertyAri(contentPropertyId, cloudId) {
-  return "ari:cloud:confluence:".concat(cloudId, ":content/").concat(contentPropertyId);
-};
 export var resourceIdFromSourceAndLocalId = function resourceIdFromSourceAndLocalId(sourceId, localId) {
   return sourceId + '/' + localId;
+};
+
+/**
+ * For the following functions, they are used for the block service API provider.
+ * The resourceId/blockResourceId always refers to the block ARI.
+ */
+
+/**
+ * @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
+ */
+export var blockResourceIdFromSourceAndLocalId = function blockResourceIdFromSourceAndLocalId(sourceId, localId) {
+  var match = sourceId.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/.*/);
+  if (!(match !== null && match !== void 0 && match[1])) {
+    throw new Error("Invalid source ARI: ".concat(sourceId));
+  }
+  var cloudId = match[1];
+  return "ari:cloud:blocks:".concat(cloudId, ":synced-block/").concat(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 var getLocalIdFromResourceId = function getLocalIdFromResourceId(ari) {
+  var 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: ".concat(ari));
 };

package/dist/types/index.d.ts

@@ -10,6 +10,6 @@ export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvide
 export type { ADFFetchProvider, ADFWriteProvider, SyncBlockDataProvider, SyncBlockInstance, } from './providers/types';
 export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
 export { SyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
-export { getConfluencePageAri, getPageIdAndTypeFromAri } from './utils/ari';
+export { blockResourceIdFromSourceAndLocalId, getConfluencePageAri, getLocalIdFromAri, getLocalIdFromResourceId, getPageARIFromResourceId, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId, } from './utils/ari';
 export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode, } from './utils/utils';
 export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';

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

@@ -12,6 +12,7 @@ declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
 declare class BlockServiceADFWriteProvider implements ADFWriteProvider {
     writeData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     deleteData(resourceId: string): Promise<DeleteSyncBlockResult>;
+    generateResourceId(sourceId: string, localId: string): string;
 }
 export declare const useMemoizedBlockServiceAPIProviders: () => {
     fetchProvider: BlockServiceADFFetchProvider;

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

@@ -24,6 +24,7 @@ declare class ConfluenceADFWriteProvider implements ADFWriteProvider {
     private createNewContentProperty;
     writeData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     deleteData(resourceId: string): Promise<DeleteSyncBlockResult>;
+    generateResourceId(sourceId: string, localId: string): string;
 }
 /**
  * Convenience function to create providers with default content property key

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

@@ -22,5 +22,6 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
     deleteNodesData(resourceIds: string[]): Promise<Array<DeleteSyncBlockResult>>;
     getSourceId(): string;
     retrieveSyncBlockSourceInfo(node: SyncBlockNode): Promise<SyncBlockSourceInfo | undefined>;
+    generateResourceId(sourceId: string, localId: string): string;
 }
 export declare const useMemoizedSyncedBlockProvider: (fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string) => SyncBlockProvider;

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

@@ -28,6 +28,7 @@ export interface ADFFetchProvider {
 }
 export interface ADFWriteProvider {
     deleteData: (resourceId: string) => Promise<DeleteSyncBlockResult>;
+    generateResourceId: (sourceId: string, localId: string) => ResourceId;
     writeData: (data: SyncBlockData) => Promise<WriteSyncBlockResult>;
 }
 export declare abstract class SyncBlockDataProvider extends NodeDataProvider<SyncBlockNode, SyncBlockInstance> {
@@ -35,6 +36,13 @@ export declare abstract class SyncBlockDataProvider extends NodeDataProvider<Syn
     abstract deleteNodesData(resourceIds: string[]): Promise<Array<DeleteSyncBlockResult>>;
     abstract getSourceId(): ResourceId;
     abstract retrieveSyncBlockSourceInfo(node: SyncBlockNode): Promise<SyncBlockSourceInfo | 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;
 }
 export type SubscriptionCallback = (data: SyncBlockInstance) => void;
 export type TitleSubscriptionCallback = (title: string) => void;

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

@@ -6,5 +6,19 @@ export declare const getPageIdAndTypeFromAri: (ari: string) => {
 };
 export declare const getLocalIdFromAri: (ari: string) => string;
 export declare const getPageARIFromResourceId: (resourceId: string) => string;
-export declare const getContentPropertyAri: (contentPropertyId: string, cloudId: string) => string;
 export declare const resourceIdFromSourceAndLocalId: (sourceId: string, localId: string) => string;
+/**
+ * For the following functions, they are used for the block service API provider.
+ * The resourceId/blockResourceId always refers to the block ARI.
+ */
+/**
+ * @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
+ */
+export declare const blockResourceIdFromSourceAndLocalId: (sourceId: string, localId: string) => string;
+/**
+ * @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 declare const getLocalIdFromResourceId: (ari: string) => string;

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

@@ -34,6 +34,6 @@ export declare class BlockError extends Error {
     constructor(status: number);
 }
 export declare const getSyncedBlockContent: ({ blockAri, }: GetSyncedBlockContentRequest) => Promise<BlockContentResponse>;
-export declare const deleteSyncedBlock: ({ blockAri, }: DeleteSyncedBlockRequest) => Promise<void>;
+export declare const deleteSyncedBlock: ({ blockAri }: DeleteSyncedBlockRequest) => Promise<void>;
 export declare const updateSyncedBlock: ({ blockAri, content, }: UpdateSyncedBlockRequest) => Promise<void>;
 export declare const createSyncedBlock: ({ blockAri, blockInstanceId, sourceAri, product, content, }: CreateSyncedBlockRequest) => Promise<BlockContentResponse>;

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

@@ -10,6 +10,6 @@ export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvide
 export type { ADFFetchProvider, ADFWriteProvider, SyncBlockDataProvider, SyncBlockInstance, } from './providers/types';
 export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
 export { SyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
-export { getConfluencePageAri, getPageIdAndTypeFromAri } from './utils/ari';
+export { blockResourceIdFromSourceAndLocalId, getConfluencePageAri, getLocalIdFromAri, getLocalIdFromResourceId, getPageARIFromResourceId, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId, } from './utils/ari';
 export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode, } from './utils/utils';
 export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';

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

@@ -12,6 +12,7 @@ declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
 declare class BlockServiceADFWriteProvider implements ADFWriteProvider {
     writeData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     deleteData(resourceId: string): Promise<DeleteSyncBlockResult>;
+    generateResourceId(sourceId: string, localId: string): string;
 }
 export declare const useMemoizedBlockServiceAPIProviders: () => {
     fetchProvider: BlockServiceADFFetchProvider;

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

@@ -24,6 +24,7 @@ declare class ConfluenceADFWriteProvider implements ADFWriteProvider {
     private createNewContentProperty;
     writeData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     deleteData(resourceId: string): Promise<DeleteSyncBlockResult>;
+    generateResourceId(sourceId: string, localId: string): string;
 }
 /**
  * Convenience function to create providers with default content property key

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

@@ -22,5 +22,6 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
     deleteNodesData(resourceIds: string[]): Promise<Array<DeleteSyncBlockResult>>;
     getSourceId(): string;
     retrieveSyncBlockSourceInfo(node: SyncBlockNode): Promise<SyncBlockSourceInfo | undefined>;
+    generateResourceId(sourceId: string, localId: string): string;
 }
 export declare const useMemoizedSyncedBlockProvider: (fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string) => SyncBlockProvider;

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

@@ -28,6 +28,7 @@ export interface ADFFetchProvider {
 }
 export interface ADFWriteProvider {
     deleteData: (resourceId: string) => Promise<DeleteSyncBlockResult>;
+    generateResourceId: (sourceId: string, localId: string) => ResourceId;
     writeData: (data: SyncBlockData) => Promise<WriteSyncBlockResult>;
 }
 export declare abstract class SyncBlockDataProvider extends NodeDataProvider<SyncBlockNode, SyncBlockInstance> {
@@ -35,6 +36,13 @@ export declare abstract class SyncBlockDataProvider extends NodeDataProvider<Syn
     abstract deleteNodesData(resourceIds: string[]): Promise<Array<DeleteSyncBlockResult>>;
     abstract getSourceId(): ResourceId;
     abstract retrieveSyncBlockSourceInfo(node: SyncBlockNode): Promise<SyncBlockSourceInfo | 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;
 }
 export type SubscriptionCallback = (data: SyncBlockInstance) => void;
 export type TitleSubscriptionCallback = (title: string) => void;

package/dist/types-ts4.5/utils/ari.d.ts

@@ -6,5 +6,19 @@ export declare const getPageIdAndTypeFromAri: (ari: string) => {
 };
 export declare const getLocalIdFromAri: (ari: string) => string;
 export declare const getPageARIFromResourceId: (resourceId: string) => string;
-export declare const getContentPropertyAri: (contentPropertyId: string, cloudId: string) => string;
 export declare const resourceIdFromSourceAndLocalId: (sourceId: string, localId: string) => string;
+/**
+ * For the following functions, they are used for the block service API provider.
+ * The resourceId/blockResourceId always refers to the block ARI.
+ */
+/**
+ * @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
+ */
+export declare const blockResourceIdFromSourceAndLocalId: (sourceId: string, localId: string) => string;
+/**
+ * @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 declare const getLocalIdFromResourceId: (ari: string) => string;

package/dist/types-ts4.5/utils/blockService.d.ts

@@ -34,6 +34,6 @@ export declare class BlockError extends Error {
     constructor(status: number);
 }
 export declare const getSyncedBlockContent: ({ blockAri, }: GetSyncedBlockContentRequest) => Promise<BlockContentResponse>;
-export declare const deleteSyncedBlock: ({ blockAri, }: DeleteSyncedBlockRequest) => Promise<void>;
+export declare const deleteSyncedBlock: ({ blockAri }: DeleteSyncedBlockRequest) => Promise<void>;
 export declare const updateSyncedBlock: ({ blockAri, content, }: UpdateSyncedBlockRequest) => Promise<void>;
 export declare const createSyncedBlock: ({ blockAri, blockInstanceId, sourceAri, product, content, }: CreateSyncedBlockRequest) => Promise<BlockContentResponse>;

package/package.json

@@ -30,6 +30,7 @@
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/node-data-provider": "^7.5.0",
+		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^16.1.0",
 		"@atlaskit/tokens": "^8.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -82,11 +83,16 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "2.8.0",
+	"version": "2.9.0",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
+	},
+	"platform-feature-flags": {
+		"platform_editor_synced_block_provider_use_block_service": {
+			"type": "boolean"
+		}
 	}
 }