autoforce 0.1.9 → 0.1.11

package/lib/helpers/context.js

@@ -21,19 +21,20 @@ export var GitServices;
     GitServices["GitHub"] = "github";
     GitServices["GitLab"] = "gitlab";
     GitServices["None"] = "none";
-})(GitServices = GitServices || (GitServices = {}));
+})(GitServices || (GitServices = {}));
 export var ProjectServices;
 (function (ProjectServices) {
     ProjectServices["GitHub"] = "github";
     ProjectServices["GitLab"] = "gitlab";
     ProjectServices["Jira"] = "Jira";
     ProjectServices["None"] = "none";
-})(ProjectServices = ProjectServices || (ProjectServices = {}));
+})(ProjectServices || (ProjectServices = {}));
 const filterProcesses = (fullPath) => fullPath.endsWith(".md"); // && !fullPath.endsWith("intro.md") 
 const ISSUES_TYPES = [{ value: 'feature', title: 'feature' }, { value: 'bug', title: 'bug' }, { value: 'documentation', title: 'documentation' }, { value: 'automation', title: 'automation' }];
 class Context {
     constructor() {
-        this.model = 'modelA'; // Default Model
+        this.model = 'modelA'; // Default Model de commands
+        this.modelTemplates = 'modelA'; // Default Model de templates
         this.gitServices = GitServices.None;
         this.isGitApi = false;
         this.projectServices = ProjectServices.None;
@@ -46,6 +47,8 @@ class Context {
         // Ultima salida del shell
         this.salida = '';
         this.backlogColumn = 'Todo';
+        this.loadConfig();
+        this.loadPackage();
     }
     loadProjectApi() {
         if (!this.isProjectApi) {
@@ -118,28 +121,38 @@ class Context {
         this.repositoryRepo = data.repositoryRepo;
     }
     loadConfig() {
-        if (!fs.existsSync(CONFIG_FILE)) {
-            logWarning('Bienvenido! Antes de usar la herramienta, tenemos que configurarla.');
-            logWarning('Lo puedes hacer mas tarde manualmente leyendo la documentacion y creando .autoforce.json en el root del proyecto');
-            logWarning('O bien ahora con el asistente, el mismo lo puedes llamar todas las veces que necesites corriendo npx autoforce config!');
-            createConfigurationFile();
-            return;
-        }
-        const content = fs.readFileSync(CONFIG_FILE, "utf8");
-        try {
-            const config = JSON.parse(content);
-            for (const key in config) {
-                this.set(key, config[key]);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!fs.existsSync(CONFIG_FILE)) {
+                logWarning('Bienvenido! La herramienta Autoforce necesita un primer paso de configuracion antes de usarla.');
+                logWarning('- Podes usar el asistente ejecutando npx autoforce config');
+                logWarning('- Podes hacerlo manualmente leyendo la documentacion y creando .autoforce.json manualmente en el root del proyecto (https://sebastianclaros.github.io/autoforce/docs/configuracion)');
+                const answer = yield prompts([
+                    {
+                        type: "confirm",
+                        name: "asistente",
+                        message: "Queres ejecutar el asistente ahora?"
+                    }
+                ]);
+                if (answer.asistente) {
+                    yield createConfigurationFile();
+                    return true;
+                }
+                return false;
             }
-        }
-        catch (_a) {
-            throw new Error(`Verifique que el ${CONFIG_FILE} sea json valido`);
-        }
+            const content = fs.readFileSync(CONFIG_FILE, "utf8");
+            try {
+                const config = JSON.parse(content);
+                for (const key in config) {
+                    this.set(key, config[key]);
+                }
+            }
+            catch (_a) {
+                throw new Error(`Verifique que el ${CONFIG_FILE} sea json valido`);
+            }
+            return true;
+        });
     }
     init() {
-        // Busca variables de entorno    
-        this.loadConfig();
-        this.loadPackage();
         this.loadProjectApi();
         this.loadGitApi();
         // 
@@ -242,9 +255,17 @@ class Context {
     validate(guards) {
         return __awaiter(this, void 0, void 0, function* () {
             for (const guard of guards) {
-                const value = yield this.get(guard);
-                if (!value) {
-                    throw new Error(`No se encontro la variable ${guard} en el contexto. Ejecute yarn auto config o lea el index.md para mas informacion.`);
+                // Chequeo de variables de entorno
+                if (guard[0] === '$') {
+                    if (!process.env[guard.substring(1)]) {
+                        throw new Error(`La variable de entorno ${guard} no esta configurada.`);
+                    }
+                }
+                else {
+                    const value = yield this.get(guard);
+                    if (!value) {
+                        throw new Error(`No se encontro la variable ${guard} en el contexto. Ejecute yarn auto config o lea el index.md para mas informacion.`);
+                    }
                 }
             }
         });
@@ -450,7 +471,7 @@ class Context {
     }
     setObject(obj) {
         for (const field in obj) {
-            Object.defineProperty(this, field, obj[field]);
+            Object.defineProperty(this, field, { value: obj[field], writable: true });
         }
     }
     set(key, value) {
@@ -512,7 +533,7 @@ const context = new Context();
 let initialized = false;
 export function initializeContext() {
     try {
-        if (!initialized) {
+        if (initialized === false) {
             context.init();
             initialized = true;
         }

package/lib/helpers/github-graphql.d.ts

@@ -14,7 +14,7 @@ export declare class GitHubApi implements IGitApi {
         id: string;
         label?: {
             id: string;
-        } | undefined;
+        };
         projectV2: {
             id: string;
             field: {

package/lib/helpers/github-graphql.js

@@ -95,8 +95,8 @@ export class GitHubApi {
         });
     }
     assignBranchToIssue(issueNumber, branchName, commitSha) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const issue = yield this.getIssue(issueNumber);
             const commit = yield this.getCommit(commitSha);
             const mutation = `

package/lib/helpers/github-project-graphql.d.ts

@@ -3,7 +3,7 @@ export declare class GitHubProjectApi extends GitHubApi implements IProjectApi {
     projectNumber: number;
     constructor(token: string, owner: string, repo: string, projectNumber: number);
     getColumnValueMap(): Promise<Record<string, string>>;
-    createIssue(title: string, state?: string, label?: string, milestone?: string, body?: string): Promise<number>;
+    createIssue(title: string, state?: string, label?: string, body?: string, milestone?: string): Promise<number>;
     getIssueState(issueNumber: string): Promise<string>;
     getIssueName(title: string): string;
     getIssueObject(issueNumber: string): Promise<IIssueObject>;
@@ -11,6 +11,14 @@ export declare class GitHubProjectApi extends GitHubApi implements IProjectApi {
         id: string;
         title: string;
     }[]>;
+    getIssuesByMilestone(milestone: string): Promise<{
+        id: string;
+        title: string;
+    }[]>;
+    getIssuesWithFilter(filterBy: string): Promise<{
+        id: string;
+        title: string;
+    }[]>;
     moveIssue(issueNumber: string, state: string): Promise<boolean>;
     assignIssueToMe(issueNumber: string): Promise<boolean>;
 }

package/lib/helpers/github-project-graphql.js

@@ -42,9 +42,9 @@ export class GitHubProjectApi extends GitHubApi {
             return mapValues;
         });
     }
-    createIssue(title, state, label, milestone, body) {
-        var _a;
+    createIssue(title, state, label, body, milestone) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const user = yield this.getUser();
             const repository = yield this.getRepository(label);
             const repositoryId = repository.id;
@@ -115,8 +115,8 @@ export class GitHubProjectApi extends GitHubApi {
         });
     }
     getIssueState(issueNumber) {
-        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             const issue = yield this.getIssue(issueNumber);
             return (_c = (_b = (_a = issue.projectItems) === null || _a === void 0 ? void 0 : _a.nodes[0]) === null || _b === void 0 ? void 0 : _b.fieldValueByName) === null || _c === void 0 ? void 0 : _c.name;
         });
@@ -145,19 +145,29 @@ export class GitHubProjectApi extends GitHubApi {
         });
     }
     getIssues() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.getIssuesWithFilter(`{ states: OPEN }`);
+        });
+    }
+    getIssuesByMilestone(milestone) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.getIssuesWithFilter(`{ milestone: ${milestone} }`);
+        });
+    }
+    getIssuesWithFilter(filterBy) {
         return __awaiter(this, void 0, void 0, function* () {
             const query = `
-    query getIssue($owner:String!, $repo: String!) {
-      repository(owner: $owner, name: $repo) {
-        issues(last: 10) {
-          nodes {
-            title
-            id          
+        query getIssues($owner:String!, $repo: String!) {
+          repository(owner: $owner, name: $repo) {
+            issues(last: 10, filterBy: ${filterBy} ) {
+              nodes {
+                title
+                id          
+              }
+            }
           }
         }
-      }
-    }
-`;
+    `;
             const { repository } = yield this.graphqlAuth(query, this.repoVar);
             return repository.issues.nodes;
         });

package/lib/helpers/gitlab-graphql.d.ts

@@ -10,7 +10,8 @@ export declare class GitLabApi implements IGitApi, IProjectApi {
     constructor(token: string, owner: string, repo: string, projectNumber?: number);
     getIssueObject(issueNumber: string): Promise<{}>;
     getIssues(): Promise<never[]>;
-    createIssue(title: string, state?: string, label?: string, milestone?: string, body?: string): Promise<number>;
+    getIssuesByMilestone(milestone: string): Promise<never[]>;
+    createIssue(title: string, state?: string, label?: string, body?: string, milestone?: string): Promise<number>;
     moveIssue(issueNumber: string, state: string): Promise<boolean>;
     assignIssueToMe(issueNumber: string): Promise<boolean>;
     getUser(): Promise<{

package/lib/helpers/gitlab-graphql.js

@@ -27,9 +27,14 @@ export class GitLabApi {
             return [];
         });
     }
-    createIssue(title, state, label, milestone, body) {
+    getIssuesByMilestone(milestone) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log(title, label, milestone, body);
+            return [];
+        });
+    }
+    createIssue(title, state, label, body, milestone) {
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log(title, state, label, body, milestone);
             return 1;
         });
     }

package/lib/helpers/lwc.js

@@ -9,8 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import sf from "./connect.js";
 import templateGenerator from "./template.js";
-const templateEngine = templateGenerator("dictionary", "md");
-import { sortByName, splitFilename, DICTIONARY_FOLDER, TEMPLATES_FOLDER } from "./util.js";
+import { DICTIONARY_FOLDER, TEMPLATE_MODEL_FOLDER } from "./util.js";
+const templateEngine = templateGenerator(`${TEMPLATE_MODEL_FOLDER}/dictionary`, "md");
+import { sortByName, splitFilename } from "./util.js";
 function getMetadata(lwc) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -59,7 +60,7 @@ function executeLwc(items, filename, folder) {
         templateEngine.render(lwcContext, {
             helpers: {}
         });
-        templateEngine.save(filename, TEMPLATES_FOLDER + "/" + folder);
+        templateEngine.save(filename, TEMPLATE_MODEL_FOLDER + "/" + folder);
     });
 }
 const lwcModule = {

package/lib/helpers/metadata.js

@@ -10,7 +10,7 @@ const helpers = {
 export default helpers;
 /*
 import context from "./context.js";
-import { TEMPLATES_FOLDER } from "./util.js";
+import { TEMPLATE_MODEL_FOLDER } from "./util.js";
 import type { DocumentationModule, IProcessInfo, IMetadataNode, IMetadataComponentNode } from "../types/auto.js";
 function getMetadataFromContext(components: string[]) {
     return getMetadataArray(context.getProcessMetadata(), components);
@@ -66,7 +66,7 @@ function getMetadataArray(metadata: IProcessInfo[], props: string[]) {
       return items;
     };
   
-    return getItemsFromTree({ folder: TEMPLATES_FOLDER, childs: metadata });
+    return getItemsFromTree({ folder: TEMPLATE_MODEL_FOLDER, childs: metadata });
   }
   
 export async function execute() {

package/lib/helpers/object.js

@@ -9,8 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import sf from "./connect.js";
 import templateGenerator from "./template.js";
-const templateEngine = templateGenerator("dictionary", "md");
-import { sortByLabel, DICTIONARY_FOLDER, TEMPLATES_FOLDER, } from "./util.js";
+import { DICTIONARY_FOLDER, TEMPLATE_MODEL_FOLDER } from "./util.js";
+const templateEngine = templateGenerator(`${TEMPLATE_MODEL_FOLDER}/dictionary`, "md");
+import { sortByLabel } from "./util.js";
 function getMetadata(objetos) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -123,7 +124,7 @@ function executeObjects(items, filename, folder) {
         templateEngine.render(objectContext, {
             helpers: { isManaged, isMetadataFormula, attributesFormula }
         });
-        templateEngine.save(filename, TEMPLATES_FOLDER + "/" + folder);
+        templateEngine.save(filename, TEMPLATE_MODEL_FOLDER + "/" + folder);
     });
 }
 const objectModule = {

package/lib/helpers/openai.js

@@ -12,8 +12,8 @@ const client = new OpenAI({
     apiKey: process.env['OPENAI_API_KEY'], // This is the default and can be omitted
 });
 export function getCommitMessage() {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (process.env['OPENAI_API_KEY']) {
             const params = {
                 messages: [{ role: 'user', content: 'Say this is a test' }],

package/lib/helpers/taskFunctions.js

@@ -9,11 +9,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { execSync } from "child_process";
 import context from "./context.js";
-import { logError } from "./color.js";
+import { logError, logInfo } from "./color.js";
 import metadata from './metadata.js';
 import prompts from "prompts";
 import templateGenerator from "./template.js";
 import { getColored } from "./color.js";
+import { storeConfig, TEMPLATE_MODEL_FOLDER } from "./util.js";
+function generateTemplate(templateFolder, templateExtension, template, context) {
+    if (!template || !templateFolder || !templateExtension) {
+        return;
+    }
+    const templateEngine = templateGenerator(templateFolder, templateExtension);
+    const formulas = {
+        today: Date.now(),
+    };
+    const view = Object.assign(Object.assign({}, formulas), context);
+    templateEngine.read(template);
+    templateEngine.render(view);
+    return templateEngine.rendered;
+}
 function createTemplate(templateFolder, templateExtension, template, filename, folder, context) {
     if (!template || !filename || !templateFolder || !templateExtension) {
         return;
@@ -219,6 +233,14 @@ function getFilesChanged() {
     return files;
 }
 export const taskFunctions = {
+    skip() {
+        logInfo('Error omitido por configuracion del step');
+        return true;
+    },
+    storeConfig(variable, value) {
+        storeConfig(variable, value);
+        return true;
+    },
     docProcess() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!context.process) {
@@ -312,12 +334,12 @@ export const taskFunctions = {
         console.log('Not implemented');
         return false;
     },
-    createIssue(title, label) {
+    createIssue(title, label, body) {
         return __awaiter(this, void 0, void 0, function* () {
             if (context.projectApi === undefined) {
                 return false;
             }
-            const issueNumber = yield context.projectApi.createIssue(title, context.backlogColumn, label);
+            const issueNumber = yield context.projectApi.createIssue(title, context.backlogColumn, label, body);
             if (issueNumber) {
                 console.log(`Se creo el issue ${issueNumber}`);
                 return true;
@@ -448,20 +470,19 @@ export const taskFunctions = {
         });
     },
     listIssues() {
-        return __awaiter(this, void 0, void 0, function* () {
+        return __awaiter(this, arguments, void 0, function* (filter = '{state: OPEN}', template = 'openIssues') {
             if (!context.projectApi) {
                 return false;
             }
             const result = yield context.projectApi.getIssues();
-            for (const issue of result) {
-                console.log(issue.title);
-            }
+            const rendered = generateTemplate(TEMPLATE_MODEL_FOLDER, 'md', template, Object.assign({ issues: result }, context));
+            console.log(rendered);
             return true;
         });
     },
     checkIssueType(issueNumber) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (!context.projectApi) {
                 return false;
             }

package/lib/helpers/tasks.js

@@ -104,8 +104,8 @@ export function validateTask(task) {
     }
     return true;
 }
-export function runTask(task, taskContext, tabs = '') {
-    return __awaiter(this, void 0, void 0, function* () {
+export function runTask(task_1, taskContext_1) {
+    return __awaiter(this, arguments, void 0, function* (task, taskContext, tabs = '') {
         initializeContext();
         // Valida que este ya esten las variables de enotorno y  configuracion
         if (task.guards) {
@@ -134,8 +134,8 @@ export function runTask(task, taskContext, tabs = '') {
         return true;
     });
 }
-export function previewTask(task, tabs = '') {
-    return __awaiter(this, void 0, void 0, function* () {
+export function previewTask(task_1) {
+    return __awaiter(this, arguments, void 0, function* (task, tabs = '') {
         initializeContext();
         logStep(`${task.name}: ${task.description}`, tabs);
         for (const step of task.steps) {
@@ -178,7 +178,7 @@ function runStep(step, tabs) {
         }
         else if (typeof step.subtask === 'string') {
             const subtask = getTask(step.subtask, SUBTASKS_FOLDER);
-            let stepContext = context.mergeArgs(step.arguments);
+            let stepContext = step.arguments ? context.mergeArgs(step.arguments) : {};
             if (Array.isArray(stepContext)) {
                 stepContext = createObject(subtask.arguments, stepContext);
             }
@@ -206,8 +206,8 @@ function askForContinueOrRetry() {
 function getStepError(step, stepName) {
     return step.errorMessage ? context.merge(step.errorMessage) : stepName ? `Fallo el step ${stepName}` : '';
 }
-function executeStep(step, tabs, verbose = false) {
-    return __awaiter(this, void 0, void 0, function* () {
+function executeStep(step_1, tabs_1) {
+    return __awaiter(this, arguments, void 0, function* (step, tabs, verbose = false) {
         const stepName = step.name ? context.merge(step.name) : undefined;
         if (verbose && stepName) {
             logStep(`[INICIO] ${stepName}`, tabs);

package/lib/helpers/template.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="handlebars" />
-declare class TemplateEngine<T> {
+declare class TemplateEngine {
     _template: HandlebarsTemplateDelegate | undefined;
     _rendered: string | undefined;
     _extension: string;
@@ -8,7 +7,8 @@ declare class TemplateEngine<T> {
     getTemplates(): string[];
     read(templateName: string): void;
     render(context: object, options?: RuntimeOptions): void;
+    get rendered(): string | undefined;
     save(filename: string, folder: string, options?: SaveTemplateOptions): void;
 }
-declare const _default: (source: string, extension: string) => TemplateEngine<unknown>;
+declare const _default: (source: string, extension: string) => TemplateEngine;
 export default _default;

package/lib/helpers/template.js

@@ -1,9 +1,7 @@
 import fs from "fs";
 import Handlebars from "handlebars";
 import { merge } from "./merge.js";
-import { fileURLToPath } from 'url';
-import { getFiles, searchInFolderHierarchy } from "./util.js";
-const TEMPLATE_ROOT_FOLDER = searchInFolderHierarchy('templates', fileURLToPath(import.meta.url));
+import { getFiles } from "./util.js";
 function isObjectEmpty(objectName) {
     return (objectName &&
         Object.keys(objectName).length === 0 &&
@@ -26,7 +24,7 @@ function openTemplate(sourceFolder, templateName, extension) {
 }
 class TemplateEngine {
     constructor(source, extension) {
-        this._sourceFolder = `${TEMPLATE_ROOT_FOLDER}/${source}`;
+        this._sourceFolder = source;
         if (!fs.existsSync(this._sourceFolder)) {
             throw new Error(`La carpeta source ${this._sourceFolder} no existe!`);
         }
@@ -53,6 +51,9 @@ class TemplateEngine {
         }
         this._rendered = this._template(context, options);
     }
+    get rendered() {
+        return this._rendered;
+    }
     save(filename, folder, options = { create: true, overwrite: true }) {
         let accion = "creo";
         if (folder && !fs.existsSync(folder)) {

package/lib/helpers/util.d.ts

@@ -1,7 +1,10 @@
+import prompts, { Choice } from "prompts";
+import { AnyValue } from "../types/auto.js";
+export declare const CONFIG_FILE: string;
 export declare const TEMPLATES_FOLDER: string;
+export declare const TEMPLATE_MODEL_FOLDER: string;
 export declare const DICTIONARY_FOLDER: string;
 export declare const WORKING_FOLDER: string;
-export declare const CONFIG_FILE: string;
 export declare const filterJson: (fullPath: string) => boolean;
 export declare const filterDirectory: (fullPath: string) => boolean;
 export declare const filterFiles: (fullPath: string) => boolean;
@@ -17,7 +20,10 @@ export declare function titlesToChoices(list: string[], titleToValue?: (title: s
     value: string;
 }[];
 export declare function getDataFromPackage(): Record<string, string>;
+export declare function findChoicesPosition(choices: Choice[], value: string): number;
 export declare function createConfigurationFile(): Promise<boolean>;
+export declare function getConfig(variable: string, defaultValue: AnyValue): any;
+export declare function storeConfig(variable: string, value: AnyValue): void;
 export declare function sortByName(objA: {
     Name: string;
 }, objB: {
@@ -44,3 +50,4 @@ export declare function searchInFolderHierarchy(element: string, parentFolder: s
 export declare function getFiles(source: string, filter?: (file: string) => boolean, recursive?: boolean, ignoreList?: string[]): string[];
 export declare function convertNameToKey(name: string): string;
 export declare function convertKeyToName(key: string): string;
+export declare function readJsonSync(filename: string): prompts.Choice[];