@atlaskit/adf-schema 55.0.1 → 55.1.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/adf-schema
 
+## 55.1.0
+
+### Minor Changes
+
+- [`100d833307949`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/100d833307949) -
+  Allow panel_c1 inside bodied sync blocks
+
+### Patch Changes
+
+- Updated dependencies
+
+## 55.0.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 55.0.1
 
 ### Patch Changes

package/dist/cjs/next-schema/generated/nodeTypes.js

@@ -130,7 +130,7 @@ var bodiedExtensionWithMarks = exports.bodiedExtensionWithMarks = (0, _createPMS
   isolating: true
 });
 var bodiedSyncBlock = exports.bodiedSyncBlock = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
-  content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | rule | table | taskList | unsupportedBlock)+',
+  content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | panel_c1 | rule | table | taskList | unsupportedBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation breakout link fragment',
   attrs: {
     resourceId: {

package/dist/cjs/next-schema/nodes/bodiedSyncBlock.js

@@ -40,7 +40,7 @@ var bodiedSyncBlock = exports.bodiedSyncBlock = (0, _adfSchemaGenerator.adfNode)
       default: ''
     }
   },
-  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _blockCard.blockCard, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _list.bulletList, _codeBlock.codeBlock, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _decisionList.decisionList, _embedCard.embedCard, _expand.expand, _heading.heading, _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _list.orderedList, _panel.panel, _rule.rule, _tableNodes.table,
+  content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _blockCard.blockCard, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _list.bulletList, _codeBlock.codeBlock, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _decisionList.decisionList, _embedCard.embedCard, _expand.expand, _heading.heading, _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _layoutSection.layoutSection, _layoutSection.layoutSection.use('with_single_column'), _layoutSection.layoutSection.use('full'), _mediaGroup.mediaGroup, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _list.orderedList, _panel.panel, _panel.panel.use('c1'), _rule.rule, _tableNodes.table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   _tableNodes.table.use('with_nested_table'), _task.taskList, _unsupportedBlock.unsupportedBlock))]
 });

package/dist/cjs/next-schema/nodes/panel.js

@@ -60,5 +60,6 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
   // panel_c1 allows all standard panel content plus table (wired via addContent
   // in full-schema.adf.ts to avoid a circular module import).
   content: [(0, _adfSchemaGenerator.$onePlus)(_adfSchemaGenerator.$or.apply(void 0, panelContent.concat([_extension.extension.use('with_marks')])))],
-  ignore: ['json-schema', 'validator-spec']
+  ignore: ['json-schema', 'validator-spec'],
+  preserveVariantNameInPm: true
 });

package/dist/cjs/schema/nodes/panel.js

