eitri-cli 1.10.0-beta.4 → 1.10.0

package/eitri-cli-v2/Cargo.toml

@@ -21,6 +21,7 @@ serde = { version = "1.0.197", features = ["derive"] }
 serde_derive = "1.0.197"
 serde_json = "1.0.114"
 tokio = { version = "1.36.0", features = ["full"] }
+colored = "2.0"
 
 [target.x86_64-unknown-linux-gnu]
 openssl = { version = "0.9", features = ["vendored"] }

package/eitri-cli-v2/src/commands/run_test.rs

@@ -1,4 +1,5 @@
 use std::{env, process::exit};
+use colored::*;
 
 use crate::{
   model::{url::Url, workspace_auth::WorkspaceAuth},
@@ -28,8 +29,12 @@ pub async fn execute(_workspace_auth: WorkspaceAuth, _path: String) {
       let output_str = output.stderr;
       eprint!("{output_str}");
     }
-    Err(_) => {
-      eprintln!("Houve um erro ao executar os testes.");
+    Err(http_error) => {
+      if let Some(message) = http_error.get_message() {
+        eprintln!("{}", message.red().bold());
+      } else {
+        eprintln!("Houve um erro ao executar os testes.");
+      }
       exit(1)
     }
   }

package/eitri-cli-v2/src/infra/http_client.rs

@@ -22,6 +22,15 @@ pub enum HttpError {
     Deserialize(reqwest::Error),
 }
 
+impl HttpError {
+    pub fn get_message(&self) -> Option<&String> {
+        match self {
+            HttpError::HttpError(_, api_error) => Some(&api_error.message),
+            _ => None,
+        }
+    }
+}
+
 #[allow(dead_code)]
 pub async fn post<T, U>(url: &str, data: U, headers: HeaderMap) -> Result<T, HttpError>
 where

package/eitri-cli-v2/src/services/eitri_foundry.rs

@@ -18,6 +18,7 @@ pub async fn run_test(
     test_path: test_path,
   };
 
+
   headers.append("workspace-id", user_workspace_id.parse().unwrap());
   let result = http_client::post::<ProcessOutput, TestConfig>(&url, data, headers).await?;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.10.0-beta.4",
+  "version": "1.10.0",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {

package/src/cmd/runTests.js

@@ -26,6 +26,21 @@ module.exports = async function runTests(args) {
     const miniConf = workspace.getMiniConf()
     let testPath = ""
 
+    if (!Object.prototype.hasOwnProperty.call(miniConf, 'type')) {
+        const message = "Erro no arquivo eitri-app.conf.js: A propriedade 'type' não está presente."
+        console.log(`\x1b[1m\x1b[31m${message}\x1b[0m`);
+        process.exit(1)
+    }
+
+    if (
+        Object.prototype.hasOwnProperty.call(miniConf, 'type') &&
+        miniConf.type !== 'module'
+    ) {
+        const message = " Os testes não podem ser executados devido à ausência do tipo 'module' no arquivo 'eitri-app.conf.js'. Certifique-se de incluir o atributo 'type' com o valor 'module' no arquivo de configuração para permitir a execução dos testes com sucesso."
+        console.log(`\x1b[1m\x1b[31m${message}\x1b[0m`);
+        process.exit(1)
+    }
+
     await vegvisirService.isCurrentWorkspaceOwnedByUser(miniConf.slug)
 
     const separator = '======================================================================='

package/src/service/Workspace.js

@@ -187,35 +187,43 @@ class Workspace {
         const headers = {
             accept: this.config.libs.updateLibsEndpointVersion,
         };
-        const setupResponse = await this.http.post(
-            `${this.serverUrl}/${this.basePath}/setup`,
-            miniConf,
-            headers
-        ); // somente para garantir que a pasta do usuario existe
+        try {
+            const setupResponse = await this.http.post(
+                `${this.serverUrl}/${this.basePath}/setup`,
+                miniConf,
+                headers
+            ); // somente para garantir que a pasta do usuario existe
 
-        console.log("Preparando compilador");
-        await this.http.put(
-            `${this.serverUrl}/${this.basePath}/version`,
-            miniConf,
-            headers
-        ); // TODO PDV Setup fara isso aqui
-        console.log("Compilador pronto para uso contínuo");
+            console.log("Preparando compilador");
+            await this.http.put(
+                `${this.serverUrl}/${this.basePath}/version`,
+                miniConf,
+                headers
+            ); // TODO PDV Setup fara isso aqui
+            console.log("Compilador pronto para uso contínuo");
 
-        const setupData = setupResponse.data;
+            const setupData = setupResponse.data;
 
-        const { state, target: remoteTarget, eitriConf: remoteEitriConf } = setupData;
+            const { state, target: remoteTarget, eitriConf: remoteEitriConf } = setupData;
 
-        if (!this.eitriAppService.validEitriConf(miniConf)) {
-            await this.eitriAppService.writeEitriConf(remoteEitriConf, miniConf, this.folder2watch);
-        }
+            if (!this.eitriAppService.validEitriConf(miniConf)) {
+                await this.eitriAppService.writeEitriConf(remoteEitriConf, miniConf, this.folder2watch);
+            }
 
-        await LibsService.validateLibsVersions({ libs: state.libs, eitriAppConf: miniConf });
+            await LibsService.validateLibsVersions({ libs: state.libs, eitriAppConf: miniConf });
 
-        this.printLibsVersion(state);
+            this.printLibsVersion(state);
 
-        await this.loadTarget(remoteTarget);
+            await this.loadTarget(remoteTarget);
 
-        return setupData;
+            return setupData;
+        } catch (e) {
+            if (e.response && e.response.data && e.response.data.name === "WorkspaceService.setup.mismatchAppType") {
+                console.error(`\x1b[1m\x1b[31m${e.response.data.message}\x1b[0m`);
+                process.exit(1)
+            }
+            throw Error(e)
+        }
     }
 
     async loadTarget(remoteTarget) {