@atlaskit/adf-schema 37.0.3 → 37.1.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +145 -0
- package/dist/cjs/next-schema/full-schema.adf.js +1 -1
- package/dist/cjs/next-schema/generated/nodeTypes.js +101 -31
- package/dist/cjs/next-schema/groups/blockGroup.js +1 -1
- package/dist/cjs/next-schema/groups/inlineGroup.js +1 -1
- package/dist/cjs/next-schema/index.js +20 -8
- package/dist/cjs/next-schema/nodes/blockquote.js +3 -2
- package/dist/cjs/next-schema/nodes/bodiedExtension.js +6 -2
- package/dist/cjs/next-schema/nodes/codeBlock.js +10 -3
- package/dist/cjs/next-schema/nodes/date.js +2 -1
- package/dist/cjs/next-schema/nodes/emoji.js +2 -1
- package/dist/cjs/next-schema/nodes/expand.js +11 -3
- package/dist/cjs/next-schema/nodes/extension.js +5 -2
- package/dist/cjs/next-schema/nodes/heading.js +28 -5
- package/dist/cjs/next-schema/nodes/inlineExtension.js +1 -0
- package/dist/cjs/next-schema/nodes/layoutSection.js +15 -2
- package/dist/cjs/next-schema/nodes/list.js +12 -9
- package/dist/cjs/next-schema/nodes/mediaInline.js +2 -1
- package/dist/cjs/next-schema/nodes/mediaSingle.js +75 -4
- package/dist/cjs/next-schema/nodes/mention.js +2 -1
- package/dist/cjs/next-schema/nodes/multiBodiedExtension.js +8 -4
- package/dist/cjs/next-schema/nodes/nestedExpand.js +5 -1
- package/dist/cjs/next-schema/nodes/panel.js +3 -0
- package/dist/cjs/next-schema/nodes/paragraph.js +29 -5
- package/dist/cjs/next-schema/nodes/status.js +2 -1
- package/dist/cjs/next-schema/nodes/tableCell.js +4 -1
- package/dist/cjs/next-schema/nodes/tableHeader.js +5 -2
- package/dist/cjs/next-schema/nodes/task.js +1 -0
- package/dist/cjs/next-schema/nodes/text.js +7 -1
- package/dist/cjs/schema/nodes/media.js +10 -4
- package/dist/cjs/schema/nodes/text.js +1 -0
- package/dist/es2019/next-schema/full-schema.adf.js +1 -1
- package/dist/es2019/next-schema/generated/nodeTypes.js +100 -30
- package/dist/es2019/next-schema/groups/blockGroup.js +1 -1
- package/dist/es2019/next-schema/groups/inlineGroup.js +1 -1
- package/dist/es2019/next-schema/index.js +1 -1
- package/dist/es2019/next-schema/nodes/blockquote.js +3 -2
- package/dist/es2019/next-schema/nodes/bodiedExtension.js +6 -2
- package/dist/es2019/next-schema/nodes/codeBlock.js +10 -3
- package/dist/es2019/next-schema/nodes/date.js +2 -1
- package/dist/es2019/next-schema/nodes/emoji.js +2 -1
- package/dist/es2019/next-schema/nodes/expand.js +11 -3
- package/dist/es2019/next-schema/nodes/extension.js +5 -2
- package/dist/es2019/next-schema/nodes/heading.js +27 -4
- package/dist/es2019/next-schema/nodes/inlineExtension.js +1 -0
- package/dist/es2019/next-schema/nodes/layoutSection.js +15 -2
- package/dist/es2019/next-schema/nodes/list.js +12 -9
- package/dist/es2019/next-schema/nodes/mediaInline.js +2 -1
- package/dist/es2019/next-schema/nodes/mediaSingle.js +76 -5
- package/dist/es2019/next-schema/nodes/mention.js +2 -1
- package/dist/es2019/next-schema/nodes/multiBodiedExtension.js +8 -4
- package/dist/es2019/next-schema/nodes/nestedExpand.js +5 -1
- package/dist/es2019/next-schema/nodes/panel.js +3 -0
- package/dist/es2019/next-schema/nodes/paragraph.js +29 -5
- package/dist/es2019/next-schema/nodes/status.js +2 -1
- package/dist/es2019/next-schema/nodes/tableCell.js +4 -1
- package/dist/es2019/next-schema/nodes/tableHeader.js +5 -2
- package/dist/es2019/next-schema/nodes/task.js +1 -0
- package/dist/es2019/next-schema/nodes/text.js +7 -1
- package/dist/es2019/schema/nodes/media.js +3 -1
- package/dist/es2019/schema/nodes/text.js +1 -0
- package/dist/esm/next-schema/full-schema.adf.js +1 -1
- package/dist/esm/next-schema/generated/nodeTypes.js +100 -30
- package/dist/esm/next-schema/groups/blockGroup.js +1 -1
- package/dist/esm/next-schema/groups/inlineGroup.js +1 -1
- package/dist/esm/next-schema/index.js +1 -1
- package/dist/esm/next-schema/nodes/blockquote.js +3 -2
- package/dist/esm/next-schema/nodes/bodiedExtension.js +6 -2
- package/dist/esm/next-schema/nodes/codeBlock.js +10 -3
- package/dist/esm/next-schema/nodes/date.js +2 -1
- package/dist/esm/next-schema/nodes/emoji.js +2 -1
- package/dist/esm/next-schema/nodes/expand.js +11 -3
- package/dist/esm/next-schema/nodes/extension.js +5 -2
- package/dist/esm/next-schema/nodes/heading.js +27 -4
- package/dist/esm/next-schema/nodes/inlineExtension.js +1 -0
- package/dist/esm/next-schema/nodes/layoutSection.js +15 -2
- package/dist/esm/next-schema/nodes/list.js +12 -9
- package/dist/esm/next-schema/nodes/mediaInline.js +2 -1
- package/dist/esm/next-schema/nodes/mediaSingle.js +76 -5
- package/dist/esm/next-schema/nodes/mention.js +2 -1
- package/dist/esm/next-schema/nodes/multiBodiedExtension.js +8 -4
- package/dist/esm/next-schema/nodes/nestedExpand.js +5 -1
- package/dist/esm/next-schema/nodes/panel.js +3 -0
- package/dist/esm/next-schema/nodes/paragraph.js +29 -5
- package/dist/esm/next-schema/nodes/status.js +2 -1
- package/dist/esm/next-schema/nodes/tableCell.js +4 -1
- package/dist/esm/next-schema/nodes/tableHeader.js +5 -2
- package/dist/esm/next-schema/nodes/task.js +1 -0
- package/dist/esm/next-schema/nodes/text.js +7 -1
- package/dist/esm/schema/nodes/media.js +9 -4
- package/dist/esm/schema/nodes/text.js +1 -0
- package/dist/types/next-schema/full-schema.adf.d.ts +18 -0
- package/dist/types/next-schema/generated/markTypes.d.ts +20 -20
- package/dist/types/next-schema/generated/nodeGroupTypes.d.ts +2 -2
- package/dist/types/next-schema/generated/nodeTypes.d.ts +145 -96
- package/dist/types/next-schema/groups/nonNestableBlockContentGroup.d.ts +128 -6
- package/dist/types/next-schema/index.d.ts +2 -2
- package/dist/types/next-schema/nodes/blockCard.d.ts +18 -0
- package/dist/types/next-schema/nodes/blockquote.d.ts +20 -1
- package/dist/types/next-schema/nodes/bodiedExtension.d.ts +20 -0
- package/dist/types/next-schema/nodes/caption.d.ts +18 -0
- package/dist/types/next-schema/nodes/codeBlock.d.ts +48 -0
- package/dist/types/next-schema/nodes/confluenceJiraIssue.d.ts +18 -0
- package/dist/types/next-schema/nodes/confluenceUnsupportedBlock.d.ts +18 -0
- package/dist/types/next-schema/nodes/confluenceUnsupportedInline.d.ts +18 -0
- package/dist/types/next-schema/nodes/date.d.ts +18 -0
- package/dist/types/next-schema/nodes/decisionItem.d.ts +18 -0
- package/dist/types/next-schema/nodes/decisionList.d.ts +18 -0
- package/dist/types/next-schema/nodes/embedCard.d.ts +18 -0
- package/dist/types/next-schema/nodes/emoji.d.ts +18 -0
- package/dist/types/next-schema/nodes/expand.d.ts +25 -0
- package/dist/types/next-schema/nodes/extension.d.ts +19 -0
- package/dist/types/next-schema/nodes/extensionFrame.d.ts +18 -0
- package/dist/types/next-schema/nodes/hardBreak.d.ts +18 -0
- package/dist/types/next-schema/nodes/heading.d.ts +80 -0
- package/dist/types/next-schema/nodes/image.d.ts +18 -0
- package/dist/types/next-schema/nodes/inlineCard.d.ts +18 -0
- package/dist/types/next-schema/nodes/inlineExtension.d.ts +18 -0
- package/dist/types/next-schema/nodes/layoutColumn.d.ts +18 -0
- package/dist/types/next-schema/nodes/layoutSection.d.ts +22 -0
- package/dist/types/next-schema/nodes/list.d.ts +36 -0
- package/dist/types/next-schema/nodes/media.d.ts +18 -0
- package/dist/types/next-schema/nodes/mediaGroup.d.ts +18 -0
- package/dist/types/next-schema/nodes/mediaInline.d.ts +18 -0
- package/dist/types/next-schema/nodes/mediaSingle.d.ts +67 -1
- package/dist/types/next-schema/nodes/mention.d.ts +18 -0
- package/dist/types/next-schema/nodes/multiBodiedExtension.d.ts +18 -0
- package/dist/types/next-schema/nodes/nestedExpand.d.ts +22 -0
- package/dist/types/next-schema/nodes/panel.d.ts +22 -1
- package/dist/types/next-schema/nodes/paragraph.d.ts +29 -0
- package/dist/types/next-schema/nodes/placeholder.d.ts +18 -0
- package/dist/types/next-schema/nodes/rule.d.ts +18 -0
- package/dist/types/next-schema/nodes/status.d.ts +18 -0
- package/dist/types/next-schema/nodes/table.d.ts +18 -0
- package/dist/types/next-schema/nodes/tableCell.d.ts +18 -0
- package/dist/types/next-schema/nodes/tableHeader.d.ts +18 -0
- package/dist/types/next-schema/nodes/tableRow.d.ts +18 -0
- package/dist/types/next-schema/nodes/task.d.ts +36 -0
- package/dist/types/next-schema/nodes/text.d.ts +22 -1
- package/dist/types/next-schema/nodes/unsupportedBlock.d.ts +18 -0
- package/dist/types/next-schema/nodes/unsupportedInline.d.ts +18 -0
- package/package.json +8 -3
- package/schema-generators/__tests__/unit/__fixtures__/index.fixture.ts +140 -0
- package/schema-generators/__tests__/unit/adfToValidatorSpec.unit.ts +1 -45
- package/schema-generators/__tests__/unit/adfToValidatorSpecValidation.unit.ts +88 -0
- package/schema-generators/__tests__/unit/json-full-schema-backwards-compat.unit.ts +70 -61
- package/schema-generators/__tests__/unit/validate-pm-schema.unit.ts +152 -46
- package/schema-generators/__tests__/unit/jqueries.md +0 -194
- package/schema-generators/__tests__/unit/json-full-schema.unit.ts +0 -2320
@@ -13,6 +13,7 @@ var extension = exports.extension = (0, _adfSchemaGenerator.adfNode)('extension'
|
|
13
13
|
atom: true,
|
14
14
|
selectable: true,
|
15
15
|
marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
16
|
+
hasEmptyMarks: true,
|
16
17
|
attrs: {
|
17
18
|
extensionKey: {
|
18
19
|
minLength: 1,
|
@@ -46,7 +47,9 @@ var extension = exports.extension = (0, _adfSchemaGenerator.adfNode)('extension'
|
|
46
47
|
optional: true,
|
47
48
|
default: null
|
48
49
|
}
|
49
|
-
}
|
50
|
+
},
|
51
|
+
ignore: ['json-schema']
|
50
52
|
}).variant('with_marks', {
|
51
|
-
marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
|
53
|
+
marks: [_dataConsumer.dataConsumer, _fragment.fragment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
54
|
+
ignore: []
|
52
55
|
});
|
@@ -3,7 +3,7 @@
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
4
4
|
value: true
|
5
5
|
});
|
6
|
-
exports.heading = void 0;
|
6
|
+
exports.headingWithMarks = exports.heading = void 0;
|
7
7
|
var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
|
8
8
|
var _inlineGroup = require("../groups/inlineGroup");
|
9
9
|
var _alignmentAndIndentation = require("../marks/alignmentAndIndentation");
|
@@ -13,6 +13,7 @@ var heading = exports.heading = (0, _adfSchemaGenerator.adfNode)('heading').defi
|
|
13
13
|
defining: true,
|
14
14
|
selectable: false,
|
15
15
|
marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
16
|
+
hasEmptyMarks: true,
|
16
17
|
attrs: {
|
17
18
|
level: {
|
18
19
|
type: 'number',
|
@@ -26,9 +27,31 @@ var heading = exports.heading = (0, _adfSchemaGenerator.adfNode)('heading').defi
|
|
26
27
|
default: null
|
27
28
|
}
|
28
29
|
},
|
29
|
-
content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup))]
|
30
|
+
content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup))],
|
31
|
+
DANGEROUS_MANUAL_OVERRIDE: {
|
32
|
+
'validator-spec': {
|
33
|
+
marks: {
|
34
|
+
value: {
|
35
|
+
type: 'array',
|
36
|
+
items: [],
|
37
|
+
optional: true
|
38
|
+
},
|
39
|
+
reason: 'In old types, some nodes have marks: Array<any>, which is not possible to represent in new DSL'
|
40
|
+
}
|
41
|
+
}
|
42
|
+
}
|
30
43
|
}).variant('with_alignment', {
|
31
|
-
marks: [_alignmentAndIndentation.alignment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
|
44
|
+
marks: [_alignmentAndIndentation.alignment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
45
|
+
content: [],
|
46
|
+
ignore: []
|
32
47
|
}).variant('with_indentation', {
|
33
|
-
marks: [_alignmentAndIndentation.indentation, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
|
34
|
-
|
48
|
+
marks: [_alignmentAndIndentation.indentation, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
49
|
+
content: [],
|
50
|
+
ignore: []
|
51
|
+
}).variant('with_no_marks', {
|
52
|
+
content: [],
|
53
|
+
marks: [],
|
54
|
+
noMarks: true,
|
55
|
+
ignore: []
|
56
|
+
});
|
57
|
+
var headingWithMarks = exports.headingWithMarks = heading;
|
@@ -13,6 +13,7 @@ var inlineExtension = exports.inlineExtension = (0, _adfSchemaGenerator.adfNode)
|
|
13
13
|
inline: true,
|
14
14
|
selectable: true,
|
15
15
|
marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
16
|
+
hasEmptyMarks: true,
|
16
17
|
attrs: {
|
17
18
|
extensionKey: {
|
18
19
|
minLength: 1,
|
@@ -13,5 +13,18 @@ var _unsupportedBlock = require("./unsupportedBlock");
|
|
13
13
|
var layoutSection = exports.layoutSection = (0, _adfSchemaGenerator.adfNode)('layoutSection').define({
|
14
14
|
isolating: true,
|
15
15
|
marks: [_breakout.breakout, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
16
|
-
content: [(0, _adfSchemaGenerator.$range)(1, 3, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock))]
|
17
|
-
|
16
|
+
content: [(0, _adfSchemaGenerator.$range)(1, 3, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock))],
|
17
|
+
ignore: ['json-schema'],
|
18
|
+
DANGEROUS_MANUAL_OVERRIDE: {
|
19
|
+
'pm-spec': {
|
20
|
+
content: {
|
21
|
+
value: '(layoutColumn | unsupportedBlock){1,3} unsupportedBlock* | unsupportedBlock+',
|
22
|
+
reason: "The content expression is not correct or redundant around 'unsupportedBlock* | unsupportedBlock+'. This case is not supported by the DSL."
|
23
|
+
}
|
24
|
+
}
|
25
|
+
}
|
26
|
+
}).variant('full', {
|
27
|
+
marks: [_breakout.breakout, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
28
|
+
content: [(0, _adfSchemaGenerator.$range)(2, 3, (0, _adfSchemaGenerator.$or)(_layoutColumn.layoutColumn, _unsupportedBlock.unsupportedBlock))],
|
29
|
+
ignore: []
|
30
|
+
});
|
@@ -14,7 +14,16 @@ var _task = require("./task");
|
|
14
14
|
var _unsupportedBlock = require("./unsupportedBlock");
|
15
15
|
var orderedList = exports.orderedList = (0, _adfSchemaGenerator.adfNode)('orderedList');
|
16
16
|
var bulletList = exports.bulletList = (0, _adfSchemaGenerator.adfNode)('bulletList');
|
17
|
-
var listItem = (0, _adfSchemaGenerator.adfNode)('listItem')
|
17
|
+
var listItem = (0, _adfSchemaGenerator.adfNode)('listItem').define({
|
18
|
+
defining: true,
|
19
|
+
selectable: false,
|
20
|
+
marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
21
|
+
contentMinItems: 1,
|
22
|
+
content: [(0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _unsupportedBlock.unsupportedBlock), (0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, bulletList, orderedList, _unsupportedBlock.unsupportedBlock))]
|
23
|
+
}).variant('legacy', {
|
24
|
+
content: [(0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _unsupportedBlock.unsupportedBlock), (0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), bulletList, orderedList, _unsupportedBlock.unsupportedBlock))],
|
25
|
+
ignore: ['json-schema', 'validator-spec']
|
26
|
+
});
|
18
27
|
orderedList.define({
|
19
28
|
selectable: false,
|
20
29
|
marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
@@ -26,16 +35,10 @@ orderedList.define({
|
|
26
35
|
optional: true
|
27
36
|
}
|
28
37
|
},
|
29
|
-
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem))]
|
38
|
+
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('legacy')))]
|
30
39
|
});
|
31
40
|
bulletList.define({
|
32
41
|
selectable: false,
|
33
42
|
marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
34
|
-
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem))]
|
35
|
-
});
|
36
|
-
listItem.define({
|
37
|
-
defining: true,
|
38
|
-
selectable: false,
|
39
|
-
marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
40
|
-
content: [(0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _unsupportedBlock.unsupportedBlock), (0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, bulletList, orderedList, _unsupportedBlock.unsupportedBlock))]
|
43
|
+
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(listItem, listItem.use('legacy')))]
|
41
44
|
});
|
@@ -12,8 +12,9 @@ var _caption = require("./caption");
|
|
12
12
|
var _media = require("./media");
|
13
13
|
var _unsupportedBlock = require("./unsupportedBlock");
|
14
14
|
var mediaSingle = exports.mediaSingle = (0, _adfSchemaGenerator.adfNode)('mediaSingle').define({
|
15
|
-
atom:
|
15
|
+
atom: true,
|
16
16
|
selectable: true,
|
17
|
+
ignore: ['json-schema'],
|
17
18
|
marks: [_link.link, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
18
19
|
attrs: {
|
19
20
|
anyOf: [{
|
@@ -53,8 +54,78 @@ var mediaSingle = exports.mediaSingle = (0, _adfSchemaGenerator.adfNode)('mediaS
|
|
53
54
|
}
|
54
55
|
}]
|
55
56
|
},
|
56
|
-
|
57
|
+
DANGEROUS_MANUAL_OVERRIDE: {
|
58
|
+
'pm-spec': {
|
59
|
+
content: {
|
60
|
+
value: 'media|media|unsupportedBlock+ unsupportedBlock+',
|
61
|
+
reason: 'The content expression is not correct or redundant around `media|media|unsupportedBlock+`. This case is not supported by the DSL.'
|
62
|
+
},
|
63
|
+
attrs: {
|
64
|
+
value: {
|
65
|
+
layout: {
|
66
|
+
default: 'center'
|
67
|
+
},
|
68
|
+
width: {
|
69
|
+
default: null
|
70
|
+
}
|
71
|
+
},
|
72
|
+
reason: 'the widthType was not in attrs of original spec'
|
73
|
+
},
|
74
|
+
marks: {
|
75
|
+
value: 'annotation border link unsupportedMark unsupportedNodeAttribute',
|
76
|
+
reason: "Types and PM Spec don't match, in types base mediaSingle doesn't have children, and in ADF DSL marks are derived from children"
|
77
|
+
}
|
78
|
+
}
|
79
|
+
}
|
57
80
|
}).variant('caption', {
|
58
81
|
atom: false,
|
59
|
-
|
60
|
-
|
82
|
+
ignore: [],
|
83
|
+
marks: [],
|
84
|
+
contentMinItems: 1,
|
85
|
+
contentMaxItems: 2,
|
86
|
+
content: [(0, _adfSchemaGenerator.$or)(_media.media, _unsupportedBlock.unsupportedBlock), (0, _adfSchemaGenerator.$or)(_caption.caption, _unsupportedBlock.unsupportedBlock)],
|
87
|
+
DANGEROUS_MANUAL_OVERRIDE: {
|
88
|
+
'pm-spec': {
|
89
|
+
content: {
|
90
|
+
value: 'media|media|unsupportedBlock+ (caption|unsupportedBlock) unsupportedBlock*',
|
91
|
+
reason: 'The content expression is not correct or redundant around `media|media|unsupportedBlock+`. This case is not supported by the DSL.'
|
92
|
+
},
|
93
|
+
attrs: {
|
94
|
+
value: {
|
95
|
+
layout: {
|
96
|
+
default: 'center'
|
97
|
+
},
|
98
|
+
width: {
|
99
|
+
default: null
|
100
|
+
}
|
101
|
+
},
|
102
|
+
reason: 'the widthType was not in attrs of original spec of mediaSingleWithCaption'
|
103
|
+
}
|
104
|
+
}
|
105
|
+
}
|
106
|
+
}).variant('full', {
|
107
|
+
atom: false,
|
108
|
+
content: [(0, _adfSchemaGenerator.$range)(1, 1, (0, _adfSchemaGenerator.$or)(_media.media, _unsupportedBlock.unsupportedBlock))],
|
109
|
+
ignore: [],
|
110
|
+
marks: [],
|
111
|
+
DANGEROUS_MANUAL_OVERRIDE: {
|
112
|
+
'pm-spec': {
|
113
|
+
content: {
|
114
|
+
value: 'media|media|unsupportedBlock+ (caption|unsupportedBlock) unsupportedBlock*',
|
115
|
+
reason: 'The content expression is not correct or redundant around `media|media|unsupportedBlock+`. This case is not supported by the DSL.'
|
116
|
+
}
|
117
|
+
}
|
118
|
+
}
|
119
|
+
}).variant('width_type', {
|
120
|
+
content: [(0, _adfSchemaGenerator.$range)(1, 1, (0, _adfSchemaGenerator.$or)(_media.media, _unsupportedBlock.unsupportedBlock))],
|
121
|
+
ignore: [],
|
122
|
+
marks: [],
|
123
|
+
DANGEROUS_MANUAL_OVERRIDE: {
|
124
|
+
'pm-spec': {
|
125
|
+
content: {
|
126
|
+
value: 'media|media|unsupportedBlock+ unsupportedBlock+',
|
127
|
+
reason: 'The content expression is not correct or redundant around `media|media|unsupportedBlock+`. This case is not supported by the DSL.'
|
128
|
+
}
|
129
|
+
}
|
130
|
+
}
|
131
|
+
});
|
@@ -5,12 +5,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
});
|
6
6
|
exports.mention = void 0;
|
7
7
|
var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
|
8
|
+
var _annotation = require("../marks/annotation");
|
8
9
|
var _unsupportedMark = require("../marks/unsupportedMark");
|
9
10
|
var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
|
10
11
|
var mention = exports.mention = (0, _adfSchemaGenerator.adfNode)('mention').define({
|
11
12
|
inline: true,
|
12
13
|
selectable: true,
|
13
|
-
marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
14
|
+
marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark, _annotation.annotation],
|
14
15
|
attrs: {
|
15
16
|
id: {
|
16
17
|
type: 'string',
|
@@ -17,11 +17,13 @@ var multiBodiedExtension = exports.multiBodiedExtension = (0, _adfSchemaGenerato
|
|
17
17
|
attrs: {
|
18
18
|
extensionKey: {
|
19
19
|
type: 'string',
|
20
|
-
default: ''
|
20
|
+
default: '',
|
21
|
+
minLength: 1
|
21
22
|
},
|
22
23
|
extensionType: {
|
23
24
|
type: 'string',
|
24
|
-
default: ''
|
25
|
+
default: '',
|
26
|
+
minLength: 1
|
25
27
|
},
|
26
28
|
parameters: {
|
27
29
|
type: 'object',
|
@@ -42,8 +44,10 @@ var multiBodiedExtension = exports.multiBodiedExtension = (0, _adfSchemaGenerato
|
|
42
44
|
localId: {
|
43
45
|
type: 'string',
|
44
46
|
optional: true,
|
45
|
-
default: null
|
47
|
+
default: null,
|
48
|
+
minLength: 1
|
46
49
|
}
|
47
50
|
},
|
48
|
-
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_extensionFrame.extensionFrame))]
|
51
|
+
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_extensionFrame.extensionFrame))],
|
52
|
+
ignore: ['json-schema']
|
49
53
|
});
|
@@ -36,4 +36,8 @@ var nestedExpand = exports.nestedExpand = (0, _adfSchemaGenerator.adfNode)('nest
|
|
36
36
|
}
|
37
37
|
},
|
38
38
|
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _unsupportedBlock.unsupportedBlock))]
|
39
|
-
}).variant('with_no_marks', {
|
39
|
+
}).variant('with_no_marks', {
|
40
|
+
marks: [],
|
41
|
+
content: [],
|
42
|
+
noMarks: true
|
43
|
+
});
|
@@ -49,4 +49,7 @@ var panel = exports.panel = (0, _adfSchemaGenerator.adfNode)('panel').define({
|
|
49
49
|
}
|
50
50
|
},
|
51
51
|
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _unsupportedBlock.unsupportedBlock))]
|
52
|
+
}).variant('legacy', {
|
53
|
+
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _unsupportedBlock.unsupportedBlock))],
|
54
|
+
ignore: ['json-schema', 'validator-spec']
|
52
55
|
});
|
@@ -19,11 +19,35 @@ var paragraph = exports.paragraph = (0, _adfSchemaGenerator.adfNode)('paragraph'
|
|
19
19
|
},
|
20
20
|
selectable: false,
|
21
21
|
marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
22
|
-
|
22
|
+
hasEmptyMarks: true,
|
23
|
+
content: [(0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(_inlineGroup.inlineGroup))],
|
24
|
+
DANGEROUS_MANUAL_OVERRIDE: {
|
25
|
+
'validator-spec': {
|
26
|
+
marks: {
|
27
|
+
value: {
|
28
|
+
type: 'array',
|
29
|
+
items: [],
|
30
|
+
optional: true
|
31
|
+
},
|
32
|
+
reason: 'NoMark type used in old schema had a hack maxItems: 0 to mark nodes that should not have any marks. This is not possible to represent in new DSL.'
|
33
|
+
}
|
34
|
+
}
|
35
|
+
}
|
23
36
|
}).variant('with_alignment', {
|
24
|
-
marks: [_alignmentAndIndentation.alignment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
|
37
|
+
marks: [_alignmentAndIndentation.alignment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
38
|
+
content: [],
|
39
|
+
ignore: []
|
25
40
|
}).variant('with_indentation', {
|
26
|
-
marks: [_alignmentAndIndentation.indentation, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
|
41
|
+
marks: [_alignmentAndIndentation.indentation, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
42
|
+
content: [],
|
43
|
+
ignore: []
|
27
44
|
}).variant('with_marks', {
|
28
|
-
marks: [_alignmentAndIndentation.alignment,
|
29
|
-
|
45
|
+
marks: [_alignmentAndIndentation.alignment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
46
|
+
content: [],
|
47
|
+
ignore: []
|
48
|
+
}).variant('with_no_marks', {
|
49
|
+
content: [],
|
50
|
+
marks: [],
|
51
|
+
noMarks: true,
|
52
|
+
ignore: []
|
53
|
+
});
|
@@ -5,12 +5,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
});
|
6
6
|
exports.status = void 0;
|
7
7
|
var _adfSchemaGenerator = require("@atlaskit/adf-schema-generator");
|
8
|
+
var _annotation = require("../marks/annotation");
|
8
9
|
var _unsupportedMark = require("../marks/unsupportedMark");
|
9
10
|
var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
|
10
11
|
var status = exports.status = (0, _adfSchemaGenerator.adfNode)('status').define({
|
11
12
|
inline: true,
|
12
13
|
selectable: true,
|
13
|
-
marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
14
|
+
marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark, _annotation.annotation],
|
14
15
|
attrs: {
|
15
16
|
text: {
|
16
17
|
minLength: 1,
|
@@ -39,7 +39,10 @@ var tableHeader = exports.tableHeader = (0, _adfSchemaGenerator.adfNode)('tableH
|
|
39
39
|
optional: true
|
40
40
|
},
|
41
41
|
colwidth: {
|
42
|
-
type: '
|
42
|
+
type: 'array',
|
43
|
+
items: {
|
44
|
+
type: 'number'
|
45
|
+
},
|
43
46
|
default: null,
|
44
47
|
optional: true
|
45
48
|
},
|
@@ -49,5 +52,5 @@ var tableHeader = exports.tableHeader = (0, _adfSchemaGenerator.adfNode)('tableH
|
|
49
52
|
optional: true
|
50
53
|
}
|
51
54
|
},
|
52
|
-
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _nestedExpand.nestedExpand.use('with_no_marks')))]
|
55
|
+
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_codeBlock.codeBlock.use('with_no_marks'), _blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _task.taskList, _list.bulletList, _list.orderedList, _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _heading.heading.use('with_indentation'), _mediaGroup.mediaGroup, _decisionList.decisionList, _rule.rule, _panel.panel, _blockquote.blockquote, _extension.extension.use('with_marks'), _embedCard.embedCard, _nestedExpand.nestedExpand, _nestedExpand.nestedExpand.use('with_no_marks')))]
|
53
56
|
});
|
@@ -39,5 +39,6 @@ taskList.define({
|
|
39
39
|
default: ''
|
40
40
|
}
|
41
41
|
},
|
42
|
+
contentMinItems: 1,
|
42
43
|
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(taskItem, _unsupportedBlock.unsupportedBlock)), (0, _adfSchemaGenerator.$zeroPlus)((0, _adfSchemaGenerator.$or)(taskItem, taskList, _unsupportedBlock.unsupportedBlock))]
|
43
44
|
});
|
@@ -18,7 +18,13 @@ var _unsupportedNodeAttribute = require("../marks/unsupportedNodeAttribute");
|
|
18
18
|
var _unsupportedMark = require("../marks/unsupportedMark");
|
19
19
|
var _typeAheadQuery = require("../marks/typeAheadQuery");
|
20
20
|
var _confluenceInlineComment = require("../marks/confluenceInlineComment");
|
21
|
-
var text = exports.text = (0, _adfSchemaGenerator.adfNode)('text').define({
|
21
|
+
var text = exports.text = (0, _adfSchemaGenerator.adfNode)('text').define({
|
22
|
+
marks: [],
|
23
|
+
hasEmptyMarks: true
|
24
|
+
}).variant('link_inline', {
|
25
|
+
marks: [_link.link],
|
26
|
+
ignore: ['pm-spec', 'json-schema']
|
27
|
+
}).variant('formatted', {
|
22
28
|
marks: [_link.link, _em.em, _strong.strong, _strike.strike, _subsup.subsup, _underline.underline, _color.textColor, _annotation.annotation, _color.backgroundColor, _typeAheadQuery.typeAheadQuery, _confluenceInlineComment.confluenceInlineComment, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
|
23
29
|
}).variant('code_inline', {
|
24
30
|
marks: [_code.code, _link.link, _annotation.annotation, _unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark]
|
@@ -1,10 +1,14 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
4
5
|
value: true
|
5
6
|
});
|
6
7
|
exports.toJSON = exports.media = exports.defaultAttrs = exports.createMediaSpec = exports.copyPrivateAttributes = exports.camelCaseToKebabCase = void 0;
|
8
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
7
9
|
var _colors = require("../../utils/colors");
|
10
|
+
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; }
|
11
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
8
12
|
/**
|
9
13
|
* @name media_node
|
10
14
|
*/
|
@@ -110,10 +114,12 @@ var createMediaSpec = exports.createMediaSpec = function createMediaSpec(attribu
|
|
110
114
|
}
|
111
115
|
});
|
112
116
|
}
|
113
|
-
return {
|
117
|
+
return _objectSpread(_objectSpread({
|
114
118
|
selectable: true,
|
115
|
-
inline: inline
|
116
|
-
|
119
|
+
inline: inline
|
120
|
+
}, inline && {
|
121
|
+
group: 'inline'
|
122
|
+
}), {}, {
|
117
123
|
attrs: attributes,
|
118
124
|
parseDOM: parseDOM,
|
119
125
|
toDOM: function toDOM(node) {
|
@@ -140,7 +146,7 @@ var createMediaSpec = exports.createMediaSpec = function createMediaSpec(attribu
|
|
140
146
|
});
|
141
147
|
return ["".concat(domNodeType), attrs];
|
142
148
|
}
|
143
|
-
};
|
149
|
+
});
|
144
150
|
};
|
145
151
|
var media = exports.media = createMediaSpec(defaultAttrs);
|
146
152
|
var camelCaseToKebabCase = exports.camelCaseToKebabCase = function camelCaseToKebabCase(str) {
|
@@ -10,6 +10,7 @@ exports.text = void 0;
|
|
10
10
|
|
11
11
|
var text = exports.text = {
|
12
12
|
group: 'inline',
|
13
|
+
// TODO: toDebugString needs to be passed with createToPmFactory when migrate in https://product-fabric.atlassian.net/browse/ED-23606
|
13
14
|
toDebugString: process.env.NODE_ENV !== 'production' ? undefined : function () {
|
14
15
|
return 'text_node';
|
15
16
|
}
|
@@ -5,6 +5,6 @@ import { blockRootOnlyGroup } from './groups/blockRootOnlyGroup';
|
|
5
5
|
const doc = adfNode('doc').define({
|
6
6
|
root: true,
|
7
7
|
version: 1,
|
8
|
-
content: [$onePlus($or(blockGroup, layoutSection, blockRootOnlyGroup))]
|
8
|
+
content: [$onePlus($or(blockGroup, layoutSection, layoutSection.use('full'), blockRootOnlyGroup))]
|
9
9
|
});
|
10
10
|
export default doc;
|