@atlaskit/adf-schema 47.7.0 → 48.0.0
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 +12 -0
- package/dist/cjs/index.js +0 -6
- package/dist/cjs/next-schema/generated/nodeTypes.js +1 -16
- package/dist/cjs/next-schema/groups/blockContentGroup.js +1 -1
- package/dist/cjs/next-schema/groups/blockGroup.js +1 -1
- package/dist/cjs/next-schema/nodes/expand.js +0 -3
- package/dist/cjs/next-schema/nodes/multiBodiedExtension.js +1 -0
- package/dist/cjs/schema/index.js +0 -6
- package/dist/cjs/schema/nodes/expand.js +1 -2
- package/dist/cjs/schema/nodes/index.js +0 -6
- package/dist/es2019/index.js +1 -1
- package/dist/es2019/next-schema/generated/nodeTypes.js +0 -15
- package/dist/es2019/next-schema/groups/blockContentGroup.js +1 -1
- package/dist/es2019/next-schema/groups/blockGroup.js +1 -1
- package/dist/es2019/next-schema/nodes/expand.js +0 -3
- package/dist/es2019/next-schema/nodes/multiBodiedExtension.js +1 -0
- package/dist/es2019/schema/index.js +1 -1
- package/dist/es2019/schema/nodes/expand.js +1 -2
- package/dist/es2019/schema/nodes/index.js +1 -1
- package/dist/esm/index.js +1 -1
- package/dist/esm/next-schema/generated/nodeTypes.js +0 -15
- package/dist/esm/next-schema/groups/blockContentGroup.js +1 -1
- package/dist/esm/next-schema/groups/blockGroup.js +1 -1
- package/dist/esm/next-schema/nodes/expand.js +0 -3
- package/dist/esm/next-schema/nodes/multiBodiedExtension.js +1 -0
- package/dist/esm/schema/index.js +1 -1
- package/dist/esm/schema/nodes/expand.js +1 -2
- package/dist/esm/schema/nodes/index.js +1 -1
- package/dist/json-schema/v1/stage-0.json +2 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/next-schema/generated/nodeGroupTypes.d.ts +2 -2
- package/dist/types/next-schema/generated/nodeTypes.d.ts +0 -10
- package/dist/types/next-schema/nodes/expand.d.ts +1 -4
- package/dist/types/schema/index.d.ts +1 -1
- package/dist/types/schema/nodes/expand.d.ts +0 -1
- package/dist/types/schema/nodes/index.d.ts +1 -1
- package/json-schema/v1/stage-0.json +2 -1
- package/package.json +2 -2
- package/dist/cjs/validator-schema/utils/sortNestedArrays.js +0 -33
- package/dist/es2019/validator-schema/utils/sortNestedArrays.js +0 -24
- package/dist/esm/validator-schema/utils/sortNestedArrays.js +0 -26
- package/dist/types/validator-schema/utils/sortNestedArrays.d.ts +0 -1
package/CHANGELOG.md
CHANGED
@@ -1,5 +1,17 @@
|
|
1
1
|
# @atlaskit/adf-schema
|
2
2
|
|
3
|
+
## 48.0.0
|
4
|
+
|
5
|
+
### Major Changes
|
6
|
+
|
7
|
+
- 926c3fd: We fully rolled out expands with nested expands, please use expandWithNestedExpand instead of expand
|
8
|
+
|
9
|
+
## 47.7.1
|
10
|
+
|
11
|
+
### Patch Changes
|
12
|
+
|
13
|
+
- 742cd9b: fixed MBE maxItems for marks array issue
|
14
|
+
|
3
15
|
## 47.7.0
|
4
16
|
|
5
17
|
### Minor Changes
|
package/dist/cjs/index.js
CHANGED
@@ -555,12 +555,6 @@ Object.defineProperty(exports, "emojiIdToAcName", {
|
|
555
555
|
return _utils.emojiIdToAcName;
|
556
556
|
}
|
557
557
|
});
|
558
|
-
Object.defineProperty(exports, "expand", {
|
559
|
-
enumerable: true,
|
560
|
-
get: function get() {
|
561
|
-
return _schema.expand;
|
562
|
-
}
|
563
|
-
});
|
564
558
|
Object.defineProperty(exports, "expandToJSON", {
|
565
559
|
enumerable: true,
|
566
560
|
get: function get() {
|
@@ -3,7 +3,7 @@
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
4
4
|
value: true
|
5
5
|
});
|
6
|
-
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.panelWithoutNestedNonBodiedMacros = exports.panel = exports.orderedList = exports.nestedExpandWithoutNonBodiedMacros = 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.listItemWithoutNonBodiedMacros = 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.
|
6
|
+
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.panelWithoutNestedNonBodiedMacros = exports.panel = exports.orderedList = exports.nestedExpandWithoutNonBodiedMacros = 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.listItemWithoutNonBodiedMacros = 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.expandRootOnly = 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.blockquoteWithoutNonBodiedMacros = exports.blockquoteWithoutNestedCodeblockOrMedia = exports.blockquoteLegacy = exports.blockquote = exports.blockCard = void 0;
|
7
7
|
var _createPMSpecFactory = require("../../schema/createPMSpecFactory");
|
8
8
|
/**
|
9
9
|
* This file was automatically generated by @atlaskit/adf-schema-generator
|
@@ -328,21 +328,6 @@ var expandRootOnly = exports.expandRootOnly = (0, _createPMSpecFactory.createPMN
|
|
328
328
|
selectable: true,
|
329
329
|
isolating: true
|
330
330
|
});
|
331
|
-
var expandWithoutNestedExpand = exports.expandWithoutNestedExpand = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
332
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
|
333
|
-
marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
|
334
|
-
group: 'block',
|
335
|
-
attrs: {
|
336
|
-
title: {
|
337
|
-
default: ''
|
338
|
-
},
|
339
|
-
__expanded: {
|
340
|
-
default: true
|
341
|
-
}
|
342
|
-
},
|
343
|
-
selectable: true,
|
344
|
-
isolating: true
|
345
|
-
});
|
346
331
|
var extension = exports.extension = (0, _createPMSpecFactory.createPMNodeSpecFactory)({
|
347
332
|
group: 'block',
|
348
333
|
atom: true,
|
@@ -37,6 +37,6 @@ var _unsupportedBlock = require("../nodes/unsupportedBlock");
|
|
37
37
|
*/
|
38
38
|
var blockContentGroup = exports.blockContentGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block_content', [_blockCard.blockCard, _paragraph.paragraph.use('with_no_marks'), _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _codeBlock.codeBlock, _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, _panel.panel.use('without_nested_non_bodied_macros'), _blockquote.blockquote, _blockquote.blockquote.use('without_nested_codeblock_or_media'), _blockquote.blockquote.use('without_non_bodied_macros'), _extension.extension.use('with_marks'), _embedCard.embedCard, _tableNodes.table,
|
39
39
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
40
|
-
_tableNodes.table.use('with_nested_table'), _expand.expand,
|
40
|
+
_tableNodes.table.use('with_nested_table'), _expand.expand, _bodiedExtension.bodiedExtension.use('with_marks'), _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
|
41
41
|
ignore: ['pm-spec']
|
42
42
|
});
|
@@ -26,7 +26,7 @@ var _task = require("../nodes/task");
|
|
26
26
|
var _unsupportedBlock = require("../nodes/unsupportedBlock");
|
27
27
|
var blockGroup = exports.blockGroup = (0, _adfSchemaGenerator.adfNodeGroup)('block', [_blockCard.blockCard, _codeBlock.codeBlock, _mediaSingle.mediaSingle, _mediaSingle.mediaSingle.use('caption'), _mediaSingle.mediaSingle.use('full'), _mediaSingle.mediaSingle.use('width_type'), _paragraph.paragraph, _paragraph.paragraph.use('with_alignment'), _paragraph.paragraph.use('with_indentation'), _paragraph.paragraph.use('with_no_marks'), _task.taskList, _list.orderedList, _list.bulletList, _blockquote.blockquote, _blockquote.blockquote.use('legacy'), _blockquote.blockquote.use('without_nested_codeblock_or_media'), _blockquote.blockquote.use('without_non_bodied_macros'), _decisionList.decisionList, _embedCard.embedCard, _extension.extension, _extension.extension.use('with_marks'), _heading.heading, _heading.heading.use('with_indentation'), _heading.heading.use('with_no_marks'), _heading.heading.use('with_alignment'), _mediaGroup.mediaGroup, _rule.rule, _panel.panel, _panel.panel.use('without_nested_non_bodied_macros'), _tableNodes.table,
|
28
28
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
29
|
-
_tableNodes.table.use('with_nested_table'), _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand,
|
29
|
+
_tableNodes.table.use('with_nested_table'), _bodiedExtension.bodiedExtension, _bodiedExtension.bodiedExtension.use('with_marks'), _expand.expand, _confluenceUnsupportedBlock.confluenceUnsupportedBlock, _unsupportedBlock.unsupportedBlock], {
|
30
30
|
// @DSLCompatibilityException
|
31
31
|
// Block group in PM doesn't match ADF
|
32
32
|
ignore: ['validator-spec', 'json-schema']
|
@@ -27,9 +27,6 @@ var expand = exports.expand = (0, _adfSchemaGenerator.adfNode)('expand').define(
|
|
27
27
|
}
|
28
28
|
},
|
29
29
|
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup, _nestedExpand.nestedExpand.use('with_no_marks'), _nestedExpand.nestedExpand.use('without_non_bodied_macros')))]
|
30
|
-
}).variant('without_nested_expand', {
|
31
|
-
content: [(0, _adfSchemaGenerator.$onePlus)((0, _adfSchemaGenerator.$or)(_nonNestableBlockContentGroup.nonNestableBlockContentGroup))],
|
32
|
-
ignore: ['json-schema', 'validator-spec']
|
33
30
|
}).variant('root_only', {
|
34
31
|
marks: [_breakout.breakout, _unsupportedMark.unsupportedMark, _unsupportedNodeAttribute.unsupportedNodeAttribute],
|
35
32
|
noMarks: false,
|
@@ -16,6 +16,7 @@ var multiBodiedExtension = exports.multiBodiedExtension = (0, _adfSchemaGenerato
|
|
16
16
|
// packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
|
17
17
|
marks: [_unsupportedNodeAttribute.unsupportedNodeAttribute, _unsupportedMark.unsupportedMark],
|
18
18
|
hasEmptyMarks: true,
|
19
|
+
marksMaxItems: 0,
|
19
20
|
attrs: {
|
20
21
|
extensionKey: {
|
21
22
|
type: 'string',
|
package/dist/cjs/schema/index.js
CHANGED
@@ -267,12 +267,6 @@ Object.defineProperty(exports, "emoji", {
|
|
267
267
|
return _nodes.emoji;
|
268
268
|
}
|
269
269
|
});
|
270
|
-
Object.defineProperty(exports, "expand", {
|
271
|
-
enumerable: true,
|
272
|
-
get: function get() {
|
273
|
-
return _nodes.expand;
|
274
|
-
}
|
275
|
-
});
|
276
270
|
Object.defineProperty(exports, "expandToJSON", {
|
277
271
|
enumerable: true,
|
278
272
|
get: function get() {
|
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
5
5
|
value: true
|
6
6
|
});
|
7
|
-
exports.toJSON = exports.expandWithNestedExpand =
|
7
|
+
exports.toJSON = exports.expandWithNestedExpand = void 0;
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
9
9
|
var _nodeTypes = require("../../next-schema/generated/nodeTypes");
|
10
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; }
|
@@ -60,7 +60,6 @@ var nodeSpecOptions = {
|
|
60
60
|
return ['div', attrs, 0];
|
61
61
|
}
|
62
62
|
};
|
63
|
-
var expand = exports.expand = (0, _nodeTypes.expandWithoutNestedExpand)(nodeSpecOptions);
|
64
63
|
var expandWithNestedExpand = exports.expandWithNestedExpand = (0, _nodeTypes.expand)(nodeSpecOptions);
|
65
64
|
var toJSON = exports.toJSON = function toJSON(node) {
|
66
65
|
return {
|
@@ -142,12 +142,6 @@ Object.defineProperty(exports, "emoji", {
|
|
142
142
|
return _emoji.emoji;
|
143
143
|
}
|
144
144
|
});
|
145
|
-
Object.defineProperty(exports, "expand", {
|
146
|
-
enumerable: true,
|
147
|
-
get: function get() {
|
148
|
-
return _expand.expand;
|
149
|
-
}
|
150
|
-
});
|
151
145
|
Object.defineProperty(exports, "expandToJSON", {
|
152
146
|
enumerable: true,
|
153
147
|
get: function get() {
|
package/dist/es2019/index.js
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, extendedBlockquote, blockquoteWithoutNonBodiedMacros, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
|
2
|
-
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji,
|
2
|
+
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expandWithNestedExpand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, listItemWithDecisionStage0, listItemWithoutNonBodiedMacros, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithoutNonBodiedMacros, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithoutNestedNonBodiedMacros, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } from './schema';
|
3
3
|
export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid, getDarkModeLCHColor } from './utils';
|
4
4
|
|
5
5
|
// ADF createPMSpecFactory
|
@@ -322,21 +322,6 @@ export const expandRootOnly = createPMNodeSpecFactory({
|
|
322
322
|
selectable: true,
|
323
323
|
isolating: true
|
324
324
|
});
|
325
|
-
export const expandWithoutNestedExpand = createPMNodeSpecFactory({
|
326
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
|
327
|
-
marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
|
328
|
-
group: 'block',
|
329
|
-
attrs: {
|
330
|
-
title: {
|
331
|
-
default: ''
|
332
|
-
},
|
333
|
-
__expanded: {
|
334
|
-
default: true
|
335
|
-
}
|
336
|
-
},
|
337
|
-
selectable: true,
|
338
|
-
isolating: true
|
339
|
-
});
|
340
325
|
export const extension = createPMNodeSpecFactory({
|
341
326
|
group: 'block',
|
342
327
|
atom: true,
|
@@ -32,6 +32,6 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
|
32
32
|
*/
|
33
33
|
export const blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, panel.use('without_nested_non_bodied_macros'), blockquote, blockquote.use('without_nested_codeblock_or_media'), blockquote.use('without_non_bodied_macros'), extension.use('with_marks'), embedCard, table,
|
34
34
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
35
|
-
table.use('with_nested_table'), expand,
|
35
|
+
table.use('with_nested_table'), expand, bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
|
36
36
|
ignore: ['pm-spec']
|
37
37
|
});
|
@@ -20,7 +20,7 @@ import { taskList } from '../nodes/task';
|
|
20
20
|
import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
21
21
|
export const blockGroup = adfNodeGroup('block', [blockCard, codeBlock, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), blockquote.use('without_non_bodied_macros'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('without_nested_non_bodied_macros'), table,
|
22
22
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
23
|
-
table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand,
|
23
|
+
table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand, confluenceUnsupportedBlock, unsupportedBlock], {
|
24
24
|
// @DSLCompatibilityException
|
25
25
|
// Block group in PM doesn't match ADF
|
26
26
|
ignore: ['validator-spec', 'json-schema']
|
@@ -21,9 +21,6 @@ export const expand = adfNode('expand').define({
|
|
21
21
|
}
|
22
22
|
},
|
23
23
|
content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks'), nestedExpand.use('without_non_bodied_macros')))]
|
24
|
-
}).variant('without_nested_expand', {
|
25
|
-
content: [$onePlus($or(nonNestableBlockContentGroup))],
|
26
|
-
ignore: ['json-schema', 'validator-spec']
|
27
24
|
}).variant('root_only', {
|
28
25
|
marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
|
29
26
|
noMarks: false,
|
@@ -10,6 +10,7 @@ export const multiBodiedExtension = adfNode('multiBodiedExtension').define({
|
|
10
10
|
// packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
|
11
11
|
marks: [unsupportedNodeAttribute, unsupportedMark],
|
12
12
|
hasEmptyMarks: true,
|
13
|
+
marksMaxItems: 0,
|
13
14
|
attrs: {
|
14
15
|
extensionKey: {
|
15
16
|
type: 'string',
|
@@ -1,4 +1,4 @@
|
|
1
|
-
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, extendedBlockquote, blockquoteWithoutNonBodiedMacros, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji,
|
1
|
+
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, extendedBlockquote, blockquoteWithoutNonBodiedMacros, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expandWithNestedExpand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, listItemWithoutNonBodiedMacros, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithoutNonBodiedMacros, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithoutNestedNonBodiedMacros, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } from './nodes';
|
2
2
|
export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
|
3
3
|
colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, backgroundColor, backgroundColorPalette } from './marks';
|
4
4
|
export { unsupportedNodeTypesForMediaCards } from './unsupported';
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import {
|
1
|
+
import { expand as expandFactory } from '../../next-schema/generated/nodeTypes';
|
2
2
|
|
3
3
|
/**
|
4
4
|
* @name expand_node
|
@@ -51,7 +51,6 @@ const nodeSpecOptions = {
|
|
51
51
|
return ['div', attrs, 0];
|
52
52
|
}
|
53
53
|
};
|
54
|
-
export const expand = expandWithoutNestedExpandFactory(nodeSpecOptions);
|
55
54
|
export const expandWithNestedExpand = expandFactory(nodeSpecOptions);
|
56
55
|
export const toJSON = node => ({
|
57
56
|
attrs: Object.keys(node.attrs).filter(key => !key.startsWith('__')).reduce((obj, key) => {
|
@@ -1,4 +1,4 @@
|
|
1
|
-
export {
|
1
|
+
export { expandWithNestedExpand, toJSON as expandToJSON } from './expand';
|
2
2
|
export { confluenceJiraIssue } from './confluence-jira-issue';
|
3
3
|
export { confluenceUnsupportedBlock } from './confluence-unsupported-block';
|
4
4
|
export { confluenceUnsupportedInline } from './confluence-unsupported-inline';
|
package/dist/esm/index.js
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, extendedBlockquote, blockquoteWithoutNonBodiedMacros, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
|
2
|
-
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji,
|
2
|
+
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expandWithNestedExpand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, listItemWithDecisionStage0, listItemWithoutNonBodiedMacros, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithoutNonBodiedMacros, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithoutNestedNonBodiedMacros, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } from './schema';
|
3
3
|
export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid, getDarkModeLCHColor } from './utils';
|
4
4
|
|
5
5
|
// ADF createPMSpecFactory
|
@@ -322,21 +322,6 @@ export var expandRootOnly = createPMNodeSpecFactory({
|
|
322
322
|
selectable: true,
|
323
323
|
isolating: true
|
324
324
|
});
|
325
|
-
export var expandWithoutNestedExpand = createPMNodeSpecFactory({
|
326
|
-
content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
|
327
|
-
marks: 'unsupportedMark unsupportedNodeAttribute fragment dataConsumer',
|
328
|
-
group: 'block',
|
329
|
-
attrs: {
|
330
|
-
title: {
|
331
|
-
default: ''
|
332
|
-
},
|
333
|
-
__expanded: {
|
334
|
-
default: true
|
335
|
-
}
|
336
|
-
},
|
337
|
-
selectable: true,
|
338
|
-
isolating: true
|
339
|
-
});
|
340
325
|
export var extension = createPMNodeSpecFactory({
|
341
326
|
group: 'block',
|
342
327
|
atom: true,
|
@@ -32,6 +32,6 @@ import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
|
32
32
|
*/
|
33
33
|
export var blockContentGroup = adfNodeGroup('block_content', [blockCard, paragraph.use('with_no_marks'), paragraph.use('with_alignment'), paragraph.use('with_indentation'), mediaSingle.use('caption'), mediaSingle.use('full'), codeBlock, taskList, bulletList, orderedList, heading.use('with_no_marks'), heading.use('with_alignment'), heading.use('with_indentation'), mediaGroup, decisionList, rule, panel, panel.use('without_nested_non_bodied_macros'), blockquote, blockquote.use('without_nested_codeblock_or_media'), blockquote.use('without_non_bodied_macros'), extension.use('with_marks'), embedCard, table,
|
34
34
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
35
|
-
table.use('with_nested_table'), expand,
|
35
|
+
table.use('with_nested_table'), expand, bodiedExtension.use('with_marks'), confluenceUnsupportedBlock, unsupportedBlock], {
|
36
36
|
ignore: ['pm-spec']
|
37
37
|
});
|
@@ -20,7 +20,7 @@ import { taskList } from '../nodes/task';
|
|
20
20
|
import { unsupportedBlock } from '../nodes/unsupportedBlock';
|
21
21
|
export var blockGroup = adfNodeGroup('block', [blockCard, codeBlock, mediaSingle, mediaSingle.use('caption'), mediaSingle.use('full'), mediaSingle.use('width_type'), paragraph, paragraph.use('with_alignment'), paragraph.use('with_indentation'), paragraph.use('with_no_marks'), taskList, orderedList, bulletList, blockquote, blockquote.use('legacy'), blockquote.use('without_nested_codeblock_or_media'), blockquote.use('without_non_bodied_macros'), decisionList, embedCard, extension, extension.use('with_marks'), heading, heading.use('with_indentation'), heading.use('with_no_marks'), heading.use('with_alignment'), mediaGroup, rule, panel, panel.use('without_nested_non_bodied_macros'), table,
|
22
22
|
// @ts-expect-error - types don't deal well with circular references for the variant
|
23
|
-
table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand,
|
23
|
+
table.use('with_nested_table'), bodiedExtension, bodiedExtension.use('with_marks'), expand, confluenceUnsupportedBlock, unsupportedBlock], {
|
24
24
|
// @DSLCompatibilityException
|
25
25
|
// Block group in PM doesn't match ADF
|
26
26
|
ignore: ['validator-spec', 'json-schema']
|
@@ -21,9 +21,6 @@ export var expand = adfNode('expand').define({
|
|
21
21
|
}
|
22
22
|
},
|
23
23
|
content: [$onePlus($or(nonNestableBlockContentGroup, nestedExpand.use('with_no_marks'), nestedExpand.use('without_non_bodied_macros')))]
|
24
|
-
}).variant('without_nested_expand', {
|
25
|
-
content: [$onePlus($or(nonNestableBlockContentGroup))],
|
26
|
-
ignore: ['json-schema', 'validator-spec']
|
27
24
|
}).variant('root_only', {
|
28
25
|
marks: [breakout, unsupportedMark, unsupportedNodeAttribute],
|
29
26
|
noMarks: false,
|
@@ -10,6 +10,7 @@ export var multiBodiedExtension = adfNode('multiBodiedExtension').define({
|
|
10
10
|
// packages/adf-schema-generator/src/transforms/adfToPm/buildPmSpec.ts
|
11
11
|
marks: [unsupportedNodeAttribute, unsupportedMark],
|
12
12
|
hasEmptyMarks: true,
|
13
|
+
marksMaxItems: 0,
|
13
14
|
attrs: {
|
14
15
|
extensionKey: {
|
15
16
|
type: 'string',
|
package/dist/esm/schema/index.js
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, extendedBlockquote, blockquoteWithoutNonBodiedMacros, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji,
|
1
|
+
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, extendedBlockquote, blockquoteWithoutNonBodiedMacros, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expandWithNestedExpand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, listItemWithoutNonBodiedMacros, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithoutNonBodiedMacros, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithoutNestedNonBodiedMacros, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable } from './nodes';
|
2
2
|
export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, /** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
|
3
3
|
colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, backgroundColor, backgroundColorPalette } from './marks';
|
4
4
|
export { unsupportedNodeTypesForMediaCards } from './unsupported';
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
2
2
|
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; }
|
3
3
|
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; }
|
4
|
-
import {
|
4
|
+
import { expand as expandFactory } from '../../next-schema/generated/nodeTypes';
|
5
5
|
|
6
6
|
/**
|
7
7
|
* @name expand_node
|
@@ -54,7 +54,6 @@ var nodeSpecOptions = {
|
|
54
54
|
return ['div', attrs, 0];
|
55
55
|
}
|
56
56
|
};
|
57
|
-
export var expand = expandWithoutNestedExpandFactory(nodeSpecOptions);
|
58
57
|
export var expandWithNestedExpand = expandFactory(nodeSpecOptions);
|
59
58
|
export var toJSON = function toJSON(node) {
|
60
59
|
return {
|
@@ -1,4 +1,4 @@
|
|
1
|
-
export {
|
1
|
+
export { expandWithNestedExpand, toJSON as expandToJSON } from './expand';
|
2
2
|
export { confluenceJiraIssue } from './confluence-jira-issue';
|
3
3
|
export { confluenceUnsupportedBlock } from './confluence-unsupported-block';
|
4
4
|
export { confluenceUnsupportedInline } from './confluence-unsupported-inline';
|
package/dist/types/index.d.ts
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
export { PanelType, AnnotationTypes, alignment, alignmentPositionMap, annotation, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, extendedBlockquote, blockquoteWithoutNonBodiedMacros, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette,
|
2
2
|
/** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
|
3
|
-
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji,
|
3
|
+
colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expandWithNestedExpand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, listItemWithTask, listItemWithDecisionStage0, listItemWithoutNonBodiedMacros, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleSpec, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithoutNonBodiedMacros, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithoutNestedNonBodiedMacros, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, textColor, toJSONTableCell, toJSONTableHeader, typeAheadQuery, underline, unknownBlock, unsupportedBlock, unsupportedInline, unsupportedNodeTypesForMediaCards, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute, border, borderColorPalette, extensionFrame, multiBodiedExtension, backgroundColor, backgroundColorPalette, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable, } from './schema';
|
4
4
|
export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, DatasourceAttributes, DatasourceAttributeProperties, DataConsumerAttributes, DataConsumerDefinition, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmDefinition, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, FragmentAttributes, FragmentDefinition, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, IndentationMarkAttributes, IndentationMarkDefinition, Inline, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, LinkAttributes, LinkDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StrikeDefinition, StrongDefinition, SubSupAttributes, SubSupDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableDisplayMode, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextColorAttributes, TextColorDefinition, TextDefinition, UnderlineDefinition, UrlType, AnnotationId, RichMediaAttributes, ExtendedMediaAttributes, RichMediaLayout, AnnotationDataAttributes, CellDomAttrs, BorderMarkAttributes, BorderMarkDefinition, MultiBodiedExtensionDefinition, ExtensionFrameDefinition, BackgroundColorDefinition, } from './schema';
|
5
5
|
export { B100, B400, B50, B500, B75, G200, G300, G400, G50, G500, G75, N0, N20, N200, N30, N300, N40, N50, N500, N60, N80, N800, N90, P100, P300, P400, P50, P500, P75, R100, R300, R400, R50, R500, R75, T100, T300, T50, T500, T75, Y200, Y400, Y50, Y500, Y75, acNameToEmoji, acShortcutToEmoji, emojiIdToAcName, generateUuid, getEmojiAcName, getLinkMatch, hexToRgb, hexToRgba, isHex, isRgb, isSafeUrl, linkify, linkifyMatch, normalizeHexColor, normalizeUrl, rgbToHex, uuid, getDarkModeLCHColor, } from './utils';
|
6
6
|
export type { Match, NameToEmoji } from './utils';
|
@@ -3,8 +3,8 @@
|
|
3
3
|
* DO NOT MODIFY IT BY HAND. Instead, modify the source files in "packages/adf-schema/src/next-schema" ,
|
4
4
|
* and run "yarn workspace @atlaskit/adf-schema build:schema:all" to regenerate this file.
|
5
5
|
*/
|
6
|
-
import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BlockquoteWithoutNestedCodeblockOrMediaDefinition, BlockquoteWithoutNonBodiedMacrosDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DateStage0Definition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, EmojiStage0Definition, ExpandDefinition,
|
7
|
-
export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BlockquoteWithoutNestedCodeblockOrMediaDefinition | BlockquoteWithoutNonBodiedMacrosDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelWithoutNestedNonBodiedMacrosDefinition | TableDefinition | TableWithNestedTableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition |
|
6
|
+
import type { BlockCardDefinition, BlockquoteDefinition, BlockquoteLegacyDefinition, BlockquoteWithoutNestedCodeblockOrMediaDefinition, BlockquoteWithoutNonBodiedMacrosDefinition, BodiedExtensionDefinition, BodiedExtensionWithMarksDefinition, BulletListDefinition, CodeBlockDefinition, ConfluenceJiraIssueDefinition, ConfluenceUnsupportedBlockDefinition, ConfluenceUnsupportedInlineDefinition, DateDefinition, DateStage0Definition, DecisionListDefinition, EmbedCardDefinition, EmojiDefinition, EmojiStage0Definition, ExpandDefinition, ExtensionDefinition, ExtensionWithMarksDefinition, HardBreakDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithNoMarksDefinition, ImageDefinition, InlineCardDefinition, InlineCardStage0Definition, InlineExtensionDefinition, InlineExtensionWithMarksDefinition, MediaGroupDefinition, MediaInlineDefinition, MediaSingleCaptionDefinition, MediaSingleDefinition, MediaSingleFullDefinition, MediaSingleWidthTypeDefinition, MentionDefinition, MentionStage0Definition, MultiBodiedExtensionStage0Definition, OrderedListDefinition, PanelDefinition, PanelWithoutNestedNonBodiedMacrosDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithNoMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, StatusStage0Definition, TableDefinition, TableWithNestedTableDefinition, TaskListDefinition, TextCodeInlineDefinition, TextDefinition, TextFormattedDefinition, UnsupportedBlockDefinition, UnsupportedInlineDefinition } from './nodeTypes';
|
7
|
+
export type BlockDefinition = Array<BlockCardDefinition | CodeBlockDefinition | MediaSingleDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | MediaSingleWidthTypeDefinition | ParagraphDefinition | ParagraphWithAlignmentDefinition | ParagraphWithIndentationDefinition | ParagraphWithNoMarksDefinition | TaskListDefinition | OrderedListDefinition | BulletListDefinition | BlockquoteDefinition | BlockquoteLegacyDefinition | BlockquoteWithoutNestedCodeblockOrMediaDefinition | BlockquoteWithoutNonBodiedMacrosDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionDefinition | ExtensionWithMarksDefinition | HeadingDefinition | HeadingWithIndentationDefinition | HeadingWithNoMarksDefinition | HeadingWithAlignmentDefinition | MediaGroupDefinition | RuleDefinition | PanelDefinition | PanelWithoutNestedNonBodiedMacrosDefinition | TableDefinition | TableWithNestedTableDefinition | BodiedExtensionDefinition | BodiedExtensionWithMarksDefinition | ExpandDefinition | ConfluenceUnsupportedBlockDefinition | UnsupportedBlockDefinition>;
|
8
8
|
export type BlockRootOnlyDefinition = Array<MultiBodiedExtensionStage0Definition>;
|
9
9
|
export type InlineDefinition = Array<TextDefinition | TextFormattedDefinition | TextCodeInlineDefinition | DateDefinition | DateStage0Definition | EmojiDefinition | EmojiStage0Definition | HardBreakDefinition | InlineCardDefinition | InlineCardStage0Definition | MentionDefinition | MentionStage0Definition | PlaceholderDefinition | StatusDefinition | StatusStage0Definition | InlineExtensionDefinition | InlineExtensionWithMarksDefinition | MediaInlineDefinition | ImageDefinition | ConfluenceJiraIssueDefinition | ConfluenceUnsupportedInlineDefinition | UnsupportedInlineDefinition>;
|
10
10
|
export type NonNestableBlockContentDefinition = Array<ParagraphWithNoMarksDefinition | PanelDefinition | BlockquoteDefinition | OrderedListDefinition | BulletListDefinition | RuleDefinition | HeadingWithNoMarksDefinition | CodeBlockDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | DecisionListDefinition | TaskListDefinition | TableDefinition | TableWithNestedTableDefinition | BlockCardDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | UnsupportedBlockDefinition>;
|
@@ -246,16 +246,6 @@ export interface ExpandRootOnlyDefinition {
|
|
246
246
|
}
|
247
247
|
export type ExpandRootOnlyNode = PMNode & ExpandRootOnlyDefinition;
|
248
248
|
export declare const expandRootOnly: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandRootOnlyNode>) => import("prosemirror-model").NodeSpec;
|
249
|
-
export interface ExpandWithoutNestedExpandDefinition {
|
250
|
-
type: 'expand';
|
251
|
-
content: Array<BlockCardDefinition | BlockquoteDefinition | BulletListDefinition | CodeBlockDefinition | DecisionListDefinition | EmbedCardDefinition | ExtensionWithMarksDefinition | HeadingWithNoMarksDefinition | MediaGroupDefinition | MediaSingleCaptionDefinition | MediaSingleFullDefinition | OrderedListDefinition | PanelDefinition | ParagraphWithNoMarksDefinition | RuleDefinition | TableDefinition | TableWithNestedTableDefinition | TaskListDefinition | UnsupportedBlockDefinition>;
|
252
|
-
attrs: {
|
253
|
-
title?: string;
|
254
|
-
__expanded?: boolean;
|
255
|
-
};
|
256
|
-
}
|
257
|
-
export type ExpandWithoutNestedExpandNode = PMNode & ExpandWithoutNestedExpandDefinition;
|
258
|
-
export declare const expandWithoutNestedExpand: ({ parseDOM, toDOM, toDebugString }: import("../../schema/createPMSpecFactory").NodeSpecOptions<ExpandWithoutNestedExpandNode>) => import("prosemirror-model").NodeSpec;
|
259
249
|
export interface ExtensionDefinition {
|
260
250
|
type: 'extension';
|
261
251
|
marks: Array<UnsupportedMarkMark | UnsupportedNodeAttributeMark>;
|
@@ -1,7 +1,4 @@
|
|
1
|
-
export declare const expand: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "
|
2
|
-
content: import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFNodeContentOneOrMoreSpec[];
|
3
|
-
ignore: ("json-schema" | "validator-spec")[];
|
4
|
-
} & {
|
1
|
+
export declare const expand: import("@atlaskit/adf-schema-generator/dist/types/adfNode").ADFNode<[string, "root_only"], import("@atlaskit/adf-schema-generator/dist/types/types/ADFNodeSpec").ADFCommonNodeSpec & {
|
5
2
|
marks: import("@atlaskit/adf-schema-generator/dist/types/adfMark").ADFMark<import("@atlaskit/adf-schema-generator/dist/types/types/ADFMarkSpec").ADFMarkSpec>[];
|
6
3
|
noMarks: false;
|
7
4
|
noExtend: true;
|
@@ -1,4 +1,4 @@
|
|
1
|
-
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, extendedBlockquote, blockquoteWithoutNonBodiedMacros, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji,
|
1
|
+
export { PanelType, blockCard, blockquote, blockquoteWithList, blockquoteWithNestedCodeblockOrMedia, extendedBlockquote, blockquoteWithoutNonBodiedMacros, bodiedExtension, bulletList, bulletListSelector, caption, codeBlock, codeBlockToJSON, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, date, decisionItem, decisionList, decisionListSelector, doc, embedCard, emoji, expandWithNestedExpand, expandToJSON, extension, hardBreak, heading, image, inlineCard, inlineExtension, layoutColumn, layoutSection, layoutSectionWithSingleColumn, listItem, listItemWithTask, listItemWithDecisionStage0, listItemWithoutNonBodiedMacros, media, mediaGroup, mediaSingle, mediaSingleSpec, mediaInline, mediaSingleWithCaption, mediaSingleWithWidthType, mediaSingleFull, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, nestedExpandWithoutNonBodiedMacros, orderedList, orderedListSelector, orderedListWithOrder, extendedPanel, panelWithoutNestedNonBodiedMacros, paragraph, placeholder, rule, getCellAttrs, getCellDomAttrs, status, table, tableStage0, tableWithCustomWidth, tableBackgroundBorderColor, tableBackgroundColorNames, tableBackgroundColorPalette, tableCell, tableCellContentDomSelector, tableCellContentWrapperSelector, tableCellSelector, tableHeader, tableHeaderSelector, tablePrefixSelector, tableRow, tableToJSON, taskItem, taskList, taskListSelector, text, toJSONTableCell, toJSONTableHeader, unknownBlock, unsupportedBlock, unsupportedInline, extensionFrame, multiBodiedExtension, tableWithNestedTable, tableRowWithNestedTable, tableCellWithNestedTable, tableHeaderWithNestedTable, } from './nodes';
|
2
2
|
export type { BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, DatasourceAttributes, DatasourceAttributeProperties, DataType, DateDefinition, DecisionItemDefinition, DecisionListDefinition, DocNode, EmbedCardDefinition, EmbedCardAttributes, EmojiAttributes, EmojiDefinition, ExpandDefinition, ExtensionDefinition, ExtensionLayout, ExternalMediaAttributes, HardBreakDefinition, HeadingBaseDefinition, HeadingDefinition, HeadingWithAlignmentDefinition, HeadingWithIndentationDefinition, HeadingWithMarksDefinition, Inline, InlineCardDefinition, InlineCode, InlineExtensionDefinition, InlineFormattedText, InlineLinkText, LayoutColumnDefinition, LayoutSectionDefinition, LayoutSectionBaseDefinition, LayoutSectionFullDefinition, LayoutSectionWithSingleColumnDefinition, ListItemArray, ListItemDefinition, MarksObject, MediaADFAttrs, MediaAttributes, MediaInlineAttributes, MediaInlineDefinition, MediaBaseAttributes, MediaDefinition, MediaDisplayType, MediaGroupDefinition, MediaSingleDefinition, MediaType, MentionAttributes, MentionDefinition, MentionUserType, NestedExpandContent, NestedExpandDefinition, NoMark, NonNestableBlockContent, OrderedListDefinition, PanelAttributes, PanelDefinition, ParagraphBaseDefinition, ParagraphDefinition, ParagraphWithAlignmentDefinition, ParagraphWithIndentationDefinition, ParagraphWithMarksDefinition, PlaceholderDefinition, RuleDefinition, StatusDefinition, TableAttributes, TableCellDefinition, TableDefinition, TableWithNestedTableDefinition, TableRowWithNestedTableDefinition, TableCellWithNestedTableDefinition, TableHeaderWithNestedTableDefinition, TableDisplayMode, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextDefinition, UrlType, RichMediaAttributes, ExtendedMediaAttributes, RichMediaLayout, CellDomAttrs, ExtensionFrameDefinition, MultiBodiedExtensionDefinition, } from './nodes';
|
3
3
|
export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette,
|
4
4
|
/** @deprecated [ED-15849] The extended palette is now rolled into the main one. Use `colorPalette` instead. */
|
@@ -26,7 +26,6 @@ export type ExpandDefinition = ExpandBaseDefinition & NoMark;
|
|
26
26
|
* @name expand_root_only_node
|
27
27
|
*/
|
28
28
|
export type ExpandRootOnlyDefinition = ExpandBaseDefinition & MarksObject<BreakoutMarkDefinition>;
|
29
|
-
export declare const expand: import("prosemirror-model").NodeSpec;
|
30
29
|
export declare const expandWithNestedExpand: import("prosemirror-model").NodeSpec;
|
31
30
|
export declare const toJSON: (node: PMNode) => {
|
32
31
|
attrs: import("prosemirror-model").Attrs;
|
@@ -1,4 +1,4 @@
|
|
1
|
-
export {
|
1
|
+
export { expandWithNestedExpand, toJSON as expandToJSON } from './expand';
|
2
2
|
export type { ExpandDefinition } from './expand';
|
3
3
|
export { confluenceJiraIssue } from './confluence-jira-issue';
|
4
4
|
export { confluenceUnsupportedBlock } from './confluence-unsupported-block';
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@atlaskit/adf-schema",
|
3
|
-
"version": "
|
3
|
+
"version": "48.0.0",
|
4
4
|
"description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
|
5
5
|
"publishConfig": {
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
@@ -46,7 +46,7 @@
|
|
46
46
|
"memoize-one": "^6.0.0"
|
47
47
|
},
|
48
48
|
"devDependencies": {
|
49
|
-
"@atlaskit/adf-schema-generator": "^2.1.
|
49
|
+
"@atlaskit/adf-schema-generator": "^2.1.1",
|
50
50
|
"@atlaskit/codemod-utils": "^4.2.4",
|
51
51
|
"@atlassian/adf-schema-json": "^1.31.0",
|
52
52
|
"@babel/cli": "^7.22.9",
|
@@ -1,33 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
4
|
-
Object.defineProperty(exports, "__esModule", {
|
5
|
-
value: true
|
6
|
-
});
|
7
|
-
exports.sortNestedArrays = sortNestedArrays;
|
8
|
-
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
9
|
-
function sortNestedArrays(obj) {
|
10
|
-
if (obj === null || obj === undefined) {
|
11
|
-
return obj;
|
12
|
-
}
|
13
|
-
if (Array.isArray(obj) && typeof obj[0] === 'string' && (0, _typeof2.default)(obj[1]) === 'object') {
|
14
|
-
// 1. tuple of object + string
|
15
|
-
obj[1] = sortNestedArrays(obj[1]);
|
16
|
-
} else if (Array.isArray(obj) && Array.isArray(obj[0])) {
|
17
|
-
// 2. array of arrays
|
18
|
-
for (var i = 0; i < obj.length; i++) {
|
19
|
-
obj[i] = sortNestedArrays(obj[i]);
|
20
|
-
}
|
21
|
-
} else if (Array.isArray(obj) && !Array.isArray(obj[0]) && (0, _typeof2.default)(obj[0]) !== 'object') {
|
22
|
-
// 3. simple array
|
23
|
-
obj.sort();
|
24
|
-
}
|
25
|
-
if ((0, _typeof2.default)(obj) === 'object') {
|
26
|
-
// 4. object
|
27
|
-
for (var _i = 0, _Object$keys = Object.keys(obj); _i < _Object$keys.length; _i++) {
|
28
|
-
var key = _Object$keys[_i];
|
29
|
-
obj[key] = sortNestedArrays(obj[key]);
|
30
|
-
}
|
31
|
-
}
|
32
|
-
return obj;
|
33
|
-
}
|
@@ -1,24 +0,0 @@
|
|
1
|
-
export function sortNestedArrays(obj) {
|
2
|
-
if (obj === null || obj === undefined) {
|
3
|
-
return obj;
|
4
|
-
}
|
5
|
-
if (Array.isArray(obj) && typeof obj[0] === 'string' && typeof obj[1] === 'object') {
|
6
|
-
// 1. tuple of object + string
|
7
|
-
obj[1] = sortNestedArrays(obj[1]);
|
8
|
-
} else if (Array.isArray(obj) && Array.isArray(obj[0])) {
|
9
|
-
// 2. array of arrays
|
10
|
-
for (let i = 0; i < obj.length; i++) {
|
11
|
-
obj[i] = sortNestedArrays(obj[i]);
|
12
|
-
}
|
13
|
-
} else if (Array.isArray(obj) && !Array.isArray(obj[0]) && typeof obj[0] !== 'object') {
|
14
|
-
// 3. simple array
|
15
|
-
obj.sort();
|
16
|
-
}
|
17
|
-
if (typeof obj === 'object') {
|
18
|
-
// 4. object
|
19
|
-
for (const key of Object.keys(obj)) {
|
20
|
-
obj[key] = sortNestedArrays(obj[key]);
|
21
|
-
}
|
22
|
-
}
|
23
|
-
return obj;
|
24
|
-
}
|
@@ -1,26 +0,0 @@
|
|
1
|
-
import _typeof from "@babel/runtime/helpers/typeof";
|
2
|
-
export function sortNestedArrays(obj) {
|
3
|
-
if (obj === null || obj === undefined) {
|
4
|
-
return obj;
|
5
|
-
}
|
6
|
-
if (Array.isArray(obj) && typeof obj[0] === 'string' && _typeof(obj[1]) === 'object') {
|
7
|
-
// 1. tuple of object + string
|
8
|
-
obj[1] = sortNestedArrays(obj[1]);
|
9
|
-
} else if (Array.isArray(obj) && Array.isArray(obj[0])) {
|
10
|
-
// 2. array of arrays
|
11
|
-
for (var i = 0; i < obj.length; i++) {
|
12
|
-
obj[i] = sortNestedArrays(obj[i]);
|
13
|
-
}
|
14
|
-
} else if (Array.isArray(obj) && !Array.isArray(obj[0]) && _typeof(obj[0]) !== 'object') {
|
15
|
-
// 3. simple array
|
16
|
-
obj.sort();
|
17
|
-
}
|
18
|
-
if (_typeof(obj) === 'object') {
|
19
|
-
// 4. object
|
20
|
-
for (var _i = 0, _Object$keys = Object.keys(obj); _i < _Object$keys.length; _i++) {
|
21
|
-
var key = _Object$keys[_i];
|
22
|
-
obj[key] = sortNestedArrays(obj[key]);
|
23
|
-
}
|
24
|
-
}
|
25
|
-
return obj;
|
26
|
-
}
|
@@ -1 +0,0 @@
|
|
1
|
-
export declare function sortNestedArrays<T>(obj: T): T;
|