eitri-cli 1.12.0-beta.3 → 1.12.0-beta.4

package/eitri-cli-v2/Cargo.toml

@@ -30,6 +30,7 @@ urlencoding = "2.1.3"
 url-parse = "1.0.7"
 config = "0.14.0"
 crossterm = "0.27.0"
+spinners = "4.1.1"
 
 [dependencies.uuid]
 version = "1.8.0"

package/eitri-cli-v2/config/config.dev.toml

@@ -17,10 +17,12 @@ url = "https://api.eitri.tech/share-api/share"
 
 [foundry]
 url = "https://api.eitri.tech"
-base_path = "runes-foundry"
+base_path = "/runes-foundry"
 target_path = "/runes-foundry/targets"
 run_test_path = "/runes-foundry/run-test"
 share_path = "/foundry/share"
+clean_path = "/sources"
+shared_tags_json_path = "/user/:workspaceId/index.json"
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"

package/eitri-cli-v2/config/config.loc.toml

@@ -17,10 +17,12 @@ url = "https://api.eitri.tech/share-api/share"
 
 [foundry]
 url = "http://localhost:3000"
-base_path = "runes-foundry"
+base_path = "/runes-foundry"
 target_path = "/runes-foundry/targets"
 run_test_path = "/runes-foundry/run-test"
 share_path = "/runes-foundry/share"
+clean_path = "/sources"
+shared_tags_json_path = "/user/:workspaceId/index.json"
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"

package/eitri-cli-v2/config/config.prod.toml

@@ -17,10 +17,12 @@ url = "https://api.eitri.tech/share-api/share"
 
 [foundry]
 url = "https://api.eitri.tech"
-base_path = "foundry"
+base_path = "/foundry"
 target_path = "/foundry/targets"
 run_test_path = "/foundry/run-test"
 share_path = "/foundry/share"
+clean_path = "/sources"
+shared_tags_json_path = "/user/:workspaceId/index.json"
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"

package/eitri-cli-v2/config/config.runes-foundry.toml

@@ -1,7 +1,9 @@
 
 [foundry]
 url = "https://api.eitri.tech"
-base_path = "runes-foundry"
+base_path = "/runes-foundry"
 target_path = "/runes-foundry/targets"
 run_test_path = "/runes-foundry/run-test"
 share_path = "/runes-foundry/share"
+clean_path = "/sources"
+shared_tags_json_path = "/user/:workspaceId/index.json"

package/eitri-cli-v2/config/config.test.toml

@@ -17,10 +17,12 @@ url = "https://api.eitri.tech/share-api/share"
 
 [foundry]
 url = "https://api.eitri.tech"
-base_path = "runes-foundry"
+base_path = "/runes-foundry"
 target_path = "/runes-foundry/targets"
 run_test_path = "/runes-foundry/run-test"
 share_path = "/foundry/share"
+clean_path = "/sources"
+shared_tags_json_path = "/user/:workspaceId/index.json"
 
 [foundry.libs]
 update_libs_endpoint_version = "application/vnd.workspace.api.v2+json"

package/index.js

