Skip to content

Treat any type annotation with a / character as a module reference #2145

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
ChadKillingsworth wants to merge 1 commit into from
Closed

Treat any type annotation with a / character as a module reference #2145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/com/google/javascript/jscomp/ProcessCommonJSModules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,7 @@ private void fixTypeNode(NodeTraversal t, Node typeNode) {
if (typeNode.isString()) {
String name = typeNode.getString();
// Type nodes can be module paths.
if (ModuleLoader.isRelativeIdentifier(name) || ModuleLoader.isAbsoluteIdentifier(name)) {
if (ModuleLoader.isPathIdentifier(name)) {
int lastSlash = name.lastIndexOf('/');
int endIndex = name.indexOf('.', lastSlash);
String localTypeName = null;
Expand Down
2 changes: 1 addition & 1 deletion src/com/google/javascript/jscomp/ProcessEs6Modules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
private void fixTypeNode(NodeTraversal t, Node typeNode) {
if (typeNode.isString()) {
String name = typeNode.getString();
if (ModuleLoader.isRelativeIdentifier(name) || ModuleLoader.isAbsoluteIdentifier(name)) {
if (ModuleLoader.isPathIdentifier(name)) {
int lastSlash = name.lastIndexOf('/');
int endIndex = name.indexOf('.', lastSlash);
String localTypeName = null;
Expand Down
3 changes: 3 additions & 0 deletions src/com/google/javascript/jscomp/deps/ModuleLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@ public static boolean isAbsoluteIdentifier(String name) {
return name.startsWith(MODULE_SLASH);
}

/** Whether name is a path-based identifier (has a '/' character) */
public static boolean isPathIdentifier(String name) { return name.contains(MODULE_SLASH); }

private static ImmutableList<String> createRootPaths(
Iterable<String> roots, PathResolver resolver) {
ImmutableList.Builder<String> builder = ImmutableList.builder();
Expand Down