Allow dart2dart to output one file per library.

Allow dart2dart to output one file per library.
This is activated by the (undocumented) command line argument
 --output-type=dart-multi

The files will be called

$out.dart // main file
$out.$lib.dart // from library lib.dart

Where $out is what is specified in the --out= argument and
$lib is a 'uniqueified' version of the library file name (directory
structure is flattened).

A library split in parts will be collected into one file.

This is still untested.

BUG=
R=floitsch@google.com, jgruber@google.com, johnniwinther@google.com

Committed: https://code.google.com/p/dart/source/detail?r=39694

[jgruber1, 2014-08-15 06:20:53]

lgtm

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
File sdk/lib/_internal/compiler/implementation/apiimpl.dart (right):

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/apiimpl.dart:47: dart2dartMultiFile:
!hasOption(options, '--output-type=dart'),
Why the negative logic? If multi-file is not intended to be the default, I think
checking for dart-multi makes more sense.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
File sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart
(right):

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:479: String
mainName = compiler.outputUri.path.split('/').last;
Does this work on windows?

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:491:
for(LibraryElement outputLibrary in userLibraries) {
Can we merge this into the previous for loop?

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:502:
unparser.unparseImportTag('$uri');
unparseImportTag(uri)?

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
File sdk/lib/_internal/compiler/implementation/tree/unparser.dart (right):

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/tree/unparser.dart:644:
unparseImportTag(String uri, {String prefix, List<String> shows: const [],
Types on these and suffix? :)

[Johnni Winther, 2014-08-15 08:07:31]

lgtm

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
File sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart
(right):

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:29: // file.
Paraphrase to something like "If `true`, libraries are generated into separate
files."

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:479: String
mainName = compiler.outputUri.path.split('/').last;
Use [Uri.pathSegments] instead of `path.split('/')`.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:491:
for(LibraryElement outputLibrary in userLibraries) {
On 2014/08/15 06:20:53, jgruber wrote:
> Can we merge this into the previous for loop? 

No. This loop requires [outputUris] to be fully computed.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:499: ?
outputUris[libraryElement] + ".dart"
Use '${outputUri[LibraryElement]}.dart' instead of +

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:532:
..add(unparsers[outputLibrary].result)
Add a TODO to enable direct output, i.e. avoid caching in `.result`.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
File sdk/lib/_internal/compiler/implementation/tree/unparser.dart (right):

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/tree/unparser.dart:646: final suffix =
(isDeferred ? ' deferred' : '') +
Use interpolation instead of the + operator on String.

[floitsch, 2014-08-15 11:59:36]

DBC.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
File sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart
(right):

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:477: names =
names.sublist(0, names.length - 1);
names is only used when the library is not the mainApp.
It looks like a
if (library == compiler.mainApp) {
...
} else {
...
}

would simplify the code.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:479: String
mainName = compiler.outputUri.path.split('/').last;
You should be able to compute the mainName/mmainBaseName outside the loop.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:485: :
"$mainBaseName.${makeUnique(names.join("."), usedLibraryNames)}";
usedLibraryNames does not contain the "mainBaseName".

[sigurdm, 2014-08-15 13:31:42]

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
File sdk/lib/_internal/compiler/implementation/apiimpl.dart (right):

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/apiimpl.dart:47: dart2dartMultiFile:
!hasOption(options, '--output-type=dart'),
On 2014/08/15 06:20:53, jgruber wrote:
> Why the negative logic? If multi-file is not intended to be the default, I
think
> checking for dart-multi makes more sense.
Good point.
Done.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
File sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart
(right):

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:29: // file.
On 2014/08/15 08:07:31, Johnni Winther wrote:
> Paraphrase to something like "If `true`, libraries are generated into separate
> files." 

Done.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:477: names =
names.sublist(0, names.length - 1);
On 2014/08/15 11:59:36, floitsch wrote:
> names is only used when the library is not the mainApp.
> It looks like a
> if (library == compiler.mainApp) {
> ...
> } else {
> ...
> }
> 
> would simplify the code.

Done.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:479: String
mainName = compiler.outputUri.path.split('/').last;
On 2014/08/15 06:20:53, jgruber wrote:
> Does this work on windows?

I think so - Uri's should normalize path segment seperators.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:479: String
mainName = compiler.outputUri.path.split('/').last;
On 2014/08/15 11:59:36, floitsch wrote:
> You should be able to compute the mainName/mmainBaseName outside the loop.

Thanks

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:479: String
mainName = compiler.outputUri.path.split('/').last;
On 2014/08/15 08:07:31, Johnni Winther wrote:
> Use [Uri.pathSegments] instead of `path.split('/')`.

Done.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:485: :
"$mainBaseName.${makeUnique(names.join("."), usedLibraryNames)}";
On 2014/08/15 11:59:36, floitsch wrote:
> usedLibraryNames does not contain the "mainBaseName".

But this is only a suffix.
So we generate
mainBaseName.$a
where $a should make the whole thing unique. It can never clash with
mainBaseName

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:491:
for(LibraryElement outputLibrary in userLibraries) {
On 2014/08/15 06:20:53, jgruber wrote:
> Can we merge this into the previous for loop? 

We want to set up all the ouputUris before using them for emitting the imports.

But I think setting up the unparsers can be moved down

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:491:
for(LibraryElement outputLibrary in userLibraries) {
On 2014/08/15 08:07:31, Johnni Winther wrote:
> On 2014/08/15 06:20:53, jgruber wrote:
> > Can we merge this into the previous for loop? 
> 
> No. This loop requires [outputUris] to be fully computed.

Acknowledged.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:499: ?
outputUris[libraryElement] + ".dart"
On 2014/08/15 08:07:31, Johnni Winther wrote:
> Use '${outputUri[LibraryElement]}.dart' instead of +

Done.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:502:
unparser.unparseImportTag('$uri');
On 2014/08/15 06:20:53, jgruber wrote:
> unparseImportTag(uri)?

Done.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:532:
..add(unparsers[outputLibrary].result)
On 2014/08/15 08:07:31, Johnni Winther wrote:
> Add a TODO to enable direct output, i.e. avoid caching in `.result`.

Done.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
File sdk/lib/_internal/compiler/implementation/tree/unparser.dart (right):

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/tree/unparser.dart:644:
unparseImportTag(String uri, {String prefix, List<String> shows: const [],
On 2014/08/15 06:20:53, jgruber wrote:
> Types on these and suffix? :)

Done.

https://codereview.chromium.org/476583003/diff/1/sdk/lib/_internal/compiler/i...
sdk/lib/_internal/compiler/implementation/tree/unparser.dart:646: final suffix =
(isDeferred ? ' deferred' : '') +
On 2014/08/15 08:07:31, Johnni Winther wrote:
> Use interpolation instead of the + operator on String.

Done.

[floitsch, 2014-08-28 20:10:07]

LGTM.

https://chromiumcodereview.appspot.com/476583003/diff/120001/sdk/lib/_interna...
File sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart
(right):

https://chromiumcodereview.appspot.com/476583003/diff/120001/sdk/lib/_interna...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:494:
for(LibraryElement outputLibrary in userLibraries) {
Add comment explaining that you rewrite the import tags here.

Move into a different function?

https://chromiumcodereview.appspot.com/476583003/diff/120001/sdk/lib/_interna...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:543: //
TODO(sigurdm): Make the unparser output directly into the buffer instead
Write comment before statement.

https://chromiumcodereview.appspot.com/476583003/diff/120001/sdk/lib/_interna...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:548: //
TODO(sigurdm): What to do here? Probably we should get rid of
Agreed.
Until then we usually write the main unit into that string.

https://chromiumcodereview.appspot.com/476583003/diff/120001/sdk/lib/_interna...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:559:
logResultBundleSizeInfo(topLevelElements);
Can we do something similar?

https://chromiumcodereview.appspot.com/476583003/diff/120001/sdk/lib/_interna...
File sdk/lib/_internal/compiler/implementation/util/util.dart (right):

https://chromiumcodereview.appspot.com/476583003/diff/120001/sdk/lib/_interna...
sdk/lib/_internal/compiler/implementation/util/util.dart:171: // Adds the result
to usedNames.
New line before.

[sigurdm, 2014-08-29 10:45:16]

Committed patchset #4 (id:140001) manually as 39694 (presubmit successful).

[sigurdm, 2014-09-03 08:24:16]

Forgot to send all my "done"s

https://codereview.chromium.org/476583003/diff/120001/sdk/lib/_internal/compi...
File sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart
(right):

https://codereview.chromium.org/476583003/diff/120001/sdk/lib/_internal/compi...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:494:
for(LibraryElement outputLibrary in userLibraries) {
On 2014/08/28 20:10:07, floitsch wrote:
> Add comment explaining that you rewrite the import tags here.
Done.
> 
> Move into a different function?
Added a TODO

https://codereview.chromium.org/476583003/diff/120001/sdk/lib/_internal/compi...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:543: //
TODO(sigurdm): Make the unparser output directly into the buffer instead
On 2014/08/28 20:10:06, floitsch wrote:
> Write comment before statement.

Done.

https://codereview.chromium.org/476583003/diff/120001/sdk/lib/_internal/compi...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:548: //
TODO(sigurdm): What to do here? Probably we should get rid of
On 2014/08/28 20:10:06, floitsch wrote:
> Agreed.
> Until then we usually write the main unit into that string.

Done.

https://codereview.chromium.org/476583003/diff/120001/sdk/lib/_internal/compi...
sdk/lib/_internal/compiler/implementation/dart_backend/backend.dart:559:
logResultBundleSizeInfo(topLevelElements);
On 2014/08/28 20:10:07, floitsch wrote:
> Can we do something similar?

Done.

https://codereview.chromium.org/476583003/diff/120001/sdk/lib/_internal/compi...
File sdk/lib/_internal/compiler/implementation/util/util.dart (right):

https://codereview.chromium.org/476583003/diff/120001/sdk/lib/_internal/compi...
sdk/lib/_internal/compiler/implementation/util/util.dart:171: // Adds the result
to usedNames.
On 2014/08/28 20:10:07, floitsch wrote:
> New line before.

Done.