build: update tree-sitter dependencies and remove WASM file from src

jtkiesel · jtkiesel · commit 3bec0cf8a211 · 2026-03-24T23:17:58.000-06:00
diff --git a/package.json b/package.json
@@ -24,12 +24,12 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsdown && cp src/tree-sitter-java_orchard.wasm dist/",
+    "build": "tsdown && cp node_modules/tree-sitter-java-orchard/tree-sitter-java_orchard.wasm dist/",
     "ci": "yarn build && yarn lint && yarn format:validate && yarn test",
     "clone-samples": "node scripts/clone-samples.js",
     "format:fix": "prettier --write \"**/*.@(js|json|ts)\"",
     "format:validate": "prettier --list-different \"**/*.@(js|json|ts)\"",
-    "postinstall": "cp node_modules/tree-sitter-java-orchard/tree-sitter-java_orchard.wasm src/ && node scripts/generate-node-types.ts && prettier --write src/node-types.ts",
+    "postinstall": "node scripts/generate-node-types.ts && prettier --write src/node-types.ts",
     "lerna:publish": "lerna publish from-git --yes",
     "lerna:version": "lerna version --exact --no-private",
     "lint": "eslint src test",
@@ -52,7 +52,7 @@
     ]
   },
   "dependencies": {
-    "web-tree-sitter": "0.26.6"
+    "web-tree-sitter": "0.26.7"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
@@ -68,7 +68,7 @@
     "mitata": "^1.0.34",
     "mocha": "^11.7.5",
     "prettier": "^3.8.1",
-    "tree-sitter-java-orchard": "0.5.4",
+    "tree-sitter-java-orchard": "0.5.6",
     "tsdown": "^0.21.4",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.57.1"
diff --git a/src/node-types.ts b/src/node-types.ts
@@ -1037,7 +1037,7 @@ export interface InstanceofExpressionNode extends NamedNodeBase {
   leftNode: ExpressionNode;
   nameNode?: IdentifierNode;
   patternNode?: RecordPatternNode;
-  rightNode?: TypeNode;
+  rightNode?: UnannotatedTypeNode;
 }
 
 export interface IntegralTypeNode extends NamedNodeBase {
diff --git a/src/printers/expressions.ts b/src/printers/expressions.ts
@@ -298,8 +298,9 @@ export default {
     return group(
       indent(
         path.map(child => {
+          const doc = print(child, { annotationMode: "noBreak" });
           if (!child.previous) {
-            return print(child);
+            return doc;
           }
 
           const separator = (
@@ -310,7 +311,7 @@ export default {
             ? line
             : " ";
 
-          return [separator, print(child)];
+          return [separator, doc];
         }, "children")
       )
     );
diff --git a/src/tree-sitter-java_orchard.wasm b/src/tree-sitter-java_orchard.wasm
diff --git a/test/test-utils.ts b/test/test-utils.ts
@@ -4,7 +4,7 @@ import { cpSync, existsSync, readdirSync, readFileSync, rmSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import prettier from "prettier";
-import plugin from "../src/index.ts";
+import plugin from "../dist/index.mjs";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
diff --git a/test/unit-test/annotation_interface_declaration/_input.java b/test/unit-test/annotation_interface_declaration/_input.java
@@ -5,4 +5,5 @@
     Integer[][] annotatedArray = (Integer[][]) new Object[4][2];  
     @RandomAnnotationWithObject({"One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten"})
     V[][] annotatedArray = (V[][]) new Object[rowList.size()][columnList.size()];
+    record Config(String a, String b) {}
 }
diff --git a/test/unit-test/annotation_interface_declaration/_output.java b/test/unit-test/annotation_interface_declaration/_output.java
@@ -26,4 +26,6 @@
     "Ten",
   })
   V[][] annotatedArray = (V[][]) new Object[rowList.size()][columnList.size()];
+
+  record Config(String a, String b) {}
 }
diff --git a/test/unit-test/binary_expressions/operator-position-end/_input.java b/test/unit-test/binary_expressions/operator-position-end/_input.java
@@ -129,5 +129,16 @@ void instanceOf() {
       Foo.get(longlinelonglinelonglinelonglinelongline) instanceof
       NumberNumberNumberNumber n &&
       n.foo();
+
+    e instanceof @Ann final E baz;
+    f instanceof final @Ann E qux;
+  }
+
+  void unaryExpression() {
+    int a = -x + y;
+    int b = ~x & y;
+    boolean c = !x && !y;
+    int d = -(x + y);
+    Object e = (int) -x;
   }
 }
diff --git a/test/unit-test/binary_expressions/operator-position-end/_output.java b/test/unit-test/binary_expressions/operator-position-end/_output.java
@@ -244,5 +244,16 @@ void instanceOf() {
     var a =
       Foo.get(longlinelonglinelonglinelonglinelongline) instanceof
         NumberNumberNumberNumber n && n.foo();
+
+    e instanceof @Ann final E baz;
+    f instanceof final @Ann E qux;
+  }
+
+  void unaryExpression() {
+    int a = -x + y;
+    int b = ~x & y;
+    boolean c = !x && !y;
+    int d = -(x + y);
+    Object e = (int) -x;
   }
 }
