@atlaskit/editor-wikimarkup-transformer 11.1.14 → 11.1.15

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-wikimarkup-transformer
 
+## 11.1.15
+
+### Patch Changes
+
+- [`7c57f6550f7`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7c57f6550f7) - Updated metacharacter escaping logic in encoder
+
 ## 11.1.14
 
 ### Patch Changes

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

@@ -30,6 +30,7 @@ var markEncoderMapping = new Map([['em', _em.em], ['strike', _strike.strike], ['
  */
 var MENTION_ESCAPE_PATTERN = '(\\[~)'; // Matches pattern like [~
 var MEDIA_ESCAPE_PATTERN = '(![^ !]+)(!)'; // Matches non space content between two consecutive "!" e.g. !filename.txt!
+var MEDIA_GROUP_ESCAPE_PATTERN = '(\\[\\^[^ ]+)(\\])'; // Matches non space content between two consecutive "[^" "]" e.g. [^filename.txt]
 
 /**
  * Checks if the node's content needs to be escaped before continuing processing.
@@ -53,9 +54,9 @@ function escapingWikiFormatter(text) {
   var pattern = [MENTION_ESCAPE_PATTERN].concat((0, _toConsumableArray2.default)(_keyword.macroKeywordTokenMap.map(function (macro) {
     return "(".concat(macro.regex.source.replace('^', ''), ")");
   }))).join('|');
-  return text.replace(new RegExp(pattern, 'g'), '\\$&').replace(new RegExp(MEDIA_ESCAPE_PATTERN, 'g'), '\\$1\\$2'); // Extra step required for media as currently both ends need to be escaped e.q. !filename.txt!
+  return text.replace(new RegExp(pattern, 'g'), '\\$&').replace(new RegExp(MEDIA_ESCAPE_PATTERN, 'g'), '\\$1\\$2') // Extra step required for media as currently both ends need to be escaped e.q. !filename.txt!
+  .replace(new RegExp(MEDIA_GROUP_ESCAPE_PATTERN, 'g'), '\\$1\\$2');
 }
-
 var text = function text(node) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
     parent = _ref.parent;

package/dist/cjs/version.json

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

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

@@ -23,6 +23,7 @@ const markEncoderMapping = new Map([['em', em], ['strike', strike], ['strong', s
  */
 const MENTION_ESCAPE_PATTERN = '(\\[~)'; // Matches pattern like [~
 const MEDIA_ESCAPE_PATTERN = '(![^ !]+)(!)'; // Matches non space content between two consecutive "!" e.g. !filename.txt!
+const MEDIA_GROUP_ESCAPE_PATTERN = '(\\[\\^[^ ]+)(\\])'; // Matches non space content between two consecutive "[^" "]" e.g. [^filename.txt]
 
 /**
  * Checks if the node's content needs to be escaped before continuing processing.
@@ -42,9 +43,9 @@ const isEscapeNeeded = (node, parent) => {
  */
 function escapingWikiFormatter(text) {
   const pattern = [MENTION_ESCAPE_PATTERN, ...macroKeywordTokenMap.map(macro => `(${macro.regex.source.replace('^', '')})`)].join('|');
-  return text.replace(new RegExp(pattern, 'g'), '\\$&').replace(new RegExp(MEDIA_ESCAPE_PATTERN, 'g'), '\\$1\\$2'); // Extra step required for media as currently both ends need to be escaped e.q. !filename.txt!
+  return text.replace(new RegExp(pattern, 'g'), '\\$&').replace(new RegExp(MEDIA_ESCAPE_PATTERN, 'g'), '\\$1\\$2') // Extra step required for media as currently both ends need to be escaped e.q. !filename.txt!
+  .replace(new RegExp(MEDIA_GROUP_ESCAPE_PATTERN, 'g'), '\\$1\\$2');
 }
-
 export const text = (node, {
   parent
 } = {}) => {

package/dist/es2019/version.json

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

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

@@ -24,6 +24,7 @@ var markEncoderMapping = new Map([['em', em], ['strike', strike], ['strong', str
  */
 var MENTION_ESCAPE_PATTERN = '(\\[~)'; // Matches pattern like [~
 var MEDIA_ESCAPE_PATTERN = '(![^ !]+)(!)'; // Matches non space content between two consecutive "!" e.g. !filename.txt!
+var MEDIA_GROUP_ESCAPE_PATTERN = '(\\[\\^[^ ]+)(\\])'; // Matches non space content between two consecutive "[^" "]" e.g. [^filename.txt]
 
 /**
  * Checks if the node's content needs to be escaped before continuing processing.
@@ -47,9 +48,9 @@ function escapingWikiFormatter(text) {
   var pattern = [MENTION_ESCAPE_PATTERN].concat(_toConsumableArray(macroKeywordTokenMap.map(function (macro) {
     return "(".concat(macro.regex.source.replace('^', ''), ")");
   }))).join('|');
-  return text.replace(new RegExp(pattern, 'g'), '\\$&').replace(new RegExp(MEDIA_ESCAPE_PATTERN, 'g'), '\\$1\\$2'); // Extra step required for media as currently both ends need to be escaped e.q. !filename.txt!
+  return text.replace(new RegExp(pattern, 'g'), '\\$&').replace(new RegExp(MEDIA_ESCAPE_PATTERN, 'g'), '\\$1\\$2') // Extra step required for media as currently both ends need to be escaped e.q. !filename.txt!
+  .replace(new RegExp(MEDIA_GROUP_ESCAPE_PATTERN, 'g'), '\\$1\\$2');
 }
-
 export var text = function text(node) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
     parent = _ref.parent;

package/dist/esm/version.json

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

package/package.json

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