@atlaskit/editor-synced-block-provider 3.2.2 → 3.4.0

package/dist/esm/providers/syncBlockProvider.js

@@ -1,5 +1,5 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
@@ -10,6 +10,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { useMemo } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getPageIdAndTypeFromConfluencePageAri } from '../clients/confluence/ari';
 import { fetchConfluencePageInfo } from '../clients/confluence/sourceInfo';
 import { SyncBlockError } from '../common/types';
@@ -66,7 +67,7 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
     }
 
     /**
-     * Fetch the data from the fetch provider
+     * Fetch the data from the fetch provider using batch API
      *
      * @param nodes
      *
@@ -74,30 +75,66 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
      */
   }, {
     key: "fetchNodesData",
-    value: function fetchNodesData(nodes) {
-      var _this2 = this;
-      var resourceIdSet = new Set(nodes.map(function (node) {
-        return node.attrs.resourceId;
+    value: (function () {
+      var _fetchNodesData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(nodes) {
+        var _this2 = this;
+        var resourceIdSet, resourceIds;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              resourceIdSet = new Set(nodes.map(function (node) {
+                return node.attrs.resourceId;
+              }));
+              resourceIds = _toConsumableArray(resourceIdSet);
+              if (!fg('platform_synced_block_dogfooding')) {
+                _context.next = 14;
+                break;
+              }
+              _context.prev = 3;
+              _context.next = 6;
+              return this.fetchProvider.batchFetchData(resourceIds);
+            case 6:
+              return _context.abrupt("return", _context.sent);
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context["catch"](3);
+              return _context.abrupt("return", resourceIds.map(function (resourceId) {
+                return {
+                  error: SyncBlockError.Errored,
+                  resourceId: resourceId
+                };
+              }));
+            case 12:
+              _context.next = 15;
+              break;
+            case 14:
+              return _context.abrupt("return", Promise.allSettled(resourceIds.map(function (resourceId) {
+                return _this2.fetchProvider.fetchData(resourceId).then(function (data) {
+                  return data;
+                }, function () {
+                  return {
+                    error: SyncBlockError.Errored,
+                    resourceId: resourceId
+                  };
+                });
+              })).then(function (results) {
+                return results.filter(function (result) {
+                  return result.status === 'fulfilled';
+                }).map(function (result) {
+                  return result.value;
+                });
+              }));
+            case 15:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[3, 9]]);
       }));
-      var resourceIds = _toConsumableArray(resourceIdSet);
-      return Promise.allSettled(resourceIds.map(function (resourceId) {
-        return _this2.fetchProvider.fetchData(resourceId).then(function (data) {
-          return data;
-        }, function () {
-          return {
-            error: SyncBlockError.Errored,
-            resourceId: resourceId
-          };
-        });
-      })).then(function (results) {
-        return results.filter(function (result) {
-          return result.status === 'fulfilled';
-        }).map(function (result) {
-          return result.value;
-        });
-      });
-    }
-
+      function fetchNodesData(_x) {
+        return _fetchNodesData.apply(this, arguments);
+      }
+      return fetchNodesData;
+    }()
     /**
      * Write the data to the write provider
      *
@@ -107,22 +144,23 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
      * @returns Array of {resourceId?: string, error?: string}.
      * resourceId: resource id of the node if write successfully , error: reason for when write failed
      */
+    )
   }, {
     key: "writeNodesData",
     value: (function () {
-      var _writeNodesData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(nodes, data) {
+      var _writeNodesData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(nodes, data) {
         var _this3 = this;
         var results;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if (this.writeProvider) {
-                _context.next = 2;
+                _context2.next = 2;
                 break;
               }
-              return _context.abrupt("return", Promise.reject(new Error('Write provider not set')));
+              return _context2.abrupt("return", Promise.reject(new Error('Write provider not set')));
             case 2:
-              _context.next = 4;
+              _context2.next = 4;
               return Promise.allSettled(nodes.map(function (_node, index) {
                 var _this3$writeProvider;
                 if (!_this3.writeProvider) {
@@ -134,8 +172,8 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
                 return (_this3$writeProvider = _this3.writeProvider) === null || _this3$writeProvider === void 0 ? void 0 : _this3$writeProvider.writeData(data[index]);
               }));
             case 4:
-              results = _context.sent;
-              return _context.abrupt("return", results.map(function (result) {
+              results = _context2.sent;
+              return _context2.abrupt("return", results.map(function (result) {
                 if (result.status === 'fulfilled') {
                   return result.value;
                 } else {
@@ -146,11 +184,11 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
               }));
             case 6:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
-      function writeNodesData(_x, _x2) {
+      function writeNodesData(_x2, _x3) {
         return _writeNodesData.apply(this, arguments);
       }
       return writeNodesData;
@@ -180,19 +218,19 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
   }, {
     key: "deleteNodesData",
     value: (function () {
-      var _deleteNodesData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resourceIds) {
+      var _deleteNodesData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(resourceIds) {
         var _this4 = this;
         var results;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               if (this.writeProvider) {
-                _context2.next = 2;
+                _context3.next = 2;
                 break;
               }
-              return _context2.abrupt("return", Promise.reject(new Error('Write provider not set')));
+              return _context3.abrupt("return", Promise.reject(new Error('Write provider not set')));
             case 2:
-              _context2.next = 4;
+              _context3.next = 4;
               return Promise.allSettled(resourceIds.map(function (resourceId) {
                 if (!_this4.writeProvider) {
                   return Promise.reject('Write provider not set');
@@ -200,8 +238,8 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
                 return _this4.writeProvider.deleteData(resourceId);
               }));
             case 4:
-              results = _context2.sent;
-              return _context2.abrupt("return", results.map(function (result, index) {
+              results = _context3.sent;
+              return _context3.abrupt("return", results.map(function (result, index) {
                 if (result.status === 'fulfilled') {
                   return result.value;
                 } else {
@@ -214,11 +252,11 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
               }));
             case 6:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
-      function deleteNodesData(_x3) {
+      function deleteNodesData(_x4) {
         return _deleteNodesData.apply(this, arguments);
       }
       return deleteNodesData;

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

@@ -90,11 +90,27 @@ type UpdateReferenceSyncedBlockOnDocumentRequest = {
     documentAri: string;
     noContent?: boolean;
 };
+export type BatchRetrieveSyncedBlocksRequest = {
+    blockAris: string[];
+};
+export type BatchRetrieveSyncedBlocksResponse = {
+    error?: Array<BlockContentErrorResponse>;
+    success?: Array<BlockContentResponse>;
+};
 export declare class BlockError extends Error {
     readonly status: number;
     constructor(status: number);
 }
 export declare const getSyncedBlockContent: ({ blockAri, }: GetSyncedBlockContentRequest) => Promise<BlockContentResponse>;
+/**
+ * Batch retrieves multiple synced blocks by their ARIs.
+ *
+ * Calls the Block Service API endpoint: `POST /v1/block/batch-retrieve`
+ *
+ * @param blockAris - Array of block ARIs to retrieve
+ * @returns A promise containing arrays of successfully fetched blocks and any errors encountered
+ */
+export declare const batchRetrieveSyncedBlocks: ({ blockAris, }: BatchRetrieveSyncedBlocksRequest) => Promise<BatchRetrieveSyncedBlocksResponse>;
 export declare const deleteSyncedBlock: ({ blockAri }: DeleteSyncedBlockRequest) => Promise<void>;
 export declare const updateSyncedBlock: ({ blockAri, content, stepVersion, }: UpdateSyncedBlockRequest) => Promise<void>;
 export declare const createSyncedBlock: ({ blockAri, blockInstanceId, sourceAri, product, content, stepVersion, }: CreateSyncedBlockRequest) => Promise<BlockContentResponse>;

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

@@ -11,6 +11,17 @@ declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
     private cloudId;
     constructor({ cloudId }: BlockServiceADFFetchProviderProps);
     fetchData(resourceId: string): Promise<SyncBlockInstance>;
+    /**
+     * Extracts the resourceId from a block ARI.
+     * Block ARI format: ari:cloud:blocks:<cloudId>:synced-block/<resourceId>
+     */
+    private extractResourceIdFromBlockAri;
+    /**
+     * Batch fetches multiple synced blocks by their resource IDs.
+     * @param resourceIds - Array of resource IDs to fetch
+     * @returns Array of SyncBlockInstance results
+     */
+    batchFetchData(resourceIds: string[]): Promise<SyncBlockInstance[]>;
 }
 interface BlockServiceADFWriteProviderProps {
     cloudId: string;

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

@@ -33,7 +33,7 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
      */
     nodeDataKey(node: SyncBlockNode): string;
     /**
-     * Fetch the data from the fetch provider
+     * Fetch the data from the fetch provider using batch API
      *
      * @param nodes
      *

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

@@ -44,6 +44,7 @@ export type UpdateReferenceSyncBlockResult = {
     success: boolean;
 };
 export interface ADFFetchProvider {
+    batchFetchData: (resourceIds: ResourceId[]) => Promise<SyncBlockInstance[]>;
     fetchData: (resourceId: ResourceId) => Promise<SyncBlockInstance>;
 }
 export interface ADFWriteProvider {

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

@@ -90,11 +90,27 @@ type UpdateReferenceSyncedBlockOnDocumentRequest = {
     documentAri: string;
     noContent?: boolean;
 };
+export type BatchRetrieveSyncedBlocksRequest = {
+    blockAris: string[];
+};
+export type BatchRetrieveSyncedBlocksResponse = {
+    error?: Array<BlockContentErrorResponse>;
+    success?: Array<BlockContentResponse>;
+};
 export declare class BlockError extends Error {
     readonly status: number;
     constructor(status: number);
 }
 export declare const getSyncedBlockContent: ({ blockAri, }: GetSyncedBlockContentRequest) => Promise<BlockContentResponse>;
+/**
+ * Batch retrieves multiple synced blocks by their ARIs.
+ *
+ * Calls the Block Service API endpoint: `POST /v1/block/batch-retrieve`
+ *
+ * @param blockAris - Array of block ARIs to retrieve
+ * @returns A promise containing arrays of successfully fetched blocks and any errors encountered
+ */
+export declare const batchRetrieveSyncedBlocks: ({ blockAris, }: BatchRetrieveSyncedBlocksRequest) => Promise<BatchRetrieveSyncedBlocksResponse>;
 export declare const deleteSyncedBlock: ({ blockAri }: DeleteSyncedBlockRequest) => Promise<void>;
 export declare const updateSyncedBlock: ({ blockAri, content, stepVersion, }: UpdateSyncedBlockRequest) => Promise<void>;
 export declare const createSyncedBlock: ({ blockAri, blockInstanceId, sourceAri, product, content, stepVersion, }: CreateSyncedBlockRequest) => Promise<BlockContentResponse>;

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

@@ -11,6 +11,17 @@ declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
     private cloudId;
     constructor({ cloudId }: BlockServiceADFFetchProviderProps);
     fetchData(resourceId: string): Promise<SyncBlockInstance>;
+    /**
+     * Extracts the resourceId from a block ARI.
+     * Block ARI format: ari:cloud:blocks:<cloudId>:synced-block/<resourceId>
+     */
+    private extractResourceIdFromBlockAri;
+    /**
+     * Batch fetches multiple synced blocks by their resource IDs.
+     * @param resourceIds - Array of resource IDs to fetch
+     * @returns Array of SyncBlockInstance results
+     */
+    batchFetchData(resourceIds: string[]): Promise<SyncBlockInstance[]>;
 }
 interface BlockServiceADFWriteProviderProps {
     cloudId: string;

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

@@ -33,7 +33,7 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
      */
     nodeDataKey(node: SyncBlockNode): string;
     /**
-     * Fetch the data from the fetch provider
+     * Fetch the data from the fetch provider using batch API
      *
      * @param nodes
      *

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

@@ -44,6 +44,7 @@ export type UpdateReferenceSyncBlockResult = {
     success: boolean;
 };
 export interface ADFFetchProvider {
+    batchFetchData: (resourceIds: ResourceId[]) => Promise<SyncBlockInstance[]>;
     fetchData: (resourceId: ResourceId) => Promise<SyncBlockInstance>;
 }
 export interface ADFWriteProvider {

package/package.json

@@ -28,12 +28,13 @@
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/node-data-provider": "^8.0.0",
+		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.6",
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.0.0",
+		"@atlaskit/editor-common": "^111.2.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -76,11 +77,16 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "3.2.2",
+	"version": "3.4.0",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
+	},
+	"platform-feature-flags": {
+		"platform_synced_block_dogfooding": {
+			"type": "boolean"
+		}
 	}
 }