@readme/markdown 6.33.2-next.1 → 6.34.0

package/CHANGELOG.md

@@ -1,6 +1,31 @@
 Changelog
 ===
 
+## Version 6.34.0
+
+### ✨ New & Improved
+
+* less lossy md() ([#377](https://github.com/readmeio/markdown/issues/377)) ([4189554](https://github.com/readmeio/markdown/commit/4189554e6f332ca396c6095ad3f028f567c7c2f3))
+
+## Version 6.34.0-next.1
+
+### ✨ New & Improved
+
+* less lossy md() ([#377](https://github.com/readmeio/markdown/issues/377)) ([4189554](https://github.com/readmeio/markdown/commit/4189554e6f332ca396c6095ad3f028f567c7c2f3))
+
+## Version 6.33.2
+
+### 🛠 Fixes & Updates
+
+* include icon in callout to string ([#373](https://github.com/readmeio/markdown/issues/373)) ([208ddb5](https://github.com/readmeio/markdown/commit/208ddb5ece9f6069b49adf5717cbc50988895705))
+* **deps-dev:** upgrading eslint to v8 ([#363](https://github.com/readmeio/markdown/issues/363)) ([431dcae](https://github.com/readmeio/markdown/commit/431dcaefb99c4885324c5be429b876fe0946a0ad))
+
+## Version 6.33.2-next.2
+
+### 🛠 Fixes & Updates
+
+* include icon in callout to string ([#373](https://github.com/readmeio/markdown/issues/373)) ([208ddb5](https://github.com/readmeio/markdown/commit/208ddb5ece9f6069b49adf5717cbc50988895705))
+
 ## Version 6.33.2-next.1
 
 ### 🛠 Fixes & Updates

package/dist/main.js

@@ -27871,7 +27871,7 @@ module.exports = function CalloutCompiler() {
 
   visitors['rdme-callout'] = function compile(node) {
     var block = this.block(node).replace(/\n/g, '\n> ');
-    block = "> ".concat(block);
+    block = "> ".concat(node.data.hProperties.icon, " ").concat(block);
     return block;
   };
 };
@@ -27910,16 +27910,22 @@ module.exports = function DivCompiler() {
 /***/ }),
 
 /***/ 4338:
-/***/ ((module) => {
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+var _defineProperty = __webpack_require__(9713);
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function EmbedCompiler(node) {
-  var _node$data$hPropertie = node.data.hProperties,
-      title = _node$data$hPropertie.title,
-      url = _node$data$hPropertie.url;
-  var _node$data$hPropertie2 = node.data.hProperties.provider,
-      provider = _node$data$hPropertie2 === void 0 ? '@embed' : _node$data$hPropertie2;
-  provider = provider[0] === '@' ? provider : "@".concat(provider);
-  return "[".concat(title || '', "](").concat(url, " \"").concat(provider, "\")");
+  var data = node.data.hProperties;
+  var _data$provider = data.provider,
+      provider = _data$provider === void 0 ? 'embed' : _data$provider;
+  provider = provider.replace(/^@/, '');
+  return "\n[block:embed]\n".concat(JSON.stringify(_objectSpread(_objectSpread({}, data), {}, {
+    provider: provider
+  }), null, 2), "\n[/block]\n");
 }
 
 module.exports = function () {
@@ -27935,23 +27941,49 @@ module.exports = function () {
 
 var _slicedToArray = __webpack_require__(3038);
 
-var nodeToString = __webpack_require__(6034);
+var _require = __webpack_require__(7589),
+    imgSizeByWidth = _require.imgSizeByWidth;
 
 module.exports = function FigureCompiler() {
   var Compiler = this.Compiler;
   var visitors = Compiler.prototype.visitors;
 
-  visitors.figcaption = function figcaptionCompiler(node) {
-    var caption = nodeToString(node);
-    return "<figcaption>".concat(caption, "</figcaption>");
-  };
-
   visitors.figure = function figureCompiler(node) {
     var _node$children = _slicedToArray(node.children, 2),
         image = _node$children[0],
         caption = _node$children[1];
 
-    return "<figure>\n\n".concat(visitors.image.call(this, image), "\n\n").concat(visitors.figcaption.call(this, caption), "\n</figure>");
+    var img = {
+      image: [image.url, image.title],
+      caption: this.block(caption),
+      sizing: imgSizeByWidth[image.data.hProperties.width]
+    };
+    if (image.border) img.border = image.border;
+    var block = {
+      images: [img]
+    };
+    return "[block:image]\n".concat(JSON.stringify(block, null, 2), "\n[/block]");
+  };
+};
+
+/***/ }),
+
+/***/ 3356:
+/***/ ((module) => {
+
+module.exports = function ImageCompiler() {
+  var Compiler = this.Compiler;
+  var visitors = Compiler.prototype.visitors;
+  var original = visitors.image;
+
+  visitors.image = function compile(node) {
+    var _node$data, _node$data$hPropertie;
+
+    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
+    }
+
+    return ((_node$data = node.data) === null || _node$data === void 0 ? void 0 : (_node$data$hPropertie = _node$data.hProperties) === null || _node$data$hPropertie === void 0 ? void 0 : _node$data$hPropertie.className) === 'emoji' ? node.title : original.call.apply(original, [this, node].concat(args));
   };
 };
 
@@ -27970,7 +28002,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "rdmeEmbedCompiler": () => (/* reexport default from dynamic */ _embed__WEBPACK_IMPORTED_MODULE_4___default.a),
 /* harmony export */   "rdmeVarCompiler": () => (/* reexport default from dynamic */ _var__WEBPACK_IMPORTED_MODULE_5___default.a),
 /* harmony export */   "rdmeCalloutCompiler": () => (/* reexport default from dynamic */ _callout__WEBPACK_IMPORTED_MODULE_6___default.a),
-/* harmony export */   "rdmePinCompiler": () => (/* reexport default from dynamic */ _pin__WEBPACK_IMPORTED_MODULE_7___default.a)
+/* harmony export */   "rdmePinCompiler": () => (/* reexport default from dynamic */ _pin__WEBPACK_IMPORTED_MODULE_7___default.a),
+/* harmony export */   "imageCompiler": () => (/* reexport default from dynamic */ _image__WEBPACK_IMPORTED_MODULE_8___default.a)
 /* harmony export */ });
 /* harmony import */ var _div__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(58);
 /* harmony import */ var _div__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_div__WEBPACK_IMPORTED_MODULE_0__);
@@ -27988,6 +28021,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _callout__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_callout__WEBPACK_IMPORTED_MODULE_6__);
 /* harmony import */ var _pin__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(2151);
 /* harmony import */ var _pin__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_pin__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var _image__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(3356);
+/* harmony import */ var _image__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_image__WEBPACK_IMPORTED_MODULE_8__);
+
 
 
 
@@ -28464,10 +28500,21 @@ var WrapPinnedBlocks = function WrapPinnedBlocks(node, json) {
   };
 };
 
-var imgSizeRemap = {
+var imgSizeValues = {
   full: '100%',
   original: 'auto'
 };
+var imgWidthBySize = new Proxy(imgSizeValues, {
+  get: function get(widths, size) {
+    return size !== null && size !== void 0 && size.match(/^\d+$/) ? "".concat(size, "%") : size in widths ? widths[size] : size;
+  }
+});
+var imgSizeByWidth = new Proxy(new Map(Array.from(imgSizeValues).reverse()), {
+  get: function get(sizes, width) {
+    var match = width === null || width === void 0 ? void 0 : width.match(/^(\d+)%$/);
+    return match ? match[1] : width in sizes ? sizes[width] : width;
+  }
+});
 
 function tokenize(eat, value) {
   var _this = this;
@@ -28547,7 +28594,6 @@ function tokenize(eat, value) {
               url = _img$image[0],
               title = _img$image[1];
 
-          var size = img.sizing;
           var block = {
             type: 'image',
             url: url,
@@ -28556,7 +28602,7 @@ function tokenize(eat, value) {
             data: {
               hProperties: {
                 className: img.border ? 'border' : '',
-                width: size && !size.match(/\D/) ? "".concat(size, "%") : imgSizeRemap[size] || size
+                width: imgWidthBySize[img.sizing]
               }
             }
           };
@@ -28752,6 +28798,8 @@ module.exports.sanitize = function (sanitizeSchema) {
   return parser;
 };
 
+module.exports.imgSizeByWidth = imgSizeByWidth;
+
 /***/ }),
 
 /***/ 2697:

package/dist/main.node.js

@@ -10760,7 +10760,7 @@ module.exports = function CalloutCompiler() {
 
   visitors['rdme-callout'] = function compile(node) {
     var block = this.block(node).replace(/\n/g, '\n> ');
-    block = "> ".concat(block);
+    block = "> ".concat(node.data.hProperties.icon, " ").concat(block);
     return block;
   };
 };
@@ -10799,16 +10799,22 @@ module.exports = function DivCompiler() {
 /***/ }),
 
 /***/ 4338:
-/***/ ((module) => {
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+var _defineProperty = __webpack_require__(9713);
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function EmbedCompiler(node) {
-  var _node$data$hPropertie = node.data.hProperties,
-      title = _node$data$hPropertie.title,
-      url = _node$data$hPropertie.url;
-  var _node$data$hPropertie2 = node.data.hProperties.provider,
-      provider = _node$data$hPropertie2 === void 0 ? '@embed' : _node$data$hPropertie2;
-  provider = provider[0] === '@' ? provider : "@".concat(provider);
-  return "[".concat(title || '', "](").concat(url, " \"").concat(provider, "\")");
+  var data = node.data.hProperties;
+  var _data$provider = data.provider,
+      provider = _data$provider === void 0 ? 'embed' : _data$provider;
+  provider = provider.replace(/^@/, '');
+  return "\n[block:embed]\n".concat(JSON.stringify(_objectSpread(_objectSpread({}, data), {}, {
+    provider: provider
+  }), null, 2), "\n[/block]\n");
 }
 
 module.exports = function () {
@@ -10824,23 +10830,49 @@ module.exports = function () {
 
 var _slicedToArray = __webpack_require__(3038);
 
-var nodeToString = __webpack_require__(6034);
+var _require = __webpack_require__(7589),
+    imgSizeByWidth = _require.imgSizeByWidth;
 
 module.exports = function FigureCompiler() {
   var Compiler = this.Compiler;
   var visitors = Compiler.prototype.visitors;
 
-  visitors.figcaption = function figcaptionCompiler(node) {
-    var caption = nodeToString(node);
-    return "<figcaption>".concat(caption, "</figcaption>");
-  };
-
   visitors.figure = function figureCompiler(node) {
     var _node$children = _slicedToArray(node.children, 2),
         image = _node$children[0],
         caption = _node$children[1];
 
-    return "<figure>\n\n".concat(visitors.image.call(this, image), "\n\n").concat(visitors.figcaption.call(this, caption), "\n</figure>");
+    var img = {
+      image: [image.url, image.title],
+      caption: this.block(caption),
+      sizing: imgSizeByWidth[image.data.hProperties.width]
+    };
+    if (image.border) img.border = image.border;
+    var block = {
+      images: [img]
+    };
+    return "[block:image]\n".concat(JSON.stringify(block, null, 2), "\n[/block]");
+  };
+};
+
+/***/ }),
+
+/***/ 3356:
+/***/ ((module) => {
+
+module.exports = function ImageCompiler() {
+  var Compiler = this.Compiler;
+  var visitors = Compiler.prototype.visitors;
+  var original = visitors.image;
+
+  visitors.image = function compile(node) {
+    var _node$data, _node$data$hPropertie;
+
+    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
+    }
+
+    return ((_node$data = node.data) === null || _node$data === void 0 ? void 0 : (_node$data$hPropertie = _node$data.hProperties) === null || _node$data$hPropertie === void 0 ? void 0 : _node$data$hPropertie.className) === 'emoji' ? node.title : original.call.apply(original, [this, node].concat(args));
   };
 };
 
@@ -10859,7 +10891,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "rdmeEmbedCompiler": () => (/* reexport default from dynamic */ _embed__WEBPACK_IMPORTED_MODULE_4___default.a),
 /* harmony export */   "rdmeVarCompiler": () => (/* reexport default from dynamic */ _var__WEBPACK_IMPORTED_MODULE_5___default.a),
 /* harmony export */   "rdmeCalloutCompiler": () => (/* reexport default from dynamic */ _callout__WEBPACK_IMPORTED_MODULE_6___default.a),
-/* harmony export */   "rdmePinCompiler": () => (/* reexport default from dynamic */ _pin__WEBPACK_IMPORTED_MODULE_7___default.a)
+/* harmony export */   "rdmePinCompiler": () => (/* reexport default from dynamic */ _pin__WEBPACK_IMPORTED_MODULE_7___default.a),
+/* harmony export */   "imageCompiler": () => (/* reexport default from dynamic */ _image__WEBPACK_IMPORTED_MODULE_8___default.a)
 /* harmony export */ });
 /* harmony import */ var _div__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(58);
 /* harmony import */ var _div__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_div__WEBPACK_IMPORTED_MODULE_0__);
@@ -10877,6 +10910,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _callout__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_callout__WEBPACK_IMPORTED_MODULE_6__);
 /* harmony import */ var _pin__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(2151);
 /* harmony import */ var _pin__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_pin__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var _image__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(3356);
+/* harmony import */ var _image__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_image__WEBPACK_IMPORTED_MODULE_8__);
+
 
 
 
@@ -11353,10 +11389,21 @@ var WrapPinnedBlocks = function WrapPinnedBlocks(node, json) {
   };
 };
 
-var imgSizeRemap = {
+var imgSizeValues = {
   full: '100%',
   original: 'auto'
 };
+var imgWidthBySize = new Proxy(imgSizeValues, {
+  get: function get(widths, size) {
+    return size !== null && size !== void 0 && size.match(/^\d+$/) ? "".concat(size, "%") : size in widths ? widths[size] : size;
+  }
+});
+var imgSizeByWidth = new Proxy(new Map(Array.from(imgSizeValues).reverse()), {
+  get: function get(sizes, width) {
+    var match = width === null || width === void 0 ? void 0 : width.match(/^(\d+)%$/);
+    return match ? match[1] : width in sizes ? sizes[width] : width;
+  }
+});
 
 function tokenize(eat, value) {
   var _this = this;
@@ -11436,7 +11483,6 @@ function tokenize(eat, value) {
               url = _img$image[0],
               title = _img$image[1];
 
-          var size = img.sizing;
           var block = {
             type: 'image',
             url: url,
@@ -11445,7 +11491,7 @@ function tokenize(eat, value) {
             data: {
               hProperties: {
                 className: img.border ? 'border' : '',
-                width: size && !size.match(/\D/) ? "".concat(size, "%") : imgSizeRemap[size] || size
+                width: imgWidthBySize[img.sizing]
               }
             }
           };
@@ -11641,6 +11687,8 @@ module.exports.sanitize = function (sanitizeSchema) {
   return parser;
 };
 
+module.exports.imgSizeByWidth = imgSizeByWidth;
+
 /***/ }),
 
 /***/ 2697:

package/package.json

@@ -2,7 +2,7 @@
   "name": "@readme/markdown",
   "description": "ReadMe's React-based Markdown parser",
   "author": "Rafe Goldberg <rafe@readme.io>",
-  "version": "6.33.2-next.1",
+  "version": "6.34.0",
   "main": "dist/main.node.js",
   "browser": "dist/main.js",
   "files": [