Merge pull request #82 from purkhusid/fix-generated-files

Fix detection of generated files

Author: tinder-maxwellelliott

src/main/java/com/bazel_diff/BazelTarget.java

@@ -7,6 +7,9 @@ interface BazelTarget {
     BazelRule getRule();
     boolean hasSourceFile();
     String getSourceFileName();
+    boolean hasGeneratedFile();
+    String getGeneratedFileName();
+    String getGeneratingRuleName();
 }
 
 class BazelTargetImpl implements BazelTarget {
@@ -41,5 +44,26 @@ public String getSourceFileName() {
         }
         return null;
     }
+
+    @Override
+    public boolean hasGeneratedFile() {
+        return target.hasGeneratedFile();
+    }
+
+    @Override
+    public String getGeneratedFileName() {
+        if (this.hasGeneratedFile()) {
+            return this.target.getGeneratedFile().getName();
+        }
+        return null;
+    }
+
+    @Override
+    public String getGeneratingRuleName() {
+        if (this.hasGeneratedFile()) {
+            return this.target.getGeneratedFile().getGeneratingRule();
+        }
+        return null;
+    }
 }
 

src/main/java/com/bazel_diff/TargetHashingClient.java

@@ -51,7 +51,6 @@ private byte[] createDigestForTarget(
             Map<String, byte[]> ruleHashes,
             byte[] seedHash
     ) throws NoSuchAlgorithmException {
-        BazelRule targetRule = target.getRule();
         if (target.hasSourceFile()) {
             String sourceFileName = getNameForTarget(target);
             if (sourceFileName != null) {
@@ -66,6 +65,14 @@ private byte[] createDigestForTarget(
                 return digest.digest().clone();
             }
         }
+        if (target.hasGeneratedFile()){
+            byte[] generatingRuleDigest = ruleHashes.get(target.getGeneratingRuleName());
+            if (generatingRuleDigest == null) {
+                return createDigestForRule(allRulesMap.get(target.getGeneratingRuleName()), allRulesMap, ruleHashes, bazelSourcefileTargets, seedHash);
+            }
+            return ruleHashes.get(target.getGeneratingRuleName()).clone();
+        }
+        BazelRule targetRule = target.getRule();
         return createDigestForRule(targetRule, allRulesMap, ruleHashes, bazelSourcefileTargets, seedHash);
     }
 
@@ -143,6 +150,9 @@ private String getNameForTarget(BazelTarget target) {
         if (target.hasSourceFile()) {
             return target.getSourceFileName();
         }
+        if (target.hasGeneratedFile()) {
+            return target.getGeneratedFileName();
+        }
         return null;
     }
 
@@ -153,10 +163,15 @@ private Map<String, String> hashAllTargets(byte[] seedHash, Map<String, BazelSou
         Map<String, BazelRule> allRulesMap = new HashMap<>();
         for (BazelTarget target : allTargets) {
             String targetName = getNameForTarget(target);
-            if (targetName == null || !target.hasRule()) {
+            if (targetName == null) {
                 continue;
             }
-            allRulesMap.put(targetName, target.getRule());
+            if(target.hasGeneratedFile()) {
+                allRulesMap.put(targetName, allRulesMap.get(target.getGeneratingRuleName()));
+            }
+            if(target.hasRule()) {
+                allRulesMap.put(targetName, target.getRule());
+            }
         }
         for (BazelTarget target : allTargets) {
             String targetName = getNameForTarget(target);