@@ -75,6 +75,10 @@ const run = async () => {
         .option(
             "-e, --emulator <platform>",
             "Abre o Eitri-App no emulador, desde que seja definido qual plataforma será aberto, android ou ios."
+        )
+        .option(
+            "-sh, --shared",
+            "Executa o Eitri-App no modo compartilhável."
         );
 
     startProgram.action((cmdObj) => {

package/package.json

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

package/src/cmd/start.js

@@ -48,7 +48,7 @@ module.exports = async function start(args) {
         debug("Fim da busca e validação do EitriAppConf", { miniConf })
 
         const url = config.get('workspace').url
-        const setupResult = await workspace.setup()
+        const setupResult = await workspace.setup(args)
         debug("Informações do setupResult do workspace", { setupResult })
 
 

package/src/service/LibsService.js

@@ -2,11 +2,12 @@ const axios = require('axios')
 const configService = require('./ConfigService')
 const CDN_83io_LIBRARY = configService.get('cdn')?.library
 const TrackingEitriAnalytics = require('./TrackingEitriAnalytics')
+const { validateUUID } = require('../util/GenericUtils')
 
 class LibsService {
 
-    static async validateLibsVersions({libs = [], eitriAppConf = {}}) {
-        const {luminusUiVersion, bifrostVersion} = this.getEitriConfLibsVersions(libs)
+    static async validateLibsVersions({ libs = [], eitriAppConf = {} }) {
+        const { luminusUiVersion, bifrostVersion } = this.getEitriConfLibsVersions(libs)
         if (!luminusUiVersion) {
             throw new Error("Nenhuma versão do [luminus-ui/eitri-app-components] encontrada em seu eitri-app.conf");
         }
@@ -15,10 +16,11 @@ class LibsService {
             throw new Error("Nenhuma versão do [bifrost/eitri-app-client] encontrada em seu eitri-app.conf");
         }
 
-        const {luminusUiVersions, bifrostVersions} = await this.simultaneousRequestAndHandleData();
+        const { luminusUiVersions, bifrostVersions } = await this.simultaneousRequestAndHandleData();
         const allBifrostVersions = bifrostVersions?.versions?.concat(bifrostVersions?.betaVersions, bifrostVersions?.alphaVersions);
 
-        if(!luminusUiVersion.includes("@")){
+
+        if (!luminusUiVersion.includes("@") && !validateUUID(luminusUiVersion)) {
             const existsLuminus = luminusUiVersions?.versions?.some(version => version === luminusUiVersion);
             if (!existsLuminus) {
                 this.throwNonExistentLibError({
@@ -30,7 +32,7 @@ class LibsService {
             }
         }
 
-        if(!bifrostVersion.includes("@")){
+        if (!bifrostVersion.includes("@")) {
             const existsBifrost = allBifrostVersions.some(version => version === bifrostVersion);
             if (!existsBifrost) {
                 this.throwNonExistentLibError({
@@ -127,12 +129,12 @@ class LibsService {
         TrackingEitriAnalytics.sendEvent({
             eventName: `${method}.error`,
             userId: "",
-            data: {errorMessage}
+            data: { errorMessage }
         })
     }
 
-    static throwNonExistentLibError(input = {libName: "", eitriConfLibVersion: "", availableVersions: [], eitriAppConf: {}}) {
-        const {libName, eitriConfLibVersion, availableVersions, eitriAppConf} = input
+    static throwNonExistentLibError(input = { libName: "", eitriConfLibVersion: "", availableVersions: [], eitriAppConf: {} }) {
+        const { libName, eitriConfLibVersion, availableVersions, eitriAppConf } = input
 
         const friendlyErrorMessage = `Versão da biblioteca [${libName}] não encontrada`;
         console.log(`\n\x1b[1m\x1b[31m${friendlyErrorMessage}\x1b[0m\n`);

package/src/service/Watcher.js

@@ -30,7 +30,7 @@ class Watcher {
                     return
                 }
                 if (stat.isFile()) {
-                    console.log('\x1b[34mAlterações em: %s\x1b[0m', filePath)
+                    console.log('\x1b[34meitri:Alterações em: %s\x1b[0m', filePath)
                     this.workspace
                         .upsert(filePath, { why: WatcherOpts.SAVE })
                         .then((result) => {
@@ -43,10 +43,10 @@ class Watcher {
                             }
                             if (result.relativePath === '/folder.hash') {
 
-                                console.log(`\x1b[94mForjado em ${result.time} milissegundos\x1b[0m`);
+                                console.log(`\x1b[94meitri:Forjado em ${result.time} milissegundos\x1b[0m`);
                                 this.trackingService.sendSave(event)
                             } else {
-                                console.log(`\x1b[94mTransportado em ${result.time} milissegundos\x1b[0m`);
+                                console.log(`\x1b[94meitri:Transportado em ${result.time} milissegundos\x1b[0m`);
                                 this.trackingService.sendCompile(event)
                             }
                             return this.hashFolder.updateHashFile()

package/src/service/Workspace.js

@@ -31,7 +31,7 @@ const EitriAppType = require("../model/EitriAppType");
 const chalk = require("chalk");
 const LibsService = require("./LibsService");
 const { LogSuccess } = require("../util/LogUtil");
-const {extractSlug} = require("../util/LibUtil");
+const { extractSlug } = require("../util/LibUtil");
 const vegvisirService = new VegvisirService()
 const huginService = new HuginService()
 
@@ -139,6 +139,9 @@ class Workspace {
                 throw Error("Arquivo eitri-app.conf.js sem version");
             }
         }
+        if (process.env.WORKSPACE_SHARED) {
+            this._miniConf['eitri-luminus'] = process.env.WORKSPACE_SHARED
+        }
         return this._miniConf;
     }
 
@@ -183,8 +186,9 @@ class Workspace {
         });
     }
 
-    async setup() {
+    async setup(args) {
         const miniConf = this.getMiniConf();
+        miniConf.isShared = args.shared
         const headers = {
             accept: this.config.libs.updateLibsEndpointVersion,
         };
@@ -242,7 +246,7 @@ class Workspace {
         let libVersionsOutput = "";
         state.libs.forEach((lib) => {
             let libraryDisplayName = lib.name
-            if(libraryDisplayName === "eitri-luminus"){
+            if (libraryDisplayName === "eitri-luminus") {
                 libraryDisplayName = extractSlug(miniConf[lib.name])
             }