@atlaskit/editor-wikimarkup-transformer 11.1.15 → 11.1.17

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-wikimarkup-transformer
 
+## 11.1.17
+
+### Patch Changes
+
+- [`0ffb55018c9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0ffb55018c9) - Revert "[ED-17172] Bumped prosemirror-view from 1.23.2 to 1.23.7 and removed work-around for fixed issues"
+
+## 11.1.16
+
+### Patch Changes
+
+- [`5ae242b554c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5ae242b554c) - updated logic to handle multiple linebreaks inside a macro within a list
+
 ## 11.1.15
 
 ### Patch Changes

package/dist/cjs/parser/builder/list-builder.js

@@ -12,7 +12,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var supportedContentType = ['paragraph', 'orderedList', 'bulletList', 'mediaSingle', 'codeBlock'];
 
 /**
@@ -25,6 +25,11 @@ var ListBuilder = /*#__PURE__*/function () {
   function ListBuilder(schema, bullets) {
     var _this = this;
     (0, _classCallCheck2.default)(this, ListBuilder);
+    /**
+     * Build prosemirror bulletList or orderedList node
+     * @param {List} list
+     * @returns {PMNode}
+     */
     (0, _defineProperty2.default)(this, "parseList", function (list) {
       var listNode = _this.schema.nodes[list.type];
       var output = [];
@@ -55,6 +60,12 @@ var ListBuilder = /*#__PURE__*/function () {
       }
       return output;
     });
+    /**
+     * Build prosemirror listItem node
+     * This function would possibly return non listItem nodes
+     * which we need to break out later
+     * @param {ListItem} item
+     */
     (0, _defineProperty2.default)(this, "parseListItem", function (item) {
       var _item$content;
       var output = [];
@@ -172,19 +183,6 @@ var ListBuilder = /*#__PURE__*/function () {
     value: function buildPMNode() {
       return this.parseList(this.root);
     }
-
-    /**
-     * Build prosemirror bulletList or orderedList node
-     * @param {List} list
-     * @returns {PMNode}
-     */
-
-    /**
-     * Build prosemirror listItem node
-     * This function would possibly return non listItem nodes
-     * which we need to break out later
-     * @param {ListItem} item
-     */
   }, {
     key: "isParagraphEmptyTextNode",
     value: /* Check if all paragraph's children nodes are text and empty */

package/dist/cjs/parser/builder/table-builder.js

@@ -10,7 +10,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 /**
  * Return the cell type based on the delimeter
  */
@@ -31,6 +31,10 @@ var TableBuilder = /*#__PURE__*/function () {
       var tableRow = _this.schema.nodes.tableRow;
       return tableRow.createChecked({}, _this.emptyTableCell());
     });
+    /**
+     * Build prosemirror table node
+     * @returns {PMNode}
+     */
     (0, _defineProperty2.default)(this, "buildTableNode", function () {
       var root = _this.root;
       var table = _this.schema.nodes.table;
@@ -40,10 +44,19 @@ var TableBuilder = /*#__PURE__*/function () {
       }
       return table.createChecked({}, content);
     });
+    /**
+     * Build prosemirror tr node
+     * @returns {PMNode}
+     */
     (0, _defineProperty2.default)(this, "buildTableRowNode", function (row) {
       var tableRow = _this.schema.nodes.tableRow;
       return tableRow.createChecked({}, row.cells.map(_this.buildTableCellNode));
     });
+    /**
+     * Build prosemirror td/th node
+     * @param {TableCell} cell
+     * @returns {PMNode}
+     */
     (0, _defineProperty2.default)(this, "buildTableCellNode", function (cell) {
       var type = cell.type,
         content = cell.content;
@@ -117,22 +130,6 @@ var TableBuilder = /*#__PURE__*/function () {
     value: function buildPMNode() {
       return this.buildTableNode();
     }
-
-    /**
-     * Build prosemirror table node
-     * @returns {PMNode}
-     */
-
-    /**
-     * Build prosemirror tr node
-     * @returns {PMNode}
-     */
-
-    /**
-     * Build prosemirror td/th node
-     * @param {TableCell} cell
-     * @returns {PMNode}
-     */
   }, {
     key: "addRow",
     value:

package/dist/cjs/parser/tokenize/index.js

@@ -38,9 +38,7 @@ var _noformatMacro = require("./noformat-macro");
 var _forceLineBreak = require("./force-line-break");
 var _issueKey = require("./issue-key");
 var _tokenToTokenParserMa;
-var TokenType; // \\
-exports.TokenType = TokenType;
-(function (TokenType) {
+var TokenType = /*#__PURE__*/function (TokenType) {
   TokenType["ADF_MACRO"] = "ADF_MACRO";
   TokenType["ANCHOR_MACRO"] = "ANCHOR_MACRO";
   TokenType["CODE_MACRO"] = "CODE_MACRO";
@@ -73,7 +71,9 @@ exports.TokenType = TokenType;
   TokenType["INSERTED"] = "INSERTED";
   TokenType["EMOJI"] = "EMOJI";
   TokenType["FORCE_LINE_BREAK"] = "FORCE_LINE_BREAK";
-})(TokenType || (exports.TokenType = TokenType = {}));
+  return TokenType;
+}({}); // \\
+exports.TokenType = TokenType;
 var tokenToTokenParserMapping = (_tokenToTokenParserMa = {}, (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.DOUBLE_DASH_SYMBOL, _doubleDashSymbol.doubleDashSymbol), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.TRIPLE_DASH_SYMBOL, _tripleDashSymbol.tripleDashSymbol), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.QUADRUPLE_DASH_SYMBOL, _quadrupleDashSymbol.quadrupleDashSymbol), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.RULER, _ruler.ruler), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.STRONG, _strong.strong), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.MONOSPACE, _monospace.monospace), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.SUPERSCRIPT, _superscript.superscript), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.SUBSCRIPT, _subscript.subscript), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.EMPHASIS, _emphasis.emphasis), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.CITATION, _citation.citation), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.DELETED, _deleted.deleted), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.INSERTED, _inserted.inserted), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.HARD_BREAK, _hardbreak.hardbreak), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.LINK_FORMAT, _linkFormat.linkFormat), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.LINK_TEXT, _linkText.linkText), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.HEADING, _heading.heading), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.MEDIA, _media.media), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.LIST, _list.list), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.QUOTE, _blockquote.blockquote), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.TABLE, _table.table), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.EMOJI, _emoji.emoji), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.ADF_MACRO, _adfMacro.adfMacro), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.ANCHOR_MACRO, _anchorMacro.anchorMacro), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.CODE_MACRO, _codeMacro.codeMacro), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.QUOTE_MACRO, _quoteMacro.quoteMacro), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.NOFORMAT_MACRO, _noformatMacro.noformatMacro), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.PANEL_MACRO, _panelMacro.panelMacro), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.COLOR_MACRO, _colorMacro.colorMacro), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.FORCE_LINE_BREAK, _forceLineBreak.forceLineBreak), (0, _defineProperty2.default)(_tokenToTokenParserMa, TokenType.ISSUE_KEY, _issueKey.issueKey), _tokenToTokenParserMa);
 function parseToken(input, type, position, schema, context) {
   var tokenParser = tokenToTokenParserMapping[type];

package/dist/cjs/parser/tokenize/links/link-resolver.js

@@ -10,7 +10,7 @@ var _urlLink = require("./url-link");
 var _issueLink = require("./issue-link");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 /**
  * Given some parsed link text, convert it into a link object that can then be rendered into
  * the page.  The parseAsContentLink() method must have been called on the GenericLinkParser

package/dist/cjs/parser/tokenize/list.js

@@ -42,8 +42,16 @@ var list = function list(_ref) {
   var builder = null;
   var contentBuffer = [];
   var output = [];
+  var isWithinMacro = false;
+  var macroLength = 0;
   while (index < input.length) {
     var char = input.charAt(index);
+
+    // Reset macro flags -> if we finished parsing the macro block. There can be multiple concecutive macros in a same listItem
+    if (isWithinMacro && index === macroLength) {
+      isWithinMacro = false;
+      macroLength = 0;
+    }
     switch (state) {
       case processState.NEW_LINE:
         {
@@ -107,7 +115,8 @@ var list = function list(_ref) {
 
           // If we encounter an empty line, we should end the list
           var emptyLineMatch = substring.match(EMPTY_LINE_REGEXP);
-          if (emptyLineMatch) {
+          // ADFEXP-371 -> We should not end the list if we are inside a macro and we encountered a new line
+          if (emptyLineMatch && !isWithinMacro) {
             state = processState.END;
             continue;
           }
@@ -143,33 +152,42 @@ var list = function list(_ref) {
           if (token.type === 'text') {
             buffer.push(token.text);
           } else {
-            var _contentBuffer3;
             // We found a macro in the list...
             if (!builder) {
               // Something is really wrong here
               return fallback(input, position);
             }
-            if (buffer.length > 0) {
-              var _contentBuffer2;
-              /**
-               * Wrapup what is already in the string buffer and save it to
-               * contentBuffer
-               */
-              var _content = (0, _text.parseString)({
-                ignoreTokenTypes: ignoreTokenTypes,
-                schema: schema,
-                context: context,
-                input: buffer.join(''),
-                includeLeadingSpace: true
-              });
-              (_contentBuffer2 = contentBuffer).push.apply(_contentBuffer2, (0, _toConsumableArray2.default)(sanitize(_content, schema)));
-              buffer = [];
+            //   if (buffer.length > 0) {
+            //     /**
+            //      * Wrapup what is already in the string buffer and save it to
+            //      * contentBuffer
+            //      */
+            //     const content = parseString({
+            //       ignoreTokenTypes,
+            //       schema,
+            //       context,
+            //       input: buffer.join(''),
+            //       includeLeadingSpace: true,
+            //     });
+            //     contentBuffer.push(...sanitize(content, schema));
+            //     buffer = [];
+            //   }
+
+            //   contentBuffer.push(...sanitize(token.nodes, schema));
+            // }
+            // index += token.length;
+            // state = processState.BUFFER;
+            // continue;
+
+            // ADFEXP-371 -> check if we encountered a macro and also that we are not inside a macro block already.
+            if (token && !isWithinMacro) {
+              isWithinMacro = true;
+              // macroLength will help to reset the isWithinMacro flag once we have sucessfully parsed entire macro block
+              macroLength = index + token.length;
             }
-            (_contentBuffer3 = contentBuffer).push.apply(_contentBuffer3, (0, _toConsumableArray2.default)(sanitize(token.nodes, schema)));
           }
