@atlaskit/editor-wikimarkup-transformer 11.1.2 → 11.1.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-wikimarkup-transformer
 
+## 11.1.4
+
+### Patch Changes
+
+- [`49280fb073e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/49280fb073e) - Removing Array.at usage to support older browsers.
+
+## 11.1.3
+
+### Patch Changes
+
+- [`916af279b4d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/916af279b4d) - added validation to handle strong mark under list
+
 ## 11.1.2
 
 ### Patch Changes

package/char/package.json

@@ -4,5 +4,12 @@
   "module": "../dist/esm/char.js",
   "module:es2019": "../dist/es2019/char.js",
   "sideEffects": false,
-  "types": "../dist/types/char.d.ts"
+  "types": "../dist/types/char.d.ts",
+  "typesVersions": {
+    ">=4.0 <4.3": {
+      "*": [
+        "../dist/types-ts4.0/char.d.ts"
+      ]
+    }
+  }
 }

package/dist/cjs/parser/text.js

@@ -128,7 +128,7 @@ function parseString(_ref) {
             var _inlineNodes2;
 
             /*ESS-2539 We are keeping track of consecutive newLines in the newLines array
-              Whenever more than two consecutive newLines are encountered, we start a new paragraph 
+              Whenever more than two consecutive newLines are encountered, we start a new paragraph
             */
             if (newLines.length >= 2 && (tokenType !== _tokenize.TokenType.HARD_BREAK || buffer.length > 0)) {
               output.push.apply(output, (0, _toConsumableArray2.default)((0, _normalize.normalizePMNodes)(inlineNodes, schema))); // push newLines to the buffer as a separator between media nodes
@@ -219,24 +219,24 @@ function parseString(_ref) {
 
   return [].concat(output, (0, _toConsumableArray2.default)(inlineNodes));
 }
-/* checks whether a newLine is required between two consecutive nodes 
-   Returns true for inline nodes, false for block nodes 
+/* checks whether a newLine is required between two consecutive nodes
+   Returns true for inline nodes, false for block nodes
 */
 
 
 function isNewLineRequiredBetweenNodes(currentNodes, buffer, nextNodes) {
-  var _currentNodes$at;
+  var _currentNodes;
 
   if (currentNodes.length === 0) {
     return false;
   }
 
-  if (buffer.length > 0 && (_currentNodes$at = currentNodes.at(-1)) !== null && _currentNodes$at !== void 0 && _currentNodes$at.isBlock) {
+  if (buffer.length > 0 && (_currentNodes = currentNodes[currentNodes.length - 1]) !== null && _currentNodes !== void 0 && _currentNodes.isBlock) {
     return false;
   }
 
   if (buffer.length === 0) {
-    var _nextNodes$, _nextNodes$2, _currentNodes$at2;
+    var _nextNodes$, _nextNodes$2, _currentNodes2;
 
     if (nextNodes.length === 0) {
       return false;
@@ -246,7 +246,7 @@ function isNewLineRequiredBetweenNodes(currentNodes, buffer, nextNodes) {
       return false;
     }
 
-    if ((_nextNodes$2 = nextNodes[0]) !== null && _nextNodes$2 !== void 0 && _nextNodes$2.isBlock || (_currentNodes$at2 = currentNodes.at(-1)) !== null && _currentNodes$at2 !== void 0 && _currentNodes$at2.isBlock) {
+    if ((_nextNodes$2 = nextNodes[0]) !== null && _nextNodes$2 !== void 0 && _nextNodes$2.isBlock || (_currentNodes2 = currentNodes[currentNodes.length - 1]) !== null && _currentNodes2 !== void 0 && _currentNodes2.isBlock) {
       return false;
     }
   }
@@ -255,7 +255,7 @@ function isNewLineRequiredBetweenNodes(currentNodes, buffer, nextNodes) {
 }
 
 function isConsecutiveMediaGroups(currentNodes, nextNodes) {
-  var _currentNodes$at3, _nextNodes$3;
+  var _currentNodes3, _nextNodes$3;
 
-  return currentNodes.length > 0 && ((_currentNodes$at3 = currentNodes.at(-1)) === null || _currentNodes$at3 === void 0 ? void 0 : _currentNodes$at3.type.name) === 'mediaGroup' && ((_nextNodes$3 = nextNodes[0]) === null || _nextNodes$3 === void 0 ? void 0 : _nextNodes$3.type.name) === 'mediaGroup';
+  return currentNodes.length > 0 && ((_currentNodes3 = currentNodes[currentNodes.length - 1]) === null || _currentNodes3 === void 0 ? void 0 : _currentNodes3.type.name) === 'mediaGroup' && ((_nextNodes$3 = nextNodes[0]) === null || _nextNodes$3 === void 0 ? void 0 : _nextNodes$3.type.name) === 'mediaGroup';
 }

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

@@ -23,6 +23,8 @@ var _ = require("./");
 
 var _whitespace = require("./whitespace");
 
+var _text2 = require("../utils/text");
+
 var MAX_LIST_DEPTH = 20;
 exports.MAX_LIST_DEPTH = MAX_LIST_DEPTH;
 var LIST_ITEM_REGEXP = new RegExp("^ *([*\\-#]{1,".concat(MAX_LIST_DEPTH, "}) "));
@@ -312,7 +314,11 @@ function sanitize(nodes, schema) {
                 n.text = n.text.toUpperCase();
               }
 
-              contentBuffer.push(n.mark([].concat((0, _toConsumableArray2.default)(n.marks), [mark])));
+              if (n.type.name === 'text' && !(0, _text2.hasAnyOfMarks)(n, ['strong', 'code'])) {
+                contentBuffer.push(n.mark([].concat((0, _toConsumableArray2.default)(n.marks), [mark])));
+              } else {
+                contentBuffer.push(n);
+              }
             } else {
               contentBuffer.push(n);
             }

package/dist/cjs/version.json

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

package/dist/es2019/parser/text.js

@@ -106,7 +106,7 @@ export function parseString({
             buffer.push(token.text);
           } else if (token.type === 'pmnode') {
             /*ESS-2539 We are keeping track of consecutive newLines in the newLines array
-              Whenever more than two consecutive newLines are encountered, we start a new paragraph 
+              Whenever more than two consecutive newLines are encountered, we start a new paragraph
             */
             if (newLines.length >= 2 && (tokenType !== TokenType.HARD_BREAK || buffer.length > 0)) {
               output.push(...normalizePMNodes(inlineNodes, schema)); // push newLines to the buffer as a separator between media nodes
@@ -185,23 +185,23 @@ export function parseString({
 
   return [...output, ...inlineNodes];
 }
-/* checks whether a newLine is required between two consecutive nodes 
-   Returns true for inline nodes, false for block nodes 
+/* checks whether a newLine is required between two consecutive nodes
+   Returns true for inline nodes, false for block nodes
 */
 
 function isNewLineRequiredBetweenNodes(currentNodes, buffer, nextNodes) {
-  var _currentNodes$at;
+  var _currentNodes;
 
   if (currentNodes.length === 0) {
     return false;
   }
 
-  if (buffer.length > 0 && (_currentNodes$at = currentNodes.at(-1)) !== null && _currentNodes$at !== void 0 && _currentNodes$at.isBlock) {
+  if (buffer.length > 0 && (_currentNodes = currentNodes[currentNodes.length - 1]) !== null && _currentNodes !== void 0 && _currentNodes.isBlock) {
     return false;
   }
 
   if (buffer.length === 0) {
-    var _nextNodes$, _nextNodes$2, _currentNodes$at2;
+    var _nextNodes$, _nextNodes$2, _currentNodes2;
 
     if (nextNodes.length === 0) {
       return false;
@@ -211,7 +211,7 @@ function isNewLineRequiredBetweenNodes(currentNodes, buffer, nextNodes) {
       return false;
     }
 
-    if ((_nextNodes$2 = nextNodes[0]) !== null && _nextNodes$2 !== void 0 && _nextNodes$2.isBlock || (_currentNodes$at2 = currentNodes.at(-1)) !== null && _currentNodes$at2 !== void 0 && _currentNodes$at2.isBlock) {
+    if ((_nextNodes$2 = nextNodes[0]) !== null && _nextNodes$2 !== void 0 && _nextNodes$2.isBlock || (_currentNodes2 = currentNodes[currentNodes.length - 1]) !== null && _currentNodes2 !== void 0 && _currentNodes2.isBlock) {
       return false;
     }
   }
@@ -220,7 +220,7 @@ function isNewLineRequiredBetweenNodes(currentNodes, buffer, nextNodes) {
 }
 
 function isConsecutiveMediaGroups(currentNodes, nextNodes) {
-  var _currentNodes$at3, _nextNodes$3;
+  var _currentNodes3, _nextNodes$3;
 
-  return currentNodes.length > 0 && ((_currentNodes$at3 = currentNodes.at(-1)) === null || _currentNodes$at3 === void 0 ? void 0 : _currentNodes$at3.type.name) === 'mediaGroup' && ((_nextNodes$3 = nextNodes[0]) === null || _nextNodes$3 === void 0 ? void 0 : _nextNodes$3.type.name) === 'mediaGroup';
+  return currentNodes.length > 0 && ((_currentNodes3 = currentNodes[currentNodes.length - 1]) === null || _currentNodes3 === void 0 ? void 0 : _currentNodes3.type.name) === 'mediaGroup' && ((_nextNodes$3 = nextNodes[0]) === null || _nextNodes$3 === void 0 ? void 0 : _nextNodes$3.type.name) === 'mediaGroup';
 }

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

@@ -4,6 +4,7 @@ import { normalizePMNodes } from '../utils/normalize';
 import { parseMacroKeyword } from './keyword';
 import { TokenType, parseToken } from './';
 import { parseNewlineOnly } from './whitespace';
+import { hasAnyOfMarks } from '../utils/text';
 export const MAX_LIST_DEPTH = 20;
 const LIST_ITEM_REGEXP = new RegExp(`^ *([*\\-#]{1,${MAX_LIST_DEPTH}}) `);
 const EMPTY_LINE_REGEXP = /^[ \t]*\r?\n/;
@@ -269,7 +270,11 @@ function sanitize(nodes, schema) {
                 n.text = n.text.toUpperCase();
               }
 
-              contentBuffer.push(n.mark([...n.marks, mark]));
+              if (n.type.name === 'text' && !hasAnyOfMarks(n, ['strong', 'code'])) {
+                contentBuffer.push(n.mark([...n.marks, mark]));
+              } else {
+                contentBuffer.push(n);
+              }
             } else {
               contentBuffer.push(n);
             }

package/dist/es2019/version.json

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

package/dist/esm/parser/text.js

@@ -111,7 +111,7 @@ export function parseString(_ref) {
             var _inlineNodes2;
 
             /*ESS-2539 We are keeping track of consecutive newLines in the newLines array
-              Whenever more than two consecutive newLines are encountered, we start a new paragraph 
+              Whenever more than two consecutive newLines are encountered, we start a new paragraph
             */
             if (newLines.length >= 2 && (tokenType !== TokenType.HARD_BREAK || buffer.length > 0)) {
               output.push.apply(output, _toConsumableArray(normalizePMNodes(inlineNodes, schema))); // push newLines to the buffer as a separator between media nodes
@@ -202,23 +202,23 @@ export function parseString(_ref) {
 
   return [].concat(output, _toConsumableArray(inlineNodes));
 }
-/* checks whether a newLine is required between two consecutive nodes 
-   Returns true for inline nodes, false for block nodes 
+/* checks whether a newLine is required between two consecutive nodes
+   Returns true for inline nodes, false for block nodes
 */
 
 function isNewLineRequiredBetweenNodes(currentNodes, buffer, nextNodes) {
-  var _currentNodes$at;
+  var _currentNodes;
 
   if (currentNodes.length === 0) {
     return false;
   }
 
-  if (buffer.length > 0 && (_currentNodes$at = currentNodes.at(-1)) !== null && _currentNodes$at !== void 0 && _currentNodes$at.isBlock) {
+  if (buffer.length > 0 && (_currentNodes = currentNodes[currentNodes.length - 1]) !== null && _currentNodes !== void 0 && _currentNodes.isBlock) {
     return false;
   }
 
   if (buffer.length === 0) {
-    var _nextNodes$, _nextNodes$2, _currentNodes$at2;
+    var _nextNodes$, _nextNodes$2, _currentNodes2;
 
     if (nextNodes.length === 0) {
       return false;
@@ -228,7 +228,7 @@ function isNewLineRequiredBetweenNodes(currentNodes, buffer, nextNodes) {
       return false;
     }
 
-    if ((_nextNodes$2 = nextNodes[0]) !== null && _nextNodes$2 !== void 0 && _nextNodes$2.isBlock || (_currentNodes$at2 = currentNodes.at(-1)) !== null && _currentNodes$at2 !== void 0 && _currentNodes$at2.isBlock) {
+    if ((_nextNodes$2 = nextNodes[0]) !== null && _nextNodes$2 !== void 0 && _nextNodes$2.isBlock || (_currentNodes2 = currentNodes[currentNodes.length - 1]) !== null && _currentNodes2 !== void 0 && _currentNodes2.isBlock) {
       return false;
     }
   }
@@ -237,7 +237,7 @@ function isNewLineRequiredBetweenNodes(currentNodes, buffer, nextNodes) {
 }
 
 function isConsecutiveMediaGroups(currentNodes, nextNodes) {
-  var _currentNodes$at3, _nextNodes$3;
+  var _currentNodes3, _nextNodes$3;
 
-  return currentNodes.length > 0 && ((_currentNodes$at3 = currentNodes.at(-1)) === null || _currentNodes$at3 === void 0 ? void 0 : _currentNodes$at3.type.name) === 'mediaGroup' && ((_nextNodes$3 = nextNodes[0]) === null || _nextNodes$3 === void 0 ? void 0 : _nextNodes$3.type.name) === 'mediaGroup';
+  return currentNodes.length > 0 && ((_currentNodes3 = currentNodes[currentNodes.length - 1]) === null || _currentNodes3 === void 0 ? void 0 : _currentNodes3.type.name) === 'mediaGroup' && ((_nextNodes$3 = nextNodes[0]) === null || _nextNodes$3 === void 0 ? void 0 : _nextNodes$3.type.name) === 'mediaGroup';
 }

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

@@ -6,6 +6,7 @@ import { normalizePMNodes } from '../utils/normalize';
 import { parseMacroKeyword } from './keyword';
 import { TokenType, parseToken } from './';
 import { parseNewlineOnly } from './whitespace';
+import { hasAnyOfMarks } from '../utils/text';
 export var MAX_LIST_DEPTH = 20;
 var LIST_ITEM_REGEXP = new RegExp("^ *([*\\-#]{1,".concat(MAX_LIST_DEPTH, "}) "));
 var EMPTY_LINE_REGEXP = /^[ \t]*\r?\n/;
@@ -291,7 +292,11 @@ function sanitize(nodes, schema) {
                 n.text = n.text.toUpperCase();
               }
 
-              contentBuffer.push(n.mark([].concat(_toConsumableArray(n.marks), [mark])));
+              if (n.type.name === 'text' && !hasAnyOfMarks(n, ['strong', 'code'])) {
+                contentBuffer.push(n.mark([].concat(_toConsumableArray(n.marks), [mark])));
+              } else {
+                contentBuffer.push(n);
+              }
             } else {
               contentBuffer.push(n);
             }

package/dist/esm/version.json

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

package/interfaces/package.json

@@ -4,5 +4,12 @@
   "module": "../dist/esm/interfaces.js",
   "module:es2019": "../dist/es2019/interfaces.js",
   "sideEffects": false,
-  "types": "../dist/types/interfaces.d.ts"
+  "types": "../dist/types/interfaces.d.ts",
+  "typesVersions": {
+    ">=4.0 <4.3": {
+      "*": [
+        "../dist/types-ts4.0/interfaces.d.ts"
+      ]
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-wikimarkup-transformer",
-  "version": "11.1.2",
+  "version": "11.1.4",
   "description": "Wiki markup transformer for JIRA and Confluence",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -33,11 +33,11 @@
   "devDependencies": {
     "@atlaskit/activity": "^1.0.1",
     "@atlaskit/docs": "*",
-    "@atlaskit/editor-common": "^69.2.0",
-    "@atlaskit/editor-core": "^172.1.0",
+    "@atlaskit/editor-common": "^69.3.0",
+    "@atlaskit/editor-core": "^172.2.0",
     "@atlaskit/editor-test-helpers": "^17.1.0",
     "@atlaskit/mention": "^21.0.0",
-    "@atlaskit/profilecard": "^16.12.0",
+    "@atlaskit/profilecard": "^17.2.0",
     "@atlaskit/renderer": "^101.1.0",
     "@atlaskit/util-data-test": "^17.5.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",

package/report.api.md

@@ -1,6 +1,10 @@
-## API Report File for "@atlaskit/editor-wikimarkup-transformer".
+## API Report File for "@atlaskit/editor-wikimarkup-transformer"
 
-> Do not edit this file. This report is auto-generated by [API Extractor](https://api-extractor.com/).
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+<!--
+	Generated API Report version: 2.0
+-->
 
 [Learn more about API reports](https://hello.atlassian.net/wiki/spaces/UR/pages/1825484529/Package+API+Reports)
 
@@ -8,55 +12,69 @@
 import { Node as Node_2 } from 'prosemirror-model';
 import { Schema } from 'prosemirror-model';
 
-declare interface Context {
-  readonly issueKeyRegex?: RegExp | undefined;
-  readonly tokenErrCallback?: TokenErrCallback;
+// @public (undocumented)
+interface Context {
+  // (undocumented)
   readonly conversion?: {
     readonly inlineCardConversion?: ConversionMap;
     readonly mediaConversion?: MediaConversionMap;
     mentionConversion?: ConversionMap;
   };
-  readonly hydration?: {
-    readonly media?: {
-      targetCollectionId?: string;
-    };
-  };
+  // (undocumented)
   readonly defaults?: {
     readonly media?: {
       width: number | null;
       height: number | null;
     };
   };
+  // (undocumented)
+  readonly hydration?: {
+    readonly media?: {
+      targetCollectionId?: string;
+    };
+  };
+  // (undocumented)
+  readonly issueKeyRegex?: RegExp | undefined;
+  // (undocumented)
+  readonly tokenErrCallback?: TokenErrCallback;
 }
 
-declare interface ConversionMap {
+// @public (undocumented)
+interface ConversionMap {
+  // (undocumented)
   [key: string]: string;
 }
 
-declare interface MediaConversionMap {
+// @public (undocumented)
+interface MediaConversionMap {
+  // (undocumented)
   [key: string]: {
     transform?: string;
     embed?: boolean;
   };
 }
 
-declare type TokenErrCallback = (err: Error, tokenType: string) => void;
+// @public (undocumented)
+type TokenErrCallback = (err: Error, tokenType: string) => void;
 
-declare interface Transformer_2<T> {
+// @public (undocumented)
+interface Transformer_2<T> {
+  // (undocumented)
   encode(node: Node_2): T;
+  // (undocumented)
   parse(content: T): Node_2;
 }
 
-declare class WikiMarkupTransformer implements Transformer_2<string> {
-  private schema;
+// @public (undocumented)
+class WikiMarkupTransformer implements Transformer_2<string> {
   constructor(schema?: Schema);
-  private sanitizeWikiMarkup;
+  // (undocumented)
   encode(node: Node_2, context?: Context): string;
+  // (undocumented)
   parse(wikiMarkup: string, context?: Context): Node_2;
-  private buildContext;
 }
 export { WikiMarkupTransformer };
 export default WikiMarkupTransformer;
 
-export {};
+// (No @packageDocumentation comment for this package)
 ```