Merge branch 'refs/heads/feat-async-function-deployments' into feat-functions-deployment-status

# Conflicts:
#	templates/cli/lib/commands/push.js.twig

Author: byawitz

src/SDK/Language/CLI.php

@@ -134,8 +134,8 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'default',
-                'destination'   => 'lib/updater.js',
-                'template'      => 'cli/lib/updater.js.twig',
+                'destination'   => 'lib/spinner.js',
+                'template'      => 'cli/lib/spinner.js.twig',
             ],
             [
                 'scope'         => 'default',

templates/cli/lib/commands/push.js.twig

@@ -2,7 +2,7 @@ const inquirer = require("inquirer");
 const JSONbig = require("json-bigint")({ storeAsString: false });
 const { Command } = require("commander");
 const { localConfig } = require("../config");
-const { Updater, SPINNER_ARC, SPINNER_DOTS } = require('../updater');
+const { Spinner, SPINNER_ARC, SPINNER_DOTS } = require('../spinner');
 const { paginate } = require('../paginate');
 const { questionsPushBuckets, questionsPushTeams, questionsPushFunctions, questionsGetEntrypoint, questionsPushCollections, questionsConfirmPushCollections } = require("../questions");
 const { actionRunner, success, log, error, commandDescriptions } = require("../parser");
@@ -273,8 +273,7 @@ const pushFunction = async ({ functionId, all, yes } = {}) => {
 
     log('Validating functions');
     // Validation is done BEFORE pushing so the deployment process can be run in async with progress update
-    for (let i = 0; i < functions.length; i++) {
-        const func = functions[i];
+    for (let func of functions) {
 
         if (!func.entrypoint) {
             log(`Function ${func.name} does not have an endpoint`);
@@ -312,7 +311,7 @@ const pushFunction = async ({ functionId, all, yes } = {}) => {
     log('All functions are validated');
     log('Pushing functions\n');
 
-    Updater.start(false);
+    Spinner.start(false);
     let successfullyPushed = 0;
     let successfullyDeployed = 0;
 
@@ -321,7 +320,7 @@ const pushFunction = async ({ functionId, all, yes } = {}) => {
         let functionExists = false;
         let deploymentCreated = false;
 
-        const updaterRow = new Updater({ status: '', resource: func.name, id: func['$id'], end: `Ignoring using: ${ignore}` });
+        const updaterRow = new Spinner({ status: '', resource: func.name, id: func['$id'], end: `Ignoring using: ${ignore}` });
 
         updaterRow.update({ status: 'Getting' }).startSpinner(SPINNER_DOTS);
 
@@ -498,7 +497,7 @@ const pushFunction = async ({ functionId, all, yes } = {}) => {
         updaterRow.stopSpinner();
     }));
 
-    Updater.stop();
+    Spinner.stop();
 
     success(`Pushed ${successfullyPushed} functions with ${successfullyDeployed} successfully deployed`);
 }

templates/cli/lib/updater.js.twig renamed to templates/cli/lib/spinner.js.twig

@@ -15,9 +15,9 @@ const spinners = {
     }
 }
 
-class Updater {
+class Spinner {
     static start(clearOnComplete = true, hideCursor = true) {
-        Updater.updatesBar = new progress.MultiBar({
+        Spinner.updatesBar = new progress.MultiBar({
             format: this.#formatter,
             hideCursor,
             clearOnComplete,
@@ -27,7 +27,7 @@ class Updater {
     }
 
     static stop() {
-        Updater.updatesBar.stop();
+        Spinner.updatesBar.stop();
     }
 
     static #formatter(options, params, payload) {
@@ -54,7 +54,7 @@ class Updater {
             end = chalk.red(payload.errorMessage);
         }
 
-        return Updater.#line(prefix, start, middle, end);
+        return Spinner.#line(prefix, start, middle, end);
     }
 
     static #line(prefix, start, middle, end, separator = '•') {
@@ -63,7 +63,7 @@ class Updater {
     }
 
     constructor(payload, total = 100, startValue = 0) {
-        this.bar = Updater.updatesBar.create(total, startValue, payload)
+        this.bar = Spinner.updatesBar.create(total, startValue, payload)
     }
 
     update(payload) {
@@ -98,7 +98,7 @@ class Updater {
 
 
 module.exports = {
-    Updater,
+    Spinner,
     SPINNER_ARC,
     SPINNER_DOTS
 }