diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 6b938def1eef..6be6101a558e 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -45,10 +45,10 @@
 | idris |  |  |  | `idris2-lsp` |
 | iex | ✓ |  |  |  |
 | java | ✓ |  |  | `jdtls` |
-| javascript | ✓ |  | ✓ | `typescript-language-server` |
+| javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | jsdoc | ✓ |  |  |  |
 | json | ✓ |  | ✓ | `vscode-json-language-server` |
-| jsx | ✓ |  | ✓ | `typescript-language-server` |
+| jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
 | julia | ✓ |  |  | `julia` |
 | kotlin | ✓ |  |  | `kotlin-language-server` |
 | latex | ✓ |  |  | `texlab` |
@@ -97,9 +97,9 @@
 | tfvars |  |  |  | `terraform-ls` |
 | toml | ✓ |  |  | `taplo` |
 | tsq | ✓ |  |  |  |
-| tsx | ✓ |  |  | `typescript-language-server` |
+| tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
 | twig | ✓ |  |  |  |
-| typescript | ✓ |  | ✓ | `typescript-language-server` |
+| typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | ungrammar | ✓ |  |  |  |
 | v | ✓ |  |  | `vls` |
 | vala | ✓ |  |  | `vala-language-server` |
diff --git a/runtime/queries/javascript/textobjects.scm b/runtime/queries/javascript/textobjects.scm
new file mode 100644
index 000000000000..c80dc81b4cc7
--- /dev/null
+++ b/runtime/queries/javascript/textobjects.scm
@@ -0,0 +1,36 @@
+(function_declaration
+  body: (_) @function.inside) @function.around
+
+(function
+  body: (_) @function.inside) @function.around
+
+(arrow_function
+  body: (_) @function.inside) @function.around
+
+(method_definition
+  body: (_) @function.inside) @function.around
+
+(generator_function_declaration
+  body: (_) @function.inside) @function.around
+
+(class_declaration
+  body: (class_body) @class.inside) @class.around
+
+(class
+  (class_body) @class.inside) @class.around
+
+(export_statement
+  declaration: [
+    (function_declaration) @function.around
+    (class_declaration) @class.around 
+  ])
+
+(formal_parameters
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(arguments
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(comment) @comment.inside
+
+(comment)+ @comment.around
diff --git a/runtime/queries/jsx/textobjects.scm b/runtime/queries/jsx/textobjects.scm
new file mode 100644
index 000000000000..ff0ddfacf135
--- /dev/null
+++ b/runtime/queries/jsx/textobjects.scm
@@ -0,0 +1 @@
+; inherits: javascript
diff --git a/runtime/queries/tsx/indents.scm b/runtime/queries/tsx/indents.scm
new file mode 100644
index 000000000000..1b61e36da3ca
--- /dev/null
+++ b/runtime/queries/tsx/indents.scm
@@ -0,0 +1 @@
+; inherits: typescript
diff --git a/runtime/queries/tsx/textobjects.scm b/runtime/queries/tsx/textobjects.scm
new file mode 100644
index 000000000000..07391231c635
--- /dev/null
+++ b/runtime/queries/tsx/textobjects.scm
@@ -0,0 +1 @@
+; inherits: typescript,jsx
diff --git a/runtime/queries/typescript/textobjects.scm b/runtime/queries/typescript/textobjects.scm
new file mode 100644
index 000000000000..8564236be522
--- /dev/null
+++ b/runtime/queries/typescript/textobjects.scm
@@ -0,0 +1,8 @@
+; inherits: javascript
+
+[
+  (interface_declaration 
+    body:(_) @class.inside)
+  (type_alias_declaration 
+    value: (_) @class.inside)
+] @class.around