diff --git a/test/unit-test/binary_expressions/operator-position-start/_input.java b/test/unit-test/binary_expressions/operator-position-start/_input.java
@@ -129,5 +129,16 @@ void instanceOf() {
       Foo.get(longlinelonglinelonglinelonglinelongline) instanceof
       NumberNumberNumberNumber n &&
       n.foo();
+
+    e instanceof @Ann final E baz;
+    f instanceof final @Ann E qux;
+  }
+
+  void unaryExpression() {
+    int a = -x + y;
+    int b = ~x & y;
+    boolean c = !x && !y;
+    int d = -(x + y);
+    Object e = (int) -x;
   }
 }
diff --git a/test/unit-test/binary_expressions/operator-position-start/_output.java b/test/unit-test/binary_expressions/operator-position-start/_output.java
@@ -239,5 +239,16 @@ void instanceOf() {
     var a =
       Foo.get(longlinelonglinelonglinelonglinelongline)
         instanceof NumberNumberNumberNumber n && n.foo();
+
+    e instanceof @Ann final E baz;
+    f instanceof final @Ann E qux;
+  }
+
+  void unaryExpression() {
+    int a = -x + y;
+    int b = ~x & y;
+    boolean c = !x && !y;
+    int d = -(x + y);
+    Object e = (int) -x;
   }
 }
diff --git a/test/unit-test/cast/_input.java b/test/unit-test/cast/_input.java
@@ -18,4 +18,12 @@ void many_nested_casts() {
        ((Map)((Map)((Map)((Map)((Map)((Map)((Map)((Map)((Map)((Map)((Map)((Map)((Map)((Map)((Map) ((Map) map).get(1)).get(1)).get(1)).get(1)).get(1)).get(1)).get(1)).get(1)).get(1)).get(1)).get(1)).get(1)).get(1)).get(1)).get(1)).get(1);
     }
 
+    void intersectionCastExpression() {
+        Object o1 = (A & B) (C) o;
+        Object o2 = (A & B) ~0;
+        Object o3 = (A & B) switch (x) { default -> null; };
+        Object o4 = (A & B) !x;
+        Object o5 = (A & B) + x;
+        Object o6 = (A & B) - x;
+    }
 }
diff --git a/test/unit-test/cast/_output.java b/test/unit-test/cast/_output.java
@@ -58,4 +58,15 @@ void many_nested_casts() {
       ).get(1)
     ).get(1);
   }
+
+  void intersectionCastExpression() {
+    Object o1 = (A & B) (C) o;
+    Object o2 = (A & B) ~0;
+    Object o3 = (A & B) switch (x) {
+      default -> null;
+    };
+    Object o4 = (A & B) !x;
+    Object o5 = (A & B) + x;
+    Object o6 = (A & B) - x;
+  }
 }
diff --git a/test/unit-test/constructors/_input.java b/test/unit-test/constructors/_input.java
@@ -49,4 +49,14 @@ public Constructors() {
 
   public <T> GenericConstructor(T genericParameter) {}
   public <T>GenericConstructor(T genericParameter) {}
+
+  FlexibleConstructorBody(int x) {
+    this.x = x;
+    super(x);
+  }
+
+  FlexibleConstructorBody() {
+    var v = 42;
+    this(v);
+  }
 }
