@atlaskit/editor-synced-block-provider 6.6.2 → 6.6.4

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

@@ -5,7 +5,7 @@ import { logException } from '@atlaskit/editor-common/monitoring';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { fetchErrorPayload } from '../utils/errorHandling';
 import { parseResourceId } from '../utils/resourceId';
-import { productAttrIfGateOn } from '../utils/utils';
+import { getSourceProductFromResourceIdSafe } from '../utils/utils';
 /**
  * Manages creation and caching of ProviderFactory instances used to
  * render synced block content (media, emoji, smart links, etc.).
@@ -26,7 +26,7 @@ export var SyncBlockProviderFactoryManager = /*#__PURE__*/function () {
         logException(error, {
           location: 'editor-synced-block-provider/syncBlockProviderFactoryManager'
         });
-        (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna(fetchErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+        (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
         return undefined;
       }
       var _dataProvider$getSync = dataProvider.getSyncedBlockRendererProviderOptions(),
@@ -59,7 +59,7 @@ export var SyncBlockProviderFactoryManager = /*#__PURE__*/function () {
           logException(error, {
             location: 'editor-synced-block-provider/syncBlockProviderFactoryManager'
           });
-          (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 || _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+          (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 || _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
         }
       }
       return providerFactory;
@@ -144,7 +144,7 @@ export var SyncBlockProviderFactoryManager = /*#__PURE__*/function () {
       if (!syncBlock.data.sourceAri || !syncBlock.data.product) {
         var _this$deps$getFireAna3, _syncBlock$data$produ;
         (_this$deps$getFireAna3 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna3 === void 0 || _this$deps$getFireAna3(fetchErrorPayload('Sync block source ari or product not found', resourceId, // Prefer cached product when available; fall back to parsing resourceId.
-        (_syncBlock$data$produ = syncBlock.data.product) !== null && _syncBlock$data$produ !== void 0 ? _syncBlock$data$produ : productAttrIfGateOn(resourceId)));
+        (_syncBlock$data$produ = syncBlock.data.product) !== null && _syncBlock$data$produ !== void 0 ? _syncBlock$data$produ : getSourceProductFromResourceIdSafe(resourceId)));
         return;
       }
       var parentInfo = dataProvider.retrieveSyncBlockParentInfo(syncBlock.data.sourceAri, syncBlock.data.product);

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

@@ -11,7 +11,7 @@ import { getProductFromSourceAri } from '../clients/block-service/ari';
 import { SyncBlockError } from '../common/types';
 import { fetchReferencesErrorPayload } from '../utils/errorHandling';
 import { getFetchReferencesExperience, getFetchSourceInfoExperience } from '../utils/experienceTracking';
-import { productAttrIfGateOn } from '../utils/utils';
+import { getSourceProductFromResourceIdSafe } from '../utils/utils';
 import { ReferenceSyncBlockStoreManager } from './referenceSyncBlockStoreManager';
 import { SourceSyncBlockStoreManager } from './sourceSyncBlockStoreManager';
 
@@ -136,7 +136,7 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
               logException(_context2.t0, {
                 location: 'editor-synced-block-provider/syncBlockStoreManager'
               });
-              (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 || _this$fireAnalyticsEv.call(this, fetchReferencesErrorPayload(_context2.t0.message, resourceId, productAttrIfGateOn(resourceId)));
+              (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 || _this$fireAnalyticsEv.call(this, fetchReferencesErrorPayload(_context2.t0.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
               return _context2.abrupt("return", {
                 error: SyncBlockError.Errored
               });

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

@@ -7,10 +7,9 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 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; }
 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, productAttrIfGateOn } from '../utils/utils';
+import { getSourceProductFromResourceIdSafe } from '../utils/utils';
 /**
  * Manages the lifecycle of GraphQL WebSocket subscriptions for sync block
  * real-time updates, owns the subscriptions and titleSubscriptions maps,
@@ -251,7 +250,7 @@ export var SyncBlockSubscriptionManager = /*#__PURE__*/function () {
         logException(error, {
           location: 'editor-synced-block-provider/syncBlockSubscriptionManager/graphql-subscription'
         });
-        (_this5$deps$getFireAn = _this5.deps.getFireAnalyticsEvent()) === null || _this5$deps$getFireAn === void 0 || _this5$deps$getFireAn(fetchErrorPayload(error.message, resourceId, productAttrIfGateOn(resourceId)));
+        (_this5$deps$getFireAn = _this5.deps.getFireAnalyticsEvent()) === null || _this5$deps$getFireAn === void 0 || _this5$deps$getFireAn(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
       });
       if (unsubscribe) {
         this.graphqlSubscriptions.set(resourceId, unsubscribe);
@@ -343,15 +342,13 @@ export var SyncBlockSubscriptionManager = /*#__PURE__*/function () {
         var localIds = callbacks ? Object.keys(callbacks) : [];
         localIds.forEach(function (localId) {
           var _this6$deps$getFireAn, _syncBlockInstance$da, _syncBlockInstance$da2;
-          (_this6$deps$getFireAn = _this6.deps.getFireAnalyticsEvent()) === null || _this6$deps$getFireAn === void 0 || _this6$deps$getFireAn(fetchSuccessPayload(syncBlockInstance.resourceId, localId,
-          // Prefer cached product when available; fall back to parsing the resourceId.
-          fg('platform_synced_block_patch_11') ? (_syncBlockInstance$da = (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product) !== null && _syncBlockInstance$da !== void 0 ? _syncBlockInstance$da : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId) : undefined));
+          (_this6$deps$getFireAn = _this6.deps.getFireAnalyticsEvent()) === null || _this6$deps$getFireAn === void 0 || _this6$deps$getFireAn(fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da = (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product) !== null && _syncBlockInstance$da !== void 0 ? _syncBlockInstance$da : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId)));
         });
         this.deps.fetchSyncBlockSourceInfo(resolved.resourceId);
       } else {
         var _syncBlockInstance$er, _syncBlockInstance$er2, _this$deps$getFireAna, _syncBlockInstance$da3, _syncBlockInstance$da4;
         var errorMessage = ((_syncBlockInstance$er = syncBlockInstance.error) === null || _syncBlockInstance$er === void 0 ? void 0 : _syncBlockInstance$er.reason) || ((_syncBlockInstance$er2 = syncBlockInstance.error) === null || _syncBlockInstance$er2 === void 0 ? void 0 : _syncBlockInstance$er2.type);
-        (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna(fetchErrorPayload(errorMessage, syncBlockInstance.resourceId, fg('platform_synced_block_patch_11') ? (_syncBlockInstance$da3 = (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.product) !== null && _syncBlockInstance$da3 !== void 0 ? _syncBlockInstance$da3 : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId) : undefined));
+        (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna(fetchErrorPayload(errorMessage, syncBlockInstance.resourceId, (_syncBlockInstance$da3 = (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.product) !== null && _syncBlockInstance$da3 !== void 0 ? _syncBlockInstance$da3 : getSourceProductFromResourceIdSafe(syncBlockInstance.resourceId)));
       }
     }
   }]);

package/dist/esm/utils/utils.js

@@ -1,6 +1,5 @@
 /* eslint-disable require-unicode-regexp  */
 
-import { fg } from '@atlaskit/platform-feature-flags';
 export var convertSyncBlockPMNodeToSyncBlockData = function convertSyncBlockPMNodeToSyncBlockData(node) {
   return {
     blockInstanceId: node.attrs.localId,
@@ -69,17 +68,6 @@ export var getSourceProductFromResourceIdSafe = function getSourceProductFromRes
     return undefined;
   }
 };
-
-/*
- * Convenience wrapper around `getSourceProductFromResourceIdSafe` that returns
- * `undefined` whenever the `platform_synced_block_patch_11` rollout flag is off.
- * Centralised so that the flag name lives in exactly one place — when the flag is
- * cleaned up, this function should be deleted in its entirety and call-sites should
- * fall back to calling `getSourceProductFromResourceIdSafe` directly.
- */
-export var productAttrIfGateOn = function productAttrIfGateOn(resourceId) {
-  return fg('platform_synced_block_patch_11') ? getSourceProductFromResourceIdSafe(resourceId) : undefined;
-};
 export var convertContentUpdatedAt = function convertContentUpdatedAt(contentUpdatedAt) {
   if (typeof contentUpdatedAt === 'number') {
     try {

package/dist/types/entry-points/utils.d.ts

@@ -1 +1 @@
-export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode, convertPMNodesToSyncBlockNodes, convertPMNodeToSyncBlockNode, convertContentUpdatedAt, getContentIdAndProductFromResourceId, getSourceProductFromResourceIdSafe, productAttrIfGateOn, } from '../utils/utils';
+export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode, convertPMNodesToSyncBlockNodes, convertPMNodeToSyncBlockNode, convertContentUpdatedAt, getContentIdAndProductFromResourceId, getSourceProductFromResourceIdSafe, } from '../utils/utils';

package/dist/types/store-manager/sourceSyncBlockStoreManager.d.ts

@@ -18,6 +18,23 @@ export declare class SourceSyncBlockStoreManager {
     private deletionRetryInfo?;
     private creationCompletionCallbacks;
     private flushCompletionCallback?;
+    private postCreationFlushCallback?;
+    /**
+     * Promises for in-flight block creations, keyed by resourceId.
+     * `flush()` awaits these so that blocks created from existing content are
+     * persisted even if no further edits trigger a subsequent flush.
+     * See EDITOR-7112.
+     */
+    private pendingCreationPromises;
+    /**
+     * Set of resource IDs whose creation was still in-flight when a `flush()`
+     * timed out. Each completion (success or failure) is removed from this set;
+     * the first successful completion of any of these IDs triggers
+     * `postCreationFlushCallback` so the content is eventually persisted.
+     * Tracking IDs (not just a boolean) avoids dropping late completions when
+     * multiple blocks are created concurrently. See EDITOR-7112.
+     */
+    private creationsTimedOutDuringFlush;
     private createExperience;
     private saveExperience;
     private deleteExperience;
@@ -29,6 +46,13 @@ export declare class SourceSyncBlockStoreManager {
      * hasUnsavedBodiedSyncBlockChanges is recalculated in plugin state.
      */
     registerFlushCompletionCallback(callback: () => void): void;
+    /**
+     * Register a callback to be invoked when flush() timed out waiting for a
+     * pending block creation and that creation subsequently completes. The
+     * callback should trigger a deferred flush to persist the content that
+     * was skipped due to the timeout. See EDITOR-7112.
+     */
+    registerPostCreationFlushCallback(callback: () => void): void;
     setFireAnalyticsEvent(fireAnalyticsEvent?: (payload: SyncBlockEventPayload) => void): void;
     isSourceBlock(node: PMNode): boolean;
     /**

package/dist/types/utils/utils.d.ts

@@ -11,5 +11,4 @@ export declare const getContentIdAndProductFromResourceId: (resourceId: string)
     sourceProduct: SyncBlockProduct;
 };
 export declare const getSourceProductFromResourceIdSafe: (resourceId?: string) => SyncBlockProduct | undefined;
-export declare const productAttrIfGateOn: (resourceId?: string) => SyncBlockProduct | undefined;
 export declare const convertContentUpdatedAt: (contentUpdatedAt: number | undefined) => string | undefined;

package/dist/types-ts4.5/entry-points/utils.d.ts

@@ -1 +1 @@
-export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode, convertPMNodesToSyncBlockNodes, convertPMNodeToSyncBlockNode, convertContentUpdatedAt, getContentIdAndProductFromResourceId, getSourceProductFromResourceIdSafe, productAttrIfGateOn, } from '../utils/utils';
+export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode, convertPMNodesToSyncBlockNodes, convertPMNodeToSyncBlockNode, convertContentUpdatedAt, getContentIdAndProductFromResourceId, getSourceProductFromResourceIdSafe, } from '../utils/utils';

package/dist/types-ts4.5/store-manager/sourceSyncBlockStoreManager.d.ts

@@ -18,6 +18,23 @@ export declare class SourceSyncBlockStoreManager {
     private deletionRetryInfo?;
     private creationCompletionCallbacks;
     private flushCompletionCallback?;
+    private postCreationFlushCallback?;
+    /**
+     * Promises for in-flight block creations, keyed by resourceId.
+     * `flush()` awaits these so that blocks created from existing content are
+     * persisted even if no further edits trigger a subsequent flush.
+     * See EDITOR-7112.
+     */
+    private pendingCreationPromises;
+    /**
+     * Set of resource IDs whose creation was still in-flight when a `flush()`
+     * timed out. Each completion (success or failure) is removed from this set;
+     * the first successful completion of any of these IDs triggers
+     * `postCreationFlushCallback` so the content is eventually persisted.
+     * Tracking IDs (not just a boolean) avoids dropping late completions when
+     * multiple blocks are created concurrently. See EDITOR-7112.
+     */
+    private creationsTimedOutDuringFlush;
     private createExperience;
     private saveExperience;
     private deleteExperience;
@@ -29,6 +46,13 @@ export declare class SourceSyncBlockStoreManager {
      * hasUnsavedBodiedSyncBlockChanges is recalculated in plugin state.
      */
     registerFlushCompletionCallback(callback: () => void): void;
+    /**
+     * Register a callback to be invoked when flush() timed out waiting for a
+     * pending block creation and that creation subsequently completes. The
+     * callback should trigger a deferred flush to persist the content that
+     * was skipped due to the timeout. See EDITOR-7112.
+     */
+    registerPostCreationFlushCallback(callback: () => void): void;
     setFireAnalyticsEvent(fireAnalyticsEvent?: (payload: SyncBlockEventPayload) => void): void;
     isSourceBlock(node: PMNode): boolean;
     /**

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

@@ -11,5 +11,4 @@ export declare const getContentIdAndProductFromResourceId: (resourceId: string)
     sourceProduct: SyncBlockProduct;
 };
 export declare const getSourceProductFromResourceIdSafe: (resourceId?: string) => SyncBlockProduct | undefined;
-export declare const productAttrIfGateOn: (resourceId?: string) => SyncBlockProduct | undefined;
 export declare const convertContentUpdatedAt: (contentUpdatedAt: number | undefined) => string | undefined;

package/package.json

@@ -29,7 +29,7 @@
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/node-data-provider": "^11.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^81.0.0",
+		"@atlaskit/tmp-editor-statsig": "^81.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"graphql-ws": "^5.14.2",
@@ -38,7 +38,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.32.0",
+		"@atlaskit/editor-common": "^114.35.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -81,7 +81,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "6.6.2",
+	"version": "6.6.4",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -89,7 +89,7 @@
 		"registry": "https://registry.npmjs.org/"
 	},
 	"platform-feature-flags": {
-		"platform_synced_block_patch_11": {
+		"platform_synced_block_patch_12": {
 			"type": "boolean"
 		}
 	}