From 345b226533ee159005ff1ba736d37ed47112b501 Mon Sep 17 00:00:00 2001
From: Samuel Ainsworth <skainsworth@gmail.com>
Date: Sat, 16 Oct 2021 20:11:22 -0700
Subject: [PATCH] generate/index.js: async/await syntax

---
 generate/index.js | 56 +++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/generate/index.js b/generate/index.js
index 753897d5b..5de1d31c5 100644
--- a/generate/index.js
+++ b/generate/index.js
@@ -1,9 +1,9 @@
-var generateJson = require("./scripts/generateJson");
-var generateNativeCode = require("./scripts/generateNativeCode");
-var generateMissingTests = require("./scripts/generateMissingTests");
-var submoduleStatus = require("../lifecycleScripts/submodules/getStatus");
+const generateJson = require("./scripts/generateJson");
+const generateNativeCode = require("./scripts/generateNativeCode");
+const generateMissingTests = require("./scripts/generateMissingTests");
+const submoduleStatus = require("../lifecycleScripts/submodules/getStatus");
 
-module.exports = function generate() {
+module.exports = async function generate() {
   console.log("[nodegit] Generating native code");
 
   function tryGenerate(numRetries = 3) {
@@ -15,7 +15,9 @@ module.exports = function generate() {
       generateMissingTests();
     } catch (error) {
       if (numRetries > 0) {
-        console.log("[nodegit] WARNING - Failed to generate native code, trying again");
+        console.log(
+          "[nodegit] WARNING - Failed to generate native code, trying again"
+        );
         tryGenerate(numRetries - 1);
       } else {
         throw error;
@@ -23,29 +25,27 @@ module.exports = function generate() {
     }
   }
 
-  return submoduleStatus()
-    .then(function(statuses) {
-      var dirtySubmodules = statuses
-        .filter(function(status) {
-          return status.onNewCommit
-            || status.needsInitialization
-            || status.workDirDirty;
-        });
+  try {
+    const statuses = await submoduleStatus();
+    const dirtySubmodules = statuses.filter(
+      (status) =>
+        status.onNewCommit || status.needsInitialization || status.workDirDirty
+    );
 
-      if (dirtySubmodules.length) {
-        console.warn("[nodegit] WARNING - Some submodules are out-of-sync");
-        dirtySubmodules.forEach(function(submodule) {
-          console.warn("[nodegit]\t" + submodule.name);
-        });
-      }
-    })
-    .then(tryGenerate)
-    .catch(function(e) {
-      console.error("[nodegit] ERROR - Could not generate native code");
-      console.error(e);
-      throw e;
-    });
-}
+    if (dirtySubmodules.length) {
+      console.warn("[nodegit] WARNING - Some submodules are out-of-sync");
+      dirtySubmodules.forEach(function (submodule) {
+        console.warn("[nodegit]\t" + submodule.name);
+      });
+    }
+
+    await tryGenerate();
+  } catch (e) {
+    console.error("[nodegit] ERROR - Could not generate native code");
+    console.error(e);
+    throw e;
+  }
+};
 
 if (require.main === module) {
   module.exports();