@atlaskit/adf-schema 45.0.0 → 45.2.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/adf-schema
 
+## 45.2.0
+
+### Minor Changes
+
+- 0ad17eb: Remove DSL inconsistency for code block with text with new no mark text variant - no functionality changes.
+
+  Added: `text_with_no_marks` variant
+
+## 45.1.0
+
+### Minor Changes
+
+- aab5f4d: Validator will now correctly validate media inline nodes with the URL attribute
+
+### Patch Changes
+
+- 162fff6: Remove exception for uniqueId on codeBlock and allow property on validator and json schema.
+
 ## 45.0.0
 
 ### Major Changes

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedInline = exports.unsupportedBlock = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableWithNestedTable = exports.tableRowWithNestedTable = exports.tableRow = exports.tableHeaderWithNestedTable = exports.tableHeader = exports.tableCellWithNestedTable = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelWithNestedBlockquoteStage0 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItemWithNestedDecisionStage0 = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionFrameStage0 = exports.extension = exports.expandWithoutNestedExpand = exports.expandWithNoMark = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockRootOnly = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
+exports.unsupportedInline = exports.unsupportedBlock = exports.textWithNoMarks = exports.textFormatted = exports.textCodeInline = exports.text = exports.taskList = exports.taskItem = exports.tableWithNestedTable = exports.tableRowWithNestedTable = exports.tableRow = exports.tableHeaderWithNestedTable = exports.tableHeader = exports.tableCellWithNestedTable = exports.tableCell = exports.table = exports.statusStage0 = exports.status = exports.rule = exports.placeholder = exports.paragraphWithNoMarks = exports.paragraphWithIndentation = exports.paragraphWithAlignment = exports.paragraph = exports.panelWithNestedBlockquoteStage0 = exports.panel = exports.orderedList = exports.nestedExpandWithNoMarks = exports.nestedExpand = exports.multiBodiedExtensionStage0 = exports.mentionStage0 = exports.mention = exports.mediaSingleWidthType = exports.mediaSingleFull = exports.mediaSingleCaption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItemWithNestedDecisionStage0 = exports.listItem = exports.layoutSectionWithSingleColumnStage0 = exports.layoutSectionFull = exports.layoutSection = exports.layoutColumn = exports.inlineExtensionWithMarks = exports.inlineExtension = exports.inlineCardStage0 = exports.inlineCard = exports.image = exports.headingWithNoMarks = exports.headingWithIndentation = exports.headingWithAlignment = exports.heading = exports.hardBreak = exports.extensionWithMarks = exports.extensionFrameStage0 = exports.extension = exports.expandWithoutNestedExpand = exports.expandWithNoMark = exports.expand = exports.emojiStage0 = exports.emoji = exports.embedCard = exports.doc = exports.decisionList = exports.decisionItem = exports.dateStage0 = exports.date = exports.confluenceUnsupportedInline = exports.confluenceUnsupportedBlock = exports.confluenceJiraIssue = exports.codeBlockRootOnly = exports.codeBlock = exports.caption = exports.bulletList = exports.bodiedExtensionWithMarks = exports.bodiedExtension = exports.blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
 var _createPMSpecFactory = require("../../schema/createPMSpecFactory");
 /**
  * This file was automatically generated by @atlaskit/adf-schema-generator
@@ -1196,6 +1196,7 @@ var textCodeInline = exports.textCodeInline = (0, _createPMSpecFactory.createPMN
 var textFormatted = exports.textFormatted = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   group: 'inline'
 });
+var textWithNoMarks = exports.textWithNoMarks = (0, _createPMSpecFactory.createPMNodeSpecFactory)({});
 var unsupportedBlock = exports.unsupportedBlock = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
   group: 'block',
   atom: true,

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

@@ -26,28 +26,7 @@ var codeBlock = exports.codeBlock = (0, _adfSchemaGenerator.adfNode)('codeBlock'
     }
   },
   noMarks: true,
-  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_text.text, _unsupportedInline.unsupportedInline))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.attrs.props.uniqueId': {
-        remove: true,
-        reason: '@DSLCompatibilityException - uniqueId is missing in the existing validator spec'
-      },
-      'props.content.items': {
-        value: [['text', {
-          props: {
-            marks: {
-              items: [],
-              maxItems: 0,
-              optional: true,
-              type: 'array'
-            }
-          }
-        }]],
-        reason: '@DSLCompatibilityException - text variant is inlined, which is not supported by current transformation'
-      }
-    }
-  }
+  content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_text.text.use('with_no_marks'), _unsupportedInline.unsupportedInline))]
 })
 // Variant used root scenario where we have breakout
 .variant('root_only', {

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

@@ -97,13 +97,5 @@ var mediaInline = exports.mediaInline = (0, _adfSchemaGenerator.adfNode)('mediaI
       type: 'object',
       optional: true
     }
-  },
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.attrs.props.url': {
-        remove: true,
-        reason: '@DSLCompatibilityException - url is not specified on the validator spec (but it probably should be)'
-      }
-    }
   }
 });

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

@@ -21,6 +21,9 @@ var _confluenceInlineComment = require("../marks/confluenceInlineComment");
 var text = exports.text = (0, _adfSchemaGenerator.adfNode)('text').define({
   marks: [],
   hasEmptyMarks: true
+}).variant('with_no_marks', {
+  marks: [],
+  noMarks: true
 }).variant('link_inline', {
   marks: [_link.link],
   ignore: ['pm-spec', 'json-schema']

package/dist/cjs/validator-schema/generated/validatorSpec.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.underline = exports.text_link_inline = exports.text_formatted = exports.text_code_inline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_alignment = exports.paragraph = exports.panel_with_nested_blockquote = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem_with_nested_decision = exports.listItem = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_content = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.indentation = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_with_no_mark = exports.expand_with_breakout_mark = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceInlineComment = exports.codeBlock_root_only = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.annotation = exports.alignment = void 0;
+exports.underline = exports.text_with_no_marks = exports.text_link_inline = exports.text_formatted = exports.text_code_inline = exports.textColor = exports.text = exports.taskList = exports.taskItem = exports.tableRow = exports.tableHeader = exports.tableCell = exports.table = exports.subsup = exports.strong = exports.strike = exports.status = exports.rule = exports.placeholder = exports.paragraph_with_no_marks = exports.paragraph_with_indentation = exports.paragraph_with_alignment = exports.paragraph = exports.panel_with_nested_blockquote = exports.panel = exports.orderedList = exports.non_nestable_block_content = exports.nestedExpand_with_no_marks = exports.nestedExpand_content = exports.nestedExpand = exports.multiBodiedExtension = exports.mention = exports.mediaSingle_width_type = exports.mediaSingle_full = exports.mediaSingle_caption = exports.mediaSingle = exports.mediaInline = exports.mediaGroup = exports.media = exports.listItem_with_nested_decision = exports.listItem = exports.link = exports.layoutSection_with_single_column = exports.layoutSection_full = exports.layoutSection = exports.layoutColumn = exports.inline_content = exports.inlineExtension_with_marks = exports.inlineExtension = exports.inlineCard = exports.indentation = exports.heading_with_no_marks = exports.heading_with_indentation = exports.heading_with_alignment = exports.heading = exports.hardBreak = exports.fragment = exports.extension_with_marks = exports.extensionFrame = exports.extension = exports.expand_with_no_mark = exports.expand_with_breakout_mark = exports.expand = exports.emoji = exports.embedCard = exports.em = exports.doc = exports.decisionList = exports.decisionItem = exports.date = exports.dataConsumer = exports.confluenceInlineComment = exports.codeBlock_root_only = exports.codeBlock = exports.code = exports.caption = exports.bulletList = exports.breakout = exports.border = exports.bodiedExtension_with_marks = exports.bodiedExtension = exports.blockquote = exports.block_content = exports.blockRootOnly = exports.blockCard = exports.backgroundColor = exports.annotation = exports.alignment = void 0;
 var alignment = exports.alignment = {
   props: {
     type: {
@@ -281,22 +281,17 @@ var codeBlock = exports.codeBlock = {
         language: {
           type: 'string',
           optional: true
+        },
+        uniqueId: {
+          type: 'string',
+          optional: true
         }
       },
       optional: true
     },
     content: {
       type: 'array',
-      items: [['text', {
-        props: {
-          marks: {
-            items: [],
-            maxItems: 0,
-            optional: true,
-            type: 'array'
-          }
-        }
-      }]],
+      items: ['text_with_no_marks'],
       optional: true,
       allowUnsupportedInline: true
     }
@@ -1043,6 +1038,10 @@ var mediaInline = exports.mediaInline = {
           values: ['link', 'file', 'image'],
           optional: true
         },
+        url: {
+          type: 'string',
+          optional: true
+        },
         id: {
           minLength: 1,
           type: 'string'
@@ -1721,6 +1720,16 @@ var text_link_inline = exports.text_link_inline = ['text', {
     }
   }
 }];
+var text_with_no_marks = exports.text_with_no_marks = ['text', {
+  props: {
+    marks: {
+      type: 'array',
+      maxItems: 0,
+      items: [],
+      optional: true
+    }
+  }
+}];
 var textColor = exports.textColor = {
   props: {
     type: {

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

@@ -1190,6 +1190,7 @@ export const textCodeInline = createPMNodeSpecFactory({
 export const textFormatted = createPMNodeSpecFactory({
   group: 'inline'
 });
+export const textWithNoMarks = createPMNodeSpecFactory({});
 export const unsupportedBlock = createPMNodeSpecFactory({
   group: 'block',
   atom: true,

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

@@ -20,28 +20,7 @@ export const codeBlock = adfNode('codeBlock').define({
     }
   },
   noMarks: true,
-  content: [$zeroPlus($or(text, unsupportedInline))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.attrs.props.uniqueId': {
-        remove: true,
-        reason: '@DSLCompatibilityException - uniqueId is missing in the existing validator spec'
-      },
-      'props.content.items': {
-        value: [['text', {
-          props: {
-            marks: {
-              items: [],
-              maxItems: 0,
-              optional: true,
-              type: 'array'
-            }
-          }
-        }]],
-        reason: '@DSLCompatibilityException - text variant is inlined, which is not supported by current transformation'
-      }
-    }
-  }
+  content: [$zeroPlus($or(text.use('with_no_marks'), unsupportedInline))]
 })
 // Variant used root scenario where we have breakout
 .variant('root_only', {

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

@@ -91,13 +91,5 @@ export const mediaInline = adfNode('mediaInline').define({
       type: 'object',
       optional: true
     }
-  },
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.attrs.props.url': {
-        remove: true,
-        reason: '@DSLCompatibilityException - url is not specified on the validator spec (but it probably should be)'
-      }
-    }
   }
 });

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

@@ -15,6 +15,9 @@ import { confluenceInlineComment } from '../marks/confluenceInlineComment';
 export const text = adfNode('text').define({
   marks: [],
   hasEmptyMarks: true
+}).variant('with_no_marks', {
+  marks: [],
+  noMarks: true
 }).variant('link_inline', {
   marks: [link],
   ignore: ['pm-spec', 'json-schema']

package/dist/es2019/validator-schema/generated/validatorSpec.js

@@ -275,22 +275,17 @@ export const codeBlock = {
         language: {
           type: 'string',
           optional: true
+        },
+        uniqueId: {
+          type: 'string',
+          optional: true
         }
       },
       optional: true
     },
     content: {
       type: 'array',
-      items: [['text', {
-        props: {
-          marks: {
-            items: [],
-            maxItems: 0,
-            optional: true,
-            type: 'array'
-          }
-        }
-      }]],
+      items: ['text_with_no_marks'],
       optional: true,
       allowUnsupportedInline: true
     }
@@ -1037,6 +1032,10 @@ export const mediaInline = {
           values: ['link', 'file', 'image'],
           optional: true
         },
+        url: {
+          type: 'string',
+          optional: true
+        },
         id: {
           minLength: 1,
           type: 'string'
@@ -1715,6 +1714,16 @@ export const text_link_inline = ['text', {
     }
   }
 }];
+export const text_with_no_marks = ['text', {
+  props: {
+    marks: {
+      type: 'array',
+      maxItems: 0,
+      items: [],
+      optional: true
+    }
+  }
+}];
 export const textColor = {
   props: {
     type: {

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

@@ -1190,6 +1190,7 @@ export var textCodeInline = createPMNodeSpecFactory({
 export var textFormatted = createPMNodeSpecFactory({
   group: 'inline'
 });
+export var textWithNoMarks = createPMNodeSpecFactory({});
 export var unsupportedBlock = createPMNodeSpecFactory({
   group: 'block',
   atom: true,

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

@@ -20,28 +20,7 @@ export var codeBlock = adfNode('codeBlock').define({
     }
   },
   noMarks: true,
-  content: [$zeroPlus($or(text, unsupportedInline))],
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.attrs.props.uniqueId': {
-        remove: true,
-        reason: '@DSLCompatibilityException - uniqueId is missing in the existing validator spec'
-      },
-      'props.content.items': {
-        value: [['text', {
-          props: {
-            marks: {
-              items: [],
-              maxItems: 0,
-              optional: true,
-              type: 'array'
-            }
-          }
-        }]],
-        reason: '@DSLCompatibilityException - text variant is inlined, which is not supported by current transformation'
-      }
-    }
-  }
+  content: [$zeroPlus($or(text.use('with_no_marks'), unsupportedInline))]
 })
 // Variant used root scenario where we have breakout
 .variant('root_only', {

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

@@ -91,13 +91,5 @@ export var mediaInline = adfNode('mediaInline').define({
       type: 'object',
       optional: true
     }
-  },
-  DANGEROUS_MANUAL_OVERRIDE: {
-    'validator-spec': {
-      'props.attrs.props.url': {
-        remove: true,
-        reason: '@DSLCompatibilityException - url is not specified on the validator spec (but it probably should be)'
-      }
-    }
   }
 });

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

@@ -15,6 +15,9 @@ import { confluenceInlineComment } from '../marks/confluenceInlineComment';
 export var text = adfNode('text').define({
   marks: [],
   hasEmptyMarks: true
+}).variant('with_no_marks', {
+  marks: [],
+  noMarks: true
 }).variant('link_inline', {
   marks: [link],
   ignore: ['pm-spec', 'json-schema']

package/dist/esm/validator-schema/generated/validatorSpec.js

@@ -275,22 +275,17 @@ export var codeBlock = {
         language: {
           type: 'string',
           optional: true
+        },
+        uniqueId: {
+          type: 'string',
+          optional: true
         }
       },
       optional: true
     },
     content: {
       type: 'array',
-      items: [['text', {
-        props: {
-          marks: {
-            items: [],
-            maxItems: 0,
-            optional: true,
-            type: 'array'
-          }
-        }
-      }]],
+      items: ['text_with_no_marks'],
       optional: true,
       allowUnsupportedInline: true
     }
@@ -1037,6 +1032,10 @@ export var mediaInline = {
           values: ['link', 'file', 'image'],
           optional: true
         },
+        url: {
+          type: 'string',
+          optional: true
+        },
         id: {
           minLength: 1,
           type: 'string'
@@ -1715,6 +1714,16 @@ export var text_link_inline = ['text', {
     }
   }
 }];
+export var text_with_no_marks = ['text', {
+  props: {
+    marks: {
+      type: 'array',
+      maxItems: 0,
+      items: [],
+      optional: true
+    }
+  }
+}];
 export var textColor = {
   props: {
     type: {

package/dist/json-schema/v1/full.json

@@ -497,6 +497,9 @@
           "properties": {
             "language": {
               "type": "string"
+            },
+            "uniqueId": {
+              "type": "string"
             }
           },
           "additionalProperties": false
@@ -504,21 +507,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -552,21 +541,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -2529,6 +2504,23 @@
       "additionalProperties": false,
       "required": ["type", "text"]
     },
+    "text_with_no_marks_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/text_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "maxItems": 0
+            }
+          },
+          "additionalProperties": true
+        }
+      ]
+    },
     "textColor_mark": {
       "type": "object",
       "properties": {

package/dist/json-schema/v1/stage-0.json

@@ -507,6 +507,9 @@
           "properties": {
             "language": {
               "type": "string"
+            },
+            "uniqueId": {
+              "type": "string"
             }
           },
           "additionalProperties": false
@@ -514,21 +517,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -562,21 +551,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -2898,6 +2873,23 @@
       "additionalProperties": false,
       "required": ["type", "text"]
     },
+    "text_with_no_marks_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/text_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "maxItems": 0
+            }
+          },
+          "additionalProperties": true
+        }
+      ]
+    },
     "textColor_mark": {
       "type": "object",
       "properties": {

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

@@ -91,7 +91,7 @@ export type CaptionNode = PMNode & CaptionDefinition;
 export declare const caption: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<CaptionNode>) => import("prosemirror-model").NodeSpec;
 export interface CodeBlockDefinition {
     type: 'codeBlock';
-    content: Array<TextDefinition | UnsupportedInlineDefinition>;
+    content: Array<TextWithNoMarksDefinition | UnsupportedInlineDefinition>;
     attrs: {
         language?: string;
         uniqueId?: string;
@@ -101,7 +101,7 @@ export type CodeBlockNode = PMNode & CodeBlockDefinition;
 export declare const codeBlock: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<CodeBlockNode>) => import("prosemirror-model").NodeSpec;
 export interface CodeBlockRootOnlyDefinition {
     type: 'codeBlock';
-    content: Array<TextDefinition | UnsupportedInlineDefinition>;
+    content: Array<TextWithNoMarksDefinition | UnsupportedInlineDefinition>;
     marks: Array<BreakoutMark | UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
     attrs: {
         language?: string;
@@ -880,6 +880,11 @@ export interface TextFormattedDefinition {
 }
 export type TextFormattedNode = PMNode & TextFormattedDefinition;
 export declare const textFormatted: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<TextFormattedNode>) => import("prosemirror-model").NodeSpec;
+export interface TextWithNoMarksDefinition {
+    type: 'text';
+}
+export type TextWithNoMarksNode = PMNode & TextWithNoMarksDefinition;
+export declare const textWithNoMarks: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<TextWithNoMarksNode>) => import("prosemirror-model").NodeSpec;
 export interface UnsupportedBlockDefinition {
     type: 'unsupportedBlock';
     attrs: {

package/dist/types/next-schema/nodes/text.d.ts

@@ -1,4 +1,7 @@
-export declare const text: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "link_inline", "formatted", "code_inline"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
+export declare const text: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "with_no_marks", "link_inline", "formatted", "code_inline"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
+    marks: any[];
+    noMarks: true;
+} & {
     marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
     ignore: ("pm-spec" | "json-schema")[];
 } & {

package/dist/types/validator-schema/generated/validatorSpec.d.ts

@@ -286,21 +286,16 @@ export declare const codeBlock: {
                     type: string;
                     optional: boolean;
                 };
+                uniqueId: {
+                    type: string;
+                    optional: boolean;
+                };
             };
             optional: boolean;
         };
         content: {
             type: string;
-            items: (string | {
-                props: {
-                    marks: {
-                        items: any[];
-                        maxItems: number;
-                        optional: boolean;
-                        type: string;
-                    };
-                };
-            })[][];
+            items: string[];
             optional: boolean;
             allowUnsupportedInline: boolean;
         };
@@ -1053,6 +1048,10 @@ export declare const mediaInline: {
                     values: string[];
                     optional: boolean;
                 };
+                url: {
+                    type: string;
+                    optional: boolean;
+                };
                 id: {
                     minLength: number;
                     type: string;
@@ -1734,6 +1733,16 @@ export declare const text_link_inline: (string | {
         };
     };
 })[];
+export declare const text_with_no_marks: (string | {
+    props: {
+        marks: {
+            type: string;
+            maxItems: number;
+            items: any[];
+            optional: boolean;
+        };
+    };
+})[];
 export declare const textColor: {
     props: {
         type: {

package/json-schema/v1/full.json

@@ -497,6 +497,9 @@
           "properties": {
             "language": {
               "type": "string"
+            },
+            "uniqueId": {
+              "type": "string"
             }
           },
           "additionalProperties": false
@@ -504,21 +507,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -552,21 +541,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -2529,6 +2504,23 @@
       "additionalProperties": false,
       "required": ["type", "text"]
     },
+    "text_with_no_marks_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/text_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "maxItems": 0
+            }
+          },
+          "additionalProperties": true
+        }
+      ]
+    },
     "textColor_mark": {
       "type": "object",
       "properties": {

package/json-schema/v1/stage-0.json

@@ -507,6 +507,9 @@
           "properties": {
             "language": {
               "type": "string"
+            },
+            "uniqueId": {
+              "type": "string"
             }
           },
           "additionalProperties": false
@@ -514,21 +517,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -562,21 +551,7 @@
         "content": {
           "type": "array",
           "items": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/text_node"
-              },
-              {
-                "type": "object",
-                "properties": {
-                  "marks": {
-                    "type": "array",
-                    "maxItems": 0
-                  }
-                },
-                "additionalProperties": true
-              }
-            ]
+            "$ref": "#/definitions/text_with_no_marks_node"
           }
         }
       },
@@ -2898,6 +2873,23 @@
       "additionalProperties": false,
       "required": ["type", "text"]
     },
+    "text_with_no_marks_node": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/text_node"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "marks": {
+              "type": "array",
+              "maxItems": 0
+            }
+          },
+          "additionalProperties": true
+        }
+      ]
+    },
     "textColor_mark": {
       "type": "object",
       "properties": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "45.0.0",
+  "version": "45.2.0",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@atlassian/adf-schema-json": "^1.24.0",
-    "@atlaskit/adf-schema-generator": "^1.38.2",
+    "@atlaskit/adf-schema-generator": "^1.38.4",
     "@atlaskit/codemod-utils": "^4.2.4",
     "@babel/cli": "^7.22.9",
     "@babel/core": "^7.22.9",