fixes for yarn translator and node builder

src/builders/nodejs/granular/default.nix

@@ -113,6 +113,11 @@ let
         
           pname = utils.sanitizeDerivationName name;
 
+          # only run build on the main package
+          runBuild =
+            packageName == mainPackageName
+                && version == mainPackageVersion;
+
           inherit dependenciesJson nodeDeps nodeSources version;
 
           src = getSource name version;
@@ -270,6 +275,8 @@ let
               else
                 echo "$installScript" | bash
               fi
+            elif [ -n "$runBuild" ] && [ "$(jq '.scripts.build' ./package.json)" != "null" ]; then
+              npm run build
             elif [ "$(jq '.scripts.postinstall' ./package.json)" != "null" ]; then
               npm --production --offline --nodedir=$nodeSources run postinstall
             fi

src/fetchers/http/default.nix

@@ -22,15 +22,19 @@
       });
 
       fetched = hash:
-        if lib.stringLength hash == 40 then
+        let drv = 
-          fetchurl {
+          if lib.stringLength hash == 40 then
-            inherit url;
+            fetchurl {
-            sha1 = hash;
+              inherit url;
-          }
+              sha1 = hash;
-        else
+            }
-          fetchurl {
+          else
-            inherit url hash;
+            fetchurl {
-          };
+              inherit url hash;
+            };
+        in drv.overrideAttrs (old: {
+          name = lib.strings.sanitizeDerivationName old.name;
+        });
 
     };
 }

src/translators/nodejs/pure/yarn-lock/default.nix

@@ -25,9 +25,13 @@
       b = builtins;
       dev = ! noDev;
       optional = ! noOptional;
-      yarnLock = utils.readTextFile "${lib.elemAt inputDirectories 0}/yarn.lock";
+  
-      packageJSON = b.fromJSON (b.readFile "${lib.elemAt inputDirectories 0}/package.json");
+      sourceDir = lib.elemAt inputDirectories 0;
-      parser = import ../yarn-lock/parser.nix { inherit lib; inherit (externals) nix-parsec;};
+      yarnLock = utils.readTextFile "${sourceDir}/yarn.lock";
+      packageJSON = b.fromJSON (b.readFile "${sourceDir}/package.json");
+      parser = import ../yarn-lock/parser.nix
+        { inherit lib; inherit (externals) nix-parsec;};
+
       tryParse = parser.parseLock yarnLock;
       parsedLock =
         if tryParse.type == "success" then
@@ -36,7 +40,10 @@
           let
             failureOffset = tryParse.value.offset;
           in
-            throw "parser failed at: \n${lib.substring failureOffset 50 tryParse.value.str}";
+            throw ''
+              parser failed at:
+              ${lib.substring failureOffset 50 tryParse.value.str}
+            '';
     in
     
     utils.simpleTranslate translatorName rec {
@@ -46,7 +53,10 @@
       mainPackageName =
         packageJSON.name or
           (if name != null then name else
-            throw "Could not identify package name. Please specify extra argument 'name'");
+            throw (
+              "Could not identify package name. "
+              + "Please specify extra argument 'name'"
+            ));
 
       mainPackageVersion = packageJSON.version or "unknown";
 
@@ -89,10 +99,13 @@
         dependencyObject.yarnName;
 
       getName = dependencyObject:
-        let
+        if lib.hasInfix "@git+" dependencyObject.yarnName then
-          version = lib.last (lib.splitString "@" dependencyObject.yarnName);
+          lib.head (lib.splitString "@git+" dependencyObject.yarnName)
-        in
+        else
-          lib.removeSuffix "@${version}" dependencyObject.yarnName;
+          let
+            version = lib.last (lib.splitString "@" dependencyObject.yarnName);
+          in
+            lib.removeSuffix "@${version}" dependencyObject.yarnName;
 
       getVersion = dependencyObject:
           dependencyObject.version;
@@ -117,7 +130,8 @@
                       if ! dependenciesByOriginalID ? ${yarnName} then
                         # handle missing lock file entry
                         let
-                          versionMatch = b.match ''.*\^([[:digit:]|\.]+)'' versionSpec;
+                          versionMatch =
+                            b.match ''.*\^([[:digit:]|\.]+)'' versionSpec;
                         in
                           {
                             inherit name;
@@ -132,15 +146,21 @@
 
       getSourceType = dependencyObject:
         if lib.hasInfix "@github:" dependencyObject.yarnName
-            || 
+            || (dependencyObject ? resolved
-            (dependencyObject ? resolved
+                && lib.hasInfix
-              && lib.hasInfix "codeload.github.com/" dependencyObject.resolved  ) then
+                  "codeload.github.com/"
+                  dependencyObject.resolved)
+            || (lib.hasInfix "@git+" dependencyObject.yarnName) then
           if dependencyObject ? integrity then
-            b.trace "Warning: Using git despite integrity exists for ${getName dependencyObject}"
+            b.trace (
+              "Warning: Using git despite integrity exists for"
+              + "${getName dependencyObject}"
+            )
               "git"
           else
             "git"
-        else if lib.hasInfix "@link:" dependencyObject.yarnName then
+        else if lib.hasInfix "@link:" dependencyObject.yarnName
+            || lib.hasInfix "@file:" dependencyObject.yarnName then
           "path"
         else
           "http";
@@ -148,23 +168,38 @@
       
       sourceConstructors = {
         git = dependencyObject:
-          let
+          if utils.identifyGitUrl dependencyObject.resolved then
-            gitUrlInfos = lib.splitString "/" dependencyObject.resolved;
+            (utils.parseGitUrl dependencyObject.resolved) // {
-            rev = lib.elemAt gitUrlInfos 6;
+              version = dependencyObject.version;
-            owner = lib.elemAt gitUrlInfos 3;
+            }
-            repo = lib.elemAt gitUrlInfos 4;
+          else
-            version = dependencyObject.version;
+            let
-          in
+              githubUrlInfos = lib.splitString "/" dependencyObject.resolved;
-          {
+              owner = lib.elemAt githubUrlInfos 3;
-            url = "https://github.com/${owner}/${repo}";
+              repo = lib.elemAt githubUrlInfos 4;
-            inherit rev version;
+              rev = lib.elemAt githubUrlInfos 6;
-          };
+              version = dependencyObject.version;
+            in
+            {
+              url = "https://github.com/${owner}/${repo}";
+              inherit rev version;
+            };
 
         path = dependencyObject:
-          {
+          if lib.hasInfix "@link:" dependencyObject.yarnName then
-            version = dependencyObject.version;     
+            {
-            path = lib.last (lib.splitString "@link:" dependencyObject.yarnName);
+              version = dependencyObject.version;     
-          };
+              path =
+                lib.last (lib.splitString "@link:" dependencyObject.yarnName);
+            }
+          else if lib.hasInfix "@file:" dependencyObject.yarnName then
+            {
+              version = dependencyObject.version;     
+              path =
+              lib.last (lib.splitString "@file:" dependencyObject.yarnName);
+            }
+          else
+            throw "unknown path format ${b.toJSON dependencyObject}";
 
         http = dependencyObject:
           {
@@ -175,7 +210,8 @@
                 dependencyObject.integrity
               else
                 let
-                  hash = lib.last (lib.splitString "#" dependencyObject.resolved);
+                  hash =
+                    lib.last (lib.splitString "#" dependencyObject.resolved);
                 in
                   if lib.stringLength hash == 40 then hash
               else