@atlaskit/editor-synced-block-provider 3.1.0 → 3.2.1

package/dist/esm/providers/syncBlockProvider.js

@@ -13,26 +13,22 @@ import { useMemo } from 'react';
 import { getPageIdAndTypeFromConfluencePageAri } from '../clients/confluence/ari';
 import { fetchConfluencePageInfo } from '../clients/confluence/sourceInfo';
 import { SyncBlockError } from '../common/types';
-import { SyncBlockDataProvider } from '../providers/types';
+import { SyncBlockDataProvider } from './types';
 export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
-  // the source document ARI; that the source sync block is on.
-
   /**
    * Constructor for the SyncBlockProvider
    *
    * @param fetchProvider
    * @param writeProvider
-   * @param sourceId
    * @param nestedRendererDataProviders
    */
-  function SyncBlockProvider(fetchProvider, writeProvider, sourceId) {
+  function SyncBlockProvider(fetchProvider, writeProvider) {
     var _this;
     _classCallCheck(this, SyncBlockProvider);
     _this = _callSuper(this, SyncBlockProvider);
     _defineProperty(_this, "name", 'syncBlockProvider');
     _this.fetchProvider = fetchProvider;
     _this.writeProvider = writeProvider;
-    _this.sourceId = sourceId;
     _this.providerOptions = {};
     return _this;
   }
@@ -42,11 +38,6 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
     value: function setProviderOptions(providerOptions) {
       this.providerOptions = providerOptions;
     }
-  }, {
-    key: "getProduct",
-    value: function getProduct() {
-      return this.writeProvider.product;
-    }
 
     /**
      * Check if the node is supported by the provider
@@ -125,14 +116,24 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              if (this.writeProvider) {
+                _context.next = 2;
+                break;
+              }
+              return _context.abrupt("return", Promise.reject(new Error('Write provider not set')));
+            case 2:
+              _context.next = 4;
               return Promise.allSettled(nodes.map(function (_node, index) {
+                var _this3$writeProvider;
+                if (!_this3.writeProvider) {
+                  return Promise.reject('Write provider not set');
+                }
                 if (!data[index].content) {
                   return Promise.reject('No Synced Block content to write');
                 }
-                return _this3.writeProvider.writeData(data[index]);
+                return (_this3$writeProvider = _this3.writeProvider) === null || _this3$writeProvider === void 0 ? void 0 : _this3$writeProvider.writeData(data[index]);
               }));
-            case 2:
+            case 4:
               results = _context.sent;
               return _context.abrupt("return", results.map(function (result) {
                 if (result.status === 'fulfilled') {
@@ -143,11 +144,11 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
                   };
                 }
               }));
-            case 4:
+            case 6:
             case "end":
               return _context.stop();
           }
-        }, _callee);
+        }, _callee, this);
       }));
       function writeNodesData(_x, _x2) {
         return _writeNodesData.apply(this, arguments);
@@ -157,6 +158,9 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
   }, {
     key: "createNodeData",
     value: function createNodeData(data) {
+      if (!this.writeProvider) {
+        return Promise.reject(new Error('Write provider not set'));
+      }
       return this.writeProvider.createData(data).then(function (result) {
         return result;
       }, function (error) {
@@ -182,11 +186,20 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              if (this.writeProvider) {
+                _context2.next = 2;
+                break;
+              }
+              return _context2.abrupt("return", Promise.reject(new Error('Write provider not set')));
+            case 2:
+              _context2.next = 4;
               return Promise.allSettled(resourceIds.map(function (resourceId) {
+                if (!_this4.writeProvider) {
+                  return Promise.reject('Write provider not set');
+                }
                 return _this4.writeProvider.deleteData(resourceId);
               }));
-            case 2:
+            case 4:
               results = _context2.sent;
               return _context2.abrupt("return", results.map(function (result, index) {
                 if (result.status === 'fulfilled') {
@@ -199,29 +212,17 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
                   };
                 }
               }));
-            case 4:
+            case 6:
             case "end":
               return _context2.stop();
           }
-        }, _callee2);
+        }, _callee2, this);
       }));
       function deleteNodesData(_x3) {
         return _deleteNodesData.apply(this, arguments);
       }
       return deleteNodesData;
     }()
-    /**
-     * Get the source id
-     *
-     * @returns The source id
-     */
-    )
-  }, {
-    key: "getSourceId",
-    value: function getSourceId() {
-      return this.sourceId;
-    }
-
     /**
      * Fetch the source info from the source id
      *
@@ -231,6 +232,7 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
      *
      * @returns The source info
      */
+    )
   }, {
     key: "fetchSyncBlockSourceInfo",
     value: function fetchSyncBlockSourceInfo(localId, sourceAri, sourceProduct, fireAnalyticsEvent) {
@@ -248,12 +250,20 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
     }
   }, {
     key: "generateResourceId",
-    value: function generateResourceId(sourceId, localId) {
-      return this.writeProvider.generateResourceId(sourceId, localId);
+    value: function generateResourceId() {
+      var localId = crypto.randomUUID();
+      var resourceId = crypto.randomUUID();
+      return {
+        localId: localId,
+        resourceId: resourceId
+      };
     }
   }, {
     key: "generateResourceIdForReference",
     value: function generateResourceIdForReference(sourceId) {
+      if (!this.writeProvider) {
+        throw new Error('Write provider not set');
+      }
       return this.writeProvider.generateResourceIdForReference(sourceId);
     }
 
@@ -285,7 +295,9 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
       switch (sourceProduct) {
         case 'confluence-page':
           return {
-            contentId: getPageIdAndTypeFromConfluencePageAri(sourceAri).id,
+            contentId: getPageIdAndTypeFromConfluencePageAri({
+              ari: sourceAri
+            }).id,
             contentProduct: sourceProduct
           };
         case 'jira-work-item':
@@ -297,14 +309,21 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
   }, {
     key: "updateReferenceData",
     value: function updateReferenceData(blocks, noContent) {
+      if (!this.writeProvider) {
+        throw new Error('Write provider not set');
+      }
       return this.writeProvider.updateReferenceData(blocks, noContent);
     }
   }]);
 }(SyncBlockDataProvider);
