| OLD | NEW |
| 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, 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 library web_components.src.normalizePath; | 4 library web_components.src.normalizePath; |
| 5 | 5 |
| 6 import 'package:path/path.dart' as path; | 6 import 'package:path/path.dart' as path; |
| 7 | 7 |
| 8 String normalizeHtmlImportPath( | 8 String normalizeHtmlImportPath( |
| 9 String filePath, String dartFilePackage, String dartFilePath) { | 9 String filePath, String dartFilePackage, String dartFilePath) { |
| 10 // If they already supplied a packages path, just return that. | 10 // If they already supplied a packages path, just return that. |
| 11 if (filePath.startsWith('package:')) { | 11 if (filePath.startsWith('package:')) { |
| 12 return filePath.replaceFirst('package:', 'packages/'); | 12 return filePath.replaceFirst('package:', 'packages/'); |
| 13 } | 13 } |
| 14 | 14 |
| 15 var dartFileDir = path.url.dirname(dartFilePath); | 15 var dartFileDir = path.url.dirname(dartFilePath); |
| 16 var segments = path.url.split(dartFileDir); | |
| 17 // The dartFileDir without the leading dir (web, lib, test, etc). | |
| 18 var dartFileSubDir = path.url.joinAll(segments.getRange(1, segments.length)); | |
| 19 | 16 |
| 20 // Relative paths have no package supplied. | 17 // Relative paths have no package supplied. |
| 21 if (dartFilePackage == null) { | 18 if (dartFilePackage == null) { |
| 22 return path.url.normalize(path.url.join(dartFileSubDir, filePath)); | 19 return path.url.normalize(path.url.join(dartFileDir, filePath)); |
| 23 } | 20 } |
| 24 | 21 |
| 25 // Only option left is a packages/ path. | 22 // Only option left is a packages/ path. |
| 26 return path.url.normalize( | 23 return path.url.normalize( |
| 27 path.url.join('packages/', dartFilePackage, dartFileSubDir, filePath)); | 24 path.url.join('packages/', dartFilePackage, dartFileDir, filePath)); |
| 28 } | 25 } |
| OLD | NEW |