@@ -23,6 +23,9 @@ var PanelType = exports.PanelType = /*#__PURE__*/function (PanelType) {
 /**
  * @name panel_node
  */
+/**
+ * @name panel_c1_node
+ */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 var getDomAttrs = function getDomAttrs(nodeAttrs) {
   var attrs = {

package/dist/cjs/schema/sanitizeNodes.js

@@ -29,8 +29,12 @@ function sanitizeNodeSpecContent(nodes, rawContent) {
   // @ts-ignore TS1501: This regular expression flag is only available when targeting 'es6' or later.
   var content = rawContent.replace(/(?:[\0-\/:-@\[-\^`\{-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])/g, ' ');
   var contentKeys = content.split(' ');
-  var unsupportedContentKeys = contentKeys.filter(function (contentKey) {
+  var unsupportedContentKeys = Array.from(new Set(contentKeys.filter(function (contentKey) {
     return !isContentSupported(nodes, contentKey);
+  }))
+  // Remove longer variant names first so base names like `panel` don't partially strip `panel_c1`.
+  ).sort(function (a, b) {
+    return b.length - a.length;
   });
   return unsupportedContentKeys.reduce(function (newContent, nodeName) {
     return sanitizedContent(newContent, nodeName);

package/dist/es2019/next-schema/generated/nodeTypes.js

@@ -124,7 +124,7 @@ export const bodiedExtensionWithMarks = createPMNodeSpecFactory({
   isolating: true
 });
 export const bodiedSyncBlock = createPMNodeSpecFactory({
-  content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | rule | table | taskList | unsupportedBlock)+',
+  content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | panel_c1 | rule | table | taskList | unsupportedBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation breakout link fragment',
   attrs: {
     resourceId: {

package/dist/es2019/next-schema/nodes/bodiedSyncBlock.js

@@ -34,7 +34,7 @@ export const bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
       default: ''
     }
   },
-  content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList, panel, rule, table,
+  content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList, panel, panel.use('c1'), rule, table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   table.use('with_nested_table'), taskList, unsupportedBlock))]
 });

package/dist/es2019/next-schema/nodes/panel.js

@@ -54,5 +54,6 @@ export const panel = adfNode('panel').define({
   // panel_c1 allows all standard panel content plus table (wired via addContent
   // in full-schema.adf.ts to avoid a circular module import).
   content: [$onePlus($or(...panelContent, extension.use('with_marks')))],
-  ignore: ['json-schema', 'validator-spec']
+  ignore: ['json-schema', 'validator-spec'],
+  preserveVariantNameInPm: true
 });

package/dist/es2019/schema/nodes/panel.js

@@ -15,6 +15,10 @@ export let PanelType = /*#__PURE__*/function (PanelType) {
  * @name panel_node
  */
 
+/**
+ * @name panel_c1_node
+ */
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const getDomAttrs = nodeAttrs => {
   const attrs = {

package/dist/es2019/schema/sanitizeNodes.js

@@ -19,7 +19,9 @@ function sanitizeNodeSpecContent(nodes, rawContent) {
   // @ts-ignore TS1501: This regular expression flag is only available when targeting 'es6' or later.
   const content = rawContent.replace(/\W/gu, ' ');
   const contentKeys = content.split(' ');
-  const unsupportedContentKeys = contentKeys.filter(contentKey => !isContentSupported(nodes, contentKey));
+  const unsupportedContentKeys = Array.from(new Set(contentKeys.filter(contentKey => !isContentSupported(nodes, contentKey)))
+  // Remove longer variant names first so base names like `panel` don't partially strip `panel_c1`.
+  ).sort((a, b) => b.length - a.length);
   return unsupportedContentKeys.reduce((newContent, nodeName) => sanitizedContent(newContent, nodeName), rawContent);
 }
 

package/dist/esm/next-schema/generated/nodeTypes.js

@@ -124,7 +124,7 @@ export var bodiedExtensionWithMarks = createPMNodeSpecFactory({
   isolating: true
 });
 export var bodiedSyncBlock = createPMNodeSpecFactory({
-  content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | rule | table | taskList | unsupportedBlock)+',
+  content: '(paragraph | blockCard | blockquote | bulletList | codeBlock | confluenceUnsupportedBlock | decisionList | embedCard | expand | heading | layoutSection | mediaGroup | mediaSingle | orderedList | panel | panel_c1 | rule | table | taskList | unsupportedBlock)+',
   marks: 'unsupportedMark unsupportedNodeAttribute fontSize alignment indentation breakout link fragment',
   attrs: {
     resourceId: {

package/dist/esm/next-schema/nodes/bodiedSyncBlock.js

@@ -34,7 +34,7 @@ export var bodiedSyncBlock = adfNode('bodiedSyncBlock').define({
       default: ''
     }
   },
-  content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList, panel, rule, table,
+  content: [$onePlus($or(paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), blockCard, blockquote, blockquote.use('legacy'), bulletList, codeBlock, confluenceUnsupportedBlock, decisionList, embedCard, expand, heading, heading.use('with_alignment'), heading.use('with_indentation'), heading.use('with_no_marks'), layoutSection, layoutSection.use('with_single_column'), layoutSection.use('full'), mediaGroup, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), orderedList, panel, panel.use('c1'), rule, table,
   // @ts-expect-error - types don't deal well with circular references for the variant
   table.use('with_nested_table'), taskList, unsupportedBlock))]
 });

package/dist/esm/next-schema/nodes/panel.js

@@ -54,5 +54,6 @@ export var panel = adfNode('panel').define({
   // panel_c1 allows all standard panel content plus table (wired via addContent
   // in full-schema.adf.ts to avoid a circular module import).
   content: [$onePlus($or.apply(void 0, panelContent.concat([extension.use('with_marks')])))],
-  ignore: ['json-schema', 'validator-spec']
+  ignore: ['json-schema', 'validator-spec'],
+  preserveVariantNameInPm: true
 });

package/dist/esm/schema/nodes/panel.js

@@ -18,6 +18,10 @@ export var PanelType = /*#__PURE__*/function (PanelType) {
  * @name panel_node
  */
 
+/**
+ * @name panel_c1_node
+ */
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 var getDomAttrs = function getDomAttrs(nodeAttrs) {
   var attrs = {

package/dist/esm/schema/sanitizeNodes.js

@@ -22,8 +22,12 @@ function sanitizeNodeSpecContent(nodes, rawContent) {
   // @ts-ignore TS1501: This regular expression flag is only available when targeting 'es6' or later.
   var content = rawContent.replace(/(?:[\0-\/:-@\[-\^`\{-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])/g, ' ');
   var contentKeys = content.split(' ');
-  var unsupportedContentKeys = contentKeys.filter(function (contentKey) {
+  var unsupportedContentKeys = Array.from(new Set(contentKeys.filter(function (contentKey) {
     return !isContentSupported(nodes, contentKey);
+  }))
+  // Remove longer variant names first so base names like `panel` don't partially strip `panel_c1`.
+  ).sort(function (a, b) {
+    return b.length - a.length;
   });
   return unsupportedContentKeys.reduce(function (newContent, nodeName) {
     return sanitizedContent(newContent, nodeName);

package/dist/types/next-schema/generated/nodeTypes.d.ts

@@ -91,7 +91,7 @@ export type BodiedExtensionWithMarksNode = PMNode & BodiedExtensionWithMarksDefi
 export declare const bodiedExtensionWithMarks: PMNodeSpecFactoryInstance<BodiedExtensionWithMarksNode>;
 export interface BodiedSyncBlockDefinition {
     type: 'bodiedSyncBlock';
-    content: Array<BlockCardDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BulletListDefinition | CodeBlockDefinition | ConfluenceUnsupportedBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExpandDefinition | HeadingDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | LayoutSectionDefinition | LayoutSectionFullDefinition | LayoutSectionWithSingleColumnStage0Definition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | OrderedListDefinition | PanelDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TableWithNestedTableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
+    content: Array<BlockCardDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BulletListDefinition | CodeBlockDefinition | ConfluenceUnsupportedBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExpandDefinition | HeadingDefinition | HeadingWithAlignmentDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | LayoutSectionDefinition | LayoutSectionFullDefinition | LayoutSectionWithSingleColumnStage0Definition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | OrderedListDefinition | PanelC1Definition | PanelDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TableWithNestedTableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
     marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         resourceId: string;

package/dist/types/schema/nodes/bodied-sync-block.d.ts

@@ -1,6 +1,6 @@
 import type { BreakoutMarkDefinition } from '../marks';
 import type { ExpandDefinition as Expand } from './expand';
-import type { PanelDefinition as Panel } from './panel';
+import type { PanelC1Definition as PanelC1, PanelDefinition as Panel } from './panel';
 import type { ParagraphDefinition as Paragraph, ParagraphWithMarksDefinition as ParagraphWithMarks } from './paragraph';
 import type { BlockQuoteDefinition as Blockquote } from './blockquote';
 import type { OrderedListDefinition as OrderedList, BulletListDefinition as BulletList } from './types/list';
@@ -39,7 +39,7 @@ export interface BodiedSyncBlockDefinition {
      // eslint-disable-next-line eslint-plugin-jsdoc/check-tag-names
      * @allowUnsupportedBlock true
      */
-    content: Array<Paragraph | ParagraphWithMarks | BlockCard | Blockquote | BulletList | CodeBlock | DecisionList | EmbedCard | Expand | Heading | HeadingWithMarks | LayoutSection | MediaGroup | MediaSingle | OrderedList | Panel | Rule | Table | TaskList>;
+    content: Array<Paragraph | ParagraphWithMarks | BlockCard | Blockquote | BulletList | CodeBlock | DecisionList | EmbedCard | Expand | Heading | HeadingWithMarks | LayoutSection | MediaGroup | MediaSingle | OrderedList | Panel | PanelC1 | Rule | Table | TaskList>;
     marks?: Array<BreakoutMarkDefinition>;
     type: 'bodiedSyncBlock';
 }

package/dist/types/schema/nodes/panel.d.ts

@@ -8,6 +8,7 @@ import type { MediaSingleDefinition as MediaSingle } from './media-single';
 import type { DecisionListDefinition as DecisionList } from './decision-list';
 import type { TaskListDefinition as TaskList } from './task-list';
 import type { RuleDefinition as Rule } from './rule';
+import type { TableDefinition as Table } from './tableNodes';
 import type { NodeSpec } from '@atlaskit/editor-prosemirror/model';
 export declare enum PanelType {
     INFO = "info",
@@ -40,6 +41,20 @@ export interface PanelDefinition {
     content: Array<Paragraph | Heading | OrderedList | BulletList | BlockCard | CodeBlock | MediaGroup | MediaSingle | DecisionList | TaskList | Rule>;
     type: 'panel';
 }
+/**
+ * @name panel_c1_node
+ */
+export interface PanelC1Definition {
+    attrs: PanelAttributes;
+    /**
+     // eslint-disable-next-line eslint-plugin-jsdoc/check-tag-names
+     * @minItems 1
+     // eslint-disable-next-line eslint-plugin-jsdoc/check-tag-names
+     * @allowUnsupportedBlock true
+     */
+    content: Array<Paragraph | Heading | OrderedList | BulletList | BlockCard | CodeBlock | MediaGroup | MediaSingle | DecisionList | TaskList | Rule | Table>;
+    type: 'panel';
+}
 export interface DOMAttributes {
     [propName: string]: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "55.0.1",
+	"version": "55.1.0",
 	"description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -37,9 +37,9 @@
 		"build:schema:all": "yarn build:schema:pm && yarn build:schema:json && yarn build:schema:validator"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema-generator": "^3.0.0",
+		"@atlaskit/adf-schema-generator": "^3.1.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
-		"@atlaskit/tmp-editor-statsig": "^105.0.0",
+		"@atlaskit/tmp-editor-statsig": "^106.0.0",
 		"@babel/runtime": "^7.0.0",
 		"css-color-names": "0.0.4",
 		"linkify-it": "^3.0.3",