@atlaskit/adf-utils 19.27.47 → 19.29.0

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @atlaskit/adf-utils
 
+## 19.29.0
+
+### Minor Changes
+
+- [`2fb1c8a74a856`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2fb1c8a74a856) -
+  ADF Change 101: Add wrap and hideLineNumbers attributes to codeBlock stage-0 variants
+
+### Patch Changes
+
+- Updated dependencies
+
+## 19.28.0
+
+### Minor Changes
+
+- [`9ea3b02135766`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9ea3b02135766) -
+  EDITOR-5613: Remove flexible list variants and consolidate into base list types.
+
+  The `listItem` and `taskList` node specs now natively support the flexible content model (allowing
+  lists as first child of listItem, and nested taskLists without requiring taskItem first). The
+  separate `listItemWithFlexibleFirstChildStage0` and `taskListWithFlexibleFirstChildStage0`
+  variants have been removed from public exports — the flexible behavior is now the default for all
+  schema stages. Consumers importing these removed exports should switch to `listItem` / `taskList`.
+
+  This is a schema simplification: the flexible content spec is a strict superset of the old
+  restrictive spec, so all previously valid content remains valid.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 19.27.47
 
 ### Patch Changes

package/dist/cjs/validator/specs/index.js

@@ -111,6 +111,18 @@ Object.defineProperty(exports, "codeBlock_root_only", {
     return _schemaValidator.codeBlock_root_only;
   }
 });
