@atlaskit/editor-synced-block-provider 2.5.2 → 2.7.0

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

@@ -11,8 +11,8 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _createSyncBlock = require("../utils/createSyncBlock");
 var _resolveSyncBlockInstance = require("../utils/resolveSyncBlockInstance");
+var _utils = require("../utils/utils");
 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) { (0, _defineProperty2.default)(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; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
@@ -58,7 +58,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                     case 0:
                       _step$value = (0, _slicedToArray2.default)(_step.value, 2), resourceId = _step$value[0], callbacks = _step$value[1];
                       Object.keys(callbacks).forEach(function (localId) {
-                        syncBlocks.push((0, _createSyncBlock.createSyncBlockNode)(localId, resourceId));
+                        syncBlocks.push((0, _utils.createSyncBlockNode)(localId, resourceId));
                       });
                     case 2:
                     case "end":
@@ -124,7 +124,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       // we could optimise this further by checking if the sync block is on the same page as the source
       if (!this.syncBlockURLRequests.get(resourceId)) {
         this.syncBlockURLRequests.set(resourceId, true);
-        this.dataProvider.retrieveSyncBlockSourceUrlAndTitle((0, _createSyncBlock.createSyncBlockNode)('', resourceId)).then(function (sourceInfo) {
+        this.dataProvider.retrieveSyncBlockSourceUrlAndTitle((0, _utils.createSyncBlockNode)('', resourceId)).then(function (sourceInfo) {
           var existingSyncBlock = _this.getFromCache(resourceId);
           if (existingSyncBlock && existingSyncBlock.data) {
             existingSyncBlock.data = _objectSpread(_objectSpread({}, existingSyncBlock.data), {}, {
@@ -229,20 +229,9 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       this.syncBlockCache.delete(resourceId);
     }
   }, {
-    key: "subscribe",
-    value: function subscribe(node, callback) {
+    key: "subscribeToSyncBlock",
+    value: function subscribeToSyncBlock(resourceId, localId, callback) {
       var _this3 = this;
-      // check node is a sync block, as we only support sync block subscriptions
-      if (node.type.name !== 'syncBlock') {
-        return function () {};
-      }
-      var _node$attrs = node.attrs,
-        resourceId = _node$attrs.resourceId,
-        localId = _node$attrs.localId;
-      if (!localId || !resourceId) {
-        return function () {};
-      }
-
       // add to subscriptions map
       var resourceSubscriptions = this.subscriptions.get(resourceId) || {};
       this.subscriptions.set(resourceId, _objectSpread(_objectSpread({}, resourceSubscriptions), {}, (0, _defineProperty2.default)({}, localId, callback)));
@@ -252,7 +241,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       if (cachedData) {
         callback(cachedData);
       } else {
-        this.fetchSyncBlocksData([(0, _createSyncBlock.createSyncBlockNode)(localId, resourceId)]).catch(function () {});
+        this.fetchSyncBlocksData([(0, _utils.createSyncBlockNode)(localId, resourceId)]).catch(function () {});
       }
       return function () {
         var resourceSubscriptions = _this3.subscriptions.get(resourceId);
@@ -276,9 +265,9 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       if (node.type.name !== 'syncBlock') {
         return function () {};
       }
-      var _node$attrs2 = node.attrs,
-        resourceId = _node$attrs2.resourceId,
-        localId = _node$attrs2.localId;
+      var _node$attrs = node.attrs,
+        resourceId = _node$attrs.resourceId,
+        localId = _node$attrs.localId;
       if (!localId || !resourceId) {
         return function () {};
       }
@@ -302,6 +291,21 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         }
       };
     }
+  }, {
+    key: "subscribe",
+    value: function subscribe(node, callback) {
+      // check node is a sync block, as we only support sync block subscriptions
+      if (node.type.name !== 'syncBlock') {
+        return function () {};
+      }
+      var _node$attrs2 = node.attrs,
+        resourceId = _node$attrs2.resourceId,
+        localId = _node$attrs2.localId;
+      if (!localId || !resourceId) {
+        return function () {};
+      }
+      return this.subscribeToSyncBlock(resourceId, localId, callback);
+    }
 
     /**
      * Get the URL for a sync block.

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

@@ -47,7 +47,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
     key: "flushBodiedSyncBlocks",
     value: (function () {
       var _flushBodiedSyncBlocks = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var bodiedSyncBlockNodes, bodiedSyncBlockData, resourceIds;
+        var bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -79,9 +79,9 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
               _context.next = 10;
               return this.dataProvider.writeNodesData(bodiedSyncBlockNodes, bodiedSyncBlockData);
             case 10:
-              resourceIds = _context.sent;
-              return _context.abrupt("return", resourceIds.every(function (resourceId) {
-                return resourceId !== undefined;
+              writeResults = _context.sent;
+              return _context.abrupt("return", writeResults.every(function (result) {
+                return result.resourceId !== undefined;
               }));
             case 14:
               _context.prev = 14;
@@ -103,6 +103,35 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
     value: function setEditorView(editorView) {
       this.editorView = editorView;
     }
+  }, {
+    key: "registerPendingCreation",
+    value: function registerPendingCreation(resourceId) {
+      this.pendingResourceId = resourceId;
+    }
+  }, {
+    key: "registerCreationCallback",
+    value: function registerCreationCallback(callback) {
+      this.creationCallback = callback;
+    }
+
+    /**
+     *  Fires callback to insert node (if creation is successful) and clears pending creation data
+     * @param success
+     */
+  }, {
+    key: "commitPendingCreation",
+    value: function commitPendingCreation(success) {
+      if (success && this.creationCallback) {
+        this.creationCallback();
+      }
+      this.pendingResourceId = undefined;
+      this.creationCallback = undefined;
+    }
+  }, {
+    key: "hasPendingCreation",
+    value: function hasPendingCreation() {
+      return !!this.pendingResourceId;
+    }
   }, {
     key: "registerConfirmationCallback",
     value: function registerConfirmationCallback(callback) {
@@ -118,31 +147,63 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
       return !!this.confirmationCallback;
     }
   }, {
-    key: "createSyncBlockNode",
-    value: function createSyncBlockNode() {
+    key: "generateBodiedSyncBlockAttrs",
+    value: function generateBodiedSyncBlockAttrs() {
       var _this$dataProvider;
-      var blockInstanceId = (0, _uuid.default)();
+      var localId = (0, _uuid.default)();
       var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
       if (!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, blockInstanceId);
-      var syncBlockNode = {
-        attrs: {
-          resourceId: resourceId,
-          localId: blockInstanceId
-        },
-        type: 'bodiedSyncBlock'
+      var resourceId = (0, _ari.resourceIdFromSourceAndLocalId)(sourceId, localId);
+      return {
+        resourceId: resourceId,
+        localId: localId
       };
-      return syncBlockNode;
+    }
+  }, {
+    key: "createBodiedSyncBlockNode",
+    value: function createBodiedSyncBlockNode(attrs) {
+      var _this2 = this;
+      try {
+        if (!this.dataProvider) {
+          throw new Error('Data provider not set');
+        }
+        var resourceId = attrs.resourceId,
+          blockInstanceId = attrs.localId;
+        this.dataProvider.writeNodesData([(0, _utils.createBodiedSyncBlockNode)(blockInstanceId, resourceId)], [{
+          content: [],
+          blockInstanceId: blockInstanceId,
+          resourceId: resourceId
+        }]).then(function (results) {
+          results.forEach(function (result) {
+            var resourceId = result.resourceId;
+            if (resourceId) {
+              _this2.commitPendingCreation(true);
+            } else {
+              _this2.commitPendingCreation(false);
+              // TODO: EDITOR-1921 - add error analytics
+            }
+          });
+        }).catch(function (_reason) {
+          _this2.commitPendingCreation(false);
+          // TODO: EDITOR-1921 - add error analytics
+        });
+        this.registerPendingCreation(resourceId);
+      } catch (error) {
+        if (this.hasPendingCreation()) {
+          this.commitPendingCreation(false);
+        }
+        // TODO: EDITOR-1921 - add error analytics
+      }
     }
   }, {
     key: "deleteSyncBlocksWithConfirmation",
     value: function () {
       var _deleteSyncBlocksWithConfirmation = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(tr, syncBlockIds) {
-        var _this2 = this;
+        var _this3 = this;
         var confirmed, _this$editorView, results;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -177,7 +238,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
               results.forEach(function (result) {
                 if (result.success) {
                   // Only delete when it's deleted successfully in backend
-                  _this2.syncBlockCache.delete(result.resourceId);
+                  _this3.syncBlockCache.delete(result.resourceId);
                 } else {
                   // TODO: EDITOR-1921 - add error analytics with result.error
                 }

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

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.SyncBlockStoreManager = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _createSyncBlock = require("../utils/createSyncBlock");
+var _utils = require("../utils/utils");
 var _referenceSyncBlockStoreManager = require("./referenceSyncBlockStoreManager");
 var _sourceSyncBlockStoreManager = require("./sourceSyncBlockStoreManager");
 // A store manager responsible for the lifecycle and state management of sync blocks in an editor instance.
@@ -30,16 +30,21 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
   return (0, _createClass2.default)(SyncBlockStoreManager, [{
     key: "fetchSyncBlocksData",
     value: function fetchSyncBlocksData(nodes) {
-      var syncBlockNodes = nodes.filter(function (node) {
-        return node.type.name === 'syncBlock' && node.attrs.resourceId && node.attrs.localId;
-      }).map(function (node) {
-        return (0, _createSyncBlock.createSyncBlockNode)(node.attrs.localId, node.attrs.resourceId);
+      var syncBlockNodes = nodes.map(function (node) {
+        return (0, _utils.convertPMNodeToSyncBlockNode)(node);
+      }).filter(function (node) {
+        return node !== undefined;
       }) || [];
       if (syncBlockNodes.length === 0) {
         return Promise.resolve([]);
       }
       return this.referenceSyncBlockStoreManager.fetchSyncBlocksData(syncBlockNodes);
     }
+  }, {
+    key: "getReferenceSyncBlockStoreManager",
+    value: function getReferenceSyncBlockStoreManager() {
+      return this.referenceSyncBlockStoreManager;
+    }
 
     /**
      * Add/update a sync block node to/from the local cache
@@ -100,11 +105,44 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
       // only applicable to source sync block, for now (will be refactored further)
       return this.sourceSyncBlockStoreManager.requireConfirmationBeforeDelete();
     }
+
+    /**
+     * Register callback function (which inserts node, handles focus etc) to be used later when creation to backend succeed
+     */
+  }, {
+    key: "registerCreationCallback",
+    value: function registerCreationCallback(callback) {
+      this.sourceSyncBlockStoreManager.registerCreationCallback(callback);
+    }
+
+    /**
+     *
+     * @returns true if waiting for the result of saving new bodiedSyncBlock to backend
+     */
+  }, {
+    key: "hasPendingCreation",
+    value: function hasPendingCreation() {
+      return this.sourceSyncBlockStoreManager.hasPendingCreation();
+    }
+
+    /**
+     * @returns attributes for a new bodiedSyncBlock node
+     */
+  }, {
+    key: "generateBodiedSyncBlockAttrs",
+    value: function generateBodiedSyncBlockAttrs() {
+      return this.sourceSyncBlockStoreManager.generateBodiedSyncBlockAttrs();
+    }
+
+    /**
+     * Save bodiedSyncBlock with empty content to backend
+     * @param attrs attributes Ids of the node
+     */
   }, {
-    key: "createSyncBlockNode",
-    value: function createSyncBlockNode() {
+    key: "createBodiedSyncBlockNode",
+    value: function createBodiedSyncBlockNode(attrs) {
       // only applicable to source sync block, for now (will be refactored further)
-      return this.sourceSyncBlockStoreManager.createSyncBlockNode();
+      return this.sourceSyncBlockStoreManager.createBodiedSyncBlockNode(attrs);
     }
   }, {
     key: "subscribeToSyncBlockData",

package/dist/cjs/utils/errorHandling.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stringifyError = void 0;
+var stringifyError = exports.stringifyError = function stringifyError(error) {
+  try {
+    return JSON.stringify(error);
+  } catch (_unused) {
+    return undefined;
+  }
+};

package/dist/cjs/utils/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isBlogPageType = exports.convertSyncBlockPMNodeToSyncBlockData = void 0;
+exports.isBlogPageType = exports.createSyncBlockNode = exports.createBodiedSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodeToSyncBlockNode = void 0;
 var convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockPMNodeToSyncBlockData = function convertSyncBlockPMNodeToSyncBlockData(node) {
   return {
     blockInstanceId: node.attrs.localId,
@@ -13,4 +13,35 @@ var convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockPMNodeToSync
 };
 var isBlogPageType = exports.isBlogPageType = function isBlogPageType(pageType) {
   return pageType === 'blogpost';
+};
+var createSyncBlockNode = exports.createSyncBlockNode = function createSyncBlockNode(localId, resourceId) {
+  return {
+    type: 'syncBlock',
+    attrs: {
+      localId: localId,
+      resourceId: resourceId
+    }
+  };
+};
+var createBodiedSyncBlockNode = exports.createBodiedSyncBlockNode = function createBodiedSyncBlockNode(localId, resourceId) {
+  return {
+    type: 'bodiedSyncBlock',
+    attrs: {
+      localId: localId,
+      resourceId: resourceId
+    }
+  };
+};
+var convertSyncBlockJSONNodeToSyncBlockNode = exports.convertSyncBlockJSONNodeToSyncBlockNode = function convertSyncBlockJSONNodeToSyncBlockNode(node) {
+  if (node.type !== 'syncBlock' || !node.attrs || !('localId' in node.attrs) || !('resourceId' in node.attrs) || typeof node.attrs.localId !== 'string' || typeof node.attrs.resourceId !== 'string') {
+    return undefined;
+  }
+  return createSyncBlockNode(node.attrs.localId, node.attrs.resourceId);
+};
+var convertPMNodeToSyncBlockNode = exports.convertPMNodeToSyncBlockNode = function convertPMNodeToSyncBlockNode(node) {
+  var _node$attrs, _node$attrs2;
+  if (node.type.name !== 'syncBlock' || !((_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.localId) || !((_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.resourceId) || typeof node.attrs.localId !== 'string' || typeof node.attrs.resourceId !== 'string') {
+    return undefined;
+  }
+  return createSyncBlockNode(node.attrs.localId, node.attrs.resourceId);
 };

package/dist/es2019/hooks/useFetchSyncBlockData.js

@@ -1,14 +1,43 @@
-import { useEffect, useState } from 'react';
-export const SYNC_BLOCK_FETCH_INTERVAL = 3000;
-export const useFetchSyncBlockData = (manager, syncBlockNode) => {
+import { useCallback, useEffect, useState } from 'react';
+import { SyncBlockError } from '../common/types';
+import { createSyncBlockNode } from '../utils/utils';
+export const useFetchSyncBlockData = (manager, resourceId, localId) => {
   const [syncBlockInstance, setSyncBlockInstance] = useState(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const referenceSyncBlockStoreManager = manager.getReferenceSyncBlockStoreManager();
+  const reloadData = useCallback(async () => {
+    if (isLoading) {
+      return;
+    }
+    const syncBlockNode = resourceId && localId ? createSyncBlockNode(localId, resourceId) : null;
+    if (!syncBlockNode) {
+      return;
+    }
+    setIsLoading(true);
+    try {
+      // Fetch sync block data, the `subscribeToSyncBlock` will update the state once data is fetched
+      await referenceSyncBlockStoreManager.fetchSyncBlocksData([syncBlockNode]);
+    } catch (error) {
+      // Set error state if fetching fails
+      setSyncBlockInstance({
+        resourceId: resourceId || '',
+        error: SyncBlockError.Errored
+      });
+    }
+    setIsLoading(false);
+  }, [isLoading, localId, referenceSyncBlockStoreManager, resourceId]);
   useEffect(() => {
-    const unsubscribe = manager.subscribeToSyncBlockData(syncBlockNode, data => {
+    const unsubscribe = referenceSyncBlockStoreManager.subscribeToSyncBlock(resourceId || '', localId || '', data => {
       setSyncBlockInstance(data);
+      setIsLoading(false);
     });
     return () => {
       unsubscribe();
     };
-  }, [manager, syncBlockNode]);
-  return syncBlockInstance;
+  }, [localId, referenceSyncBlockStoreManager, resourceId]);
+  return {
+    syncBlockInstance,
+    isLoading,
+    reloadData
+  };
 };

package/dist/es2019/index.js

@@ -1,14 +1,15 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
 
-export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
-export { SyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
+export { rebaseTransaction } from './common/rebase-transaction';
+export { getDefaultSyncBlockSchema } from './common/schema';
+export { SyncBlockError } from './common/types';
 export { useFetchSyncBlockData } from './hooks/useFetchSyncBlockData';
 export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
-export { SyncBlockError } from './common/types';
-export { getDefaultSyncBlockSchema } from './common/schema';
 export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders } from './providers/confluence/confluenceContentAPI';
+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 { convertSyncBlockPMNodeToSyncBlockData } from './utils/utils';
-export { rebaseTransaction } from './common/rebase-transaction';
+export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode } from './utils/utils';
 export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';

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

@@ -3,6 +3,7 @@ import { useMemo } from 'react';
 import { SyncBlockError } from '../../common/types';
 import { getLocalIdFromAri, getPageIdAndTypeFromAri } from '../../utils/ari';
 import { getContentProperty, createContentProperty, updateContentProperty, deleteContentProperty } from '../../utils/contentProperty';
+import { stringifyError } from '../../utils/errorHandling';
 import { isBlogPageType } from '../../utils/utils';
 
 /**
@@ -118,7 +119,7 @@ class ConfluenceADFWriteProvider {
         if (((_contentProperty$data7 = contentProperty.data.confluence.createBlogPostProperty.blogPostProperty) === null || _contentProperty$data7 === void 0 ? void 0 : _contentProperty$data7.key) === key) {
           return key;
         } else {
-          throw new Error('Failed to create blog post content property');
+          return Promise.reject('Failed to create blog post content property');
         }
       } else {
         var _contentProperty$data8;
@@ -126,20 +127,31 @@ class ConfluenceADFWriteProvider {
         if (((_contentProperty$data8 = contentProperty.data.confluence.createPageProperty.pageProperty) === null || _contentProperty$data8 === void 0 ? void 0 : _contentProperty$data8.key) === key) {
           return key;
         } else {
-          throw new Error('Failed to create page content property');
+          return Promise.reject('Failed to create page content property');
         }
       }
     });
     this.config = config;
   }
   async writeData(data) {
+    let match;
+    const {
+      resourceId
+    } = data;
+    try {
+      match = getPageIdAndTypeFromAri(data.resourceId);
+    } catch (error) {
+      return {
+        error: stringifyError(error)
+      };
+    }
     const {
       id: pageId,
       type: pageType
-    } = getPageIdAndTypeFromAri(data.resourceId);
-    if (data.resourceId) {
+    } = match;
+    try {
       // Update existing content property
-      const localId = getLocalIdFromAri(data.resourceId);
+      const localId = getLocalIdFromAri(resourceId);
       const key = getContentPropertyKey(this.config.contentPropertyKey, localId);
       const options = {
         pageId,
@@ -148,55 +160,65 @@ class ConfluenceADFWriteProvider {
         cloudId: this.config.cloudId,
         pageType
       };
-      if (isBlogPageType(pageType)) {
-        var _contentProperty$data9;
-        const contentProperty = await updateContentProperty(options);
-        if (((_contentProperty$data9 = contentProperty.data.confluence.updateValueBlogPostProperty.blogPostProperty) === null || _contentProperty$data9 === void 0 ? void 0 : _contentProperty$data9.key) === key) {
-          return key;
-        } else if (contentProperty.data.confluence.updateValueBlogPostProperty.blogPostProperty === null) {
-          return this.createNewContentProperty(pageId, key, data, pageType);
-        } else {
-          throw new Error('Failed to update blog post content property');
-        }
+      const updatePayload = await updateContentProperty(options);
+      const updateResult = isBlogPageType(pageType) ? updatePayload.data.confluence.updateValueBlogPostProperty.blogPostProperty : updatePayload.data.confluence.updateValuePageProperty.pageProperty;
+      if ((updateResult === null || updateResult === void 0 ? void 0 : updateResult.key) === key) {
+        return {
+          resourceId
+        };
+      } else if (!updateResult) {
+        return this.createNewContentProperty(pageId, key, data, pageType).then(() => {
+          return {
+            resourceId
+          };
+        }, error => {
+          return {
+            error
+          };
+        });
       } else {
-        var _contentProperty$data0;
-        const contentProperty = await updateContentProperty(options);
-        if (((_contentProperty$data0 = contentProperty.data.confluence.updateValuePageProperty.pageProperty) === null || _contentProperty$data0 === void 0 ? void 0 : _contentProperty$data0.key) === key) {
-          return key;
-        } else if (contentProperty.data.confluence.updateValuePageProperty.pageProperty === null) {
-          return this.createNewContentProperty(pageId, key, data, pageType);
-        } else {
-          throw new Error('Failed to update content property');
-        }
+        return {
+          error: `Failed to update ${pageType} content property`
+        };
       }
-    } else {
-      // Create new content property
-      const key = getContentPropertyKey(this.config.contentPropertyKey, data.blockInstanceId);
-      return this.createNewContentProperty(pageId, key, data, pageType);
+    } catch {
+      return {
+        error: `Failed to write ${pageType}`
+      };
     }
   }
   async deleteData(resourceId) {
+    let deletePayload, deleteResult, match;
+    try {
+      match = getPageIdAndTypeFromAri(resourceId);
+    } catch (error) {
+      return {
+        resourceId,
+        success: false,
+        error: stringifyError(error)
+      };
+    }
     const {
       id: pageId,
       type: pageType
-    } = getPageIdAndTypeFromAri(resourceId);
-    const localId = getLocalIdFromAri(resourceId);
-    const key = getContentPropertyKey(this.config.contentPropertyKey, localId);
-    const options = {
-      pageId,
-      key,
-      cloudId: this.config.cloudId,
-      pageType
-    };
-    let deletePayload, deleteResult;
+    } = match;
     try {
+      const localId = getLocalIdFromAri(resourceId);
+      const key = getContentPropertyKey(this.config.contentPropertyKey, localId);
+      const options = {
+        pageId,
+        key,
+        cloudId: this.config.cloudId,
+        pageType
+      };
       deletePayload = await deleteContentProperty(options);
       deleteResult = isBlogPageType(pageType) ? deletePayload.data.confluence.deleteBlogPostProperty : deletePayload.data.confluence.deletePageProperty;
-    } catch {
+    } catch (error) {
+      var _stringifyError;
       return {
         resourceId,
         success: false,
-        error: `Fail to delete ${pageType} content property`
+        error: (_stringifyError = stringifyError(error)) !== null && _stringifyError !== void 0 ? _stringifyError : `Fail to delete ${pageType} content property`
       };
     }
     return {

package/dist/es2019/providers/syncBlockProvider.js

@@ -41,19 +41,25 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
    * @param nodes
    * @param data
    *
-   * @returns the resource ids of the nodes that were written
+   * @returns Array of {resourceId?: string, error?: string}.
+   * resourceId: resource id of the node if write successfully , error: reason for when write failed
    */
-  writeNodesData(nodes, data) {
-    const resourceIds = [];
-    nodes.forEach((_node, index) => {
+  async writeNodesData(nodes, data) {
+    const results = await Promise.allSettled(nodes.map((_node, index) => {
       if (!data[index].content) {
-        resourceIds.push(Promise.reject('No Synced Block content to write'));
-        return;
+        return Promise.reject('No Synced Block content to write');
+      }
+      return this.writeProvider.writeData(data[index]);
+    }));
+    return results.map(result => {
+      if (result.status === 'fulfilled') {
+        return result.value;
+      } else {
+        return {
+          error: result.reason
+        };
       }
-      const resourceId = this.writeProvider.writeData(data[index]);
-      resourceIds.push(resourceId);
     });
-    return Promise.all(resourceIds);
   }
   async deleteNodesData(resourceIds) {
     const results = await Promise.allSettled(resourceIds.map(resourceId => this.writeProvider.deleteData(resourceId)));