Migrating precommit hooks from LB

examples/build.nix

@@ -5,7 +5,6 @@ _:
 {
   imports =
     [
-      ./pre-commit.nix
       ./haskell-flake-project/build.nix
       ./rust-flake-project/build.nix
       ./typescript-flake-project/build.nix

examples/typescript-flake-project-with-extra-dependency/package.json

@@ -18,10 +18,7 @@
   },
   "author": "Jared Pon",
   "license": "ISC",
-  "files": 
-    [ "./dist/**/*"
-    , "./.extra-dependencies/**/*"
-    ],
+  "files": ["./dist/**/*", "./.extra-dependencies/**/*"],
   "dependencies": {
     "typescript": "^5.3.3",
     "typescript-flake-project": "file:.extra-dependencies/typescript-flake-project-1.0.0.tgz"

examples/typescript-flake-project-with-extra-dependency/src/MyLib/index.ts

@@ -1,5 +1,5 @@
-import * as TsFlakeProject from 'typescript-flake-project'
+import * as TsFlakeProject from "typescript-flake-project";
 
 export function helloWorld() {
-    TsFlakeProject.helloWorld();
+  TsFlakeProject.helloWorld();
 }

examples/typescript-flake-project-with-transitive-extra-dependency/src/MyLib/index.ts

@@ -1,9 +1,7 @@
-import * as TsFlakeProject from 'typescript-flake-project'
+import * as TsFlakeProject from "typescript-flake-project";
 
 export function helloWorld() {
-    TsFlakeProject.helloWorld();
+  TsFlakeProject.helloWorld();
 }
 
-
-
 helloWorld();

examples/typescript-flake-project/package.json

@@ -18,10 +18,7 @@
   },
   "author": "Jared Pon",
   "license": "ISC",
-  "files": 
-    [ "./dist/**/*"
-    , "./.extra-dependencies/**/*"
-    ],
+  "files": ["./dist/**/*", "./.extra-dependencies/**/*"],
   "dependencies": {
     "typescript": "^5.3.3"
   }

examples/typescript-flake-project/src/MyLib/index.ts

@@ -1,3 +1,3 @@
 export function helloWorld() {
-    console.log("Hello world!");
+  console.log("Hello world!");
 }

flake-lang/build.nix

@@ -7,6 +7,9 @@
 #   typescriptFlake = ...
 #   ...
 # };
+# flakeModule = {
+#   rustMonorepoPreCommit = ...
+# };
 # ```
 # This is unfortunately not super easy to do with flake-parts! Some useful
 # links + examples are as follows.
@@ -16,11 +19,31 @@
 { config, inputs, flake-parts-lib, lib, ... }: {
   options = {
     flake = flake-parts-lib.mkSubmoduleOptions {
+      # Expose attributes which are generated by the `perSystem` `lib` options
+      # e.g. it gives an option for things like
+      # ```
+      # lib.<system>.haskellFlake = ..
+      # ```
       lib = lib.mkOption {
         type = lib.types.lazyAttrsOf (lib.types.lazyAttrsOf (lib.types.functionTo lib.types.attrs));
         default = { };
         visible = false;
       };
+
+      # Expose attributes like
+      # ```
+      # flakeModule.rustMonorepoPreCommit = ..
+      # ```
+      flakeModule = {
+        rustMonorepoPreCommit = lib.mkOption {
+          type = lib.types.lazyAttrsOf lib.types.unspecified;
+          default = ./pre-commit-hooks/rust-monorepo.nix;
+          readOnly = true;
+          description = lib.mdDoc ''pre-commit-hooks.nix hook for Rust in a monorepo setting'';
+          example = lib.mdDoc ''TODO(bladyjoker)'';
+        };
+
+      };
     };
     perSystem = flake-parts-lib.mkPerSystemOption ({ pkgs, pkgsForCtl, pkgsForHaskellNix, pkgsForRust, ... }: {
       options = {
@@ -81,22 +104,6 @@
             example = lib.mdDoc ''TODO(jaredponn)'';
           };
 
-          rustMonorepoPreCommit = lib.mkOption {
-            type = lib.types.flakeModule;
-            default = ./pre-commit-hooks/rust-monorepo.nix;
-            readOnly = true;
-            description = lib.mdDoc ''pre-commit-hooks.nix hook for Rust in a monorepo setting'';
-            example = lib.mdDoc ''TODO(bladyjoker)'';
-          };
-
-          denoPreCommit = lib.mkOption {
-            type = lib.types.flakeModule;
-            default = ./pre-commit-hooks/deno.nix;
-            readOnly = true;
-            description = lib.mdDoc ''pre-commit-hooks.nix hook for Deno in a monorepo setting'';
-            example = lib.mdDoc ''TODO(bladyjoker)'';
-          };
-
         };
       };
     });

flake-lang/pre-commit-hooks/tools.nix

@@ -1,23 +1,16 @@
 { flake-parts-lib, lib, ... }: {
-  perSystem = flake-parts-lib.mkPerSystemOption ({ pkgs, pkgsForRust, ... }: {
-    options = {
-      flake-lang.pre-commit-hooks.tools = {
-
-        rustfmt = lib.mkOption {
-          type = lib.types.derivation;
-          default = pkgsForRust.rustfmt;
-          readOnly = false;
-          description = lib.mdDoc ''Rust formatter to use for pre-commit hooks'';
+  options = {
+    perSystem = flake-parts-lib.mkPerSystemOption ({ pkgsForRust, ... }: {
+      options = {
+        flake-lang.pre-commit-hooks.tools = {
+          rustfmt = lib.mkOption {
+            type = lib.types.package;
+            default = pkgsForRust.rustfmt;
+            readOnly = false;
+            description = lib.mdDoc ''Rust formatter to use for pre-commit hooks'';
+          };
         };
-
-        deno = lib.mkOption {
-          type = lib.types.derivation;
-          default = pkgs.deno;
-          readOnly = false;
-          description = lib.mdDoc ''Deno tool to use for pre-commit hooks'';
-        };
-
       };
-    };
-  });
+    });
+  };
 }

pre-commit.nix

@@ -1,6 +1,7 @@
 { inputs, ... }: {
   imports = [
     inputs.pre-commit-hooks.flakeModule
+    ./flake-lang/pre-commit-hooks/rust-monorepo.nix
   ];
   perSystem = { config, ... }: {
     devShells.default = config.pre-commit.devShell;
@@ -20,6 +21,19 @@
         cabal-fmt.enable = true;
         hlint.enable = true;
         fourmolu.enable = true;
+
+        # Typescript
+        denofmt = {
+          enable = true;
+          # NOTE(jaredponn): We follow the default files deno formats, except
+          # we exclude markdown files. See:
+          #   [1] https://docs.deno.com/runtime/manual/tools/formatter
+          files = ''^.*\.(js|ts|jsx|tsx|json|jsonc)$'';
+        };
+        denolint.enable = true;
+
+        # Rust
+        rustfmt-monorepo.enable = true;
       };
     };
   };