Remove processing of dart code, summary.dart, simplified info.dart

pkg/polymer/lib/src/analyzer.dart

 // Copyright (c) 2013, 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.
 
 /**
  * Part of the template compilation that concerns with extracting information
  * from the HTML parse tree.
  */
 library analyzer;
 
 import 'package:html5lib/dom.dart';
 import 'package:html5lib/dom_parsing.dart';
-import 'package:source_maps/span.dart' hide SourceFile;
 
 import 'custom_tag_name.dart';
-import 'dart_parser.dart' show parseDartCode;
 import 'files.dart';
 import 'info.dart';
 import 'messages.dart';
-import 'summary.dart';
 
 /**
  * Finds custom elements in this file and the list of referenced files with
  * component declarations. This is the first pass of analysis on a file.
  *
  * Adds emitted error/warning messages to [messages], if [messages] is
  * supplied.
  */
 FileInfo analyzeDefinitions(GlobalInfo global, UrlInfo inputUrl,
-    Document document, Messages messages, {bool isEntryPoint: false}) {
-  var result = new FileInfo(inputUrl, isEntryPoint);
+    Document document, Messages messages) {

[terry, 2013/08/28 21:41:52]

I we plan of only running in pub deploy should Messages change to the Transform
logger?

[Jennifer Messerly, 2013/08/28 22:10:25]

+1 ... please kill Messages :)

[Siggi Cherem (dart-lang), 2013/08/29 00:34:15]

I'll keep it in mind, but I wont do it just yet. What happens is that the
analyzer code is separate from the deploy code. So far I was not planning on
using barback to run the analzyer, but we could switch to that in the future.
Meanwhile, we need to keep messages. I'll make it simpler though =).

+  var result = new FileInfo(inputUrl);
   var loader = new _ElementLoader(global, result, messages);
   loader.visit(document);
   return result;
 }
 
 /**
  *  Extract relevant information from all files found from the root document.
  *
  *  Adds emitted error/warning messages to [messages], if [messages] is
  *  supplied.
@@ skipping 89 matching lines @@
             node.sourceSpan);
       }
       _keepIndentationSpaces = value != 'remove';
     }
 
     // Invoke super to visit children.
     super.visitElement(node);
 
     _keepIndentationSpaces = keepSpaces;
     _currentInfo = lastInfo;
-
-    if (node.tagName == 'body' || node.parent == null) {
-      _fileInfo.body = node;
-    }
   }
 
   void _analyzeComponent(ComponentInfo component) {
     var baseTag = component.extendsTag;
     component.extendsComponent = baseTag == null ? null
         : _fileInfo.components[baseTag];
     if (component.extendsComponent == null && isCustomTag(baseTag)) {
       _messages.warning(
           'custom element with tag name ${component.extendsTag} not found.',
           component.element.sourceSpan);
     }
-
-    // Now that the component's code has been loaded, we can validate that the
-    // class exists.
-    component.findClassDeclaration(_messages);
   }
 
   void _bindCustomElement(Element node) {
     // <fancy-button>
     var component = _fileInfo.components[node.tagName];
     if (component == null) {
       // TODO(jmesserly): warn for unknown element tags?
 
       // <button is="fancy-button">
       var componentName = node.attributes['is'];
       if (componentName != null) {
         component = _fileInfo.components[componentName];
       } else if (isCustomTag(node.tagName)) {
         componentName = node.tagName;
       }
       if (component == null && componentName != null &&
           componentName != 'polymer-element') {
         _messages.warning(
             'custom element with tag name $componentName not found.',
             node.sourceSpan);
       }
     }
 
     if (component != null) {
-      if (!component.hasConflict) {
-        _currentInfo.usedComponents[component] = true;
-      }
-
       var baseTag = component.baseExtendsTag;
       var nodeTag = node.tagName;
       var hasIsAttribute = node.attributes.containsKey('is');
 
       if (baseTag != null && !hasIsAttribute) {
         _messages.warning(
             'custom element "${component.tagName}" extends from "$baseTag", but'
             ' this tag will not include the default properties of "$baseTag". '
             'To fix this, either write this tag as <$baseTag '
             'is="${component.tagName}"> or remove the "extends" attribute from '
@@ skipping 65 matching lines @@
 
   /**
    * Normalizes references in [info]. On the [analyzeDefinitions] phase, the
    * analyzer extracted names of files and components. Here we link those names
    * to actual info classes. In particular:
    *   * we initialize the [FileInfo.components] map in [info] by importing all
    *     [declaredComponents],
    *   * we scan all [info.componentLinks] and import their
    *     [info.declaredComponents], using [files] to map the href to the file
    *     info. Names in [info] will shadow names from imported files.
-   *   * we fill [LibraryInfo.externalCode] on each component declared in
-   *     [info].
    */
   void _normalize(FileInfo info, Map<String, FileInfo> files) {
-    _attachExtenalScript(info, files);
-
     for (var component in info.declaredComponents) {
       _addComponent(info, component);
-      _attachExtenalScript(component, files);
     }
 
     for (var link in info.componentLinks) {
       var file = files[link.resolvedPath];
       // We already issued an error for missing files.
       if (file == null) continue;
       file.declaredComponents.forEach((c) => _addComponent(info, c));
     }
   }
 
