v0.0.13

Author: stevenvachon

.travis.yml

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

README.md

@@ -52,22 +52,29 @@ When `true`, output will be formatted for increased legibility.
 ### options.normalizeWhitespace
 Type: `Boolean` 
 Default value: `true` 
-When `true`, multiple whitespace characters will be replaced with a single space. For more info, see [handlebars-html-parser](https://github.com/stevenvachon/handlebars-html-parser).
+See [handlebars-html-parser](https://github.com/stevenvachon/handlebars-html-parser).
 
 ### options.useDomMethods
 Type: `Boolean` 
 Default value: `true` 
 When `true`, available `React.DOM` convenience functions will be used instead of `React.createElement()`.
 
+### options.xmlMode
+Type: `Boolean` 
+Default value: `false` 
+See [handlebars-html-parser](https://github.com/stevenvachon/handlebars-html-parser).
+
 
 ## Roadmap Features
-* support `<script type="text/x-handlebars-template">`, etc
-* add `convertHbsComments` option for converting Handlebars comments to HTML comments
-* add `ignoreHtmlComments` option when React supports such ([react#2810](https://github.com/facebook/react/issues/2810))
+* support `<template>`
+* `convertHbsComments` to JavaScript block comments (or HTML comments?)
+* `convertHtmlComments` to JavaScript block comments
+* `ignoreComments` option when React supports such ([react#2810](https://github.com/facebook/react/issues/2810))
+* `trimWhitespace` option to remove spaces between elements (`<tag/> a word <tag/>` to `<tag/>a word<tag/>`)?
 
 
 ## Changelog
-* 0.0.1–0.0.12 pre-releases
+* 0.0.1–0.0.13 pre-releases
 
 
 [npm-image]: https://img.shields.io/npm/v/handlebars-react.svg

index.js

@@ -15,71 +15,40 @@ var defaultOptions =
 normalizeWhitespace: true,
 prefix: "",
 suffix: "",
-useDomMethods: true
+useDomMethods: true,
+xmlMode: false
 };
 
 
 
-/*var NodeType = 
-{
-HBS_EXPRESSION: "hbsExpression",
-
-HBS_EXPRESSION_END: "hbsExpressionEnd",
-HBS_EXPRESSION_HASH_PARAM: "hbsExpressionHashParam",
-HBS_EXPRESSION_PARAM: "hbsExpressionParam",
-HBS_EXPRESSION_PATH: "hbsExpressionPath",
-HBS_EXPRESSION_START: "hbsExpressionStart",
-HBS_TAG_END: "hbsTagEnd",
-HBS_TAG_START: "hbsTagStart",
-
-HTML_ATTR_END: "htmlAttrEnd",
-HTML_ATTR_NAME_END: "htmlAttrNameEnd",
-HTML_ATTR_NAME_START: "htmlAttrNameStart",
-HTML_ATTR_START: "htmlAttrStart",
-HTML_ATTR_VALUE_END: "htmlAttrValueEnd",
-HTML_ATTR_VALUE_START: "htmlAttrValueStart",
-HTML_COMMENT_END: "htmlCommentEnd",
-HTML_COMMENT_START: "htmlCommentStart",
-HTML_TAG_END: "htmlTagEnd",
-HTML_TAG_NAME_END: "htmlTagNameEnd",
-HTML_TAG_NAME_START: "htmlTagNameStart",
-HTML_TAG_START: "htmlTagStart",
-
-TEXT: "text"
-};*/
-
-
-
 function compiler(options)
 {
 this.options = objectAssign({}, defaultOptions, options);
 
 this.parser = new HandlebarsHtmlParser(
 {
-normalizeWhitespace: this.options.normalizeWhitespace
+normalizeWhitespace: this.options.normalizeWhitespace,
+xmlMode: this.options.xmlMode
 });
 }
 
 
 
 compiler.prototype.compile = function(str)
 {
+var nodeStack,parserState;
+
 var compilerState = 
 {
 // React.DOM… or React.createElement per element in stack
 // Stack indexed by parent tag depth -- first index is a "document" node (root/top-level nodes container)
 areDomMethods: [false]
 };
 
-var nodeStack = this.parser.parse(str);
 var options = this.options;
-var parserState;
 var result = [];
 
-//console.log(nodeStack);
-//console.log(str);
-
-HandlebarsHtmlParser.each(nodeStack, function(node, state)
+nodeStack = this.parser.parse(str, function(node, state)
 {
 // Parent scope access
 parserState = state;
@@ -114,6 +83,16 @@ compiler.prototype.compile = function(str)
 }
 
 
+case HandlebarsHtmlParser.type.HBS_TAG_END:
+{
+break;
+}
+case HandlebarsHtmlParser.type.HBS_TAG_START:
+{
+break;
+}
+
+
 case HandlebarsHtmlParser.type.HTML_ATTR_END:
 {
 break;
@@ -256,19 +235,25 @@ compiler.prototype.compile = function(str)
 }
 else if (parserState.isAttributeValue === true)
 {
-if (parserState.isStyleAttribute === false)
+// TODO :: support `href="javscript:code()"`
+/*if (parserState.isEventAttribute === true)
 {
-// React.createElement("tag", {"attr":"value"
-// React.DOM.tag({"attr":"value"
-// TODO :: run transformScript if script event attribute
-result.push( safeString(node.value) );
+// React.createElement("tag", {"onsomething":"code()"
+// React.DOM.tag({"onsomething":"code()"
+result.push( transformScript(node.value, options) );
 }
-else
+else*/ if (parserState.isStyleAttribute === true)
 {
 // React.createElement("tag", {"style":{…}
 // React.DOM.tag({"style":{…}
 result.push( transformInlineStyles(node.value, options) );
 }
+else
+{
+// React.createElement("tag", {"attr":"value"
+// React.DOM.tag({"attr":"value"
+result.push( safeString(node.value) );
+}
 }
 }
 }
@@ -330,6 +315,8 @@ compiler.prototype.compile = function(str)
 }
 }
 
+//console.log(str);
+//console.log(nodeStack);
 //console.log(result);
 result = finalize(result, options);
 //console.log(result);

package.json

@@ -1,7 +1,7 @@
 {
  "name": "handlebars-react",
  "description": "Compile Handlebars templates to React.",
- "version": "0.0.12",
+ "version": "0.0.13",
  "license": "MIT",
  "homepage": "https://github.com/stevenvachon/handlebars-react",
  "author": {

test/test.js

@@ -177,8 +177,8 @@ describe("Basic HTML", function()
 {
 it("should support text content with special characters", function(done)
 {
-var result = new compiler( options() ).compile('<tag>"text©&copy;"</tag>');
-var expectedResult = 'React.createElement("tag",null,"\\\"text©©\\\"")';
+var result = new compiler( options() ).compile('<tag>"text©&copy;&nbsp;"</tag>');
+var expectedResult = 'React.createElement("tag",null,"\\\"text©© \\\"")';
 
 expect(result).to.equal(expectedResult);
 done();
@@ -197,6 +197,29 @@ describe("Basic HTML", function()
 
 
 
+it("should support unrecognized <script> tags", function(done)
+{
+var result = new compiler( options() ).compile('<script type="text/template"><tag attr=\"value\">text</tag></script>');
+var expectedResult = 'React.createElement("script",{"type":"text/template"},"<tag attr=\\\"value\\\">text</tag>")';
+
+expect(result).to.equal(expectedResult);
+done();
+});
+
+
+
+// TODO :: parse as text?
+it.skip("should support <template> tags", function(done)
+{
+var result = new compiler( options() ).compile('<template><tag attr=\"value\">text</tag></template>');
+var expectedResult = 'React.createElement("template",null,"<tag attr=\\\"value\\\">text</tag>")';
+
+expect(result).to.equal(expectedResult);
+done();
+});
+
+
+
 it("should support <style> tags", function(done)
 {
 var result = new compiler( options() ).compile('<style>html { background-color:gray }</style>');
@@ -246,5 +269,21 @@ describe("Basic HTML", function()
 expect(result).to.equal(expectedResult);
 done();
 });
+
+
+
+it("normalizeWhitespace = true", function(done)
+{
+var result = new compiler( options({ normalizeWhitespace:true }) ).compile('<tag>text©&copy; &nbsp; </tag>');
+var expectedResult = 'React.createElement("tag",null,"text©©   ")'; // non-breaking space remains
+
+expect(result).to.equal(expectedResult);
+done();
+});
+
+
+
+// `multipleTopLevelNodes` is tested above
+// `useDomMethods` is tested above
 });
 });