tree-sitter-syscript 0.1.0 → 1.0.0

package/bindings/node/binding.cc

@@ -0,0 +1,19 @@
+#include <napi.h>
+
+typedef struct TSLanguage TSLanguage;
+
+extern "C" TSLanguage *tree_sitter_syscript();
+
+// "tree-sitter", "language" hashed with BLAKE2
+const napi_type_tag LANGUAGE_TYPE_TAG = {
+    0x8AF2E5212AD58ABF, 0xD5006CAD83ABBA16
+};
+
+Napi::Object Init(Napi::Env env, Napi::Object exports) {
+    auto language = Napi::External<TSLanguage>::New(env, tree_sitter_syscript());
+    language.TypeTag(&LANGUAGE_TYPE_TAG);
+    exports["language"] = language;
+    return exports;
+}
+
+NODE_API_MODULE(tree_sitter_syscript_binding, Init)

package/bindings/node/binding_test.js

@@ -0,0 +1,9 @@
+const assert = require("node:assert");
+const { test } = require("node:test");
+
+const Parser = require("tree-sitter");
+
+test("can load grammar", () => {
+  const parser = new Parser();
+  assert.doesNotThrow(() => parser.setLanguage(require(".")));
+});

package/bindings/node/index.d.ts

@@ -0,0 +1,27 @@
+type BaseNode = {
+  type: string;
+  named: boolean;
+};
+
+type ChildNode = {
+  multiple: boolean;
+  required: boolean;
+  types: BaseNode[];
+};
+
+type NodeInfo =
+  | (BaseNode & {
+      subtypes: BaseNode[];
+    })
+  | (BaseNode & {
+      fields: { [name: string]: ChildNode };
+      children: ChildNode[];
+    });
+
+type Language = {
+  language: unknown;
+  nodeTypeInfo: NodeInfo[];
+};
+
+declare const language: Language;
+export = language;

package/bindings/node/index.js

@@ -0,0 +1,11 @@
+const root = require("path").join(__dirname, "..", "..");
+
+module.exports =
+  typeof process.versions.bun === "string"
+    // Support `bun build --compile` by being statically analyzable enough to find the .node file at build-time
+    ? require(`../../prebuilds/${process.platform}-${process.arch}/tree-sitter-syscript.node`)
+    : require("node-gyp-build")(root);
+
+try {
+  module.exports.nodeTypeInfo = require("../../src/node-types.json");
+} catch (_) {}

package/grammar.js

@@ -7,10 +7,12 @@
 /// <reference types="tree-sitter-cli/dsl" />
 // @ts-check
 
+const MULTILINE_COMMENT_REGEX = /[^*]*\*+([^\/*][^*]*\*+)*/;
+
 module.exports = grammar({
 	name: "syscript",
 
-	extras: $ => [/\s/, $.comment],
+	extras: $ => [/\s/, $.comment],	
 
 	conflicts: $ => [
 		[$.code_block, $.struct_literal]
@@ -21,11 +23,12 @@ module.exports = grammar({
 
 		shebang: $ => seq("#!", /.*/),
 
-		comment: $ => choice($.single_line_comment, $.documentation_comment, $.multi_line_comment, $.unclosed_multi_line_comment),
+		comment: $ => choice($.single_line_comment, $.multi_line_comment, $.doc_comment),
 		single_line_comment: $ => token(seq("//", /.*/)),
-		documentation_comment: $ => prec.left(1, token(seq("/**", /(.*)*(\n.*)*/, "*/"))),
-		multi_line_comment: $ => prec.left(1, token(seq("/*", /(.*)*(\n.*)*/, "*/"))),
-
+		doc_comment: $ => token(seq("/**", MULTILINE_COMMENT_REGEX, "/")), 
+		multi_line_comment: $ => token(seq("/*", MULTILINE_COMMENT_REGEX, "/")), 
+		
+		
 		classes: $ =>
 			seq("class", field("name", $.identifier), optional(seq("extends", $.identifier)), "{", field("fields", repeat(choice($.field, $.method))), "}"),
 		structs: $ => seq("struct", field("name", $.identifier), optional(seq("extends", $.identifier)), "{", field("fields", repeat($.field)), "}"),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "tree-sitter-syscript",
-	"version": "0.1.0",
+	"version": "1.0.0",
 	"description": "Syscript grammar for tree-sitter",
 	"repository": "https://github.com/tree-sitter/tree-sitter-syscript",
 	"license": "MIT",

package/queries/highlights.scm

@@ -41,7 +41,7 @@
 (identifier) @variable
 
 (comment) @comment
-(documentation_comment) @comment.doc
+(doc_comment) @comment.doc
 
 (const_declaration
 	(identifier) @constant)

package/src/grammar.json

@@ -71,17 +71,13 @@
           "type": "SYMBOL",
           "name": "single_line_comment"
         },
-        {
-          "type": "SYMBOL",
-          "name": "documentation_comment"
-        },
         {
           "type": "SYMBOL",
           "name": "multi_line_comment"
         },
         {
           "type": "SYMBOL",
-          "name": "unclosed_multi_line_comment"
+          "name": "doc_comment"
         }
       ]
     },
@@ -101,55 +97,27 @@
         ]
       }
     },
-    "documentation_comment": {
-      "type": "PREC_LEFT",
-      "value": 1,
+    "doc_comment": {
+      "type": "TOKEN",
       "content": {
-        "type": "TOKEN",
-        "content": {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "/**"
-            },
-            {
-              "type": "PATTERN",
-              "value": "(.*)*(\\n.*)*"
-            },
-            {
-              "type": "STRING",
-              "value": "*/"
-            }
-          ]
-        }
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "/**"
+          },
+          {
+            "type": "PATTERN",
+            "value": "[^*]*\\*+([^\\/*][^*]*\\*+)*"
+          },
+          {
+            "type": "STRING",
+            "value": "/"
+          }
+        ]
       }
     },
     "multi_line_comment": {
-      "type": "PREC_LEFT",
-      "value": 1,
-      "content": {
-        "type": "TOKEN",
-        "content": {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "/*"
-            },
-            {
-              "type": "PATTERN",
-              "value": "(.*)*(\\n.*)*"
-            },
-            {
-              "type": "STRING",
-              "value": "*/"
-            }
-          ]
-        }
-      }
-    },
-    "unclosed_multi_line_comment": {
       "type": "TOKEN",
       "content": {
         "type": "SEQ",
@@ -160,7 +128,11 @@
           },
           {
             "type": "PATTERN",
-            "value": "(.*)*(\\n.*)*$"
+            "value": "[^*]*\\*+([^\\/*][^*]*\\*+)*"
+          },
+          {
+            "type": "STRING",
+            "value": "/"
           }
         ]
       }

package/src/node-types.json

@@ -129,7 +129,7 @@
       "required": true,
       "types": [
         {
-          "type": "documentation_comment",
+          "type": "doc_comment",
           "named": true
         },
         {
@@ -1201,7 +1201,7 @@
     "named": false
   },
   {
-    "type": "documentation_comment",
+    "type": "doc_comment",
     "named": true
   },
   {