Skip to content

Commit da3582b

Browse files
Update SourceMaps during transform (#3011)
1 parent 39013c9 commit da3582b

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

packages/firestore/scripts/remove-asserts.ts

+20-6
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ class RemoveAsserts {
4949
}
5050

5151
visitNode(node: ts.Node): ts.Node {
52+
let updatedNode: ts.Node | null = null;
53+
5254
if (ts.isCallExpression(node)) {
5355
const signature = this.typeChecker.getResolvedSignature(node);
5456
if (
@@ -63,19 +65,31 @@ class RemoveAsserts {
6365
) {
6466
const method = declaration.name!.text;
6567
if (method === 'debugAssert') {
66-
return ts.createEmptyStatement();
68+
updatedNode = ts.createEmptyStatement();
6769
} else if (method === 'hardAssert') {
6870
// Remove the log message but keep the assertion
69-
return ts.createCall(declaration.name!, /*typeArgs*/ undefined, [
70-
node.arguments[0]
71-
]);
71+
updatedNode = ts.createCall(
72+
declaration.name!,
73+
/*typeArgs*/ undefined,
74+
[node.arguments[0]]
75+
);
7276
} else if (method === 'fail') {
7377
// Remove the log message
74-
return ts.createCall(declaration.name!, /*typeArgs*/ undefined, []);
78+
updatedNode = ts.createCall(
79+
declaration.name!,
80+
/*typeArgs*/ undefined,
81+
[]
82+
);
7583
}
7684
}
7785
}
7886
}
79-
return node;
87+
88+
if (updatedNode) {
89+
ts.setSourceMapRange(updatedNode, ts.getSourceMapRange(node));
90+
return updatedNode;
91+
} else {
92+
return node;
93+
}
8094
}
8195
}

packages/firestore/scripts/rename-internals.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ class RenameInternals {
4949
!this.publicApi.has(name) &&
5050
blacklist.indexOf(node.escapedText.toString()) === -1
5151
) {
52-
return ts.createIdentifier(this.prefix + name);
52+
const newIdentifier = ts.createIdentifier(this.prefix + name);
53+
ts.setSourceMapRange(newIdentifier, ts.getSourceMapRange(node));
54+
return newIdentifier;
5355
}
5456
}
5557

0 commit comments

Comments
 (0)