tree-sitter-objectscript 1.9.20 → 1.9.22

package/common/scanner.h

@@ -324,12 +324,15 @@ static bool lex_fenced_text(TSLexer *lexer,
   const char *comment_end = "-->";
   const char *script_start = "script";
   const char *script_end = "</script>";
-  while (iswspace(lexer->lookahead) || lexer->lookahead == 0x2028 || lexer->lookahead == 0x2029 || iswalnum(lexer->lookahead)) {
+  while (iswspace(lexer->lookahead) || lexer->lookahead == 0x2028 || lexer->lookahead == 0x2029) {
       advance(lexer);
   }
   if (lexer->lookahead == '<') {
       is_xml = true;
   }
+  while(iswalnum(lexer->lookahead) || iswspace(lexer->lookahead)) {
+      advance(lexer);
+  }
   while (!lexer->eof(lexer)) {
     while (iswspace(lexer->lookahead) || lexer->lookahead == 0x2028 || lexer->lookahead == 0x2029) {
         advance(lexer);

package/core/src/parser.c

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/core/src/parser.c
 size: 44871078 bytes
-sha256: c1876f8a3a53bfd88038e3479c578892f0d299b8ba6e7f3b91acc96676b8c232
+sha256: 8423e58ee56778fbc8bc68c35bcf9655568436dacea06337fca933c829fc18b5

package/expr/src/parser.c

@@ -33540,7 +33540,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_expr(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 9,
-      .patch_version = 20,
+      .patch_version = 22,
     },
   };
   return &language;

package/objectscript/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
@@ -6397,11 +6546,11 @@
           "named": true
         },
         {
-          "type": "keyword_trigger",
+          "type": "external_trigger_keywords",
           "named": true
         },
         {
-          "type": "method_keyword_external_language",
+          "type": "keyword_trigger",
           "named": true
         },
         {
@@ -6409,7 +6558,7 @@
           "named": true
         },
         {
-          "type": "trigger_keyword",
+          "type": "trigger_keywords",
           "named": true
         },
         {
@@ -6465,6 +6614,21 @@
       ]
     }
   },
