@atlaskit/adf-schema 20.1.3 → 22.0.1

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

@@ -1,68 +1,27 @@
-import { Fragment } from 'prosemirror-model';
-import { isSafeUrl } from '../../utils/url';
-
-const getLinkContent = (node, schema) => {
-  if (!(node instanceof HTMLAnchorElement)) {
-    return Fragment.empty;
-  }
-
-  const href = node.getAttribute('href') || '';
-  const text = node.innerText;
-
-  if (!text || text.length === 0) {
-    return Fragment.empty;
-  }
-
-  const marks = isSafeUrl(href) ? [schema.marks.link.create({
-    href
-  })] : [];
-  const textNode = schema.text(text, marks);
-  return Fragment.from(textNode);
-};
-
-const blockTags = {
-  address: true,
-  article: true,
-  aside: true,
-  blockquote: true,
-  canvas: true,
-  dd: true,
-  div: true,
-  dl: true,
-  fieldset: true,
-  figcaption: true,
-  figure: true,
-  footer: true,
-  form: true,
-  h1: true,
-  h2: true,
-  h3: true,
-  h4: true,
-  h5: true,
-  h6: true,
-  header: true,
-  hgroup: true,
-  hr: true,
-  li: true,
-  noscript: true,
-  ol: true,
-  output: true,
-  p: true,
-  pre: true,
-  section: true,
-  table: true,
-  tfoot: true,
-  ul: true
-};
-
-const isListItemNode = node => {
-  return Boolean(node && node.nodeName.toLowerCase() === 'li');
-};
-
-const isTextNode = node => {
-  return Boolean(node && node.nodeType === Node.TEXT_NODE);
-};
-
+/**
+ * @name paragraph_node
+ */
+
+/**
+ * @name paragraph_with_no_marks_node
+ */
+
+/**
+ * NOTE: Need this because TS is too smart and inline everything.
+ * So we need to give them separate identity.
+ * Probably there's a way to solve it but that will need time and exploration.
+ * // http://bit.ly/2raXFX5
+ * type T1 = X | Y
+ * type T2 = A | T1 | B // T2 = A | X | Y | B
+ */
+
+/**
+ * @name paragraph_with_alignment_node
+ */
+
+/**
+ * @name paragraph_with_indentation_node
+ */
 const isImageNode = node => {
   return Boolean(node && node.nodeName.toLowerCase() === 'img');
 };
@@ -83,21 +42,6 @@ const hasInlineImage = node => {
   });
 };
 
