@atlaskit/editor-wikimarkup-transformer 11.0.8 → 11.0.11

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-wikimarkup-transformer
 
+## 11.0.11
+
+### Patch Changes
+
+- [`31ea1d0b1f8`](https://bitbucket.org/atlassian/atlassian-frontend/commits/31ea1d0b1f8) - Escape opening braces for only macro keywords
+
+## 11.0.10
+
+### Patch Changes
+
+- [`c0315117480`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c0315117480) - ESS-2375 Text effects should support surrounding curly braces
+
+## 11.0.9
+
+### Patch Changes
+
+- [`daa1dac9961`](https://bitbucket.org/atlassian/atlassian-frontend/commits/daa1dac9961) - Update the @atlaskit/editor-wikimarkup-transformer to use emotion instead of styled and also updated the dependencies
+- Updated dependencies
+
 ## 11.0.8
 
 ### Patch Changes

package/dist/cjs/encoder/nodes/text.js

@@ -1,10 +1,16 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.text = void 0;
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _keyword = require("../../parser/tokenize/keyword");
+
 var _code = require("../marks/code");
 
 var _color = require("../marks/color");
@@ -44,7 +50,10 @@ var isEscapeNeeded = function isEscapeNeeded(node, parent) {
 };
 
 function escapingWikiFormatter(text) {
-  return text.replace(/[{\\![]/g, '\\$&');
+  var pattern = ['([\\![])'].concat((0, _toConsumableArray2.default)(_keyword.macroKeywordTokenMap.map(function (macro) {
+    return "(".concat(macro.regex.source.replace('^', ''), ")");
+  }))).join('|');
+  return text.replace(new RegExp(pattern, 'g'), '\\$&');
 }
 
 var text = function text(node) {

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

@@ -60,9 +60,13 @@ var citation = function citation(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = (0, _text.getSurroundingSymbols)(input.substring(position), '??', '??'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return (0, _commonFormatter.commonFormatter)(input, position, schema, {
-    opening: '??',
-    closing: '??',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -55,9 +55,13 @@ var deleted = function deleted(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = (0, _text.getSurroundingSymbols)(input.substring(position), '-', '-'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return (0, _commonFormatter.commonFormatter)(input, position, schema, {
-    opening: '-',
-    closing: '-',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -54,9 +54,13 @@ var emphasis = function emphasis(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = (0, _text.getSurroundingSymbols)(input.substring(position), '_', '_'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return (0, _commonFormatter.commonFormatter)(input, position, schema, {
-    opening: '_',
-    closing: '_',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -54,9 +54,13 @@ var inserted = function inserted(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = (0, _text.getSurroundingSymbols)(input.substring(position), '+', '+'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return (0, _commonFormatter.commonFormatter)(input, position, schema, {
-    opening: '+',
-    closing: '+',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.macroKeywordTokenMap = void 0;
 exports.parseIssueKeyword = parseIssueKeyword;
 exports.parseLeadingKeyword = parseLeadingKeyword;
 exports.parseMacroKeyword = parseMacroKeyword;
@@ -42,6 +43,7 @@ var macroKeywordTokenMap = [{
  * will be checked first, so it matters.
  */
 
+exports.macroKeywordTokenMap = macroKeywordTokenMap;
 var keywordTokenMap = {
   '[': _.TokenType.LINK_FORMAT,
   http: _.TokenType.LINK_TEXT,
@@ -56,6 +58,14 @@ var keywordTokenMap = {
   '----': _.TokenType.QUADRUPLE_DASH_SYMBOL,
   '---': _.TokenType.TRIPLE_DASH_SYMBOL,
   '--': _.TokenType.DOUBLE_DASH_SYMBOL,
+  '{-}': _.TokenType.DELETED,
+  '{+}': _.TokenType.INSERTED,
+  '{*}': _.TokenType.STRONG,
+  '{^}': _.TokenType.SUPERSCRIPT,
+  '{~}': _.TokenType.SUBSCRIPT,
+  '{_}': _.TokenType.EMPHASIS,
+  '{{{}': _.TokenType.MONOSPACE,
+  '{??}': _.TokenType.CITATION,
   '-': _.TokenType.DELETED,
   '+': _.TokenType.INSERTED,
   '*': _.TokenType.STRONG,

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

@@ -7,9 +7,11 @@ exports.monospace = void 0;
 
 var _ = require("./");
 
+var _text = require("../utils/text");
+
 var _commonFormatter = require("./common-formatter");
 
-var _text = require("../text");
+var _text2 = require("../text");
 
 var monospace = function monospace(_ref) {
   var input = _ref.input,
@@ -34,7 +36,7 @@ var monospace = function monospace(_ref) {
   };
 
   var rawContentProcessor = function rawContentProcessor(raw, length) {
-    var content = (0, _text.parseString)({
+    var content = (0, _text2.parseString)({
       ignoreTokenTypes: ignoreTokenTypes,
       schema: schema,
       context: context,
@@ -48,9 +50,13 @@ var monospace = function monospace(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = (0, _text.getSurroundingSymbols)(input.substring(position), '{{', '}}'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return (0, _commonFormatter.commonFormatter)(input, position, schema, {
-    opening: '{{',
-    closing: '}}',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -54,9 +54,13 @@ var strong = function strong(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = (0, _text.getSurroundingSymbols)(input.substring(position), '*', '*'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return (0, _commonFormatter.commonFormatter)(input, position, schema, {
-    opening: '*',
-    closing: '*',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -56,9 +56,13 @@ var subscript = function subscript(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = (0, _text.getSurroundingSymbols)(input.substring(position), '~', '~'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return (0, _commonFormatter.commonFormatter)(input, position, schema, {
-    opening: '~',
-    closing: '~',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -56,9 +56,13 @@ var superscript = function superscript(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = (0, _text.getSurroundingSymbols)(input.substring(position), '^', '^'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return (0, _commonFormatter.commonFormatter)(input, position, schema, {
-    opening: '^',
-    closing: '^',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.StringBuffer = void 0;
+exports.getSurroundingSymbols = exports.StringBuffer = void 0;
 exports.hasAnyOfMarks = hasAnyOfMarks;
 exports.isBlank = isBlank;
 exports.isDigit = isDigit;
@@ -36,8 +36,24 @@ function isBlank(value) {
 
 function isNotBlank(value) {
   return !isBlank(value);
-} // TODO This is using strings which makes it potentially a performance bottleneck
+}
+/**
+ * ESS-2375 Returns the beginning and closing symbol to parse a token
+ */
+
+
+var getSurroundingSymbols = function getSurroundingSymbols(trimmedInput, openingText, closingText) {
+  var openingSymbol = trimmedInput.startsWith("{".concat(openingText, "}")) ? "{".concat(openingText, "}") : openingText;
+  var endIndex = trimmedInput.indexOf(closingText, openingSymbol === "{".concat(openingText, "}") ? openingText.length + 2 : openingText.length);
+  var closingSymbol = endIndex > -1 && trimmedInput.charAt(endIndex - 1) === '{' && trimmedInput.charAt(endIndex + closingText.length) === '}' ? "{".concat(closingText, "}") : closingText;
+  return {
+    openingSymbol: openingSymbol,
+    closingSymbol: closingSymbol
+  };
+}; // TODO This is using strings which makes it potentially a performance bottleneck
+
 
+exports.getSurroundingSymbols = getSurroundingSymbols;
 
 var StringBuffer = /*#__PURE__*/function () {
   function StringBuffer() {

package/dist/cjs/version.json

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

package/dist/es2019/encoder/nodes/text.js

@@ -1,3 +1,4 @@
+import { macroKeywordTokenMap } from '../../parser/tokenize/keyword';
 import { code } from '../marks/code';
 import { textColor } from '../marks/color';
 import { em } from '../marks/em';
@@ -28,7 +29,8 @@ const isEscapeNeeded = (node, parent) => {
 };
 
 function escapingWikiFormatter(text) {
-  return text.replace(/[{\\![]/g, '\\$&');
+  const pattern = ['([\\![])', ...macroKeywordTokenMap.map(macro => `(${macro.regex.source.replace('^', '')})`)].join('|');
+  return text.replace(new RegExp(pattern, 'g'), '\\$&');
 }
 
 export const text = (node, {

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

@@ -1,5 +1,5 @@
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 import { EM_DASH } from '../../char';
@@ -44,9 +44,13 @@ export const citation = ({
     };
   };
 
+  const {
+    openingSymbol,
+    closingSymbol
+  } = getSurroundingSymbols(input.substring(position), '??', '??');
   return commonFormatter(input, position, schema, {
-    opening: '??',
-    closing: '??',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context,
     rawContentProcessor
   });

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

@@ -1,5 +1,5 @@
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export const deleted = ({
@@ -40,9 +40,13 @@ export const deleted = ({
     };
   };
 
+  const {
+    openingSymbol,
+    closingSymbol
+  } = getSurroundingSymbols(input.substring(position), '-', '-');
   return commonFormatter(input, position, schema, {
-    opening: '-',
-    closing: '-',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context,
     rawContentProcessor
   });

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

@@ -1,5 +1,5 @@
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export const emphasis = ({
@@ -39,9 +39,13 @@ export const emphasis = ({
     };
   };
 
+  const {
+    openingSymbol,
+    closingSymbol
+  } = getSurroundingSymbols(input.substring(position), '_', '_');
   return commonFormatter(input, position, schema, {
-    opening: '_',
-    closing: '_',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context,
     rawContentProcessor
   });

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

@@ -1,5 +1,5 @@
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export const inserted = ({
@@ -39,9 +39,13 @@ export const inserted = ({
     };
   };
 
+  const {
+    openingSymbol,
+    closingSymbol
+  } = getSurroundingSymbols(input.substring(position), '+', '+');
   return commonFormatter(input, position, schema, {
-    opening: '+',
-    closing: '+',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context,
     rawContentProcessor
   });

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

@@ -1,6 +1,6 @@
 import { TokenType } from './';
 import { MAX_LIST_DEPTH } from './list';
-const macroKeywordTokenMap = [{
+export const macroKeywordTokenMap = [{
   type: TokenType.ADF_MACRO,
   regex: /^{adf/i
 }, {
@@ -44,6 +44,14 @@ const keywordTokenMap = {
   '----': TokenType.QUADRUPLE_DASH_SYMBOL,
   '---': TokenType.TRIPLE_DASH_SYMBOL,
   '--': TokenType.DOUBLE_DASH_SYMBOL,
+  '{-}': TokenType.DELETED,
+  '{+}': TokenType.INSERTED,
+  '{*}': TokenType.STRONG,
+  '{^}': TokenType.SUPERSCRIPT,
+  '{~}': TokenType.SUBSCRIPT,
+  '{_}': TokenType.EMPHASIS,
+  '{{{}': TokenType.MONOSPACE,
+  '{??}': TokenType.CITATION,
   '-': TokenType.DELETED,
   '+': TokenType.INSERTED,
   '*': TokenType.STRONG,

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

@@ -1,4 +1,5 @@
 import { TokenType } from './';
+import { getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export const monospace = ({
@@ -38,9 +39,13 @@ export const monospace = ({
     };
   };
 
+  const {
+    openingSymbol,
+    closingSymbol
+  } = getSurroundingSymbols(input.substring(position), '{{', '}}');
   return commonFormatter(input, position, schema, {
-    opening: '{{',
-    closing: '}}',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context,
     rawContentProcessor
   });

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

@@ -1,5 +1,5 @@
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export const strong = ({
@@ -39,9 +39,13 @@ export const strong = ({
     };
   };
 
+  const {
+    openingSymbol,
+    closingSymbol
+  } = getSurroundingSymbols(input.substring(position), '*', '*');
   return commonFormatter(input, position, schema, {
-    opening: '*',
-    closing: '*',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context,
     rawContentProcessor
   });

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

@@ -1,5 +1,5 @@
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export const subscript = ({
@@ -41,9 +41,13 @@ export const subscript = ({
     };
   };
 
+  const {
+    openingSymbol,
+    closingSymbol
+  } = getSurroundingSymbols(input.substring(position), '~', '~');
   return commonFormatter(input, position, schema, {
-    opening: '~',
-    closing: '~',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context,
     rawContentProcessor
   });

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

@@ -1,5 +1,5 @@
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export const superscript = ({
@@ -41,9 +41,13 @@ export const superscript = ({
     };
   };
 
+  const {
+    openingSymbol,
+    closingSymbol
+  } = getSurroundingSymbols(input.substring(position), '^', '^');
   return commonFormatter(input, position, schema, {
-    opening: '^',
-    closing: '^',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context,
     rawContentProcessor
   });

package/dist/es2019/parser/utils/text.js

@@ -12,7 +12,20 @@ export function isBlank(value) {
 }
 export function isNotBlank(value) {
   return !isBlank(value);
-} // TODO This is using strings which makes it potentially a performance bottleneck
+}
+/**
+ * ESS-2375 Returns the beginning and closing symbol to parse a token
+ */
+
+export const getSurroundingSymbols = (trimmedInput, openingText, closingText) => {
+  const openingSymbol = trimmedInput.startsWith(`{${openingText}}`) ? `{${openingText}}` : openingText;
+  const endIndex = trimmedInput.indexOf(closingText, openingSymbol === `{${openingText}}` ? openingText.length + 2 : openingText.length);
+  const closingSymbol = endIndex > -1 && trimmedInput.charAt(endIndex - 1) === '{' && trimmedInput.charAt(endIndex + closingText.length) === '}' ? `{${closingText}}` : closingText;
+  return {
+    openingSymbol,
+    closingSymbol
+  };
+}; // TODO This is using strings which makes it potentially a performance bottleneck
 
 export class StringBuffer {
   constructor(buffer = '') {

package/dist/es2019/version.json

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

package/dist/esm/encoder/nodes/text.js

@@ -1,3 +1,5 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import { macroKeywordTokenMap } from '../../parser/tokenize/keyword';
 import { code } from '../marks/code';
 import { textColor } from '../marks/color';
 import { em } from '../marks/em';
@@ -30,7 +32,10 @@ var isEscapeNeeded = function isEscapeNeeded(node, parent) {
 };
 
 function escapingWikiFormatter(text) {
-  return text.replace(/[{\\![]/g, '\\$&');
+  var pattern = ['([\\![])'].concat(_toConsumableArray(macroKeywordTokenMap.map(function (macro) {
+    return "(".concat(macro.regex.source.replace('^', ''), ")");
+  }))).join('|');
+  return text.replace(new RegExp(pattern, 'g'), '\\$&');
 }
 
 export var text = function text(node) {

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

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 import { EM_DASH } from '../../char';
@@ -45,9 +45,13 @@ export var citation = function citation(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = getSurroundingSymbols(input.substring(position), '??', '??'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return commonFormatter(input, position, schema, {
-    opening: '??',
-    closing: '??',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export var deleted = function deleted(_ref) {
@@ -41,9 +41,13 @@ export var deleted = function deleted(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = getSurroundingSymbols(input.substring(position), '-', '-'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return commonFormatter(input, position, schema, {
-    opening: '-',
-    closing: '-',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export var emphasis = function emphasis(_ref) {
@@ -40,9 +40,13 @@ export var emphasis = function emphasis(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = getSurroundingSymbols(input.substring(position), '_', '_'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return commonFormatter(input, position, schema, {
-    opening: '_',
-    closing: '_',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export var inserted = function inserted(_ref) {
@@ -40,9 +40,13 @@ export var inserted = function inserted(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = getSurroundingSymbols(input.substring(position), '+', '+'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return commonFormatter(input, position, schema, {
-    opening: '+',
-    closing: '+',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -1,6 +1,6 @@
 import { TokenType } from './';
 import { MAX_LIST_DEPTH } from './list';
-var macroKeywordTokenMap = [{
+export var macroKeywordTokenMap = [{
   type: TokenType.ADF_MACRO,
   regex: /^{adf/i
 }, {
@@ -44,6 +44,14 @@ var keywordTokenMap = {
   '----': TokenType.QUADRUPLE_DASH_SYMBOL,
   '---': TokenType.TRIPLE_DASH_SYMBOL,
   '--': TokenType.DOUBLE_DASH_SYMBOL,
+  '{-}': TokenType.DELETED,
+  '{+}': TokenType.INSERTED,
+  '{*}': TokenType.STRONG,
+  '{^}': TokenType.SUPERSCRIPT,
+  '{~}': TokenType.SUBSCRIPT,
+  '{_}': TokenType.EMPHASIS,
+  '{{{}': TokenType.MONOSPACE,
+  '{??}': TokenType.CITATION,
   '-': TokenType.DELETED,
   '+': TokenType.INSERTED,
   '*': TokenType.STRONG,

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

@@ -1,4 +1,5 @@
 import { TokenType } from './';
+import { getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export var monospace = function monospace(_ref) {
@@ -38,9 +39,13 @@ export var monospace = function monospace(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = getSurroundingSymbols(input.substring(position), '{{', '}}'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return commonFormatter(input, position, schema, {
-    opening: '{{',
-    closing: '}}',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export var strong = function strong(_ref) {
@@ -40,9 +40,13 @@ export var strong = function strong(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = getSurroundingSymbols(input.substring(position), '*', '*'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return commonFormatter(input, position, schema, {
-    opening: '*',
-    closing: '*',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export var subscript = function subscript(_ref) {
@@ -42,9 +42,13 @@ export var subscript = function subscript(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = getSurroundingSymbols(input.substring(position), '~', '~'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return commonFormatter(input, position, schema, {
-    opening: '~',
-    closing: '~',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { TokenType } from './';
-import { hasAnyOfMarks } from '../utils/text';
+import { hasAnyOfMarks, getSurroundingSymbols } from '../utils/text';
 import { commonFormatter } from './common-formatter';
 import { parseString } from '../text';
 export var superscript = function superscript(_ref) {
@@ -42,9 +42,13 @@ export var superscript = function superscript(_ref) {
     };
   };
 
+  var _getSurroundingSymbol = getSurroundingSymbols(input.substring(position), '^', '^'),
+      openingSymbol = _getSurroundingSymbol.openingSymbol,
+      closingSymbol = _getSurroundingSymbol.closingSymbol;
+
   return commonFormatter(input, position, schema, {
-    opening: '^',
-    closing: '^',
+    opening: openingSymbol,
+    closing: closingSymbol,
     context: context,
     rawContentProcessor: rawContentProcessor
   });

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

@@ -19,7 +19,20 @@ export function isBlank(value) {
 }
 export function isNotBlank(value) {
   return !isBlank(value);
-} // TODO This is using strings which makes it potentially a performance bottleneck
+}
+/**
+ * ESS-2375 Returns the beginning and closing symbol to parse a token
+ */
+
+export var getSurroundingSymbols = function getSurroundingSymbols(trimmedInput, openingText, closingText) {
+  var openingSymbol = trimmedInput.startsWith("{".concat(openingText, "}")) ? "{".concat(openingText, "}") : openingText;
+  var endIndex = trimmedInput.indexOf(closingText, openingSymbol === "{".concat(openingText, "}") ? openingText.length + 2 : openingText.length);
+  var closingSymbol = endIndex > -1 && trimmedInput.charAt(endIndex - 1) === '{' && trimmedInput.charAt(endIndex + closingText.length) === '}' ? "{".concat(closingText, "}") : closingText;
+  return {
+    openingSymbol: openingSymbol,
+    closingSymbol: closingSymbol
+  };
+}; // TODO This is using strings which makes it potentially a performance bottleneck
 
 export var StringBuffer = /*#__PURE__*/function () {
   function StringBuffer() {

package/dist/esm/version.json

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

package/dist/types/parser/tokenize/keyword.d.ts

@@ -1,4 +1,9 @@
 import { TokenType } from './';
+interface KeywordToken {
+    type: TokenType;
+    regex: RegExp;
+}
+export declare const macroKeywordTokenMap: KeywordToken[];
 export declare function parseMacroKeyword(input: string): {
     type: TokenType;
 } | null;
@@ -11,3 +16,4 @@ export declare function parseLeadingKeyword(input: string): {
 export declare function parseIssueKeyword(input: string, issueKeyRegex?: RegExp): {
     type: TokenType;
 } | null;
+export {};

package/dist/types/parser/utils/text.d.ts

@@ -6,6 +6,10 @@ export declare function hasAnyOfMarks(node: PMNode, types: string[]): boolean;
 export declare function isDigit(value: string): boolean;
 export declare function isBlank(value: string | null): boolean;
 export declare function isNotBlank(value: string | null): boolean;
+/**
+ * ESS-2375 Returns the beginning and closing symbol to parse a token
+ */
+export declare const getSurroundingSymbols: (trimmedInput: string, openingText: string, closingText: string) => Record<string, string>;
 export declare class StringBuffer {
     private buffer;
     constructor(buffer?: string);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-wikimarkup-transformer",
-  "version": "11.0.8",
+  "version": "11.0.11",
   "description": "Wiki markup transformer for JIRA and Confluence",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -24,7 +24,7 @@
     }
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^23.0.0",
+    "@atlaskit/adf-schema": "^23.1.0",
     "@atlaskit/editor-json-transformer": "^8.7.0",
     "@atlaskit/theme": "^12.1.0",
     "@babel/runtime": "^7.0.0",
@@ -33,20 +33,20 @@
   "devDependencies": {
     "@atlaskit/activity": "^1.0.1",
     "@atlaskit/docs": "*",
-    "@atlaskit/editor-common": "^67.0.0",
-    "@atlaskit/editor-core": "^166.0.0",
+    "@atlaskit/editor-common": "^68.0.0",
+    "@atlaskit/editor-core": "^167.0.0",
     "@atlaskit/editor-test-helpers": "^17.0.0",
     "@atlaskit/mention": "^21.0.0",
-    "@atlaskit/profilecard": "^16.4.0",
-    "@atlaskit/renderer": "^95.0.0",
-    "@atlaskit/util-data-test": "^17.2.0",
+    "@atlaskit/profilecard": "^16.9.0",
+    "@atlaskit/renderer": "^96.0.0",
+    "@atlaskit/util-data-test": "^17.3.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
+    "@emotion/react": "^11.7.1",
     "@types/prosemirror-model": "^1.11.0",
     "cookie": "^0.3.1",
     "debug": "^2.2.0",
     "react": "^16.8.0",
     "rxjs": "^5.5.0",
-    "styled-components": "^3.2.6",
     "typescript": "4.2.4"
   },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.1"

package/report.api.md

@@ -0,0 +1,21 @@
+## API Report File for "@atlaskit/editor-wikimarkup-transformer"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { Node as Node_2 } from 'prosemirror-model';
+import { Schema } from 'prosemirror-model';
+
+// @public (undocumented)
+class WikiMarkupTransformer implements Transformer_2<string> {
+  constructor(schema?: Schema);
+  // (undocumented)
+  encode(node: Node_2, context?: Context): string;
+  // (undocumented)
+  parse(wikiMarkup: string, context?: Context): Node_2;
+}
+export { WikiMarkupTransformer };
+export default WikiMarkupTransformer;
+
+// (No @packageDocumentation comment for this package)
+```