v0.0.12

Author: stevenvachon

.travis.yml

@@ -2,5 +2,5 @@ language: node_js
 node_js:
 - "0.10"
 - "0.12"
-- "iojs"
+- "4"
 script: npm test

README.md

@@ -43,6 +43,11 @@ For more information on the strengths, weaknesses and implementation details of
 
 ## Options
 
+### options.convertHbsComments
+Type: `Boolean` 
+Default value: `false` 
+When `true`, Handlebars comments will be converted to HTML comments.
+
 ### options.ignoreHbsComments
 Type: `Boolean` 
 Default value: `false` 
@@ -60,7 +65,8 @@ When `true`, will replace multiple standard whitespace characters (line breaks,
 
 * Does not affect "special" whitespace chars such as ` `, etc.
 * Does not affect text within `<pre>`,`<script>`,`<style>` tags
-* Does not affect HTML's rendered appearance
+* Does not affect text within "dynamic" tags (`<{{tag}}>`)
+* Does not affect HTML's rendered appearance (unless using CSS `white-space:pre`)
 
 ### options.xmlMode
 Type: `Boolean` 
@@ -81,12 +87,11 @@ As of v1.5.0, it is not at all "forgiving", in that it will parse `<{{tag}}>asdf
 * add support for `{{#if}}`,`{{else}}`,`{{else if}}`,`{{#unless}}`
 * add support for `{{#with}}`,`{{#each}}`,`{{@index}}`,`{{@key}}`,`{{this}}`,`{{.}}`,`{{undefined}}`,`{{null}}`,`{{true}}`,`{{1}}`
 * add support for `{{> partial}}`
-* `options.convertHbsComments` for converting Handlebars comments to HTML comments
 * `options.mustacheOnly` that disables helpers, expressions and whitespace control? would have to provide parse errors
 
 
 ## Changelog
-* 0.0.1–0.0.11 pre-releases
+* 0.0.1–0.0.12 pre-releases
 
 
 [npm-image]: https://img.shields.io/npm/v/handlebars-html-parser.svg

lib/each.js

@@ -12,7 +12,7 @@ function addTop(stack, value)
 
 
 
-function each(program, callback)
+function each(program, options, callback)
 {
 var i;
 var numNodes = program.length;
@@ -39,13 +39,13 @@ function each(program, callback)
 
 for (i=0; i<numNodes; i++)
 {
-eachNode(program[i], state, callback);
+eachNode(program[i], state, options, callback);
 }
 }
 
 
 
-function eachNode(node, state, callback)
+function eachNode(node, state, options, callback)
 {
 var callbackInvoked = false;
 
@@ -85,6 +85,14 @@ function eachNode(node, state, callback)
 }
 case NodeType.HBS_TAG_START:
 {
+/*if (state.isTag === false)
+{
+if (node.closing !== true)
+{
+incrementTop(state.hbsCounts);
+}
+}*/
+
 break;
 }
 
@@ -152,6 +160,7 @@ function eachNode(node, state, callback)
 {
 removeTop(state.attrCounts);
 removeTop(state.childCounts);
+//removeTop(state.hbsCounts);
 
 state.isWithinScriptTag = false;
 state.isWithinStyleTag = false;
@@ -174,6 +183,7 @@ function eachNode(node, state, callback)
 
 addTop(state.attrCounts);
 addTop(state.childCounts);
+//addTop(state.hbsCounts);
 }
 
 break;

lib/index.js

@@ -9,71 +9,69 @@ var objectAssign = require("object-assign");
 
 var defaultOptions = 
 {
-// Undocumented
-// TODO :: this isn't cloned
-htmlParser:
-{
-decodeEntities: true,
-lowerCaseAttributeNames: true,
-lowerCaseTags: true,
-recognizeSelfClosing: true
-},
-
-// Documented
+convertHbsComments: false,
 ignoreHbsComments: false,
 ignoreHtmlComments: false,
 normalizeWhitespace: false,
 xmlMode: false
 };
 
+var htmlParserOptions = 
+{
+decodeEntities: true,
+lowerCaseAttributeNames: true, // TODO :: what about inline SVG?
+lowerCaseTags: true, // TODO :: what about inline SVG?
+recognizeSelfClosing: true,
+xmlMode: false
+};
+
 
 
 function parser(options)
 {
 this.options = objectAssign({}, defaultOptions, options);
 
-this.options.htmlParser.xmlMode = this.options.xmlMode;
+this.options.htmlParser = objectAssign({}, htmlParserOptions);
 
 if (this.options.xmlMode === true)
 {
-this.options.htmlParser.lowerCaseAttributeNames = true;
-this.options.htmlParser.lowerCaseTags = true;
+this.options.htmlParser.lowerCaseAttributeNames = false;
+this.options.htmlParser.lowerCaseTags = false;
+this.options.htmlParser.xmlMode = true;
 }
+
+// Convenience
+this.type = parser.type;
 }
 
 
 
-parser.each = each;
 parser.type = NodeType;
 
 
 
 /*
-Build a linear program of HTML pieces and Handlebars expressions.
+Run a provided function once per element in a linear program containing
+HTML pieces and Handlebars expressions.
 */
-parser.prototype.parse = function(input)
+parser.prototype.parse = function(input, callback)
 {
 //devlog.basic(input);
 
-this.orgProgram = handlebars.parse(input);
-this.newProgram = [];
-
-// Used for iterating through Handlebars statements within `orgProgram`
-//this.orgProgramCurrent = null;
-
-// Convenience
-this.type = parser.type;
+var orgProgram = handlebars.parse(input);
+//devlog(orgProgram);
 
 // Start with root-level (no children) program
-parseHtml(this, this.orgProgram);
-
-//devlog(this.orgProgram);
+var newProgram = parseHtml([], orgProgram, this.options);
+//devlog(newProgram);
 
-// TODO :: loop through newProgram in test
-//devlog(this.newProgram);
+if (typeof callback === "function")
+{
+each(newProgram, this.options, callback);
+}
 
-// ?
-return this.newProgram;
+// For testing and curious minds
+return newProgram;
 };