JavaScript type mapping (#6025)

Author: jkschneider

.claude/settings.json

@@ -1,6 +1,10 @@
 {
   "permissions": {
     "allow": [
+      "mcp__ide__getDiagnostics",
+      "Bash(npm search:*)",
+      "Bash(npm run:*)",
+      "Bash(node:*)",
       "Bash(npm view:*)",
       "Bash(npx:*)",
       "Bash(npm ls:*)",

rewrite-core/src/main/java/org/openrewrite/TreeVisitor.java

@@ -224,10 +224,7 @@ public P reduce(Tree tree, P p, Cursor parent) {
             return defaultValue(null, p);
         }
 
-        boolean topLevel = false;
-        if (visitCount == 0) {
-            topLevel = true;
-        }
+        boolean topLevel = visitCount == 0;
 
         visitCount++;
         setCursor(new Cursor(cursor, tree));
@@ -263,7 +260,7 @@ public P reduce(Tree tree, P p, Cursor parent) {
             if (topLevel) {
                 if (t != null && afterVisit != null) {
                     for (TreeVisitor<?, P> v : afterVisit) {
-                         v.setCursor(getCursor());
+                        v.setCursor(getCursor());
                         //noinspection unchecked
                         t = (T) v.visit(t, p);
                     }

rewrite-core/src/main/java/org/openrewrite/rpc/RewriteRpc.java

@@ -350,6 +350,10 @@ public String print(SourceFile tree, Print.@Nullable MarkerPrinter markerPrinter
         return print(tree, new Cursor(null, Cursor.ROOT_VALUE), markerPrinter);
     }
 
+    public String print(Tree tree, Cursor parent) {
+        return print(tree, parent, null);
+    }
+
     public String print(Tree tree, Cursor parent, Print.@Nullable MarkerPrinter markerPrinter) {
         localObjects.put(tree.getId().toString(), tree);
         return send("Print", new Print(tree.getId().toString(), getCursorIds(parent), markerPrinter), String.class);

rewrite-core/src/main/java/org/openrewrite/rpc/RpcReceiveQueue.java

@@ -15,8 +15,6 @@
  */
 package org.openrewrite.rpc;
 
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
 import org.jspecify.annotations.Nullable;
 import org.objenesis.ObjenesisStd;
 
@@ -29,16 +27,6 @@
 
 public class RpcReceiveQueue {
     private static final ObjenesisStd objenesis = new ObjenesisStd();
-    private static final LoadingCache<String, Object> instanceCache = Caffeine.newBuilder()
-            .maximumSize(1_000)
-            .build((String key) -> {
-                try {
-                    Class<?> clazz = Class.forName(key);
-                    return objenesis.newInstance(clazz);
-                } catch (ClassNotFoundException e) {
-                    throw new RuntimeException(e);
-                }
-            });
 
     private final Deque<RpcObjectData> batch;
     private final Map<Integer, Object> refs;
@@ -124,6 +112,12 @@ public <T> T receive(@Nullable T before, @Nullable UnaryOperator<T> onChange) {
                     before = message.getValueType() == null ?
                             message.getValue() :
                             newObj(message.getValueType());
+                    if (ref != null) {
+                        // For an object like JavaType that we will mutate in place rather than using
+                        // immutable updates because of its cyclic nature, the before instance will ultimately
+                        // be the same as the after instance below.
+                        refs.put(ref, before);
+                    }
                 }
                 // Intentional fall-through...
             case CHANGE:
@@ -175,8 +169,13 @@ public <T> T receive(@Nullable T before, @Nullable UnaryOperator<T> onChange) {
     }
 
     private <T> T newObj(String type) {
-        //noinspection unchecked
-        return (T) requireNonNull(instanceCache.get(type));
+        try {
+            Class<?> clazz = Class.forName(type);
+            //noinspection unchecked
+            return (T) objenesis.newInstance(clazz);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**

rewrite-core/src/main/java/org/openrewrite/rpc/RpcSendQueue.java

@@ -69,14 +69,29 @@ public <T, U> void getAndSend(T parent, Function<T, @Nullable U> value, @Nullabl
         send(after, before, onChange == null || after == null ? null : () -> onChange.accept(after));
     }
 
+    public <T, U> void getAndSendListAsRef(@Nullable T parent,
+                                           Function<T, @Nullable List<U>> values,
+                                           Function<? super U, ?> id,
+                                           @Nullable Consumer<U> onChange) {
+        getAndSendList(parent, values, id, onChange, true);
+    }
+
     public <T, U> void getAndSendList(@Nullable T parent,
                                       Function<T, @Nullable List<U>> values,
-                                      Function<U, ?> id,
+                                      Function<? super U, ?> id,
                                       @Nullable Consumer<U> onChange) {
-        List<U> after = values.apply(parent);
+        getAndSendList(parent, values, id, onChange, false);
+    }
+
+    private <T, U> void getAndSendList(@Nullable T parent,
+                                       Function<T, @Nullable List<U>> values,
+                                       Function<? super U, ?> id,
+                                       @Nullable Consumer<U> onChange,
+                                       boolean asRef) {
+        List<U> after = parent == null ? null : values.apply(parent);
         //noinspection unchecked
         List<U> before = this.before == null ? null : values.apply((T) this.before);
-        sendList(after, before, id, onChange);
+        sendList(after, before, id, onChange, asRef);
     }
 
     public <T> void send(@Nullable T after, @Nullable T before, @Nullable Runnable onChange) {
@@ -97,10 +112,11 @@ public <T> void send(@Nullable T after, @Nullable T before, @Nullable Runnable o
         }
     }
 
-    public <T> void sendList(@Nullable List<T> after,
-                             @Nullable List<T> before,
-                             Function<T, ?> id,
-                             @Nullable Consumer<T> onChange) {
+    <T> void sendList(@Nullable List<T> after,
+                      @Nullable List<T> before,
+                      Function<? super T, ?> id,
+                      @Nullable Consumer<T> onChange,
+                      boolean asRef) {
         send(after, before, () -> {
             assert after != null : "A DELETE event should have been sent.";
 
@@ -110,7 +126,7 @@ public <T> void sendList(@Nullable List<T> after,
                 Integer beforePos = beforeIdx.get(id.apply(anAfter));
                 Runnable onChangeRun = onChange == null ? null : () -> onChange.accept(anAfter);
                 if (beforePos == null) {
-                    add(anAfter, onChangeRun);
+                    add(asRef ? Reference.asRef(anAfter) : anAfter, onChangeRun);
                 } else {
                     T aBefore = before == null ? null : before.get(beforePos);
                     if (aBefore == anAfter) {
@@ -125,7 +141,7 @@ public <T> void sendList(@Nullable List<T> after,
         });
     }
 
-    private <T> Map<Object, Integer> putListPositions(List<T> after, @Nullable List<T> before, Function<T, ?> id) {
+    private <T> Map<Object, Integer> putListPositions(List<T> after, @Nullable List<T> before, Function<? super T, ?> id) {
         Map<Object, Integer> beforeIdx = new IdentityHashMap<>();
         if (before != null) {
             for (int i = 0; i < before.size(); i++) {
@@ -144,7 +160,7 @@ private <T> Map<Object, Integer> putListPositions(List<T> after, @Nullable List<
     private void add(@Nullable Object after, @Nullable Runnable onChange) {
         Object afterVal = Reference.getValue(after);
         Integer ref = null;
-        if (after instanceof Reference) {
+        if (after instanceof Reference && afterVal != null) {
             if (refs.containsKey(afterVal)) {
                 put(new RpcObjectData(ADD, null, null, refs.get(afterVal)));
                 // No onChange call because the remote will be using an instance from its ref cache

rewrite-core/src/test/java/org/openrewrite/internal/StringUtilsTest.java

@@ -18,11 +18,19 @@
 import org.junit.jupiter.api.Test;
 import org.openrewrite.Issue;
 
+import java.util.regex.Pattern;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.openrewrite.internal.StringUtils.*;
 
 class StringUtilsTest {
 
+    @Test
+    void aspectJNameToPatternTest() {
+        assertThat(Pattern.compile(aspectjNameToPattern("java.io..*")).matcher("java.io.File")).matches();
+        assertThat(Pattern.compile(aspectjNameToPattern("@types/lodash..*")).matcher("@types/lodash.LoDashStatic")).matches();
+    }
+
     @Test
     void containsOnlyWhitespaceAndCommentsTest() {
         assertThat(containsOnlyWhitespaceAndComments("")).isTrue();
@@ -120,17 +128,17 @@ void globMatching() {
     void greatestCommonMargin() {
         assertThat(StringUtils.greatestCommonMargin(
           """
-           \s
-            \s
+             \s
               \s
-          """)).isEqualTo("  ");
+                \s
+            """)).isEqualTo("  ");
 
         assertThat(StringUtils.greatestCommonMargin(
           """
-            \s
-            s\s
-             \s
-          """)).isEqualTo("  ");
+              \s
+              s\s
+               \s
+            """)).isEqualTo("  ");
 
         assertThat(StringUtils.greatestCommonMargin("")).isEqualTo("");
         assertThat(StringUtils.greatestCommonMargin("\n\n")).isEqualTo("");

rewrite-core/src/test/java/org/openrewrite/rpc/RpcSendQueueTest.java

@@ -46,7 +46,7 @@ void sendList() throws Exception {
             latch.countDown();
         }, new IdentityHashMap<>());
 
-        q.sendList(after, before, Function.identity(), null);
+        q.sendList(after, before, Function.identity(), null, false);
         q.flush();
 
         assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
@@ -68,7 +68,7 @@ void sendEnum() throws Exception {
             latch.countDown();
         }, new IdentityHashMap<>());
 
-        q.sendList(after, before, Function.identity(), null);
+        q.sendList(after, before, Function.identity(), null, false);
         q.flush();
 
         assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
@@ -87,7 +87,7 @@ void emptyList() throws Exception {
             latch.countDown();
         }, new IdentityHashMap<>());
 
-        q.sendList(after, null, Function.identity(), null);
+        q.sendList(after, null, Function.identity(), null, false);
         q.flush();
 
         assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();

rewrite-java-test/src/test/java/org/openrewrite/java/MethodMatcherTest.java

@@ -57,6 +57,12 @@ void invalidMethodMatcher() {
           .isValid()).isFalse();
     }
 
+    @Test
+    void npmPackageNaming() {
+        assertThat(MethodMatcher.validate("@types/lodash..* map(..)").isValid()).isTrue();
+        assertTrue(typeRegex("@types/lodash..* map(..)").matcher("@types/lodash.LodashStatic").matches());
+    }
+
     @Test
     void anyTypeMatchesNullTargetType() {
         assertTrue(new MethodMatcher("*..* equals(Object)", true).matchesTargetType(null));
@@ -246,7 +252,7 @@ void matchesMemberReferenceAsExpressionUsage(String methodPattern) {
             """
               package a;
               import java.util.function.Supplier;
-
+              
               class A {
                   Supplier<A> a = A::new;
               }
@@ -262,7 +268,7 @@ void matchesMethod() {
           java(
             """
               package a;
-
+              
               class A {
                   void setInt(int value) {}
                   int getInt() {}
@@ -288,12 +294,12 @@ void strictMatchMethodOverride() {
           java(
             """
               package com.abc;
-
+              
               class Parent {
                   public void method(String s) {
                   }
               }
-
+              
               class Test extends Parent {
                   @Override
                   public void method(String s) {
@@ -316,7 +322,7 @@ void matchesMethodWithWildcardForClassInPackage() {
           java(
             """
               package a;
-
+              
               class A {
                   void foo() {}
               }
@@ -360,7 +366,7 @@ void siteExample() {
           java(
             """
               package com.yourorg;
-
+              
               class Foo {
                   void bar(int i, String s) {}
                   void other() {
@@ -500,7 +506,7 @@ void arrayExample() {
           java(
             """
               package com.yourorg;
-
+              
               class Foo {
                   void bar(String[] s) {}
                   void test() {

rewrite-java/src/main/antlr/MethodSignatureLexer.g4

@@ -9,7 +9,10 @@ RPAREN          : ')';
 LBRACK          : '[';
 RBRACK          : ']';
 COMMA           : ',';
-DOT             : '.';
+
+// The widening of DOT to include '/' allows matching of package separators
+// in JavaScript and TypeScript import paths, e.g. @types/lodash..* map(..)
+DOT             : '.' | '/';
 
 // §3.12 Operators
 
@@ -32,6 +35,10 @@ Identifier
 fragment
 JavaLetter
     :   [a-zA-Z$_] // these are the "java letters" below 0x7F
+    |
+        // The widening of JavaLetter to include '@' allows matching package name parts
+        // in JavaScript and TypeScript import paths, e.g. @types/lodash..* map(..)
+        '@'
     |   // covers all characters above 0x7F which are not a surrogate
         ~[\u0000-\u007F\uD800-\uDBFF]
         {Character.isJavaIdentifierStart(_input.LA(-1))}?