@atlaskit/editor-synced-block-provider 22.0.5 → 22.1.0

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

@@ -127,6 +127,10 @@ export class ReferenceSyncBlockStoreManager {
   getSubscribedResourceIds() {
     return this._subscriptionManager.getSubscribedResourceIds();
   }
+  getSubscribedLocalIds(resourceId) {
+    var _this$_subscriptionMa;
+    return Object.keys((_this$_subscriptionMa = this._subscriptionManager.getSubscriptions().get(resourceId)) !== null && _this$_subscriptionMa !== void 0 ? _this$_subscriptionMa : {});
+  }
 
   /**
    * Registers a listener that will be called when subscriptions change.
@@ -188,8 +192,9 @@ export class ReferenceSyncBlockStoreManager {
     return this.getFromSessionCache(resourceId);
   }
   getSameDocumentReferenceParts(resourceId) {
+    var _this$dataProvider$ca, _this$dataProvider3;
     const parsed = parseResourceId(resourceId);
-    if (!parsed || !this.dataProvider || this.dataProvider.generateResourceIdForReference(parsed.uuid) !== resourceId) {
+    if (!parsed || !this.dataProvider || isExperimentEnabled('platform_editor_blocks_patch_12') && ((_this$dataProvider$ca = (_this$dataProvider3 = this.dataProvider).canGenerateResourceIdForReference) === null || _this$dataProvider$ca === void 0 ? void 0 : _this$dataProvider$ca.call(_this$dataProvider3)) === false || this.dataProvider.generateResourceIdForReference(parsed.uuid) !== resourceId) {
       return undefined;
     }
     return parsed;
@@ -626,8 +631,8 @@ export class ReferenceSyncBlockStoreManager {
       resourceId
     } = sanitizedSyncBlock;
     if (resourceId) {
-      var _this$dataProvider3;
-      (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 ? void 0 : _this$dataProvider3.updateCache({
+      var _this$dataProvider4;
+      (_this$dataProvider4 = this.dataProvider) === null || _this$dataProvider4 === void 0 ? void 0 : _this$dataProvider4.updateCache({
         [resourceId]: sanitizedSyncBlock
       }, {
         strategy: 'merge',
@@ -638,13 +643,13 @@ export class ReferenceSyncBlockStoreManager {
     }
   }
   getFromCache(resourceId) {
-    var _this$dataProvider4, _this$dataProvider4$g;
+    var _this$dataProvider5, _this$dataProvider5$g;
     const syncBlockNode = createSyncBlockNode('', resourceId);
-    return (_this$dataProvider4 = this.dataProvider) === null || _this$dataProvider4 === void 0 ? void 0 : (_this$dataProvider4$g = _this$dataProvider4.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider4$g === void 0 ? void 0 : _this$dataProvider4$g.data;
+    return (_this$dataProvider5 = this.dataProvider) === null || _this$dataProvider5 === void 0 ? void 0 : (_this$dataProvider5$g = _this$dataProvider5.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider5$g === void 0 ? void 0 : _this$dataProvider5$g.data;
   }
   deleteFromCache(resourceId) {
-    var _this$dataProvider5;
-    (_this$dataProvider5 = this.dataProvider) === null || _this$dataProvider5 === void 0 ? void 0 : _this$dataProvider5.removeFromCache([resourceId]);
+    var _this$dataProvider6;
+    (_this$dataProvider6 = this.dataProvider) === null || _this$dataProvider6 === void 0 ? void 0 : _this$dataProvider6.removeFromCache([resourceId]);
     this._providerFactoryManager.deleteFactory(resourceId);
     // Evict in-flight source-info promise and reset reschedule counter
     // so a stale resolution can't silently merge into a re-fetched entry.
@@ -1031,7 +1036,7 @@ export class ReferenceSyncBlockStoreManager {
     return success;
   }
   destroy() {
-    var _this$dataProvider6, _this$saveExperience5, _this$fetchExperience0, _this$fetchSourceInfo6;
+    var _this$dataProvider7, _this$saveExperience5, _this$fetchExperience0, _this$fetchSourceInfo6;
     // Mark destroyed first so in-flight timer callbacks can early-return.
     this.isDestroyed = true;
 
@@ -1053,7 +1058,7 @@ export class ReferenceSyncBlockStoreManager {
     this._subscriptionManager.destroy();
     this._providerFactoryManager.destroy();
     this._batchFetcher.destroy();
-    (_this$dataProvider6 = this.dataProvider) === null || _this$dataProvider6 === void 0 ? void 0 : _this$dataProvider6.resetCache();
+    (_this$dataProvider7 = this.dataProvider) === null || _this$dataProvider7 === void 0 ? void 0 : _this$dataProvider7.resetCache();
     this.dataProvider = undefined;
     this.syncBlockFetchDataRequests.clear();
     this.syncBlockSourceInfoRequests.clear();

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

@@ -29,9 +29,21 @@ export class SyncBlockStoreManager {
   isSyncBlock(node) {
     return this.sourceSyncBlockStoreManager.isSourceBlock(node) || this.referenceSyncBlockStoreManager.isReferenceBlock(node);
   }
-  async fetchReferencesSourceInfo(resourceId, blockInstanceId, isSourceSyncBlock) {
+  getDocumentReferenceIds(resourceId, doc) {
+    if (!doc) {
+      return undefined;
+    }
+    const localIds = new Set();
+    doc.descendants(node => {
+      if (this.referenceManager.isReferenceBlock(node) && node.attrs.resourceId === resourceId && node.attrs.localId) {
+        localIds.add(node.attrs.localId);
+      }
+    });
+    return localIds;
+  }
+  async fetchReferencesSourceInfo(resourceId, blockInstanceId, isSourceSyncBlock, doc) {
     try {
-      var _this$fetchReferences, _response$references, _this$fetchReferences3, _response$references2;
+      var _this$fetchReferences, _response$references, _this$fetchReferences4;
       if (!this.dataProvider) {
         throw new Error('Data provider not set');
       }
@@ -46,11 +58,24 @@ export class SyncBlockStoreManager {
           error: response.error
         };
       }
-      if (!response.references || ((_response$references = response.references) === null || _response$references === void 0 ? void 0 : _response$references.length) === 0) {
+      const patchEnabled = isExperimentEnabled('platform_editor_blocks_patch_12');
+      const referenceResourceId = patchEnabled && isSourceSyncBlock ? this.referenceSyncBlockStoreManager.generateResourceIdForReference(resourceId) : resourceId;
+      const documentIds = patchEnabled ? this.getDocumentReferenceIds(referenceResourceId, doc) : undefined;
+      const localIds = patchEnabled ? documentIds ? [...documentIds] : this.referenceSyncBlockStoreManager.getSubscribedLocalIds(referenceResourceId) : [];
+      // Saved references on this document can already have been removed in the editor.
+      const references = ((_response$references = response.references) !== null && _response$references !== void 0 ? _response$references : []).filter(reference => documentIds === undefined || !reference.onSameDocument || Boolean(reference.blockInstanceId && documentIds.has(reference.blockInstanceId)));
+      if (references.length === 0 && localIds.length === 0) {
+        if (documentIds !== undefined) {
+          var _this$fetchReferences3;
+          (_this$fetchReferences3 = this.fetchReferencesExperience) === null || _this$fetchReferences3 === void 0 ? void 0 : _this$fetchReferences3.success();
+          return {
+            references: []
+          };
+        }
         return this.getUnregisteredReferences(resourceId, blockInstanceId, isSourceSyncBlock);
       }
-      (_this$fetchReferences3 = this.fetchReferencesExperience) === null || _this$fetchReferences3 === void 0 ? void 0 : _this$fetchReferences3.success();
-      const sourceInfoPromises = ((_response$references2 = response.references) !== null && _response$references2 !== void 0 ? _response$references2 : []).map(async reference => {
+      (_this$fetchReferences4 = this.fetchReferencesExperience) === null || _this$fetchReferences4 === void 0 ? void 0 : _this$fetchReferences4.success();
+      const sourceInfoPromises = references.map(async reference => {
         var _this$fetchSourceInfo, _this$dataProvider, _this$fetchSourceInfo3;
         if (!reference.hasAccess && isExperimentEnabled('platform_editor_blocks_patch_11')) {
           return this.fetchRestrictedReferenceInfo(reference.documentAri);
@@ -86,6 +111,25 @@ export class SyncBlockStoreManager {
           productType: sourceSyncBlockData === null || sourceSyncBlockData === void 0 ? void 0 : sourceSyncBlockData.productType
         });
       }
+
+      // Only instances in this editor belong to its unsaved document. A matching
+      // local ID on another document must not hide an unsaved copy here.
+      const registeredLocalIds = new Set();
+      for (const reference of references) {
+        if (reference.onSameDocument && reference.blockInstanceId) {
+          registeredLocalIds.add(reference.blockInstanceId);
+        }
+      }
+      const localSourceInfos = await Promise.all(localIds.filter(localId => !registeredLocalIds.has(localId)).map(async localId => {
+        const sourceInfo = await this.referenceSyncBlockStoreManager.fetchSyncBlockSourceInfoByLocalId(localId);
+        return sourceInfo ? {
+          ...sourceInfo,
+          onSameDocument: true,
+          hasAccess: true,
+          isSource: false
+        } : undefined;
+      }));
+      sourceInfos.push(...localSourceInfos);
       return {
         references: sourceInfos
       };
@@ -114,10 +158,10 @@ export class SyncBlockStoreManager {
     return this.sourceSyncBlockStoreManager;
   }
   destroy() {
-    var _this$fetchReferences4, _this$fetchSourceInfo4;
+    var _this$fetchReferences5, _this$fetchSourceInfo4;
     this.referenceSyncBlockStoreManager.destroy();
     this.sourceSyncBlockStoreManager.destroy();
-    (_this$fetchReferences4 = this.fetchReferencesExperience) === null || _this$fetchReferences4 === void 0 ? void 0 : _this$fetchReferences4.abort({
+    (_this$fetchReferences5 = this.fetchReferencesExperience) === null || _this$fetchReferences5 === void 0 ? void 0 : _this$fetchReferences5.abort({
       reason: 'editorDestroyed'
     });
     (_this$fetchSourceInfo4 = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo4 === void 0 ? void 0 : _this$fetchSourceInfo4.abort({
@@ -161,17 +205,17 @@ export class SyncBlockStoreManager {
     };
   }
   async getUnregisteredReferences(resourceId, blockInstanceId, isSourceSyncBlock) {
-    var _this$fetchReferences8;
+    var _this$fetchReferences9;
     // No reference found
     if (isSourceSyncBlock) {
-      var _this$fetchReferences6;
+      var _this$fetchReferences7;
       // Verify that a reference sync block for this specific source actually
       // exists on the current page by checking if the reference manager has
       // an active subscription for the derived reference resourceId.
       const referenceResourceId = this.referenceSyncBlockStoreManager.generateResourceIdForReference(resourceId);
       const hasUnregisteredReferenceOnPage = this.referenceSyncBlockStoreManager.getSubscribedResourceIds().includes(referenceResourceId);
       if (hasUnregisteredReferenceOnPage) {
-        var _this$fetchReferences5;
+        var _this$fetchReferences6;
         // This is current page data. It is the same for data for source and reference
         const sourceSyncBlockData = await this.sourceSyncBlockStoreManager.getSyncBlockSourceInfo(blockInstanceId);
         const references = [];
@@ -190,14 +234,14 @@ export class SyncBlockStoreManager {
           };
           references.push(sourceSyncBlockReference, referenceSyncBlockReference);
         }
-        (_this$fetchReferences5 = this.fetchReferencesExperience) === null || _this$fetchReferences5 === void 0 ? void 0 : _this$fetchReferences5.success();
+        (_this$fetchReferences6 = this.fetchReferencesExperience) === null || _this$fetchReferences6 === void 0 ? void 0 : _this$fetchReferences6.success();
         return {
           references
         };
       }
 
       // No remote or local reference exists — show info text with link to doco on how to use Synced Blocks
-      (_this$fetchReferences6 = this.fetchReferencesExperience) === null || _this$fetchReferences6 === void 0 ? void 0 : _this$fetchReferences6.success();
+      (_this$fetchReferences7 = this.fetchReferencesExperience) === null || _this$fetchReferences7 === void 0 ? void 0 : _this$fetchReferences7.success();
       return {
         references: []
       };
@@ -226,15 +270,15 @@ export class SyncBlockStoreManager {
       });
     }
     if (references.length === 0) {
-      var _this$fetchReferences7;
-      (_this$fetchReferences7 = this.fetchReferencesExperience) === null || _this$fetchReferences7 === void 0 ? void 0 : _this$fetchReferences7.failure({
+      var _this$fetchReferences8;
+      (_this$fetchReferences8 = this.fetchReferencesExperience) === null || _this$fetchReferences8 === void 0 ? void 0 : _this$fetchReferences8.failure({
         reason: 'No references found for reference synced block'
       });
       return {
         error: SyncBlockError.Errored
       };
     }
-    (_this$fetchReferences8 = this.fetchReferencesExperience) === null || _this$fetchReferences8 === void 0 ? void 0 : _this$fetchReferences8.success();
+    (_this$fetchReferences9 = this.fetchReferencesExperience) === null || _this$fetchReferences9 === void 0 ? void 0 : _this$fetchReferences9.success();
     return {
       references
     };

package/dist/esm/providers/syncBlockProvider.js

@@ -391,6 +391,11 @@ export var SyncedBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
         resourceId: resourceId
       };
     }
+  }, {
+    key: "canGenerateResourceIdForReference",
+    value: function canGenerateResourceIdForReference() {
+      return this.writeProvider !== undefined;
+    }
   }, {
     key: "generateResourceIdForReference",
     value: function generateResourceIdForReference(sourceId) {

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

@@ -180,6 +180,12 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: function getSubscribedResourceIds() {
       return this._subscriptionManager.getSubscribedResourceIds();
     }
+  }, {
+    key: "getSubscribedLocalIds",
+    value: function getSubscribedLocalIds(resourceId) {
+      var _this$_subscriptionMa;
+      return Object.keys((_this$_subscriptionMa = this._subscriptionManager.getSubscriptions().get(resourceId)) !== null && _this$_subscriptionMa !== void 0 ? _this$_subscriptionMa : {});
+    }
 
     /**
      * Registers a listener that will be called when subscriptions change.
@@ -259,8 +265,9 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "getSameDocumentReferenceParts",
     value: function getSameDocumentReferenceParts(resourceId) {
+      var _this$dataProvider$ca, _this$dataProvider3;
       var parsed = parseResourceId(resourceId);
-      if (!parsed || !this.dataProvider || this.dataProvider.generateResourceIdForReference(parsed.uuid) !== resourceId) {
+      if (!parsed || !this.dataProvider || isExperimentEnabled('platform_editor_blocks_patch_12') && ((_this$dataProvider$ca = (_this$dataProvider3 = this.dataProvider).canGenerateResourceIdForReference) === null || _this$dataProvider$ca === void 0 ? void 0 : _this$dataProvider$ca.call(_this$dataProvider3)) === false || this.dataProvider.generateResourceIdForReference(parsed.uuid) !== resourceId) {
         return undefined;
       }
       return parsed;
@@ -754,8 +761,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       var sanitizedSyncBlock = this.normalizeReferenceData(syncBlock);
       var resourceId = sanitizedSyncBlock.resourceId;
       if (resourceId) {
-        var _this$dataProvider3;
-        (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 || _this$dataProvider3.updateCache(_defineProperty({}, resourceId, sanitizedSyncBlock), {
+        var _this$dataProvider4;
+        (_this$dataProvider4 = this.dataProvider) === null || _this$dataProvider4 === void 0 || _this$dataProvider4.updateCache(_defineProperty({}, resourceId, sanitizedSyncBlock), {
           strategy: 'merge',
           source: 'network'
         });
@@ -766,15 +773,15 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "getFromCache",
     value: function getFromCache(resourceId) {
-      var _this$dataProvider4;
+      var _this$dataProvider5;
       var syncBlockNode = createSyncBlockNode('', resourceId);
-      return (_this$dataProvider4 = this.dataProvider) === null || _this$dataProvider4 === void 0 || (_this$dataProvider4 = _this$dataProvider4.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider4 === void 0 ? void 0 : _this$dataProvider4.data;
+      return (_this$dataProvider5 = this.dataProvider) === null || _this$dataProvider5 === void 0 || (_this$dataProvider5 = _this$dataProvider5.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider5 === void 0 ? void 0 : _this$dataProvider5.data;
     }
   }, {
     key: "deleteFromCache",
     value: function deleteFromCache(resourceId) {
-      var _this$dataProvider5;
-      (_this$dataProvider5 = this.dataProvider) === null || _this$dataProvider5 === void 0 || _this$dataProvider5.removeFromCache([resourceId]);
+      var _this$dataProvider6;
+      (_this$dataProvider6 = this.dataProvider) === null || _this$dataProvider6 === void 0 || _this$dataProvider6.removeFromCache([resourceId]);
       this._providerFactoryManager.deleteFactory(resourceId);
       // Evict in-flight source-info promise and reset reschedule counter
       // so a stale resolution can't silently merge into a re-fetched entry.
@@ -1258,7 +1265,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$dataProvider6, _this$saveExperience5, _this$fetchExperience0, _this$fetchSourceInfo2;
+      var _this$dataProvider7, _this$saveExperience5, _this$fetchExperience0, _this$fetchSourceInfo2;
       // Mark destroyed first so in-flight timer callbacks can early-return.
       this.isDestroyed = true;
 
@@ -1284,7 +1291,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       this._subscriptionManager.destroy();
       this._providerFactoryManager.destroy();
       this._batchFetcher.destroy();
-      (_this$dataProvider6 = this.dataProvider) === null || _this$dataProvider6 === void 0 || _this$dataProvider6.resetCache();
+      (_this$dataProvider7 = this.dataProvider) === null || _this$dataProvider7 === void 0 || _this$dataProvider7.resetCache();
       this.dataProvider = undefined;
       this.syncBlockFetchDataRequests.clear();
       this.syncBlockSourceInfoRequests.clear();