-export var useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions, getSSRData) {
+export var useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(_ref) {
+  var fetchProvider = _ref.fetchProvider,
+    writeProvider = _ref.writeProvider,
+    providerOptions = _ref.providerOptions,
+    getSSRData = _ref.getSSRData;
   var syncBlockProvider = useMemo(function () {
-    return new SyncBlockProvider(fetchProvider, writeProvider, sourceId);
-  }, [fetchProvider, writeProvider, sourceId]);
+    return new SyncBlockProvider(fetchProvider, writeProvider);
+  }, [fetchProvider, writeProvider]);
   syncBlockProvider.setProviderOptions(providerOptions);
   var ssrData = getSSRData ? getSSRData() : undefined;
   if (ssrData) {

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

@@ -5,8 +5,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-import uuid from 'uuid';
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { SyncBlockError } from '../common/types';
 import { updateErrorPayload, createErrorPayload, deleteErrorPayload, updateCacheErrorPayload } from '../utils/errorHandling';
@@ -231,14 +229,12 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "generateBodiedSyncBlockAttrs",
     value: function generateBodiedSyncBlockAttrs() {
-      var _this$dataProvider;
-      // 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 (!this.dataProvider || !sourceId) {
+      if (!this.dataProvider) {
         throw new Error('Data provider not set or source id not set');
       }
-      var resourceId = this.dataProvider.generateResourceId(sourceId, localId);
+      var _this$dataProvider$ge = this.dataProvider.generateResourceId(),
+        resourceId = _this$dataProvider$ge.resourceId,
+        localId = _this$dataProvider$ge.localId;
       return {
         resourceId: resourceId,
         localId: localId

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

@@ -1,18 +1,28 @@
 import { type SyncBlockProduct } from '../../common/types';
 /**
  * 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 cloudId - the cloudId of the block. E.G the cloudId of the confluence page, or the cloudId of the Jira instance
+ * @param parentId - the parentId of the block. E.G the pageId for a confluence page, or the issueId for a Jira work item
  * @param resourceId - the resource ID of the block node. A randomly generated UUID
+ * @param product - the product of the block. E.G 'confluence-page', 'jira-work-item'
  * @returns the block ARI. E.G ari:cloud:blocks:<cloudId>:synced-block/<product>/<pageId>/<resourceId>
  */
-export declare const generateBlockAri: (sourceAri: string, resourceId: string, product: SyncBlockProduct) => string;
+export declare const generateBlockAri: ({ cloudId, parentId, product, resourceId, }: {
+    cloudId: string;
+    parentId: string;
+    product: SyncBlockProduct;
+    resourceId: string;
+}) => string;
 /**
  * Generates the block ARI from the reference synced block ARI and the resource ID
- * @param sourceAri - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
+ * @param cloudId - the cloudId of the block. E.G the cloudId of the confluence page, or the cloudId of the Jira instance
  * @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;
+export declare const generateBlockAriFromReference: ({ cloudId, resourceId, }: {
+    cloudId: 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/clients/block-service/blockService.d.ts

@@ -23,7 +23,7 @@ export declare const isBlockContentResponse: (response: BlockContentResponse | B
 /**
  * Retrieves all synced blocks referenced in a document.
  *
- * Calls the Block Service API endpoint: `/v1/block/document/reference/{documentAri}`
+ * Calls the Block Service GraphQL API: `blockService_getDocumentReferenceBlocks`
  *
  * @param documentAri - The ARI of the document to fetch synced blocks for
  * @returns A promise containing arrays of successfully fetched blocks and any errors encountered
@@ -60,7 +60,6 @@ export declare const isBlockContentResponse: (response: BlockContentResponse | B
  *   ]
  * }
  * ```
- * Check https://block-service.dev.atl-paas.net/ for latest API documentation.
  */
 export declare const getReferenceSyncedBlocks: (documentAri: string) => Promise<ReferenceSyncedBlockResponse>;
 export type GetSyncedBlockContentRequest = {

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

@@ -9,32 +9,19 @@ export type PAGE_TYPE = 'page' | 'blogpost';
  * @param pageType - the type of the page
  * @returns the Confluence page ARI
  */
-export declare const getConfluencePageAri: (pageId: string, cloudId: string, pageType?: PAGE_TYPE) => string;
+export declare const getConfluencePageAri: ({ pageId, cloudId, pageType, }: {
+    cloudId: string;
+    pageId: string;
+    pageType: PAGE_TYPE;
+}) => string;
 /**
  * Extracts the page ID and type from the Confluence page ARI
  * @param ari - the Confluence page ARI
  * @returns the page ID and type
  */
-export declare const getPageIdAndTypeFromConfluencePageAri: (ari: string) => {
+export declare const getPageIdAndTypeFromConfluencePageAri: ({ ari, }: {
+    ari: string;
+}) => {
     id: string;
     type: PAGE_TYPE;
 };
-/**
- * Extracts the local ID from the Confluence page content property resource ID
- * @param resourceId - the Confluence page content property resource ID
- * @returns the local ID
- */
-export declare const getLocalIdFromContentPropertyResourceId: (resourceId: string) => string;
-/**
- * Extracts the Confluence page ARI from the Confluence content property resource ID
- * @param resourceId - the Confluence content property resource ID
- * @returns the Confluence page ARI
- */
-export declare const getPageAriFromContentPropertyResourceId: (resourceId: string) => string;
-/**
- * Generates the Confluence page content property resource ID from the source ID and local ID
- * @param sourceId - the source ID
- * @param localId - the local ID
- * @returns the Confluence page content property resource ID
- */
-export declare const resourceIdFromConfluencePageSourceIdAndLocalId: (sourceId: string, localId: string) => string;

package/dist/types/clients/jira/ari.d.ts

@@ -4,10 +4,15 @@
  * @param cloudId - the cloud ID
  * @returns the Jira work item ARI
  */
-export declare const getJiraWorkItemAri: (workItemId: string, cloudId: string) => string;
+export declare const getJiraWorkItemAri: ({ cloudId, workItemId, }: {
+    cloudId: string;
+    workItemId: string;
+}) => string;
 /**
  * Extracts the Jira work item ID from the Jira work item ARI
  * @param ari - the Jira work item ARI
  * @returns the Jira work item ID
  */
-export declare const getJiraWorkItemIdFromAri: (ari: string) => string;
+export declare const getJiraWorkItemIdFromAri: ({ ari }: {
+    ari: string;
+}) => string;

package/dist/types/index.d.ts

@@ -1,20 +1,19 @@
 export { rebaseTransaction } from './common/rebase-transaction';
 export { SyncBlockError } from './common/types';
-export type { SyncBlockData, SyncBlockNode, SyncBlockProduct, BlockInstanceId, } from './common/types';
+export type { SyncBlockData, SyncBlockNode, SyncBlockProduct, BlockInstanceId, SyncBlockAttrs, } from './common/types';
 export { useFetchSyncBlockData, type UseFetchSyncBlockDataResult, } from './hooks/useFetchSyncBlockData';
 export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
 export { generateBlockAri, generateBlockAriFromReference, getLocalIdFromBlockResourceId, } from './clients/block-service/ari';
-export { getConfluencePageAri, getLocalIdFromContentPropertyResourceId, getPageAriFromContentPropertyResourceId, getPageIdAndTypeFromConfluencePageAri, resourceIdFromConfluencePageSourceIdAndLocalId, } from './clients/confluence/ari';
+export { getConfluencePageAri, getPageIdAndTypeFromConfluencePageAri, } from './clients/confluence/ari';
 export { getJiraWorkItemAri, getJiraWorkItemIdFromAri } from './clients/jira/ari';
-export { useMemoizedBlockServiceAPIProviders } from './providers/block-service/blockServiceAPI';
-export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders, } from './providers/confluence/confluenceContentAPI';
+export { useMemoizedBlockServiceAPIProviders, useMemoizedBlockServiceFetchOnlyAPIProvider, } from './providers/block-service/blockServiceAPI';
 export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider, } from './providers/syncBlockProvider';
-export type { ADFFetchProvider, ADFWriteProvider, SyncBlockDataProvider, SyncBlockInstance, MediaEmojiProviderOptions, SyncedBlockRendererProviderOptions, SyncBlockRendererProviderCreator, SyncedBlockRendererDataProviders, } from './providers/types';
+export type { ADFFetchProvider, ADFWriteProvider, SyncBlockDataProvider, SyncBlockInstance, MediaEmojiProviderOptions, SyncedBlockRendererProviderOptions, SyncBlockRendererProviderCreator, SyncedBlockRendererDataProviders, UpdateReferenceSyncBlockResult, WriteSyncBlockResult, SyncBlockParentInfo, } from './providers/types';
 export { type ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
 export { SyncBlockStoreManager, useMemoizedSyncBlockStoreManager, } from './store-manager/syncBlockStoreManager';
 export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';
-export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode, convertPMNodesToSyncBlockNodes, getContentIdAndProductFromResourceId } from './utils/utils';
+export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode, convertPMNodesToSyncBlockNodes, getContentIdAndProductFromResourceId, } from './utils/utils';
 export { fetchErrorPayload } from './utils/errorHandling';
 export { fetchReferences } from './providers/block-service/blockServiceAPI';

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

@@ -1,23 +1,34 @@
 import { SyncBlockError, type ResourceId, type SyncBlockAttrs, type SyncBlockData, type SyncBlockProduct } from '../../common/types';
 import type { ADFFetchProvider, ADFWriteProvider, DeleteSyncBlockResult, SyncBlockInstance, UpdateReferenceSyncBlockResult, WriteSyncBlockResult } from '../types';
 export declare const fetchReferences: (documentAri: string) => Promise<SyncBlockInstance[] | SyncBlockError>;
+interface BlockServiceADFFetchProviderProps {
+    cloudId: string;
+}
 /**
  * ADFFetchProvider implementation that fetches synced block data from Block Service API
  */
 declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
-    private sourceAri;
-    constructor(sourceAri: string);
+    private cloudId;
+    constructor({ cloudId }: BlockServiceADFFetchProviderProps);
     fetchData(resourceId: string): Promise<SyncBlockInstance>;
 }
+interface BlockServiceADFWriteProviderProps {
+    cloudId: string;
+    getVersion?: () => number | undefined;
+    parentAri: string;
+    parentId: string;
+    product: SyncBlockProduct;
+}
 /**
  * ADFWriteProvider implementation that writes synced block data to Block Service API
  */
 declare class BlockServiceADFWriteProvider implements ADFWriteProvider {
-    private sourceAri;
-    private sourceDocumentId;
+    private cloudId;
+    private parentAri;
+    private parentId;
     private getVersion?;
     product: SyncBlockProduct;
-    constructor(sourceAri: string, product: SyncBlockProduct, sourceDocumentId: string, getVersion?: () => number | undefined);
+    constructor({ cloudId, parentAri, parentId, product, getVersion, }: BlockServiceADFWriteProviderProps);
     writeData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     createData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     deleteData(resourceId: string): Promise<DeleteSyncBlockResult>;
@@ -25,8 +36,22 @@ declare class BlockServiceADFWriteProvider implements ADFWriteProvider {
     generateResourceId(): ResourceId;
     updateReferenceData(blocks: SyncBlockAttrs[], noContent?: boolean): Promise<UpdateReferenceSyncBlockResult>;
 }
-export declare const useMemoizedBlockServiceAPIProviders: (sourceAri: string, product: SyncBlockProduct, sourceDocumentId: string, getVersion?: () => number | undefined) => {
+interface BlockServiceAPIProvidersProps {
+    cloudId: string;
+    getVersion?: () => number | undefined;
+    parentAri: string;
+    parentId: string;
+    product: SyncBlockProduct;
+}
+export declare const useMemoizedBlockServiceAPIProviders: ({ cloudId, parentAri, parentId, product, getVersion, }: BlockServiceAPIProvidersProps) => {
     fetchProvider: BlockServiceADFFetchProvider;
     writeProvider: BlockServiceADFWriteProvider;
 };
+interface BlockServiceFetchOnlyAPIProviderProps {
+    cloudId: string;
+}
+export declare const useMemoizedBlockServiceFetchOnlyAPIProvider: ({ cloudId, }: BlockServiceFetchOnlyAPIProviderProps) => {
+    fetchProvider: BlockServiceADFFetchProvider;
+    writeProvider: undefined;
+};
 export {};

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

@@ -1,24 +1,21 @@
 import type { RendererSyncBlockEventPayload } from '@atlaskit/editor-common/analytics';
 import type { JSONNode } from '@atlaskit/editor-json-transformer/types';
 import { type BlockInstanceId, type ResourceId, type SyncBlockAttrs, type SyncBlockData, type SyncBlockNode, type SyncBlockProduct } from '../common/types';
-import { SyncBlockDataProvider, type ADFFetchProvider, type ADFWriteProvider, type DeleteSyncBlockResult, type SyncBlockInstance, type SyncBlockParentInfo, type SyncBlockSourceInfo, type SyncedBlockRendererProviderOptions, type UpdateReferenceSyncBlockResult, type WriteSyncBlockResult } from '../providers/types';
+import { SyncBlockDataProvider, type ADFFetchProvider, type ADFWriteProvider, type DeleteSyncBlockResult, type SyncBlockInstance, type SyncBlockParentInfo, type SyncBlockSourceInfo, type SyncedBlockRendererProviderOptions, type UpdateReferenceSyncBlockResult, type WriteSyncBlockResult } from './types';
 export declare class SyncBlockProvider extends SyncBlockDataProvider {
     name: string;
     private fetchProvider;
     private writeProvider;
-    private sourceId;
     private providerOptions;
     /**
      * Constructor for the SyncBlockProvider
      *
      * @param fetchProvider
      * @param writeProvider
-     * @param sourceId
      * @param nestedRendererDataProviders
      */
-    constructor(fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string);
+    constructor(fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider | undefined);
     setProviderOptions(providerOptions: SyncedBlockRendererProviderOptions): void;
-    getProduct(): SyncBlockProduct | undefined;
     /**
      * Check if the node is supported by the provider
      *
@@ -62,12 +59,6 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
      * @returns Array of {resourceId?: string, error?: string}.
      */
     deleteNodesData(resourceIds: ResourceId[]): Promise<Array<DeleteSyncBlockResult>>;
-    /**
-     * Get the source id
-     *
-     * @returns The source id
-     */
-    getSourceId(): string;
     /**
      * Fetch the source info from the source id
      *
@@ -78,7 +69,10 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
      * @returns The source info
      */
     fetchSyncBlockSourceInfo(localId: BlockInstanceId, sourceAri: string, sourceProduct: SyncBlockProduct, fireAnalyticsEvent?: (payload: RendererSyncBlockEventPayload) => void): Promise<SyncBlockSourceInfo | undefined>;
-    generateResourceId(sourceId: string, localId: BlockInstanceId): string;
+    generateResourceId(): {
+        localId: BlockInstanceId;
+        resourceId: ResourceId;
+    };
     generateResourceIdForReference(sourceId: ResourceId): ResourceId;
     /**
      * Get the synced block renderer provider options
@@ -97,4 +91,11 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
     retrieveSyncBlockParentInfo(sourceAri: string, sourceProduct: SyncBlockProduct): SyncBlockParentInfo | undefined;
     updateReferenceData(blocks: SyncBlockAttrs[], noContent?: boolean): Promise<UpdateReferenceSyncBlockResult>;
 }
-export declare const useMemoizedSyncedBlockProvider: (fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string, providerOptions: SyncedBlockRendererProviderOptions, getSSRData?: () => Record<string, SyncBlockInstance> | undefined) => SyncBlockProvider;
+type UseMemoizedSyncedBlockProviderProps = {
+    fetchProvider: ADFFetchProvider;
+    getSSRData?: () => Record<string, SyncBlockInstance> | undefined;
+    providerOptions: SyncedBlockRendererProviderOptions;
+    writeProvider: ADFWriteProvider | undefined;
+};
+export declare const useMemoizedSyncedBlockProvider: ({ fetchProvider, writeProvider, providerOptions, getSSRData, }: UseMemoizedSyncedBlockProviderProps) => SyncBlockProvider;
+export {};

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

@@ -55,7 +55,6 @@ export interface ADFWriteProvider {
      * User should not be blocked by not_found error when deleting, so successful result should be returned for 404 error
      */
     deleteData: (resourceId: ResourceId) => Promise<DeleteSyncBlockResult>;
-    generateResourceId: (sourceId: string, localId: string) => ResourceId;
     generateResourceIdForReference: (sourceId: ResourceId) => ResourceId;
     product: SyncBlockProduct;
     updateReferenceData: (blocks: SyncBlockAttrs[], noContent?: boolean) => Promise<UpdateReferenceSyncBlockResult>;
@@ -82,19 +81,23 @@ export declare abstract class SyncBlockDataProvider extends NodeDataProvider<Syn
     abstract writeNodesData(nodes: SyncBlockNode[], data: SyncBlockData[]): Promise<Array<WriteSyncBlockResult>>;
     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 setProviderOptions(providerOptions: SyncedBlockRendererProviderOptions): void;
     abstract getSyncedBlockRendererProviderOptions(): SyncedBlockRendererProviderOptions;
     abstract retrieveSyncBlockParentInfo(sourceAri: string, sourceProduct: SyncBlockProduct): SyncBlockParentInfo | undefined;
     /**
-     * Generates a resource ID from a source ID and local ID.
+     * Generates a resource ID for source synced block.
+     * @returns The generated resource ID
+     */
+    abstract generateResourceId(): {
+        localId: BlockInstanceId;
+        resourceId: ResourceId;
+    };
+    /**
+     * Generates a resource ID for reference synced block.
      * @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: BlockInstanceId): ResourceId;
     abstract generateResourceIdForReference(sourceId: ResourceId): ResourceId;
     abstract updateReferenceData(blocks: SyncBlockAttrs[], noContent?: boolean): Promise<UpdateReferenceSyncBlockResult>;
 }

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

@@ -1,18 +1,28 @@
 import { type SyncBlockProduct } from '../../common/types';
 /**
  * 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 cloudId - the cloudId of the block. E.G the cloudId of the confluence page, or the cloudId of the Jira instance
+ * @param parentId - the parentId of the block. E.G the pageId for a confluence page, or the issueId for a Jira work item
  * @param resourceId - the resource ID of the block node. A randomly generated UUID
+ * @param product - the product of the block. E.G 'confluence-page', 'jira-work-item'
  * @returns the block ARI. E.G ari:cloud:blocks:<cloudId>:synced-block/<product>/<pageId>/<resourceId>
  */
-export declare const generateBlockAri: (sourceAri: string, resourceId: string, product: SyncBlockProduct) => string;
+export declare const generateBlockAri: ({ cloudId, parentId, product, resourceId, }: {
+    cloudId: string;
+    parentId: string;
+    product: SyncBlockProduct;
+    resourceId: string;
+}) => string;
 /**
  * Generates the block ARI from the reference synced block ARI and the resource ID
- * @param sourceAri - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
+ * @param cloudId - the cloudId of the block. E.G the cloudId of the confluence page, or the cloudId of the Jira instance
  * @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;
+export declare const generateBlockAriFromReference: ({ cloudId, resourceId, }: {
+    cloudId: 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-ts4.5/clients/block-service/blockService.d.ts

@@ -23,7 +23,7 @@ export declare const isBlockContentResponse: (response: BlockContentResponse | B
 /**
  * Retrieves all synced blocks referenced in a document.
  *
- * Calls the Block Service API endpoint: `/v1/block/document/reference/{documentAri}`
+ * Calls the Block Service GraphQL API: `blockService_getDocumentReferenceBlocks`
  *
  * @param documentAri - The ARI of the document to fetch synced blocks for
  * @returns A promise containing arrays of successfully fetched blocks and any errors encountered
@@ -60,7 +60,6 @@ export declare const isBlockContentResponse: (response: BlockContentResponse | B
  *   ]
  * }
  * ```
- * Check https://block-service.dev.atl-paas.net/ for latest API documentation.
  */
 export declare const getReferenceSyncedBlocks: (documentAri: string) => Promise<ReferenceSyncedBlockResponse>;
 export type GetSyncedBlockContentRequest = {

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

@@ -9,32 +9,19 @@ export type PAGE_TYPE = 'page' | 'blogpost';
  * @param pageType - the type of the page
  * @returns the Confluence page ARI
  */
-export declare const getConfluencePageAri: (pageId: string, cloudId: string, pageType?: PAGE_TYPE) => string;
+export declare const getConfluencePageAri: ({ pageId, cloudId, pageType, }: {
+    cloudId: string;
+    pageId: string;
+    pageType: PAGE_TYPE;
+}) => string;
 /**
  * Extracts the page ID and type from the Confluence page ARI
  * @param ari - the Confluence page ARI
  * @returns the page ID and type
  */
-export declare const getPageIdAndTypeFromConfluencePageAri: (ari: string) => {
+export declare const getPageIdAndTypeFromConfluencePageAri: ({ ari, }: {
+    ari: string;
+}) => {
     id: string;
     type: PAGE_TYPE;
 };
-/**
- * Extracts the local ID from the Confluence page content property resource ID
- * @param resourceId - the Confluence page content property resource ID
- * @returns the local ID
- */
-export declare const getLocalIdFromContentPropertyResourceId: (resourceId: string) => string;
-/**
- * Extracts the Confluence page ARI from the Confluence content property resource ID
- * @param resourceId - the Confluence content property resource ID
- * @returns the Confluence page ARI
- */
-export declare const getPageAriFromContentPropertyResourceId: (resourceId: string) => string;
-/**
- * Generates the Confluence page content property resource ID from the source ID and local ID
- * @param sourceId - the source ID
- * @param localId - the local ID
- * @returns the Confluence page content property resource ID
- */
-export declare const resourceIdFromConfluencePageSourceIdAndLocalId: (sourceId: string, localId: string) => string;