eitri-cli 1.6.1-beta.2 → 1.6.1-beta.3

package/package.json

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

package/src/service/TargetService.js

@@ -1,20 +1,20 @@
 const configService = require('./ConfigService')
 const targetEnum = require('../enum/target')
 // eslint-disable-next-line no-unused-vars
-
-const LIBS_FOR_TARGET = {
-    MOBILE: {
-        superApp: 'eitri-app-client',
-        components: 'eitri-app-components',
-        sdkSupport: 'eitri-app-sdk-support',
-    },
-    WEB: {
-        superApp: 'eitri-app-client-web',
-        components: 'eitri-miniapp-components-web',
-        sdkSupport: 'eitri-app-sdk-support',
-    },
-}
 class TargetService{
+    
+    static LIBS_FOR_TARGET = {
+        MOBILE: {
+            bifrost: 'eitri-app-client',
+            luminus: 'eitri-app-components',
+            sdkSupport: 'eitri-app-sdk-support',
+        },
+        MOBILE_NEW: {
+            bifrost: 'eitri-bifrost',
+            luminus: 'eitri-luminus',
+            sdkSupport: 'eitri-app-sdk-support',
+        },
+    }
     constructor(workspace) {
         this.workspace = workspace
         this.conf = configService.get('managerApi')
@@ -37,16 +37,16 @@ class TargetService{
         }        
     }
 
-    static getLibsFromMiniConf(miniConf, availableTargets) {
-        const target = availableTargets.find(t => t.name === miniConf.target)
-        if (target) {
+    static getLibsFromMiniConf(eitriConf, availableTargets) {
+        const application = availableTargets.find(t => t.name === eitriConf.target || t.id === eitriConf.applicationId)
+        if (application) {
             return {
-                superApp: target.superAppClientLibName,
-                components: target.componentsLibName,
-                sdkSupport: target.sdkSupportLibName || LIBS_FOR_TARGET.MOBILE.sdkSupport
+                bifrost: application.superAppClientLibName,
+                luminus: application.componentsLibName,
+                sdkSupport: application.sdkSupportLibName || this.LIBS_FOR_TARGET.MOBILE.sdkSupport
             }
         }
-        return LIBS_FOR_TARGET.MOBILE
+        return this.LIBS_FOR_TARGET.MOBILE
     }
 
     async getLibs() {

package/src/service/Workspace.js

@@ -28,6 +28,7 @@ const EitriAppService = require("./EitriAppService");
 const VegvisirService = require("../modules/vegvisir/VegvisirService");
 const HuginService = require("./HuginService");
 const EitriAppType = require("../model/EitriAppType");
+const chalk = require("chalk");
 const vegvisirService = new VegvisirService()
 const huginService = new HuginService()
 
@@ -286,7 +287,7 @@ class Workspace {
 
     async checkVersions() {
         try {
-            const miniConf = this.getMiniConf();
+            const eitriConf = this.getMiniConf();
             const headers = {
                 accept: this.config.libs.updateLibsEndpointVersion,
             };
@@ -294,25 +295,33 @@ class Workspace {
             // somente para garantir que a pasta do usuario existe
             await this.http.post(
                 `${this.serverUrl}/${this.basePath}/setup`,
-                miniConf,
+                eitriConf,
                 headers
             );
             console.log("Preparando ambiente de desenvolvimento");
             const response = await this.http.put(
                 `${this.serverUrl}/${this.basePath}/version?command=push-version`,
-                miniConf,
+                eitriConf,
                 headers
             );
-            miniConf.target = response.target;
+            eitriConf.target = response.application;
             const availableTargets = await this.availableTargets();
             let libs = TargetService.getLibsFromMiniConf(
-                miniConf,
+                eitriConf,
                 availableTargets
             );
             console.log("Ambiente pronto para compilação");
+            const eitriConfProperties = Object.getOwnPropertyNames(eitriConf)
+            const clientName = eitriConfProperties.find(p => p === libs.bifrost) || TargetService.LIBS_FOR_TARGET.MOBILE_NEW.bifrost
+            const componentsName = eitriConfProperties.find(p => p === libs.luminus) || TargetService.LIBS_FOR_TARGET.MOBILE_NEW.luminus
+
+            const bifrostVersion = eitriConf[clientName]
+            const luminusVersion = eitriConf[componentsName]
+
+            console.log("\nVersão sendo criada a partir das seguintes bibliotecas e suas respectivas versões:")
+            console.log(chalk.bold.green(`${clientName} [${bifrostVersion}]`))
             console.log(
-                `${libs.components} [${miniConf[libs.components]}]\n${libs.superApp
-                } [${miniConf[libs.superApp]}]`
+               chalk.bold.green(`${componentsName} [${luminusVersion}]`)
             );
             return { target: response.target };
         } catch (error) {