@20minutes/draft-convert 3.0.3 → 3.1.0

package/README.md

@@ -1,9 +1,8 @@
 @20minutes/draft-convert
 ===============
 
-[![Node CI](https://github.com/20minutes/draft-convert/actions/workflows/ci.yml/badge.svg)](https://github.com/20minutes/draft-convert/actions/workflows/ci.yml)
-[![npm version](https://badge.fury.io/js/@20minutes%2Fdraft-convert.svg)](https://badge.fury.io/js/@20minutes%2Fdraft-convert)
-[![npm downloads](https://img.shields.io/npm/dt/@20minutes%2Fdraft-convert.svg?style=flat)](https://www.npmjs.com/package/@20minutes%2Fdraft-convert)
+[![Build status](https://github.com/20minutes/draft-convert/actions/workflows/tests.yml/badge.svg)](https://github.com/20minutes/draft-convert/actions/workflows/tests.yml)
+[![NPM](https://img.shields.io/npm/v/@20minutes/draft-convert)](https://www.npmjs.com/package/@20minutes/draft-convert)
 
 Forked version:
 - with deps up to date

package/esm/blockEntities.js

@@ -1,67 +1,64 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import updateMutation from './util/updateMutation';
 import rangeSort from './util/rangeSort';
 import getElementHTML from './util/getElementHTML';
 import getElementTagLength from './util/getElementTagLength';
-var converter = function converter() {
-  var entity = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var originalText = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-  return originalText;
-};
-export default (function (block, entityMap) {
-  var entityConverter = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : converter;
-  var resultText = _toConsumableArray(block.text);
-  var getEntityHTML = entityConverter;
-  if (entityConverter.__isMiddleware) {
-    getEntityHTML = entityConverter(converter);
-  }
-  if (Object.prototype.hasOwnProperty.call(block, 'entityRanges') && block.entityRanges.length > 0) {
-    var entities = block.entityRanges.sort(rangeSort);
-    var styles = block.inlineStyleRanges;
-    var _loop = function _loop(index) {
-      var entityRange = entities[index];
-      var entity = entityMap[entityRange.key];
-      var originalText = resultText.slice(entityRange.offset, entityRange.offset + entityRange.length).join('');
-      var entityHTML = getEntityHTML(entity, originalText);
-      var elementHTML = getElementHTML(entityHTML, originalText);
-      var converted;
-      if (!!elementHTML || elementHTML === '') {
-        converted = _toConsumableArray(elementHTML);
-      } else {
-        converted = originalText;
-      }
-      var prefixLength = getElementTagLength(entityHTML, 'start');
-      var suffixLength = getElementTagLength(entityHTML, 'end');
-      var updateLaterMutation = function updateLaterMutation(mutation, mutationIndex) {
-        if (mutationIndex > index || Object.prototype.hasOwnProperty.call(mutation, 'style')) {
-          return updateMutation(mutation, entityRange.offset, entityRange.length, converted.length, prefixLength, suffixLength);
+const converter = (entity = {}, originalText = '')=>originalText;
+export default ((block, entityMap, entityConverter = converter)=>{
+    let resultText = [
+        ...block.text
+    ];
+    let getEntityHTML = entityConverter;
+    if (entityConverter.__isMiddleware) {
+        getEntityHTML = entityConverter(converter);
+    }
+    if (Object.prototype.hasOwnProperty.call(block, 'entityRanges') && block.entityRanges.length > 0) {
+        let entities = block.entityRanges.sort(rangeSort);
+        let styles = block.inlineStyleRanges;
+        for(let index = 0; index < entities.length; index += 1){
+            const entityRange = entities[index];
+            const entity = entityMap[entityRange.key];
+            const originalText = resultText.slice(entityRange.offset, entityRange.offset + entityRange.length).join('');
+            const entityHTML = getEntityHTML(entity, originalText);
+            const elementHTML = getElementHTML(entityHTML, originalText);
+            let converted;
+            if (!!elementHTML || elementHTML === '') {
+                converted = [
+                    ...elementHTML
+                ];
+            } else {
+                converted = originalText;
+            }
+            const prefixLength = getElementTagLength(entityHTML, 'start');
+            const suffixLength = getElementTagLength(entityHTML, 'end');
+            const updateLaterMutation = (mutation, mutationIndex)=>{
+                if (mutationIndex > index || Object.prototype.hasOwnProperty.call(mutation, 'style')) {
+                    return updateMutation(mutation, entityRange.offset, entityRange.length, converted.length, prefixLength, suffixLength);
+                }
+                return mutation;
+            };
+            const updateLaterMutations = (mutationList)=>mutationList.reduce((acc, mutation, mutationIndex)=>{
+                    const updatedMutation = updateLaterMutation(mutation, mutationIndex);
+                    if (Array.isArray(updatedMutation)) {
+                        return acc.concat(updatedMutation);
+                    }
+                    return acc.concat([
+                        updatedMutation
+                    ]);
+                }, []);
+            entities = updateLaterMutations(entities);
+            styles = updateLaterMutations(styles);
+            resultText = [
+                ...resultText.slice(0, entityRange.offset),
+                ...converted,
+                ...resultText.slice(entityRange.offset + entityRange.length)
+            ];
         }
-        return mutation;
-      };
-      var updateLaterMutations = function updateLaterMutations(mutationList) {
-        return mutationList.reduce(function (acc, mutation, mutationIndex) {
-          var updatedMutation = updateLaterMutation(mutation, mutationIndex);
-          if (Array.isArray(updatedMutation)) {
-            return acc.concat(updatedMutation);
-          }
-          return acc.concat([updatedMutation]);
-        }, []);
-      };
-      entities = updateLaterMutations(entities);
-      styles = updateLaterMutations(styles);
-      resultText = [].concat(_toConsumableArray(resultText.slice(0, entityRange.offset)), _toConsumableArray(converted), _toConsumableArray(resultText.slice(entityRange.offset + entityRange.length)));
-    };
-    for (var index = 0; index < entities.length; index += 1) {
-      _loop(index);
+        return {
+            ...block,
+            text: resultText.join(''),
+            inlineStyleRanges: styles,
+            entityRanges: entities
+        };
     }
-    return _objectSpread(_objectSpread({}, block), {}, {
-      text: resultText.join(''),
-      inlineStyleRanges: styles,
-      entityRanges: entities
-    });
-  }
-  return block;
-});
+    return block;
+});

package/esm/blockInlineStyles.js

@@ -1,98 +1,75 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import invariant from 'invariant';
 import styleObjectFunction from './util/styleObjectFunction';
 import accumulateFunction from './util/accumulateFunction';
 import getElementHTML from './util/getElementHTML';
 import rangeSort from './util/rangeSort';
 import defaultInlineHTML from './default/defaultInlineHTML';
-var subtractStyles = function subtractStyles(original, toRemove) {
-  return original.filter(function (el) {
-    return !toRemove.some(function (elToRemove) {
-      return elToRemove.style === el.style;
-    });
-  });
+const subtractStyles = (original, toRemove)=>original.filter((el)=>!toRemove.some((elToRemove)=>elToRemove.style === el.style));
+const popEndingStyles = (styleStack, endingStyles)=>endingStyles.reduceRight((stack, style)=>{
+        const styleToRemove = stack[stack.length - 1];
+        invariant(styleToRemove.style === style.style, `Style ${styleToRemove.style} to be removed doesn't match expected ${style.style}`);
+        return stack.slice(0, -1);
+    }, styleStack);
+const characterStyles = (offset, ranges)=>ranges.filter((range)=>offset >= range.offset && offset < range.offset + range.length);
+const rangeIsSubset = (firstRange, secondRange)=>{
+    // returns true if the second range is a subset of the first
+    const secondStartWithinFirst = firstRange.offset <= secondRange.offset;
+    const secondEndWithinFirst = firstRange.offset + firstRange.length >= secondRange.offset + secondRange.length;
+    return secondStartWithinFirst && secondEndWithinFirst;
 };
-var popEndingStyles = function popEndingStyles(styleStack, endingStyles) {
-  return endingStyles.reduceRight(function (stack, style) {
-    var styleToRemove = stack[stack.length - 1];
-    invariant(styleToRemove.style === style.style, "Style ".concat(styleToRemove.style, " to be removed doesn't match expected ").concat(style.style));
-    return stack.slice(0, -1);
-  }, styleStack);
+const latestStyleLast = (s1, s2)=>{
+    // make sure longer-lasting styles are added first
+    const s2endIndex = s2.offset + s2.length;
+    const s1endIndex = s1.offset + s1.length;
+    return s2endIndex - s1endIndex;
 };
-var characterStyles = function characterStyles(offset, ranges) {
-  return ranges.filter(function (range) {
-    return offset >= range.offset && offset < range.offset + range.length;
-  });
-};
-var rangeIsSubset = function rangeIsSubset(firstRange, secondRange) {
-  // returns true if the second range is a subset of the first
-  var secondStartWithinFirst = firstRange.offset <= secondRange.offset;
-  var secondEndWithinFirst = firstRange.offset + firstRange.length >= secondRange.offset + secondRange.length;
-  return secondStartWithinFirst && secondEndWithinFirst;
-};
-var latestStyleLast = function latestStyleLast(s1, s2) {
-  // make sure longer-lasting styles are added first
-  var s2endIndex = s2.offset + s2.length;
-  var s1endIndex = s1.offset + s1.length;
-  return s2endIndex - s1endIndex;
-};
-var getStylesToReset = function getStylesToReset(remainingStyles, newStyles) {
-  var i = 0;
-  while (i < remainingStyles.length) {
-    if (newStyles.every(rangeIsSubset.bind(null, remainingStyles[i]))) {
-      i += 1;
-    } else {
-      return remainingStyles.slice(i);
+const getStylesToReset = (remainingStyles, newStyles)=>{
+    let i = 0;
+    while(i < remainingStyles.length){
+        if (newStyles.every(rangeIsSubset.bind(null, remainingStyles[i]))) {
+            i += 1;
+        } else {
+            return remainingStyles.slice(i);
+        }
     }
-  }
-  return [];
-};
-var appendStartMarkup = function appendStartMarkup(inlineHTML, string, styleRange) {
-  return string + getElementHTML(inlineHTML(styleRange.style)).start;
-};
-var prependEndMarkup = function prependEndMarkup(inlineHTML, string, styleRange) {
-  return getElementHTML(inlineHTML(styleRange.style)).end + string;
-};
-var defaultCustomInlineHTML = function defaultCustomInlineHTML(next) {
-  return function (style) {
-    return next(style);
-  };
+    return [];
 };
+const appendStartMarkup = (inlineHTML, string, styleRange)=>string + getElementHTML(inlineHTML(styleRange.style)).start;
+const prependEndMarkup = (inlineHTML, string, styleRange)=>getElementHTML(inlineHTML(styleRange.style)).end + string;
+const defaultCustomInlineHTML = (next)=>(style)=>next(style);
 defaultCustomInlineHTML.__isMiddleware = true;
-export default (function (rawBlock) {
-  var customInlineHTML = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultCustomInlineHTML;
-  invariant(rawBlock !== null && rawBlock !== undefined, 'Expected raw block to be non-null');
-  var inlineHTML;
-  if (customInlineHTML.__isMiddleware === true) {
-    inlineHTML = customInlineHTML(defaultInlineHTML);
-  } else {
-    inlineHTML = accumulateFunction(styleObjectFunction(customInlineHTML), styleObjectFunction(defaultInlineHTML));
-  }
-  var result = '';
-  var styleStack = [];
-  var sortedRanges = rawBlock.inlineStyleRanges.sort(rangeSort);
-  var originalTextArray = _toConsumableArray(rawBlock.text);
-  for (var i = 0; i < originalTextArray.length; i += 1) {
-    var styles = characterStyles(i, sortedRanges);
-    var endingStyles = subtractStyles(styleStack, styles);
-    var newStyles = subtractStyles(styles, styleStack);
-    var remainingStyles = subtractStyles(styleStack, endingStyles);
-
-    // reset styles: look for any already existing styles that will need to
-    // end before styles that are being added on this character. to solve this
-    // close out those current tags and all nested children,
-    // then open new ones nested within the new styles.
-    var resetStyles = getStylesToReset(remainingStyles, newStyles);
-    var openingStyles = resetStyles.concat(newStyles).sort(latestStyleLast);
-    var openingStyleTags = openingStyles.reduce(appendStartMarkup.bind(null, inlineHTML), '');
-    var endingStyleTags = endingStyles.concat(resetStyles).reduce(prependEndMarkup.bind(null, inlineHTML), '');
-    result += endingStyleTags + openingStyleTags + originalTextArray[i];
-    styleStack = popEndingStyles(styleStack, resetStyles.concat(endingStyles));
-    styleStack = styleStack.concat(openingStyles);
-    invariant(styleStack.length === styles.length, "Character ".concat(i, ": ").concat(styleStack.length - styles.length, " styles left on stack that should no longer be there"));
-  }
-  result = styleStack.reduceRight(function (res, openStyle) {
-    return res + getElementHTML(inlineHTML(openStyle.style)).end;
-  }, result);
-  return result;
-});
+export default ((rawBlock, customInlineHTML = defaultCustomInlineHTML)=>{
+    invariant(rawBlock !== null && rawBlock !== undefined, 'Expected raw block to be non-null');
+    let inlineHTML;
+    if (customInlineHTML.__isMiddleware === true) {
+        inlineHTML = customInlineHTML(defaultInlineHTML);
+    } else {
+        inlineHTML = accumulateFunction(styleObjectFunction(customInlineHTML), styleObjectFunction(defaultInlineHTML));
+    }
+    let result = '';
+    let styleStack = [];
+    const sortedRanges = rawBlock.inlineStyleRanges.sort(rangeSort);
+    const originalTextArray = [
+        ...rawBlock.text
+    ];
+    for(let i = 0; i < originalTextArray.length; i += 1){
+        const styles = characterStyles(i, sortedRanges);
+        const endingStyles = subtractStyles(styleStack, styles);
+        const newStyles = subtractStyles(styles, styleStack);
+        const remainingStyles = subtractStyles(styleStack, endingStyles);
+        // reset styles: look for any already existing styles that will need to
+        // end before styles that are being added on this character. to solve this
+        // close out those current tags and all nested children,
+        // then open new ones nested within the new styles.
+        const resetStyles = getStylesToReset(remainingStyles, newStyles);
+        const openingStyles = resetStyles.concat(newStyles).sort(latestStyleLast);
+        const openingStyleTags = openingStyles.reduce(appendStartMarkup.bind(null, inlineHTML), '');
+        const endingStyleTags = endingStyles.concat(resetStyles).reduce(prependEndMarkup.bind(null, inlineHTML), '');
+        result += endingStyleTags + openingStyleTags + originalTextArray[i];
+        styleStack = popEndingStyles(styleStack, resetStyles.concat(endingStyles));
+        styleStack = styleStack.concat(openingStyles);
+        invariant(styleStack.length === styles.length, `Character ${i}: ${styleStack.length - styles.length} styles left on stack that should no longer be there`);
+    }
+    result = styleStack.reduceRight((res, openStyle)=>res + getElementHTML(inlineHTML(openStyle.style)).end, result);
+    return result;
+});