autoforce 0.1.17 → 0.1.19

package/lib/helpers/util.js

@@ -1,23 +1,12 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import fs from "fs";
 import { fileURLToPath } from 'url';
 import prompts from "prompts";
 import context, { ProjectServices, GitServices } from "./context.js";
 import { logInfo, logWarning } from "./color.js";
-const COMMAND_FOLDER = searchInFolderHierarchy('commands', fileURLToPath(import.meta.url));
-export const CONFIG_FILE = searchInFolderHierarchy('.autoforce.json', fileURLToPath(import.meta.url));
-export const TEMPLATES_FOLDER = searchInFolderHierarchy('templates', fileURLToPath(import.meta.url));
-export const TEMPLATE_MODEL_FOLDER = TEMPLATES_FOLDER + '/' + getConfig('modelTemplates', 'modelA');
-export const DICTIONARY_FOLDER = TEMPLATE_MODEL_FOLDER + "/diccionarios";
+const MODELS_FOLDER = searchInFolderHierarchy('models', fileURLToPath(import.meta.url));
 export const WORKING_FOLDER = process.env.INIT_CWD || ".";
+export const CONFIG_FILE = searchInFolderHierarchy('.autoforce.json', WORKING_FOLDER);
+export const DICTIONARY_FOLDER = process.cwd() + "/docs"; //  context.dictionaryFolder;
 export const filterJson = (fullPath) => fullPath.endsWith(".json");
 export const filterDirectory = (fullPath) => fs.lstatSync(fullPath).isDirectory();
 export const filterFiles = (fullPath) => !fs.lstatSync(fullPath).isDirectory();
