hack: fix new prisma commit parsing failure

Author: aster-void

flake.nix

@@ -5,39 +5,35 @@
     treefmt-nix.url = "github:numtide/treefmt-nix";
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
   };
-  outputs =
-    {
-      self,
-      nixpkgs,
-      flake-utils,
-      treefmt-nix,
-    }:
-    let
-      prisma-factory = import ./prisma.nix;
-    in
+  outputs = {
+    self,
+    nixpkgs,
+    flake-utils,
+    treefmt-nix,
+  }: let
+    prisma-factory = import ./prisma.nix;
+  in
     flake-utils.lib.eachDefaultSystem (
-      system:
-      let
+      system: let
         pkgs = nixpkgs.legacyPackages.${system};
 
         yarn-v1 = pkgs.writeShellApplication {
           name = "yarn-v1";
           checkPhase = "";
-          runtimeInputs = [ pkgs.yarn ];
+          runtimeInputs = [pkgs.yarn];
           text = "yarn $@";
         };
         yarn-berry = pkgs.writeShellApplication {
           name = "yarn-berry";
           checkPhase = "";
-          runtimeInputs = [ pkgs.yarn-berry ];
+          runtimeInputs = [pkgs.yarn-berry];
           text = "yarn $@";
         };
         treefmt = treefmt-nix.lib.evalModule pkgs {
           # nixfmt is nixfmt-rfc-style
           programs.nixfmt.enable = true;
         };
-      in
-      {
+      in {
         formatter = treefmt.config.build.wrapper;
         checks =
           (pkgs.callPackages ./tests.nix {
@@ -60,46 +56,47 @@
           })
           // {
             format = treefmt.config.build.check self;
-            fetcher-assert-npm =
-              let
-                # force download debian for consistent hash across systems
-                binaryTargetBySystem = {
-                  x86_64-linux = "debian";
-                  aarch64-linux = "debian";
-                  x86_64-darwin = "debian";
-                  aarch64-darwin = "debian";
-                };
-                prisma-legacy = prisma-factory {
+            fetcher-assert-npm = let
+              # force download debian for consistent hash across systems
+              binaryTargetBySystem = {
+                x86_64-linux = "debian";
+                aarch64-linux = "debian";
+                x86_64-darwin = "debian";
+                aarch64-darwin = "debian";
+              };
+              prisma-legacy = prisma-factory {
+                inherit pkgs binaryTargetBySystem;
+                hash = "sha256-R9PG286KQTbzF0r/PPcShUkMiYam2prRh/JICjmhCZA=";
+              };
+              prisma-new = lockName: lockFile:
+                prisma-factory {
                   inherit pkgs binaryTargetBySystem;
                   hash = "sha256-R9PG286KQTbzF0r/PPcShUkMiYam2prRh/JICjmhCZA=";
+                  ${lockName} = lockFile;
                 };
-                prisma-new =
-                  lockName: lockFile:
-                  prisma-factory {
-                    inherit pkgs binaryTargetBySystem;
-                    hash = "sha256-R9PG286KQTbzF0r/PPcShUkMiYam2prRh/JICjmhCZA=";
-                    ${lockName} = lockFile;
-                  };
-              in
-              assert
-                (prisma-legacy.fromNpmLock ./npm/package-lock.json).env
-                == (prisma-new "npmLock" ./npm/package-lock.json).env;
-              pkgs.hello;
+            in
+              assert (prisma-legacy.fromNpmLock ./npm/package-lock.json).env
+              == (prisma-new "npmLock" ./npm/package-lock.json).env;
+                pkgs.hello;
+            prisma-next =
+              (self.lib.prisma-factory {
+                inherit pkgs;
+                _commit = "next-0c19ccc313cf9911a90d99d2ac2eb0280c76c513";
+              }).package;
           };
         packages.default =
           (prisma-factory {
             inherit pkgs;
             hash = "sha256-R9PG286KQTbzF0r/PPcShUkMiYam2prRh/JICjmhCZA=";
             _commit = "6a3747c37ff169c90047725a05a6ef02e32ac97e";
           }).package;
-        devShells.default =
-          let
-            prisma = prisma-factory {
-              inherit pkgs;
-              hash = "sha256-R9PG286KQTbzF0r/PPcShUkMiYam2prRh/JICjmhCZA=";
-              _commit = "6a3747c37ff169c90047725a05a6ef02e32ac97e";
-            };
-          in
+        devShells.default = let
+          prisma = prisma-factory {
+            inherit pkgs;
+            hash = "sha256-R9PG286KQTbzF0r/PPcShUkMiYam2prRh/JICjmhCZA=";
+            _commit = "6a3747c37ff169c90047725a05a6ef02e32ac97e";
+          };
+        in
           pkgs.mkShell {
             buildInputs = [
               pkgs.nodejs-18_x

prisma.nix

@@ -25,16 +25,18 @@
     x86_64-darwin = "darwin";
     aarch64-darwin = "darwin-arm64";
   },
-}:
-let
+}: let
   inherit (pkgs) lib;
-  parsers = pkgs.callPackage ./lib/parsers.nix { };
+  parsers = pkgs.callPackage ./lib/parsers.nix {};
   binaryTarget = binaryTargetBySystem.${pkgs.system};
-  fromCommit =
-    commit:
-    if builtins.stringLength commit != 40 then
-      throw "invalid commit: got ${commit}"
-    else if hash != null then
+  fromCommit = _commit: let
+    # HACK: _commit may be "next-0c19ccc313cf9911a90d99d2ac2eb0280c76c513" instead of "0c19ccc313cf9911a90d99d2ac2eb0280c76c513"
+    commit = lib.lists.last (lib.splitString "-" _commit);
+  in
+    if builtins.stringLength commit != 40
+    then throw "invalid commit: got ${commit}"
+    else if hash != null
+    then
       pkgs.callPackage ./lib/fetcher.nix {
         inherit
           commit
@@ -66,33 +68,32 @@ let
   fromYarnLock = file: fromCommit (parsers.parseYarnLock file);
   fromBunLock = file: fromCommit (parsers.parseBunLock file);
 in
-lib.warnIf (nixpkgs != null)
+  lib.warnIf (nixpkgs != null)
   ''
     `nixpkgs` argument in nix-prisma-utils is deprecated. please replace it with `pkgs`.
     examples:
       if your code has `inherit nixpkgs;`, replace it with `pkgs = nixpkgs;`.
       if your code has `nixpkgs = pkgs;`, replace it with `pkgs = pkgs;` or `inherit pkgs;`.
   ''
   (
-    if _commit != null then
-      fromCommit _commit
-    else if npmLock != null then
-      fromNpmLock npmLock
-    else if yarnLock != null then
-      fromYarnLock yarnLock
-    else if pnpmLock != null then
-      fromPnpmLock pnpmLock
-    else if bunLock != null then
-      fromBunLock bunLock
-    else
-      {
-        # builder pattern
-        inherit
-          fromCommit
-          fromNpmLock
-          fromYarnLock
-          fromPnpmLock
-          fromBunLock
-          ;
-      }
+    if _commit != null
+    then fromCommit _commit
+    else if npmLock != null
+    then fromNpmLock npmLock
+    else if yarnLock != null
+    then fromYarnLock yarnLock
+    else if pnpmLock != null
+    then fromPnpmLock pnpmLock
+    else if bunLock != null
+    then fromBunLock bunLock
+    else {
+      # builder pattern
+      inherit
+        fromCommit
+        fromNpmLock
+        fromYarnLock
+        fromPnpmLock
+        fromBunLock
+        ;
+    }
   )