+Object.defineProperty(exports, "codeBlock_root_only_with_extended_attributes", {
+  enumerable: true,
+  get: function get() {
+    return _schemaValidator.codeBlock_root_only_with_extended_attributes;
+  }
+});
+Object.defineProperty(exports, "codeBlock_with_extended_attributes", {
+  enumerable: true,
+  get: function get() {
+    return _schemaValidator.codeBlock_with_extended_attributes;
+  }
+});
 Object.defineProperty(exports, "confluenceInlineComment", {
   enumerable: true,
   get: function get() {
@@ -303,12 +315,6 @@ Object.defineProperty(exports, "listItem", {
     return _schemaValidator.listItem;
   }
 });
-Object.defineProperty(exports, "listItem_with_flexible_first_child", {
-  enumerable: true,
-  get: function get() {
-    return _schemaValidator.listItem_with_flexible_first_child;
-  }
-});
 Object.defineProperty(exports, "media", {
   enumerable: true,
   get: function get() {
@@ -513,12 +519,6 @@ Object.defineProperty(exports, "taskList", {
     return _schemaValidator.taskList;
   }
 });
-Object.defineProperty(exports, "taskList_with_flexible_first_child", {
-  enumerable: true,
-  get: function get() {
-    return _schemaValidator.taskList_with_flexible_first_child;
-  }
-});
 Object.defineProperty(exports, "text", {
   enumerable: true,
   get: function get() {

package/dist/cjs/validator/validator.js

@@ -12,11 +12,11 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var specs = _interopRequireWildcard(require("./specs"));
 var _utils = require("./utils");
 var _extractAllowedContent = require("./extractAllowedContent");
 var _rules = require("./rules");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _excluded = ["items"]; // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -67,9 +67,6 @@ var partitionObject = function partitionObject(obj, predicate) {
  * Checks if a spec is a variant spec.
  * A variant spec is an array where the first element is a string (base spec name)
  * and the second element is a ValidatorSpec object { props: { ... } }
- *
- * @param spec - The spec to check
- * @returns true if the spec is a variant spec, false otherwise
  */
 var isVariant = function isVariant(spec) {
   return (0, _typeof2.default)(spec) === 'object' && !!spec && 0 in spec && 1 in spec && typeof spec[0] === 'string' && (0, _typeof2.default)(spec[1]) === 'object';
@@ -80,19 +77,16 @@ var isVariant = function isVariant(spec) {
  * We denormalised the spec to save bundle size.
  */
 function createSpec(nodes, marks) {
+  var variantOverrides = getVariantSpecOverrides();
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return Object.keys(specs).reduce(function (newSpecs, k) {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     var spec = _objectSpread({}, specs[k]);
-    if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_flexible_list_schema', 'isEnabled', true) && isVariant(spec) &&
-    // Only apply to variants which are explicitly marked for override in `variantSpecOverrides`
-    Object.values(variantSpecOverrides).includes(k)) {
-      // This allows the variant spec to also have the content normalization applied to it
+    if (isVariant(spec) && Object.values(variantOverrides).includes(k)) {
       // When the spec is a variant it will be in the form of ['base_spec_name', { props: { ... } }]
-      // So the actual validator spec of the variant will be the second item in the array
-      // We also need to shallow clone this to ensure we don't mutate the original spec
+      // The actual validator spec of the variant will be the second item in the array
       spec = _objectSpread({}, spec[1]);
     }
     if (spec.props) {
@@ -212,6 +206,10 @@ function getOptionsForType(type, list) {
 var isValidatorSpecAttrs = function isValidatorSpecAttrs(spec) {
   return !!spec.props;
 };
+
+/**
+ * Validates attributes against the provided attribute specification.
+ */
 function validateAttrs(spec, value) {
   if (!(0, _utils.isDefined)(value)) {
     return !!spec.optional;
@@ -350,21 +348,26 @@ var unsupportedNodeAttributesContent = function unsupportedNodeAttributesContent
 };
 
 /**
- * Map of base spec names to a preferred variant spec that should be used in their place during validation.
+ * Returns a map of base spec names to a preferred variant spec that should be used
+ * in their place during validation. Implemented as a getter function so that entries
+ * can be conditionally included behind feature gates.
  *
  * WARNING: The variant spec must be a strict superset of the base spec, i.e. any content valid
- * under the base spec must also be valid under the variant
+ * under the base spec must also be valid under the variant.
  */
-var variantSpecOverrides = {
-  listItem: 'listItem_with_flexible_first_child',
-  taskList: 'taskList_with_flexible_first_child'
+var getVariantSpecOverrides = function getVariantSpecOverrides() {
+  var overrides = {};
+  if ((0, _expValEquals.expValEquals)('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
+    overrides.codeBlock = 'codeBlock_with_extended_attributes';
+  }
+  return overrides;
 };
 
 /**
- * Replaces base validator specs with their designated variant overrides
+ * Replaces base validator specs with their designated variant overrides.
  */
 var applyVariantSpecOverrides = function applyVariantSpecOverrides(validatorSpecs) {
-  Object.entries(variantSpecOverrides).forEach(function (_ref2) {
+  Object.entries(getVariantSpecOverrides()).forEach(function (_ref2) {
     var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
       base = _ref3[0],
       variant = _ref3[1];
@@ -376,11 +379,14 @@ var applyVariantSpecOverrides = function applyVariantSpecOverrides(validatorSpec
     }
   });
 };
+
+/**
+ * Creates a validator function for ADF documents.
+ * Validates document structure against the ADF specification.
+ */
 function validator(nodes, marks, options) {
   var validatorSpecs = createSpec(nodes, marks);
-  if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_flexible_list_schema', 'isEnabled', true)) {
-    applyVariantSpecOverrides(validatorSpecs);
-  }
+  applyVariantSpecOverrides(validatorSpecs);
   var _ref4 = options || {},
     _ref4$mode = _ref4.mode,
     mode = _ref4$mode === void 0 ? 'strict' : _ref4$mode,

package/dist/es2019/validator/specs/index.js

@@ -1,2 +1,2 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { alignment, annotation, backgroundColor, blockCard, block_content, blockRootOnly, blockquote, blockTaskItem, bodiedExtension, bodiedExtension_with_marks, border, breakout, bulletList, caption, code, codeBlock, codeBlock_root_only, text_with_no_marks, confluenceInlineComment, dataConsumer, date, decisionItem, decisionList, doc, em, embedCard, emoji, expand, expand_root_only, extension, extensionFrame, extension_with_marks, fontSize, fragment, hardBreak, heading, heading_with_alignment, heading_with_indentation, heading_with_no_marks, indentation, inlineCard, inlineExtension, inlineExtension_with_marks, inline_content, layoutColumn, layoutSection, layoutSection_full, layoutSection_with_single_column, link, listItem, listItem_with_flexible_first_child, media, mediaGroup, mediaInline, mediaSingle, mediaSingle_caption, mediaSingle_full, mention, multiBodiedExtension, nestedExpand, nestedExpand_content, nestedExpand_with_no_marks, non_nestable_block_content, orderedList, panel, paragraph, paragraph_with_alignment, paragraph_with_font_size, paragraph_with_font_size_and_alignment, paragraph_with_font_size_and_indentation, paragraph_with_indentation, paragraph_with_no_marks, placeholder, rule, status, strike, strong, subsup, table, tableCell, tableHeader, tableRow, taskItem, taskList, taskList_with_flexible_first_child, text, textColor, text_code_inline, text_formatted, text_link_inline, underline, syncBlock, bodiedSyncBlock } from '@atlaskit/adf-schema/schema-validator';
+export { alignment, annotation, backgroundColor, blockCard, block_content, blockRootOnly, blockquote, blockTaskItem, bodiedExtension, bodiedExtension_with_marks, border, breakout, bulletList, caption, code, codeBlock, codeBlock_root_only, codeBlock_with_extended_attributes, codeBlock_root_only_with_extended_attributes, text_with_no_marks, confluenceInlineComment, dataConsumer, date, decisionItem, decisionList, doc, em, embedCard, emoji, expand, expand_root_only, extension, extensionFrame, extension_with_marks, fontSize, fragment, hardBreak, heading, heading_with_alignment, heading_with_indentation, heading_with_no_marks, indentation, inlineCard, inlineExtension, inlineExtension_with_marks, inline_content, layoutColumn, layoutSection, layoutSection_full, layoutSection_with_single_column, link, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingle_caption, mediaSingle_full, mention, multiBodiedExtension, nestedExpand, nestedExpand_content, nestedExpand_with_no_marks, non_nestable_block_content, orderedList, panel, paragraph, paragraph_with_alignment, paragraph_with_font_size, paragraph_with_font_size_and_alignment, paragraph_with_font_size_and_indentation, paragraph_with_indentation, paragraph_with_no_marks, placeholder, rule, status, strike, strong, subsup, table, tableCell, tableHeader, tableRow, taskItem, taskList, text, textColor, text_code_inline, text_formatted, text_link_inline, underline, syncBlock, bodiedSyncBlock } from '@atlaskit/adf-schema/schema-validator';

package/dist/es2019/validator/validator.js

@@ -1,10 +1,10 @@
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
 import * as specs from './specs';
 import { copy, isBoolean, isDefined, isInteger, isNumber, isPlainObject, isString, makeArray } from './utils';
 import { extractAllowedContent } from './extractAllowedContent';
 import { validatorFnMap } from './rules';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -47,9 +47,6 @@ const partitionObject = (obj, predicate) => Object.keys(obj).reduce((acc, key) =
  * Checks if a spec is a variant spec.
  * A variant spec is an array where the first element is a string (base spec name)
  * and the second element is a ValidatorSpec object { props: { ... } }
- *
- * @param spec - The spec to check
- * @returns true if the spec is a variant spec, false otherwise
  */
 const isVariant = spec => typeof spec === 'object' && !!spec && 0 in spec && 1 in spec && typeof spec[0] === 'string' && typeof spec[1] === 'object';
 
@@ -58,6 +55,7 @@ const isVariant = spec => typeof spec === 'object' && !!spec && 0 in spec && 1 i
  * We denormalised the spec to save bundle size.
  */
 export function createSpec(nodes, marks) {
+  const variantOverrides = getVariantSpecOverrides();
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return Object.keys(specs).reduce((newSpecs, k) => {
@@ -66,13 +64,9 @@ export function createSpec(nodes, marks) {
     let spec = {
       ...specs[k]
     };
-    if (expValEqualsNoExposure('platform_editor_flexible_list_schema', 'isEnabled', true) && isVariant(spec) &&
-    // Only apply to variants which are explicitly marked for override in `variantSpecOverrides`
-    Object.values(variantSpecOverrides).includes(k)) {
-      // This allows the variant spec to also have the content normalization applied to it
+    if (isVariant(spec) && Object.values(variantOverrides).includes(k)) {
       // When the spec is a variant it will be in the form of ['base_spec_name', { props: { ... } }]
-      // So the actual validator spec of the variant will be the second item in the array
-      // We also need to shallow clone this to ensure we don't mutate the original spec
+      // The actual validator spec of the variant will be the second item in the array
       spec = {
         ...spec[1]
       };
@@ -183,6 +177,10 @@ function getOptionsForType(type, list) {
 const isValidatorSpecAttrs = spec => {
   return !!spec.props;
 };
+
+/**
+ * Validates attributes against the provided attribute specification.
+ */
 export function validateAttrs(spec, value) {
   if (!isDefined(value)) {
     return !!spec.optional;
@@ -311,21 +309,26 @@ const unsupportedNodeAttributesContent = (entity, errorCode, invalidAttributes,
 };
 
 /**
- * Map of base spec names to a preferred variant spec that should be used in their place during validation.
+ * Returns a map of base spec names to a preferred variant spec that should be used
+ * in their place during validation. Implemented as a getter function so that entries
+ * can be conditionally included behind feature gates.
  *
  * WARNING: The variant spec must be a strict superset of the base spec, i.e. any content valid
- * under the base spec must also be valid under the variant
+ * under the base spec must also be valid under the variant.
  */
-const variantSpecOverrides = {
-  listItem: 'listItem_with_flexible_first_child',
-  taskList: 'taskList_with_flexible_first_child'
+const getVariantSpecOverrides = () => {
+  const overrides = {};
+  if (expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
+    overrides.codeBlock = 'codeBlock_with_extended_attributes';
+  }
+  return overrides;
 };
 
 /**
- * Replaces base validator specs with their designated variant overrides
+ * Replaces base validator specs with their designated variant overrides.
  */
 const applyVariantSpecOverrides = validatorSpecs => {
-  Object.entries(variantSpecOverrides).forEach(([base, variant]) => {
+  Object.entries(getVariantSpecOverrides()).forEach(([base, variant]) => {
     const baseSpec = validatorSpecs[base];
     const variantOverride = validatorSpecs[variant];
     if (baseSpec !== null && baseSpec !== void 0 && baseSpec.props && variantOverride !== null && variantOverride !== void 0 && variantOverride.props && typeof baseSpec.props === 'object' && typeof variantOverride.props === 'object') {
@@ -338,11 +341,14 @@ const applyVariantSpecOverrides = validatorSpecs => {
     }
   });
 };
+
+/**
+ * Creates a validator function for ADF documents.
+ * Validates document structure against the ADF specification.
+ */
 export function validator(nodes, marks, options) {
   const validatorSpecs = createSpec(nodes, marks);
-  if (expValEqualsNoExposure('platform_editor_flexible_list_schema', 'isEnabled', true)) {
-    applyVariantSpecOverrides(validatorSpecs);
-  }
+  applyVariantSpecOverrides(validatorSpecs);
   const {
     mode = 'strict',
     allowPrivateAttributes = false

package/dist/esm/validator/specs/index.js

@@ -1,2 +1,2 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
-export { alignment, annotation, backgroundColor, blockCard, block_content, blockRootOnly, blockquote, blockTaskItem, bodiedExtension, bodiedExtension_with_marks, border, breakout, bulletList, caption, code, codeBlock, codeBlock_root_only, text_with_no_marks, confluenceInlineComment, dataConsumer, date, decisionItem, decisionList, doc, em, embedCard, emoji, expand, expand_root_only, extension, extensionFrame, extension_with_marks, fontSize, fragment, hardBreak, heading, heading_with_alignment, heading_with_indentation, heading_with_no_marks, indentation, inlineCard, inlineExtension, inlineExtension_with_marks, inline_content, layoutColumn, layoutSection, layoutSection_full, layoutSection_with_single_column, link, listItem, listItem_with_flexible_first_child, media, mediaGroup, mediaInline, mediaSingle, mediaSingle_caption, mediaSingle_full, mention, multiBodiedExtension, nestedExpand, nestedExpand_content, nestedExpand_with_no_marks, non_nestable_block_content, orderedList, panel, paragraph, paragraph_with_alignment, paragraph_with_font_size, paragraph_with_font_size_and_alignment, paragraph_with_font_size_and_indentation, paragraph_with_indentation, paragraph_with_no_marks, placeholder, rule, status, strike, strong, subsup, table, tableCell, tableHeader, tableRow, taskItem, taskList, taskList_with_flexible_first_child, text, textColor, text_code_inline, text_formatted, text_link_inline, underline, syncBlock, bodiedSyncBlock } from '@atlaskit/adf-schema/schema-validator';
+export { alignment, annotation, backgroundColor, blockCard, block_content, blockRootOnly, blockquote, blockTaskItem, bodiedExtension, bodiedExtension_with_marks, border, breakout, bulletList, caption, code, codeBlock, codeBlock_root_only, codeBlock_with_extended_attributes, codeBlock_root_only_with_extended_attributes, text_with_no_marks, confluenceInlineComment, dataConsumer, date, decisionItem, decisionList, doc, em, embedCard, emoji, expand, expand_root_only, extension, extensionFrame, extension_with_marks, fontSize, fragment, hardBreak, heading, heading_with_alignment, heading_with_indentation, heading_with_no_marks, indentation, inlineCard, inlineExtension, inlineExtension_with_marks, inline_content, layoutColumn, layoutSection, layoutSection_full, layoutSection_with_single_column, link, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingle_caption, mediaSingle_full, mention, multiBodiedExtension, nestedExpand, nestedExpand_content, nestedExpand_with_no_marks, non_nestable_block_content, orderedList, panel, paragraph, paragraph_with_alignment, paragraph_with_font_size, paragraph_with_font_size_and_alignment, paragraph_with_font_size_and_indentation, paragraph_with_indentation, paragraph_with_no_marks, placeholder, rule, status, strike, strong, subsup, table, tableCell, tableHeader, tableRow, taskItem, taskList, text, textColor, text_code_inline, text_formatted, text_link_inline, underline, syncBlock, bodiedSyncBlock } from '@atlaskit/adf-schema/schema-validator';

package/dist/esm/validator/validator.js

@@ -8,13 +8,13 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 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; }
 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 { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
 import * as specs from './specs';
 import { copy, isBoolean, isDefined, isInteger, isNumber, isPlainObject, isString, makeArray } from './utils';
 import { extractAllowedContent } from './extractAllowedContent';
 import { validatorFnMap } from './rules';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -58,9 +58,6 @@ var partitionObject = function partitionObject(obj, predicate) {
  * Checks if a spec is a variant spec.
  * A variant spec is an array where the first element is a string (base spec name)
  * and the second element is a ValidatorSpec object { props: { ... } }
- *
- * @param spec - The spec to check
- * @returns true if the spec is a variant spec, false otherwise
  */
 var isVariant = function isVariant(spec) {
   return _typeof(spec) === 'object' && !!spec && 0 in spec && 1 in spec && typeof spec[0] === 'string' && _typeof(spec[1]) === 'object';
@@ -71,19 +68,16 @@ var isVariant = function isVariant(spec) {
  * We denormalised the spec to save bundle size.
  */
 export function createSpec(nodes, marks) {
+  var variantOverrides = getVariantSpecOverrides();
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return Object.keys(specs).reduce(function (newSpecs, k) {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     var spec = _objectSpread({}, specs[k]);
-    if (expValEqualsNoExposure('platform_editor_flexible_list_schema', 'isEnabled', true) && isVariant(spec) &&
-    // Only apply to variants which are explicitly marked for override in `variantSpecOverrides`
-    Object.values(variantSpecOverrides).includes(k)) {
-      // This allows the variant spec to also have the content normalization applied to it
+    if (isVariant(spec) && Object.values(variantOverrides).includes(k)) {
       // When the spec is a variant it will be in the form of ['base_spec_name', { props: { ... } }]
-      // So the actual validator spec of the variant will be the second item in the array
-      // We also need to shallow clone this to ensure we don't mutate the original spec
+      // The actual validator spec of the variant will be the second item in the array
       spec = _objectSpread({}, spec[1]);
     }
     if (spec.props) {
@@ -203,6 +197,10 @@ function getOptionsForType(type, list) {
 var isValidatorSpecAttrs = function isValidatorSpecAttrs(spec) {
   return !!spec.props;
 };
+
+/**
+ * Validates attributes against the provided attribute specification.
+ */
 export function validateAttrs(spec, value) {
   if (!isDefined(value)) {
     return !!spec.optional;
@@ -341,21 +339,26 @@ var unsupportedNodeAttributesContent = function unsupportedNodeAttributesContent
 };
 
 /**
- * Map of base spec names to a preferred variant spec that should be used in their place during validation.
+ * Returns a map of base spec names to a preferred variant spec that should be used
+ * in their place during validation. Implemented as a getter function so that entries
+ * can be conditionally included behind feature gates.
  *
  * WARNING: The variant spec must be a strict superset of the base spec, i.e. any content valid
- * under the base spec must also be valid under the variant
+ * under the base spec must also be valid under the variant.
  */
-var variantSpecOverrides = {
-  listItem: 'listItem_with_flexible_first_child',
-  taskList: 'taskList_with_flexible_first_child'
+var getVariantSpecOverrides = function getVariantSpecOverrides() {
+  var overrides = {};
+  if (expValEquals('platform_editor_code_block_q4_lovability', 'isEnabled', true)) {
+    overrides.codeBlock = 'codeBlock_with_extended_attributes';
+  }
+  return overrides;
 };
 
 /**
- * Replaces base validator specs with their designated variant overrides
+ * Replaces base validator specs with their designated variant overrides.
  */
 var applyVariantSpecOverrides = function applyVariantSpecOverrides(validatorSpecs) {
-  Object.entries(variantSpecOverrides).forEach(function (_ref2) {
+  Object.entries(getVariantSpecOverrides()).forEach(function (_ref2) {
     var _ref3 = _slicedToArray(_ref2, 2),
       base = _ref3[0],
       variant = _ref3[1];
@@ -367,11 +370,14 @@ var applyVariantSpecOverrides = function applyVariantSpecOverrides(validatorSpec
     }
   });
 };
+
+/**
+ * Creates a validator function for ADF documents.
+ * Validates document structure against the ADF specification.
+ */
 export function validator(nodes, marks, options) {
   var validatorSpecs = createSpec(nodes, marks);
-  if (expValEqualsNoExposure('platform_editor_flexible_list_schema', 'isEnabled', true)) {
-    applyVariantSpecOverrides(validatorSpecs);
-  }
+  applyVariantSpecOverrides(validatorSpecs);
   var _ref4 = options || {},
     _ref4$mode = _ref4.mode,
     mode = _ref4$mode === void 0 ? 'strict' : _ref4$mode,

package/dist/types/validator/specs/index.d.ts

@@ -1 +1 @@
-export { alignment, annotation, backgroundColor, blockCard, block_content, blockRootOnly, blockquote, blockTaskItem, bodiedExtension, bodiedExtension_with_marks, border, breakout, bulletList, caption, code, codeBlock, codeBlock_root_only, text_with_no_marks, confluenceInlineComment, dataConsumer, date, decisionItem, decisionList, doc, em, embedCard, emoji, expand, expand_root_only, extension, extensionFrame, extension_with_marks, fontSize, fragment, hardBreak, heading, heading_with_alignment, heading_with_indentation, heading_with_no_marks, indentation, inlineCard, inlineExtension, inlineExtension_with_marks, inline_content, layoutColumn, layoutSection, layoutSection_full, layoutSection_with_single_column, link, listItem, listItem_with_flexible_first_child, media, mediaGroup, mediaInline, mediaSingle, mediaSingle_caption, mediaSingle_full, mention, multiBodiedExtension, nestedExpand, nestedExpand_content, nestedExpand_with_no_marks, non_nestable_block_content, orderedList, panel, paragraph, paragraph_with_alignment, paragraph_with_font_size, paragraph_with_font_size_and_alignment, paragraph_with_font_size_and_indentation, paragraph_with_indentation, paragraph_with_no_marks, placeholder, rule, status, strike, strong, subsup, table, tableCell, tableHeader, tableRow, taskItem, taskList, taskList_with_flexible_first_child, text, textColor, text_code_inline, text_formatted, text_link_inline, underline, syncBlock, bodiedSyncBlock, } from '@atlaskit/adf-schema/schema-validator';
+export { alignment, annotation, backgroundColor, blockCard, block_content, blockRootOnly, blockquote, blockTaskItem, bodiedExtension, bodiedExtension_with_marks, border, breakout, bulletList, caption, code, codeBlock, codeBlock_root_only, codeBlock_with_extended_attributes, codeBlock_root_only_with_extended_attributes, text_with_no_marks, confluenceInlineComment, dataConsumer, date, decisionItem, decisionList, doc, em, embedCard, emoji, expand, expand_root_only, extension, extensionFrame, extension_with_marks, fontSize, fragment, hardBreak, heading, heading_with_alignment, heading_with_indentation, heading_with_no_marks, indentation, inlineCard, inlineExtension, inlineExtension_with_marks, inline_content, layoutColumn, layoutSection, layoutSection_full, layoutSection_with_single_column, link, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingle_caption, mediaSingle_full, mention, multiBodiedExtension, nestedExpand, nestedExpand_content, nestedExpand_with_no_marks, non_nestable_block_content, orderedList, panel, paragraph, paragraph_with_alignment, paragraph_with_font_size, paragraph_with_font_size_and_alignment, paragraph_with_font_size_and_indentation, paragraph_with_indentation, paragraph_with_no_marks, placeholder, rule, status, strike, strong, subsup, table, tableCell, tableHeader, tableRow, taskItem, taskList, text, textColor, text_code_inline, text_formatted, text_link_inline, underline, syncBlock, bodiedSyncBlock, } from '@atlaskit/adf-schema/schema-validator';

package/dist/types/validator/validator.d.ts

@@ -4,5 +4,12 @@ import type { AttributesSpec, CreateSpecReturn, Validate, ValidationOptions } fr
  * We denormalised the spec to save bundle size.
  */
 export declare function createSpec(nodes?: Array<string>, marks?: Array<string>): CreateSpecReturn;
+/**
+ * Validates attributes against the provided attribute specification.
+ */
 export declare function validateAttrs<T>(spec: AttributesSpec, value: T): boolean;
+/**
+ * Creates a validator function for ADF documents.
+ * Validates document structure against the ADF specification.
+ */
 export declare function validator(nodes?: Array<string>, marks?: Array<string>, options?: ValidationOptions): Validate;

package/dist/types-ts4.5/validator/specs/index.d.ts

@@ -1 +1 @@
-export { alignment, annotation, backgroundColor, blockCard, block_content, blockRootOnly, blockquote, blockTaskItem, bodiedExtension, bodiedExtension_with_marks, border, breakout, bulletList, caption, code, codeBlock, codeBlock_root_only, text_with_no_marks, confluenceInlineComment, dataConsumer, date, decisionItem, decisionList, doc, em, embedCard, emoji, expand, expand_root_only, extension, extensionFrame, extension_with_marks, fontSize, fragment, hardBreak, heading, heading_with_alignment, heading_with_indentation, heading_with_no_marks, indentation, inlineCard, inlineExtension, inlineExtension_with_marks, inline_content, layoutColumn, layoutSection, layoutSection_full, layoutSection_with_single_column, link, listItem, listItem_with_flexible_first_child, media, mediaGroup, mediaInline, mediaSingle, mediaSingle_caption, mediaSingle_full, mention, multiBodiedExtension, nestedExpand, nestedExpand_content, nestedExpand_with_no_marks, non_nestable_block_content, orderedList, panel, paragraph, paragraph_with_alignment, paragraph_with_font_size, paragraph_with_font_size_and_alignment, paragraph_with_font_size_and_indentation, paragraph_with_indentation, paragraph_with_no_marks, placeholder, rule, status, strike, strong, subsup, table, tableCell, tableHeader, tableRow, taskItem, taskList, taskList_with_flexible_first_child, text, textColor, text_code_inline, text_formatted, text_link_inline, underline, syncBlock, bodiedSyncBlock, } from '@atlaskit/adf-schema/schema-validator';
+export { alignment, annotation, backgroundColor, blockCard, block_content, blockRootOnly, blockquote, blockTaskItem, bodiedExtension, bodiedExtension_with_marks, border, breakout, bulletList, caption, code, codeBlock, codeBlock_root_only, codeBlock_with_extended_attributes, codeBlock_root_only_with_extended_attributes, text_with_no_marks, confluenceInlineComment, dataConsumer, date, decisionItem, decisionList, doc, em, embedCard, emoji, expand, expand_root_only, extension, extensionFrame, extension_with_marks, fontSize, fragment, hardBreak, heading, heading_with_alignment, heading_with_indentation, heading_with_no_marks, indentation, inlineCard, inlineExtension, inlineExtension_with_marks, inline_content, layoutColumn, layoutSection, layoutSection_full, layoutSection_with_single_column, link, listItem, media, mediaGroup, mediaInline, mediaSingle, mediaSingle_caption, mediaSingle_full, mention, multiBodiedExtension, nestedExpand, nestedExpand_content, nestedExpand_with_no_marks, non_nestable_block_content, orderedList, panel, paragraph, paragraph_with_alignment, paragraph_with_font_size, paragraph_with_font_size_and_alignment, paragraph_with_font_size_and_indentation, paragraph_with_indentation, paragraph_with_no_marks, placeholder, rule, status, strike, strong, subsup, table, tableCell, tableHeader, tableRow, taskItem, taskList, text, textColor, text_code_inline, text_formatted, text_link_inline, underline, syncBlock, bodiedSyncBlock, } from '@atlaskit/adf-schema/schema-validator';

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

@@ -4,5 +4,12 @@ import type { AttributesSpec, CreateSpecReturn, Validate, ValidationOptions } fr
  * We denormalised the spec to save bundle size.
  */
 export declare function createSpec(nodes?: Array<string>, marks?: Array<string>): CreateSpecReturn;
+/**
+ * Validates attributes against the provided attribute specification.
+ */
 export declare function validateAttrs<T>(spec: AttributesSpec, value: T): boolean;
+/**
+ * Creates a validator function for ADF documents.
+ * Validates document structure against the ADF specification.
+ */
 export declare function validator(nodes?: Array<string>, marks?: Array<string>, options?: ValidationOptions): Validate;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/adf-utils",
-	"version": "19.27.47",
+	"version": "19.29.0",
 	"description": "Set of utilities to traverse, modify and create ADF documents.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -26,9 +26,9 @@
 		"team": "Editor: Collaboration"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^52.6.0",
+		"@atlaskit/adf-schema": "^52.8.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^73.0.0",
+		"@atlaskit/tmp-editor-statsig": "^74.7.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"devDependencies": {