diff --git a/test/unit-test/constructors/_output.java b/test/unit-test/constructors/_output.java
@@ -62,4 +62,14 @@ public Constructors() {
   public <T> GenericConstructor(T genericParameter) {}
 
   public <T> GenericConstructor(T genericParameter) {}
+
+  FlexibleConstructorBody(int x) {
+    this.x = x;
+    super(x);
+  }
+
+  FlexibleConstructorBody() {
+    var v = 42;
+    this(v);
+  }
 }
diff --git a/test/unit-test/expressions/_input.java b/test/unit-test/expressions/_input.java
@@ -246,4 +246,13 @@ void parenthesesWithoutBreak() {
     Aaaaaaaaaa aaaaaaaaaa = (bbbbbbbbbb -> cccccccccc ? dddddddddd : eeeeeeeeee)::ffffffffff;
     Aaaaaaaaaa aaaaaaaaaa = (bbbbbbbbbb -> cccccccccc ? dddddddddd : eeeeeeeeee)[ffffffffff];
   }
+
+  void unaryExpression() {
+    int a = +x;
+    int b = -x;
+    int c = ~x;
+    boolean d = !x;
+    int e = ~~x;
+    int f = -+x;
+  }
 }
diff --git a/test/unit-test/expressions/_output.java b/test/unit-test/expressions/_output.java
@@ -340,4 +340,13 @@ void parenthesesWithoutBreak() {
     Aaaaaaaaaa aaaaaaaaaa = (bbbbbbbbbb ->
       cccccccccc ? dddddddddd : eeeeeeeeee)[ffffffffff];
   }
+
+  void unaryExpression() {
+    int a = +x;
+    int b = -x;
+    int c = ~x;
+    boolean d = !x;
+    int e = ~~x;
+    int f = -+x;
+  }
 }
diff --git a/test/unit-test/pattern-matching/_input.java b/test/unit-test/pattern-matching/_input.java
@@ -43,6 +43,10 @@ case Buyer b when (
     }
 
     int recordPatterns(MyRecord r) {
+        if (o instanceof Foo(@Bar String s)) {}
+        switch (obj) {
+            case final String s: break;
+        }
         return switch (r) {
             case null, default -> 0;
             case MyRecord(A a) -> 0;
@@ -52,6 +56,8 @@ int recordPatterns(MyRecord r) {
             case MyRecord(LongTypeName longVariableName, LongTypeName longVariableName) -> 0;
             case MyRecord(LongTypeName longVariableName, LongTypeName longVariableName) when this.longVariableName > longVariableName && this.longVariableName > longVariableName -> 0;
             case MyRecord(LongTypeName longVariableName, LongTypeName longVariableName) when this.longVariableName > longVariableName && this.longVariableName > longVariableName -> longMethodName(longVariableName, longVariableName, longVariableName, longVariableName);
+            case Outer.Inner(String s) -> {}
+            case final String s -> s;
         };
     }
 }
diff --git a/test/unit-test/pattern-matching/_output.java b/test/unit-test/pattern-matching/_output.java
@@ -66,6 +66,12 @@ case Buyer b when (
   }
 
   int recordPatterns(MyRecord r) {
+    if (o instanceof Foo(@Bar String s)) {
+    }
+    switch (obj) {
+      case final String s:
+        break;
+    }
     return switch (r) {
       case null, default -> 0;
       case MyRecord(A a) -> 0;
@@ -104,6 +110,9 @@ case MyRecord(
         longVariableName,
         longVariableName
       );
+      case Outer.Inner(String s) -> {
+      }
+      case final String s -> s;
     };
   }
 }
diff --git a/test/unit-test/text-blocks/_input.java b/test/unit-test/text-blocks/_input.java
@@ -55,4 +55,17 @@ public void print(%s object) {
     );
   }
 
+  String escapes = """
+    1+1 equals \
+    2 maybe
+    """;
+
+  String escapes = """
+    \"""var msg = hello world!\""";
+    """;
+
+  String escapes = """
+    \n\t\r\f\b\s\\
+    \077
+    \u0041""";
 }
diff --git a/test/unit-test/text-blocks/_output.java b/test/unit-test/text-blocks/_output.java
@@ -52,4 +52,18 @@ public void print(%s object) {
             abc"""
     );
   }
+
+  String escapes = """
+    1+1 equals \
+    2 maybe
+    """;
+
+  String escapes = """
+    \"""var msg = hello world!\""";
+    """;
+
+  String escapes = """
+    \n\t\r\f\b\s\\
+    \077
+    \u0041""";
 }
