eitri-cli 1.38.0-beta.9 → 1.39.0-beta.1

package/eitri-cli-v2/index.d.ts

@@ -18,11 +18,15 @@ export interface StartArguments {
   playground?: boolean
   initializationParams?: string
 }
+export interface SelectArgs {
+  name?: string
+  local?: boolean
+}
 export interface CreateArguments {
   projectName: string
   application?: string
   yes?: boolean
-  bundle?: boolean
+  template?: boolean
 }
 export interface EitriLibsArguments {
   bifrost?: boolean
@@ -65,4 +69,10 @@ export declare namespace app {
 export declare namespace workspace {
   export function clean(): Promise<void>
   export function current(): Promise<void>
+  export function create(): Promise<void>
+  export function list(): Promise<void>
+  /**
+  * Use is a reserved word in Rust
+  */
+  export function select(args: SelectArgs): Promise<void>
 }

package/index.js

@@ -3,8 +3,6 @@ const commander = require("commander");
 const program = new commander.Command();
 const emoji = require("emojilib");
 const path = require("path");
-const { workspace } = require("./src/service/Workspace");
-const configService = require("./src/service/ConfigService");
 const VegvisirCommand = require("./src/modules/vegvisir/VegvisirCommand");
 const AppCommand = require("./src/modules/app/AppCommand");
 const debug = require("debug")("eitri:run");
@@ -32,17 +30,7 @@ const run = async () => {
   // Temporariamente necessário por conta de no contexto do Rust não saber o diretório atual, dessa forma exportando o fullPath do config é possível.
   // Quando se tornar uma CLI somente em rust no processo de instalação podemos declarar o caminho, como é via NPM pode ter caminhos variados de acordo com sistema de versionamento, NVM, Volta, ASDF é necessário a variável abaixo.
   process.env.CONFIG_DIR_PATH = path.join(__dirname, "eitri-cli-v2", "config");
-  try {
-    const srcFolder2watch = path.join(process.cwd(), "src");
-    workspace.setFolder2Watch(srcFolder2watch);
-    workspace.setServerUrl(`${configService.get("workspace").url}`);
-  } catch (e) {
-    debug("Erro no set da pasta", { message: e?.message, error: e });
-    if (process.env.LOG_LEVEL === "full") {
-      console.log("Current directory listening has failed", e);
-    }
-    // Continuando como antes...
-  }
+
 
 
   try {
@@ -72,14 +60,9 @@ const run = async () => {
     .option("--yes", "Aceita o redirecionamento para o console")
     .option("-v, --verbose", "Exibe mais logs")
     .action(async (cmdObj) => {
-      const isLoginV3 = process.env.FT_LOGIN_V3
-      if (isLoginV3 === 'true') {
-        await globalEitriCLIV2.login(cmdObj)
-        return
-      }
+      await globalEitriCLIV2.login(cmdObj)
+      return
 
-      console.log("\n\n Iniciando login \n");
-      require("./src/cmd/loginV2")(cmdObj);
     });
 
   program
@@ -90,7 +73,7 @@ const run = async () => {
       "--application <application>",
       "Define o application de execução do Eitri-App"
     )
-    .option("-b, --bundle", "Fornece um select de qual bundle deseja utilizar para criar o Eitri-App")
+    .option("-t, --template", "Fornece uma variedade de templates para utilizar ao criar o Eitri-App")
     .option("-v, --verbose", "Exibe mais logs")
     .action(async (projectName, cmdObj) => {
       return await globalEitriCLIV2.create({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eitri-cli",
-    "version": "1.38.0-beta.9",
+    "version": "1.39.0-beta.1",
     "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
     "main": "index.js",
     "bin": {
@@ -24,43 +24,11 @@
     "author": "Calindra",
     "license": "ISC",
     "dependencies": {
-        "adm-zip": "^0.5.9",
         "axios": "^1.7.2",
-        "axios-cookiejar-support": "^5.0.2",
-        "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",
         "commander": "^9.2.0",
-        "config": "^3.3.0",
-        "cors": "^2.8.5",
         "emojilib": "^2.4.0",
-        "express": "^4.17.3",
-        "express-rate-limit": "^6.3.0",
-        "figlet": "^1.2.4",
-        "folder-hash": "^3.3.0",
-        "form-data": "^4.0.0",
-        "get-folder-size": "^2.0.1",
-        "inquirer": "^7.0.0",
-        "js-yaml": "^4.1.0",
-        "jsonwebtoken": "^9.0.2",
-        "lz-string": "^1.5.0",
-        "node-watch": "^0.6.3",
-        "open": "^7.0.0",
-        "ps-node": "^0.1.6",
-        "qrcode": "^1.5.3",
-        "semver": "^7.1.3",
-        "slugify": "^1.4.0",
-        "socket.io-client": "^4.5.2",
-        "standard-version": "^9.5.0",
-        "temp-dir": "^2.0.0",
-        "tmp": "^0.1.0",
-        "tough-cookie": "^4.1.4",
-        "tough-cookie-file-store": "^2.0.2",
-        "uuid": "^7.0.2",
-        "yaml": "^2.4.2"
+        "semver": "^7.7.0",
+        "uuid": "^7.0.2"
     },
     "devDependencies": {
         "@commitlint/cli": "^17.7.2",
@@ -68,24 +36,10 @@
         "@faker-js/faker": "^7.6.0",
         "@semantic-release/changelog": "^6.0.3",
         "@semantic-release/git": "^10.0.1",
-        "eslint": "^9.5.0",
-        "eslint-config-google": "^0.14.0",
-        "eslint-plugin-jest": "^28.6.0",
-        "eslint-plugin-prettier": "^5.1.3",
         "husky": "^8.0.3",
         "jest": "^29.7.0",
         "lint-staged": "^9.5.0",
-        "nock": "^13.3.0",
-        "prettier": "^3.3.2",
         "puppeteer": "22.12.1",
         "semantic-release": "^22.0.8"
-    },
-    "resolutions": {
-        "lodash": "4.17.21",
-        "minimist": "1.2.6",
-        "ansi-regex": "5.0.1",
-        "merge": "2.1.1",
-        "tar": "6.1.9",
-        "handlebars": "4.7.7"
     }
 }

package/src/modules/app/AppCommand.js

@@ -35,7 +35,7 @@ module.exports = function AppCommand() {
     app
         .command("create <application-name>")
         .description(
-            "Cria múltiplos Eitri-Apps para um Aplicativo, baseado em um bundle selecionado."
+            "Cria múltiplos Eitri-Apps para um Aplicativo, baseado em um Template selecionado."
         )
         .option("-v, --verbose", "Exibe mais logs")
         .action(async (applicationName, cmdObj) => {

package/src/modules/vegvisir/VegvisirCommand.js

@@ -1,7 +1,6 @@
 const commander = require("commander");
-
+const eitriCLIV2 = require("../../../eitri-cli-v2/index.js");
 module.exports = function VegvisirCommand() {
-  const NEW_CLI_VERSION = process.env.CLI_VERSION === "v2";
 
   const workspaceCommand = commander
     .command("workspace")
@@ -13,7 +12,7 @@ module.exports = function VegvisirCommand() {
     .command("list")
     .description("Lista os workspaces do usuário")
     .action(async (cmdObj) => {
-      require("./cmd/list")(cmdObj);
+      await eitriCLIV2.workspace.list()
     });
 
   workspaceCommand
@@ -28,14 +27,14 @@ module.exports = function VegvisirCommand() {
       "Permite selecionar um workspace previamente criado pelo nome"
     )
     .action(async (cmdObj) => {
-      require("./cmd/use.js")(cmdObj);
+      return await eitriCLIV2.workspace.select(cmdObj)
     });
 
   workspaceCommand
     .command("create")
     .description("Cria um workspace para desenvolvimento de Eitri-Apps")
-    .action((cmdObj) => {
-      require("./cmd/create")(cmdObj);
+    .action(async () => {
+      await eitriCLIV2.workspace.create();
     });
 
   workspaceCommand
@@ -43,13 +42,9 @@ module.exports = function VegvisirCommand() {
     .description(
       "Exibe o workspace atual, obedecendo a prioridade Local > Global."
     )
-    .action(async (cmdObj) => {
-      if (NEW_CLI_VERSION) {
-        const eitriCLIV2 = require("../../../eitri-cli-v2/index.js");
-        return await eitriCLIV2.workspace.current();
-      }
+    .action(async () => {
+      return await eitriCLIV2.workspace.current();
 
-      require("./cmd/current")(cmdObj);
     });
 
   workspaceCommand
@@ -58,7 +53,6 @@ module.exports = function VegvisirCommand() {
       "Realiza a limpeza do workspace remoto do desenvolvedor. Útil quando há mal funcionamento na compilação em nuvem do Eitri-App. Obedece a prioridade Local > Global."
     )
     .action(async () => {
-      const eitriCLIV2 = require("../../../eitri-cli-v2/index.js");
       await eitriCLIV2.workspace.clean();
     });
 

package/.eslintrc.json

@@ -1,26 +0,0 @@
-{
-    "root": true,
-    "extends": ["eslint:recommended", "google", "plugin:prettier/recommended", "plugin:jest/recommended"],
-    "plugins": ["prettier", "jest"],
-    "env": {
-        "es6": true,
-        "node": true
-    },
-    "globals": {
-        "Atomics": "readonly",
-        "SharedArrayBuffer": "readonly"
-    },
-    "parserOptions": {
-        "sourceType": "commonjs"
-    },
-    "rules": {
-        "jest/no-conditional-expect": "warn",
-        "jest/no-focused-tests": "warn",
-        "prefer-const": "warn",
-        "prefer-rest-params": "warn",
-        "no-unused-expressions": "error",
-        "no-undef": "error",
-        "prettier/prettier": "error",
-        "no-console": "off"
-    }
-}

package/.prettierrc

@@ -1,6 +0,0 @@
-{
-    "printWidth": 130,
-    "tabWidth": 4,
-    "singleQuote": false,
-    "semi": false
-}

package/src/cmd/clean.js

@@ -1,144 +0,0 @@
-const { workspace } = require('../service/Workspace')
-const validator = require('./validate')
-const TrackingService = require('../service/TrackingService')
-const config = require('../service/ConfigService')
-const TargetService = require('../service/TargetService')
-const inquirer = require('inquirer')
-const TrackingEitriAnalytics = require('../service/TrackingEitriAnalytics')
-const UserLocalCredential = require('../util/UserLocalCredential')
-
-const blindGuardian = workspace.blindGuardian
-const trackingService = new TrackingService(blindGuardian)
-const targetService = new TargetService(workspace)
-
-module.exports = async function clean(cmdObj) {
-    try {
-        UserLocalCredential.checkForCredentials()
-    } catch (error) {
-        const errorMessage = cmdObj?.verbose ? error : error?.message
-        console.error("\n", errorMessage, "\n")
-        return
-    }
-
-    try {
-        await validator.assertCommandNotRunning('clean')
-
-        blindGuardian.readConf()
-        workspace.setServerUrl(config.get('workspace').url)
-        await workspace.init()
-
-        console.log('Limpando compilador')
-
-        await workspace.clean()
-
-        console.log('[1] Limpo.')
-
-        TrackingEitriAnalytics.sendEvent({
-            eventName: "clean",
-            userId: workspace?.userEmail
-        })
-        process.exit(0)
-    } catch (e) {
-        TrackingEitriAnalytics.sendEvent({
-            eventName: "clean.error",
-            userId: workspace?.userEmail,
-            data: {
-                errorMessage: e?.message || ""
-            }
-        })
-
-        if(!e) {
-            console.error('Erro desconhecido')
-            process.exit(1)
-        }
-
-        if (cmdObj.verbose) {
-            console.error('Falha deletando workspace remoto', e)
-        }
-
-        const exit = async () => {
-            await trackingService.sendError(e)
-            process.exit(1)
-        }
-
-        const { httpStatus, response } = e
-
-        if(response){
-            const { data } = response
-
-            const transactionId = data.req_id
-
-            const printError = (message) => console.error(`${transactionId}: ${message}`)
-
-            const tryExitWithFriendlyMessage = async () => {
-                if(data && data.friendlyMessage) {
-                    const {friendlyMessage} = data
-                    printError(friendlyMessage)
-                    await exit()
-                }
-            }
-
-            if(httpStatus === 403) {
-                await tryExitWithFriendlyMessage()
-                printError('Acesso negado! Confira se você está registrado como desenvolvedor deste Eitri-App.')
-                await exit()
-            }
-            if(httpStatus === 500) {
-                if(data && data.error.includes('ENOENT: no such file or directory')) {
-                    // O workspace remoto ja nao existe, portanto nada fazemos.
-                    console.log('[2] Limpeza finalizada com sucesso.')
-                    await exit()
-                }
-                await tryExitWithFriendlyMessage()
-                printError('Erro interno!')
-                await exit()
-            }
-            printError('Ops: ocorreu um erro inesperado realizar a limpeza :-(')
-        }
-        console.error(`Ops: ocorreu um erro durante a limpeza: ${e.message}`)
-        await exit()
-    }
-}
-
-async function track(miniConf, start) {
-    let libs = await targetService.getLibs()
-    let event = {
-        superClientVersion: miniConf[libs.superAppClientLibName],
-        componentsVersion: miniConf[libs.componentsLibName],
-        miniAppSlug: miniConf.slug,
-        miniAppVersion: miniConf.version,
-        timeMs: Date.now() - start,
-    }
-    await trackingService.sendPushedVersion(event)
-}
-
-function checkErros(miniConf) {
-    let validateResult = validator.validate(miniConf)
-    validateResult.errors.forEach(message => console.log(message))
-    return validateResult
-}
-
-async function logPermissionsAndOpenPrompt(addedPermissions, removedPermissions, cmdObj) {
-    const GREEN_COLOR = '\x1b[32m'
-    const RED_COLOR = '\x1b[31m'
-    const MINIMAL_LENGTH = 0
-    if(addedPermissions.length > MINIMAL_LENGTH) {
-        console.log(`${GREEN_COLOR}\nPermissões adicionadas: ${addedPermissions}${GREEN_COLOR}`)
-    }
-    if(removedPermissions.length > MINIMAL_LENGTH) {
-        console.log(`${RED_COLOR}Permissões removidas: ${removedPermissions}\n${RED_COLOR}`)
-    }
-    if(!cmdObj.yes && (addedPermissions.length > MINIMAL_LENGTH || removedPermissions.length > MINIMAL_LENGTH)) {
-        const answer = await inquirer.prompt([
-            {
-                name: 'option',
-                message: 'Houve uma alteração nas permissões em relação a versão publicada. Deseja Continuar?',
-                type: 'rawlist',
-                choices: ['Sim', 'Não']
-            }
-        ])
-        if(answer.option === 'Não') {
-            process.exit(0)
-        }
-    }
-}