Calculator App for ChromeOS with fixes for templates/CSS to support this application.

utils/template/codegen.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 class CGBlock {
   int _blockType;             // Code type of this block
   int _indent;                // Number of spaces to prefix for each statement
   bool _inEach;               // This block or any currently active blocks is a
                               // #each.  If so then any element marked with a
                               // var attribute is repeated therefore the var
@@ skipping 33 matching lines @@
     CGStatement stmt = new CGStatement(elem, _indent, parentName, varName,
         exact, _inEach);
     _stmts.add(stmt);
 
     return stmt;
   }
 
   void pop() {
     _stmts.removeLast();
   }
 

[Jacob, 2012/04/05 18:06:01]

unreleated to this change but perhaps emit final instead of var. Looking at the
generated code a lot of the vars could by final

   void add(String value) {
     if (_stmts.last() != null) {
       _stmts.last().add(value);
     }
   }
 
-  CGStatement get last() => _stmts.last();
+  CGStatement get last() => _stmts.length > 0 ? _stmts.last() : null;
 
   /**
    * Returns mixed list of elements marked with the var attribute.  If the 
    * element is inside of a #each the name exposed is:
    *
    *      List varName;
    *
    * otherwise it's:
    *
    *      var varName;
@@ skipping 89 matching lines @@
     return "";
   }
 
   void add(String value) {
     _buff.add(value);
   }
 
   bool get isClosed() => _closed;
 
   void close() {
-    if (_elem is TemplateElement) {
+    if (_elem is TemplateElement && _elem.scoped) {
       add("</${_elem.tagName}>");
     }
     _closed = true;
   }
 
   String emitDartStatement() {
     StringBuffer statement = new StringBuffer();
 
     String spaces = Codegen.spaces(_indent);
 
@@ skipping 83 matching lines @@
     List<String> fileParts = filename.split('.');
     assert(fileParts.length == 2);
     filename = fileParts[0];
 
     StringBuffer buff = new StringBuffer();
     int injectId = 0;         // Inject function id
 
     buff.add("// Generated Dart class from HTML template.\n");
     buff.add("// DO NOT EDIT.\n\n");
 
-    buff.add("String safeHTML(String html) {\n");
-    buff.add("  // TODO(terry): Escaping for XSS vulnerabilities TBD.\n");
-    buff.add("  return html;\n");
-    buff.add("}\n\n");
-
     String addStylesheetFuncName = "add_${filename}_templatesStyles";
     
     for (final template in templates) {
       // Emit the template class.
       TemplateSignature sig = template.signature;
       buff.add(_emitClass(sig.name, sig.params, template.content,
         addStylesheetFuncName));
     }
 
     // TODO(terry): Stylesheet aggregator should not be global needs to be
@@ skipping 89 matching lines @@
       anyParams = true;
     }
     if (anyParams) buff.add("\n");
 
     ElemCG ecg = new ElemCG();
 
     if (!ecg.pushBlock()) {
       world.error("Error at ${content}");
     }
 
-    var root = content.html.children[0];
+    var root = content.html.children.length > 0 ? content.html.children[0] :
+        content.html;
     bool firstTime = true;
     for (var child in root.children) {
       if (child is TemplateText) {
         if (!firstTime) {
           ecg.closeStatement();
         }
-        CGStatement stmt = ecg.pushStatement(child, "_fragment");
+
+        String textNodeValue = child.value.trim();
+        if (textNodeValue.length > 0) {
+          CGStatement stmt = ecg.pushStatement(child, "_fragment");
+        }
       }
       ecg.emitConstructHtml(child, "", "_fragment");
       firstTime = false;
     }
 
     // Create all element names marked with var.
     String decls = ecg.globalDeclarations;
     if (decls.length > 0) {
       buff.add("\n  // Elements bound to a variable:\n");
       buff.add("${decls}\n");
@@ skipping 19 matching lines @@
 
     buff.add("    // Insure stylesheet for template exist in the document.\n");
     buff.add("    ${addStylesheetFuncName}();\n\n");
 
     buff.add("    _fragment = new DocumentFragment();\n");
 
     buff.add(ecg.codeBody);     // HTML for constructor to build.
 
     buff.add("  }\n\n");        // End constructor
 
+    buff.add(emitGetters(content.getters));
+
     buff.add("  Element get root() => _fragment;\n");
 
     // Emit all CSS class selectors:
     buff.add(_emitCSSSelectors(content.css));
 
     // Emit the injection functions.
     buff.add("\n  // Injection functions:");
     for (final expr in ecg.expressions) {
       buff.add("${expr}");
     }
@@ skipping 14 matching lines @@
     if (content.css != null) {
       buff.add("\'\'\'\n    ${content.css.toString()}\n");
       buff.add("  \'\'\';\n\n");
 
       // TODO(terry): Emit all known selectors for this template.
       buff.add("  // Stylesheet class selectors:\n");
     } else {
       buff.add("\"\";\n");
     }
 
+    buff.add("  String safeHTML(String html) {\n");

[Jacob, 2012/04/05 18:06:01]

use multiline strings to make this cleaner

+    buff.add("    // TODO(terry): Escaping for XSS vulnerabilities TBD.\n");
+    buff.add("    return html;\n");
+    buff.add("  }\n");
+
     buff.add("}\n");              // End class
 
     return buff.toString();
   }
+
+  // TODO(terry): Need to generate function to inject any TemplateExpressions
+  //              to call SafeHTML wrapper.
+  static String emitGetters(List<TemplateGetter> getters) {
+    StringBuffer buff = new StringBuffer();
+    for (final TemplateGetter getter in getters) {
+      buff.add('  String ${getter.getterSignatureAsString()} {\n');
+      buff.add('    return \'\'\'');
+      var docFrag = getter.docFrag.children[0];
+      for (final child in docFrag.children) {
+        buff.add(child.toString().trim());
+      }
+      buff.add('\'\'\';\n');
+      buff.add('  }\n\n');
+    }
+
+    return buff.toString();
+  }
 }
 
 class ElemCG {
   // List of identifiers and quoted strings (single and double quoted).
   var identRe = const RegExp(
     "\s*('\"\\'\\\"[^'\"\\'\\\"]+'\"\\'\\\"|[_A-Za-z][_A-Za-z0-9]*)");
 
   List<CGBlock> _cgBlocks;
   StringBuffer _globalDecls;        // Global var declarations for all blocks.
   StringBuffer _globalInits;        // Global List var initializtion for all
@@ skipping 109 matching lines @@
   }
 
   CGStatement pushStatement(var elem, var parentName) {
     return lastBlock.push(elem, parentName, false);
   }
 
   CGStatement pushExactStatement(var elem, var parentName) {
     return lastBlock.push(elem, parentName, true);
   }
 
-  bool get isClosedStatement() => lastBlock.last.isClosed;
+  bool get isClosedStatement() {
+    return (lastBlock != null && lastBlock.last != null) ?
+        lastBlock.last.isClosed : false;
+  }
 
   void closeStatement() {
     if (lastBlock != null && lastBlock.last != null &&
         !lastBlock.last.isClosed) {
       lastBlock.last.close();
     }
   }
 
   String get lastVariableName() {
     if (lastBlock != null && lastBlock.last != null) {
       return lastBlock.last.variableName;
     }
   }
 
+  String get lastParentName() {
+    if (lastBlock != null && lastBlock.last != null) {
+      return lastBlock.last.parentName;
+    }
+  }
+
   CGBlock get lastBlock() => _cgBlocks.length > 0 ? _cgBlocks.last() : null;
 
   void add(String str) {
     _cgBlocks.last().add(str);
   }
 
   String get globalDeclarations() {
     assert(_cgBlocks.length == 1);    // Only constructor body should be left.
     _globalDecls.add(lastBlock.globalDeclarations);
     return _globalDecls.toString();
@@ skipping 19 matching lines @@
               [String scopeName = "",
                var parentVarOrIdx = 0,
                bool immediateNestedEach = false]) {
     if (elem is TemplateElement) {
       if (!elem.isFragment) {
         add("<${elem.tagName}${elem.attributesToString()}>");
       }
       String prevParent = lastVariableName;
       for (var childElem in elem.children) {
         if (childElem is TemplateElement) {
+          closeStatement();
           if (childElem.hasVar) {
-            closeStatement();
             emitConstructHtml(childElem, scopeName, prevParent,
               childElem.varName);
-            closeStatement();
           } else {
-            closeStatement();
             emitConstructHtml(childElem, scopeName, prevParent);
-            closeStatement();
           }
+          closeStatement();
         } else {
           emitElement(childElem, scopeName, parentVarOrIdx);
         }
       }
 
       // Close this tag.
       closeStatement();
     } else if (elem is TemplateText) {
-      add("${elem.value}");
+      String outputValue = elem.value.trim();
+      if (outputValue.length > 0) {
+        bool emitTextNode = false;
+        if (isClosedStatement) {
+          String prevParent = lastParentName;
+          CGStatement stmt = pushStatement(elem, prevParent);
+          emitTextNode = true;
+        }
+
+        // TODO(terry): Need to interpolate following:
+        //      {sp}  → space
+        //      {nil} → empty string
+        //      {\r}  → carriage return
+        //      {\n}  → new line (line feed)
+        //      {\t}  → tab
+        //      {lb}  → left brace
+        //      {rb}  → right brace
+      
+        add("${outputValue}");            // remove leading/trailing whitespace.
+
+        if (emitTextNode) {
+          closeStatement();
+        }
+      }
     } else if (elem is TemplateExpression) {
       emitExpressions(elem, scopeName);
     } else if (elem is TemplateEachCommand) {
       // Signal to caller new block coming in, returns "each_" prefix
       emitEach(elem, "List", elem.listName.name, "parent", immediateNestedEach,
           elem.hasLoopItem ? elem.loopItem.name : null);
     } else if (elem is TemplateWithCommand) {
       // Signal to caller new block coming in, returns "each_" prefix
       emitWith(elem, "var", elem.objectName.name, "parent",
           elem.hasBlockItem ? elem.blockItem.name : null);
@@ skipping 251 matching lines @@
       for (String name in names) {
         buff.add("    var ${name} = _scopes[\"${name}\"];\n");
       }
       buff.add("\n");
     }
 
     return buff.toString();
   }
 
 }