Skip to content

fix: source-maps - consistent paths to inline content #39302

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
petebacondarwin wants to merge 3 commits into from
Closed

fix: source-maps - consistent paths to inline content #39302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bdde92
test(compiler-cli): move source-map tests into correct describe block
petebacondarwin Oct 16, 2020
9d11724
fix(compiler-cli): use consistent file names for inline source-mapped…
petebacondarwin Oct 16, 2020
22c4e1c
fixup! fix(compiler-cli): use consistent file names for inline source…
petebacondarwin May 3, 2021
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
11 changes: 8 additions & 3 deletions packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file_loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {ContentOrigin} from './content_origin';
import {MapAndPath, RawSourceMap, SourceMapInfo} from './raw_source_map';
import {SourceFile} from './source_file';

const SCHEME_MATCHER = /^([a-z][a-z0-9.-]*):\/\//i;
const SCHEME_MATCHER = /^([a-z][a-z0-9.-]*):\/\/(.*)$/i;

/**
* This class can be used to load a source file, its associated source map and any upstream sources.
Expand Down Expand Up @@ -193,8 +193,11 @@ export class SourceFileLoader {
const sourceRoot = this.fs.resolve(
this.fs.dirname(basePath), this.replaceSchemeWithPath(map.sourceRoot || ''));
return map.sources.map((source, index) => {
const path = this.fs.resolve(sourceRoot, this.replaceSchemeWithPath(source));
const content = map.sourcesContent && map.sourcesContent[index] || null;
const path = this.fs.resolve(
sourceRoot,
content !== null ? this.fs.basename(source) : this.replaceSchemeWithPath(source));

// The origin of this source file is "inline" if we extracted it from the source-map's
// `sourcesContent`, except when the source-map itself was "provided" in-memory.
// An inline source file is treated as if it were from the file-system if the source-map that
Expand Down Expand Up @@ -265,6 +268,8 @@ export class SourceFileLoader {
*/
private replaceSchemeWithPath(path: string): string {
return path.replace(
SCHEME_MATCHER, (_: string, scheme: string) => this.schemeMap[scheme.toLowerCase()] || '');
SCHEME_MATCHER,
(_: string, scheme: string, rest: string) =>
this.fs.join(this.schemeMap[scheme.toLowerCase()] || '/', rest));
}
}
Loading