X Tutup
Skip to content

feat(dart/transform): Avoid print in transformer code. #7855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kegluneq wants to merge 1 commit into from
Closed

feat(dart/transform): Avoid print in transformer code. #7855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions modules_dart/transform/lib/src/transform/common/async_string_writer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
library angular2.transform.common.async_string_writer;

import 'dart:async';

import 'package:analyzer/src/generated/java_core.dart';

/// [PrintWriter] implementation that allows asynchronous printing via
Expand All @@ -18,6 +19,7 @@ class AsyncStringWriter extends PrintWriter {

AsyncStringWriter([Object content = ""]) : this._(new StringBuffer(content));

@override
void print(x) {
_curr.write(x);
}
Expand Down Expand Up @@ -54,6 +56,7 @@ class AsyncStringWriter extends PrintWriter {
}).whenComplete(_semaphoreDecrementAndCleanup);
}

@override
String toString() => _bufs.map((buf) => '$buf').join('(async gap)');

void _semaphoreIncrement() {
Expand Down
23 changes: 18 additions & 5 deletions modules_dart/transform/lib/src/transform/common/logging.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
library angular2.src.transform.common.logging;

import 'dart:async';
import 'dart:io' show stderr;

import 'package:barback/barback.dart';
import 'package:source_span/source_span.dart';
Expand Down Expand Up @@ -49,12 +50,16 @@ void _logElapsed(Stopwatch timer, String operationName, AssetId assetId) {
log.fine(buf.toString(), asset: assetId);
}

/// Prints logged messages to the console.
/// Writes logged messages to the provided [StringSink].
///
/// A simple implementation of [TransformLogger] that prints messages to the
/// console and discards `asset` and `span` information.
class PrintLogger implements TransformLogger {
void _printWithPrefix(prefix, msg) => print('$prefix: $msg');
/// A simple implementation of [TransformLogger] that writes messages to a
/// [StringSink] and discards `asset` and `span` information.
class SinkLogger implements TransformLogger {
final StringSink _sink;

SinkLogger(this._sink);

void _printWithPrefix(prefix, msg) => _sink.writeln('$prefix: $msg');

@override
void info(msg, {AssetId asset, SourceSpan span}) =>
Expand All @@ -74,6 +79,14 @@ class PrintLogger implements TransformLogger {
}
}

/// Prints logged messages to stderr.
///
/// A simple implementation of [TransformLogger] that prints messages to
/// [stderr] and discards `asset` and `span` information.
class PrintLogger extends SinkLogger {
PrintLogger() : super(stderr);
}

class PrintLoggerError extends Error {
final String message;
final AssetId asset;
Expand Down
12 changes: 8 additions & 4 deletions modules_dart/transform/lib/src/transform/common/options_reader.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
library angular2.transform.common.options_reader;

import 'dart:io';

import 'package:barback/barback.dart';

import 'annotation_matcher.dart';
import 'mirror_mode.dart';
import 'options.dart';
import './url_resolver.dart';

TransformerOptions parseBarbackSettings(BarbackSettings settings) {
TransformerOptions parseBarbackSettings(BarbackSettings settings) {
var config = settings.configuration;
var entryPoints = _readStringList(config, ENTRY_POINT_PARAM);
var initReflector =
Expand Down Expand Up @@ -79,7 +82,8 @@ List<String> _readStringList(Map config, String paramName) {
error = true;
}
if (error) {
print('Invalid value for "$paramName" in the Angular 2 transformer.');
stderr.writeln(
'Invalid value for "$paramName" in the Angular 2 transformer.');
}
return result;
}
Expand Down Expand Up @@ -111,7 +115,7 @@ List<ClassDescriptor> _readCustomAnnotations(Map config) {
}
}
if (error) {
print(CUSTOM_ANNOTATIONS_ERROR);
stderr.writeln(CUSTOM_ANNOTATIONS_ERROR);
}
return descriptors;
}
Expand All @@ -121,7 +125,7 @@ const CUSTOM_ANNOTATIONS_ERROR = '''
Expected something that looks like the following:

transformers:
- angular2:
- angular2[/transform/codegen]:
custom_annotations:
- name: MyAnnotation
import: 'package:my_package/my_annotation.dart'
Expand Down
X Tutup