@bbob/parser - npm Package Compare versions

Comparing version 2.4.0 to 2.5.0

CHANGELOG.md

@@ -6,2 +6,13 @@ # Change Log
 
+<a name="2.5.0"></a>
+# [2.5.0](https://github.com/JiLiZART/bbob/compare/v2.4.1...v2.5.0) (2019-06-17)
+
+
+### Features
+
+* **parse:** allow tags to be escaped with backslash ([#17](https://github.com/JiLiZART/bbob/issues/17)) ([c4f78c1](https://github.com/JiLiZART/bbob/commit/c4f78c1))
+
+
+
+
 <a name="2.4.0"></a>
@@ -8,0 +19,0 @@ # [2.4.0](https://github.com/JiLiZART/bbob/compare/v2.3.4...v2.4.0) (2019-03-29)

dist/index.js

@@ -584,2 +584,3 @@ (function (global, factory) {
 	 * @param {String} options.closeTag
+	 * @param {Boolean} options.enableEscapeTags
 	 * @return {Lexer}
@@ -599,3 +600,3 @@ */
 	  var RESERVED_CHARS = [closeTag, openTag, char_7, char_14, char_8, char_5, char_6, char_2, EM];
-	  var NOT_CHAR_TOKENS = [openTag, char_8, char_5, char_2];
+	  var NOT_CHAR_TOKENS = [].concat(options.enableEscapeTags ? [char_14] : [], [openTag, char_8, char_5, char_2, char_14]);
 	  var WHITESPACES = [char_8, char_5];
@@ -701,2 +702,3 @@ var SPECIAL_CHARS = [char_6, char_8, char_5];
 	    var currChar = bufferGrabber.getCurr();
+	    var nextChar = bufferGrabber.getNext();
 
@@ -712,4 +714,7 @@ if (currChar === char_2) {
 	      emitToken(createToken(TYPE_SPACE, str, row, col));
+	    } else if (options.enableEscapeTags && currChar === char_14 && (nextChar === openTag || nextChar === closeTag)) {
+	      bufferGrabber.skip(); // skip the \ without emitting anything
+	      bufferGrabber.skip(); // skip past the [ or ] as well
+	      emitToken(createToken(TYPE_WORD, nextChar, row, col));
 	    } else if (currChar === openTag) {
-	      var nextChar = bufferGrabber.getNext();
 	      bufferGrabber.skip(); // skip openTag
@@ -785,2 +790,3 @@
 	 * @param {String} opts.closeTag
+	 * @param {Boolean} opts.enableEscapeTags
 	 * @return {Array}
@@ -999,3 +1005,4 @@ */
 	    openTag: options.openTag,
-	    closeTag: options.closeTag
+	    closeTag: options.closeTag,
+	    enableEscapeTags: options.enableEscapeTags
 	  });
@@ -1002,0 +1009,0 @@

dist/index.min.js

@@ -1,1 +0,1 @@
-!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports):"function"==typeof define&&define.amd?define(["exports"],n):n(t.BbobParser={})}(this,function(t){"use strict";function n(t){return t&&t.__esModule&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t}function e(t,n){return t(n={exports:{}},n.exports),n.exports}var a=e(function(t,n){n.__esModule=!0;n.N="\n",n.F="\f",n.R="\r",n.TAB="\t",n.EQ="=",n.QUOTEMARK='"',n.SPACE=" ",n.OPEN_BRAKET="[",n.CLOSE_BRAKET="]",n.SLASH="/",n.PLACEHOLDER_SPACE_TAB="    ",n.PLACEHOLDER_SPACE=" ",n.BACKSLASH="\\"});n(a);var A=a.N,N=a.TAB,E=a.EQ,L=a.QUOTEMARK,b=a.SPACE,O=a.OPEN_BRAKET,S=a.CLOSE_BRAKET,x=a.SLASH,C=a.BACKSLASH,o=e(function(t,n){n.__esModule=!0,n.isEOL=n.isStringNode=n.isTagNode=n.getNodeLength=n.appendToNode=n.attrValue=n.attrsToString=void 0;var r=function(t){return"object"==typeof t&&!!t.tag},o=function(t){return"string"==typeof t},i=function(t){return t.replace(/"/g,"&quot;")},u=function(t,n){var e=typeof n,r={boolean:function(){return n?""+t:""},number:function(){return t+'="'+n+'"'},string:function(){return t+'="'+i(n)+'"'},object:function(){return t+'="'+i(JSON.stringify(n))+'"'}};return r[e]?r[e]():""};n.attrsToString=function(e){return Object.keys(e).reduce(function(t,n){return[].concat(t,[u(n,e[n])])},[""]).join(" ")},n.attrValue=u,n.appendToNode=function(t,n){t.content.push(n)},n.getNodeLength=function e(t){return r(t)?t.content.reduce(function(t,n){return t+e(n)},0):o(t)?t.length:0},n.isTagNode=r,n.isStringNode=o,n.isEOL=function(t){return t===a.N}});n(o);var r=e(function(t,n){n.__esModule=!0,n.TagNode=void 0;var e=function(){function r(t,n){for(var e=0;e<n.length;e++){var r=n[e];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(t,n,e){return n&&r(t.prototype,n),e&&r(t,e),t}}();var r=function(){function r(t,n,e){!function(t,n){if(!(t instanceof n))throw new TypeError("Cannot call a class as a function")}(this,r),this.tag=t,this.attrs=n,this.content=[].concat(e)}return r.prototype.attr=function(t,n){return void 0!==n&&(this.attrs[t]=n),this.attrs[t]},r.prototype.append=function(t){return(0,o.appendToNode)(this,t)},r.prototype.toString=function(){var t=a.OPEN_BRAKET,n=a.CLOSE_BRAKET;return t+this.tag+n+this.content.reduce(function(t,n){return t+""+n},"")+t+a.SLASH+this.tag+n},e(r,[{key:"length",get:function(){return(0,o.getNodeLength)(this)}}]),r}();r.create=function(t){return new r(t,1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},2<arguments.length&&void 0!==arguments[2]?arguments[2]:[])},r.isOf=function(t,n){return t.tag===n},n.TagNode=r,n.default=r}),h=n(r),i=r.TagNode,u="type",s="value",f="line",c="word",l="attr-name",g="attr-value",p="space",d="new-line",v=function(t){return t[s]},T=function(t){return v(t).charCodeAt(0)==x.charCodeAt(0)},y=function(){function o(t,n,e,r){!function(t,n){if(!(t instanceof n))throw new TypeError("Cannot call a class as a function")}(this,o),this[u]=t+"",this[s]=n+"",this[f]=+e,this.row=+r}return o.prototype.isEmpty=function(){return!!this[u]},o.prototype.isText=function(){return(t=this)[u]===p||t[u]===d||t[u]===c;var t},o.prototype.isTag=function(){return"tag"===this[u]},o.prototype.isAttrName=function(){return this[u]===l},o.prototype.isAttrValue=function(){return this[u]===g},o.prototype.isStart=function(){return!T(this)},o.prototype.isEnd=function(){return T(this)},o.prototype.getName=function(){return n=v(t=this),T(t)?n.slice(1):n;var t,n},o.prototype.getValue=function(){return v(this)},o.prototype.getLine=function(){return this[f]},o.prototype.getColumn=function(){return this.row},o.prototype.toString=function(){return t=O,t+=v(this),t+=S;var t},o}(),m=c,k=function(e){var t=(1<arguments.length&&void 0!==arguments[1]?arguments[1]:{}).onSkip,r=0,o=function(){r+=1,t&&t()},i=function(){return r<e.length},u=function(){return e.substr(r)},a=function(){return e[r]};return{skip:o,hasNext:i,isLast:function(){return r===e.length},grabWhile:function(t){for(var n=r;i()&&t(a());)o();return e.substr(n,r-n)},getNext:function(){return e[r+1]},getPrev:function(){return e[r-1]},getCurr:a,getRest:u,substrUntilChar:function(t){var n=u(),e=n.indexOf(t);return e<0?"":n.substr(0,e)}}},_=function(){var n=0<arguments.length&&void 0!==arguments[0]?arguments[0]:[];return{getLast:function(){return n.length?n[n.length-1]:null},flushLast:function(){return!!n.length&&n.pop()},push:function(t){return n.push(t)},toArray:function(){return n}}},w=function(t,n){return new y(t,n,2<arguments.length&&void 0!==arguments[2]?arguments[2]:0,3<arguments.length&&void 0!==arguments[3]?arguments[3]:0)};function P(e){var n=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},f=0,c=0,r=-1,o=Array(Math.floor(e.length)),s=n.openTag||O,l=n.closeTag||S,g=[l,s,L,C,b,N,E,A,"!"],i=[s,b,N,A],u=[b,N],p=[E,b,N],h=function(t){return 0<=u.indexOf(t)},d=function(t){return-1==i.indexOf(t)},v=function(t){n.onToken&&n.onToken(t),o[r+=1]=t},T=function(t){for(var u=null,a=!1,r=[],s=k(t),o=function(t){var n=t===E,e=h(t),r=s.getPrev(),o=s.getNext(),i=r===C;return null===u?!1===(n||e||s.isLast()):!(!a||p.indexOf(t)<0)||!!(t!==L||i||(a=!a)||o===E||h(o))&&!1===(n||e)},n=function(){var t=s.grabWhile(o),n=s.getCurr();if(null===u)u=t;else if(h(n)||n===L||!s.hasNext()){var e=function(t,n){for(;t.charAt(0)===n;)t=t.substring(1);for(;t.charAt(t.length-1)===n;)t=t.substring(0,t.length-1);return t}(t,L).replace(C+L,L);r.push(w("attr-value",e,f,c))}else r.push(w("attr-name",t,f,c));s.skip()};s.hasNext();)n();return{tag:u,attrs:r}},y=k(e,{onSkip:function(){c++}}),t=function(){var t=y.getCurr();if(t===A)y.skip(),v(w("new-line",t,++f,c=0));else if(h(t)){var n=y.grabWhile(h);v(w("space",n,f,c))}else if(t===s){var e=y.getNext();y.skip();var r=y.substrUntilChar(l),o=0===r.length||0<=r.indexOf(s);if(0<=g.indexOf(e)||o||y.isLast())v(w(m,t,f,c));else{var i=y.grabWhile(function(t){return t!==l});if(y.skip(),-1==i.indexOf(E)||i[0]===x)v(w("tag",i,f,c));else{var u=T(i);v(w("tag",u.tag,f,c)),u.attrs.map(v)}}}else if(t===l)y.skip(),v(w(m,t,f,c));else if(d(t)){var a=y.grabWhile(d);v(w(m,a,f,c))}};return{tokenize:function(){for(;y.hasNext();)t();return o.length=r+1,o},isTokenNested:function(t){var n=s+x+t.getValue();return-1<e.indexOf(n)}}}var B=function(t){var n=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},i=n,o=null,e=_(),u=_(),a=_(),s=_(),f={},c=function(){a.flushLast()&&s.flushLast()},l=function(t){var n;(n=u.getLast(),n?n.content:e.toArray()).push(t)},r=function(t){c();var n,e=h.create(t.getValue()),r=(void 0===f[(n=t).getValue()]&&(f[n.getValue()]=o.isTokenNested(n)),f[n.getValue()]);a.push(e),r?u.push(e):l(e)},g=function(t){t.isStart()&&r(t),t.isEnd()&&function(t){c();var n=u.flushLast();if(n)l(n);else if(i.onError){var e=t.getValue(),r=t.getLine(),o=t.getColumn();i.onError({message:"Inconsistent tag '"+e+"' on line "+r+" and column "+o,tagName:e,lineNumber:r,columnNumber:o})}}(t)},p=function(t){var n=a.getLast(),e=t.getValue(),r=!!f[t];if(n)if(t.isAttrName())s.push(e),n.attr(s.getLast(),"");else if(t.isAttrValue()){var o=s.getLast();o?(n.attr(o,e),s.flushLast()):n.attr(e,e)}else t.isText()?r?n.append(e):l(e):t.isTag()&&l(""+t);else t.isText()?l(e):t.isTag()&&l(""+t)};(o=(n.createTokenizer?n.createTokenizer:P)(t,{onToken:function(t){var n;!t.isTag()||(n=t.getName(),i.onlyAllowTags&&i.onlyAllowTags.length&&i.onlyAllowTags.indexOf(n)<0)?p(t):g(t)},onlyAllowTags:i.onlyAllowTags,openTag:i.openTag,closeTag:i.closeTag})).tokenize();return e.toArray()};t.default=B,t.parse=B,t.TagNode=i,Object.defineProperty(t,"__esModule",{value:!0})});
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports):"function"==typeof define&&define.amd?define(["exports"],n):n(t.BbobParser={})}(this,function(t){"use strict";function n(t){return t&&t.__esModule&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t}function e(t,n){return t(n={exports:{}},n.exports),n.exports}var a=e(function(t,n){n.__esModule=!0;n.N="\n",n.F="\f",n.R="\r",n.TAB="\t",n.EQ="=",n.QUOTEMARK='"',n.SPACE=" ",n.OPEN_BRAKET="[",n.CLOSE_BRAKET="]",n.SLASH="/",n.PLACEHOLDER_SPACE_TAB="    ",n.PLACEHOLDER_SPACE=" ",n.BACKSLASH="\\"});n(a);var E=a.N,u=a.TAB,N=a.EQ,b=a.QUOTEMARK,L=a.SPACE,O=a.OPEN_BRAKET,S=a.CLOSE_BRAKET,x=a.SLASH,k=a.BACKSLASH,o=e(function(t,n){n.__esModule=!0,n.isEOL=n.isStringNode=n.isTagNode=n.getNodeLength=n.appendToNode=n.attrValue=n.attrsToString=void 0;var r=function(t){return"object"==typeof t&&!!t.tag},o=function(t){return"string"==typeof t},i=function(t){return t.replace(/"/g,"&quot;")},u=function(t,n){var e=typeof n,r={boolean:function(){return n?""+t:""},number:function(){return t+'="'+n+'"'},string:function(){return t+'="'+i(n)+'"'},object:function(){return t+'="'+i(JSON.stringify(n))+'"'}};return r[e]?r[e]():""};n.attrsToString=function(e){return Object.keys(e).reduce(function(t,n){return[].concat(t,[u(n,e[n])])},[""]).join(" ")},n.attrValue=u,n.appendToNode=function(t,n){t.content.push(n)},n.getNodeLength=function e(t){return r(t)?t.content.reduce(function(t,n){return t+e(n)},0):o(t)?t.length:0},n.isTagNode=r,n.isStringNode=o,n.isEOL=function(t){return t===a.N}});n(o);var r=e(function(t,n){n.__esModule=!0,n.TagNode=void 0;var e=function(){function r(t,n){for(var e=0;e<n.length;e++){var r=n[e];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(t,n,e){return n&&r(t.prototype,n),e&&r(t,e),t}}();var r=function(){function r(t,n,e){!function(t,n){if(!(t instanceof n))throw new TypeError("Cannot call a class as a function")}(this,r),this.tag=t,this.attrs=n,this.content=[].concat(e)}return r.prototype.attr=function(t,n){return void 0!==n&&(this.attrs[t]=n),this.attrs[t]},r.prototype.append=function(t){return(0,o.appendToNode)(this,t)},r.prototype.toString=function(){var t=a.OPEN_BRAKET,n=a.CLOSE_BRAKET;return t+this.tag+n+this.content.reduce(function(t,n){return t+""+n},"")+t+a.SLASH+this.tag+n},e(r,[{key:"length",get:function(){return(0,o.getNodeLength)(this)}}]),r}();r.create=function(t){return new r(t,1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},2<arguments.length&&void 0!==arguments[2]?arguments[2]:[])},r.isOf=function(t,n){return t.tag===n},n.TagNode=r,n.default=r}),h=n(r),i=r.TagNode,s="type",f="value",c="line",l="word",g="attr-name",p="attr-value",d="space",v="new-line",T=function(t){return t[f]},y=function(t){return T(t).charCodeAt(0)==x.charCodeAt(0)},A=function(){function o(t,n,e,r){!function(t,n){if(!(t instanceof n))throw new TypeError("Cannot call a class as a function")}(this,o),this[s]=t+"",this[f]=n+"",this[c]=+e,this.row=+r}return o.prototype.isEmpty=function(){return!!this[s]},o.prototype.isText=function(){return(t=this)[s]===d||t[s]===v||t[s]===l;var t},o.prototype.isTag=function(){return"tag"===this[s]},o.prototype.isAttrName=function(){return this[s]===g},o.prototype.isAttrValue=function(){return this[s]===p},o.prototype.isStart=function(){return!y(this)},o.prototype.isEnd=function(){return y(this)},o.prototype.getName=function(){return n=T(t=this),y(t)?n.slice(1):n;var t,n},o.prototype.getValue=function(){return T(this)},o.prototype.getLine=function(){return this[c]},o.prototype.getColumn=function(){return this.row},o.prototype.toString=function(){return t=O,t+=T(this),t+=S;var t},o}(),C=l,m=function(e){var t=(1<arguments.length&&void 0!==arguments[1]?arguments[1]:{}).onSkip,r=0,o=function(){r+=1,t&&t()},i=function(){return r<e.length},u=function(){return e.substr(r)},a=function(){return e[r]};return{skip:o,hasNext:i,isLast:function(){return r===e.length},grabWhile:function(t){for(var n=r;i()&&t(a());)o();return e.substr(n,r-n)},getNext:function(){return e[r+1]},getPrev:function(){return e[r-1]},getCurr:a,getRest:u,substrUntilChar:function(t){var n=u(),e=n.indexOf(t);return e<0?"":n.substr(0,e)}}},_=function(){var n=0<arguments.length&&void 0!==arguments[0]?arguments[0]:[];return{getLast:function(){return n.length?n[n.length-1]:null},flushLast:function(){return!!n.length&&n.pop()},push:function(t){return n.push(t)},toArray:function(){return n}}},w=function(t,n){return new A(t,n,2<arguments.length&&void 0!==arguments[2]?arguments[2]:0,3<arguments.length&&void 0!==arguments[3]?arguments[3]:0)};function P(e){var s=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},f=0,c=0,n=-1,r=Array(Math.floor(e.length)),l=s.openTag||O,g=s.closeTag||S,p=[g,l,b,k,L,u,N,E,"!"],o=[].concat(s.enableEscapeTags?[k]:[],[l,L,u,E,k]),i=[L,u],h=[N,L,u],d=function(t){return 0<=i.indexOf(t)},v=function(t){return-1==o.indexOf(t)},T=function(t){s.onToken&&s.onToken(t),r[n+=1]=t},y=function(t){for(var u=null,a=!1,r=[],s=m(t),o=function(t){var n=t===N,e=d(t),r=s.getPrev(),o=s.getNext(),i=r===k;return null===u?!1===(n||e||s.isLast()):!(!a||h.indexOf(t)<0)||!!(t!==b||i||(a=!a)||o===N||d(o))&&!1===(n||e)},n=function(){var t=s.grabWhile(o),n=s.getCurr();if(null===u)u=t;else if(d(n)||n===b||!s.hasNext()){var e=function(t,n){for(;t.charAt(0)===n;)t=t.substring(1);for(;t.charAt(t.length-1)===n;)t=t.substring(0,t.length-1);return t}(t,b).replace(k+b,b);r.push(w("attr-value",e,f,c))}else r.push(w("attr-name",t,f,c));s.skip()};s.hasNext();)n();return{tag:u,attrs:r}},A=m(e,{onSkip:function(){c++}}),t=function(){var t=A.getCurr(),n=A.getNext();if(t===E)A.skip(),T(w("new-line",t,++f,c=0));else if(d(t)){var e=A.grabWhile(d);T(w("space",e,f,c))}else if(!s.enableEscapeTags||t!==k||n!==l&&n!==g){if(t===l){A.skip();var r=A.substrUntilChar(g),o=0===r.length||0<=r.indexOf(l);if(0<=p.indexOf(n)||o||A.isLast())T(w(C,t,f,c));else{var i=A.grabWhile(function(t){return t!==g});if(A.skip(),-1==i.indexOf(N)||i[0]===x)T(w("tag",i,f,c));else{var u=y(i);T(w("tag",u.tag,f,c)),u.attrs.map(T)}}}else if(t===g)A.skip(),T(w(C,t,f,c));else if(v(t)){var a=A.grabWhile(v);T(w(C,a,f,c))}}else A.skip(),A.skip(),T(w(C,n,f,c))};return{tokenize:function(){for(;A.hasNext();)t();return r.length=n+1,r},isTokenNested:function(t){var n=l+x+t.getValue();return-1<e.indexOf(n)}}}var B=function(t){var n=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},i=n,o=null,e=_(),u=_(),a=_(),s=_(),f={},c=function(){a.flushLast()&&s.flushLast()},l=function(t){var n;(n=u.getLast(),n?n.content:e.toArray()).push(t)},r=function(t){c();var n,e=h.create(t.getValue()),r=(void 0===f[(n=t).getValue()]&&(f[n.getValue()]=o.isTokenNested(n)),f[n.getValue()]);a.push(e),r?u.push(e):l(e)},g=function(t){t.isStart()&&r(t),t.isEnd()&&function(t){c();var n=u.flushLast();if(n)l(n);else if(i.onError){var e=t.getValue(),r=t.getLine(),o=t.getColumn();i.onError({message:"Inconsistent tag '"+e+"' on line "+r+" and column "+o,tagName:e,lineNumber:r,columnNumber:o})}}(t)},p=function(t){var n=a.getLast(),e=t.getValue(),r=!!f[t];if(n)if(t.isAttrName())s.push(e),n.attr(s.getLast(),"");else if(t.isAttrValue()){var o=s.getLast();o?(n.attr(o,e),s.flushLast()):n.attr(e,e)}else t.isText()?r?n.append(e):l(e):t.isTag()&&l(""+t);else t.isText()?l(e):t.isTag()&&l(""+t)};(o=(n.createTokenizer?n.createTokenizer:P)(t,{onToken:function(t){var n;!t.isTag()||(n=t.getName(),i.onlyAllowTags&&i.onlyAllowTags.length&&i.onlyAllowTags.indexOf(n)<0)?p(t):g(t)},onlyAllowTags:i.onlyAllowTags,openTag:i.openTag,closeTag:i.closeTag,enableEscapeTags:i.enableEscapeTags})).tokenize();return e.toArray()};t.default=B,t.parse=B,t.TagNode=i,Object.defineProperty(t,"__esModule",{value:!0})});

es/lexer.js

@@ -35,2 +35,3 @@ /* eslint-disable no-plusplus,no-param-reassign */
  * @param {String} options.closeTag
+ * @param {Boolean} options.enableEscapeTags
  * @return {Lexer}
@@ -50,3 +51,3 @@ */
   var RESERVED_CHARS = [closeTag, openTag, QUOTEMARK, BACKSLASH, SPACE, TAB, EQ, N, EM];
-  var NOT_CHAR_TOKENS = [openTag, SPACE, TAB, N];
+  var NOT_CHAR_TOKENS = [].concat(options.enableEscapeTags ? [BACKSLASH] : [], [openTag, SPACE, TAB, N, BACKSLASH]);
   var WHITESPACES = [SPACE, TAB];
@@ -152,2 +153,3 @@ var SPECIAL_CHARS = [EQ, SPACE, TAB];
     var currChar = bufferGrabber.getCurr();
+    var nextChar = bufferGrabber.getNext();
 
@@ -163,4 +165,7 @@ if (currChar === N) {
       emitToken(createToken(TYPE_SPACE, str, row, col));
+    } else if (options.enableEscapeTags && currChar === BACKSLASH && (nextChar === openTag || nextChar === closeTag)) {
+      bufferGrabber.skip(); // skip the \ without emitting anything
+      bufferGrabber.skip(); // skip past the [ or ] as well
+      emitToken(createToken(TYPE_WORD, nextChar, row, col));
     } else if (currChar === openTag) {
-      var nextChar = bufferGrabber.getNext();
       bufferGrabber.skip(); // skip openTag
@@ -167,0 +172,0 @@

es/parse.js

@@ -13,2 +13,3 @@ import TagNode from '@bbob/plugin-helper/lib/TagNode';
  * @param {String} opts.closeTag
+ * @param {Boolean} opts.enableEscapeTags
  * @return {Array}
@@ -227,3 +228,4 @@ */
     openTag: options.openTag,
-    closeTag: options.closeTag
+    closeTag: options.closeTag,
+    enableEscapeTags: options.enableEscapeTags
   });
@@ -230,0 +232,0 @@

lib/lexer.js

@@ -41,2 +41,3 @@ 'use strict';
  * @param {String} options.closeTag
+ * @param {Boolean} options.enableEscapeTags
  * @return {Lexer}
@@ -56,3 +57,3 @@ */
   var RESERVED_CHARS = [closeTag, openTag, _char.QUOTEMARK, _char.BACKSLASH, _char.SPACE, _char.TAB, _char.EQ, _char.N, EM];
-  var NOT_CHAR_TOKENS = [openTag, _char.SPACE, _char.TAB, _char.N];
+  var NOT_CHAR_TOKENS = [].concat(options.enableEscapeTags ? [_char.BACKSLASH] : [], [openTag, _char.SPACE, _char.TAB, _char.N, _char.BACKSLASH]);
   var WHITESPACES = [_char.SPACE, _char.TAB];
@@ -158,2 +159,3 @@ var SPECIAL_CHARS = [_char.EQ, _char.SPACE, _char.TAB];
     var currChar = bufferGrabber.getCurr();
+    var nextChar = bufferGrabber.getNext();
 
@@ -169,4 +171,7 @@ if (currChar === _char.N) {
       emitToken(createToken(_Token.TYPE_SPACE, str, row, col));
+    } else if (options.enableEscapeTags && currChar === _char.BACKSLASH && (nextChar === openTag || nextChar === closeTag)) {
+      bufferGrabber.skip(); // skip the \ without emitting anything
+      bufferGrabber.skip(); // skip past the [ or ] as well
+      emitToken(createToken(_Token.TYPE_WORD, nextChar, row, col));
     } else if (currChar === openTag) {
-      var nextChar = bufferGrabber.getNext();
       bufferGrabber.skip(); // skip openTag
@@ -173,0 +178,0 @@

lib/parse.js

@@ -24,2 +24,3 @@ 'use strict';
  * @param {String} opts.closeTag
+ * @param {Boolean} opts.enableEscapeTags
  * @return {Array}
@@ -238,3 +239,4 @@ */
     openTag: options.openTag,
-    closeTag: options.closeTag
+    closeTag: options.closeTag,
+    enableEscapeTags: options.enableEscapeTags
   });
@@ -241,0 +243,0 @@

package.json

 {
   "name": "@bbob/parser",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Just parses BBcode to AST array. Part of @bbob bbcode parser",
@@ -5,0 +5,0 @@ "keywords": [

src/lexer.js

@@ -41,2 +41,3 @@ /* eslint-disable no-plusplus,no-param-reassign */
  * @param {String} options.closeTag
+ * @param {Boolean} options.enableEscapeTags
  * @return {Lexer}
@@ -54,3 +55,6 @@ */
   const RESERVED_CHARS = [closeTag, openTag, QUOTEMARK, BACKSLASH, SPACE, TAB, EQ, N, EM];
-  const NOT_CHAR_TOKENS = [openTag, SPACE, TAB, N];
+  const NOT_CHAR_TOKENS = [
+    ...(options.enableEscapeTags ? [BACKSLASH] : []),
+    openTag, SPACE, TAB, N, BACKSLASH,
+  ];
   const WHITESPACES = [SPACE, TAB];
@@ -148,2 +152,3 @@ const SPECIAL_CHARS = [EQ, SPACE, TAB];
     const currChar = bufferGrabber.getCurr();
+    const nextChar = bufferGrabber.getNext();
 
@@ -159,4 +164,8 @@ if (currChar === N) {
       emitToken(createToken(TYPE_SPACE, str, row, col));
+    } else if (options.enableEscapeTags && currChar === BACKSLASH
+               && (nextChar === openTag || nextChar === closeTag)) {
+      bufferGrabber.skip(); // skip the \ without emitting anything
+      bufferGrabber.skip(); // skip past the [ or ] as well
+      emitToken(createToken(TYPE_WORD, nextChar, row, col));
     } else if (currChar === openTag) {
-      const nextChar = bufferGrabber.getNext();
       bufferGrabber.skip(); // skip openTag
@@ -163,0 +172,0 @@

src/parse.js

@@ -13,2 +13,3 @@ import TagNode from '@bbob/plugin-helper/lib/TagNode';
  * @param {String} opts.closeTag
+ * @param {Boolean} opts.enableEscapeTags
  * @return {Array}
@@ -224,2 +225,3 @@ */
     closeTag: options.closeTag,
+    enableEscapeTags: options.enableEscapeTags,
   });
@@ -226,0 +228,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

144455

increased by1.78%

Lines of code

2840

increased by1.14%

No dependency changes