tree-sitter-objectscript 1.9.21 → 1.10.0

package/udl/queries/injections.scm

@@ -27,40 +27,45 @@
 ; Keywords, one of type language = "python", none of type codemode
 ; External method body injection based on [ Language = ... ]
 (method_definition
-  (method_keyword_external_language
-    (typename) @_lang)
+  (external_method_keywords
+    (keyword_external_language
+      (typename) @_lang))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_lang "python" "Python" "PYTHON")
   (#set! injection.language "python"))
 
 (method_definition
-  (method_keyword_external_language
-    (typename) @_lang)
+  (external_method_keywords
+    (keyword_external_language
+      (typename) @_lang))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_lang "tsql" "TSQL" "tSQL" "tSql" "TSql")
   (#set! injection.language "tsql"))
 
 (method_definition
-  (method_keyword_external_language
-    (typename) @_lang)
+  (external_method_keywords
+    (keyword_external_language
+      (typename) @_lang))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_lang "ispl" "ISPL" "ISpl" "iSpl")
   (#set! injection.language "ispl"))
 
 (trigger
-  (method_keyword_external_language
-    (typename) @_lang)
+  (external_trigger_keywords
+    (keyword_external_language
+      (typename) @_lang))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_lang "python" "Python" "PYTHON")
   (#set! injection.language "python"))
 
 (trigger
-  (method_keyword_external_language
-    (typename) @_lang)
+  (external_trigger_keywords
+    (keyword_external_language
+      (typename) @_lang))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_lang "tsql" "TSQL" "tSQL" "tSql" "TSql")
@@ -86,61 +91,95 @@
 ; text/markdown
 ;
 (xdata
-  (xdata_keyword_mimetype
-    (typename) @_mt)
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_mt "text/markdown" "\"text/markdown\"")
   (#set! injection.language "markdown"))
 
 (xdata
-  (xdata_keyword_mimetype
-    (typename) @_mt)
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
+  (external_method_body_content) @injection.content
+  (#set! injection.include-children "true")
+  (#any-of? @_mt "text/javascript" "\"text/javascript\"")
+  (#set! injection.language "javascript"))
+
+(xdata
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_mt "text/x-python" "\"text/x-python\"" "application/python" "\"application/python\"")
   (#set! injection.language "python"))
 
 (xdata
-  (xdata_keyword_mimetype
-    (typename) @_mt)
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_mt "text/xml" "\"text/xml\"" "application/xml" "\"application/xml\"")
   (#set! injection.language "xml"))
 
 (xdata
-  (xdata_keyword_mimetype
-    (typename) @_mt)
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_mt "text/html" "\"text/html\"")
   (#set! injection.language "html"))
 
 (xdata
-  (xdata_keyword_mimetype
-    (typename) @_mt)
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_mt "application/json" "\"application/json\"")
   (#set! injection.language "json"))
 
 (xdata
-  (xdata_keyword_mimetype
-    (typename) @_mt)
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_mt "text/yaml" "\"text/yaml\"" "application/yaml" "\"application/yaml\"")
   (#set! injection.language "yaml"))
 
 (xdata
-  (xdata_keyword_mimetype
-    (typename) @_mt)
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
   (external_method_body_content) @injection.content
   (#set! injection.include-children "true")
   (#any-of? @_mt "text/css" "\"text/css\"")
   (#set! injection.language "css"))
 
+(xdata
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
+  (external_method_body_content) @injection.content
+  (#set! injection.include-children "true")
+  (#any-of? @_mt "application/sql" "\"application/sql\"")
+  (#set! injection.language "sql"))
+
+(xdata
+  (xdata_keywords
+    (xdata_keyword_mimetype
+      (typename) @_mt))
+  (external_method_body_content) @injection.content
+  (#set! injection.include-children "true")
+  (#any-of? @_mt "text/x-java-source" "\"text/x-java-source\"")
+  (#set! injection.language "java"))
+
 ; --------------------------------------------
 ; XDATA default (no MimeType header): XML fallback
 ; --------------------------------------------

package/udl/src/node-types.json

@@ -98,6 +98,25 @@
       ]
     }
   },
+  {
+    "type": "call_method_keywords",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "call_method_keyword",
+          "named": true
+        },
+        {
+          "type": "method_keyword",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "catch_block",
     "named": true,
@@ -449,15 +468,11 @@
           "named": true
         },
         {
-          "type": "keyword_clientmethod",
-          "named": true
-        },
-        {
-          "type": "method_keyword",
+          "type": "external_method_keywords",
           "named": true
         },
         {
-          "type": "method_keyword_external_language",
+          "type": "keyword_clientmethod",
           "named": true
         },
         {
@@ -555,21 +570,6 @@
       ]
     }
   },
-  {
-    "type": "column_name",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "identifier",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "command_break",
     "named": true,
@@ -2863,6 +2863,25 @@
       ]
     }
   },
+  {
+    "type": "expression_method_keywords",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "method_keyword",
+          "named": true
+        },
+        {
+          "type": "method_keyword_codemode_expression",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "extent_index_keyword",
     "named": true,
@@ -2897,6 +2916,44 @@
       ]
     }
   },
+  {
+    "type": "external_method_keywords",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "keyword_external_language",
+          "named": true
+        },
+        {
+          "type": "method_keyword",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "external_trigger_keywords",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "keyword_external_language",
+          "named": true
+        },
+        {
+          "type": "trigger_keyword",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "extrinsic_function",
     "named": true,
@@ -3181,10 +3238,6 @@
       "multiple": true,
       "required": true,
       "types": [
-        {
-          "type": "column_name",
-          "named": true
-        },
         {
           "type": "extent_index_keywords",
           "named": true
@@ -3198,7 +3251,7 @@
           "named": true
         },
         {
-          "type": "keyword_as",
+          "type": "index_property_value",
           "named": true
         },
         {
@@ -3209,17 +3262,9 @@
           "type": "keyword_on",
           "named": true
         },
-        {
-          "type": "numeric_literal",
-          "named": true
-        },
         {
           "type": "return_type",
           "named": true
-        },
-        {
-          "type": "typename",
-          "named": true
         }
       ]
     }
@@ -3293,6 +3338,52 @@
       ]
     }
   },
+  {
+    "type": "index_property_value",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "index_type",
+          "named": true
+        },
+        {
+          "type": "property_name",
+          "named": true
+        },
+        {
+          "type": "typename",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "index_type",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "keyword_as",
+          "named": true
+        },
+        {
+          "type": "numeric_literal",
+          "named": true
+        },
+        {
+          "type": "typename",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "indirection",
     "named": true,
@@ -3517,6 +3608,21 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "keyword_external_language",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "typename",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "keyword_js",
     "named": true,
@@ -4014,7 +4120,7 @@
           "named": true
         },
         {
-          "type": "call_method_keyword",
+          "type": "call_method_keywords",
           "named": true
         },
         {
@@ -4022,19 +4128,19 @@
           "named": true
         },
         {
-          "type": "external_method_body_content",
+          "type": "expression_method_keywords",
           "named": true
         },
         {
-          "type": "method_keyword",
+          "type": "external_method_body_content",
           "named": true
         },
         {
-          "type": "method_keyword_codemode_expression",
+          "type": "external_method_keywords",
           "named": true
         },
         {
-          "type": "method_keyword_external_language",
+          "type": "method_keywords",
           "named": true
         },
         {
@@ -4123,15 +4229,15 @@
     }
   },
   {
-    "type": "method_keyword_external_language",
+    "type": "method_keywords",
     "named": true,
     "fields": {},
     "children": {
-      "multiple": false,
-      "required": true,
+      "multiple": true,
+      "required": false,
       "types": [
         {
-          "type": "typename",
+          "type": "method_keyword",
           "named": true
         }
       ]
@@ -5218,7 +5324,7 @@
           "named": true
         },
         {
-          "type": "query_keyword",
+          "type": "query_keywords",
           "named": true
         },
         {
@@ -5263,6 +5369,21 @@
       ]
     }
   },
+  {
+    "type": "query_keywords",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "query_keyword",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "query_name",
     "named": true,
@@ -5387,13 +5508,41 @@
     "named": true,
     "fields": {},
     "children": {
-      "multiple": false,
+      "multiple": true,
       "required": false,
       "types": [
         {
           "type": "expression",
           "named": true
         },
+        {
+          "type": "keyword_not",
+          "named": true
+        },
+        {
+          "type": "keyword_server_only",
+          "named": true
+        },
+        {
+          "type": "numeric_literal",
+          "named": true
+        },
+        {
+          "type": "oref_chain_expr",
+          "named": true
+        },
+        {
+          "type": "property_name",
+          "named": true
+        },
+        {
+          "type": "query_name",
+          "named": true
+        },
+        {
+          "type": "rhs_sql_compute_code",
+          "named": true
+        },
         {
           "type": "typename",
           "named": true
@@ -6353,11 +6502,11 @@
           "named": true
         },
         {
-          "type": "keyword_trigger",
+          "type": "external_trigger_keywords",
           "named": true
         },
         {
-          "type": "method_keyword_external_language",
+          "type": "keyword_trigger",
           "named": true
         },
         {
@@ -6365,7 +6514,7 @@
           "named": true
         },
         {
-          "type": "trigger_keyword",
+          "type": "trigger_keywords",
           "named": true
         },
         {
@@ -6421,6 +6570,21 @@
       ]
     }
   },
+  {
+    "type": "trigger_keywords",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "trigger_keyword",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "trigger_name",
     "named": true,
@@ -6691,11 +6855,7 @@
           "named": true
         },
         {
-          "type": "xdata_keyword",
-          "named": true
-        },
-        {
-          "type": "xdata_keyword_mimetype",
+          "type": "xdata_keywords",
           "named": true
         },
         {
@@ -6743,6 +6903,25 @@
       ]
     }
   },
+  {
+    "type": "xdata_keywords",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "xdata_keyword",
+          "named": true
+        },
+        {
+          "type": "xdata_keyword_mimetype",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "xdata_name",
     "named": true,

package/udl/src/parser.c

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/udl/src/parser.c
-size: 47229012 bytes
-sha256: cb7da8b5aa33fa07e37197d85a7a1ee0971f4f5262437c88e57735fa71a0cba3
+size: 47332276 bytes
+sha256: b0cc39f6503259485503203e9e7fb8bd32c8d52c741a8c3d4bdb796751984008