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

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

@@ -2,32 +2,31 @@
 
 /**
  * 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 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}`;
+export const generateBlockAri = ({
+  cloudId,
+  parentId,
+  product,
+  resourceId
+}) => {
+  return `ari:cloud:blocks:${cloudId}:synced-block/${product}/${parentId}/${resourceId}`;
 };
 
 /**
  * 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 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: ${sourceAri}`);
-  }
-  const cloudId = match[1];
+export const generateBlockAriFromReference = ({
+  cloudId,
+  resourceId
+}) => {
   return `ari:cloud:blocks:${cloudId}:synced-block/${resourceId}`;
 };
 

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

@@ -11,14 +11,22 @@
  * @param pageType - the type of the page
  * @returns the Confluence page ARI
  */
-export const getConfluencePageAri = (pageId, cloudId, pageType = 'page') => `ari:cloud:confluence:${cloudId}:${pageType}/${pageId}`;
+export const getConfluencePageAri = ({
+  pageId,
+  cloudId,
+  pageType
+}) => {
+  return `ari:cloud:confluence:${cloudId}:${pageType}/${pageId}`;
+};
 
 /**
  * Extracts the page ID and type from the Confluence page ARI
  * @param ari - the Confluence page ARI
  * @returns the page ID and type
  */
-export const getPageIdAndTypeFromConfluencePageAri = ari => {
+export const getPageIdAndTypeFromConfluencePageAri = ({
+  ari
+}) => {
   const match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/);
   if (match !== null && match !== void 0 && match[2]) {
     return {
@@ -27,38 +35,4 @@ export const getPageIdAndTypeFromConfluencePageAri = ari => {
     };
   }
   throw new Error(`Invalid page ARI: ${ari}`);
-};
-
-/**
- * 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 const getLocalIdFromContentPropertyResourceId = resourceId => {
-  const match = resourceId.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 resourceId: ${resourceId}`);
-};
-
-/**
- * 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 const getPageAriFromContentPropertyResourceId = resourceId => {
-  const match = resourceId.match(/(ari:cloud:confluence:[^:]+:(page|blogpost)\/\d+)\/([a-zA-Z0-9-]+)$/);
-  if (match !== null && match !== void 0 && match[1]) {
-    return match[1];
-  }
-  throw new Error(`Invalid resourceId: ${resourceId}`);
-};
-
-/**
- * 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 const resourceIdFromConfluencePageSourceIdAndLocalId = (sourceId, localId) => `${sourceId}/${localId}`;
+};

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

@@ -60,7 +60,9 @@ export const fetchConfluencePageInfo = async (pageAri, localId, fireAnalyticsEve
     var _response$data, _response$data$conten, _response$data$conten2, _contentData$space;
     const {
       type: pageType
-    } = getPageIdAndTypeFromConfluencePageAri(pageAri);
+    } = getPageIdAndTypeFromConfluencePageAri({
+      ari: pageAri
+    });
     const response = await getConfluenceSourceInfo(pageAri);
     const contentData = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$conten = _response$data.content) === null || _response$data$conten === void 0 ? void 0 : (_response$data$conten2 = _response$data$conten.nodes) === null || _response$data$conten2 === void 0 ? void 0 : _response$data$conten2[0];
     const title = contentData === null || contentData === void 0 ? void 0 : contentData.title;

package/dist/es2019/clients/jira/ari.js

@@ -6,14 +6,21 @@
  * @param cloudId - the cloud ID
  * @returns the Jira work item ARI
  */
-export const getJiraWorkItemAri = (workItemId, cloudId) => `ari:cloud:jira:${cloudId}:issue/${workItemId}`;
+export const getJiraWorkItemAri = ({
+  cloudId,
+  workItemId
+}) => {
+  return `ari:cloud:jira:${cloudId}:issue/${workItemId}`;
+};
 
 /**
  * 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 const getJiraWorkItemIdFromAri = ari => {
+export const getJiraWorkItemIdFromAri = ({
+  ari
+}) => {
   const match = ari.match(/ari:cloud:jira:([^:]+):issue\/(\d+)/);
   if (match !== null && match !== void 0 && match[2]) {
     return match[2];

package/dist/es2019/index.js

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

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

@@ -77,19 +77,23 @@ export const fetchReferences = async documentAri => {
   }));
   return [...blocksInstances, ...errorInstances];
 };
-
 /**
  * ADFFetchProvider implementation that fetches synced block data from Block Service API
  */
 class BlockServiceADFFetchProvider {
-  constructor(sourceAri) {
-    this.sourceAri = sourceAri;
+  constructor({
+    cloudId
+  }) {
+    this.cloudId = cloudId;
   }
 
   // resourceId of the reference synced block.
   // the ARI must be constructed to call the block service API
   async fetchData(resourceId) {
-    const blockAri = generateBlockAriFromReference(this.sourceAri, resourceId);
+    const blockAri = generateBlockAriFromReference({
+      cloudId: this.cloudId,
+      resourceId
+    });
     try {
       const blockContentResponse = await getSyncedBlockContent({
         blockAri
@@ -129,15 +133,21 @@ class BlockServiceADFFetchProvider {
     }
   }
 }
-
 /**
  * ADFWriteProvider implementation that writes synced block data to Block Service API
  */
 class BlockServiceADFWriteProvider {
-  constructor(sourceAri, product, sourceDocumentId, getVersion) {
-    this.sourceAri = sourceAri;
+  constructor({
+    cloudId,
+    parentAri,
+    parentId,
+    product,
+    getVersion
+  }) {
+    this.cloudId = cloudId;
+    this.parentAri = parentAri;
+    this.parentId = parentId;
     this.product = product;
-    this.sourceDocumentId = sourceDocumentId;
     this.getVersion = getVersion;
   }
 
@@ -146,7 +156,12 @@ class BlockServiceADFWriteProvider {
     const {
       resourceId
     } = data;
-    const blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
+    const blockAri = generateBlockAri({
+      cloudId: this.cloudId,
+      parentId: this.parentId,
+      product: this.product,
+      resourceId
+    });
     const stepVersion = this.getVersion ? this.getVersion() : undefined;
     try {
       // Try update existing block's content
@@ -175,13 +190,18 @@ class BlockServiceADFWriteProvider {
     const {
       resourceId
     } = data;
-    const blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
+    const blockAri = generateBlockAri({
+      cloudId: this.cloudId,
+      parentId: this.parentId,
+      product: this.product,
+      resourceId
+    });
     const stepVersion = this.getVersion ? this.getVersion() : undefined;
     try {
       await createSyncedBlock({
         blockAri,
         blockInstanceId: data.blockInstanceId,
-        sourceAri: this.sourceAri,
+        sourceAri: this.parentAri,
         product: this.product,
         content: JSON.stringify(data.content),
         stepVersion
@@ -205,7 +225,12 @@ class BlockServiceADFWriteProvider {
 
   // soft deletes the source synced block
   async deleteData(resourceId) {
-    const blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
+    const blockAri = generateBlockAri({
+      cloudId: this.cloudId,
+      parentId: this.parentId,
+      product: this.product,
+      resourceId
+    });
     try {
       await deleteSyncedBlock({
         blockAri
@@ -241,7 +266,7 @@ class BlockServiceADFWriteProvider {
 
   // the sourceId is the resourceId of the source synced block.
   generateResourceIdForReference(sourceId) {
-    return `${this.product}/${this.sourceDocumentId}/${sourceId}`;
+    return `${this.product}/${this.parentId}/${sourceId}`;
   }
   generateResourceId() {
     return crypto.randomUUID();
@@ -249,9 +274,12 @@ class BlockServiceADFWriteProvider {
   async updateReferenceData(blocks, noContent) {
     try {
       await updateReferenceSyncedBlockOnDocument({
-        documentAri: this.sourceAri,
+        documentAri: this.parentAri,
         blocks: blocks.map(block => ({
-          blockAri: generateBlockAriFromReference(this.sourceAri, block.resourceId),
+          blockAri: generateBlockAriFromReference({
+            cloudId: this.cloudId,
+            resourceId: block.resourceId
+          }),
           blockInstanceId: block.localId
         })),
         noContent
@@ -273,18 +301,37 @@ class BlockServiceADFWriteProvider {
     }
   }
 }
-
-/**
- * Factory function to create both providers with shared configuration
- */
-const createBlockServiceAPIProviders = (sourceAri, product, sourceDocumentId, getVersion) => {
-  const fetchProvider = new BlockServiceADFFetchProvider(sourceAri);
-  const writeProvider = new BlockServiceADFWriteProvider(sourceAri, product, sourceDocumentId, getVersion);
-  return {
-    fetchProvider,
-    writeProvider
-  };
+export const useMemoizedBlockServiceAPIProviders = ({
+  cloudId,
+  parentAri,
+  parentId,
+  product,
+  getVersion
+}) => {
+  return useMemo(() => {
+    return {
+      fetchProvider: new BlockServiceADFFetchProvider({
+        cloudId
+      }),
+      writeProvider: new BlockServiceADFWriteProvider({
+        cloudId,
+        parentAri,
+        parentId,
+        product,
+        getVersion
+      })
+    };
+  }, [cloudId, parentAri, parentId, product, getVersion]);
 };
-export const useMemoizedBlockServiceAPIProviders = (sourceAri, product, sourceDocumentId, getVersion) => {
-  return useMemo(() => createBlockServiceAPIProviders(sourceAri, product, sourceDocumentId, getVersion), [sourceAri, product, sourceDocumentId, getVersion]);
+export const useMemoizedBlockServiceFetchOnlyAPIProvider = ({
+  cloudId
+}) => {
+  return useMemo(() => {
+    return {
+      fetchProvider: new BlockServiceADFFetchProvider({
+        cloudId
+      }),
+      writeProvider: undefined
+    };
+  }, [cloudId]);
 };

package/dist/es2019/providers/syncBlockProvider.js

@@ -3,32 +3,25 @@ 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 class SyncBlockProvider extends SyncBlockDataProvider {
-  // the source document ARI; that the source sync block is on.
-
   /**
    * Constructor for the SyncBlockProvider
    *
    * @param fetchProvider
    * @param writeProvider
-   * @param sourceId
    * @param nestedRendererDataProviders
    */
-  constructor(fetchProvider, writeProvider, sourceId) {
+  constructor(fetchProvider, writeProvider) {
     super();
     _defineProperty(this, "name", 'syncBlockProvider');
     this.fetchProvider = fetchProvider;
     this.writeProvider = writeProvider;
-    this.sourceId = sourceId;
     this.providerOptions = {};
   }
   setProviderOptions(providerOptions) {
     this.providerOptions = providerOptions;
   }
-  getProduct() {
-    return this.writeProvider.product;
-  }
 
   /**
    * Check if the node is supported by the provider
@@ -88,11 +81,18 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
    * resourceId: resource id of the node if write successfully , error: reason for when write failed
    */
   async writeNodesData(nodes, data) {
+    if (!this.writeProvider) {
+      return Promise.reject(new Error('Write provider not set'));
+    }
     const results = await Promise.allSettled(nodes.map((_node, index) => {
+      var _this$writeProvider;
+      if (!this.writeProvider) {
+        return Promise.reject('Write provider not set');
+      }
       if (!data[index].content) {
         return Promise.reject('No Synced Block content to write');
       }
-      return this.writeProvider.writeData(data[index]);
+      return (_this$writeProvider = this.writeProvider) === null || _this$writeProvider === void 0 ? void 0 : _this$writeProvider.writeData(data[index]);
     }));
     return results.map(result => {
       if (result.status === 'fulfilled') {
@@ -105,6 +105,9 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
     });
   }
   createNodeData(data) {
+    if (!this.writeProvider) {
+      return Promise.reject(new Error('Write provider not set'));
+    }
     return this.writeProvider.createData(data).then(result => result, error => ({
       error
     }));
@@ -118,7 +121,15 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
    * @returns Array of {resourceId?: string, error?: string}.
    */
   async deleteNodesData(resourceIds) {
-    const results = await Promise.allSettled(resourceIds.map(resourceId => this.writeProvider.deleteData(resourceId)));
+    if (!this.writeProvider) {
+      return Promise.reject(new Error('Write provider not set'));
+    }
+    const results = await Promise.allSettled(resourceIds.map(resourceId => {
+      if (!this.writeProvider) {
+        return Promise.reject('Write provider not set');
+      }
+      return this.writeProvider.deleteData(resourceId);
+    }));
     return results.map((result, index) => {
       if (result.status === 'fulfilled') {
         return result.value;
@@ -132,15 +143,6 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
     });
   }
 
-  /**
-   * Get the source id
-   *
-   * @returns The source id
-   */
-  getSourceId() {
-    return this.sourceId;
-  }
-
   /**
    * Fetch the source info from the source id
    *
@@ -163,10 +165,18 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
         return Promise.reject(new Error(`${sourceProduct} source product not supported`));
     }
   }
-  generateResourceId(sourceId, localId) {
-    return this.writeProvider.generateResourceId(sourceId, localId);
+  generateResourceId() {
+    const localId = crypto.randomUUID();
+    const resourceId = crypto.randomUUID();
+    return {
+      localId,
+      resourceId
+    };
   }
   generateResourceIdForReference(sourceId) {
+    if (!this.writeProvider) {
+      throw new Error('Write provider not set');
+    }
     return this.writeProvider.generateResourceIdForReference(sourceId);
   }
 
@@ -194,7 +204,9 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
     switch (sourceProduct) {
       case 'confluence-page':
         return {
-          contentId: getPageIdAndTypeFromConfluencePageAri(sourceAri).id,
+          contentId: getPageIdAndTypeFromConfluencePageAri({
+            ari: sourceAri
+          }).id,
           contentProduct: sourceProduct
         };
       case 'jira-work-item':
@@ -204,11 +216,19 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
     }
   }
   updateReferenceData(blocks, noContent) {
+    if (!this.writeProvider) {
+      throw new Error('Write provider not set');
+    }
     return this.writeProvider.updateReferenceData(blocks, noContent);
   }
 }
-export const useMemoizedSyncedBlockProvider = (fetchProvider, writeProvider, sourceId, providerOptions, getSSRData) => {
-  const syncBlockProvider = useMemo(() => new SyncBlockProvider(fetchProvider, writeProvider, sourceId), [fetchProvider, writeProvider, sourceId]);
+export const useMemoizedSyncedBlockProvider = ({
+  fetchProvider,
+  writeProvider,
+  providerOptions,
+  getSSRData
+}) => {
+  const syncBlockProvider = useMemo(() => new SyncBlockProvider(fetchProvider, writeProvider), [fetchProvider, writeProvider]);
   syncBlockProvider.setProviderOptions(providerOptions);
   const ssrData = getSSRData ? getSSRData() : undefined;
   if (ssrData) {

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

@@ -1,6 +1,4 @@
 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 { logException } from '@atlaskit/editor-common/monitoring';
 import { SyncBlockError } from '../common/types';
 import { updateErrorPayload, createErrorPayload, deleteErrorPayload, updateCacheErrorPayload } from '../utils/errorHandling';
@@ -168,14 +166,13 @@ export class SourceSyncBlockStoreManager {
    * @returns attributes for a new bodiedSyncBlock node
    */
   generateBodiedSyncBlockAttrs() {
-    var _this$dataProvider;
-    // 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 (!this.dataProvider || !sourceId) {
+    if (!this.dataProvider) {
       throw new Error('Data provider not set or source id not set');
     }
-    const resourceId = this.dataProvider.generateResourceId(sourceId, localId);
+    const {
+      resourceId,
+      localId
+    } = this.dataProvider.generateResourceId();
     return {
       resourceId,
       localId

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

@@ -2,32 +2,29 @@
 
 /**
  * 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 var 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);
+export var generateBlockAri = function generateBlockAri(_ref) {
+  var cloudId = _ref.cloudId,
+    parentId = _ref.parentId,
+    product = _ref.product,
+    resourceId = _ref.resourceId;
+  return "ari:cloud:blocks:".concat(cloudId, ":synced-block/").concat(product, "/").concat(parentId, "/").concat(resourceId);
 };
 
 /**
  * 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 var 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(sourceAri));
-  }
-  var cloudId = match[1];
+export var generateBlockAriFromReference = function generateBlockAriFromReference(_ref2) {
+  var cloudId = _ref2.cloudId,
+    resourceId = _ref2.resourceId;
   return "ari:cloud:blocks:".concat(cloudId, ":synced-block/").concat(resourceId);
 };
 

package/dist/esm/clients/confluence/ari.js

@@ -11,8 +11,10 @@
  * @param pageType - the type of the page
  * @returns the Confluence page ARI
  */
-export var getConfluencePageAri = function getConfluencePageAri(pageId, cloudId) {
-  var pageType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'page';
+export var getConfluencePageAri = function getConfluencePageAri(_ref) {
+  var pageId = _ref.pageId,
+    cloudId = _ref.cloudId,
+    pageType = _ref.pageType;
   return "ari:cloud:confluence:".concat(cloudId, ":").concat(pageType, "/").concat(pageId);
 };
 
@@ -21,7 +23,8 @@ export var getConfluencePageAri = function getConfluencePageAri(pageId, cloudId)
  * @param ari - the Confluence page ARI
  * @returns the page ID and type
  */
-export var getPageIdAndTypeFromConfluencePageAri = function getPageIdAndTypeFromConfluencePageAri(ari) {
+export var getPageIdAndTypeFromConfluencePageAri = function getPageIdAndTypeFromConfluencePageAri(_ref2) {
+  var ari = _ref2.ari;
   var match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/);
   if (match !== null && match !== void 0 && match[2]) {
     return {
@@ -30,40 +33,4 @@ export var getPageIdAndTypeFromConfluencePageAri = function getPageIdAndTypeFrom
     };
   }
   throw new Error("Invalid page ARI: ".concat(ari));
-};
-
-/**
- * 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 var getLocalIdFromContentPropertyResourceId = function getLocalIdFromContentPropertyResourceId(resourceId) {
-  var match = resourceId.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 resourceId: ".concat(resourceId));
-};
-
-/**
- * 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 var getPageAriFromContentPropertyResourceId = function getPageAriFromContentPropertyResourceId(resourceId) {
-  var match = resourceId.match(/(ari:cloud:confluence:[^:]+:(page|blogpost)\/\d+)\/([a-zA-Z0-9-]+)$/);
-  if (match !== null && match !== void 0 && match[1]) {
-    return match[1];
-  }
-  throw new Error("Invalid resourceId: ".concat(resourceId));
-};
-
-/**
- * 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 var resourceIdFromConfluencePageSourceIdAndLocalId = function resourceIdFromConfluencePageSourceIdAndLocalId(sourceId, localId) {
-  return "".concat(sourceId, "/").concat(localId);
 };

package/dist/esm/clients/confluence/sourceInfo.js

@@ -73,7 +73,9 @@ export var fetchConfluencePageInfo = /*#__PURE__*/function () {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.prev = 0;
-          _getPageIdAndTypeFrom = getPageIdAndTypeFromConfluencePageAri(pageAri), pageType = _getPageIdAndTypeFrom.type;
+          _getPageIdAndTypeFrom = getPageIdAndTypeFromConfluencePageAri({
+            ari: pageAri
+          }), pageType = _getPageIdAndTypeFrom.type;
           _context2.next = 4;
           return getConfluenceSourceInfo(pageAri);
         case 4:

package/dist/esm/clients/jira/ari.js

@@ -6,7 +6,9 @@
  * @param cloudId - the cloud ID
  * @returns the Jira work item ARI
  */
-export var getJiraWorkItemAri = function getJiraWorkItemAri(workItemId, cloudId) {
+export var getJiraWorkItemAri = function getJiraWorkItemAri(_ref) {
+  var cloudId = _ref.cloudId,
+    workItemId = _ref.workItemId;
   return "ari:cloud:jira:".concat(cloudId, ":issue/").concat(workItemId);
 };
 
@@ -15,7 +17,8 @@ export var getJiraWorkItemAri = function getJiraWorkItemAri(workItemId, cloudId)
  * @param ari - the Jira work item ARI
  * @returns the Jira work item ID
  */
-export var getJiraWorkItemIdFromAri = function getJiraWorkItemIdFromAri(ari) {
+export var getJiraWorkItemIdFromAri = function getJiraWorkItemIdFromAri(_ref2) {
+  var ari = _ref2.ari;
   var match = ari.match(/ari:cloud:jira:([^:]+):issue\/(\d+)/);
   if (match !== null && match !== void 0 && match[2]) {
     return match[2];