-          index += token.length;
-          state = processState.BUFFER;
-          continue;
+          buffer.push(char);
+          break;
         }
       case processState.END:
         {
@@ -178,16 +196,16 @@ var list = function list(_ref) {
             return fallback(input, position);
           }
           if (buffer.length > 0) {
-            var _contentBuffer4;
+            var _contentBuffer2;
             // Wrap up previous list item and clear buffer
-            var _content2 = (0, _text.parseString)({
+            var _content = (0, _text.parseString)({
               ignoreTokenTypes: ignoreTokenTypes,
               schema: schema,
               context: context,
               input: buffer.join(''),
               includeLeadingSpace: true
             });
-            (_contentBuffer4 = contentBuffer).push.apply(_contentBuffer4, (0, _toConsumableArray2.default)(_content2));
+            (_contentBuffer2 = contentBuffer).push.apply(_contentBuffer2, (0, _toConsumableArray2.default)(_content));
           }
           builder.add([{
             style: lastListSymbols,
@@ -204,16 +222,16 @@ var list = function list(_ref) {
     index++;
   }
   if (buffer.length > 0) {
-    var _contentBuffer5;
+    var _contentBuffer3;
     // Wrap up what's left in the buffer
-    var _content3 = (0, _text.parseString)({
+    var _content2 = (0, _text.parseString)({
       ignoreTokenTypes: ignoreTokenTypes,
       schema: schema,
       context: context,
       input: buffer.join(''),
       includeLeadingSpace: true
     });
-    (_contentBuffer5 = contentBuffer).push.apply(_contentBuffer5, (0, _toConsumableArray2.default)(_content3));
+    (_contentBuffer3 = contentBuffer).push.apply(_contentBuffer3, (0, _toConsumableArray2.default)(_content2));
   }
   if (builder) {
     builder.add([{

package/dist/cjs/parser/tokenize/panel-macro.js

@@ -14,7 +14,7 @@ var _panelType = require("../utils/panel-type");
 var _title = require("../utils/title");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var allowedNodeType = ['paragraph', 'heading', 'orderedList', 'bulletList'];

package/dist/cjs/parser/tokenize/quote-macro.js

@@ -12,7 +12,7 @@ var _normalize = require("../utils/normalize");
 var _text2 = require("../text");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var quoteMacro = function quoteMacro(_ref) {
   var input = _ref.input,
     position = _ref.position,

package/dist/cjs/parser/utils/normalize.js

@@ -12,7 +12,7 @@ var _paragraph = require("../nodes/paragraph");
 var _tableBuilder = require("../builder/table-builder");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function normalizePMNodes(nodes, schema, parentNode) {
   return [normalizeMediaGroups, normalizeInlineNodes].reduce(function (currentNodes, normFunc) {
     return normFunc(currentNodes, schema, parentNode);

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-wikimarkup-transformer",
-	"version": "11.1.15",
+	"version": "11.1.17",
 	"sideEffects": false
 }

package/dist/es2019/parser/builder/list-builder.js

@@ -9,6 +9,11 @@ export function getType(bullets) {
 }
 export class ListBuilder {
   constructor(schema, bullets) {
+    /**
+     * Build prosemirror bulletList or orderedList node
+     * @param {List} list
+     * @returns {PMNode}
+     */
     _defineProperty(this, "parseList", list => {
       const listNode = this.schema.nodes[list.type];
       const output = [];
@@ -39,6 +44,12 @@ export class ListBuilder {
       }
       return output;
     });
+    /**
+     * Build prosemirror listItem node
+     * This function would possibly return non listItem nodes
+     * which we need to break out later
+     * @param {ListItem} item
+     */
     _defineProperty(this, "parseListItem", item => {
       const output = [];
       if (!item.content) {
@@ -142,20 +153,6 @@ export class ListBuilder {
   buildPMNode() {
     return this.parseList(this.root);
   }
-
-  /**
-   * Build prosemirror bulletList or orderedList node
-   * @param {List} list
-   * @returns {PMNode}
-   */
-
-  /**
-   * Build prosemirror listItem node
-   * This function would possibly return non listItem nodes
-   * which we need to break out later
-   * @param {ListItem} item
-   */
-
   /* Check if all paragraph's children nodes are text and empty */
   isParagraphEmptyTextNode(node) {
     if (node.type.name !== 'paragraph' || !node.childCount) {

package/dist/es2019/parser/builder/table-builder.js

@@ -20,6 +20,10 @@ export class TableBuilder {
       } = this.schema.nodes;
       return tableRow.createChecked({}, this.emptyTableCell());
     });
+    /**
+     * Build prosemirror table node
+     * @returns {PMNode}
+     */
     _defineProperty(this, "buildTableNode", () => {
       const {
         root
@@ -33,12 +37,21 @@ export class TableBuilder {
       }
       return table.createChecked({}, content);
     });
+    /**
+     * Build prosemirror tr node
+     * @returns {PMNode}
+     */
     _defineProperty(this, "buildTableRowNode", row => {
       const {
         tableRow
       } = this.schema.nodes;
       return tableRow.createChecked({}, row.cells.map(this.buildTableCellNode));
     });
+    /**
+     * Build prosemirror td/th node
+     * @param {TableCell} cell
+     * @returns {PMNode}
+     */
     _defineProperty(this, "buildTableCellNode", cell => {
       const {
         type,
@@ -101,23 +114,6 @@ export class TableBuilder {
   buildPMNode() {
     return this.buildTableNode();
   }
-
-  /**
-   * Build prosemirror table node
-   * @returns {PMNode}
-   */
-
-  /**
-   * Build prosemirror tr node
-   * @returns {PMNode}
-   */
-
-  /**
-   * Build prosemirror td/th node
-   * @param {TableCell} cell
-   * @returns {PMNode}
-   */
-
   /**
    * Add a new row to the table
    */

package/dist/es2019/parser/tokenize/index.js

@@ -28,8 +28,7 @@ import { colorMacro } from './color-macro';
 import { noformatMacro } from './noformat-macro';
 import { forceLineBreak } from './force-line-break';
 import { issueKey } from './issue-key';
-export let TokenType; // \\
-(function (TokenType) {
+export let TokenType = /*#__PURE__*/function (TokenType) {
   TokenType["ADF_MACRO"] = "ADF_MACRO";
   TokenType["ANCHOR_MACRO"] = "ANCHOR_MACRO";
   TokenType["CODE_MACRO"] = "CODE_MACRO";
@@ -62,7 +61,8 @@ export let TokenType; // \\
   TokenType["INSERTED"] = "INSERTED";
   TokenType["EMOJI"] = "EMOJI";
   TokenType["FORCE_LINE_BREAK"] = "FORCE_LINE_BREAK";
-})(TokenType || (TokenType = {}));
+  return TokenType;
+}({}); // \\
 const tokenToTokenParserMapping = {
   [TokenType.DOUBLE_DASH_SYMBOL]: doubleDashSymbol,
   [TokenType.TRIPLE_DASH_SYMBOL]: tripleDashSymbol,

package/dist/es2019/parser/tokenize/list.js

@@ -33,8 +33,16 @@ export const list = ({
   let builder = null;
   let contentBuffer = [];
   const output = [];
+  let isWithinMacro = false;
+  let macroLength = 0;
   while (index < input.length) {
     const char = input.charAt(index);
+
+    // Reset macro flags -> if we finished parsing the macro block. There can be multiple concecutive macros in a same listItem
+    if (isWithinMacro && index === macroLength) {
+      isWithinMacro = false;
+      macroLength = 0;
+    }
     switch (state) {
       case processState.NEW_LINE:
         {
@@ -96,7 +104,8 @@ export const list = ({
 
           // If we encounter an empty line, we should end the list
           const emptyLineMatch = substring.match(EMPTY_LINE_REGEXP);
-          if (emptyLineMatch) {
+          // ADFEXP-371 -> We should not end the list if we are inside a macro and we encountered a new line
+          if (emptyLineMatch && !isWithinMacro) {
             state = processState.END;
             continue;
           }
@@ -137,26 +146,37 @@ export const list = ({
               // Something is really wrong here
               return fallback(input, position);
             }
-            if (buffer.length > 0) {
-              /**
-               * Wrapup what is already in the string buffer and save it to
-               * contentBuffer
-               */
-              const content = parseString({
-                ignoreTokenTypes,
-                schema,
-                context,
-                input: buffer.join(''),
-                includeLeadingSpace: true
-              });
-              contentBuffer.push(...sanitize(content, schema));
-              buffer = [];
+            //   if (buffer.length > 0) {
+            //     /**
+            //      * Wrapup what is already in the string buffer and save it to
+            //      * contentBuffer
+            //      */
+            //     const content = parseString({
+            //       ignoreTokenTypes,
+            //       schema,
+            //       context,
+            //       input: buffer.join(''),
+            //       includeLeadingSpace: true,
+            //     });
+            //     contentBuffer.push(...sanitize(content, schema));
+            //     buffer = [];
+            //   }
+
+            //   contentBuffer.push(...sanitize(token.nodes, schema));
+            // }
+            // index += token.length;
+            // state = processState.BUFFER;
+            // continue;
+
+            // ADFEXP-371 -> check if we encountered a macro and also that we are not inside a macro block already.
+            if (token && !isWithinMacro) {
+              isWithinMacro = true;
+              // macroLength will help to reset the isWithinMacro flag once we have sucessfully parsed entire macro block
+              macroLength = index + token.length;
             }
-            contentBuffer.push(...sanitize(token.nodes, schema));
           }
-          index += token.length;
-          state = processState.BUFFER;
-          continue;
+          buffer.push(char);
+          break;
         }
       case processState.END:
         {

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-wikimarkup-transformer",
-	"version": "11.1.15",
+	"version": "11.1.17",
 	"sideEffects": false
 }

package/dist/esm/parser/builder/list-builder.js

@@ -4,7 +4,7 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var supportedContentType = ['paragraph', 'orderedList', 'bulletList', 'mediaSingle', 'codeBlock'];
 
 /**
@@ -17,6 +17,11 @@ export var ListBuilder = /*#__PURE__*/function () {
   function ListBuilder(schema, bullets) {
     var _this = this;
     _classCallCheck(this, ListBuilder);
+    /**
+     * Build prosemirror bulletList or orderedList node
+     * @param {List} list
+     * @returns {PMNode}
+     */
     _defineProperty(this, "parseList", function (list) {
       var listNode = _this.schema.nodes[list.type];
       var output = [];
@@ -47,6 +52,12 @@ export var ListBuilder = /*#__PURE__*/function () {
       }
       return output;
     });
+    /**
+     * Build prosemirror listItem node
+     * This function would possibly return non listItem nodes
+     * which we need to break out later
+     * @param {ListItem} item
+     */
     _defineProperty(this, "parseListItem", function (item) {
       var _item$content;
       var output = [];
@@ -164,19 +175,6 @@ export var ListBuilder = /*#__PURE__*/function () {
     value: function buildPMNode() {
       return this.parseList(this.root);
     }
-
-    /**
-     * Build prosemirror bulletList or orderedList node
-     * @param {List} list
-     * @returns {PMNode}
-     */
-
-    /**
-     * Build prosemirror listItem node
-     * This function would possibly return non listItem nodes
-     * which we need to break out later
-     * @param {ListItem} item
-     */
   }, {
     key: "isParagraphEmptyTextNode",
     value: /* Check if all paragraph's children nodes are text and empty */

package/dist/esm/parser/builder/table-builder.js

@@ -3,7 +3,7 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 /**
  * Return the cell type based on the delimeter
  */
@@ -24,6 +24,10 @@ export var TableBuilder = /*#__PURE__*/function () {
       var tableRow = _this.schema.nodes.tableRow;
       return tableRow.createChecked({}, _this.emptyTableCell());
     });
+    /**
+     * Build prosemirror table node
+     * @returns {PMNode}
+     */
     _defineProperty(this, "buildTableNode", function () {
       var root = _this.root;
       var table = _this.schema.nodes.table;
@@ -33,10 +37,19 @@ export var TableBuilder = /*#__PURE__*/function () {
       }
       return table.createChecked({}, content);
     });
+    /**
+     * Build prosemirror tr node
+     * @returns {PMNode}
+     */
     _defineProperty(this, "buildTableRowNode", function (row) {
       var tableRow = _this.schema.nodes.tableRow;
       return tableRow.createChecked({}, row.cells.map(_this.buildTableCellNode));
     });
+    /**
+     * Build prosemirror td/th node
+     * @param {TableCell} cell
+     * @returns {PMNode}
+     */
     _defineProperty(this, "buildTableCellNode", function (cell) {
       var type = cell.type,
         content = cell.content;
@@ -110,22 +123,6 @@ export var TableBuilder = /*#__PURE__*/function () {
     value: function buildPMNode() {
       return this.buildTableNode();
     }
-
-    /**
-     * Build prosemirror table node
-     * @returns {PMNode}
-     */
-
-    /**
-     * Build prosemirror tr node
-     * @returns {PMNode}
-     */
-
-    /**
-     * Build prosemirror td/th node
-     * @param {TableCell} cell
-     * @returns {PMNode}
-     */
   }, {
     key: "addRow",
     value:

package/dist/esm/parser/tokenize/index.js

@@ -30,8 +30,7 @@ import { colorMacro } from './color-macro';
 import { noformatMacro } from './noformat-macro';
 import { forceLineBreak } from './force-line-break';
 import { issueKey } from './issue-key';
-export var TokenType; // \\
-(function (TokenType) {
+export var TokenType = /*#__PURE__*/function (TokenType) {
   TokenType["ADF_MACRO"] = "ADF_MACRO";
   TokenType["ANCHOR_MACRO"] = "ANCHOR_MACRO";
   TokenType["CODE_MACRO"] = "CODE_MACRO";
@@ -64,7 +63,8 @@ export var TokenType; // \\
   TokenType["INSERTED"] = "INSERTED";
   TokenType["EMOJI"] = "EMOJI";
   TokenType["FORCE_LINE_BREAK"] = "FORCE_LINE_BREAK";
-})(TokenType || (TokenType = {}));
+  return TokenType;
+}({}); // \\
 var tokenToTokenParserMapping = (_tokenToTokenParserMa = {}, _defineProperty(_tokenToTokenParserMa, TokenType.DOUBLE_DASH_SYMBOL, doubleDashSymbol), _defineProperty(_tokenToTokenParserMa, TokenType.TRIPLE_DASH_SYMBOL, tripleDashSymbol), _defineProperty(_tokenToTokenParserMa, TokenType.QUADRUPLE_DASH_SYMBOL, quadrupleDashSymbol), _defineProperty(_tokenToTokenParserMa, TokenType.RULER, ruler), _defineProperty(_tokenToTokenParserMa, TokenType.STRONG, strong), _defineProperty(_tokenToTokenParserMa, TokenType.MONOSPACE, monospace), _defineProperty(_tokenToTokenParserMa, TokenType.SUPERSCRIPT, superscript), _defineProperty(_tokenToTokenParserMa, TokenType.SUBSCRIPT, subscript), _defineProperty(_tokenToTokenParserMa, TokenType.EMPHASIS, emphasis), _defineProperty(_tokenToTokenParserMa, TokenType.CITATION, citation), _defineProperty(_tokenToTokenParserMa, TokenType.DELETED, deleted), _defineProperty(_tokenToTokenParserMa, TokenType.INSERTED, inserted), _defineProperty(_tokenToTokenParserMa, TokenType.HARD_BREAK, hardbreak), _defineProperty(_tokenToTokenParserMa, TokenType.LINK_FORMAT, linkFormat), _defineProperty(_tokenToTokenParserMa, TokenType.LINK_TEXT, linkText), _defineProperty(_tokenToTokenParserMa, TokenType.HEADING, heading), _defineProperty(_tokenToTokenParserMa, TokenType.MEDIA, media), _defineProperty(_tokenToTokenParserMa, TokenType.LIST, list), _defineProperty(_tokenToTokenParserMa, TokenType.QUOTE, blockquote), _defineProperty(_tokenToTokenParserMa, TokenType.TABLE, table), _defineProperty(_tokenToTokenParserMa, TokenType.EMOJI, emoji), _defineProperty(_tokenToTokenParserMa, TokenType.ADF_MACRO, adfMacro), _defineProperty(_tokenToTokenParserMa, TokenType.ANCHOR_MACRO, anchorMacro), _defineProperty(_tokenToTokenParserMa, TokenType.CODE_MACRO, codeMacro), _defineProperty(_tokenToTokenParserMa, TokenType.QUOTE_MACRO, quoteMacro), _defineProperty(_tokenToTokenParserMa, TokenType.NOFORMAT_MACRO, noformatMacro), _defineProperty(_tokenToTokenParserMa, TokenType.PANEL_MACRO, panelMacro), _defineProperty(_tokenToTokenParserMa, TokenType.COLOR_MACRO, colorMacro), _defineProperty(_tokenToTokenParserMa, TokenType.FORCE_LINE_BREAK, forceLineBreak), _defineProperty(_tokenToTokenParserMa, TokenType.ISSUE_KEY, issueKey), _tokenToTokenParserMa);
 export function parseToken(input, type, position, schema, context) {
   var tokenParser = tokenToTokenParserMapping[type];

package/dist/esm/parser/tokenize/links/link-resolver.js

@@ -1,6 +1,6 @@
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { mentionLinkResolver } from './mention-link';
 import { attachmentLinkResolver } from './attachment-link';
 import { urlLinkResolver } from './url-link';

package/dist/esm/parser/tokenize/list.js

@@ -34,8 +34,16 @@ export var list = function list(_ref) {
   var builder = null;
   var contentBuffer = [];
   var output = [];
+  var isWithinMacro = false;
+  var macroLength = 0;
   while (index < input.length) {
     var char = input.charAt(index);
+
+    // Reset macro flags -> if we finished parsing the macro block. There can be multiple concecutive macros in a same listItem
+    if (isWithinMacro && index === macroLength) {
+      isWithinMacro = false;
+      macroLength = 0;
+    }
     switch (state) {
       case processState.NEW_LINE:
         {
@@ -99,7 +107,8 @@ export var list = function list(_ref) {
 
           // If we encounter an empty line, we should end the list
           var emptyLineMatch = substring.match(EMPTY_LINE_REGEXP);
-          if (emptyLineMatch) {
+          // ADFEXP-371 -> We should not end the list if we are inside a macro and we encountered a new line
+          if (emptyLineMatch && !isWithinMacro) {
             state = processState.END;
             continue;
           }
@@ -135,33 +144,42 @@ export var list = function list(_ref) {
           if (token.type === 'text') {
             buffer.push(token.text);
           } else {
-            var _contentBuffer3;
             // We found a macro in the list...
             if (!builder) {
               // Something is really wrong here
               return fallback(input, position);
             }
-            if (buffer.length > 0) {
-              var _contentBuffer2;
-              /**
-               * Wrapup what is already in the string buffer and save it to
-               * contentBuffer
-               */
-              var _content = parseString({
-                ignoreTokenTypes: ignoreTokenTypes,
-                schema: schema,
-                context: context,
-                input: buffer.join(''),
-                includeLeadingSpace: true
-              });
-              (_contentBuffer2 = contentBuffer).push.apply(_contentBuffer2, _toConsumableArray(sanitize(_content, schema)));
-              buffer = [];
+            //   if (buffer.length > 0) {
+            //     /**
+            //      * Wrapup what is already in the string buffer and save it to
+            //      * contentBuffer
+            //      */
+            //     const content = parseString({
+            //       ignoreTokenTypes,
+            //       schema,
+            //       context,
+            //       input: buffer.join(''),
+            //       includeLeadingSpace: true,
+            //     });
+            //     contentBuffer.push(...sanitize(content, schema));
+            //     buffer = [];
+            //   }
+
+            //   contentBuffer.push(...sanitize(token.nodes, schema));
+            // }
+            // index += token.length;
+            // state = processState.BUFFER;
+            // continue;
+
+            // ADFEXP-371 -> check if we encountered a macro and also that we are not inside a macro block already.
+            if (token && !isWithinMacro) {
+              isWithinMacro = true;
+              // macroLength will help to reset the isWithinMacro flag once we have sucessfully parsed entire macro block
+              macroLength = index + token.length;
             }
-            (_contentBuffer3 = contentBuffer).push.apply(_contentBuffer3, _toConsumableArray(sanitize(token.nodes, schema)));
           }
-          index += token.length;
-          state = processState.BUFFER;
-          continue;
+          buffer.push(char);
+          break;
         }
       case processState.END:
         {
@@ -170,16 +188,16 @@ export var list = function list(_ref) {
             return fallback(input, position);
           }
           if (buffer.length > 0) {
-            var _contentBuffer4;
+            var _contentBuffer2;
             // Wrap up previous list item and clear buffer
-            var _content2 = parseString({
+            var _content = parseString({
               ignoreTokenTypes: ignoreTokenTypes,
               schema: schema,
               context: context,
               input: buffer.join(''),
               includeLeadingSpace: true
             });
-            (_contentBuffer4 = contentBuffer).push.apply(_contentBuffer4, _toConsumableArray(_content2));
+            (_contentBuffer2 = contentBuffer).push.apply(_contentBuffer2, _toConsumableArray(_content));
           }
           builder.add([{
             style: lastListSymbols,
@@ -196,16 +214,16 @@ export var list = function list(_ref) {
     index++;
   }
   if (buffer.length > 0) {
-    var _contentBuffer5;
+    var _contentBuffer3;
     // Wrap up what's left in the buffer
-    var _content3 = parseString({
+    var _content2 = parseString({
       ignoreTokenTypes: ignoreTokenTypes,
       schema: schema,
       context: context,
       input: buffer.join(''),
       includeLeadingSpace: true
     });
-    (_contentBuffer5 = contentBuffer).push.apply(_contentBuffer5, _toConsumableArray(_content3));
+    (_contentBuffer3 = contentBuffer).push.apply(_contentBuffer3, _toConsumableArray(_content2));
   }
   if (builder) {
     builder.add([{

package/dist/esm/parser/tokenize/panel-macro.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import { commonMacro } from './common-macro';

package/dist/esm/parser/tokenize/quote-macro.js

@@ -1,7 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { commonMacro } from './common-macro';
 import { hasAnyOfMarks } from '../utils/text';
 import { normalizePMNodes } from '../utils/normalize';

package/dist/esm/parser/utils/normalize.js

@@ -1,7 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { createParagraphNodeFromInlineNodes, createEmptyParagraphNode } from '../nodes/paragraph';
 import { TableBuilder } from '../builder/table-builder';
 export function normalizePMNodes(nodes, schema, parentNode) {

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-wikimarkup-transformer",
-	"version": "11.1.15",
+	"version": "11.1.17",
 	"sideEffects": false
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-wikimarkup-transformer",
-  "version": "11.1.15",
+  "version": "11.1.17",
   "description": "Wiki markup transformer for JIRA and Confluence",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -33,8 +33,8 @@
   "devDependencies": {
     "@atlaskit/activity": "^1.0.1",
     "@atlaskit/docs": "*",
-    "@atlaskit/editor-common": "^72.9.0",
-    "@atlaskit/editor-core": "^182.1.0",
+    "@atlaskit/editor-common": "^73.0.0",
+    "@atlaskit/editor-core": "^182.2.0",
     "@atlaskit/editor-test-helpers": "^18.2.0",
     "@atlaskit/mention": "^22.0.0",
     "@atlaskit/profilecard": "^19.2.0",