added more checks

Author: Sergii.Kliuchnyk

LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Sergii Kliuchnyk
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

conv.js

@@ -16,8 +16,7 @@ var tplAnnotations = /\/\*+\s*@jsx\-tpl\s+([\w\-]+)\s*\*\//g,
 function convert(js, html, callback) {
     parseHtml(html, function (err, body) {
         if (err) {
-            callback(err);
-            return;
+            return callback(err);
         }
 
         var templates = {};
@@ -35,7 +34,7 @@ function convert(js, html, callback) {
             domUtils.removeElement(node);
         });
 
-        var _return = search(renderReturnSelector, js)[0],
+        var _return = search(renderReturnSelector, js),
             _props = search(renderReturnSelector + ' > obj > prop', js),
             props = {};
 
@@ -51,14 +50,33 @@ function convert(js, html, callback) {
             props[name] = value;
         });
 
-        var template = clearAttrQuotes(domUtils.getOuterHTML(body))
-            .replace(renderAnnotations, function (x, name) {
-                return props[name];
-            });
+        var template = clearAttrQuotes(domUtils.getOuterHTML(body));
+
+        try {
+            template = template
+                .replace(renderAnnotations, function (x, name) {
+                    if (!props.hasOwnProperty(name)) {
+                        throw new Error('Template "' + name + '" not exists');
+                    }
+                    return props[name];
+                })
+            ;
+        }
+        catch (e) {
+            return callback(e);
+        }
 
-        js = insert(js, _return.start, _return.end, format('return (%s);', template));
+        if (_return.length === 0) {
+            return callback(new Error('React.createClass return: option not found'));
+        }
+        else if (_return.length > 2) {
+            return callback(new Error('More then one React.createClass return: option'));
+        }
+        else {
+            js = insert(js, _return.start, _return.end, format('return (%s);', template));
+        }
 
-        callback(js);
+        return callback(err, js);
     });
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-st",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "React separate template",
   "main": "conv.js",
   "dependencies": {

test/conv.js

@@ -9,7 +9,7 @@ function file(path) {
 describe('convert function', function () {
 
     it ('should convert js + html to jsx', function (done) {
-        conv(file('menu.js'), file('menu.html'), function (jsx) {
+        conv(file('menu.js'), file('menu.html'), function (err, jsx) {
             expect(jsx).to.equal(file('menu.jsx'));
             done();
         });