@@ -31,195 +20,146 @@ export function valuesToChoices(list, valueToTitle = (value) => value) {
 export function titlesToChoices(list, titleToValue = (title) => title) {
     return list.map(title => { return { title, value: titleToValue(title) }; });
 }
-export function getDataFromPackage() {
-    const data = {};
-    try {
-        const filename = searchInFolderHierarchy("package.json", process.cwd());
-        if (!filename) {
-            throw new Error("No se encontro el package.json en " + process.cwd());
-        }
-        const content = fs.readFileSync(filename, "utf8");
-        const packageJson = JSON.parse(content);
-        if (packageJson.repository) {
-            if (packageJson.repository.url) {
-                data.repositoryUrl = packageJson.repository.url;
-                data.repositoryType = packageJson.repository.type;
-                // Ver de sacar repo y owner
-                if (data.repositoryUrl) {
-                    if (data.repositoryUrl.includes("github.com")) {
-                        const repositoryArray = data.repositoryUrl.split('github.com/');
-                        [data.repositoryOwner, data.repositoryRepo] = repositoryArray[1].split('/');
-                    }
-                    if (data.repositoryUrl.includes("gitlab.com")) {
-                        const repositoryArray = data.repositoryUrl.split('gitlab.com/');
-                        [data.repositoryOwner, data.repositoryRepo] = repositoryArray[1].split('/');
-                    }
-                }
-            }
-            else if (typeof packageJson.repository === 'string') {
-                data.repositoryUrl = packageJson.repository;
-                const repositoryArray = data.repositoryUrl.split(':');
-                data.repositoryType = repositoryArray[0];
-                [data.repositoryOwner, data.repositoryRepo] = repositoryArray[1].split('/');
-            }
-            if (data.repositoryRepo && data.repositoryRepo.endsWith('.git')) {
-                data.repositoryRepo = data.repositoryRepo.replace('.git', '');
-            }
-        }
-    }
-    catch (error) {
-        console.log(error);
-        throw new Error(`Verifique que exista y sea valido el package.json`);
-    }
-    return data;
-}
 export function findChoicesPosition(choices, value) {
     const index = choices.findIndex(choice => choice.value === value);
     return index === -1 ? 0 : index;
 }
-function getTaskConfig(config) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // TODO: Ver si esto se mueve a un config list
-        // List Command settings
-        const filters = context.listFilters();
-        const listFilter = yield prompts([
+export function getFilesInFolders(folders, filter, recursive = false, ignoreList = []) {
+    const files = new Set();
+    for (const folder of folders) {
+        getFiles(folder, filter, recursive, ignoreList)
+            .forEach(file => files.add(file));
+    }
+    return Array.from(files);
+}
+export function getModelFolders(subfolder) {
+    const folder = [
+        `${MODELS_FOLDER}/dev/${context.devModel}/${subfolder}`,
+        `${MODELS_FOLDER}/git/${context.gitModel}/${subfolder}`,
+        `${MODELS_FOLDER}/doc/${context.docModel}/${subfolder}`,
+        `${MODELS_FOLDER}/project/${context.projectModel}/${subfolder}`,
+    ];
+    // Filter only folders that exists
+    return folder.filter(folder => fs.existsSync(folder));
+}
+function getTemplates(filter) {
+    return getFilesInFolders(getModelFolders('templates'), filter);
+}
+async function getTaskConfig(config) {
+    // TODO: Ver si esto se mueve a un config list
+    // List Command settings
+    const filters = context.listFilters();
+    const listFilter = await prompts([
+        {
+            message: 'Elija un filtro, o bien lo puede dejar fijo en autoforce como listFilter',
+            name: 'filter',
+            type: 'select',
+            initial: findChoicesPosition(filters, config.listFilter),
+            choices: filters
+        }
+    ]);
+    if (listFilter.filter === undefined)
+        return;
+    config.listFilter = listFilter.filter;
+    const files = getTemplates(filterBash).map(filename => filename.split(".")[0]);
+    if (files.length > 0) {
+        const templates = valuesToChoices(files);
+        const template = await prompts([
             {
-                message: 'Elija un filtro, o bien lo puede dejar fijo en autoforce como listFilter',
-                name: 'filter',
+                message: 'Elija un template, o bien lo puede dejar en autoforce como listTemplate',
+                name: 'template',
                 type: 'select',
-                initial: findChoicesPosition(filters, config.listFilter),
-                choices: filters
+                initial: findChoicesPosition(templates, config.listTemplate),
+                choices: templates
             }
         ]);
-        if (listFilter.filter === undefined)
+        if (template.template === undefined)
             return;
-        config.listFilter = listFilter.filter;
-        const files = getFiles(`${TEMPLATES_FOLDER}/${config.modelTemplates}`, filterBash).map(filename => filename.split(".")[0]);
-        if (files.length > 0) {
-            const templates = valuesToChoices(files);
-            const template = yield prompts([
-                {
-                    message: 'Elija un template, o bien lo puede dejar en autoforce como listTemplate',
-                    name: 'template',
-                    type: 'select',
-                    initial: findChoicesPosition(templates, config.listTemplate),
-                    choices: templates
-                }
-            ]);
-            if (template.template === undefined)
-                return;
-            config.listTemplate = template.template;
-        }
-        return config;
-    });
+        config.listTemplate = template.template;
+    }
+    return config;
 }
-function getBaseConfig(config) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // Todo: Chequear el repoOwner y repo
-        const gitChoices = [{ title: 'Github', value: GitServices.GitHub }, { title: 'Gitlab', value: GitServices.GitLab }];
-        // Preguntar por GitHub o GitLab
-        const gitServices = yield prompts([{
-                type: "select",
-                name: "git",
-                message: "Elija un servicio de Git",
-                initial: findChoicesPosition(gitChoices, config.gitServices),
-                choices: gitChoices
-            }]);
-        if (gitServices.git === undefined)
-            process.exit(0);
-        config.gitServices = gitServices.git;
-        //  Chequear las variables de entorno 
-        if (gitServices.git === GitServices.GitHub && !process.env.GITHUB_TOKEN) {
-            logWarning('A fin de que la herramienta funcione debe configurar una variable de entorno GITHUB_TOKEN');
-        }
-        if (gitServices.git === GitServices.GitLab && !process.env.GITLAB_TOKEN) {
-            logWarning('A fin de que la herramienta funcione debe configurar una variable de entorno GITLAB_TOKEN');
-        }
-        // Selecciona el modelo de automatizacion
-        const models = readJsonSync(`${COMMAND_FOLDER}/models.json`);
-        models.push({ title: 'Personalizado', value: 'custom', description: 'En este caso los comandos son configurados fuera de la herramienta y los lee de la carpeta commands en el root del repo' });
-        const automationModel = yield prompts([{
+async function getBaseConfig(config) {
+    // Todo: Chequear el repoOwner y repo
+    const gitChoices = [{ title: 'Github', value: GitServices.GitHub }, { title: 'Gitlab', value: GitServices.GitLab }];
+    // Preguntar por GitHub o GitLab
+    const gitServices = await prompts([{
+            type: "select",
+            name: "git",
+            message: "Elija un servicio de Git",
+            initial: findChoicesPosition(gitChoices, config.gitServices),
+            choices: gitChoices
+        }]);
+    if (gitServices.git === undefined)
+        process.exit(0);
+    config.gitServices = gitServices.git;
+    //  Chequear las variables de entorno 
+    if (gitServices.git === GitServices.GitHub && !process.env.GITHUB_TOKEN) {
+        logWarning('A fin de que la herramienta funcione debe configurar una variable de entorno GITHUB_TOKEN');
+    }
+    if (gitServices.git === GitServices.GitLab && !process.env.GITLAB_TOKEN) {
+        logWarning('A fin de que la herramienta funcione debe configurar una variable de entorno GITLAB_TOKEN');
+    }
+    // Selecciona los modelos de automatizacion
+    for (const prefix of ['dev', 'git', 'doc', 'project']) {
+        const contextProperty = prefix + 'Model';
+        const models = readJsonSync(`${MODELS_FOLDER}/${prefix}/models.json`);
+        const automationModel = await prompts([{
                 type: "select",
                 name: "model",
-                message: "Elija un modelo de automatizacion",
-                initial: findChoicesPosition(models, config.model),
+                message: `Elija un modelo de automatizacion para ${prefix}`,
+                initial: findChoicesPosition(models, config[contextProperty]),
                 choices: models
             }]);
         if (automationModel.model === undefined)
             return;
-        config.model = automationModel.model;
-        // Si es custom pregunta si quiere tomar de base alguno existente
-        if (automationModel.model === 'custom') {
-            const baseModel = yield prompts([{
-                    type: "select",
-                    name: "model",
-                    message: "Quiere tomar algun modelo existente de base ? Este se copiara a la carpeta ",
-                    choices: models.concat([{ title: 'No quiero usar ningun modelo', value: 'none' }])
-                }]);
-            if (baseModel.model !== 'none') {
-                console.log('copy archivos..');
-            }
-        }
+        config[contextProperty] = automationModel.model;
+    }
+    // Gestion del Proyecto
+    const projectChoices = [{ title: 'Github Projects', value: ProjectServices.GitHub }, { title: 'GitLab Projects', value: ProjectServices.GitLab }, { title: 'Jira', value: ProjectServices.Jira }, { title: 'None', value: ProjectServices.None }];
+    const projectServices = await prompts([{
+            type: "select",
+            name: "project",
+            message: "Gestion de proyecto",
+            initial: findChoicesPosition(projectChoices, config.projectServices),
+            choices: projectChoices
+        }]);
+    if (projectServices.project === undefined)
+        return;
+    config.projectServices = projectServices.project;
+    ;
+    if (projectServices.project === ProjectServices.GitHub || projectServices.project === ProjectServices.GitLab) {
         // Gestion del Proyecto
-        const projectChoices = [{ title: 'Github Projects', value: ProjectServices.GitHub }, { title: 'GitLab Projects', value: ProjectServices.GitLab }, { title: 'Jira', value: ProjectServices.Jira }, { title: 'None', value: ProjectServices.None }];
-        const projectServices = yield prompts([{
-                type: "select",
-                name: "project",
-                message: "Gestion de proyecto",
-                initial: findChoicesPosition(projectChoices, config.projectServices),
-                choices: projectChoices
-            }]);
-        if (projectServices.project === undefined)
-            return;
-        config.projectServices = projectServices.project;
-        ;
-        if (projectServices.project === ProjectServices.GitHub || projectServices.project === ProjectServices.GitLab) {
-            // Gestion del Proyecto
-            const backlogColumn = yield prompts([{
-                    type: "text",
-                    name: "backlogColumn",
-                    initial: config.backlogColumn,
-                    message: "Nombre de la columna donde se crean nuevos issues"
-                }]);
-            if (backlogColumn.backlogColumn === undefined)
-                return;
-            config.backlogColumn = backlogColumn.backlogColumn;
-            logInfo(`Por omision ser utilizan proyectos dentro de ${context.repositoryOwner} y ${context.repositoryRepo} `);
-        }
-        // Id de Projecto
-        const projectId = yield prompts([{
+        const backlogColumn = await prompts([{
                 type: "text",
-                name: "projectId",
-                initial: config.projectId,
-                message: "Id del proyecto"
-            }]);
-        if (projectId.projectId === undefined)
-            return;
-        config.projectId = projectId.projectId;
-        // Modelo de Dcumentacion
-        const modelsTemplates = readJsonSync(`${TEMPLATES_FOLDER}/models.json`);
-        const modelTemplates = yield prompts([{
-                type: "select",
-                name: "model",
-                message: "Elija un modelo de documentacion",
-                initial: findChoicesPosition(modelsTemplates, config.modelTemplates),
-                choices: modelsTemplates
+                name: "backlogColumn",
+                initial: config.backlogColumn,
+                message: "Nombre de la columna donde se crean nuevos issues"
             }]);
-        if (modelTemplates.model === undefined)
+        if (backlogColumn.backlogColumn === undefined)
             return;
-        config.modelTemplates = modelTemplates.model;
-        return config;
-    });
+        config.backlogColumn = backlogColumn.backlogColumn;
+        logInfo(`Por omision ser utilizan proyectos dentro de ${context.repositoryOwner} y ${context.repositoryRepo} `);
+    }
+    // Id de Projecto
+    const projectId = await prompts([{
+            type: "text",
+            name: "projectId",
+            initial: config.projectId,
+            message: "Id del proyecto"
+        }]);
+    if (projectId.projectId === undefined)
+        return;
+    config.projectId = projectId.projectId;
+    return config;
 }
-export function createConfigurationFile(taskName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const baseConfig = { backlogColumn: context.backlogColumn, model: context.model, modelTemplates: context.modelTemplates, gitServices: context.gitServices, projectServices: context.projectServices, projectId: context.projectId, listFilter: context.listFilter, listTemplate: context.listTemplate };
-        let config = taskName ? yield getTaskConfig(baseConfig) : yield getBaseConfig(baseConfig);
-        if (!config)
-            return false;
-        storeConfig(config);
-        return true;
-    });
+export async function createConfigurationFile(taskName) {
+    const baseConfig = { backlogColumn: context.backlogColumn, devModel: context.devModel, docModel: context.docModel, projectModel: context.projectModel, gitModel: context.gitModel, gitServices: context.gitServices, projectServices: context.projectServices, projectId: context.projectId, listFilter: context.listFilter, listTemplate: context.listTemplate };
+    let config = taskName ? await getTaskConfig(baseConfig) : await getBaseConfig(baseConfig);
+    if (!config)
+        return false;
+    storeConfig(config);
+    return true;
 }
 export function getConfigFile(file, variable, defaultValue) {
     if (fs.existsSync(file)) {
@@ -230,7 +170,7 @@ export function getConfigFile(file, variable, defaultValue) {
                 return config[variable];
             }
         }
-        catch (_a) {
+        catch {
             return defaultValue;
         }
     }
@@ -246,7 +186,7 @@ export function storeConfig(record) {
         try {
             config = JSON.parse(content);
         }
-        catch (_a) {
+        catch {
             throw new Error(`Verifique que el ${CONFIG_FILE} sea json valido`);
         }
     }
@@ -256,7 +196,7 @@ export function storeConfig(record) {
     try {
         fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
     }
-    catch (_b) {
+    catch {
         throw new Error(`No se pudo guardar la configuracion en ${CONFIG_FILE}`);
     }
 }
@@ -355,6 +295,10 @@ export function convertKeyToName(key) {
 }
 export function readJsonSync(filename) {
     const content = fs.readFileSync(filename, "utf8");
-    const data = JSON.parse(content);
-    return data;
+    try {
+        return JSON.parse(content);
+    }
+    catch {
+        throw new Error(`Verifique que el ${filename} sea json valido`);
+    }
 }

package/models/dev/models.json

@@ -0,0 +1,19 @@
+[
+    { 
+        "title": "Salesforce con scratchs",
+        "value": "scratchs",
+        "default": true,
+        "description": "Desarrollos empresariales sobre Salesforce, usando una scracth para desarrollo de cada requerimiento"
+    },
+    { 
+        "title": "Second Generation Packages con Scratch Orgs",
+        "value": "packages",
+        "description": "ISV o desarrollos de aplicaciones en Salesforce"
+    },
+    { 
+        "title": "Paquetes de NPM",
+        "value": "npm",
+        "description": "Para herramientas complementarias como autoforce"
+    }
+]
+

package/models/doc/models.json

@@ -0,0 +1,9 @@
+[
+    { 
+        "title": "Procesos de Negocio en Salesforce",
+        "value": "processes",
+        "default": true,
+        "description": "Documentacion Tecnica de procesos de negocio en Salesforce"
+    }
+]
+

package/models/git/models.json

@@ -0,0 +1,9 @@
+[
+    { 
+        "title": "Github flow branching model",
+        "value": "githubflow",
+        "default": true,
+        "description": "Cada feature se desarrolla en una feature branch y se mergea en main"
+    }
+]
+

package/models/project/models.json

@@ -0,0 +1,9 @@
+[
+    { 
+        "title": "Proyectos con releases",
+        "value": "github-releases",
+        "default": true,
+        "description": "Manejo de releases en Github proyects"
+    }
+]
+

package/package.json

@@ -2,7 +2,7 @@
   "name": "autoforce",
   "homepage": "https://sebastianclaros.github.io/autoforce",
   "private": false,
-  "version": "0.1.17",
+  "version": "0.1.19",
   "keywords": [
     "Salesforce",
     "Automation",
@@ -15,8 +15,7 @@
   },
   "main": "./bin/index.js",
   "files": [
-    "commands/**/*",
-    "templates/**/*",
+    "models/**/*",
     "lib/**/*",
     ".autoforce.json",
     "bin/**/*"
@@ -30,27 +29,32 @@
     "build": "tsc --project tsconfig.build.json",
     "prettier": "prettier --write \"**/*.{css,html,js,json,ts,md,xml,yaml,yml}\"",
     "test:build": "yarn build && npm publish --dry-run && node ./bin/index.js",
-    "test": "ts-jest --config jest.config.ts"
+    "test:package": "yarn build && npm publish --dry-run && node ./bin/index.js",
+    "test": "vitest"
   },
   "devDependencies": {
-    "@eslint/js": "^9.9.1",
+    "@eslint/js": "^8.56.0",
     "@octokit/graphql": "^8.1.1",
     "@types/graphql": "^14.5.0",
-    "@types/jest": "29.4.0",
+    "@types/jest": "^29.5.14",
+    "@types/mocha": "^10.0.10",
     "@types/node": "^22.8.1",
-    "@typescript-eslint/eslint-plugin": "5.54.0",
-    "@typescript-eslint/parser": "5.52.0",
-    "eslint": "^9.9.1",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
+    "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-jest": "^26.1.2",
+    "eslint-plugin-jest": "^27.6.0",
     "husky": "^7.0.4",
     "jest": "29.4.3",
+    "jsdom": "^26.0.0",
     "lint-staged": "^12.3.7",
     "prettier": "^2.6.0",
     "ts-jest": "29.0.5",
+    "ts-jest-mock-import-meta": "^1.2.1",
     "ts-node": "^10.9.2",
-    "typescript": "4.9.5",
-    "typescript-eslint": "^8.3.0"
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.3.0",
+    "vitest": "^3.0.5"
   },
   "dependencies": {
     "@types/jsforce": "^1.11.5",

package/commands/modelC/new/issue.json

@@ -1,24 +0,0 @@
-{
-  "name": "issue",
-  "guards": ["isGitApi"],
-  "arguments": {
-    "title": { "required": true },
-    "label": {
-      "type": "select",
-      "values": "labels"
-    },
-    "milestone": {
-      "type": "select",      
-      "values": "milestones"
-    },
-    "body": { "required": false }    
-  },
-  "description": "Comando para crear un requerimiento nuevo",
-  "steps": [
-    {
-      "name": "Crear un issue nuevo",
-      "function": "createIssue",
-      "arguments": ["${title}", "${label}", "${body}", "${milestone}"]
-    }
-  ]
-}

package/commands/models.json

@@ -1,18 +0,0 @@
-[
-    { 
-        "title": "Continious Delivery con Scratch Orgs",
-        "value": "modelA",
-        "description": "Github workflow pensado en soluciones para Clientes finales"
-    },
-    { 
-        "title": "Second Generation Packages con Scratch Orgs",
-        "value": "modelB",
-        "description": "Gitflow workflow pensado para ISV"
-    },
-    { 
-        "title": "Paquetes de NPM",
-        "value": "modelC",
-        "description": "Para herramientas complementarias como autoforce"
-    }
-]
-

package/templates/modelB/openIssues.bash

@@ -1,4 +0,0 @@
-{{#each issues}}
-* #{{number}}: {{title}} 
-  {{milestone.title}}
-{{/each}}

package/templates/modelB/viewIssue.bash

@@ -1,8 +0,0 @@
-{{#with issue}}
-#{{number}}: {{title}} 
-{{state}}
-{{#each labels}}{{this}}{{/each}}
-{{url}}
-{{milestone.title}}
-{{body}}
-{{/with}}

package/templates/models.json

@@ -1,12 +0,0 @@
-[
-    { 
-        "title": "Procesos de Negocio en Salesforce",
-        "value": "modelA",
-        "description": "Documenta Clases, Objetos y LWC a traves de procesos de negocios. Se basa en docusaurus"
-    },
-    { 
-        "title": "Proyecto simple en Github Docs",
-        "value": "modelB",
-        "description": "Github pages con changelog, readme y carpeta docs de Markdowns"
-    }
-]