diff --git a/test/unit-test/variables/_input.java b/test/unit-test/variables/_input.java
@@ -33,8 +33,27 @@ public class Variables {
   private Range<Date> creator3 = this.dateRangeField.new <Integer>Range<>(from, to);
   private Range<Date> creator3 = new <Integer>Range<>(from, to);
 
+  private int intLiteral = 1__0;
+  private int intLiteral = 0_00_00;
+  private int intLiteral = 0_7;
+  private int intLiteral = 0__7;
   private int	hexLiteral = 0x0000;
-  private int	octLiteral = 001;
+  private int hexLiteral = 0xa__b;
+  private int hexLiteral = 0x1p0993;
+  private int hexLiteral = 0x1p-0993;
+  private int octLiteral = 001;
+  private int binaryLiteral = 0b1__0;
+  private double floatingPointLiteral = 0d;
+  private double floatingPointLiteral = 0D;
+  private double floatingPointLiteral = 00d;
+  private double floatingPointLiteral = 1.0d;
+  private double floatingPointLiteral = 1.0D;
+  private float floatingPointLiteral = 1.0f;
+  private float floatingPointLiteral = 1.0F;
+  private float floatingPointLiteral = 1e4f;
+  private double floatingPointLiteral = 1e4d;
+  private float floatingPointLiteral = 007f;
+  private double floatingPointLiteral = 00e1;
 
   private Interface anonymousClassVariable = new Interface(){
     @Override
diff --git a/test/unit-test/variables/_output.java b/test/unit-test/variables/_output.java
@@ -58,8 +58,27 @@ public class Variables {
   );
   private Range<Date> creator3 = new <Integer>Range<>(from, to);
 
+  private int intLiteral = 1__0;
+  private int intLiteral = 0_00_00;
+  private int intLiteral = 0_7;
+  private int intLiteral = 0__7;
   private int hexLiteral = 0x0000;
+  private int hexLiteral = 0xa__b;
+  private int hexLiteral = 0x1p0993;
+  private int hexLiteral = 0x1p-0993;
   private int octLiteral = 001;
+  private int binaryLiteral = 0b1__0;
+  private double floatingPointLiteral = 0d;
+  private double floatingPointLiteral = 0D;
+  private double floatingPointLiteral = 00d;
+  private double floatingPointLiteral = 1.0d;
+  private double floatingPointLiteral = 1.0D;
+  private float floatingPointLiteral = 1.0f;
+  private float floatingPointLiteral = 1.0F;
+  private float floatingPointLiteral = 1e4f;
+  private double floatingPointLiteral = 1e4d;
+  private float floatingPointLiteral = 007f;
+  private double floatingPointLiteral = 00e1;
 
   private Interface anonymousClassVariable = new Interface() {
     @Override
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1037,7 +1037,7 @@ export interface InstanceofExpressionNode extends NamedNodeBase {`
`1037`	`1037`	`leftNode: ExpressionNode;`
`1038`	`1038`	`nameNode?: IdentifierNode;`
`1039`	`1039`	`patternNode?: RecordPatternNode;`
`1040`		`- rightNode?: TypeNode;`
	`1040`	`+ rightNode?: UnannotatedTypeNode;`
`1041`	`1041`	`}`
`1042`	`1042`
`1043`	`1043`	`export interface IntegralTypeNode extends NamedNodeBase {`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,5 @@`
`5`	`5`	`Integer[][] annotatedArray = (Integer[][]) new Object[4][2];`
`6`	`6`	`@RandomAnnotationWithObject({"One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten"})`
`7`	`7`	`V[][] annotatedArray = (V[][]) new Object[rowList.size()][columnList.size()];`
	`8`	`+ record Config(String a, String b) {}`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,6 @@`
`26`	`26`	`"Ten",`
`27`	`27`	`})`
`28`	`28`	`V[][] annotatedArray = (V[][]) new Object[rowList.size()][columnList.size()];`
	`29`	`+`
	`30`	`+ record Config(String a, String b) {}`
`29`	`31`	`}`