@atlaskit/editor-synced-block-provider 6.6.9 → 6.6.11

package/dist/cjs/utils/resourceId.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.parseResourceId = exports.createResourceIdForReference = void 0;
 var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 var _consts = require("../common/consts");
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var isSyncBlockProduct = function isSyncBlockProduct(product) {
   return _consts.SYNC_BLOCK_PRODUCTS.includes(product);
 };
@@ -45,7 +46,7 @@ var parseResourceId = exports.parseResourceId = function parseResourceId(resourc
     product = _resourceId$split2[0],
     contentId = _resourceId$split2[1],
     uuid = _resourceId$split2[2],
-    rest = _resourceId$split2.slice(3);
+    rest = _arrayLikeToArray(_resourceId$split2).slice(3);
 
   // invalid if any part is missing or there are extra parts
   if (!product || !contentId || !uuid || rest.length > 0) {

package/dist/cjs/utils/retry.js

@@ -35,32 +35,32 @@ var _fetchWithRetry = exports.fetchWithRetry = /*#__PURE__*/function () {
       parsedDelay,
       retryDelay,
       _args = arguments;
-    return _regenerator.default.wrap(function _callee$(_context) {
+    return _regenerator.default.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           retriesRemaining = _args.length > 2 && _args[2] !== undefined ? _args[2] : 3;
           delay = _args.length > 3 && _args[3] !== undefined ? _args[3] : 1000;
-          _context.next = 4;
+          _context.next = 1;
           return fetch(url, options);
-        case 4:
+        case 1:
           response = _context.sent;
           shouldRetry = !response.ok && response.status === 429 && retriesRemaining > 1;
           if (shouldRetry) {
-            _context.next = 8;
+            _context.next = 2;
             break;
           }
           return _context.abrupt("return", response);
-        case 8:
+        case 2:
           retryAfter = response.headers.get('Retry-After');
           parsedDelay = (_ref2 = retryAfter ? parseRetryAfter(retryAfter) : undefined) !== null && _ref2 !== void 0 ? _ref2 : delay;
           retryDelay = Math.min(parsedDelay, MAX_RETRY_DELAY);
-          _context.next = 13;
+          _context.next = 3;
           return new Promise(function (resolve) {
             return setTimeout(resolve, retryDelay);
           });
-        case 13:
+        case 3:
           return _context.abrupt("return", _fetchWithRetry(url, options, retriesRemaining - 1, delay * 2));
-        case 14:
+        case 4:
         case "end":
           return _context.stop();
       }

package/dist/cjs/utils/utils.js

@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.stripAnnotationMarksFromJSONContent = exports.getSourceProductFromResourceIdSafe = exports.getContentIdAndProductFromResourceId = exports.createSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodesToSyncBlockNodes = exports.convertPMNodeToSyncBlockNode = exports.convertContentUpdatedAt = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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; } /* eslint-disable require-unicode-regexp  */
+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; }
+/* eslint-disable require-unicode-regexp  */
+
 var _stripAnnotationMarksFromJSONContent = exports.stripAnnotationMarksFromJSONContent = function stripAnnotationMarksFromJSONContent(content) {
   var strippedContent;
   content.forEach(function (contentNode, index) {
@@ -54,7 +55,7 @@ var convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockPMNodeToSync
   var content = node.content.toJSON();
   return {
     blockInstanceId: node.attrs.localId,
-    content: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_12') ? _stripAnnotationMarksFromJSONContent(content) : content,
+    content: content ? _stripAnnotationMarksFromJSONContent(content) : content,
     resourceId: node.attrs.resourceId
   };
 };

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

@@ -153,7 +153,7 @@ export class ReferenceSyncBlockStoreManager {
   }
   stripAnnotationMarksFromReferenceData(syncBlock) {
     var _syncBlock$data;
-    if (!fg('platform_synced_block_patch_12') || !((_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && _syncBlock$data.content)) {
+    if (!((_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && _syncBlock$data.content)) {
       return syncBlock;
     }
     const content = stripAnnotationMarksFromJSONContent(syncBlock.data.content);

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

@@ -1,6 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SyncBlockError } from '../common/types';
 import { updateErrorPayload, createErrorPayload, deleteErrorPayload, updateCacheErrorPayload, getSourceInfoErrorPayload, updateSuccessPayload, createSuccessPayload, deleteSuccessPayload, fetchReferencesErrorPayload } from '../utils/errorHandling';
 import { getCreateSourceExperience, getDeleteSourceExperience, getSaveSourceExperience, getFetchSourceInfoExperience } from '../utils/experienceTracking';
@@ -152,7 +151,7 @@ export class SourceSyncBlockStoreManager {
       // `commitPendingCreation()` can trigger a follow-up flush once that
       // specific creation completes.
       // See EDITOR-7112.
-      if (this.pendingCreationPromises.size > 0 && fg('platform_synced_block_patch_12')) {
+      if (this.pendingCreationPromises.size > 0) {
         let timedOut = false;
         let timeoutId;
         const timeout = new Promise(resolve => {

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

@@ -1,6 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { fetchErrorPayload, fetchSuccessPayload } from '../utils/errorHandling';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
 import { getSourceProductFromResourceIdSafe } from '../utils/utils';
@@ -216,7 +215,6 @@ export class SyncBlockSubscriptionManager {
     if (!(dataProvider !== null && dataProvider !== void 0 && dataProvider.subscribeToBlockUpdates)) {
       return;
     }
-    const reconnectEnabled = fg('platform_synced_block_patch_12');
     const unsubscribe = dataProvider.subscribeToBlockUpdates(resourceId, syncBlockInstance => {
       this.handleGraphQLUpdate(syncBlockInstance);
     }, error => {
@@ -225,12 +223,10 @@ export class SyncBlockSubscriptionManager {
         location: 'editor-synced-block-provider/syncBlockSubscriptionManager/graphql-subscription'
       });
       (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 ? void 0 : _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
-      if (reconnectEnabled) {
-        this.handleSubscriptionTerminated(resourceId);
-      }
-    }, reconnectEnabled ? () => {
       this.handleSubscriptionTerminated(resourceId);
-    } : undefined);
+    }, () => {
+      this.handleSubscriptionTerminated(resourceId);
+    });
     if (unsubscribe) {
       this.graphqlSubscriptions.set(resourceId, unsubscribe);
     }
@@ -320,10 +316,8 @@ export class SyncBlockSubscriptionManager {
       unsubscribe();
       this.graphqlSubscriptions.delete(resourceId);
     }
-    if (fg('platform_synced_block_patch_12')) {
-      this.cancelPendingRetry(resourceId);
-      this.retryAttempts.delete(resourceId);
-    }
+    this.cancelPendingRetry(resourceId);
+    this.retryAttempts.delete(resourceId);
   }
   setupSubscriptionsForAllBlocks() {
     for (const resourceId of this.subscriptions.keys()) {
@@ -335,9 +329,7 @@ export class SyncBlockSubscriptionManager {
       unsubscribe();
     }
     this.graphqlSubscriptions.clear();
-    if (fg('platform_synced_block_patch_12')) {
-      this.cancelAllPendingRetries();
-    }
+    this.cancelAllPendingRetries();
   }
   destroy() {
     this.cleanupAll();
@@ -363,10 +355,7 @@ export class SyncBlockSubscriptionManager {
     const resolved = existing ? resolveSyncBlockInstance(existing, syncBlockInstance) : syncBlockInstance;
     this.deps.updateCache(resolved);
     if (!syncBlockInstance.error) {
-      // Successful data delivery means the subscription is healthy — reset retry counter
-      if (fg('platform_synced_block_patch_12')) {
-        this.resetRetryCount(syncBlockInstance.resourceId);
-      }
+      this.resetRetryCount(syncBlockInstance.resourceId);
       const callbacks = this.subscriptions.get(syncBlockInstance.resourceId);
       const localIds = callbacks ? Object.keys(callbacks) : [];
       localIds.forEach(localId => {

package/dist/es2019/utils/utils.js

@@ -1,6 +1,5 @@
 /* eslint-disable require-unicode-regexp  */
 
-import { fg } from '@atlaskit/platform-feature-flags';
 export const stripAnnotationMarksFromJSONContent = content => {
   var _strippedContent3;
   let strippedContent;
@@ -45,7 +44,7 @@ export const convertSyncBlockPMNodeToSyncBlockData = node => {
   const content = node.content.toJSON();
   return {
     blockInstanceId: node.attrs.localId,
-    content: fg('platform_synced_block_patch_12') ? stripAnnotationMarksFromJSONContent(content) : content,
+    content: content ? stripAnnotationMarksFromJSONContent(content) : content,
     resourceId: node.attrs.resourceId
   };
 };