From 33f72394f5073a881b1a9db0879b3c72bb2c4f27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 7 Jan 2023 23:32:17 +0000
Subject: [PATCH 1/2] Bump json5 from 2.2.0 to 2.2.3

Bumps [json5](https://github.com/json5/json5) from 2.2.0 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v2.2.0...v2.2.3)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3617c3ff..5aec3e78 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2277,10 +2277,8 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
 
 json5@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz"
-  dependencies:
-    minimist "^1.2.5"
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
 
 jsonparse@^1.2.0:
   version "1.3.1"
@@ -2670,7 +2668,7 @@ minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.5:
+minimist@^1.1.0, minimist@^1.1.1:
   version "1.2.6"
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"
 

From 3a9f1bc7dada3f6c6b2f13b69c2e1b3951d37be6 Mon Sep 17 00:00:00 2001
From: Peter Cottle <pcottle@instagram.com>
Date: Thu, 12 Jan 2023 10:19:52 -0700
Subject: [PATCH 2/2] Resolves #1048

---
 src/js/graph/treeCompare.js  | 6 +++++-
 src/levels/mixed/describe.js | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/js/graph/treeCompare.js b/src/js/graph/treeCompare.js
index bef1ee71..716704b1 100644
--- a/src/js/graph/treeCompare.js
+++ b/src/js/graph/treeCompare.js
@@ -74,6 +74,8 @@ TreeCompare.dispatchShallow = function(levelBlob, goalTreeString, treeToCompare)
       return TreeCompare.compareBranchesWithinTreesHashAgnostic(
         treeToCompare, goalTreeString, ['main']
       ) && TreeCompare.evalAsserts(treeToCompare, levelBlob.goalAsserts);
+    case !!levelBlob.onlyEvaluateAsserts:
+      return TreeCompare.evalAsserts(treeToCompare, levelBlob.goalAsserts);
     default:
       return TreeCompare.compareAllBranchesWithinTreesAndHEAD(
         treeToCompare, goalTreeString
@@ -233,11 +235,14 @@ TreeCompare.evalAssertsOnBranch = function(tree, branchName, asserts) {
   var branch = tree.branches[branchName];
   var queue = [branch.target];
   var data = {};
+  var numCommits = 0;
   while (queue.length) {
     var commitRef = queue.pop();
     data[this.getBaseRef(commitRef)] = this.getNumHashes(commitRef);
     queue = queue.concat(tree.commits[commitRef].parents);
+    numCommits++;
   }
+  data['__num_commits_upstream'] = numCommits;
 
   var result = true;
   asserts.forEach(function(assert) {
@@ -245,7 +250,6 @@ TreeCompare.evalAssertsOnBranch = function(tree, branchName, asserts) {
       result = result && assert(data);
     } catch (err) {
       console.warn('error during assert', err);
-      console.log(err);
       result = false;
     }
   });
diff --git a/src/levels/mixed/describe.js b/src/levels/mixed/describe.js
index afe77305..bf780175 100644
--- a/src/levels/mixed/describe.js
+++ b/src/levels/mixed/describe.js
@@ -2,6 +2,14 @@ exports.level = {
   "goalTreeString": "{\"branches\":{\"main\":{\"target\":\"C2\",\"id\":\"main\",\"remoteTrackingBranchID\":null},\"side\":{\"target\":\"C4\",\"id\":\"side\",\"remoteTrackingBranchID\":null},\"bugFix\":{\"target\":\"C7\",\"id\":\"bugFix\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C1\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C3\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C3\"],\"id\":\"C5\"},\"C6\":{\"parents\":[\"C5\"],\"id\":\"C6\"},\"C7\":{\"parents\":[\"C6\"],\"id\":\"C7\"}},\"tags\":{\"v0\":{\"target\":\"C0\",\"id\":\"v0\",\"type\":\"tag\"},\"v1\":{\"target\":\"C3\",\"id\":\"v1\",\"type\":\"tag\"}},\"HEAD\":{\"target\":\"bugFix\",\"id\":\"HEAD\"}}",
   "solutionCommand": "git commit ",
   "startTree": "{\"branches\":{\"main\":{\"target\":\"C2\",\"id\":\"main\",\"remoteTrackingBranchID\":null},\"side\":{\"target\":\"C4\",\"id\":\"side\",\"remoteTrackingBranchID\":null},\"bugFix\":{\"target\":\"C6\",\"id\":\"bugFix\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C1\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C3\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C3\"],\"id\":\"C5\"},\"C6\":{\"parents\":[\"C5\"],\"id\":\"C6\"}},\"tags\":{\"v0\":{\"target\":\"C0\",\"id\":\"v0\",\"type\":\"tag\"},\"v1\":{\"target\":\"C3\",\"id\":\"v1\",\"type\":\"tag\"}},\"HEAD\":{\"target\":\"bugFix\",\"id\":\"HEAD\"}}",
+  "onlyEvaluateAsserts": true,
+  "goalAsserts": {
+    "bugfix": [
+      function (data) {
+        return data.__num_commits_upstream > 5;
+      },
+    ]
+  },
   "name": {
     "en_US": "Git Describe",
     "fr_FR": "Git describe",