Skip to content

Commit 235d898

Browse files
committed
feat: fix types
we are no longer a codec :( fixes #18 fixes #15
1 parent 42000ba commit 235d898

7 files changed

Lines changed: 58 additions & 19 deletions
File renamed without changes.

‎lib/csv.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'dart:convert';
44
import 'dart:async';
55

66
import 'src/csv_parser.dart';
7+
import 'src/complex_converter.dart';
78
import 'csv_settings_autodetection.dart';
89

910
part 'csv_to_list_converter.dart';
@@ -20,10 +21,8 @@ const String defaultEol = '\r\n';
2021

2122
const bool defaultDelimitAllFields = false;
2223

23-
/// A codec which converts a csv string ↔ List of rows.
24-
///
2524
/// See [CsvToListConverter] and [ListToCsvConverter].
26-
class CsvCodec extends Codec<List<List>, String> {
25+
class CsvCodec {
2726
final CsvToListConverter decoder;
2827

2928
final ListToCsvConverter encoder;

‎lib/csv_to_list_converter.dart‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ part of csv;
55
/// This converter follows the rules of [rfc4180](http://tools.ietf.org/html/rfc4180).
66
///
77
/// See the [CsvParser] for more information.
8-
class CsvToListConverter extends Converter<String, List<List>>
9-
implements StreamTransformer<String, List<List>> {
8+
class CsvToListConverter extends StreamTransformerBase<String, List>
9+
implements ComplexChunkedConverter<String, List<List>> {
1010
/// The separator between fields.
1111
final String fieldDelimiter;
1212

@@ -100,7 +100,6 @@ class CsvToListConverter extends Converter<String, List<List>>
100100
}
101101

102102
/// Parses the [csv] and returns a List (rows) of Lists (columns).
103-
@override
104103
List<List> convert(String csv,
105104
{String fieldDelimiter,
106105
String textDelimiter,
@@ -130,6 +129,11 @@ class CsvToListConverter extends Converter<String, List<List>>
130129

131130
return parser.convert(csv);
132131
}
132+
133+
Stream<List> bind(Stream<String> stream) {
134+
return new Stream<List>.eventTransformed(stream,
135+
(EventSink sink) => new ComplexConverterStreamEventSink(this, sink));
136+
}
133137
}
134138

135139
CsvParser _buildNewParserWithSettings(

‎lib/list_to_csv_converter.dart‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ part of csv;
7171
/// double quote. For example:
7272
///
7373
/// "aaa","b""bb","ccc"
74-
class ListToCsvConverter extends Converter<List<List>, String>
75-
implements StreamTransformer<List<List>, String> {
74+
class ListToCsvConverter extends StreamTransformerBase<List, String>
75+
implements ComplexChunkedConverter<List<List>, String> {
7676
/// The separator between fields in the outputString.
7777
final String fieldDelimiter;
7878

@@ -123,7 +123,6 @@ class ListToCsvConverter extends Converter<List<List>, String>
123123
/// All other rfc rules are followed.
124124
///
125125
/// If [rows] is null an empty String is returned.
126-
@override
127126
String convert(List<List> rows,
128127
{String fieldDelimiter,
129128
String textDelimiter,
@@ -259,6 +258,11 @@ class ListToCsvConverter extends Converter<List<List>, String>
259258
}
260259
return false;
261260
}
261+
262+
Stream<String> bind(Stream<List> stream) {
263+
return new Stream<String>.eventTransformed(stream,
264+
(EventSink sink) => new ComplexConverterStreamEventSink(this, sink));
265+
}
262266
}
263267

264268
/// The input sink for a chunked list to csv conversion.

‎lib/src/complex_converter.dart‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
import 'dart:async';
2+
3+
abstract class ComplexChunkedConverter<S, T> {
4+
Sink<S> startChunkedConversion(Sink<T> sink);
5+
}
6+
7+
/**
8+
* This class implements the logic for a chunked conversion as a
9+
* stream transformer.
10+
*
11+
* It is a copy of the [ConverterStreamEventSink].
12+
*/
13+
class ComplexConverterStreamEventSink<S, T> implements EventSink<S> {
14+
/** The output sink for the converter. */
15+
final EventSink<T> _eventSink;
16+
17+
/**
18+
* The input sink for new data. All data that is received with
19+
* [handleData] is added into this sink.
20+
*/
21+
final Sink<S> _chunkedSink;
22+
23+
ComplexConverterStreamEventSink(
24+
ComplexChunkedConverter<S, T> converter, EventSink<T> sink)
25+
: this._eventSink = sink,
26+
_chunkedSink = converter.startChunkedConversion(sink);
27+
28+
void add(S o) {
29+
_chunkedSink.add(o);
30+
}
31+
32+
void addError(Object error, [StackTrace stackTrace]) {
33+
_eventSink.addError(error, stackTrace);
34+
}
35+
36+
void close() {
37+
_chunkedSink.close();
38+
}
39+
}

‎lib/src/csv_parser.dart‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -510,14 +510,7 @@ class CsvParser {
510510
if (!shouldParseNumbers || quoted)
511511
row.add(value);
512512
else {
513-
int addValueAsString(String s) {
514-
row.add(value);
515-
return null;
516-
}
517-
;
518-
num n;
519-
n = num.parse(value, addValueAsString);
520-
if (n != null) row.add(n);
513+
row.add(num.tryParse(value) ?? value);
521514
}
522515
}
523516

‎pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: csv
2-
version: 3.1.2
2+
version: 3.2.0
33
author: Christian Loitsch <[email protected]>
44
description: |-
55
A codec to transform between a string and a list of values.
@@ -9,7 +9,7 @@ homepage: https://github.com/close2/csv
99
documentation: https://github.com/close2/csv
1010

1111
environment:
12-
sdk: '>=1.11.0 <2.0.0'
12+
sdk: '>=1.11.0 <2.1.0'
1313

1414
dev_dependencies:
1515
test: '>=0.12.8 <0.13.0'

0 commit comments

Comments
 (0)