@atlaskit/adf-schema 22.0.2 → 23.0.1

package/CHANGELOG.md

@@ -1,5 +1,61 @@
 # @atlaskit/adf-schema
 
+## 23.0.1
+
+### Patch Changes
+
+- [`cb2392f6d33`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cb2392f6d33) - Upgrade to TypeScript 4.2.4
+
+## 23.0.0
+
+### Major Changes
+
+- [`b29ce16dad8`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b29ce16dad8) - [ED-14606] Move bitbucket schema, confluence schema, jira schema, and default schema from @atlaskit/adf-schema to their own entry points. These new entry points are as follows
+
+  @atlaskit/adf-schema/schema-bitbucket for:
+
+  - bitbucketSchema
+
+  @atlaskit/adf-schema/schema-confluence for:
+
+  - confluenceSchema
+  - confluenceSchemaWithMediaSingle
+
+  @atlaskit/adf-schema/schema-jira for:
+
+  - default as createJIRASchema
+  - isSchemaWithLists
+  - isSchemaWithMentions
+  - isSchemaWithEmojis
+  - isSchemaWithLinks
+  - isSchemaWithAdvancedTextFormattingMarks
+  - isSchemaWithCodeBlock
+  - isSchemaWithBlockQuotes
+  - isSchemaWithMedia
+  - isSchemaWithSubSupMark
+  - isSchemaWithTextColor
+  - isSchemaWithTables
+
+  @atlaskit/adf-schema/schema-default for:
+
+  - defaultSchema
+  - getSchemaBasedOnStage
+  - defaultSchemaConfig
+
+  This change also includes codemods in @atlaskit/adf-schema to update these entry points. It also introduces a new util function "changeImportEntryPoint" to @atlaskit/codemod-utils to handle this scenario.
+
+### Patch Changes
+
+- [`d079ab083af`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d079ab083af) - Don't make mediaInline trigger if pasted dom node is an img tag
+- [`0663a4954aa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0663a4954aa) - [ED-14690] Add safe check for text node on SetAttrs custom step
+- Updated dependencies
+
+## 22.1.0
+
+### Minor Changes
+
+- [`fd5028f6751`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fd5028f6751) - EDM-2873: Promote MediaInline to full schema
+
 ## 22.0.2
 
 ### Patch Changes

package/codemods/23.0.0-move-bitbucket-schema-to-own-entry-points.ts

@@ -0,0 +1,8 @@
+import { createTransformer } from '@atlaskit/codemod-utils';
+import { updateImportEntryPointsForBitbucketSchema } from './migrates/update-bitbucket-schema-entry-points';
+
+const transformer = createTransformer(
+  updateImportEntryPointsForBitbucketSchema,
+);
+
+export default transformer;

package/codemods/23.0.0-move-confluence-schema-to-own-entry-points.ts

@@ -0,0 +1,8 @@
+import { createTransformer } from '@atlaskit/codemod-utils';
+import { updateImportEntryPointsForConfluenceSchema } from './migrates/update-confluence-schema-entry-points';
+
+const transformer = createTransformer(
+  updateImportEntryPointsForConfluenceSchema,
+);
+
+export default transformer;

package/codemods/23.0.0-move-default-schema-to-own-entry-points.ts

@@ -0,0 +1,6 @@
+import { createTransformer } from '@atlaskit/codemod-utils';
+import { updateImportEntryPointsForDefaultSchema } from './migrates/update-default-schema-entry-points';
+
+const transformer = createTransformer(updateImportEntryPointsForDefaultSchema);
+
+export default transformer;

package/codemods/23.0.0-move-jira-schema-to-own-entry-points.ts

@@ -0,0 +1,6 @@
+import { createTransformer } from '@atlaskit/codemod-utils';
+import { updateImportEntryPointsForJiraSchema } from './migrates/update-jira-schema-entry-points';
+
+const transformer = createTransformer(updateImportEntryPointsForJiraSchema);
+
+export default transformer;

package/codemods/migrates/update-bitbucket-schema-entry-points.ts

@@ -0,0 +1,9 @@
+import { changeImportEntryPoint } from '@atlaskit/codemod-utils';
+
+export const updateImportEntryPointsForBitbucketSchema = [
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'bitbucketSchema',
+    '@atlaskit/adf-schema/schema-bitbucket',
+  ),
+];

package/codemods/migrates/update-confluence-schema-entry-points.ts

@@ -0,0 +1,14 @@
+import { changeImportEntryPoint } from '@atlaskit/codemod-utils';
+
+export const updateImportEntryPointsForConfluenceSchema = [
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'confluenceSchema',
+    '@atlaskit/adf-schema/schema-confluence',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'confluenceSchemaWithMediaSingle',
+    '@atlaskit/adf-schema/schema-confluence',
+  ),
+];

package/codemods/migrates/update-default-schema-entry-points.ts

@@ -0,0 +1,19 @@
+import { changeImportEntryPoint } from '@atlaskit/codemod-utils';
+
+export const updateImportEntryPointsForDefaultSchema = [
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'defaultSchema',
+    '@atlaskit/adf-schema/schema-default',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'getSchemaBasedOnStage',
+    '@atlaskit/adf-schema/schema-default',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'defaultSchemaConfig',
+    '@atlaskit/adf-schema/schema-default',
+  ),
+];

package/codemods/migrates/update-jira-schema-entry-points.ts

@@ -0,0 +1,64 @@
+import { changeImportEntryPoint } from '@atlaskit/codemod-utils';
+
+export const updateImportEntryPointsForJiraSchema = [
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'createJIRASchema',
+    '@atlaskit/adf-schema/schema-jira',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'isSchemaWithLists',
+    '@atlaskit/adf-schema/schema-jira',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'isSchemaWithMentions',
+    '@atlaskit/adf-schema/schema-jira',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'isSchemaWithEmojis',
+    '@atlaskit/adf-schema/schema-jira',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'isSchemaWithLinks',
+    '@atlaskit/adf-schema/schema-jira',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'isSchemaWithAdvancedTextFormattingMarks',
+    '@atlaskit/adf-schema/schema-jira',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'isSchemaWithCodeBlock',
+    '@atlaskit/adf-schema/schema-jira',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'isSchemaWithBlockQuotes',
+    '@atlaskit/adf-schema/schema-jira',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'isSchemaWithMedia',
+    '@atlaskit/adf-schema/schema-jira',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'isSchemaWithSubSupMark',
+    '@atlaskit/adf-schema/schema-jira',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'isSchemaWithTextColor',
+    '@atlaskit/adf-schema/schema-jira',
+  ),
+  changeImportEntryPoint(
+    '@atlaskit/adf-schema',
+    'isSchemaWithTables',
+    '@atlaskit/adf-schema/schema-jira',
+  ),
+];

package/dist/cjs/index.js

@@ -321,12 +321,6 @@ Object.defineProperty(exports, "annotation", {
     return _schema.annotation;
   }
 });
-Object.defineProperty(exports, "bitbucketSchema", {
-  enumerable: true,
-  get: function get() {
-    return _schema.bitbucketSchema;
-  }
-});
 Object.defineProperty(exports, "blockCard", {
   enumerable: true,
   get: function get() {
@@ -417,18 +411,6 @@ Object.defineProperty(exports, "confluenceJiraIssue", {
     return _schema.confluenceJiraIssue;
   }
 });
-Object.defineProperty(exports, "confluenceSchema", {
-  enumerable: true,
-  get: function get() {
-    return _schema.confluenceSchema;
-  }
-});
-Object.defineProperty(exports, "confluenceSchemaWithMediaSingle", {
-  enumerable: true,
-  get: function get() {
-    return _schema.confluenceSchemaWithMediaSingle;
-  }
-});
 Object.defineProperty(exports, "confluenceUnsupportedBlock", {
   enumerable: true,
   get: function get() {
@@ -447,12 +429,6 @@ Object.defineProperty(exports, "copyPrivateMediaAttributes", {
     return _schema.copyPrivateMediaAttributes;
   }
 });
-Object.defineProperty(exports, "createJIRASchema", {
-  enumerable: true,
-  get: function get() {
-    return _schema.createJIRASchema;
-  }
-});
 Object.defineProperty(exports, "createSchema", {
   enumerable: true,
   get: function get() {
@@ -495,18 +471,6 @@ Object.defineProperty(exports, "decisionListSelector", {
     return _schema.decisionListSelector;
   }
 });
-Object.defineProperty(exports, "defaultSchema", {
-  enumerable: true,
-  get: function get() {
-    return _schema.defaultSchema;
-  }
-});
-Object.defineProperty(exports, "defaultSchemaConfig", {
-  enumerable: true,
-  get: function get() {
-    return _schema.defaultSchemaConfig;
-  }
-});
 Object.defineProperty(exports, "doc", {
   enumerable: true,
   get: function get() {
@@ -597,12 +561,6 @@ Object.defineProperty(exports, "getLinkMatch", {
     return _utils.getLinkMatch;
   }
 });
-Object.defineProperty(exports, "getSchemaBasedOnStage", {
-  enumerable: true,
-  get: function get() {
-    return _schema.getSchemaBasedOnStage;
-  }
-});
 Object.defineProperty(exports, "hardBreak", {
   enumerable: true,
   get: function get() {
@@ -675,72 +633,6 @@ Object.defineProperty(exports, "isSafeUrl", {
     return _utils.isSafeUrl;
   }
 });
-Object.defineProperty(exports, "isSchemaWithAdvancedTextFormattingMarks", {
-  enumerable: true,
-  get: function get() {
-    return _schema.isSchemaWithAdvancedTextFormattingMarks;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithBlockQuotes", {
-  enumerable: true,
-  get: function get() {
-    return _schema.isSchemaWithBlockQuotes;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithCodeBlock", {
-  enumerable: true,
-  get: function get() {
-    return _schema.isSchemaWithCodeBlock;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithEmojis", {
-  enumerable: true,
-  get: function get() {
-    return _schema.isSchemaWithEmojis;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithLinks", {
-  enumerable: true,
-  get: function get() {
-    return _schema.isSchemaWithLinks;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithLists", {
-  enumerable: true,
-  get: function get() {
-    return _schema.isSchemaWithLists;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithMedia", {
-  enumerable: true,
-  get: function get() {
-    return _schema.isSchemaWithMedia;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithMentions", {
-  enumerable: true,
-  get: function get() {
-    return _schema.isSchemaWithMentions;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithSubSupMark", {
-  enumerable: true,
-  get: function get() {
-    return _schema.isSchemaWithSubSupMark;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithTables", {
-  enumerable: true,
-  get: function get() {
-    return _schema.isSchemaWithTables;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithTextColor", {
-  enumerable: true,
-  get: function get() {
-    return _schema.isSchemaWithTextColor;
-  }
-});
 Object.defineProperty(exports, "layoutColumn", {
   enumerable: true,
   get: function get() {

package/dist/cjs/schema/index.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -41,12 +39,6 @@ Object.defineProperty(exports, "annotation", {
     return _marks.annotation;
   }
 });
-Object.defineProperty(exports, "bitbucketSchema", {
-  enumerable: true,
-  get: function get() {
-    return _bitbucketSchema.bitbucketSchema;
-  }
-});
 Object.defineProperty(exports, "blockCard", {
   enumerable: true,
   get: function get() {
@@ -137,18 +129,6 @@ Object.defineProperty(exports, "confluenceJiraIssue", {
     return _nodes.confluenceJiraIssue;
   }
 });
-Object.defineProperty(exports, "confluenceSchema", {
-  enumerable: true,
-  get: function get() {
-    return _confluenceSchema.confluenceSchema;
-  }
-});
-Object.defineProperty(exports, "confluenceSchemaWithMediaSingle", {
-  enumerable: true,
-  get: function get() {
-    return _confluenceSchema.confluenceSchemaWithMediaSingle;
-  }
-});
 Object.defineProperty(exports, "confluenceUnsupportedBlock", {
   enumerable: true,
   get: function get() {
@@ -167,12 +147,6 @@ Object.defineProperty(exports, "copyPrivateMediaAttributes", {
     return _nodes.copyPrivateMediaAttributes;
   }
 });
-Object.defineProperty(exports, "createJIRASchema", {
-  enumerable: true,
-  get: function get() {
-    return _jiraSchema.default;
-  }
-});
 Object.defineProperty(exports, "createSchema", {
   enumerable: true,
   get: function get() {
@@ -215,18 +189,6 @@ Object.defineProperty(exports, "decisionListSelector", {
     return _nodes.decisionListSelector;
   }
 });
-Object.defineProperty(exports, "defaultSchema", {
-  enumerable: true,
-  get: function get() {
-    return _defaultSchema.defaultSchema;
-  }
-});
-Object.defineProperty(exports, "defaultSchemaConfig", {
-  enumerable: true,
-  get: function get() {
-    return _defaultSchema.defaultSchemaConfig;
-  }
-});
 Object.defineProperty(exports, "doc", {
   enumerable: true,
   get: function get() {
@@ -293,12 +255,6 @@ Object.defineProperty(exports, "getCellDomAttrs", {
     return _nodes.getCellDomAttrs;
   }
 });
-Object.defineProperty(exports, "getSchemaBasedOnStage", {
-  enumerable: true,
-  get: function get() {
-    return _defaultSchema.getSchemaBasedOnStage;
-  }
-});
 Object.defineProperty(exports, "hardBreak", {
   enumerable: true,
   get: function get() {
@@ -341,72 +297,6 @@ Object.defineProperty(exports, "inlineNodes", {
     return _inlineNodes.inlineNodes;
   }
 });
-Object.defineProperty(exports, "isSchemaWithAdvancedTextFormattingMarks", {
-  enumerable: true,
-  get: function get() {
-    return _jiraSchema.isSchemaWithAdvancedTextFormattingMarks;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithBlockQuotes", {
-  enumerable: true,
-  get: function get() {
-    return _jiraSchema.isSchemaWithBlockQuotes;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithCodeBlock", {
-  enumerable: true,
-  get: function get() {
-    return _jiraSchema.isSchemaWithCodeBlock;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithEmojis", {
-  enumerable: true,
-  get: function get() {
-    return _jiraSchema.isSchemaWithEmojis;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithLinks", {
-  enumerable: true,
-  get: function get() {
-    return _jiraSchema.isSchemaWithLinks;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithLists", {
-  enumerable: true,
-  get: function get() {
-    return _jiraSchema.isSchemaWithLists;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithMedia", {
-  enumerable: true,
-  get: function get() {
-    return _jiraSchema.isSchemaWithMedia;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithMentions", {
-  enumerable: true,
-  get: function get() {
-    return _jiraSchema.isSchemaWithMentions;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithSubSupMark", {
-  enumerable: true,
-  get: function get() {
-    return _jiraSchema.isSchemaWithSubSupMark;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithTables", {
-  enumerable: true,
-  get: function get() {
-    return _jiraSchema.isSchemaWithTables;
-  }
-});
-Object.defineProperty(exports, "isSchemaWithTextColor", {
-  enumerable: true,
-  get: function get() {
-    return _jiraSchema.isSchemaWithTextColor;
-  }
-});
 Object.defineProperty(exports, "layoutColumn", {
   enumerable: true,
   get: function get() {
@@ -746,16 +636,4 @@ var _unsupported = require("./unsupported");
 
 var _inlineNodes = require("./inline-nodes");
 
-var _createSchema = require("./create-schema");
-
-var _bitbucketSchema = require("./bitbucket-schema");
-
-var _confluenceSchema = require("./confluence-schema");
-
-var _defaultSchema = require("./default-schema");
-
-var _jiraSchema = _interopRequireWildcard(require("./jira-schema"));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _createSchema = require("./create-schema");

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

@@ -57,51 +57,51 @@ var createMediaSpec = function createMediaSpec(attributes) {
   var inline = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var domNodeType = inline ? 'span' : 'div';
   var nodeName = inline ? 'mediaInline' : 'media';
-  return {
-    selectable: true,
-    inline: inline,
-    group: inline ? 'inline' : undefined,
-    attrs: attributes,
-    parseDOM: [{
-      tag: "".concat(domNodeType, "[data-node-type=\"").concat(nodeName, "\"]"),
-      getAttrs: function getAttrs(dom) {
-        var attrs = {};
-
-        if (attributes) {
-          Object.keys(attributes).forEach(function (k) {
-            var key = camelCaseToKebabCase(k).replace(/^__/, '');
-            var value = dom.getAttribute("data-".concat(key)) || '';
+  var parseDOM = [{
+    tag: "".concat(domNodeType, "[data-node-type=\"").concat(nodeName, "\"]"),
+    getAttrs: function getAttrs(dom) {
+      var attrs = {};
 
-            if (value) {
-              attrs[k] = value;
-            }
-          });
-        } // Need to do validation & type conversion manually
+      if (attributes) {
+        Object.keys(attributes).forEach(function (k) {
+          var key = camelCaseToKebabCase(k).replace(/^__/, '');
+          var value = dom.getAttribute("data-".concat(key)) || '';
 
+          if (value) {
+            attrs[k] = value;
+          }
+        });
+      } // Need to do validation & type conversion manually
 
-        if (attrs.__fileSize) {
-          attrs.__fileSize = +attrs.__fileSize;
-        }
 
-        var width = Number(attrs.width);
+      if (attrs.__fileSize) {
+        attrs.__fileSize = +attrs.__fileSize;
+      }
 
-        if (typeof width !== 'undefined' && !isNaN(width)) {
-          attrs.width = width;
-        }
+      var width = Number(attrs.width);
 
-        var height = Number(attrs.height);
+      if (typeof width !== 'undefined' && !isNaN(width)) {
+        attrs.width = width;
+      }
 
-        if (typeof height !== 'undefined' && !isNaN(height)) {
-          attrs.height = height;
-        }
+      var height = Number(attrs.height);
 
-        return attrs;
+      if (typeof height !== 'undefined' && !isNaN(height)) {
+        attrs.height = height;
       }
-    }, // Don't match data URI
-    {
-      tag: 'img[src^="data:image"]',
-      ignore: true
-    }, {
+
+      return attrs;
+    }
+  }, // Don't match data URI
+  {
+    tag: 'img[src^="data:image"]',
+    ignore: true
+  }]; // media-inline.ts uses this same function to generate the nodespec
+  // this ensures that we don't make a media inline out of a copied image
+  // https://product-fabric.atlassian.net/browse/EDM-2996
+
+  if (!inline) {
+    parseDOM.push({
       tag: 'img:not(.smart-link-icon)',
       getAttrs: function getAttrs(dom) {
         return {
@@ -110,7 +110,15 @@ var createMediaSpec = function createMediaSpec(attributes) {
           alt: dom.getAttribute('alt') || ''
         };
       }
-    }],
+    });
+  }
+
+  return {
+    selectable: true,
+    inline: inline,
+    group: inline ? 'inline' : undefined,
+    attrs: attributes,
+    parseDOM: parseDOM,
     toDOM: function toDOM(node) {
       var attrs = {
         'data-id': node.attrs.id,

package/dist/cjs/steps/set-attrs.js

@@ -61,6 +61,10 @@ var SetAttrsStep = /*#__PURE__*/function (_Step) {
         return _prosemirrorTransform.StepResult.fail('No node at given position');
       }
 
+      if (target.isText) {
+        return _prosemirrorTransform.StepResult.fail('Target is a text node. Attributes are not allowed.');
+      }
+
       var attrs = _objectSpread(_objectSpread({}, target.attrs || {}), this.attrs || {});
 
       var newNode = target.type.create(attrs, _prosemirrorModel.Fragment.empty, target.marks);

package/dist/cjs/version.json

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

package/dist/es2019/index.js

@@ -1,2 +1,2 @@
-export { AnnotationTypes, PanelType, alignment, alignmentPositionMap, annotation, bitbucketSchema, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceSchema, confluenceSchemaWithMediaSingle, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createJIRASchema, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, defaultSchema, defaultSchemaConfig, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, getSchemaBasedOnStage, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, isSchemaWithAdvancedTextFormattingMarks, isSchemaWithBlockQuotes, isSchemaWithCodeBlock, isSchemaWithEmojis, isSchemaWithLinks, isSchemaWithLists, isSchemaWithMedia, isSchemaWithMentions, isSchemaWithSubSupMark, isSchemaWithTables, isSchemaWithTextColor, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, 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 } from './schema';
+export { AnnotationTypes, PanelType, alignment, alignmentPositionMap, annotation, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, 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 } from './schema';
 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 } from './utils';

package/dist/es2019/schema/index.js

@@ -2,8 +2,4 @@ export { PanelType, blockCard, blockquote, bodiedExtension, bulletList, bulletLi
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';
-export { sanitizeNodes, createSchema } from './create-schema';
-export { bitbucketSchema } from './bitbucket-schema';
-export { confluenceSchema, confluenceSchemaWithMediaSingle } from './confluence-schema';
-export { defaultSchema, getSchemaBasedOnStage, defaultSchemaConfig } from './default-schema';
-export { default as createJIRASchema, isSchemaWithLists, isSchemaWithMentions, isSchemaWithEmojis, isSchemaWithLinks, isSchemaWithAdvancedTextFormattingMarks, isSchemaWithCodeBlock, isSchemaWithBlockQuotes, isSchemaWithMedia, isSchemaWithSubSupMark, isSchemaWithTextColor, isSchemaWithTables } from './jira-schema';
+export { sanitizeNodes, createSchema } from './create-schema';

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

@@ -46,51 +46,51 @@ export const defaultAttrs = {
 export const createMediaSpec = (attributes, inline = false) => {
   const domNodeType = inline ? 'span' : 'div';
   const nodeName = inline ? 'mediaInline' : 'media';
-  return {
-    selectable: true,
-    inline,
-    group: inline ? 'inline' : undefined,
-    attrs: attributes,
-    parseDOM: [{
-      tag: `${domNodeType}[data-node-type="${nodeName}"]`,
-      getAttrs: dom => {
-        const attrs = {};
-
-        if (attributes) {
-          Object.keys(attributes).forEach(k => {
-            const key = camelCaseToKebabCase(k).replace(/^__/, '');
-            const value = dom.getAttribute(`data-${key}`) || '';
+  const parseDOM = [{
+    tag: `${domNodeType}[data-node-type="${nodeName}"]`,
+    getAttrs: dom => {
+      const attrs = {};
 
-            if (value) {
-              attrs[k] = value;
-            }
-          });
-        } // Need to do validation & type conversion manually
+      if (attributes) {
+        Object.keys(attributes).forEach(k => {
+          const key = camelCaseToKebabCase(k).replace(/^__/, '');
+          const value = dom.getAttribute(`data-${key}`) || '';
 
+          if (value) {
+            attrs[k] = value;
+          }
+        });
+      } // Need to do validation & type conversion manually
 
-        if (attrs.__fileSize) {
-          attrs.__fileSize = +attrs.__fileSize;
-        }
 
-        const width = Number(attrs.width);
+      if (attrs.__fileSize) {
+        attrs.__fileSize = +attrs.__fileSize;
+      }
 
-        if (typeof width !== 'undefined' && !isNaN(width)) {
-          attrs.width = width;
-        }
+      const width = Number(attrs.width);
 
-        const height = Number(attrs.height);
+      if (typeof width !== 'undefined' && !isNaN(width)) {
+        attrs.width = width;
+      }
 
-        if (typeof height !== 'undefined' && !isNaN(height)) {
-          attrs.height = height;
-        }
+      const height = Number(attrs.height);
 
-        return attrs;
+      if (typeof height !== 'undefined' && !isNaN(height)) {
+        attrs.height = height;
       }
-    }, // Don't match data URI
-    {
-      tag: 'img[src^="data:image"]',
-      ignore: true
-    }, {
+
+      return attrs;
+    }
+  }, // Don't match data URI
+  {
+    tag: 'img[src^="data:image"]',
+    ignore: true
+  }]; // media-inline.ts uses this same function to generate the nodespec
+  // this ensures that we don't make a media inline out of a copied image
+  // https://product-fabric.atlassian.net/browse/EDM-2996
+
+  if (!inline) {
+    parseDOM.push({
       tag: 'img:not(.smart-link-icon)',
       getAttrs: dom => {
         return {
@@ -99,7 +99,15 @@ export const createMediaSpec = (attributes, inline = false) => {
           alt: dom.getAttribute('alt') || ''
         };
       }
-    }],
+    });
+  }
+
+  return {
+    selectable: true,
+    inline,
+    group: inline ? 'inline' : undefined,
+    attrs: attributes,
+    parseDOM,
 
     toDOM(node) {
       const attrs = {

package/dist/es2019/steps/set-attrs.js

@@ -19,6 +19,10 @@ export class SetAttrsStep extends Step {
       return StepResult.fail('No node at given position');
     }
 
+    if (target.isText) {
+      return StepResult.fail('Target is a text node. Attributes are not allowed.');
+    }
+
     const attrs = { ...(target.attrs || {}),
       ...(this.attrs || {})
     };

package/dist/es2019/version.json

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

package/dist/esm/index.js

@@ -1,2 +1,2 @@
-export { AnnotationTypes, PanelType, alignment, alignmentPositionMap, annotation, bitbucketSchema, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceSchema, confluenceSchemaWithMediaSingle, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createJIRASchema, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, defaultSchema, defaultSchemaConfig, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, getSchemaBasedOnStage, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, isSchemaWithAdvancedTextFormattingMarks, isSchemaWithBlockQuotes, isSchemaWithCodeBlock, isSchemaWithEmojis, isSchemaWithLinks, isSchemaWithLists, isSchemaWithMedia, isSchemaWithMentions, isSchemaWithSubSupMark, isSchemaWithTables, isSchemaWithTextColor, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, 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 } from './schema';
+export { AnnotationTypes, PanelType, alignment, alignmentPositionMap, annotation, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, 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 } from './schema';
 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 } from './utils';

package/dist/esm/schema/index.js

@@ -2,8 +2,4 @@ export { PanelType, blockCard, blockquote, bodiedExtension, bulletList, bulletLi
 export { AnnotationTypes, alignment, alignmentPositionMap, annotation, breakout, code, colorPalette, colorPaletteExtended, confluenceInlineComment, dataConsumer, dataConsumerToJSON, em, fragment, fragmentToJSON, indentation, link, linkToJSON, strike, strong, subsup, textColor, typeAheadQuery, underline, buildAnnotationMarkDataAttributes, AnnotationMarkStates, unsupportedMark, unsupportedNodeAttribute } from './marks';
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';
-export { sanitizeNodes, createSchema } from './create-schema';
-export { bitbucketSchema } from './bitbucket-schema';
-export { confluenceSchema, confluenceSchemaWithMediaSingle } from './confluence-schema';
-export { defaultSchema, getSchemaBasedOnStage, defaultSchemaConfig } from './default-schema';
-export { default as createJIRASchema, isSchemaWithLists, isSchemaWithMentions, isSchemaWithEmojis, isSchemaWithLinks, isSchemaWithAdvancedTextFormattingMarks, isSchemaWithCodeBlock, isSchemaWithBlockQuotes, isSchemaWithMedia, isSchemaWithSubSupMark, isSchemaWithTextColor, isSchemaWithTables } from './jira-schema';
+export { sanitizeNodes, createSchema } from './create-schema';

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

@@ -47,51 +47,51 @@ export var createMediaSpec = function createMediaSpec(attributes) {
   var inline = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var domNodeType = inline ? 'span' : 'div';
   var nodeName = inline ? 'mediaInline' : 'media';
-  return {
-    selectable: true,
-    inline: inline,
-    group: inline ? 'inline' : undefined,
-    attrs: attributes,
-    parseDOM: [{
-      tag: "".concat(domNodeType, "[data-node-type=\"").concat(nodeName, "\"]"),
-      getAttrs: function getAttrs(dom) {
-        var attrs = {};
-
-        if (attributes) {
-          Object.keys(attributes).forEach(function (k) {
-            var key = camelCaseToKebabCase(k).replace(/^__/, '');
-            var value = dom.getAttribute("data-".concat(key)) || '';
+  var parseDOM = [{
+    tag: "".concat(domNodeType, "[data-node-type=\"").concat(nodeName, "\"]"),
+    getAttrs: function getAttrs(dom) {
+      var attrs = {};
 
-            if (value) {
-              attrs[k] = value;
-            }
-          });
-        } // Need to do validation & type conversion manually
+      if (attributes) {
+        Object.keys(attributes).forEach(function (k) {
+          var key = camelCaseToKebabCase(k).replace(/^__/, '');
+          var value = dom.getAttribute("data-".concat(key)) || '';
 
+          if (value) {
+            attrs[k] = value;
+          }
+        });
+      } // Need to do validation & type conversion manually
 
-        if (attrs.__fileSize) {
-          attrs.__fileSize = +attrs.__fileSize;
-        }
 
-        var width = Number(attrs.width);
+      if (attrs.__fileSize) {
+        attrs.__fileSize = +attrs.__fileSize;
+      }
 
-        if (typeof width !== 'undefined' && !isNaN(width)) {
-          attrs.width = width;
-        }
+      var width = Number(attrs.width);
 
-        var height = Number(attrs.height);
+      if (typeof width !== 'undefined' && !isNaN(width)) {
+        attrs.width = width;
+      }
 
-        if (typeof height !== 'undefined' && !isNaN(height)) {
-          attrs.height = height;
-        }
+      var height = Number(attrs.height);
 
-        return attrs;
+      if (typeof height !== 'undefined' && !isNaN(height)) {
+        attrs.height = height;
       }
-    }, // Don't match data URI
-    {
-      tag: 'img[src^="data:image"]',
-      ignore: true
-    }, {
+
+      return attrs;
+    }
+  }, // Don't match data URI
+  {
+    tag: 'img[src^="data:image"]',
+    ignore: true
+  }]; // media-inline.ts uses this same function to generate the nodespec
+  // this ensures that we don't make a media inline out of a copied image
+  // https://product-fabric.atlassian.net/browse/EDM-2996
+
+  if (!inline) {
+    parseDOM.push({
       tag: 'img:not(.smart-link-icon)',
       getAttrs: function getAttrs(dom) {
         return {
@@ -100,7 +100,15 @@ export var createMediaSpec = function createMediaSpec(attributes) {
           alt: dom.getAttribute('alt') || ''
         };
       }
-    }],
+    });
+  }
+
+  return {
+    selectable: true,
+    inline: inline,
+    group: inline ? 'inline' : undefined,
+    attrs: attributes,
+    parseDOM: parseDOM,
     toDOM: function toDOM(node) {
       var attrs = {
         'data-id': node.attrs.id,

package/dist/esm/steps/set-attrs.js

@@ -46,6 +46,10 @@ export var SetAttrsStep = /*#__PURE__*/function (_Step) {
         return StepResult.fail('No node at given position');
       }
 
+      if (target.isText) {
+        return StepResult.fail('Target is a text node. Attributes are not allowed.');
+      }
+
       var attrs = _objectSpread(_objectSpread({}, target.attrs || {}), this.attrs || {});
 
       var newNode = target.type.create(attrs, Fragment.empty, target.marks);

package/dist/esm/version.json

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

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

@@ -897,6 +897,58 @@
       ],
       "additionalProperties": false
     },
+    "mediaInline_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": [
+            "mediaInline"
+          ]
+        },
+        "attrs": {
+          "type": "object",
+          "properties": {
+            "data": {},
+            "id": {
+              "type": "string",
+              "minLength": 1
+            },
+            "collection": {
+              "type": "string"
+            },
+            "height": {
+              "type": "number"
+            },
+            "width": {
+              "type": "number"
+            },
+            "occurrenceKey": {
+              "type": "string",
+              "minLength": 1
+            },
+            "alt": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "id",
+            "collection"
+          ]
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/link_mark"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "attrs"
+      ],
+      "additionalProperties": false
+    },
     "formatted_text_inline_node": {
       "allOf": [
         {
@@ -996,6 +1048,9 @@
         {
           "$ref": "#/definitions/status_node"
         },
+        {
+          "$ref": "#/definitions/mediaInline_node"
+        },
         {
           "$ref": "#/definitions/formatted_text_inline_node"
         },

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-export { AnnotationTypes, PanelType, alignment, alignmentPositionMap, annotation, bitbucketSchema, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceSchema, confluenceSchemaWithMediaSingle, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createJIRASchema, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, defaultSchema, defaultSchemaConfig, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, getSchemaBasedOnStage, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, isSchemaWithAdvancedTextFormattingMarks, isSchemaWithBlockQuotes, isSchemaWithCodeBlock, isSchemaWithEmojis, isSchemaWithLinks, isSchemaWithLists, isSchemaWithMedia, isSchemaWithMentions, isSchemaWithSubSupMark, isSchemaWithTables, isSchemaWithTextColor, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, 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, } from './schema';
+export { AnnotationTypes, PanelType, alignment, alignmentPositionMap, annotation, blockCard, blockquote, bodiedExtension, breakout, bulletList, bulletListSelector, caption, code, codeBlock, codeBlockToJSON, colorPalette, colorPaletteExtended, confluenceInlineComment, confluenceJiraIssue, confluenceUnsupportedBlock, confluenceUnsupportedInline, copyPrivateMediaAttributes, createSchema, dataConsumer, dataConsumerToJSON, date, decisionItem, decisionList, decisionListSelector, doc, em, embedCard, emoji, expand, expandToJSON, extension, fragment, fragmentToJSON, hardBreak, heading, image, indentation, inlineCard, inlineExtension, inlineNodes, layoutColumn, layoutSection, link, linkToJSON, listItem, media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline, mediaSingleToJSON, mediaToJSON, mention, mentionToJSON, nestedExpand, orderedList, orderedListSelector, panel, paragraph, placeholder, rule, sanitizeNodes, getCellAttrs, getCellDomAttrs, status, strike, strong, subsup, table, 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, } from './schema';
 export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttributes, AnnotationMarkDefinition, BlockCardDefinition, BlockContent, BlockQuoteDefinition, BodiedExtensionDefinition, BreakoutMarkAttrs, BreakoutMarkDefinition, BulletListDefinition, CaptionDefinition, CardAttributes, CellAttributes, CodeBlockAttrs, CodeBlockBaseDefinition, CodeBlockDefinition, CodeBlockWithMarksDefinition, CodeDefinition, 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, InlineAtomic, 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, TableHeaderDefinition, TableLayout, TableRowDefinition, TaskItemDefinition, TaskListContent, TaskListDefinition, TextColorAttributes, TextColorDefinition, TextDefinition, UnderlineDefinition, UrlType, AnnotationId, RichMediaAttributes, RichMediaLayout, AnnotationDataAttributes, CellDomAttrs, } from './schema';
 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, } from './utils';
 export type { Match, NameToEmoji } from './utils';

package/dist/types/schema/index.d.ts

@@ -5,7 +5,3 @@ export type { AlignmentAttributes, AlignmentMarkDefinition, AnnotationMarkAttrib
 export { unsupportedNodeTypesForMediaCards } from './unsupported';
 export { inlineNodes } from './inline-nodes';
 export { sanitizeNodes, createSchema } from './create-schema';
-export { bitbucketSchema } from './bitbucket-schema';
-export { confluenceSchema, confluenceSchemaWithMediaSingle, } from './confluence-schema';
-export { defaultSchema, getSchemaBasedOnStage, defaultSchemaConfig, } from './default-schema';
-export { default as createJIRASchema, isSchemaWithLists, isSchemaWithMentions, isSchemaWithEmojis, isSchemaWithLinks, isSchemaWithAdvancedTextFormattingMarks, isSchemaWithCodeBlock, isSchemaWithBlockQuotes, isSchemaWithMedia, isSchemaWithSubSupMark, isSchemaWithTextColor, isSchemaWithTables, } from './jira-schema';

package/dist/types/schema/nodes/media-inline.d.ts

@@ -5,7 +5,6 @@ export interface MediaInlineAttributes extends MediaBaseAttributes {
     data?: object;
 }
 /**
- * @stage 0
  * @name mediaInline_node
  */
 export interface MediaInlineDefinition {

package/json-schema/v1/full.json

@@ -897,6 +897,58 @@
       ],
       "additionalProperties": false
     },
+    "mediaInline_node": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "enum": [
+            "mediaInline"
+          ]
+        },
+        "attrs": {
+          "type": "object",
+          "properties": {
+            "data": {},
+            "id": {
+              "type": "string",
+              "minLength": 1
+            },
+            "collection": {
+              "type": "string"
+            },
+            "height": {
+              "type": "number"
+            },
+            "width": {
+              "type": "number"
+            },
+            "occurrenceKey": {
+              "type": "string",
+              "minLength": 1
+            },
+            "alt": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "id",
+            "collection"
+          ]
+        },
+        "marks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/link_mark"
+          }
+        }
+      },
+      "required": [
+        "type",
+        "attrs"
+      ],
+      "additionalProperties": false
+    },
     "formatted_text_inline_node": {
       "allOf": [
         {
@@ -996,6 +1048,9 @@
         {
           "$ref": "#/definitions/status_node"
         },
+        {
+          "$ref": "#/definitions/mediaInline_node"
+        },
         {
           "$ref": "#/definitions/formatted_text_inline_node"
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/adf-schema",
-  "version": "22.0.2",
+  "version": "23.0.1",
   "description": "Shared package that contains the ADF-schema (json) and ProseMirror node/mark specs",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -24,7 +24,11 @@
     "./steps": "./src/steps.ts",
     "./schema": "./src/schema/index.ts",
     "./json-schema": "./src/json-schema/index.ts",
-    "./url": "./src/utils/url.ts"
+    "./url": "./src/utils/url.ts",
+    "./schema-bitbucket": "./src/schema/bitbucket-schema.ts",
+    "./schema-confluence": "./src/schema/confluence-schema.ts",
+    "./schema-jira": "./src/schema/jira-schema.ts",
+    "./schema-default": "./src/schema/default-schema.ts"
   },
   "scripts": {
     "build:json-schema": "mkdir -p dist && cp -r json-schema dist",
@@ -34,6 +38,7 @@
     "ak-postbuild": "yarn build:json-schema"
   },
   "dependencies": {
+    "@atlaskit/codemod-utils": "^4.0.0",
     "@atlaskit/editor-tables": "^2.1.0",
     "@babel/runtime": "^7.0.0",
     "@types/linkify-it": "^2.0.4",
@@ -48,16 +53,17 @@
   "devDependencies": {
     "@atlaskit/adf-utils": "^16.0.0",
     "@atlaskit/editor-json-transformer": "^8.7.0",
-    "@atlaskit/editor-test-helpers": "^16.1.0",
+    "@atlaskit/editor-test-helpers": "^17.0.0",
     "@atlaskit/json-schema-generator": "^3.2.0",
     "@atlassian/adf-sample": "^1.0.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@types/prosemirror-history": "^1.0.1",
     "ajv": "^6.12.6",
+    "jscodeshift": "^0.13.0",
     "json-schema-diff-validator": "^0.4.1",
     "prosemirror-history": "^1.1.3",
     "prosemirror-state": "1.3.4",
-    "typescript": "3.9.6"
+    "typescript": "4.2.4"
   },
   "techstack": {
     "@atlassian/frontend": {

package/schema-bitbucket/package.json

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

package/schema-confluence/package.json

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

package/schema-default/package.json

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

package/schema-jira/package.json

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

package/tsconfig.json

@@ -9,7 +9,8 @@
     "./docs/**/*.ts",
     "./docs/**/*.tsx",
     "test-helpers/**/*.ts",
-    "test-helpers/**/*.tsx"
+    "test-helpers/**/*.tsx",
+    "codemods"
   ],
   "exclude": [
     "node_modules",