-const hasWhiteSpacePre = node => {
-  return Boolean(node instanceof HTMLElement && node.style.whiteSpace === 'pre');
-};
-
-const hasFontFamilyMonospace = node => {
-  return Boolean(node instanceof HTMLElement && node.style.fontFamily.includes('monospace'));
-};
-
-const isBlockLevelNode = node => {
-  return Boolean(node && blockTags.hasOwnProperty(node.nodeName.toLowerCase()));
-};
-
-const NOT_INTERNAL_LINKS = [':not([data-inline-card])', ':not([data-block-card])', ':not([data-block-link])', ':not([data-skip-paste])'].join('');
-const ANCHOR_LINK = `a[href]${NOT_INTERNAL_LINKS}`;
-const NOT_INTERNAL_ELEMENTS = [':not(.code-block)', ':not([data-node-type])', ':not([data-embed-card])', ':not([data-layout-section])', ':not([data-task-local-id])', ':not([data-task-state])', ':not([data-pm-slice])', ':not([data-mark-type])', ':not([data-layout-content])', ':not([data-panel-content])'].join('');
 const pDOM = ['p', 0];
 export const paragraph = {
   selectable: false,
@@ -106,68 +50,6 @@ export const paragraph = {
   marks: 'strong code em link strike subsup textColor typeAheadQuery underline confluenceInlineComment action annotation unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   parseDOM: [{
     tag: 'p'
-  }, {
-    tag: `div${NOT_INTERNAL_ELEMENTS}, li:not([data-pm-slice])`,
-    priority: 100,
-    getAttrs: node => {
-      if (!(node instanceof Node)) {
-        return false;
-      }
-
-      const isCodeBlock = hasWhiteSpacePre(node) || hasFontFamilyMonospace(node);
-
-      if (isCodeBlock || !node.hasChildNodes()) {
-        return false;
-      }
-
-      const hasInlineChildren = Array.from(node.childNodes).every(child => !isBlockLevelNode(child) && // IMG is considered block for mediaSingle
-      !isImageNode(child));
-
-      if (!hasInlineChildren) {
-        return false;
-      }
-
-      if ( // We can skip this rule for pure list items
-      isListItemNode(node) && Array.from(node.childNodes).every(isTextNode)) {
-        return false;
-      }
-
-      return null;
-    }
-  }, {
-    tag: `:not(span) + ${ANCHOR_LINK}`,
-    priority: 100,
-    getContent: getLinkContent
-  }, {
-    tag: `:not(span) > ${ANCHOR_LINK}:first-child`,
-    getAttrs: node => {
-      if (!(node instanceof Node)) {
-        return false;
-      }
-
-      if (isBlockLevelNode(node.firstChild)) {
-        return null;
-      }
-
-      if (hasInlineImage(node)) {
-        return false;
-      }
-
-      const isNextSiblingValid = node.nextSibling === null || node.nextSibling instanceof Text && (node.nextSibling.textContent || '').trim().length === 0;
-
-      if (isNextSiblingValid) {
-        return null;
-      } // This rule should not match when there is any sibling after the anchor
-
-
-      if (!isBlockLevelNode(node.nextSibling)) {
-        return false;
-      }
-
-      return null;
-    },
-    priority: 100,
-    getContent: getLinkContent
   }],
 
   toDOM() {

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

@@ -183,7 +183,7 @@ export const tableCell = {
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle |  mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
   attrs: cellAttrs,
   tableRole: 'cell',
-  marks: 'link alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
+  marks: 'alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   isolating: true,
   parseDOM: [// Ignore number cell copied from renderer
   {
@@ -210,7 +210,7 @@ export const tableHeader = {
   attrs: cellAttrs,
   tableRole: 'header_cell',
   isolating: true,
-  marks: 'link alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
+  marks: 'alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   parseDOM: [{
     tag: 'th',
     getAttrs: dom => getCellAttrs(dom, {

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "20.1.3",
+	"version": "22.0.1",
 	"sideEffects": false
 }

package/dist/esm/json-schema/index.js

@@ -0,0 +1,2 @@
+export { default as fullSchema } from '../../json-schema/v1/full.json';
+export { default as stageZeroSchema } from '../../json-schema/v1/stage-0.json';

package/dist/esm/schema/marks/data-consumer.js

@@ -1,6 +1,13 @@
 import { isDOMElement } from '../../utils/parseDOM';
 /**
- * @minLength 1
+ * This annotation is purely for reference, & does _nothing_ given annotating
+ * `minLength` on an array of strings is not supported with our schema+spec
+ * generator.
+ *
+ * We're keeping it to signal that data consumer `sources` shouldn't be empty
+ * strings
+ *
+ * // @minLength 1
  */
 
 var parseDataConsumer = function parseDataConsumer(maybeValue) {

package/dist/esm/schema/nodes/bodied-extension.js

@@ -4,7 +4,7 @@ var createBodiedExtensionNodeSpec = function createBodiedExtensionNodeSpec() {
   var nodeSpec = {
     inline: false,
     group: 'block',
-    marks: 'link dataConsumer fragment',
+    marks: 'dataConsumer fragment',
     content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | extension | unsupportedBlock | embedCard)+',
     defining: true,
     selectable: true,

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

@@ -3,5 +3,5 @@
  */
 export var doc = {
   content: '(block|layoutSection)+',
-  marks: 'alignment breakout dataConsumer fragment indentation link unsupportedMark unsupportedNodeAttribute'
+  marks: 'alignment breakout dataConsumer fragment indentation unsupportedMark unsupportedNodeAttribute'
 };

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

@@ -18,7 +18,11 @@ export var emoji = {
       default: ''
     }
   },
-  parseDOM: [{
+  parseDOM: [// Handle copy/paste beautiful panel from renderer />
+  {
+    tag: 'div.ak-editor-panel__icon span',
+    ignore: true
+  }, {
     tag: 'span[data-emoji-short-name]',
     getAttrs: function getAttrs(domNode) {
       var dom = domNode;
@@ -28,10 +32,6 @@ export var emoji = {
         text: dom.getAttribute('data-emoji-text') || emoji.attrs.text.default
       };
     }
-  }, // Handle copy/paste beautiful panel from renderer />
-  {
-    tag: 'div.ak-editor-panel__icon',
-    ignore: true
   }, // Handle copy/paste from old <ac:emoticon />
   {
     tag: 'img[data-emoticon-name]',

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

@@ -20,7 +20,7 @@ function getExpandAttrs(domNode) {
 export var expand = {
   inline: false,
   group: 'block',
-  marks: 'link dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
+  marks: 'dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaGroup | mediaSingle | decisionList | taskList | table | blockCard | embedCard | extension | unsupportedBlock)+',
   isolating: true,
   selectable: true,

package/dist/esm/schema/nodes/layout-column.js

@@ -4,7 +4,7 @@
 export var layoutColumn = {
   content: '(block|unsupportedBlock)+',
   isolating: true,
-  marks: 'link alignment indentation dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
+  marks: 'alignment indentation dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   selectable: false,
   attrs: {
     width: {

package/dist/esm/schema/nodes/list-item.js

@@ -6,7 +6,7 @@
  */
 export var listItem = {
   content: '(paragraph | mediaSingle | codeBlock) (paragraph | bulletList | orderedList | mediaSingle | codeBlock)*',
-  marks: 'link unsupportedMark unsupportedNodeAttribute',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   defining: true,
   selectable: false,
   parseDOM: [{

package/dist/esm/schema/nodes/media-group.js

@@ -6,7 +6,7 @@ export var mediaGroup = {
   group: 'block',
   content: '(media|unsupportedBlock)+',
   attrs: {},
-  marks: 'unsupportedMark unsupportedNodeAttribute link',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   selectable: false,
   parseDOM: [{
     tag: 'div[data-node-type="mediaGroup"]'

package/dist/esm/schema/nodes/nested-expand.js

@@ -13,7 +13,7 @@
  */
 export var nestedExpand = {
   inline: false,
-  marks: 'link unsupportedMark unsupportedNodeAttribute',
+  marks: 'unsupportedMark unsupportedNodeAttribute',
   content: '(paragraph | heading | mediaSingle | mediaGroup | unsupportedBlock)+',
   isolating: true,
   selectable: true,

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

@@ -24,6 +24,12 @@ var getDefaultAttrs = function getDefaultAttrs() {
     panelIcon: {
       default: null
     },
+    panelIconId: {
+      default: null
+    },
+    panelIconText: {
+      default: null
+    },
     panelColor: {
       default: null
     }
@@ -35,6 +41,8 @@ var getDomAttrs = function getDomAttrs(nodeAttrs) {
   var attrs = {
     'data-panel-type': nodeAttrs.panelType,
     'data-panel-icon': nodeAttrs.panelIcon,
+    'data-panel-icon-id': nodeAttrs.panelIconId,
+    'data-panel-icon-text': nodeAttrs.panelIconText,
     'data-panel-color': nodeAttrs.panelColor
   };
   return attrs;
@@ -48,6 +56,8 @@ var getParseDOMAttrs = function getParseDOMAttrs(allowCustomPanel, dom) {
   if (allowCustomPanel) {
     parseDOMAttrs = _objectSpread(_objectSpread({}, parseDOMAttrs), {}, {
       panelIcon: dom.getAttribute('data-panel-icon'),
+      panelIconId: dom.getAttribute('data-panel-icon-id'),
+      panelIconText: dom.getAttribute('data-panel-icon-text'),
       panelColor: dom.getAttribute('data-panel-color')
     });
   } else {

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

@@ -1,68 +1,27 @@
-import { Fragment } from 'prosemirror-model';
-import { isSafeUrl } from '../../utils/url';
-
-var getLinkContent = function getLinkContent(node, schema) {
-  if (!(node instanceof HTMLAnchorElement)) {
-    return Fragment.empty;
-  }
-
-  var href = node.getAttribute('href') || '';
-  var text = node.innerText;
-
-  if (!text || text.length === 0) {
-    return Fragment.empty;
-  }
-
-  var marks = isSafeUrl(href) ? [schema.marks.link.create({
-    href: href
-  })] : [];
-  var textNode = schema.text(text, marks);
-  return Fragment.from(textNode);
-};
-
-var blockTags = {
-  address: true,
-  article: true,
-  aside: true,
-  blockquote: true,
-  canvas: true,
-  dd: true,
-  div: true,
-  dl: true,
-  fieldset: true,
-  figcaption: true,
-  figure: true,
-  footer: true,
-  form: true,
-  h1: true,
-  h2: true,
-  h3: true,
-  h4: true,
-  h5: true,
-  h6: true,
-  header: true,
-  hgroup: true,
-  hr: true,
-  li: true,
-  noscript: true,
-  ol: true,
-  output: true,
-  p: true,
-  pre: true,
-  section: true,
-  table: true,
-  tfoot: true,
-  ul: true
-};
-
-var isListItemNode = function isListItemNode(node) {
-  return Boolean(node && node.nodeName.toLowerCase() === 'li');
-};
-
-var isTextNode = function isTextNode(node) {
-  return Boolean(node && node.nodeType === Node.TEXT_NODE);
-};
-
+/**
+ * @name paragraph_node
+ */
+
+/**
+ * @name paragraph_with_no_marks_node
+ */
+
+/**
+ * NOTE: Need this because TS is too smart and inline everything.
+ * So we need to give them separate identity.
+ * Probably there's a way to solve it but that will need time and exploration.
+ * // http://bit.ly/2raXFX5
+ * type T1 = X | Y
+ * type T2 = A | T1 | B // T2 = A | X | Y | B
+ */
+
+/**
+ * @name paragraph_with_alignment_node
+ */
+
+/**
+ * @name paragraph_with_indentation_node
+ */
 var isImageNode = function isImageNode(node) {
   return Boolean(node && node.nodeName.toLowerCase() === 'img');
 };
@@ -85,21 +44,6 @@ var hasInlineImage = function hasInlineImage(node) {
   });
 };
 
-var hasWhiteSpacePre = function hasWhiteSpacePre(node) {
-  return Boolean(node instanceof HTMLElement && node.style.whiteSpace === 'pre');
-};
-
-var hasFontFamilyMonospace = function hasFontFamilyMonospace(node) {
-  return Boolean(node instanceof HTMLElement && node.style.fontFamily.includes('monospace'));
-};
-
-var isBlockLevelNode = function isBlockLevelNode(node) {
-  return Boolean(node && blockTags.hasOwnProperty(node.nodeName.toLowerCase()));
-};
-
-var NOT_INTERNAL_LINKS = [':not([data-inline-card])', ':not([data-block-card])', ':not([data-block-link])', ':not([data-skip-paste])'].join('');
-var ANCHOR_LINK = "a[href]".concat(NOT_INTERNAL_LINKS);
-var NOT_INTERNAL_ELEMENTS = [':not(.code-block)', ':not([data-node-type])', ':not([data-embed-card])', ':not([data-layout-section])', ':not([data-task-local-id])', ':not([data-task-state])', ':not([data-pm-slice])', ':not([data-mark-type])', ':not([data-layout-content])', ':not([data-panel-content])'].join('');
 var pDOM = ['p', 0];
 export var paragraph = {
   selectable: false,
@@ -108,70 +52,6 @@ export var paragraph = {
   marks: 'strong code em link strike subsup textColor typeAheadQuery underline confluenceInlineComment action annotation unsupportedMark unsupportedNodeAttribute dataConsumer fragment',
   parseDOM: [{
     tag: 'p'
-  }, {
-    tag: "div".concat(NOT_INTERNAL_ELEMENTS, ", li:not([data-pm-slice])"),
-    priority: 100,
-    getAttrs: function getAttrs(node) {
-      if (!(node instanceof Node)) {
-        return false;
-      }
-
-      var isCodeBlock = hasWhiteSpacePre(node) || hasFontFamilyMonospace(node);
-
-      if (isCodeBlock || !node.hasChildNodes()) {
-        return false;
-      }
-
-      var hasInlineChildren = Array.from(node.childNodes).every(function (child) {
-        return !isBlockLevelNode(child) && // IMG is considered block for mediaSingle
-        !isImageNode(child);
-      });
-
-      if (!hasInlineChildren) {
-        return false;
-      }
-
-      if ( // We can skip this rule for pure list items
-      isListItemNode(node) && Array.from(node.childNodes).every(isTextNode)) {
-        return false;
-      }
-
-      return null;
-    }
-  }, {
-    tag: ":not(span) + ".concat(ANCHOR_LINK),
-    priority: 100,
-    getContent: getLinkContent
-  }, {
-    tag: ":not(span) > ".concat(ANCHOR_LINK, ":first-child"),
-    getAttrs: function getAttrs(node) {
-      if (!(node instanceof Node)) {
-        return false;
-      }
-
-      if (isBlockLevelNode(node.firstChild)) {
-        return null;
-      }
-
-      if (hasInlineImage(node)) {
-        return false;
-      }
-
-      var isNextSiblingValid = node.nextSibling === null || node.nextSibling instanceof Text && (node.nextSibling.textContent || '').trim().length === 0;
-
-      if (isNextSiblingValid) {
-        return null;
-      } // This rule should not match when there is any sibling after the anchor
-
-
-      if (!isBlockLevelNode(node.nextSibling)) {
-        return false;
-      }
-
-      return null;
-    },
-    priority: 100,
-    getContent: getLinkContent
   }],
   toDOM: function toDOM() {
     return pDOM;

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

@@ -189,7 +189,7 @@ export var tableCell = {
   content: '(paragraph | panel | blockquote | orderedList | bulletList | rule | heading | codeBlock | mediaSingle |  mediaGroup | decisionList | taskList | blockCard | embedCard | extension | nestedExpand | unsupportedBlock)+',
   attrs: cellAttrs,
   tableRole: 'cell',
-  marks: 'link alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
+  marks: 'alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   isolating: true,
   parseDOM: [// Ignore number cell copied from renderer
   {
@@ -222,7 +222,7 @@ export var tableHeader = {
   attrs: cellAttrs,
   tableRole: 'header_cell',
   isolating: true,
-  marks: 'link alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
+  marks: 'alignment dataConsumer fragment unsupportedMark unsupportedNodeAttribute',
   parseDOM: [{
     tag: 'th',
     getAttrs: function getAttrs(dom) {

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/adf-schema",
-	"version": "20.1.3",
+	"version": "22.0.1",
 	"sideEffects": false
 }

package/dist/json-schema/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@atlaskit/adf-schema/json-schema",
+  "main": "../dist/cjs/json-schema/index.js",
+  "module": "../dist/esm/json-schema/index.js",
+  "module:es2019": "../dist/es2019/json-schema/index.js",
+  "types": "../dist/types/json-schema/index.d.ts"
+}