Merge branch '6.x.x'

Author: Soreine

HISTORY.md

@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Unreleased
 
+### 7.0.3
+
+Import fixes from 6.0.6:
+
+- Fix empty custom block serialization
+- Fix invalid custom block parsing
+
 ### 7.0.2
 
 Import fixes from 6.0.2, 6.0.3, 6.0.4 and 6.0.5:
@@ -22,9 +29,14 @@ Import fixes from 6.0.2, 6.0.3, 6.0.4 and 6.0.5:
 
 - Upgrade Slate to 0.33
 
+### 6.0.6
+
+- Fix empty custom block serialization
+- Fix invalid custom block parsing
+
 ### 6.0.5
 
-- Fix empty custom block parsing
+- Fix empty custom block tag parsing
 
 ### 6.0.4
 

package.json

@@ -65,6 +65,7 @@
  "trim-trailing-lines": "^1.1.0",
  "type-of": "^2.0.1",
  "uid": "0.0.2",
+ "warning": "^3.0.0",
  "yargs": "^4.7.1"
  },
  "bin": {

src/markdown/blocks/custom.js

@@ -1,9 +1,11 @@
 const { List } = require('immutable');
+const warning = require('warning');
 const trimTrailingLines = require('trim-trailing-lines');
-const { Serializer, Deserializer, Block } = require('../../');
+const { Serializer, Deserializer, Block, BLOCKS } = require('../../');
 const reBlock = require('../re/block');
 const liquid = require('../liquid');
 
+
 /**
  * Return true if a block type is a custom one.
  * @param {String} tag
@@ -49,6 +51,18 @@ function isClosingTagFor(tag, forTag) {
  return tag.indexOf(`end${forTag}`) === 0;
 }
 
+/**
+ * Wrap the given nodes in the default block
+ * @param {Array<Node>} nodes
+ * @return {Block}
+ */
+function wrapInDefaultBlock(nodes) {
+ return Block.create({
+ type: BLOCKS.DEFAULT,
+ nodes
+ });
+}
+
 /**
  * Serialize a templating block to markdown
  * @type {Serializer}
@@ -64,24 +78,41 @@ const serialize = Serializer()
  data
  });
 
- const unendingTags = state.getProp('unendingTags') || List();
- const endTag =
- unendingTags.includes(getTagFromCustomType(node.type))
- ? ''
- : liquid.stringifyTag({
- tag: 'end' + getTagFromCustomType(node.type)
- });
-
  const split = node.object == 'block' ? '\n' : '';
  const end = node.object == 'block' ? '\n\n' : '';
 
- if (node.isVoid) {
+ if (node.isVoid || node.nodes.isEmpty()) {
+ warning(
+ node.isVoid,
+ 'Encountered a non-void custom block with no children'
+ );
+
  return state
  .shift()
  .write(`${startTag}${end}`);
  }
 
- const inner = trimTrailingLines(state.serialize(node.nodes));
+ const containsInline = node.nodes.first().object !== 'block';
+ warning(
+ !containsInline,
+ 'Encountered a custom block containing inlines'
+ );
+
+ const innerNodes = containsInline
+ ? List([wrapInDefaultBlock(node.nodes)])
+ : node.nodes;
+
+ const inner = trimTrailingLines(
+ state.serialize(innerNodes)
+ );
+
+ const unendingTags = state.getProp('unendingTags') || List();
+ const endTag =
+ unendingTags.includes(getTagFromCustomType(node.type))
+ ? ''
+ : liquid.stringifyTag({
+ tag: 'end' + getTagFromCustomType(node.type)
+ });
 
  return state
  .shift()
@@ -103,7 +134,15 @@ const deserialize = Deserializer()
  return state;
  }
 
+<<<<<<< HEAD
  const { tag, data } = liquid.parseTag(text);
+=======
+ const parsed = liquid.parseTag(text);
+ if (!parsed) {
+ return state;
+ }
+ const { tag, data } = parsed;
+>>>>>>> 6.x.x
 
  const node = Block.create({
  type: getCustomTypeFromTag(tag),

src/markdown/liquid/parseTag.js

@@ -51,11 +51,15 @@ function parseData(text) {
 /**
  * Parse the inner text of a tag.
  * @param {String} text
- * @return {Object} { tag: String, data: Map }
+ * @return {Object | Null} { tag: String, data: Map }
  */
 function parseTag(text) {
  const match = text.match(lexical.tagLine);
 
+ if (!match) {
+ return null;
+ }
+
  return {
  tag: match[1],
  data: parseData(match[2])

test/from-markdown/custom-blocks/empty-tag/input.md

@@ -1,8 +1,21 @@
+<<<<<<< HEAD
 Hello world
 
 {% %}
 
 {% %}
 
+=======
+A
+
+{% %}
+
+B
+
+{% %}
+
+C
+
+>>>>>>> 6.x.x
 {% This one is parsed as a paragraph
 %}

test/from-markdown/custom-blocks/empty-tag/output.yaml

@@ -5,7 +5,19 @@ document:
  nodes:
  - object: text
  leaves:
- - text: Hello world
+ - text: A
+ - object: block
+ type: paragraph
+ nodes:
+ - object: text
+ leaves:
+ - text: B
+ - object: block
+ type: paragraph
+ nodes:
+ - object: text
+ leaves:
+ - text: C
  - object: block
  type: paragraph
  nodes:

test/from-markdown/custom-blocks/invalid-tag/input.md

@@ -0,0 +1,9 @@
+A
+
+{% !! %}
+
+B
+
+{% =# %}
+
+C

test/from-markdown/custom-blocks/invalid-tag/output.yaml

@@ -0,0 +1,20 @@
+document:
+ nodes:
+ - object: block
+ type: paragraph
+ nodes:
+ - object: text
+ leaves:
+ - text: A
+ - object: block
+ type: paragraph
+ nodes:
+ - object: text
+ leaves:
+ - text: B
+ - object: block
+ type: paragraph
+ nodes:
+ - object: text
+ leaves:
+ - text: C

test/to-markdown/custom-blocks/block-empty/input.yaml

@@ -0,0 +1,12 @@
+document:
+ nodes:
+ - object: block
+ type: x-empty
+ # Custom blocks should either contain blocks or be Void. It's must be
+ # ensured uphill by normalization,
+ # This test shows that markup-it still handles non-Void empty blocks well.
+ isVoid: false
+ nodes:
+ - object: text
+ leaves:
+ - text: ''

test/to-markdown/custom-blocks/block-empty/output.md

@@ -0,0 +1,3 @@
+{% empty %}
+
+{% endempty %}