feat: improve flakes structure

.envrc

@@ -0,0 +1,5 @@
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
+fi
+
+use flake

.gitignore

@@ -1,2 +1,10 @@
+### direnv ###
+.direnv
+
+### nix ###
+result*
+repl-result-*
+
+### tree-sitter ###
 build
 node_modules

.yamlfmt

@@ -0,0 +1,3 @@
+formatter:
+  type: basic
+  retain_line_breaks: true

default.nix

@@ -1,19 +1,23 @@
-{ pkgs ? import <nixpkgs> { }
-, lib ? pkgs.lib
-, src ? lib.cleanSource ./.
-}:
+{system ? builtins.currentSystem}: let
+  lock = builtins.fromJSON (builtins.readFile ./flake.lock);
 
-pkgs.tree-sitter-grammars.tree-sitter-nix.overrideAttrs (old: {
-  name = "tree-sitter-nix-dev";
-  version = "dev";
-  inherit src;
+  root = lock.nodes.${lock.root};
+  inherit
+    (lock.nodes.${root.inputs.flake-compat}.locked)
+    owner
+    repo
+    rev
+    narHash
+    ;
 
-  doCheck = true;
-  checkInputs = [
-    pkgs.tree-sitter
-    pkgs.nodejs
-  ];
-  checkPhase = ''
-    HOME=$(mktemp -d) tree-sitter test
-  '';
-})
+  flake-compat = fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
+    sha256 = narHash;
+  };
+
+  flake = import flake-compat {
+    inherit system;
+    src = ./.;
+  };
+in
+  flake.defaultNix

devshell.nix

@@ -0,0 +1,16 @@
+{pkgs, ...}:
+pkgs.mkShell {
+  packages = with pkgs; [
+    nodejs
+    python3
+
+    tree-sitter
+    editorconfig-checker
+
+    rustc
+    cargo
+
+    go
+    gcc
+  ];
+}

flake.nix

@@ -8,114 +8,119 @@
 
     nix-github-actions.url = "github:nix-community/nix-github-actions";
     nix-github-actions.inputs.nixpkgs.follows = "nixpkgs";
+
+    flake-compat.url = "github:nix-community/flake-compat";
+
+    treefmt-nix = {
+      url = "github:numtide/treefmt-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, flake-utils, nix-github-actions }: (
-    (flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-        inherit (pkgs) lib;
+  outputs = {
+    self,
+    flake-utils,
+    nix-github-actions,
+    nixpkgs,
+    treefmt-nix,
+    ...
+  }: (
+    (flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = nixpkgs.legacyPackages.${system};
+      inherit (pkgs) lib;
+      treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
+    in {
+      checks = let
+        # shellPackages = (pkgs.callPackage ./shell.nix { }).packages;
+        # If the generated code differs from the checked in we need
+        # to check in the newly generated sources.
+        mkCheck = name: check:
+          pkgs.runCommand name
+          {
+            inherit (self.devShells.${system}.default) nativeBuildInputs;
+          } ''
+            cp -rv ${self} src
+            chmod +w -R src
+            cd src
+
+            ${check}
 
+            touch $out
+          '';
       in
-      {
-        checks =
-          let
-            # shellPackages = (pkgs.callPackage ./shell.nix { }).packages;
-
-            # If the generated code differs from the checked in we need
-            # to check in the newly generated sources.
-            mkCheck = name: check: pkgs.runCommand name
-              {
-                inherit (self.devShells.${system}.default) nativeBuildInputs;
-              } ''
-              cp -rv ${self} src
-              chmod +w -R src
-              cd src
-
-              ${check}
-
-              touch $out
-            '';
+        {
+          build = self.packages.${system}.tree-sitter-nix;
+
+          editorconfig = mkCheck "editorconfig" "editorconfig-checker";
+
+          # If the generated code differs from the checked in we need
+          # to check in the newly generated sources.
+          generated-diff = mkCheck "generated-diff" ''
+            HOME=. npm run generate
+            diff -r src/ ${self}/src
+          '';
+
+          treefmt = treefmtEval.config.build.check self;
 
+          rust-bindings = let
+            cargo' = lib.importTOML ./Cargo.toml;
           in
-          {
-            build = self.packages.${system}.tree-sitter-nix;
-
-            editorconfig = mkCheck "editorconfig" "editorconfig-checker";
-
-            # If the generated code differs from the checked in we need
-            # to check in the newly generated sources.
-            generated-diff = mkCheck "generated-diff" ''
-              HOME=. npm run generate
-              diff -r src/ ${self}/src
-            '';
-
-            treefmt = mkCheck "treefmt" "treefmt --no-cache --fail-on-change";
-
-            rust-bindings =
-              let
-                cargo' = lib.importTOML ./Cargo.toml;
-              in
-              pkgs.rustPlatform.buildRustPackage {
-                pname = cargo'.package.name;
-                inherit (cargo'.package) version;
-                src = self;
-                cargoLock = {
-                  lockFile = ./Cargo.lock;
-                };
+            pkgs.rustPlatform.buildRustPackage {
+              pname = cargo'.package.name;
+              inherit (cargo'.package) version;
+              src = self;
+              cargoLock = {
+                lockFile = ./Cargo.lock;
               };
-
-          } // lib.optionalAttrs (!pkgs.stdenv.isDarwin) {
-            # Requires xcode
-            node-bindings =
-              let
-                package' = lib.importJSON ./package.json;
-              in
-              pkgs.stdenv.mkDerivation {
-                pname = package'.name;
-                inherit (package') version;
-                src = self;
-                nativeBuildInputs = with pkgs; [
-                  importNpmLock.hooks.npmConfigHook
-                  nodejs
-                  nodejs.passthru.python # for node-gyp
-                  npmHooks.npmBuildHook
-                  npmHooks.npmInstallHook
-                  tree-sitter
-                ];
-                npmDeps = pkgs.importNpmLock {
-                  npmRoot = ./.;
-                };
-                buildPhase = ''
-                  runHook preBuild
-                  ${pkgs.nodePackages.node-gyp}/bin/node-gyp configure
-                  npm run build
-                  runHook postBuild
-                '';
-                installPhase = "touch $out";
+            };
+        }
+        // lib.optionalAttrs (!pkgs.stdenv.isDarwin) {
+          # Requires xcode
+          node-bindings = let
+            package' = lib.importJSON ./package.json;
+          in
+            pkgs.stdenv.mkDerivation {
+              pname = package'.name;
+              inherit (package') version;
+              src = self;
+              nativeBuildInputs = with pkgs; [
+                importNpmLock.hooks.npmConfigHook
+                nodejs
+                nodejs.passthru.python # for node-gyp
+                npmHooks.npmBuildHook
+                npmHooks.npmInstallHook
+                tree-sitter
+              ];
+              npmDeps = pkgs.importNpmLock {
+                npmRoot = ./.;
               };
-          };
-
-        packages.tree-sitter-nix = pkgs.callPackage ./default.nix { src = self; };
-        packages.default = self.packages.${system}.tree-sitter-nix;
-        devShells.default = pkgs.callPackage ./shell.nix { };
+              buildPhase = ''
+                runHook preBuild
+                ${pkgs.nodePackages.node-gyp}/bin/node-gyp configure
+                npm run build
+                runHook postBuild
+              '';
+              installPhase = "touch $out";
+            };
+        };
 
-        formatter = pkgs.writeShellScriptBin "tree-sitter-nix-fmt" ''
-          exec ${pkgs.treefmt}/bin/treefmt --config-file ${./treefmt.toml} "$@"
-        '';
+      packages.tree-sitter-nix = pkgs.callPackage ./package.nix {src = self;};
+      packages.default = self.packages.${system}.tree-sitter-nix;
 
-      })) // {
+      devShells.default = pkgs.callPackage ./devshell.nix {};
 
+      formatter = treefmtEval.config.build.wrapper;
+    }))
+    // {
       githubActions = nix-github-actions.lib.mkGithubMatrix {
         # Inherit GHA actions matrix from a subset of platforms supported by hosted runners
         checks = {
           inherit (self.checks) x86_64-linux;
 
           # Don't run linters on darwin as it's just scheduling overhead
-          x86_64-darwin = builtins.removeAttrs self.checks.x86_64-darwin [ "editorconfig" "generated-diff" "treefmt" ];
+          x86_64-darwin = builtins.removeAttrs self.checks.x86_64-darwin ["editorconfig" "generated-diff" "treefmt"];
         };
       };
-
     }
   );
 }

grammar.js

@@ -206,7 +206,7 @@ module.exports = grammar({
           prec(
             precedence,
             seq(field("operator", operator), field("argument", $._expr_op)),
-          ),
+          )
         ),
       ),
 
@@ -234,7 +234,7 @@ module.exports = grammar({
               field("operator", operator),
               field("right", $._expr_op),
             ),
-          ),
+          )
         ),
         // right assoc.
         ...[
@@ -249,7 +249,7 @@ module.exports = grammar({
               field("operator", operator),
               field("right", $._expr_op),
             ),
-          ),
+          )
         ),
       ),
 

package.nix

@@ -0,0 +1,19 @@
+{
+  pkgs ? import <nixpkgs> {},
+  lib ? pkgs.lib,
+  src ? lib.cleanSource ./.,
+}:
+pkgs.tree-sitter-grammars.tree-sitter-nix.overrideAttrs (_old: {
+  name = "tree-sitter-nix-dev";
+  version = "dev";
+  inherit src;
+
+  doCheck = true;
+  checkInputs = [
+    pkgs.tree-sitter
+    pkgs.nodejs
+  ];
+  checkPhase = ''
+    HOME=$(mktemp -d) tree-sitter test
+  '';
+})