@atlaskit/renderer 141.0.7 → 142.0.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/renderer
 
+## 142.0.0
+
+### Major Changes
+
+- [`01047cd51f538`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/01047cd51f538) -
+  Clean up `platform_editor_renderer_rm_usespecbasedvalidator` and always use spec-based validation
+  in the renderer.
+
+  Remove the deprecated `useSpecBasedValidator` renderer prop and the fifth `renderDocument`
+  argument. Remove this prop from renderer usages and remove the fifth argument from direct
+  `renderDocument` calls, shifting any subsequent arguments one position to the left. The legacy
+  validator is no longer available through the renderer.
+
+  Update editor AI renderer consumers to use the permanent validation behavior.
+
+### Patch Changes
+
+- [`90cc9e3c7fc0c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/90cc9e3c7fc0c) -
+  Support gated dark-background styling for the configured Rovo Chat agent mention in editors and
+  the renderer.
+- Updated dependencies
+
 ## 141.0.7
 
 ### Patch Changes

package/dist/cjs/render-document.js

@@ -11,7 +11,6 @@ var _schemaDefault = require("@atlaskit/adf-schema/schema-default");
 var _transforms = require("@atlaskit/adf-utils/transforms");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-common/utils");
-var _validator = require("@atlaskit/editor-common/validator");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _events = require("./analytics/events");
@@ -34,37 +33,34 @@ var withStopwatch = function withStopwatch(cb) {
 
 /** Schema-variant escape hatches handed to the ADF validator. */
 
-var _validation = function _validation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation, validationOverrides) {
-  var result;
-  if (useSpecBasedValidator) {
-    // link mark on mediaSingle is deprecated, need to move link mark to child media node
-    // https://product-fabric.atlassian.net/browse/ED-14043
-    var _transformMediaLinkMa = (0, _transforms.transformMediaLinkMarks)(doc),
-      transformedAdf = _transformMediaLinkMa.transformedAdf,
-      isTransformed = _transformMediaLinkMa.isTransformed;
-    if (isTransformed && dispatchAnalyticsEvent) {
-      dispatchAnalyticsEvent({
-        action: _analytics.ACTION.MEDIA_LINK_TRANSFORMED,
-        actionSubject: _analytics.ACTION_SUBJECT.RENDERER,
-        eventType: _analytics.EVENT_TYPE.OPERATIONAL
-      });
-    }
-
-    // Forward `adfStage` only when a caller names one. Omitting it keeps stage-0 specs acceptable,
-    // which is what a renderer wants: stored documents can contain them, and wrapping such content
-    // as unsupported is worse than rendering it. A caller that declares `final` asks for full-ADF
-    // strictness and gets it. The legacy branch below reads the same value as a schema selector and
-    // so keeps its own `final` default.
-    result = skipValidation ? transformedAdf || doc : (0, _utils.validateADFEntity)(schema, transformedAdf || doc, dispatchAnalyticsEvent, validationOverrides, adfStage);
-  } else {
-    result = (0, _validator.getValidDocument)(doc, schema, adfStage !== null && adfStage !== void 0 ? adfStage : 'final');
+var _validation = function _validation(doc, schema, adfStage, dispatchAnalyticsEvent, skipValidation, validationOverrides) {
+  // link mark on mediaSingle is deprecated, need to move link mark to child media node
+  // https://product-fabric.atlassian.net/browse/ED-14043
+  var _transformMediaLinkMa = (0, _transforms.transformMediaLinkMarks)(doc),
+    transformedAdf = _transformMediaLinkMa.transformedAdf,
+    isTransformed = _transformMediaLinkMa.isTransformed;
+  if (isTransformed && dispatchAnalyticsEvent) {
+    dispatchAnalyticsEvent({
+      action: _analytics.ACTION.MEDIA_LINK_TRANSFORMED,
+      actionSubject: _analytics.ACTION_SUBJECT.RENDERER,
+      eventType: _analytics.EVENT_TYPE.OPERATIONAL
+    });
   }
-  if (!result) {
-    return result;
+
+  // Forward `adfStage` only when a caller names one. Omitting it keeps stage-0 specs acceptable,
+  // which is what a renderer wants: stored documents can contain them, and wrapping such content
+  // as unsupported is worse than rendering it. A caller that declares `final` asks for full-ADF
+  // strictness and gets it.
+  var result = skipValidation ? transformedAdf || doc : (0, _utils.validateADFEntity)(schema, transformedAdf || doc, dispatchAnalyticsEvent, validationOverrides, adfStage);
+
+  // The spec validator can return the original root object when malformed JSON has no node type.
+  // Reject it here, matching the legacy validator, before ProseMirror attempts to deserialize it.
+  if (!result || typeof result.type !== 'string' || result.type.length === 0) {
+    return null;
   }
 
   // ProseMirror always require a child under doc
-  if (result.type === 'doc' && useSpecBasedValidator) {
+  if (result.type === 'doc') {
     if (Array.isArray(result.content) && result.content.length === 0) {
       result.content.push({
         type: 'paragraph',
@@ -149,24 +145,22 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
   return result;
 };
 var memoValidation = (0, _memoizeOne.default)(_validation, function (newArgs, lastArgs) {
-  var _newArgs = (0, _slicedToArray2.default)(newArgs, 7),
+  var _newArgs = (0, _slicedToArray2.default)(newArgs, 6),
     newDoc = _newArgs[0],
     newSchema = _newArgs[1],
     newADFStage = _newArgs[2],
-    newUseSpecValidator = _newArgs[3],
-    /* ignoring dispatchAnalyticsEvent */newSkipValidation = _newArgs[5],
-    newValidationOverrides = _newArgs[6];
-  var _lastArgs = (0, _slicedToArray2.default)(lastArgs, 7),
+    /* ignoring dispatchAnalyticsEvent */newSkipValidation = _newArgs[4],
+    newValidationOverrides = _newArgs[5];
+  var _lastArgs = (0, _slicedToArray2.default)(lastArgs, 6),
     oldDoc = _lastArgs[0],
     oldSchema = _lastArgs[1],
     oldADFStage = _lastArgs[2],
-    oldUseSpecValidator = _lastArgs[3],
-    /* ignoring dispatchAnalyticsEvent */oldSkipValidation = _lastArgs[5],
-    oldValidationOverrides = _lastArgs[6];
+    /* ignoring dispatchAnalyticsEvent */oldSkipValidation = _lastArgs[4],
+    oldValidationOverrides = _lastArgs[5];
 
   // `areDocsEqual` may stringify the whole document, so it goes last and only runs once everything
   // cheaper has matched.
-  return newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation && areValidationOverridesEqual(newValidationOverrides, oldValidationOverrides) && areDocsEqual(newDoc, oldDoc);
+  return newSchema === oldSchema && newADFStage === oldADFStage && newSkipValidation === oldSkipValidation && areValidationOverridesEqual(newValidationOverrides, oldValidationOverrides) && areDocsEqual(newDoc, oldDoc);
 });
 
 // Ignored via go/ees005
@@ -260,22 +254,18 @@ var memoCreateNodeAndCheck = (0, _memoizeOne.default)(_createNodeAndCheck, funct
 var renderDocument = exports.renderDocument = function renderDocument(doc, serializer) {
   var schema = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _schemaDefault.defaultSchema;
   var adfStage = arguments.length > 3 ? arguments[3] : undefined;
-  var useSpecBasedValidator = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-  var rendererId = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'noid';
-  var dispatchAnalyticsEvent = arguments.length > 6 ? arguments[6] : undefined;
-  var unsupportedContentLevelsTracking = arguments.length > 7 ? arguments[7] : undefined;
-  var appearance = arguments.length > 8 ? arguments[8] : undefined;
-  var includeNodesCountInStats = arguments.length > 9 ? arguments[9] : undefined;
-  var skipValidation = arguments.length > 10 ? arguments[10] : undefined;
-  var validationOverrides = arguments.length > 11 ? arguments[11] : undefined;
+  var rendererId = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'noid';
+  var dispatchAnalyticsEvent = arguments.length > 5 ? arguments[5] : undefined;
+  var unsupportedContentLevelsTracking = arguments.length > 6 ? arguments[6] : undefined;
+  var appearance = arguments.length > 7 ? arguments[7] : undefined;
+  var includeNodesCountInStats = arguments.length > 8 ? arguments[8] : undefined;
+  var skipValidation = arguments.length > 9 ? arguments[9] : undefined;
+  var validationOverrides = arguments.length > 10 ? arguments[10] : undefined;
   var stat = {
     sanitizeTime: 0
   };
-  if ((0, _fg.fg)('platform_editor_renderer_rm_usespecbasedvalidator')) {
-    useSpecBasedValidator = true;
-  }
   var _withStopwatch = withStopwatch(function () {
-      return memoValidation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation, validationOverrides);
+      return memoValidation(doc, schema, adfStage, dispatchAnalyticsEvent, skipValidation, validationOverrides);
     }),
     validDoc = _withStopwatch.output,
     sanitizeTime = _withStopwatch.time;
@@ -304,7 +294,7 @@ var renderDocument = exports.renderDocument = function renderDocument(doc, seria
 
   // save serialize tree time to stats
   stat.serializeTime = serializeTime;
-  if (dispatchAnalyticsEvent && useSpecBasedValidator) {
+  if (dispatchAnalyticsEvent) {
     (0, _utils.findAndTrackUnsupportedContentNodes)(node, schema, dispatchAnalyticsEvent);
     if (unsupportedContentLevelsTracking !== null && unsupportedContentLevelsTracking !== void 0 && unsupportedContentLevelsTracking.enabled) {
       var documentData = {

package/dist/cjs/ui/Renderer/index.js

@@ -71,7 +71,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.1;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "141.0.6";
+var packageVersion = "141.0.7";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -498,7 +498,7 @@ var RendererFunctionalComponent = exports.RendererFunctionalComponent = function
   try {
     var _rendererContext$feat, _props$media;
     var schema = getSchema(props.schema, props.adfStage);
-    var _renderDocument = (0, _.renderDocument)(props.shouldRemoveEmptySpaceAroundContent ? (0, _rendererHelper.removeEmptySpaceAroundContent)(props.document) : props.document, serializer, schema, props.adfStage, props.useSpecBasedValidator, id, _fireAnalyticsEvent, props.unsupportedContentLevelsTracking, props.appearance, props.includeNodesCountInStats, props.skipValidation, validationOverrides),
+    var _renderDocument = (0, _.renderDocument)(props.shouldRemoveEmptySpaceAroundContent ? (0, _rendererHelper.removeEmptySpaceAroundContent)(props.document) : props.document, serializer, schema, props.adfStage, id, _fireAnalyticsEvent, props.unsupportedContentLevelsTracking, props.appearance, props.includeNodesCountInStats, props.skipValidation, validationOverrides),
       result = _renderDocument.result,
       stat = _renderDocument.stat,
       pmDoc = _renderDocument.pmDoc;

package/dist/es2019/render-document.js

@@ -6,7 +6,6 @@ import { defaultSchema } from '@atlaskit/adf-schema/schema-default';
 import { nativeEmbedsFallbackTransform, transformContainerNodes, transformMediaLinkMarks, transformNestedTablesIncomingDocument } from '@atlaskit/adf-utils/transforms';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { findAndTrackUnsupportedContentNodes, validateADFEntity } from '@atlaskit/editor-common/utils';
-import { getValidDocument } from '@atlaskit/editor-common/validator';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { PLATFORM } from './analytics/events';
@@ -26,38 +25,35 @@ const withStopwatch = cb => {
 
 /** Schema-variant escape hatches handed to the ADF validator. */
 
-const _validation = (doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation, validationOverrides) => {
-  let result;
-  if (useSpecBasedValidator) {
-    // link mark on mediaSingle is deprecated, need to move link mark to child media node
-    // https://product-fabric.atlassian.net/browse/ED-14043
-    const {
-      transformedAdf,
-      isTransformed
-    } = transformMediaLinkMarks(doc);
-    if (isTransformed && dispatchAnalyticsEvent) {
-      dispatchAnalyticsEvent({
-        action: ACTION.MEDIA_LINK_TRANSFORMED,
-        actionSubject: ACTION_SUBJECT.RENDERER,
-        eventType: EVENT_TYPE.OPERATIONAL
-      });
-    }
-
-    // Forward `adfStage` only when a caller names one. Omitting it keeps stage-0 specs acceptable,
-    // which is what a renderer wants: stored documents can contain them, and wrapping such content
-    // as unsupported is worse than rendering it. A caller that declares `final` asks for full-ADF
-    // strictness and gets it. The legacy branch below reads the same value as a schema selector and
-    // so keeps its own `final` default.
-    result = skipValidation ? transformedAdf || doc : validateADFEntity(schema, transformedAdf || doc, dispatchAnalyticsEvent, validationOverrides, adfStage);
-  } else {
-    result = getValidDocument(doc, schema, adfStage !== null && adfStage !== void 0 ? adfStage : 'final');
+const _validation = (doc, schema, adfStage, dispatchAnalyticsEvent, skipValidation, validationOverrides) => {
+  // link mark on mediaSingle is deprecated, need to move link mark to child media node
+  // https://product-fabric.atlassian.net/browse/ED-14043
+  const {
+    transformedAdf,
+    isTransformed
+  } = transformMediaLinkMarks(doc);
+  if (isTransformed && dispatchAnalyticsEvent) {
+    dispatchAnalyticsEvent({
+      action: ACTION.MEDIA_LINK_TRANSFORMED,
+      actionSubject: ACTION_SUBJECT.RENDERER,
+      eventType: EVENT_TYPE.OPERATIONAL
+    });
   }
-  if (!result) {
-    return result;
+
+  // Forward `adfStage` only when a caller names one. Omitting it keeps stage-0 specs acceptable,
+  // which is what a renderer wants: stored documents can contain them, and wrapping such content
+  // as unsupported is worse than rendering it. A caller that declares `final` asks for full-ADF
+  // strictness and gets it.
+  let result = skipValidation ? transformedAdf || doc : validateADFEntity(schema, transformedAdf || doc, dispatchAnalyticsEvent, validationOverrides, adfStage);
+
+  // The spec validator can return the original root object when malformed JSON has no node type.
+  // Reject it here, matching the legacy validator, before ProseMirror attempts to deserialize it.
+  if (!result || typeof result.type !== 'string' || result.type.length === 0) {
+    return null;
   }
 
   // ProseMirror always require a child under doc
-  if (result.type === 'doc' && useSpecBasedValidator) {
+  if (result.type === 'doc') {
     if (Array.isArray(result.content) && result.content.length === 0) {
       result.content.push({
         type: 'paragraph',
@@ -145,12 +141,12 @@ const _validation = (doc, schema, adfStage, useSpecBasedValidator, dispatchAnaly
   return result;
 };
 const memoValidation = memoizeOne(_validation, (newArgs, lastArgs) => {
-  const [newDoc, newSchema, newADFStage, newUseSpecValidator,, /* ignoring dispatchAnalyticsEvent */newSkipValidation, newValidationOverrides] = newArgs;
-  const [oldDoc, oldSchema, oldADFStage, oldUseSpecValidator,, /* ignoring dispatchAnalyticsEvent */oldSkipValidation, oldValidationOverrides] = lastArgs;
+  const [newDoc, newSchema, newADFStage,, /* ignoring dispatchAnalyticsEvent */newSkipValidation, newValidationOverrides] = newArgs;
+  const [oldDoc, oldSchema, oldADFStage,, /* ignoring dispatchAnalyticsEvent */oldSkipValidation, oldValidationOverrides] = lastArgs;
 
   // `areDocsEqual` may stringify the whole document, so it goes last and only runs once everything
   // cheaper has matched.
-  return newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation && areValidationOverridesEqual(newValidationOverrides, oldValidationOverrides) && areDocsEqual(newDoc, oldDoc);
+  return newSchema === oldSchema && newADFStage === oldADFStage && newSkipValidation === oldSkipValidation && areValidationOverridesEqual(newValidationOverrides, oldValidationOverrides) && areDocsEqual(newDoc, oldDoc);
 });
 
 // Ignored via go/ees005
@@ -228,18 +224,15 @@ const memoCreateNodeAndCheck = memoizeOne(_createNodeAndCheck, (newArgs, lastArg
   const [oldSchema, oldDoc] = lastArgs;
   return newSchema === oldSchema && areDocsEqual(newDoc, oldDoc);
 });
-export const renderDocument = (doc, serializer, schema = defaultSchema, adfStage, useSpecBasedValidator = false, rendererId = 'noid', dispatchAnalyticsEvent, unsupportedContentLevelsTracking, appearance, includeNodesCountInStats, skipValidation, validationOverrides) => {
+export const renderDocument = (doc, serializer, schema = defaultSchema, adfStage, rendererId = 'noid', dispatchAnalyticsEvent, unsupportedContentLevelsTracking, appearance, includeNodesCountInStats, skipValidation, validationOverrides) => {
   const stat = {
     sanitizeTime: 0
   };
-  if (fg('platform_editor_renderer_rm_usespecbasedvalidator')) {
-    useSpecBasedValidator = true;
-  }
   const {
     output: validDoc,
     time: sanitizeTime
   } = withStopwatch(() => {
-    return memoValidation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation, validationOverrides);
+    return memoValidation(doc, schema, adfStage, dispatchAnalyticsEvent, skipValidation, validationOverrides);
   });
 
   // save sanitize time to stats
@@ -268,7 +261,7 @@ export const renderDocument = (doc, serializer, schema = defaultSchema, adfStage
 
   // save serialize tree time to stats
   stat.serializeTime = serializeTime;
-  if (dispatchAnalyticsEvent && useSpecBasedValidator) {
+  if (dispatchAnalyticsEvent) {
     findAndTrackUnsupportedContentNodes(node, schema, dispatchAnalyticsEvent);
     if (unsupportedContentLevelsTracking !== null && unsupportedContentLevelsTracking !== void 0 && unsupportedContentLevelsTracking.enabled) {
       const documentData = {

package/dist/es2019/ui/Renderer/index.js

@@ -56,7 +56,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const TABLE_INFO_TIMEOUT = 10000;
 const RENDER_EVENT_SAMPLE_RATE = 0.1;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "141.0.6";
+const packageVersion = "141.0.7";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -494,7 +494,7 @@ export const RendererFunctionalComponent = props => {
       result,
       stat,
       pmDoc
-    } = renderDocument(props.shouldRemoveEmptySpaceAroundContent ? removeEmptySpaceAroundContent(props.document) : props.document, serializer, schema, props.adfStage, props.useSpecBasedValidator, id, fireAnalyticsEvent, props.unsupportedContentLevelsTracking, props.appearance, props.includeNodesCountInStats, props.skipValidation, validationOverrides);
+    } = renderDocument(props.shouldRemoveEmptySpaceAroundContent ? removeEmptySpaceAroundContent(props.document) : props.document, serializer, schema, props.adfStage, id, fireAnalyticsEvent, props.unsupportedContentLevelsTracking, props.appearance, props.includeNodesCountInStats, props.skipValidation, validationOverrides);
     if (props.onComplete) {
       pendingOnCompleteStatRef.current = stat;
     }

package/dist/esm/render-document.js

@@ -7,7 +7,6 @@ import { defaultSchema } from '@atlaskit/adf-schema/schema-default';
 import { nativeEmbedsFallbackTransform, transformContainerNodes, transformMediaLinkMarks, transformNestedTablesIncomingDocument } from '@atlaskit/adf-utils/transforms';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { findAndTrackUnsupportedContentNodes, validateADFEntity } from '@atlaskit/editor-common/utils';
-import { getValidDocument } from '@atlaskit/editor-common/validator';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { PLATFORM } from './analytics/events';
@@ -27,37 +26,34 @@ var withStopwatch = function withStopwatch(cb) {
 
 /** Schema-variant escape hatches handed to the ADF validator. */
 
-var _validation = function _validation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation, validationOverrides) {
-  var result;
-  if (useSpecBasedValidator) {
-    // link mark on mediaSingle is deprecated, need to move link mark to child media node
-    // https://product-fabric.atlassian.net/browse/ED-14043
-    var _transformMediaLinkMa = transformMediaLinkMarks(doc),
-      transformedAdf = _transformMediaLinkMa.transformedAdf,
-      isTransformed = _transformMediaLinkMa.isTransformed;
-    if (isTransformed && dispatchAnalyticsEvent) {
-      dispatchAnalyticsEvent({
-        action: ACTION.MEDIA_LINK_TRANSFORMED,
-        actionSubject: ACTION_SUBJECT.RENDERER,
-        eventType: EVENT_TYPE.OPERATIONAL
-      });
-    }
-
-    // Forward `adfStage` only when a caller names one. Omitting it keeps stage-0 specs acceptable,
-    // which is what a renderer wants: stored documents can contain them, and wrapping such content
-    // as unsupported is worse than rendering it. A caller that declares `final` asks for full-ADF
-    // strictness and gets it. The legacy branch below reads the same value as a schema selector and
-    // so keeps its own `final` default.
-    result = skipValidation ? transformedAdf || doc : validateADFEntity(schema, transformedAdf || doc, dispatchAnalyticsEvent, validationOverrides, adfStage);
-  } else {
-    result = getValidDocument(doc, schema, adfStage !== null && adfStage !== void 0 ? adfStage : 'final');
+var _validation = function _validation(doc, schema, adfStage, dispatchAnalyticsEvent, skipValidation, validationOverrides) {
+  // link mark on mediaSingle is deprecated, need to move link mark to child media node
+  // https://product-fabric.atlassian.net/browse/ED-14043
+  var _transformMediaLinkMa = transformMediaLinkMarks(doc),
+    transformedAdf = _transformMediaLinkMa.transformedAdf,
+    isTransformed = _transformMediaLinkMa.isTransformed;
+  if (isTransformed && dispatchAnalyticsEvent) {
+    dispatchAnalyticsEvent({
+      action: ACTION.MEDIA_LINK_TRANSFORMED,
+      actionSubject: ACTION_SUBJECT.RENDERER,
+      eventType: EVENT_TYPE.OPERATIONAL
+    });
   }
-  if (!result) {
-    return result;
+
+  // Forward `adfStage` only when a caller names one. Omitting it keeps stage-0 specs acceptable,
+  // which is what a renderer wants: stored documents can contain them, and wrapping such content
+  // as unsupported is worse than rendering it. A caller that declares `final` asks for full-ADF
+  // strictness and gets it.
+  var result = skipValidation ? transformedAdf || doc : validateADFEntity(schema, transformedAdf || doc, dispatchAnalyticsEvent, validationOverrides, adfStage);
+
+  // The spec validator can return the original root object when malformed JSON has no node type.
+  // Reject it here, matching the legacy validator, before ProseMirror attempts to deserialize it.
+  if (!result || typeof result.type !== 'string' || result.type.length === 0) {
+    return null;
   }
 
   // ProseMirror always require a child under doc
-  if (result.type === 'doc' && useSpecBasedValidator) {
+  if (result.type === 'doc') {
     if (Array.isArray(result.content) && result.content.length === 0) {
       result.content.push({
         type: 'paragraph',
@@ -142,24 +138,22 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
   return result;
 };
 var memoValidation = memoizeOne(_validation, function (newArgs, lastArgs) {
-  var _newArgs = _slicedToArray(newArgs, 7),
+  var _newArgs = _slicedToArray(newArgs, 6),
     newDoc = _newArgs[0],
     newSchema = _newArgs[1],
     newADFStage = _newArgs[2],
-    newUseSpecValidator = _newArgs[3],
-    /* ignoring dispatchAnalyticsEvent */newSkipValidation = _newArgs[5],
-    newValidationOverrides = _newArgs[6];
-  var _lastArgs = _slicedToArray(lastArgs, 7),
+    /* ignoring dispatchAnalyticsEvent */newSkipValidation = _newArgs[4],
+    newValidationOverrides = _newArgs[5];
+  var _lastArgs = _slicedToArray(lastArgs, 6),
     oldDoc = _lastArgs[0],
     oldSchema = _lastArgs[1],
     oldADFStage = _lastArgs[2],
-    oldUseSpecValidator = _lastArgs[3],
-    /* ignoring dispatchAnalyticsEvent */oldSkipValidation = _lastArgs[5],
-    oldValidationOverrides = _lastArgs[6];
+    /* ignoring dispatchAnalyticsEvent */oldSkipValidation = _lastArgs[4],
+    oldValidationOverrides = _lastArgs[5];
 
   // `areDocsEqual` may stringify the whole document, so it goes last and only runs once everything
   // cheaper has matched.
-  return newSchema === oldSchema && newADFStage === oldADFStage && newUseSpecValidator === oldUseSpecValidator && newSkipValidation === oldSkipValidation && areValidationOverridesEqual(newValidationOverrides, oldValidationOverrides) && areDocsEqual(newDoc, oldDoc);
+  return newSchema === oldSchema && newADFStage === oldADFStage && newSkipValidation === oldSkipValidation && areValidationOverridesEqual(newValidationOverrides, oldValidationOverrides) && areDocsEqual(newDoc, oldDoc);
 });
 
 // Ignored via go/ees005
@@ -253,22 +247,18 @@ var memoCreateNodeAndCheck = memoizeOne(_createNodeAndCheck, function (newArgs,
 export var renderDocument = function renderDocument(doc, serializer) {
   var schema = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : defaultSchema;
   var adfStage = arguments.length > 3 ? arguments[3] : undefined;
-  var useSpecBasedValidator = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-  var rendererId = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'noid';
-  var dispatchAnalyticsEvent = arguments.length > 6 ? arguments[6] : undefined;
-  var unsupportedContentLevelsTracking = arguments.length > 7 ? arguments[7] : undefined;
-  var appearance = arguments.length > 8 ? arguments[8] : undefined;
-  var includeNodesCountInStats = arguments.length > 9 ? arguments[9] : undefined;
-  var skipValidation = arguments.length > 10 ? arguments[10] : undefined;
-  var validationOverrides = arguments.length > 11 ? arguments[11] : undefined;
+  var rendererId = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'noid';
+  var dispatchAnalyticsEvent = arguments.length > 5 ? arguments[5] : undefined;
+  var unsupportedContentLevelsTracking = arguments.length > 6 ? arguments[6] : undefined;
+  var appearance = arguments.length > 7 ? arguments[7] : undefined;
+  var includeNodesCountInStats = arguments.length > 8 ? arguments[8] : undefined;
+  var skipValidation = arguments.length > 9 ? arguments[9] : undefined;
+  var validationOverrides = arguments.length > 10 ? arguments[10] : undefined;
   var stat = {
     sanitizeTime: 0
   };
-  if (fg('platform_editor_renderer_rm_usespecbasedvalidator')) {
-    useSpecBasedValidator = true;
-  }
   var _withStopwatch = withStopwatch(function () {
-      return memoValidation(doc, schema, adfStage, useSpecBasedValidator, dispatchAnalyticsEvent, skipValidation, validationOverrides);
+      return memoValidation(doc, schema, adfStage, dispatchAnalyticsEvent, skipValidation, validationOverrides);
     }),
     validDoc = _withStopwatch.output,
     sanitizeTime = _withStopwatch.time;
@@ -297,7 +287,7 @@ export var renderDocument = function renderDocument(doc, serializer) {
 
   // save serialize tree time to stats
   stat.serializeTime = serializeTime;
-  if (dispatchAnalyticsEvent && useSpecBasedValidator) {
+  if (dispatchAnalyticsEvent) {
     findAndTrackUnsupportedContentNodes(node, schema, dispatchAnalyticsEvent);
     if (unsupportedContentLevelsTracking !== null && unsupportedContentLevelsTracking !== void 0 && unsupportedContentLevelsTracking.enabled) {
       var documentData = {

package/dist/esm/ui/Renderer/index.js

@@ -61,7 +61,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.1;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "141.0.6";
+var packageVersion = "141.0.7";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -488,7 +488,7 @@ export var RendererFunctionalComponent = function RendererFunctionalComponent(pr
   try {
     var _rendererContext$feat, _props$media;
     var schema = getSchema(props.schema, props.adfStage);
-    var _renderDocument = renderDocument(props.shouldRemoveEmptySpaceAroundContent ? removeEmptySpaceAroundContent(props.document) : props.document, serializer, schema, props.adfStage, props.useSpecBasedValidator, id, _fireAnalyticsEvent, props.unsupportedContentLevelsTracking, props.appearance, props.includeNodesCountInStats, props.skipValidation, validationOverrides),
+    var _renderDocument = renderDocument(props.shouldRemoveEmptySpaceAroundContent ? removeEmptySpaceAroundContent(props.document) : props.document, serializer, schema, props.adfStage, id, _fireAnalyticsEvent, props.unsupportedContentLevelsTracking, props.appearance, props.includeNodesCountInStats, props.skipValidation, validationOverrides),
       result = _renderDocument.result,
       stat = _renderDocument.stat,
       pmDoc = _renderDocument.pmDoc;

package/dist/types/render-document.d.ts

@@ -25,5 +25,5 @@ type ValidationOverrides = {
     allowNestedTables?: boolean;
     allowTableInPanel?: boolean;
 };
-export declare const renderDocument: <T>(doc: any, serializer: Serializer<T>, schema?: Schema, adfStage?: ADFStage, useSpecBasedValidator?: boolean, rendererId?: string, dispatchAnalyticsEvent?: DispatchAnalyticsEvent, unsupportedContentLevelsTracking?: UnsupportedContentLevelsTracking, appearance?: RendererAppearance, includeNodesCountInStats?: boolean, skipValidation?: boolean, validationOverrides?: ValidationOverrides) => RenderOutput<T | null>;
+export declare const renderDocument: <T>(doc: any, serializer: Serializer<T>, schema?: Schema, adfStage?: ADFStage, rendererId?: string, dispatchAnalyticsEvent?: DispatchAnalyticsEvent, unsupportedContentLevelsTracking?: UnsupportedContentLevelsTracking, appearance?: RendererAppearance, includeNodesCountInStats?: boolean, skipValidation?: boolean, validationOverrides?: ValidationOverrides) => RenderOutput<T | null>;
 export {};

package/dist/types/ui/renderer-props.d.ts

@@ -230,7 +230,5 @@ export interface RendererProps {
     /** @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-26490 Internal documentation for deprecation (no external access)}  This prop has been marked stable and therefore replaced by the `textHighlighter` prop. Please use `textHighlighter` prop instead. */
     UNSTABLE_textHighlighter?: TextHighlighter;
     unsupportedContentLevelsTracking?: UnsupportedContentLevelsTracking;
-    /** @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-3649 Internal documentation for deprecation (no external access)} This prop will be removed and set as default enabled, as the same flag on the Editor is also now default enabled. */
-    useSpecBasedValidator?: boolean;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "141.0.7",
+	"version": "142.0.0",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -88,7 +88,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^123.5.0",
+		"@atlaskit/editor-common": "^123.6.0",
 		"@atlaskit/link-provider": "^5.7.0",
 		"@atlaskit/media-core": "^38.2.0",
 		"react": "^18.2.0 || ^19.2.0",
@@ -194,9 +194,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"platform_editor_renderer_rm_usespecbasedvalidator": {
-			"type": "boolean"
-		},
 		"platform_editor_bordered_panel_nested_in_table": {
 			"type": "boolean"
 		},