+  {
+    "type": "trigger_keywords",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "trigger_keyword",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "trigger_name",
     "named": true,
@@ -6735,11 +6899,7 @@
           "named": true
         },
         {
-          "type": "xdata_keyword",
-          "named": true
-        },
-        {
-          "type": "xdata_keyword_mimetype",
+          "type": "xdata_keywords",
           "named": true
         },
         {
@@ -6787,6 +6947,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/objectscript/src/parser.c

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/objectscript/src/parser.c
-size: 48995703 bytes
-sha256: 9b931e53e9536993dabf92af6e94dc5d4f3d86f507ed17934c4cd0ee91711c21
+size: 48996854 bytes
+sha256: 2da2cf4f98c6b812786dc0e8724166fd4d8590f26f4d7530733ef6a2e989786a

package/objectscript_routine/src/parser.c

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/objectscript_routine/src/parser.c
 size: 46685829 bytes
-sha256: c4fa1dd0fafeea3a5275aa22c2019c7fba0bb00111b8c7712a4c70951ed3bf86
+sha256: eff6d20e02c63be0847a29a069a9d0444104b799a4d2fdb2aa73d62778b124ba

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-objectscript",
-  "version": "1.9.20",
+  "version": "1.9.22",
   "description": "Tree Sitter Grammar for InterSystems ObjectScript",
   "scripts": {
     "install": "node-gyp-build",

package/prebuilds/darwin-arm64/tree-sitter-objectscript.node

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/prebuilds/darwin-arm64/tree-sitter-objectscript.node
-size: 40678648 bytes
-sha256: a736432645fc9db4041cac1c07988b8e8b2da2d46ba4bcd60a40631ce4f00e6d
+size: 40678888 bytes
+sha256: 7600112dc8bcabac74a436d919cfd878eb391549841404d35bc913ed831dbbfb

package/prebuilds/darwin-x64/tree-sitter-objectscript.node

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/prebuilds/darwin-x64/tree-sitter-objectscript.node
-size: 40089720 bytes
-sha256: 8f4b189b43d2b96897f40729391aad6b181e79cadf2ae705d3a54a9b1452b5b7
+size: 40085872 bytes
+sha256: 20f6c82e1c17e5cf0bc470d90ee20781ffe4ef4940881da6132a13ef82ee4bed

package/prebuilds/linux-arm64/tree-sitter-objectscript.node

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/prebuilds/linux-arm64/tree-sitter-objectscript.node
-size: 40275808 bytes
-sha256: f3ee5b3743b9e7096cc27ccccaa224d065d60eee3a0ffaf4d0b87a78d10736e3
+size: 40275944 bytes
+sha256: fe655b9cf7005048acce297283b98a2f640e8528978bfc690e24a5bf498df855

package/prebuilds/linux-x64/tree-sitter-objectscript.node

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/prebuilds/linux-x64/tree-sitter-objectscript.node
-size: 40162720 bytes
-sha256: 6b06b6072fcd20c6f602ea2f8e599b2263dd200ff3d6eabc3d918cb9c0f1dc1a
+size: 40158760 bytes
+sha256: 36787b81e2c8dad7fa658403b7dc873349bda7ee0fe8cfcc3bd0b2a6271a09ca

package/prebuilds/win32-arm64/tree-sitter-objectscript.node

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/prebuilds/win32-arm64/tree-sitter-objectscript.node
-size: 40229376 bytes
-sha256: 5c78b3db213910333604088fef098a45a58d16f87f0bd0d114124b5493db6c77
+size: 40228864 bytes
+sha256: 4925ea5e87cc95a8e25274a7f971aa0d1912ea500c722bc9405f7023c2dbf8fd

package/prebuilds/win32-x64/tree-sitter-objectscript.node

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/prebuilds/win32-x64/tree-sitter-objectscript.node
-size: 40149504 bytes
-sha256: 5cc3e944b7c4675e44de040119ccc0fd8130de41ca9e571be92e4c03d1127f47
+size: 40148992 bytes
+sha256: b1dcab8065ce3c89ea284edd6a2a50bc389261177648f3f24fc78718f327c79b

package/tree-sitter.json

@@ -56,7 +56,7 @@
     }
   ],
   "metadata": {
-    "version": "1.9.20",
+    "version": "1.9.22",
     "license": "MIT",
     "description": "ObjectScript grammars for tree-sitter",
     "namespace": "io.github.treesitter.objectscript",

package/udl/grammar.js

@@ -33,14 +33,14 @@ module.exports = define_grammar(objectscript_core, {
   conflicts: ($, previous) =>
     previous.concat([
       [
-        $._trigger_keywords,
-        $._external_trigger_keywords,
+        $.trigger_keywords,
+        $.external_trigger_keywords,
       ],
       [
-        $._expression_method_keywords,
-        $._external_method_keywords,
-        $._call_method_keywords,
-        $._method_keywords,
+        $.expression_method_keywords,
+        $.external_method_keywords,
+        $.call_method_keywords,
+        $.method_keywords,
       ],
     ]),
 
@@ -110,7 +110,7 @@ module.exports = define_grammar(objectscript_core, {
         alias($._quote_permitting_identifier, $.query_name),
         $.arguments,
         $.return_type,
-        optional($._query_keywords),
+        optional($.query_keywords),
         $._external_body,
       ),
 
@@ -122,10 +122,10 @@ module.exports = define_grammar(objectscript_core, {
       ),
 
     _class_statements_block: ($) => seq('{', repeat($.statement), '}'),
-    _core_trigger: ($) => seq($._trigger_keywords, $._class_statements_block),
+    _core_trigger: ($) => seq($.trigger_keywords, $._class_statements_block),
 
     _external_trigger: ($) =>
-      seq($._external_trigger_keywords, $._external_body),
+      seq($.external_trigger_keywords, $._external_body),
 
     property: ($) =>
       seq(
@@ -198,34 +198,34 @@ module.exports = define_grammar(objectscript_core, {
     _index_on_values: ($) =>
       choice(
         prec.right(seq(
-          build_argument_list(commaSep1($._index_property_value)),
+          build_argument_list(commaSep1($.index_property_value)),
           optional($.return_type),
         )),
-        $._index_property_value,
+        $.index_property_value,
       ),
-    _index_property_value: ($) =>
+    index_property_value: ($) =>
       prec.right(
         seq(
-          alias($._quote_permitting_identifier, $.column_name),
+          alias($._quote_permitting_identifier, $.property_name),
           optional($._index_property_args),
-          optional($._index_type),
+          optional($.index_type),
         ),
       ),
 
-    _index_type: ($) =>
+    index_type: ($) =>
       seq(
         $.keyword_as,
         alias($._base_variable, $.typename),
         optional(build_argument_list($.numeric_literal),
         ),
       ),
-    _index_property_args: ($) => build_argument_list(alias(token(choice(/ELEMENTS/i, /KEYS/i)), $.typename)),
+    _index_property_args: ($) => build_argument_list(alias(choice(/ELEMENTS/i, /KEYS/i), $.typename)),
 
     xdata: ($) =>
       seq(
         $.keyword_xdata,
         alias($._quote_permitting_identifier, $.xdata_name),
-        optional($._xdata_keywords),
+        optional($.xdata_keywords),
         $._external_body,
       ),
 
@@ -262,15 +262,15 @@ module.exports = define_grammar(objectscript_core, {
       ),
 
     _call_method: ($) =>
-      seq($._call_method_keywords, '{', $.routine_tag_call, '}'),
+      seq($.call_method_keywords, '{', $.routine_tag_call, '}'),
 
     _core_method: ($) =>
-      seq(optional($._method_keywords), $._class_statements_block),
+      seq(optional($.method_keywords), $._class_statements_block),
 
     _expression_method: ($) =>
-      seq($._expression_method_keywords, '{', $.expression, '}'),
+      seq($.expression_method_keywords, '{', $.expression, '}'),
 
-    _external_method: ($) => seq($._external_method_keywords, $._external_body),
+    _external_method: ($) => seq($.external_method_keywords, $._external_body),
 
     arguments: ($) =>
       seq(

package/udl/queries/highlights.scm

@@ -359,7 +359,7 @@
   (query_keyword)
   (trigger_keyword)
   (xdata_keyword_mimetype)
-  (method_keyword_external_language)
+  (keyword_external_language)
   (relationship_keyword)
   (foreignkey_keyword)
   (parameter_keyword)
@@ -382,7 +382,6 @@
   (xdata_name)
   (storage_name)
   (xml_identifier)
-  (column_name)
 ] @variable.member
 
 (keyword_list) @type.builtin

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,67 +91,102 @@
 ; 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 default (no MimeType): XML fallback
-; -----------------------------------------
 (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
+; --------------------------------------------
+((xdata
+  (external_method_body_content) @injection.content) @_xdata
+  (#not-match? @_xdata "^[^{}]*[Mm][Ii][Mm][Ee][Tt][Yy][Pp][Ee][ \t\r\n]*=")
+  (#set! injection.include-children "true")
   (#set! injection.language "xml"))
 
 ; Storage definition is XML

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: cdb98a2a45ff736276bc32af9aa70111df83466e61f6f2c3bd348331ecf06edc
+size: 47232954 bytes
+sha256: e820879682d688e9774ec285cd0dfc3f049da94f1699a6cd20200ab8e3c6f20f