Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 /** Common methods used by transfomers. */ | 5 /** Common methods used by transfomers. */ |
| 6 library polymer.src.build.common; | 6 library polymer.src.build.common; |
| 7 | 7 |
| 8 import 'dart:async'; | 8 import 'dart:async'; |
| 9 import 'dart:math' show min, max; | 9 import 'dart:math' show min, max; |
| 10 | 10 |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 105 var primaryId = transform.primaryInput.id; | 105 var primaryId = transform.primaryInput.id; |
| 106 bool samePackage = id.package == primaryId.package; | 106 bool samePackage = id.package == primaryId.package; |
| 107 var url = samePackage ? id.path | 107 var url = samePackage ? id.path |
| 108 : assetUrlFor(id, primaryId, transform.logger, allowAssetUrl: true); | 108 : assetUrlFor(id, primaryId, transform.logger, allowAssetUrl: true); |
| 109 return transform.readInputAsString(id).then((content) { | 109 return transform.readInputAsString(id).then((content) { |
| 110 return _parseHtml(content, url, transform.logger, | 110 return _parseHtml(content, url, transform.logger, |
| 111 checkDocType: samePackage && options.isHtmlEntryPoint(id)); | 111 checkDocType: samePackage && options.isHtmlEntryPoint(id)); |
| 112 }); | 112 }); |
| 113 } | 113 } |
| 114 | 114 |
| 115 Future<String> readAsString(AssetId id, Transform transform) { | |
|
Siggi Cherem (dart-lang)
2014/02/13 00:08:18
is this method needed? seems that the first few va
Jennifer Messerly
2014/02/13 06:11:22
good catch. Out of curiosity, what is the `var ur
Siggi Cherem (dart-lang)
2014/02/13 17:46:33
It's basically for better error messages.
Jennifer Messerly
2014/02/13 20:43:45
Lovely explanation! Thank you :)
| |
| 116 var primaryId = transform.primaryInput.id; | |
| 117 bool samePackage = id.package == primaryId.package; | |
| 118 var url = samePackage ? id.path | |
| 119 : assetUrlFor(id, primaryId, transform.logger, allowAssetUrl: true); | |
| 120 return transform.readInputAsString(id); | |
| 121 } | |
| 122 | |
| 115 Future<bool> assetExists(AssetId id, Transform transform) => | 123 Future<bool> assetExists(AssetId id, Transform transform) => |
| 116 transform.getInput(id).then((_) => true).catchError((_) => false); | 124 transform.getInput(id).then((_) => true).catchError((_) => false); |
| 117 | 125 |
| 118 String toString() => 'polymer ($runtimeType)'; | 126 String toString() => 'polymer ($runtimeType)'; |
| 119 } | 127 } |
| 120 | 128 |
| 121 /** Transformer phases which should be applied to the Polymer package. */ | 129 /** Transformer phases which should be applied to the Polymer package. */ |
| 122 List<List<Transformer>> get phasesForPolymer => | 130 List<List<Transformer>> get phasesForPolymer => |
| 123 [[new ObservableTransformer(['lib/src/instance.dart'])]]; | 131 [[new ObservableTransformer(['lib/src/instance.dart'])]]; |
| 124 | 132 |
| 125 /** | 133 /** |
| 126 * Create an [AssetId] for a [url] seen in the [source] asset. By default this | 134 * Create an [AssetId] for a [url] seen in the [source] asset. By default this |
| 127 * is used to resolve relative urls that occur in HTML assets, including | 135 * is used to resolve relative urls that occur in HTML assets, including |
| 128 * cross-package urls of the form "packages/foo/bar.html". Dart-style "package:" | 136 * cross-package urls of the form "packages/foo/bar.html". Dart-style "package:" |
| 129 * urls are not resolved unless [source] is Dart file (has a .dart extension). | 137 * urls are not resolved unless [source] is Dart file (has a .dart extension). |
| 130 */ | 138 */ |
| 131 // TODO(sigmund): delete once this is part of barback (dartbug.com/12610) | 139 // TODO(sigmund): delete once this is part of barback (dartbug.com/12610) |
| 132 AssetId resolve(AssetId source, String url, TransformLogger logger, Span span) { | 140 AssetId resolve(AssetId source, String url, TransformLogger logger, Span span, |
| 141 {bool allowAbsolute: false}) { | |
| 133 if (url == null || url == '') return null; | 142 if (url == null || url == '') return null; |
| 134 var uri = Uri.parse(url); | 143 var uri = Uri.parse(url); |
| 135 var urlBuilder = path.url; | 144 var urlBuilder = path.url; |
| 136 if (uri.host != '' || uri.scheme != '' || urlBuilder.isAbsolute(url)) { | 145 if (uri.host != '' || uri.scheme != '' || urlBuilder.isAbsolute(url)) { |
| 137 if (source.extension == '.dart' && uri.scheme == 'package') { | 146 if (source.extension == '.dart' && uri.scheme == 'package') { |
| 138 var index = uri.path.indexOf('/'); | 147 var index = uri.path.indexOf('/'); |
| 139 if (index != -1) { | 148 if (index != -1) { |
| 140 return new AssetId(uri.path.substring(0, index), | 149 return new AssetId(uri.path.substring(0, index), |
| 141 'lib${uri.path.substring(index)}'); | 150 'lib${uri.path.substring(index)}'); |
| 142 } | 151 } |
| 143 } | 152 } |
| 144 | 153 |
| 145 logger.error('absolute paths not allowed: "$url"', span: span); | 154 if (!allowAbsolute) { |
| 155 logger.error('absolute paths not allowed: "$url"', span: span); | |
| 156 } | |
|
Siggi Cherem (dart-lang)
2014/02/13 00:08:18
we might want to resolve more precisely paths that
Jennifer Messerly
2014/02/13 06:11:22
yeah agree
| |
| 146 return null; | 157 return null; |
| 147 } | 158 } |
| 148 | 159 |
| 149 var targetPath = urlBuilder.normalize( | 160 var targetPath = urlBuilder.normalize( |
| 150 urlBuilder.join(urlBuilder.dirname(source.path), url)); | 161 urlBuilder.join(urlBuilder.dirname(source.path), url)); |
| 151 var segments = urlBuilder.split(targetPath); | 162 var segments = urlBuilder.split(targetPath); |
| 152 var sourceSegments = urlBuilder.split(source.path); | 163 var sourceSegments = urlBuilder.split(source.path); |
| 153 assert (sourceSegments.length > 0); | 164 assert (sourceSegments.length > 0); |
| 154 var topFolder = sourceSegments[0]; | 165 var topFolder = sourceSegments[0]; |
| 155 var entryFolder = topFolder != 'lib' && topFolder != 'asset'; | 166 var entryFolder = topFolder != 'lib' && topFolder != 'asset'; |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 239 return builder.relative(builder.join('/', id.path), | 250 return builder.relative(builder.join('/', id.path), |
| 240 from: builder.join('/', builder.dirname(sourceId.path))); | 251 from: builder.join('/', builder.dirname(sourceId.path))); |
| 241 } | 252 } |
| 242 | 253 |
| 243 | 254 |
| 244 /** Convert system paths to asset paths (asset paths are posix style). */ | 255 /** Convert system paths to asset paths (asset paths are posix style). */ |
| 245 String _systemToAssetPath(String assetPath) { | 256 String _systemToAssetPath(String assetPath) { |
| 246 if (path.Style.platform != path.Style.windows) return assetPath; | 257 if (path.Style.platform != path.Style.windows) return assetPath; |
| 247 return path.posix.joinAll(path.split(assetPath)); | 258 return path.posix.joinAll(path.split(assetPath)); |
| 248 } | 259 } |
| OLD | NEW |