@atlaskit/editor-synced-block-provider 8.3.0 → 8.4.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-synced-block-provider
 
+## 8.4.0
+
+### Minor Changes
+
+- [`5e439884aa23d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5e439884aa23d) -
+  Add a readiness guard to the source synced-block cache-update path. When a `bodiedSyncBlock` node
+  is updated before its `localId`/`resourceId` has been populated (a benign timing/initialisation
+  ordering case), the cache update is now skipped as a no-op instead of throwing. This stops the
+  `Local ID or resource ID is not set` error from being logged and from firing the synced-block
+  update-cache operational error event, so it no longer counts as a genuine cache-update failure.
+  Gated behind `platform_editor_blocks_patch_4`.
+
+## 8.3.1
+
+### Patch Changes
+
+- [`73743eb8b36e6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/73743eb8b36e6) -
+  CLeanup prefer static regex violations
+- Updated dependencies
+
 ## 8.3.0
 
 ### Minor Changes

package/dist/cjs/clients/block-service/ari.js

@@ -6,6 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.getProductFromSourceAri = exports.getLocalIdFromBlockResourceId = exports.generateBlockAriFromReference = exports.generateBlockAri = void 0;
 /* eslint-disable require-unicode-regexp */
 
+var GET_LOCAL_ID_FROM_BLOCK_RESOURCE_ID_REGEX = /ari:cloud:blocks:[^:]+:synced-block\/([a-zA-Z0-9-]+)/;
+var JIRA_SOURCE_ARI_REGEX = /ari:cloud:jira:.*/;
+var CONFLUENCE_SOURCE_ARI_REGEX = /ari:cloud:confluence:.*/;
+
 /**
  * Generates the block ARI from the source page ARI and the source block's resource ID.
  * @param cloudId - the cloudId of the block. E.G the cloudId of the confluence page, or the cloudId of the Jira instance
@@ -42,18 +46,18 @@ var generateBlockAriFromReference = exports.generateBlockAriFromReference = func
  * @returns the localId of the block node. A randomly generated UUID
  */
 var getLocalIdFromBlockResourceId = exports.getLocalIdFromBlockResourceId = function getLocalIdFromBlockResourceId(ari) {
-  var match = ari.match(/ari:cloud:blocks:[^:]+:synced-block\/([a-zA-Z0-9-]+)/);
+  var match = ari.match(GET_LOCAL_ID_FROM_BLOCK_RESOURCE_ID_REGEX);
   if (match !== null && match !== void 0 && match[1]) {
     return match[1];
   }
   throw new Error("Invalid block ARI: ".concat(ari));
 };
 var getProductFromSourceAri = exports.getProductFromSourceAri = function getProductFromSourceAri(ari) {
-  var jiraMatch = ari === null || ari === void 0 ? void 0 : ari.search(/ari:cloud:jira:.*/);
+  var jiraMatch = ari === null || ari === void 0 ? void 0 : ari.search(JIRA_SOURCE_ARI_REGEX);
   if (jiraMatch !== -1) {
     return 'jira-work-item';
   }
-  var confluenceMatch = ari === null || ari === void 0 ? void 0 : ari.search(/ari:cloud:confluence:.*/);
+  var confluenceMatch = ari === null || ari === void 0 ? void 0 : ari.search(CONFLUENCE_SOURCE_ARI_REGEX);
   if (confluenceMatch !== -1) {
     return 'confluence-page';
   }

package/dist/cjs/clients/block-service/blockSubscription.js

@@ -10,6 +10,9 @@ var _graphqlWs = require("graphql-ws");
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _utils = require("../../utils/utils");
 var GRAPHQL_WS_ENDPOINT = '/gateway/api/graphql/subscriptions';
+
+// eslint-disable-next-line require-unicode-regexp
+var EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX = /ari:cloud:blocks:[^:]+:synced-block\/(.+)$/;
 var blockServiceClient = null;
 
 /**
@@ -129,8 +132,7 @@ var extractGraphQLWSErrorMessage = exports.extractGraphQLWSErrorMessage = functi
  * @returns The resourceId portion of the ARI
  */
 var extractResourceIdFromBlockAri = function extractResourceIdFromBlockAri(blockAri) {
-  // eslint-disable-next-line require-unicode-regexp
-  var match = blockAri.match(/ari:cloud:blocks:[^:]+:synced-block\/(.+)$/);
+  var match = blockAri.match(EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX);
   return (match === null || match === void 0 ? void 0 : match[1]) || null;
 };
 

package/dist/cjs/clients/confluence/ari.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.getPageIdAndTypeFromConfluencePageAri = exports.getConfluencePageAri = void 0;
 /* eslint-disable require-unicode-regexp  */
 
+var CONFLUENCE_PAGE_ARI_REGEX = /ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/;
+
 /**
  * The type of the Confluence page
  */
@@ -31,7 +33,7 @@ var getConfluencePageAri = exports.getConfluencePageAri = function getConfluence
  */
 var getPageIdAndTypeFromConfluencePageAri = exports.getPageIdAndTypeFromConfluencePageAri = function getPageIdAndTypeFromConfluencePageAri(_ref2) {
   var ari = _ref2.ari;
-  var match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/);
+  var match = ari.match(CONFLUENCE_PAGE_ARI_REGEX);
   if (match !== null && match !== void 0 && match[2]) {
     return {
       type: match[1],

package/dist/cjs/clients/jira/ari.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.getJiraWorkItemIdFromAri = exports.getJiraWorkItemAri = void 0;
 /* eslint-disable require-unicode-regexp  */
 
+var JIRA_WORK_ITEM_ARI_REGEX = /ari:cloud:jira:([^:]+):issue\/(\d+)/;
+
 /**
  * Generates the Jira work item ARI
  * @param workItemId - the ID of the work item
@@ -25,7 +27,7 @@ var getJiraWorkItemAri = exports.getJiraWorkItemAri = function getJiraWorkItemAr
  */
 var getJiraWorkItemIdFromAri = exports.getJiraWorkItemIdFromAri = function getJiraWorkItemIdFromAri(_ref2) {
   var ari = _ref2.ari;
-  var match = ari.match(/ari:cloud:jira:([^:]+):issue\/(\d+)/);
+  var match = ari.match(JIRA_WORK_ITEM_ARI_REGEX);
   if (match !== null && match !== void 0 && match[2]) {
     return match[2];
   }

package/dist/cjs/providers/block-service/blockServiceAPI.js

@@ -26,6 +26,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 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; } /* eslint-disable require-unicode-regexp  */
+var BLOCK_ARI_TO_RESOURCE_ID_REGEX = /^ari:cloud:blocks:.*:synced-block\/(.+)$/;
+var EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX = /ari:cloud:blocks:[^:]+:synced-block\/(.+)$/;
 var mapBlockError = function mapBlockError(error) {
   switch (error.status) {
     case 400:
@@ -92,7 +94,7 @@ var blockAriToResourceId = exports.blockAriToResourceId = function blockAriToRes
   // The regex captures the full path after synced-block/
   // e.g. ari:cloud:blocks:DUMMY-a5a01d21-1cc3-4f29-9565-f2bb8cd969f5:synced-block/confluence-page/455232061495/e8cf64e3-1b6e-489b-ad86-8465b0905bb4
   // should return confluence-page/455232061495/e8cf64e3-1b6e-489b-ad86-8465b0905bb4
-  var match = blockAri.match(/^ari:cloud:blocks:.*:synced-block\/(.+)$/);
+  var match = blockAri.match(BLOCK_ARI_TO_RESOURCE_ID_REGEX);
   return (match === null || match === void 0 ? void 0 : match[1]) || null;
 };
 
@@ -201,7 +203,7 @@ var fetchReferences = exports.fetchReferences = /*#__PURE__*/function () {
  * Block ARI format: ari:cloud:blocks:<cloudId>:synced-block/<resourceId>
  */
 var extractResourceIdFromBlockAri = exports.extractResourceIdFromBlockAri = function extractResourceIdFromBlockAri(blockAri) {
-  var match = blockAri.match(/ari:cloud:blocks:[^:]+:synced-block\/(.+)$/);
+  var match = blockAri.match(EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX);
   return match === null || match === void 0 ? void 0 : match[1];
 };
 

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

@@ -123,6 +123,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
           localId = _syncBlockNode$attrs.localId,
           resourceId = _syncBlockNode$attrs.resourceId;
         if (!localId || !resourceId) {
+          // Identifiers not populated yet: benign timing case, skip as a no-op.
+          if ((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4')) {
+            return false;
+          }
           throw new Error('Local ID or resource ID is not set');
         }
         var cachedBlock = this.syncBlockCache.get(resourceId);

package/dist/cjs/utils/utils.js

@@ -10,6 +10,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 GET_CONTENT_ID_AND_PRODUCT_REGEX = /^(confluence-page|jira-work-item)\/([^/]+)/;
 var _normalizeSyncBlockJSONContentInternal = function normalizeSyncBlockJSONContentInternal(content, options) {
   var normalizedContent;
   content.forEach(function (contentNode, index) {
@@ -109,7 +110,7 @@ var convertPMNodesToSyncBlockNodes = exports.convertPMNodesToSyncBlockNodes = fu
  * Extracts the source page content id and source product
  */
 var getContentIdAndProductFromResourceId = exports.getContentIdAndProductFromResourceId = function getContentIdAndProductFromResourceId(resourceId) {
-  var match = resourceId.match(/^(confluence-page|jira-work-item)\/([^/]+)/);
+  var match = resourceId.match(GET_CONTENT_ID_AND_PRODUCT_REGEX);
   if (match !== null && match !== void 0 && match[2]) {
     return {
       sourceProduct: match[1],

package/dist/es2019/clients/block-service/ari.js

@@ -1,5 +1,9 @@
 /* eslint-disable require-unicode-regexp */
 
+const GET_LOCAL_ID_FROM_BLOCK_RESOURCE_ID_REGEX = /ari:cloud:blocks:[^:]+:synced-block\/([a-zA-Z0-9-]+)/;
+const JIRA_SOURCE_ARI_REGEX = /ari:cloud:jira:.*/;
+const CONFLUENCE_SOURCE_ARI_REGEX = /ari:cloud:confluence:.*/;
+
 /**
  * Generates the block ARI from the source page ARI and the source block's resource ID.
  * @param cloudId - the cloudId of the block. E.G the cloudId of the confluence page, or the cloudId of the Jira instance
@@ -38,18 +42,18 @@ export const generateBlockAriFromReference = ({
  * @returns the localId of the block node. A randomly generated UUID
  */
 export const getLocalIdFromBlockResourceId = ari => {
-  const match = ari.match(/ari:cloud:blocks:[^:]+:synced-block\/([a-zA-Z0-9-]+)/);
+  const match = ari.match(GET_LOCAL_ID_FROM_BLOCK_RESOURCE_ID_REGEX);
   if (match !== null && match !== void 0 && match[1]) {
     return match[1];
   }
   throw new Error(`Invalid block ARI: ${ari}`);
 };
 export const getProductFromSourceAri = ari => {
-  const jiraMatch = ari === null || ari === void 0 ? void 0 : ari.search(/ari:cloud:jira:.*/);
+  const jiraMatch = ari === null || ari === void 0 ? void 0 : ari.search(JIRA_SOURCE_ARI_REGEX);
   if (jiraMatch !== -1) {
     return 'jira-work-item';
   }
-  const confluenceMatch = ari === null || ari === void 0 ? void 0 : ari.search(/ari:cloud:confluence:.*/);
+  const confluenceMatch = ari === null || ari === void 0 ? void 0 : ari.search(CONFLUENCE_SOURCE_ARI_REGEX);
   if (confluenceMatch !== -1) {
     return 'confluence-page';
   }

package/dist/es2019/clients/block-service/blockSubscription.js

@@ -2,6 +2,9 @@ import { createClient } from 'graphql-ws';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { convertContentUpdatedAt } from '../../utils/utils';
 const GRAPHQL_WS_ENDPOINT = '/gateway/api/graphql/subscriptions';
+
+// eslint-disable-next-line require-unicode-regexp
+const EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX = /ari:cloud:blocks:[^:]+:synced-block\/(.+)$/;
 let blockServiceClient = null;
 
 /**
@@ -136,8 +139,7 @@ export const extractGraphQLWSErrorMessage = error => {
  * @returns The resourceId portion of the ARI
  */
 const extractResourceIdFromBlockAri = blockAri => {
-  // eslint-disable-next-line require-unicode-regexp
-  const match = blockAri.match(/ari:cloud:blocks:[^:]+:synced-block\/(.+)$/);
+  const match = blockAri.match(EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX);
   return (match === null || match === void 0 ? void 0 : match[1]) || null;
 };
 

package/dist/es2019/clients/confluence/ari.js

@@ -1,5 +1,7 @@
 /* eslint-disable require-unicode-regexp  */
 
+const CONFLUENCE_PAGE_ARI_REGEX = /ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/;
+
 /**
  * The type of the Confluence page
  */
@@ -27,7 +29,7 @@ export const getConfluencePageAri = ({
 export const getPageIdAndTypeFromConfluencePageAri = ({
   ari
 }) => {
-  const match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/);
+  const match = ari.match(CONFLUENCE_PAGE_ARI_REGEX);
   if (match !== null && match !== void 0 && match[2]) {
     return {
       type: match[1],

package/dist/es2019/clients/jira/ari.js

@@ -1,5 +1,7 @@
 /* eslint-disable require-unicode-regexp  */
 
+const JIRA_WORK_ITEM_ARI_REGEX = /ari:cloud:jira:([^:]+):issue\/(\d+)/;
+
 /**
  * Generates the Jira work item ARI
  * @param workItemId - the ID of the work item
@@ -21,7 +23,7 @@ export const getJiraWorkItemAri = ({
 export const getJiraWorkItemIdFromAri = ({
   ari
 }) => {
-  const match = ari.match(/ari:cloud:jira:([^:]+):issue\/(\d+)/);
+  const match = ari.match(JIRA_WORK_ITEM_ARI_REGEX);
   if (match !== null && match !== void 0 && match[2]) {
     return match[2];
   }

package/dist/es2019/providers/block-service/blockServiceAPI.js

@@ -7,6 +7,8 @@ import { SyncBlockError } from '../../common/types';
 import { stringifyError } from '../../utils/errorHandling';
 import { createResourceIdForReference } from '../../utils/resourceId';
 import { convertContentUpdatedAt } from '../../utils/utils';
+const BLOCK_ARI_TO_RESOURCE_ID_REGEX = /^ari:cloud:blocks:.*:synced-block\/(.+)$/;
+const EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX = /ari:cloud:blocks:[^:]+:synced-block\/(.+)$/;
 const mapBlockError = error => {
   switch (error.status) {
     case 400:
@@ -73,7 +75,7 @@ export const blockAriToResourceId = blockAri => {
   // The regex captures the full path after synced-block/
   // e.g. ari:cloud:blocks:DUMMY-a5a01d21-1cc3-4f29-9565-f2bb8cd969f5:synced-block/confluence-page/455232061495/e8cf64e3-1b6e-489b-ad86-8465b0905bb4
   // should return confluence-page/455232061495/e8cf64e3-1b6e-489b-ad86-8465b0905bb4
-  const match = blockAri.match(/^ari:cloud:blocks:.*:synced-block\/(.+)$/);
+  const match = blockAri.match(BLOCK_ARI_TO_RESOURCE_ID_REGEX);
   return (match === null || match === void 0 ? void 0 : match[1]) || null;
 };
 
@@ -160,7 +162,7 @@ export const fetchReferences = async documentAri => {
  * Block ARI format: ari:cloud:blocks:<cloudId>:synced-block/<resourceId>
  */
 export const extractResourceIdFromBlockAri = blockAri => {
-  const match = blockAri.match(/ari:cloud:blocks:[^:]+:synced-block\/(.+)$/);
+  const match = blockAri.match(EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX);
   return match === null || match === void 0 ? void 0 : match[1];
 };
 

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

@@ -95,6 +95,10 @@ export class SourceSyncBlockStoreManager {
         resourceId
       } = syncBlockNode.attrs;
       if (!localId || !resourceId) {
+        // Identifiers not populated yet: benign timing case, skip as a no-op.
+        if (fg('platform_editor_blocks_patch_4')) {
+          return false;
+        }
         throw new Error('Local ID or resource ID is not set');
       }
       const cachedBlock = this.syncBlockCache.get(resourceId);

package/dist/es2019/utils/utils.js

@@ -1,5 +1,6 @@
 /* eslint-disable require-unicode-regexp  */
 
+const GET_CONTENT_ID_AND_PRODUCT_REGEX = /^(confluence-page|jira-work-item)\/([^/]+)/;
 const normalizeSyncBlockJSONContentInternal = (content, options) => {
   var _normalizedContent3;
   let normalizedContent;
@@ -94,7 +95,7 @@ export const convertPMNodesToSyncBlockNodes = nodes => {
  * Extracts the source page content id and source product
  */
 export const getContentIdAndProductFromResourceId = resourceId => {
-  const match = resourceId.match(/^(confluence-page|jira-work-item)\/([^/]+)/);
+  const match = resourceId.match(GET_CONTENT_ID_AND_PRODUCT_REGEX);
   if (match !== null && match !== void 0 && match[2]) {
     return {
       sourceProduct: match[1],

package/dist/esm/clients/block-service/ari.js

@@ -1,5 +1,9 @@
 /* eslint-disable require-unicode-regexp */
 
+var GET_LOCAL_ID_FROM_BLOCK_RESOURCE_ID_REGEX = /ari:cloud:blocks:[^:]+:synced-block\/([a-zA-Z0-9-]+)/;
+var JIRA_SOURCE_ARI_REGEX = /ari:cloud:jira:.*/;
+var CONFLUENCE_SOURCE_ARI_REGEX = /ari:cloud:confluence:.*/;
+
 /**
  * Generates the block ARI from the source page ARI and the source block's resource ID.
  * @param cloudId - the cloudId of the block. E.G the cloudId of the confluence page, or the cloudId of the Jira instance
@@ -36,18 +40,18 @@ export var generateBlockAriFromReference = function generateBlockAriFromReferenc
  * @returns the localId of the block node. A randomly generated UUID
  */
 export var getLocalIdFromBlockResourceId = function getLocalIdFromBlockResourceId(ari) {
-  var match = ari.match(/ari:cloud:blocks:[^:]+:synced-block\/([a-zA-Z0-9-]+)/);
+  var match = ari.match(GET_LOCAL_ID_FROM_BLOCK_RESOURCE_ID_REGEX);
   if (match !== null && match !== void 0 && match[1]) {
     return match[1];
   }
   throw new Error("Invalid block ARI: ".concat(ari));
 };
 export var getProductFromSourceAri = function getProductFromSourceAri(ari) {
-  var jiraMatch = ari === null || ari === void 0 ? void 0 : ari.search(/ari:cloud:jira:.*/);
+  var jiraMatch = ari === null || ari === void 0 ? void 0 : ari.search(JIRA_SOURCE_ARI_REGEX);
   if (jiraMatch !== -1) {
     return 'jira-work-item';
   }
-  var confluenceMatch = ari === null || ari === void 0 ? void 0 : ari.search(/ari:cloud:confluence:.*/);
+  var confluenceMatch = ari === null || ari === void 0 ? void 0 : ari.search(CONFLUENCE_SOURCE_ARI_REGEX);
   if (confluenceMatch !== -1) {
     return 'confluence-page';
   }

package/dist/esm/clients/block-service/blockSubscription.js

@@ -3,6 +3,9 @@ import { createClient } from 'graphql-ws';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { convertContentUpdatedAt } from '../../utils/utils';
 var GRAPHQL_WS_ENDPOINT = '/gateway/api/graphql/subscriptions';
+
+// eslint-disable-next-line require-unicode-regexp
+var EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX = /ari:cloud:blocks:[^:]+:synced-block\/(.+)$/;
 var blockServiceClient = null;
 
 /**
@@ -122,8 +125,7 @@ export var extractGraphQLWSErrorMessage = function extractGraphQLWSErrorMessage(
  * @returns The resourceId portion of the ARI
  */
 var extractResourceIdFromBlockAri = function extractResourceIdFromBlockAri(blockAri) {
-  // eslint-disable-next-line require-unicode-regexp
-  var match = blockAri.match(/ari:cloud:blocks:[^:]+:synced-block\/(.+)$/);
+  var match = blockAri.match(EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX);
   return (match === null || match === void 0 ? void 0 : match[1]) || null;
 };
 

package/dist/esm/clients/confluence/ari.js

@@ -1,5 +1,7 @@
 /* eslint-disable require-unicode-regexp  */
 
+var CONFLUENCE_PAGE_ARI_REGEX = /ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/;
+
 /**
  * The type of the Confluence page
  */
@@ -25,7 +27,7 @@ export var getConfluencePageAri = function getConfluencePageAri(_ref) {
  */
 export var getPageIdAndTypeFromConfluencePageAri = function getPageIdAndTypeFromConfluencePageAri(_ref2) {
   var ari = _ref2.ari;
-  var match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/);
+  var match = ari.match(CONFLUENCE_PAGE_ARI_REGEX);
   if (match !== null && match !== void 0 && match[2]) {
     return {
       type: match[1],

package/dist/esm/clients/jira/ari.js

@@ -1,5 +1,7 @@
 /* eslint-disable require-unicode-regexp  */
 
+var JIRA_WORK_ITEM_ARI_REGEX = /ari:cloud:jira:([^:]+):issue\/(\d+)/;
+
 /**
  * Generates the Jira work item ARI
  * @param workItemId - the ID of the work item
@@ -19,7 +21,7 @@ export var getJiraWorkItemAri = function getJiraWorkItemAri(_ref) {
  */
 export var getJiraWorkItemIdFromAri = function getJiraWorkItemIdFromAri(_ref2) {
   var ari = _ref2.ari;
-  var match = ari.match(/ari:cloud:jira:([^:]+):issue\/(\d+)/);
+  var match = ari.match(JIRA_WORK_ITEM_ARI_REGEX);
   if (match !== null && match !== void 0 && match[2]) {
     return match[2];
   }

package/dist/esm/providers/block-service/blockServiceAPI.js

@@ -18,6 +18,8 @@ import { SyncBlockError } from '../../common/types';
 import { stringifyError } from '../../utils/errorHandling';
 import { createResourceIdForReference } from '../../utils/resourceId';
 import { convertContentUpdatedAt } from '../../utils/utils';
+var BLOCK_ARI_TO_RESOURCE_ID_REGEX = /^ari:cloud:blocks:.*:synced-block\/(.+)$/;
+var EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX = /ari:cloud:blocks:[^:]+:synced-block\/(.+)$/;
 var mapBlockError = function mapBlockError(error) {
   switch (error.status) {
     case 400:
@@ -84,7 +86,7 @@ export var blockAriToResourceId = function blockAriToResourceId(blockAri) {
   // The regex captures the full path after synced-block/
   // e.g. ari:cloud:blocks:DUMMY-a5a01d21-1cc3-4f29-9565-f2bb8cd969f5:synced-block/confluence-page/455232061495/e8cf64e3-1b6e-489b-ad86-8465b0905bb4
   // should return confluence-page/455232061495/e8cf64e3-1b6e-489b-ad86-8465b0905bb4
-  var match = blockAri.match(/^ari:cloud:blocks:.*:synced-block\/(.+)$/);
+  var match = blockAri.match(BLOCK_ARI_TO_RESOURCE_ID_REGEX);
   return (match === null || match === void 0 ? void 0 : match[1]) || null;
 };
 
@@ -193,7 +195,7 @@ export var fetchReferences = /*#__PURE__*/function () {
  * Block ARI format: ari:cloud:blocks:<cloudId>:synced-block/<resourceId>
  */
 export var extractResourceIdFromBlockAri = function extractResourceIdFromBlockAri(blockAri) {
-  var match = blockAri.match(/ari:cloud:blocks:[^:]+:synced-block\/(.+)$/);
+  var match = blockAri.match(EXTRACT_RESOURCE_ID_FROM_BLOCK_ARI_REGEX);
   return match === null || match === void 0 ? void 0 : match[1];
 };
 

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

@@ -116,6 +116,10 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
           localId = _syncBlockNode$attrs.localId,
           resourceId = _syncBlockNode$attrs.resourceId;
         if (!localId || !resourceId) {
+          // Identifiers not populated yet: benign timing case, skip as a no-op.
+          if (fg('platform_editor_blocks_patch_4')) {
+            return false;
+          }
           throw new Error('Local ID or resource ID is not set');
         }
         var cachedBlock = this.syncBlockCache.get(resourceId);

package/dist/esm/utils/utils.js

@@ -3,6 +3,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 /* eslint-disable require-unicode-regexp  */
 
+var GET_CONTENT_ID_AND_PRODUCT_REGEX = /^(confluence-page|jira-work-item)\/([^/]+)/;
 var _normalizeSyncBlockJSONContentInternal = function normalizeSyncBlockJSONContentInternal(content, options) {
   var normalizedContent;
   content.forEach(function (contentNode, index) {
@@ -102,7 +103,7 @@ export var convertPMNodesToSyncBlockNodes = function convertPMNodesToSyncBlockNo
  * Extracts the source page content id and source product
  */
 export var getContentIdAndProductFromResourceId = function getContentIdAndProductFromResourceId(resourceId) {
-  var match = resourceId.match(/^(confluence-page|jira-work-item)\/([^/]+)/);
+  var match = resourceId.match(GET_CONTENT_ID_AND_PRODUCT_REGEX);
   if (match !== null && match !== void 0 && match[2]) {
     return {
       sourceProduct: match[1],

package/package.json

@@ -21,7 +21,7 @@
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/node-data-provider": "^13.0.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
-		"@atlaskit/tmp-editor-statsig": "^114.4.0",
+		"@atlaskit/tmp-editor-statsig": "^114.6.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"graphql-ws": "^5.14.2",
@@ -74,7 +74,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "8.3.0",
+	"version": "8.4.0",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -88,6 +88,9 @@
 		"platform_editor_blocks_patch_3": {
 			"type": "boolean"
 		},
+		"platform_editor_blocks_patch_4": {
+			"type": "boolean"
+		},
 		"platform_synced_block_patch_13": {
 			"type": "boolean"
 		},