-  /**
-   * Stores a direct reference in [info] to a dart source file that was loaded
-   * in a script tag with the 'src' attribute.
-   */
-  void _attachExtenalScript(LibraryInfo info, Map<String, FileInfo> files) {
-    var externalFile = info.externalFile;
-    if (externalFile != null) {
-      info.externalCode = files[externalFile.resolvedPath];
-      if (info.externalCode != null) info.externalCode.htmlFile = info;
-    }
-  }
-
   /** Adds a component's tag name to the names in scope for [fileInfo]. */
-  void _addComponent(FileInfo fileInfo, ComponentSummary component) {
+  void _addComponent(FileInfo fileInfo, ComponentInfo component) {
     var existing = fileInfo.components[component.tagName];
     if (existing != null) {
       if (existing == component) {
         // This is the same exact component as the existing one.
         return;
       }
 
       if (existing is ComponentInfo && component is! ComponentInfo) {
         // Components declared in [fileInfo] shadow component names declared in
         // imported files.
@@ skipping 113 matching lines @@
     var tagName = node.attributes['name'];
     var extendsTag = node.attributes['extends'];
 
     if (tagName == null) {
       _messages.error('Missing tag name of the component. Please include an '
           'attribute like \'name="your-tag-name"\'.',
           node.sourceSpan);
       return;
     }
 
-    var component = new ComponentInfo(node, _fileInfo, tagName, extendsTag);
+    var component = new ComponentInfo(node, tagName, extendsTag);
     _fileInfo.declaredComponents.add(component);
     _addComponent(component);
 
     var lastInfo = _currentInfo;
     _currentInfo = component;
     super.visitElement(node);
     _currentInfo = lastInfo;
   }
 
   /** Adds a component's tag name to the global list. */
@@ skipping 36 matching lines @@
             node.sourceSpan);
       }
       if (src != null && src.endsWith('.dart')) {
         _messages.warning('script tag with .dart source file but no type will '
             'be treated as JavaScript. Did you forget type="application/dart"?',
             node.sourceSpan);
       }
       return;
     }
 
-    if (scriptType != 'application/dart') {
-      if (_currentInfo is ComponentInfo) {
-        // TODO(jmesserly): this warning should not be here, but our compiler
-        // does the wrong thing and it could cause surprising behavior, so let
-        // the user know! See issue #340 for more info.
-        // What we should be doing: leave JS component untouched by compiler.
-        _messages.warning('our custom element implementation does not support '
-            'JavaScript components yet. If this is affecting you please let us '
-            'know at https://github.com/dart-lang/web-ui/issues/340.',
-            node.sourceSpan);
-      }
-
-      return;
-    }
+    if (scriptType != 'application/dart') return;
 
     if (src != null) {
       if (!src.endsWith('.dart')) {
         _messages.warning('"application/dart" scripts should '
             'use the .dart file extension.',
             node.sourceSpan);
       }
 
       if (node.innerHtml.trim() != '') {
         _messages.error('script tag has "src" attribute and also has script '
             'text.', node.sourceSpan);
       }
-
-      if (_currentInfo.codeAttached) {
-        _tooManyScriptsError(node);
-      } else {
-        _currentInfo.externalFile = UrlInfo.resolve(src, _fileInfo.inputUrl,
-            node.sourceSpan, _messages);
-      }
-      return;
-    }
-
-    if (node.nodes.length == 0) return;
-
-    // I don't think the html5 parser will emit a tree with more than
-    // one child of <script>
-    assert(node.nodes.length == 1);
-    Text text = node.nodes[0];
-
-    if (_currentInfo.codeAttached) {
-      _tooManyScriptsError(node);
-    } else if (_currentInfo == _fileInfo && !_fileInfo.isEntryPoint) {
-      _messages.warning('top-level dart code is ignored on '
-          ' HTML pages that define components, but are not the entry HTML '
-          'file.', node.sourceSpan);
-    } else {
-      _currentInfo.inlinedCode = parseDartCode(
-          _currentInfo.dartCodeUrl.resolvedPath, text.value,
-          text.sourceSpan.start);
-      if (_currentInfo.userCode.partOf != null) {
-        _messages.error('expected a library, not a part.',
-            node.sourceSpan);
-      }
     }
   }
-
-  void _tooManyScriptsError(Node node) {
-    var location = _currentInfo is ComponentInfo ?
-        'a custom element declaration' : 'the top-level HTML page';
-
-    _messages.error('there should be only one dart script tag in $location.',
-        node.sourceSpan);
-  }
 }