tree-sitter-ucode 0.4.0 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-ucode",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Ucode grammar for tree-sitter",
   "repository": {
     "type": "git",
@@ -28,6 +28,9 @@
     "markup/src/**",
     "markup/queries/*",
     "scripts/generate-markup-grammar.js",
+    "ucdocs/grammar.js",
+    "ucdocs/src/**",
+    "ucdocs/queries/*",
     "*.wasm"
   ],
   "dependencies": {

package/queries/locals.scm

@@ -25,6 +25,13 @@
 
 ; Function declaration names belong to the enclosing scope so that
 ; callers outside the function body can resolve them.
+;
+; NOTE: tree-sitter does not evaluate #set! predicates — it has no built-in
+; concept of "place this definition one scope level up." This annotation is
+; metadata only; the consumer must detect it (predicate name and args) and
+; implement the scope-parent walk itself. A consumer that builds a
+; scope -> definitions map by structural nesting alone will misplace this
+; definition: it will end up invisible to callers outside the function body.
 (function_declaration
   name: (identifier) @local.definition.function
   (#set! definition.function.scope parent))

package/queries/tags.scm

@@ -1,5 +1,19 @@
 ; Tags queries for ucode.
 ; Used by GitHub code navigation and tools that index symbol definitions.
+;
+; NOTE on #strip! and #select-adjacent!: these are non-standard predicates with
+; no tree-sitter runtime support — tree-sitter only evaluates #eq?/#match?/
+; #not-match?-family predicates and filters non-matching captures; everything
+; else (including these two) passes through as metadata for the consumer to
+; act on. A consumer that reads @doc captures verbatim gets raw `/** ... */`
+; text with leading `*` characters intact (no #strip!), and may associate a
+; comment from several lines above with the wrong definition (no
+; #select-adjacent!). Expected semantics:
+;   #strip! @capture <regex>        — strip text matching <regex> from the
+;                                      start/end of @capture's text.
+;   #select-adjacent! @a @b         — only keep this match if @a is on a line
+;                                      immediately preceding @b (no blank
+;                                      lines or other statements between).
 
 ; -------------------------------------------------------------------------
 ; Function definitions — named declarations (brace body or endfunction body)
@@ -87,5 +101,4 @@
 
 (call_expression
   function: (member_expression
-    property: (property_identifier) @name)
-  arguments: (_) @reference.call)
+    property: (property_identifier) @name)) @reference.call

package/src/grammar.json

@@ -223,8 +223,12 @@
               "value": "export"
             },
             {
-              "type": "SYMBOL",
-              "name": "export_clause"
+              "type": "FIELD",
+              "name": "clause",
+              "content": {
+                "type": "SYMBOL",
+                "name": "export_clause"
+              }
             },
             {
               "type": "SYMBOL",
@@ -422,8 +426,12 @@
               "type": "SEQ",
               "members": [
                 {
-                  "type": "SYMBOL",
-                  "name": "import_clause"
+                  "type": "FIELD",
+                  "name": "clause",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "import_clause"
+                  }
                 },
                 {
                   "type": "STRING",
@@ -459,19 +467,31 @@
       "type": "CHOICE",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "namespace_import"
+          "type": "FIELD",
+          "name": "namespace",
+          "content": {
+            "type": "SYMBOL",
+            "name": "namespace_import"
+          }
         },
         {
-          "type": "SYMBOL",
-          "name": "named_imports"
+          "type": "FIELD",
+          "name": "named",
+          "content": {
+            "type": "SYMBOL",
+            "name": "named_imports"
+          }
         },
         {
           "type": "SEQ",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "identifier"
+              "type": "FIELD",
+              "name": "default",
+              "content": {
+                "type": "SYMBOL",
+                "name": "identifier"
+              }
             },
             {
               "type": "CHOICE",
@@ -487,12 +507,20 @@
                       "type": "CHOICE",
                       "members": [
                         {
-                          "type": "SYMBOL",
-                          "name": "namespace_import"
+                          "type": "FIELD",
+                          "name": "namespace",
+                          "content": {
+                            "type": "SYMBOL",
+                            "name": "namespace_import"
+                          }
                         },
                         {
-                          "type": "SYMBOL",
-                          "name": "named_imports"
+                          "type": "FIELD",
+                          "name": "named",
+                          "content": {
+                            "type": "SYMBOL",
+                            "name": "named_imports"
+                          }
                         }
                       ]
                     }

package/src/node-types.json

@@ -909,6 +909,16 @@
     "type": "export_statement",
     "named": true,
     "fields": {
+      "clause": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "export_clause",
+            "named": true
+          }
+        ]
+      },
       "declaration": {
         "multiple": false,
         "required": false,
@@ -929,16 +939,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "export_clause",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -1762,24 +1762,37 @@
   {
     "type": "import_clause",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "identifier",
-          "named": true
-        },
-        {
-          "type": "named_imports",
-          "named": true
-        },
-        {
-          "type": "namespace_import",
-          "named": true
-        }
-      ]
+    "fields": {
+      "default": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "identifier",
+            "named": true
+          }
+        ]
+      },
+      "named": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "named_imports",
+            "named": true
+          }
+        ]
+      },
+      "namespace": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "namespace_import",
+            "named": true
+          }
+        ]
+      }
     }
   },
   {
@@ -1820,6 +1833,16 @@
     "type": "import_statement",
     "named": true,
     "fields": {
+      "clause": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "import_clause",
+            "named": true
+          }
+        ]
+      },
       "source": {
         "multiple": false,
         "required": true,
@@ -1830,16 +1853,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "import_clause",
-          "named": true
-        }
-      ]
     }
   },
   {