autoforce 0.1.25 → 0.1.27

package/.autoforce.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.23",
+  "version": "0.1.27",
   "backlogColumn": "Todo",
   "gitServices": "github",
   "gitModel": "githubflow",
@@ -11,5 +11,6 @@
   "devModel": "npm",
   "docModel": "processes",
   "filter": "{states: OPEN}",
-  "template": "openIssues"
+  "template": "openIssues",
+  "dictionaryFolder": "docs/docs"
 }

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Versiones
 
+0.1.26
+## Version 0.1.26
+- Fecha: 
+- Paquete: [Descargar](https://www.npmjs.com/package/autoforce/v/0.1.26)
+- Cambios:
+    * Bugfixing de create-scracth para autoforce-test 
+
 
 0.1.25
 ## Version 0.1.25

package/lib/helpers/class.js

@@ -4,7 +4,7 @@ import { DICTIONARY_FOLDER, getModelFolders } from "./util.js";
 let _templateEngine;
 function getTemplateEngine() {
     if (!_templateEngine) {
-        _templateEngine = templateGenerator(getModelFolders('dictionary'), "md");
+        _templateEngine = templateGenerator(getModelFolders('templates/dictionary'), "md");
     }
     return _templateEngine;
 }

package/lib/helpers/context.d.ts

@@ -24,12 +24,12 @@ declare class Context implements IObjectRecord {
     gitModel: string | undefined;
     docModel: string | undefined;
     errorMessage: string;
+    projectPath: string;
     projectModel: string | undefined;
     gitServices: GitServices;
     isGitApi: boolean;
     gitApi: IGitApi | undefined;
     version: string | undefined;
-    dictionaryFolder: string;
     options: Record<string, AnyValue>;
     projectServices: ProjectServices;
     isProjectApi: boolean;
@@ -39,6 +39,7 @@ declare class Context implements IObjectRecord {
     branchName: string | undefined;
     issueNumber: string | undefined;
     issueType: string | undefined;
+    _dictionaryFolder: string | undefined;
     _process: string | undefined;
     _processesHeader: Record<string, IProcessHeader> | undefined;
     _newIssueNumber: string | undefined;
@@ -80,10 +81,12 @@ declare class Context implements IObjectRecord {
         [key: string]: any;
     };
     addProcessMetadata(component: string, items: string[]): void;
+    set dictionaryFolder(value: string);
+    get dictionaryFolder(): string;
     get processesHeader(): Record<string, IProcessHeader>;
     getProcessMetadata(): IProcessInfo[];
     getModules(): string[];
-    get modules(): PromptChoices;
+    modules(): PromptChoices;
     get existScratch(): boolean;
     get scratch(): OrganizationInfo;
     validate(guards: string[]): Promise<void>;

package/lib/helpers/context.js

@@ -43,13 +43,16 @@ function searchInFolderHierarchy(element, parentFolder) {
     }
     return '';
 }
+function getProjectPath() {
+    return searchInFolderHierarchy('package.json', process.cwd() || '.');
+}
 function getDataFromPackage() {
     const data = {};
     try {
-        const PROJECT_FOLDER = searchInFolderHierarchy('package.json', process.cwd() || '.');
-        const filename = `${PROJECT_FOLDER}/package.json`;
+        const projectPath = getProjectPath();
+        const filename = `${projectPath}/package.json`;
         if (!fs.existsSync(filename)) {
-            throw new Error("No se encontro el package.json en " + PROJECT_FOLDER);
+            throw new Error("No se encontro el package.json en " + projectPath);
         }
         const content = fs.readFileSync(filename, "utf8");
         const packageJson = JSON.parse(content);
@@ -91,12 +94,12 @@ class Context {
     gitModel;
     docModel;
     errorMessage = '';
+    projectPath = getProjectPath();
     projectModel;
     gitServices = GitServices.None;
     isGitApi = false;
     gitApi;
     version;
-    dictionaryFolder = process.cwd() + "/docs";
     options = {};
     projectServices = ProjectServices.None;
     isProjectApi = false;
@@ -106,6 +109,7 @@ class Context {
     branchName;
     issueNumber;
     issueType;
+    _dictionaryFolder;
     _process;
     _processesHeader;
     _newIssueNumber;
@@ -322,6 +326,12 @@ class Context {
             throw new Error(`No se pudo guardar la metadata`);
         }
     }
+    set dictionaryFolder(value) {
+        this._dictionaryFolder = value;
+    }
+    get dictionaryFolder() {
+        return this._dictionaryFolder ? this._dictionaryFolder : getProjectPath() + '/docs';
+    }
     get processesHeader() {
         if (!this._processesHeader) {
             this._processesHeader = {};
@@ -361,9 +371,9 @@ class Context {
         return retArray;
     }
     getModules() {
-        return getFiles(this.dictionaryFolder, filterDirectory, false, ['diccionarios']);
+        return getFiles(this.dictionaryFolder, filterDirectory, false, ['diccionarios', 'src', '.docusaurus', 'node_modules']);
     }
-    get modules() {
+    modules() {
         return this.getModules().map(module => { return { value: module, title: module }; });
     }
     get existScratch() {
@@ -549,7 +559,7 @@ class Context {
         }
         return inputsArray;
     }
-    async askForExit() {
+    async askForExit( /* prompt: PromptObject */) {
         const answer = await prompts([
             {
                 type: "confirm",
@@ -583,14 +593,19 @@ class Context {
     }
     async askForArguments(inputs) {
         // unifica los dos tipos de inputs (array y objeto) en un array de inputs
-        const inputsArray = await this.convertToArrayOfInputs(inputs);
-        for (const input of inputsArray) {
-            const hasValue = await this.get(input.name);
-            if (!hasValue) {
-                const answer = await prompts([input], { onCancel: this.askForExit });
-                this[input.name] = answer[input.name];
+        try {
+            const inputsArray = await this.convertToArrayOfInputs(inputs);
+            for (const input of inputsArray) {
+                const hasValue = await this.get(input.name);
+                if (!hasValue) {
+                    const answer = await prompts([input], { onCancel: this.askForExit });
+                    this[input.name] = answer[input.name];
+                }
             }
         }
+        catch {
+            throw new Error(`No se pudo obtener los argumentos para ${inputs}`);
+        }
     }
     setObject(obj) {
         for (const field in obj) {

package/lib/helpers/lwc.js

@@ -4,7 +4,7 @@ import { DICTIONARY_FOLDER, getModelFolders } from "./util.js";
 let _templateEngine;
 function getTemplateEngine() {
     if (!_templateEngine) {
-        _templateEngine = templateGenerator(getModelFolders('dictionary'), "md");
+        _templateEngine = templateGenerator(getModelFolders('templates/dictionary'), "md");
     }
     return _templateEngine;
 }

package/lib/helpers/object.js

@@ -4,7 +4,7 @@ import { DICTIONARY_FOLDER, getModelFolders } from "./util.js";
 let _templateEngine;
 function getTemplateEngine() {
     if (!_templateEngine) {
-        _templateEngine = templateGenerator(getModelFolders('dictionary'), "md");
+        _templateEngine = templateGenerator(getModelFolders('templates/dictionary'), "md");
     }
     return _templateEngine;
 }

package/lib/helpers/taskFunctions.js

@@ -18,11 +18,11 @@ function generateTemplate(templateFolder, templateExtension, template, context)
     templateEngine.render(view);
     return templateEngine.rendered;
 }
-function createTemplate(templateFolder, templateExtension, template, filename, folder, context) {
-    if (!template || !filename || !templateFolder || !templateExtension) {
+function createTemplate(templateFolders, templateExtension, template, filename, folder, context) {
+    if (!template || !filename || !templateFolders || !templateExtension) {
         return;
     }
-    const templateEngine = templateGenerator([templateFolder], templateExtension);
+    const templateEngine = templateGenerator(templateFolders, templateExtension);
     const formulas = {
         today: Date.now(),
         filename
@@ -57,7 +57,8 @@ export async function executeCommand(step) {
         execSync(step.command + ' ' + convertArgsToString(step.arguments), { stdio: 'inherit' });
         return true;
     }
-    catch {
+    catch (e) {
+        context.errorMessage = `Se produjo un error al ejecutar el comando: ${e}`;
         return false;
     }
 }
@@ -246,15 +247,15 @@ export const taskFunctions = {
         if (!tryToRetrieve) {
             return false;
         }
-        executeShell(`sf project retrieve start`);
+        executeShell("sf project retrieve start");
         return await this.validateScratch();
     },
     async validateScratch() {
         const salida = executeShell("sf project retrieve preview");
         context.salida = salida;
-        const noHayCambios = salida.indexOf('No files will be deleted') !== -1 && salida.indexOf('No files will be retrieved') !== -1 && salida.indexOf('No conflicts found') !== -1;
+        context.noHayCambios = salida.indexOf('No files will be deleted') !== -1 && salida.indexOf('No files will be retrieved') !== -1 && salida.indexOf('No conflicts found') !== -1;
         // Probar de bajarlos // sf project retrieve start
-        return noHayCambios;
+        return context.noHayCambios;
     },
     async commitChanges() {
         const tryToCommit = await askForContinue("Desea commitear los cambios?");
@@ -370,7 +371,7 @@ export const taskFunctions = {
     },
     async createTemplate(template, folder, name, identifier) {
         const filename = name.toLocaleLowerCase().replaceAll(' ', '-') + '.md';
-        createTemplate('.', 'md', template, filename, folder, { name, identifier });
+        createTemplate(getModelFolders('templates'), 'md', template, filename, folder, { name, identifier });
         return true;
     },
     async validateIssue(issueNumber, states) {

package/lib/helpers/template.js

@@ -58,7 +58,7 @@ export class TemplateEngine {
         // Busca en las carpetas el archivo
         for (const currentFolder of this._sourceFolders) {
             folder = currentFolder;
-            const filterWithExtension = (fileName) => fileName === `${name}.${extension}`;
+            const filterWithExtension = (fileName) => fileName.endsWith(`/${name}.${extension}`);
             const filterWithoutExtension = (fileName) => fileName.split(".")[0].endsWith(name);
             const filter = (extension === '*' || extension === '') ? filterWithoutExtension : filterWithExtension;
             const fileNames = getFiles(folder, filter);

package/lib/helpers/util.js

@@ -141,6 +141,16 @@ async function getBaseConfig(config) {
         config.backlogColumn = backlogColumn.backlogColumn;
         logInfo(`Por omision ser utilizan proyectos dentro de ${context.repositoryOwner} y ${context.repositoryRepo} `);
     }
+    // dictionaryFolder
+    const dictionaryFolder = await prompts([{
+            type: "text",
+            name: "dictionaryFolder",
+            initial: config.dictionaryFolder,
+            message: "Ruta a los modulos de la documentacion (desde el root del proyecto)"
+        }]);
+    if (dictionaryFolder.dictionaryFolder === undefined)
+        return;
+    config.dictionaryFolder = dictionaryFolder.dictionaryFolder;
     // Id de Projecto
     const projectId = await prompts([{
             type: "text",

package/models/dev/npm/tasks/publish.json

@@ -8,7 +8,6 @@
   "steps": [
     { "name": "Actualiza la version", "function": "storeConfig", "arguments": ["version", "${newVersion}"] },
     { "name": "Paquetiza", "subtask": "pack" },
-    { "name": "Salida para el Changelog.md", "task": "list", "arguments": {"filter": "milestone", "template": "changelog", "milestone": "v${newVersion}"} },
     { "name": "Publica", "command": "yarn publish ", "arguments": {"--new-version": "${newVersion}"} },
     { "name": "Actualiza el milestone", "function": "updateMilestone", "arguments": ["v${newVersion}", "closed"] }
   ]

package/models/dev/scratchs/subtasks/create-scratch.json

@@ -20,7 +20,7 @@
         "--name": "${scratchName}",
         "--duration-days": "${dias}"
       },
-      "errorMessage": "No se pudo crear la scracth org, verifique que no se haya pasado del limite scratchs (3 activas)* sf org list --clean\n* o bien si quedo en la mitad del proceso\n* sf org resume"
+      "errorMessage": "No se pudo crear la scracth org, verifique que no se haya pasado del limite scratchs (3 activas)* sf org list --clean\n* o bien si quedo en la mitad del proceso\n* sf org resume. Pruebe manualmente: ${command}"
     },
     {
       "criteria": { "field": "existBranchScratch", "value": true },

package/models/doc/processes/new/process.json

@@ -1,7 +1,7 @@
 {
   "name": "process",
   "arguments": {
-    "folder": { "type": "select", "choices": "${modules}" },
+    "folder": { "type": "select", "values": "modules" },
     "name": { "required": true },
     "identifier": { "required": true }
   },

package/package.json

@@ -2,7 +2,7 @@
   "name": "autoforce",
   "homepage": "https://sebastianclaros.github.io/autoforce",
   "private": false,
-  "version": "0.1.25",
+  "version": "0.1.27",
   "keywords": [
     "Salesforce",
     "Automation",
@@ -69,5 +69,6 @@
     "prompts": "^2.4.2"
   },
   "author": "Sebastian Claros <sclaros@gmail.com>",
-  "license": "MIT"
+  "license": "MIT",
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }