Support for observable models, fixes #259

lib/src/info.dart

 // Copyright (c) 2012, 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.
 
 /**
  * Datatypes holding information extracted by the analyzer and used by later
  * phases of the compiler.
  */
 library info;
 
 import 'dart:collection' show SplayTreeMap, LinkedHashMap;
 import 'dart:uri';
 
 import 'package:html5lib/dom.dart';
+import 'package:analyzer_experimental/src/generated/ast.dart';
 import 'package:csslib/parser.dart' as css;
 import 'package:csslib/visitor.dart';
 
+import 'dart_parser.dart' show DartCodeInfo;
 import 'file_system/path.dart';
 import 'files.dart';
 import 'messages.dart';
 import 'utils.dart';
 
 /** Information about input, base, and output path locations. */
 class PathInfo {
   /**
    * Common prefix to all input paths that are read from the file system. The
    * output generated by the compiler will reflect the directory structure
@@ skipping 77 matching lines @@
    * the form `<link rel="component" href="packages/...">`, so that you can
    * refer to components within the packages symlink.  Regardless of whether an
    * --out option was given to the compiler, we don't want to generate files
    * inside `packages/` for those components.  Instead we will generate such
    * code in a special directory called `_from_packages/`.
    */
   Path _rewritePackages(Path outputPath) {
     if (!outputPath.toString().contains('packages')) return outputPath;
     var segments = outputPath.segments().map(
         (segment) => segment == 'packages' ? '_from_packages' : segment);
-    return new Path(segments.join('/'));
+    var rewrittenPath = segments.join('/');
+    if (outputPath.isAbsolute) {
+      // TODO(jmesserly): this is probably broken on Windows
+      // We need to switch to package:pathos
+      rewrittenPath = '/$rewrittenPath';
+    }
+    return new Path(rewrittenPath);
   }
 
   /**
    * Returns a relative path to import/export the output library represented by
    * [target] from the output library of [src]. In other words, a path to import
    * or export `target.outputFilename` from `src.outputFilename`.
    */
   Path relativePath(LibraryInfo src, LibraryInfo target) {
     var srcDir = src.inputPath.directoryPath;
     var relDir = target.inputPath.directoryPath.relativeTo(srcDir);
@@ skipping 30 matching lines @@
  * Information for any library-like input. We consider each HTML file a library,
  * and each component declaration a library as well. Hence we use this as a base
  * class for both [FileInfo] and [ComponentInfo]. Both HTML files and components
  * can have .dart code provided by the user for top-level user scripts and
  * component-level behavior code. This code can either be inlined in the HTML
  * file or included in a script tag with the "src" attribute.
  */
 abstract class LibraryInfo {
 
   /** Whether there is any code associated with the page/component. */
-  bool get codeAttached => inlinedCode != null || externalFile != null;
+  bool get codeAttached => userCode != null || externalFile != null;

[Siggi Cherem (dart-lang), 2013/02/13 19:28:54]

I can see how this works, but it's a bit confusing because userCode can have
both inline or external code.

I think it's ok as it is, but here is a possibly wasteful suggestion that might
make things clearer. How about we put back inlinedCode, but make it a
DartCodeInfo. Then userCode is simply a getter:

DartCodeInfo get userCode =>
  externalFile != null ? externalFile.userCode : inlinedCode

Thoughts?

[Jennifer Messerly, 2013/02/14 00:38:09]

Good idea! That will simplify things. :)

 
   /**
    * The actual code, either inlined or from an external file, or `null` if none
    * was defined.
    */
   DartCodeInfo userCode;
 
-  /** The inlined code, if any. */
-  String inlinedCode;
-
   /** The name of the file sourced in a script tag, if any. */
   Path externalFile;
 
   /** Info asscociated with [externalFile], if any. */
   FileInfo externalCode;
 
+  /**
+   * The inverse of [externalCode]. If this .dart file was imported via a script
+   * tag, this refers to the HTML file that imported it.
+   */
+  LibraryInfo htmlFile;
+
   /** File where the top-level code was defined. */
   Path get inputPath;
 
   /** Stylesheet with <style>...</style> */
   StringBuffer cssSource = new StringBuffer();
 
   /** Parsed cssSource. */
   StyleSheet styleSheet;
 
   /**
    * Name of the file that will hold any generated Dart code for this library
    * unit.
    */
   String _getOutputFilename(NameMangler mangle);
 
+  /** This is used in transforming Dart code to track modified files. */
+  bool modified = false;
+
+  /**
+   * This is used in transforming Dart code to compute files that reference
+   * [modified] files.
+   */
+  List<FileInfo> referencedBy = [];
+
   /**
    * Components used within this library unit. For [FileInfo] these are
    * components used directly in the page. For [ComponentInfo] these are
    * components used within their shadowed template.
    */
   final Map<ComponentInfo, bool> usedComponents =
       new LinkedHashMap<ComponentInfo, bool>();
 }
 
 /** Information extracted at the file-level. */
@@ skipping 417 matching lines @@
 
 /**
  * Specifies the action to take on a particular event. Some actions need to read
  * attributes from the DOM element that has the event listener (e.g. two way
  * bindings do this). [elementVarName] stores a reference to this element.
  * It is generated outside of the analyzer (in the emitter), so it is passed
  * here as an argument.
  */
 typedef String ActionDefinition(String elemVarName);
 
-/** Information extracted from a source Dart file. */
-class DartCodeInfo {
-  /** Library qualified identifier, if any. */
-  final String libraryName;
-
-  /** Library which the code is part-of, if any. */
-  final String partOf;
-
-  /** Declared imports, exports, and parts. */
-  final List<DartDirectiveInfo> directives;
-
-  /** The rest of the code. */
-  final String code;
-
-  DartCodeInfo(this.libraryName, this.partOf, this.directives, this.code);
-}
-
-/** Information about a single import/export/part directive. */
-class DartDirectiveInfo {
-  /** Directive's label: import, export, or part. */
-  String label;
-
-  /** Referenced uri being imported, exported, or included by a part. */
-  String uri;
-
-  /** Prefix used for imports, if any. */
-  String prefix;
-
-  /** Hidden identifiers. */
-  List<String> hide;
-
-  /** Shown identifiers. */
-  List<String> show;
-
-  DartDirectiveInfo(this.label, this.uri, [this.prefix, this.hide, this.show]);
-}
-
 
 /**
  * Find ElementInfo that associated with a particular DOM node.
  * Used by [ElementInfo.query].
  */
 class _QueryInfo extends InfoVisitor {
   final String _tagName;
 
   _QueryInfo(this._tagName);
 
   visitElementInfo(ElementInfo info) {
     if (info.node.tagName == _tagName) {
       return info;
     }
 
     return super.visitElementInfo(info);
   }
 
   visitChildren(ElementInfo info) {
     for (var child in info.children) {
       var result = visit(child);
       if (result != null) return result;
     }
     return null;
   }
 }