eitri-cli 1.12.0-beta.6 → 1.12.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.12.0-beta.6",
+  "version": "1.12.0-beta.8",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {
@@ -34,6 +34,7 @@
     "axios-cookiejar-support": "^0.5.1",
     "base-64": "^0.1.0",
     "base64url": "^3.0.1",
+    "camelcase": "^6.3.0",
     "chalk": "^3.0.0",
     "cheerio": "^1.0.0-rc.3",
     "cli-progress": "^3.4.0",
@@ -63,7 +64,8 @@
     "tmp": "^0.1.0",
     "tough-cookie": "^3.0.1",
     "tough-cookie-file-store": "^2.0.2",
-    "uuid": "^7.0.2"
+    "uuid": "^7.0.2",
+    "yaml": "^2.4.2"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.7.2",

package/src/cmd/create.js

@@ -10,7 +10,7 @@ const { NAME_TITLE_REGEX, SLUG_REGEX } = require("./validate");
 const handleStartServer = require("../service/StarterService");
 const getCreateFactory = require("../util/getCreateFactory");
 const UrlUtils = require("../util/UrlUtils");
-
+const open = require("open");
 // eslint-disable-next-line no-unused-vars
 const Target = require("../model/Target");
 const EitriAppManager = require("../service/EitriAppManager");
@@ -54,7 +54,7 @@ module.exports = async function create(projectName, cmdObj) {
     }
 
     console.log(
-        "\x1b[34mVamos criar o seu Eitri-App. Para isso basta responder algumas perguntas:\x1b[0m"
+        "Vamos criar o seu Eitri-App. Carregando configurações..."
     );
 
     try {
@@ -62,6 +62,7 @@ module.exports = async function create(projectName, cmdObj) {
         workspace.setServerUrl(url);
         const clientApplication = await askClientApplication(cmdObj.application);
         if (clientApplication.name === ITEM_DOUBT) {
+            open("https://docs.eitri.tech/")
             handleStartServer(
                 cmdObj,
                 trackingService,
@@ -92,6 +93,11 @@ module.exports = async function create(projectName, cmdObj) {
 
 async function askClientApplication(applicationName) {
     const availableApplications = await eitriAppManager.findAllApplications();
+
+    console.log(
+        "\x1b[34m \nAgora, responda algumas perguntas:\n\x1b[0m"
+    );
+
     if (availableApplications.length <= 0) {
         console.log(
             "Sua organização não contém nenhuma aplicação disponível para prosseguir com a criação."
@@ -120,9 +126,10 @@ async function askClientApplication(applicationName) {
             name: "accepted",
             type: "rawlist",
             message:
-                "Selecione a aplicação para qual destina-se seu Eitri-App:",
+                "Selecione o Aplicativo para o Eitri-App:",
             choices: cliOptions.map(createLabel),
-            pageSize: cliOptions.length + 2,
+            pageSize: 10,
+            loop: false,
         },
     ]);
     const clientApplication = cliOptions.find(

package/src/cmd/start.js

@@ -51,8 +51,7 @@ module.exports = async function start(args) {
         const setupResult = await workspace.setup(args)
         debug("Informações do setupResult do workspace", { setupResult })
 
-
-        const target = setupResult.target.name
+        const applicationName = setupResult?.application?.name
 
         blindGuardian.readConf()
         const qrCodeUrl = config.get('qrCode').url
@@ -109,8 +108,8 @@ module.exports = async function start(args) {
             ...args,
             deepLinks: loadedTarget?.deepLinks || []
         }
-        debug("Iniciando servidor", { argsWithDeeplinks, trackingService, watcher, workspace, target, setupResult, platform })
-        await handleStartServer(argsWithDeeplinks, trackingService, watcher, workspace, target, setupResult, platform)
+        debug("Iniciando servidor", { argsWithDeeplinks, trackingService, watcher, workspace, applicationName, setupResult, platform })
+        await handleStartServer(argsWithDeeplinks, trackingService, watcher, workspace, applicationName, setupResult, platform)
         debug("Servidor iniciado", { loadedTarget })
 
         TrackingEitriAnalytics.sendEvent({

package/src/service/Workspace.js

@@ -34,6 +34,10 @@ const { LogSuccess } = require("../util/LogUtil");
 const { extractSlug } = require("../util/LibUtil");
 const vegvisirService = new VegvisirService()
 const huginService = new HuginService()
+const YAML = require('yaml');
+const { readFile } = require("fs/promises");
+const convertKeysToCamelCase = require("../util/convertKeysToCamelCase");
+const { exit } = require("process");
 
 class Workspace {
 
@@ -187,39 +191,49 @@ class Workspace {
     }
 
     async setup(args) {
-        const miniConf = this.getMiniConf();
-        miniConf.isShared = args.shared
+        const eitriConf = this.getMiniConf();
+        eitriConf.isShared = args?.shared
         const headers = {
             accept: this.config.libs.updateLibsEndpointVersion,
         };
         try {
+            const appConfig = await this.getAppConfig()
             const setupResponse = await this.http.post(
-                `${this.serverUrl}/${this.basePath}/setup`,
-                miniConf,
+                `${this.serverUrl}/${this.basePath}/v2/workspace/setup`,
+                {
+                    eitriConf,
+                    appConfig
+                },
                 headers
             ); // somente para garantir que a pasta do usuario existe
 
             console.log("Preparando compilador");
             await this.http.put(
                 `${this.serverUrl}/${this.basePath}/version`,
-                miniConf,
+                eitriConf,
                 headers
             ); // TODO PDV Setup fara isso aqui
             console.log("Compilador pronto para uso contínuo");
 
             const setupData = setupResponse.data;
 
-            const { state, target: remoteTarget, eitriConf: remoteEitriConf } = setupData;
+            const { state, application, eitriConf: remoteEitriConf } = setupData;
+
+            if (!application) {
+                console.error("O Aplicativo não foi encontrado durante o processo de setup do Eitri-App.");;
+                return exit(1);
+            }
 
-            if (!this.eitriAppService.validEitriConf(miniConf)) {
-                await this.eitriAppService.writeEitriConf(remoteEitriConf, miniConf, this.folder2watch);
+            if (!this.eitriAppService.validEitriConf(eitriConf)) {
+                await this.eitriAppService.writeEitriConf(remoteEitriConf, eitriConf, this.folder2watch);
             }
 
-            await LibsService.validateLibsVersions({ libs: state.libs, eitriAppConf: miniConf });
+            await LibsService.validateLibsVersions({ libs: state.libs, eitriAppConf: eitriConf });
 
             this.printLibsVersion(state);
 
-            await this.loadTarget(remoteTarget);
+            await this.loadTarget(application);
+
 
             return setupData;
         } catch (e) {
@@ -231,6 +245,18 @@ class Workspace {
         }
     }
 
+    async getAppConfig() {
+        const appConfigPath = path.resolve(
+            this.folder2watch,
+            "../../app-config.yaml"
+        );
+        if (!fs.existsSync(appConfigPath)) return
+        const content = await readFile(appConfigPath, 'utf8')
+        const appConfig = YAML.parse(content);
+        return convertKeysToCamelCase(appConfig);
+    }
+
+
     async loadTarget(remoteTarget) {
         const targets = await this.availableTargets();
         this.target = targets.find((t) => t.name === remoteTarget.name);

package/src/util/convertKeysToCamelCase.js

@@ -0,0 +1,26 @@
+const camelCase = require('camelcase');
+
+function convertKeysToCamelCase(obj) {
+    const newObj = {};
+    for (let key in obj) {
+        if (Object.getOwnPropertyNames(obj)) {
+            let value = obj[key];
+            const camelKey = camelCase(key);
+            if (typeof value === 'object' && !Array.isArray(value)) {
+                value = convertKeysToCamelCase(value); // Se for um objeto, chama a função recursivamente
+            } else if (Array.isArray(value)) {
+                // Se for um array, percorre cada item e chama a função recursivamente se for um objeto
+                value = value.map(item => {
+                    if (typeof item === 'object' && !Array.isArray(item)) {
+                        return convertKeysToCamelCase(item);
+                    }
+                    return item;
+                });
+            }
+            newObj[camelKey] = value;
+        }
+    }
+    return newObj;
+}
+
+module.exports = convertKeysToCamelCase