tree-sitter-muttrc 0.0.3 → 0.0.5

package/binding.gyp

@@ -1,16 +1,21 @@
-{  # noqa: B018 # type: ignore
-    "targets": [
-        {
-            "target_name": "tree_sitter_muttrc_binding",
-            "include_dirs": ["<!(node -e \"require('nan')\")", "src"],
-            "sources": [
-                "bindings/node/binding.cc",
-                "src/parser.c",
-                # If your language uses an external scanner, add it here.
-            ],
-            "cflags_c": [
-                "-std=c99",
-            ],
-        }
-    ]
+{
+  "targets": [
+    {
+      "target_name": "tree_sitter_muttrc_binding",
+      "dependencies": [
+        "<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except",
+      ],
+      "include_dirs": [
+        "src",
+      ],
+      "sources": [
+        "bindings/node/binding.cc",
+        "src/parser.c",
+        # NOTE: if your language has an external scanner, add it here.
+      ],
+      "cflags_c": [
+        "-std=c11",
+      ],
+    }
+  ]
 }

package/bindings/node/binding.cc

@@ -1,28 +1,20 @@
-#include "tree_sitter/parser.h"
-#include <node.h>
-#include "nan.h"
+#include <napi.h>
 
-using namespace v8;
+typedef struct TSLanguage TSLanguage;
 
-extern "C" TSLanguage * tree_sitter_muttrc();
+extern "C" TSLanguage *tree_sitter_muttrc();
 
-namespace {
+// "tree-sitter", "language" hashed with BLAKE2
+const napi_type_tag LANGUAGE_TYPE_TAG = {
+  0x8AF2E5212AD58ABF, 0xD5006CAD83ABBA16
+};
 
-NAN_METHOD(New) {}
-
-void Init(Local<Object> exports, Local<Object> module) {
-  Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
-  tpl->SetClassName(Nan::New("Language").ToLocalChecked());
-  tpl->InstanceTemplate()->SetInternalFieldCount(1);
-
-  Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
-  Local<Object> instance = constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
-  Nan::SetInternalFieldPointer(instance, 0, tree_sitter_muttrc());
-
-  Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("muttrc").ToLocalChecked());
-  Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
+Napi::Object Init(Napi::Env env, Napi::Object exports) {
+    exports["name"] = Napi::String::New(env, "muttrc");
+    auto language = Napi::External<TSLanguage>::New(env, tree_sitter_muttrc());
+    language.TypeTag(&LANGUAGE_TYPE_TAG);
+    exports["language"] = language;
+    return exports;
 }
 
-NODE_MODULE(tree_sitter_muttrc_binding, Init)
-
-}  // namespace
+NODE_API_MODULE(tree_sitter_muttrc_binding, Init)

package/bindings/node/index.d.ts

@@ -0,0 +1,28 @@
+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 = {
+  name: string;
+  language: unknown;
+  nodeTypeInfo: NodeInfo[];
+};
+
+declare const language: Language;
+export = language;

package/bindings/node/index.js

@@ -1,18 +1,6 @@
-try {
-  module.exports = require("../../build/Release/tree_sitter_muttrc_binding");
-} catch (error1) {
-  if (error1.code !== 'MODULE_NOT_FOUND') {
-    throw error1;
-  }
-  try {
-    module.exports = require("../../build/Debug/tree_sitter_muttrc_binding");
-  } catch (error2) {
-    if (error2.code !== 'MODULE_NOT_FOUND') {
-      throw error2;
-    }
-    throw error1
-  }
-}
+const root = require("path").join(__dirname, "..", "..");
+
+module.exports = require("node-gyp-build")(root);
 
 try {
   module.exports.nodeTypeInfo = require("../../src/node-types.json");

package/grammar.js

@@ -258,7 +258,7 @@ module.exports = grammar({
             optional($._attributes),
             $.foreground,
             $.background,
-            $._regex
+            optional($._regex)
           ),
           seq(
             "compose",
@@ -467,7 +467,6 @@ module.exports = grammar({
         quoted_string('"', $.shell),
         quoted_string("`", $.shell),
         alias($._word, $.shell),
-        "\n"
       ),
     _regex: ($) =>
       choice(
@@ -475,7 +474,6 @@ module.exports = grammar({
         quoted_string('"', $.regex),
         quoted_string("`", $.shell),
         alias($._word, $.regex),
-        "\n"
       ),
     _word: (_) => /(\\\r?\n|[^"'`\s])(\S|\\\s)*/,
 
@@ -508,7 +506,7 @@ function quoted_string(char, name) {
   return seq(
     char,
     alias(
-      field("content", new RegExp("([^" + char + "]|\\\\" + char + ")+")),
+      field("content", new RegExp("([^" + char + "]|\\\\" + char + ")*")),
       name
     ),
     char

package/package.json

@@ -1,28 +1,53 @@
 {
   "name": "tree-sitter-muttrc",
-  "version": "0.0.3",
-  "description": "muttrc grammar for tree-sitter",
+  "version": "0.0.5",
+  "description": "Muttrc grammar for tree-sitter",
+  "repository": "github:tree-sitter/tree-sitter-muttrc",
+  "license": "MIT",
   "main": "bindings/node",
+  "types": "bindings/node",
   "keywords": [
+    "incremental",
     "parsing",
-    "incremental"
+    "tree-sitter",
+    "muttrc"
+  ],
+  "files": [
+    "grammar.js",
+    "binding.gyp",
+    "prebuilds/**",
+    "bindings/node/*",
+    "queries/*",
+    "src/**"
   ],
   "dependencies": {
-    "nan": "^2.12.1"
+    "node-addon-api": "^7.1.0",
+    "node-gyp-build": "^4.8.0"
   },
   "devDependencies": {
-    "tree-sitter-cli": "^0.20.8"
+    "prebuildify": "^6.0.0",
+    "tree-sitter-cli": "^0.22.2"
+  },
+  "peerDependencies": {
+    "tree-sitter": "^0.21.0"
+  },
+  "peerDependenciesMeta": {
+    "tree-sitter": {
+      "optional": true
+    }
   },
   "scripts": {
-    "test": "tree-sitter test"
+    "install": "node-gyp-build",
+    "prebuildify": "prebuildify --napi --strip",
+    "build": "tree-sitter generate --no-bindings",
+    "build-wasm": "tree-sitter build --wasm",
+    "test": "tree-sitter test",
+    "parse": "tree-sitter parse"
   },
   "tree-sitter": [
     {
       "scope": "source.muttrc",
-      "file-types": [
-        "muttrc",
-        "neomuttrc"
-      ]
+      "injection-regex": "^muttrc$"
     }
   ]
 }

package/src/grammar.json

@@ -1498,8 +1498,16 @@
                   "name": "background"
                 },
                 {
-                  "type": "SYMBOL",
-                  "name": "_regex"
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "_regex"
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
                 }
               ]
             },
@@ -3719,7 +3727,7 @@
                 "name": "content",
                 "content": {
                   "type": "PATTERN",
-                  "value": "([^']|\\\\')+"
+                  "value": "([^']|\\\\')*"
                 }
               },
               "named": true,
@@ -3745,7 +3753,7 @@
                 "name": "content",
                 "content": {
                   "type": "PATTERN",
-                  "value": "([^\"]|\\\\\")+"
+                  "value": "([^\"]|\\\\\")*"
                 }
               },
               "named": true,
@@ -3771,7 +3779,7 @@
                 "name": "content",
                 "content": {
                   "type": "PATTERN",
-                  "value": "([^`]|\\\\`)+"
+                  "value": "([^`]|\\\\`)*"
                 }
               },
               "named": true,
@@ -3791,10 +3799,6 @@
           },
           "named": true,
           "value": "shell"
-        },
-        {
-          "type": "STRING",
-          "value": "\n"
         }
       ]
     },
@@ -3815,7 +3819,7 @@
                 "name": "content",
                 "content": {
                   "type": "PATTERN",
-                  "value": "([^']|\\\\')+"
+                  "value": "([^']|\\\\')*"
                 }
               },
               "named": true,
@@ -3841,7 +3845,7 @@
                 "name": "content",
                 "content": {
                   "type": "PATTERN",
-                  "value": "([^\"]|\\\\\")+"
+                  "value": "([^\"]|\\\\\")*"
                 }
               },
               "named": true,
@@ -3867,7 +3871,7 @@
                 "name": "content",
                 "content": {
                   "type": "PATTERN",
-                  "value": "([^`]|\\\\`)+"
+                  "value": "([^`]|\\\\`)*"
                 }
               },
               "named": true,
@@ -3887,10 +3891,6 @@
           },
           "named": true,
           "value": "regex"
-        },
-        {
-          "type": "STRING",
-          "value": "\n"
         }
       ]
     },
@@ -3990,4 +3990,3 @@
   "inline": [],
   "supertypes": []
 }
-

package/src/node-types.json

@@ -6866,10 +6866,6 @@
       ]
     }
   },
-  {
-    "type": "\n",
-    "named": false
-  },
   {
     "type": " ",
     "named": false