autoforce 0.1.26 → 0.1.28

package/.autoforce.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.23",
+  "version": "0.1.28",
   "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.27
+## Version 0.1.27
+- Fecha: 
+- Paquete: [Descargar](https://www.npmjs.com/package/autoforce/v/0.1.27)
+- Cambios:
+    * Bugfixing del template folder
+
 0.1.26
 ## Version 0.1.26
 - Fecha: 

package/README.md

@@ -126,14 +126,14 @@ La guia del readme sirve de ejemplo.
 
 ## Testear una version en forma local
 
-Para hacer un testeo local se puede generar una version nueva
+Para hacer un testeo local se puede generar una version nueva. Esto pide un nro de version arma el package en root como autoforce-latest.tgz
 
 ```
-yarn build && yarn pack
+yarn pack
 ```
 
-Y despues en algun proyecto se puede instalar
+Despues en el repositorio local autoforce-test, hay un script que lo instala. 
 
 ```
-yarn add -D files:<<path-to-file>>
+./scripts/test/upgrade-local.sh
 ```

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

@@ -30,7 +30,6 @@ declare class Context implements IObjectRecord {
     isGitApi: boolean;
     gitApi: IGitApi | undefined;
     version: string | undefined;
-    dictionaryFolder: string;
     options: Record<string, AnyValue>;
     projectServices: ProjectServices;
     isProjectApi: boolean;
@@ -40,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;
@@ -81,10 +81,11 @@ 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;
+    modulesFolders(): PromptChoices;
     get existScratch(): boolean;
     get scratch(): OrganizationInfo;
     validate(guards: string[]): Promise<void>;

package/lib/helpers/context.js

@@ -100,7 +100,6 @@ class Context {
     isGitApi = false;
     gitApi;
     version;
-    dictionaryFolder = process.cwd() + "/docs";
     options = {};
     projectServices = ProjectServices.None;
     isProjectApi = false;
@@ -110,6 +109,7 @@ class Context {
     branchName;
     issueNumber;
     issueType;
+    _dictionaryFolder;
     _process;
     _processesHeader;
     _newIssueNumber;
@@ -326,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 = {};
@@ -364,11 +370,9 @@ class Context {
         }
         return retArray;
     }
-    getModules() {
-        return getFiles(this.dictionaryFolder, filterDirectory, false, ['diccionarios']);
-    }
-    get modules() {
-        return this.getModules().map(module => { return { value: module, title: module }; });
+    modulesFolders() {
+        const folders = getFiles(this.dictionaryFolder, filterDirectory, true, ['diccionarios', 'src', '.docusaurus', 'node_modules']).sort();
+        return folders.map(module => { return { value: this.dictionaryFolder + '/' + module, title: module.replaceAll('/', ' > ') }; });
     }
     get existScratch() {
         return typeof this.scratch !== 'undefined';
@@ -553,7 +557,7 @@ class Context {
         }
         return inputsArray;
     }
-    async askForExit() {
+    async askForExit( /* prompt: PromptObject */) {
         const answer = await prompts([
             {
                 type: "confirm",
@@ -587,14 +591,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
@@ -247,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?");
@@ -371,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/subtasks/postpack.json

@@ -0,0 +1,11 @@
+{
+    "name": "postpack",
+    "description": "Comando despues de hacer el package localmente",
+    "steps": [
+      {
+        "name": "Renombra paquete",
+        "command": "mv autoforce*.tgz autoforce-latest.tgz",
+        "onError": "skip"
+      }
+    ]
+  }

package/models/dev/npm/subtasks/{pack.json → prepack.json}

@@ -1,10 +1,14 @@
 {
-    "name": "pack",
-    "description": "Comando para crear el package localmente",
+    "name": "prepack",
+    "arguments": {
+      "newVersion": { "required": true, "default": "${version}" }
+    },
+    "description": "Comando para previo al pack",
     "steps": [
+      { "name": "Actualiza la version", "function": "storeConfig", "arguments": ["version", "${newVersion}"] },
       {
         "name": "Borra el paquete",
-        "command": "rm autoforce*.tgz",
+        "command": "rm -f autoforce*.tgz",
         "onError": "skip"
       },
       {
@@ -15,15 +19,6 @@
       {
         "name": "Compila el typescript",
         "command": "tsc --project tsconfig.build.json"
-      },
-      {
-        "name": "Arma el paquete",
-        "command": "yarn pack"
-      },
-      {
-        "name": "Renombra paquete",
-        "command": "mv autoforce*.tgz autoforce.tgz"
       }
     ]
   }
-  

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

@@ -1,7 +1,7 @@
 {
   "name": "process",
   "arguments": {
-    "folder": { "type": "select", "choices": "${modules}" },
+    "folder": { "type": "select", "values": "modulesFolders" },
     "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.26",
+  "version": "0.1.28",
   "keywords": [
     "Salesforce",
     "Automation",
@@ -27,9 +27,10 @@
   "scripts": {
     "prebuild": "rm -rf ./lib/",
     "build": "tsc --project tsconfig.build.json",
+    "prepack": "npx autoforce subtask prepack",
+    "postpack": "npx autoforce subtask postpack",
     "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:package": "yarn build && npm publish --dry-run && node ./bin/index.js",
+    "test:build": "yarn build && node ./bin/index.js",
     "test": "vitest"
   },
   "devDependencies": {
@@ -69,5 +70,6 @@
     "prompts": "^2.4.2"
   },
   "author": "Sebastian Claros <sclaros@gmail.com>",
-  "license": "MIT"
+  "license": "MIT",
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }