autoforce 0.1.10 → 0.1.12

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

@@ -42,24 +42,24 @@ export class GitHubProjectApi extends GitHubApi {
             return mapValues;
         });
     }
-    createIssue(title, state, label, body, milestone) {
-        var _a;
+    createIssue(title, state, label, body, milestoneId) {
         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;
             const labelId = (_a = repository.label) === null || _a === void 0 ? void 0 : _a.id;
             const projectId = repository.projectV2.id;
             const mutationIssue = `
-      mutation createIssue($repositoryId: ID!, $assignId: ID!, $title: String!, $body: String, ${labelId ? '$labelId: ID!' : ''} , $milestoneId: ID ) {
+      mutation createIssue($repositoryId: ID!, $assignId: ID!, $title: String!, $body: String, $milestoneId: ID ${labelId ? ', $labelId: ID!' : ''}  ) {
         createIssue(
             input: {
               repositoryId: $repositoryId,
               assigneeIds: [$assignId],
-              ${labelId ? 'labelIds: [$labelId],' : ''}
               title: $title,
               milestoneId: $milestoneId,
               body: $body
+              ${labelId ? ',labelIds: [$labelId]' : ''}
             }
         ) {
           issue {
@@ -68,7 +68,7 @@ export class GitHubProjectApi extends GitHubApi {
           }
         }
       }`;
-            const { createIssue } = yield this.graphqlAuth(mutationIssue, { labelId, body, assignId: user.id, projectId, repositoryId, title, label: label ? [label] : null });
+            const { createIssue } = yield this.graphqlAuth(mutationIssue, { labelId, body, assignId: user.id, projectId, repositoryId, title, milestoneId: milestoneId ? milestoneId : null, label: label ? [label] : null });
             const issue = createIssue.issue;
             if (!state || !issue.number) {
                 return issue.number;
@@ -115,19 +115,71 @@ export class GitHubProjectApi extends GitHubApi {
         });
     }
     getIssueState(issueNumber) {
-        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const issue = yield this.getIssue(issueNumber);
+            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;
         });
     }
     getIssueName(title) {
         return title.toLowerCase().replaceAll(' ', '-');
     }
-    getIssueObject(issueNumber) {
+    _getIssue(issueNumber) {
         return __awaiter(this, void 0, void 0, function* () {
-            const issue = yield this.getIssue(issueNumber);
-            const issueObject = { title: issue.title };
+            const query = `
+        query getIssue($owner:String!, $repo: String!, $issueNumber: Int!) {
+          repository(owner: $owner, name: $repo) {
+            issue(number: $issueNumber) {
+              title
+              number,
+              id
+              url
+              body
+              labels(first:3, orderBy:  { field: CREATED_AT, direction: DESC}) {
+                nodes {
+                  color
+                  name
+                }
+              }
+              projectItems(last: 1) {
+                nodes{
+                  id, 
+                  project {
+                    id
+                  }
+                  fieldValueByName(name: "Status"){
+                    ... on ProjectV2ItemFieldSingleSelectValue {
+                      name
+                      id
+                      field {
+                        ... on ProjectV2SingleSelectField {
+                          id
+                        }
+                      }
+                    }
+                  }
+                }
+              }             
+              linkedBranches(last:1){
+                  nodes {
+                      ref {
+                        id
+                        name
+                      }
+                  }
+              }
+            }
+          }
+        }
+    `;
+            const { repository } = yield this.graphqlAuth(query, Object.assign({ issueNumber: Number.parseInt(issueNumber) }, this.repoVar));
+            return repository.issue;
+        });
+    }
+    getIssue(issueNumber) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const issue = yield this._getIssue(issueNumber);
+            const issueObject = { number: issue.number, title: issue.title, id: issue.id, url: issue.url, body: issue.body };
             issueObject.name = this.getIssueName(issue.title);
             if (issue.linkedBranches.nodes.length > 0) {
                 issueObject.branch = issue.linkedBranches.nodes[0].ref.name;
@@ -149,11 +201,6 @@ export class GitHubProjectApi extends GitHubApi {
             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 = `
@@ -161,7 +208,26 @@ export class GitHubProjectApi extends GitHubApi {
           repository(owner: $owner, name: $repo) {
             issues(last: 10, filterBy: ${filterBy} ) {
               nodes {
+                number
                 title
+                body
+                state
+                url
+                milestone {
+                  dueOn
+                  title
+                }
+                labels ( last: 3, orderBy:  { field: CREATED_AT, direction: DESC} ) {
+                  nodes {
+                    color
+                    name
+                  }
+                }
+                assignees ( last: 3 ) {
+                  nodes {
+                    login
+                  }
+                }
                 id          
               }
             }
@@ -174,7 +240,7 @@ export class GitHubProjectApi extends GitHubApi {
     }
     moveIssue(issueNumber, state) {
         return __awaiter(this, void 0, void 0, function* () {
-            const issue = yield this.getIssue(issueNumber);
+            const issue = yield this._getIssue(issueNumber);
             const itemId = issue.projectItems.nodes[0].id;
             const projectId = issue.projectItems.nodes[0].project.id;
             const fieldId = issue.projectItems.nodes[0].fieldValueByName.field.id;
@@ -202,7 +268,7 @@ export class GitHubProjectApi extends GitHubApi {
     assignIssueToMe(issueNumber) {
         return __awaiter(this, void 0, void 0, function* () {
             const user = yield this.getUser();
-            const issue = yield this.getIssue(issueNumber);
+            const issue = yield this._getIssue(issueNumber);
             const mutation = `
       mutation assignUser( $issueId: ID!, $userId: ID!) { 
         addAssigneesToAssignable(input: {

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

@@ -8,9 +8,11 @@ export declare class GitLabApi implements IGitApi, IProjectApi {
     projectNumber: number | undefined;
     graphqlAuth: GraphQLClient;
     constructor(token: string, owner: string, repo: string, projectNumber?: number);
-    getIssueObject(issueNumber: string): Promise<{}>;
+    getLabels(): Promise<never[]>;
+    getMilestones(): Promise<never[]>;
+    getIssue(issueNumber: string): Promise<{}>;
     getIssues(): Promise<never[]>;
-    getIssuesByMilestone(milestone: string): Promise<never[]>;
+    getIssuesWithFilter(filter: 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>;

package/lib/helpers/gitlab-graphql.js

@@ -16,7 +16,17 @@ export class GitLabApi {
         this.projectNumber = projectNumber;
         this.graphqlAuth.setHeaders({ authorization: `Bearer ${token}` });
     }
-    getIssueObject(issueNumber) {
+    getLabels() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return [];
+        });
+    }
+    getMilestones() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return [];
+        });
+    }
+    getIssue(issueNumber) {
         return __awaiter(this, void 0, void 0, function* () {
             console.log(issueNumber);
             return {};
@@ -27,7 +37,7 @@ export class GitLabApi {
             return [];
         });
     }
-    getIssuesByMilestone(milestone) {
+    getIssuesWithFilter(filter) {
         return __awaiter(this, void 0, void 0, function* () {
             return [];
         });

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

@@ -8,13 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { execSync } from "child_process";
-import context from "./context.js";
+import context, { ListFilters } from "./context.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 } from "./util.js";
+import { filterBash, getFiles, storeConfig, TEMPLATE_MODEL_FOLDER, valuesToChoices } 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;
@@ -225,7 +237,7 @@ export const taskFunctions = {
         return true;
     },
     storeConfig(variable, value) {
-        storeConfig(variable, value);
+        storeConfig({ [variable]: value });
         return true;
     },
     docProcess() {
@@ -321,12 +333,12 @@ export const taskFunctions = {
         console.log('Not implemented');
         return false;
     },
-    createIssue(title, label, body) {
+    createIssue(title, label, body, milestone) {
         return __awaiter(this, void 0, void 0, function* () {
             if (context.projectApi === undefined) {
                 return false;
             }
-            const issueNumber = yield context.projectApi.createIssue(title, context.backlogColumn, label, body);
+            const issueNumber = yield context.projectApi.createIssue(title, context.backlogColumn, label, body, milestone);
             if (issueNumber) {
                 console.log(`Se creo el issue ${issueNumber}`);
                 return true;
@@ -346,7 +358,7 @@ export const taskFunctions = {
             if (context.projectApi === undefined) {
                 return false;
             }
-            const issue = yield context.projectApi.getIssueObject(issueNumber);
+            const issue = yield context.projectApi.getIssue(issueNumber);
             if (!issue.state) {
                 return false;
             }
@@ -428,53 +440,119 @@ export const taskFunctions = {
             return result;
         });
     },
-    viewIssue(issueNumber) {
-        return __awaiter(this, void 0, void 0, function* () {
+    viewIssue(issueNumber_1) {
+        return __awaiter(this, arguments, void 0, function* (issueNumber, template = 'viewIssue') {
             if (!context.projectApi) {
                 return false;
             }
-            const result = yield context.projectApi.getIssueObject(issueNumber);
-            // Branch    
-            if (result.branch) {
-                console.log(result.branch);
-            }
-            else {
-                console.log('sin branch');
-            }
-            // Labels
-            if (result.labels) {
-                const labels = [];
-                for (const label of result.labels) {
-                    labels.push(getColored(label, 'cyan'));
-                }
-                console.log(labels.join(' '));
-            }
-            // Body
-            if (result.body) {
-                console.log(result.body);
-            }
+            const result = yield context.projectApi.getIssue(issueNumber);
+            const rendered = generateTemplate(TEMPLATE_MODEL_FOLDER, 'bash', template, Object.assign({ issue: result }, context));
+            console.log(rendered);
             return true;
         });
     },
-    listIssues() {
+    listIssues(listFilter, listTemplate) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!context.projectApi) {
+            let filter = '{states: OPEN}';
+            const extension = '*';
+            if (!listFilter) {
+                listFilter = context.options.filter || context.listFilter;
+            }
+            if (!listTemplate) {
+                listTemplate = context.options.template || context.listTemplate;
+            }
+            if (!context.projectApi || !context.gitApi) {
                 return false;
             }
-            const result = yield context.projectApi.getIssues();
-            for (const issue of result) {
-                console.log(issue.title);
+            if (!listFilter) {
+                const answer = yield prompts([
+                    {
+                        message: 'Elija un filtro, o bien lo puede dejar fijo en autoforce como listFilter',
+                        name: 'filter',
+                        type: 'select',
+                        initial: 0,
+                        choices: context.listFilters
+                    }
+                ]);
+                listFilter = answer.filter;
+            }
+            if (listFilter === ListFilters.PorMilestone) {
+                if (context.options.milestone) {
+                    const milestoneFilter = (yield context.gitApi.getMilestones()).filter(milestone => milestone.title == context.options.milestone);
+                    if (milestoneFilter.length === 0) {
+                        return false;
+                    }
+                    filter = `{ milestoneNumber: "${milestoneFilter[0].number}"}`;
+                }
+                else {
+                    const choices = (yield context.gitApi.getMilestones()).map(milestone => { return { value: milestone.number, title: milestone.title }; });
+                    choices.push({ value: '', title: 'Issues sin Milestone' });
+                    choices.push({ value: '*', title: 'Issues con Milestone' });
+                    const answer = yield prompts([
+                        {
+                            message: 'Elija un milestone',
+                            name: 'filterValue',
+                            type: 'select',
+                            initial: 0,
+                            choices
+                        }
+                    ]);
+                    filter = `{ milestoneNumber: "${answer.filterValue}"}`;
+                    if (answer.filterValue === undefined)
+                        return false;
+                }
+            }
+            if (listFilter === ListFilters.PorLabel) {
+                if (context.options.label) {
+                    filter = `{labels: "${context.options.label}"}`;
+                }
+                else {
+                    const labels = (yield context.gitApi.getLabels()).map(label => label.name);
+                    const choices = valuesToChoices(labels);
+                    const answer = yield prompts([
+                        {
+                            message: 'Elija un label',
+                            name: 'filterValue',
+                            type: 'select',
+                            initial: 0,
+                            choices
+                        }
+                    ]);
+                    if (answer.filterValue === undefined)
+                        return false;
+                    filter = `{labels: "${answer.filterValue}"}`;
+                }
             }
+            if (!listTemplate) {
+                const files = getFiles(TEMPLATE_MODEL_FOLDER, filterBash).map(filename => filename.split(".")[0]);
+                const templates = valuesToChoices(files);
+                const answer = yield prompts([
+                    {
+                        message: 'Elija un template, o bien lo puede dejar en autoforce como listTemplate',
+                        name: 'template',
+                        type: 'select',
+                        initial: 0,
+                        choices: templates
+                    }
+                ]);
+                listTemplate = answer.template;
+                if (listTemplate === undefined)
+                    return false;
+            }
+            const result = yield context.projectApi.getIssuesWithFilter(filter);
+            console.log(context.version);
+            const rendered = generateTemplate(TEMPLATE_MODEL_FOLDER, extension, listTemplate, { 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;
             }
-            const issue = yield context.projectApi.getIssueObject(issueNumber);
+            const issue = yield context.projectApi.getIssue(issueNumber);
             // Setea el issueType segun el issue
             try {
                 let newIssueType = 'feature';

package/lib/helpers/tasks.js

@@ -95,6 +95,10 @@ export function validateTask(task) {
             const subtask = getTask(step.subtask, SUBTASKS_FOLDER);
             validateStep = validateTask(subtask);
         }
+        else if (typeof step.task === 'string') {
+            const subtask = getTask(step.task, TASKS_FOLDER);
+            validateStep = validateTask(subtask);
+        }
         else {
             console.log('Step no tiene command ni function ni subtask');
         }
@@ -104,8 +108,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 +138,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) {
@@ -176,8 +180,8 @@ function runStep(step, tabs) {
         else if (typeof step.function === 'string') {
             return yield executeFunction(step);
         }
-        else if (typeof step.subtask === 'string') {
-            const subtask = getTask(step.subtask, SUBTASKS_FOLDER);
+        else if (typeof step.subtask === 'string' || typeof step.task === 'string') {
+            const subtask = typeof step.subtask === 'string' ? getTask(step.subtask, SUBTASKS_FOLDER) : getTask(step.task, TASKS_FOLDER);
             let stepContext = step.arguments ? context.mergeArgs(step.arguments) : {};
             if (Array.isArray(stepContext)) {
                 stepContext = createObject(subtask.arguments, stepContext);
@@ -206,8 +210,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,13 +1,14 @@
-/// <reference types="handlebars" />
 declare class TemplateEngine {
     _template: HandlebarsTemplateDelegate | undefined;
     _rendered: string | undefined;
     _extension: string;
     _sourceFolder: string;
-    constructor(source: string, extension: string);
+    constructor(source: string, extension?: string);
     getTemplates(): string[];
+    getNameAndExtension(templateName: string): 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;

package/lib/helpers/template.js

@@ -23,7 +23,7 @@ function openTemplate(sourceFolder, templateName, extension) {
     return content;
 }
 class TemplateEngine {
-    constructor(source, extension) {
+    constructor(source, extension = '*') {
         this._sourceFolder = source;
         if (!fs.existsSync(this._sourceFolder)) {
             throw new Error(`La carpeta source ${this._sourceFolder} no existe!`);
@@ -32,7 +32,7 @@ class TemplateEngine {
     }
     ;
     getTemplates() {
-        const filterThisExtension = (file) => file.endsWith(`.${this._extension}`);
+        const filterThisExtension = (file) => file.endsWith(`.${this._extension}`) || this._extension === '*';
         const templates = [];
         const files = getFiles(this._sourceFolder, filterThisExtension, true, ['dictionary']);
         for (const filename of files) {
@@ -41,8 +41,25 @@ class TemplateEngine {
         }
         return templates;
     }
+    getNameAndExtension(templateName) {
+        // Si viene la extension en el nombre la extrae
+        if (templateName.split(".").length > 1) {
+            return templateName.split(".");
+        }
+        // Si viene la extension * busca cual puede ser en el directorio
+        if (this._extension === '*' || this._extension === '') {
+            const fileNames = getFiles(this._sourceFolder, fileName => fileName.split(".")[0].endsWith(templateName));
+            if (fileNames.length > 0) {
+                return fileNames[0].split(".");
+            }
+        }
+        // Por defecto usa el templateName como nombre y la extension
+        return [templateName, this._extension];
+    }
     read(templateName) {
-        const rawTemplate = openTemplate(this._sourceFolder, templateName, this._extension);
+        // Por defecto usa el templateName como nombre y la extension
+        const [name, extension] = this.getNameAndExtension(templateName);
+        const rawTemplate = openTemplate(this._sourceFolder, name, extension);
         this._template = Handlebars.compile(rawTemplate);
     }
     render(context, options = {}) {
@@ -51,6 +68,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,4 +1,4 @@
-import prompts from "prompts";
+import prompts, { Choice } from "prompts";
 import { AnyValue } from "../types/auto.js";
 export declare const CONFIG_FILE: string;
 export declare const TEMPLATES_FOLDER: string;
@@ -8,6 +8,7 @@ export declare const WORKING_FOLDER: string;
 export declare const filterJson: (fullPath: string) => boolean;
 export declare const filterDirectory: (fullPath: string) => boolean;
 export declare const filterFiles: (fullPath: string) => boolean;
+export declare const filterBash: (fullPath: string) => boolean;
 export declare const camelToText: (s: string) => string;
 export declare const kebabToText: (s: string) => string;
 export declare const snakeToText: (s: string) => string;
@@ -20,9 +21,10 @@ export declare function titlesToChoices(list: string[], titleToValue?: (title: s
     value: string;
 }[];
 export declare function getDataFromPackage(): Record<string, string>;
-export declare function createConfigurationFile(): Promise<boolean>;
+export declare function findChoicesPosition(choices: Choice[], value: string): number;
+export declare function createConfigurationFile(taskName?: string): Promise<boolean>;
 export declare function getConfig(variable: string, defaultValue: AnyValue): any;
-export declare function storeConfig(variable: string, value: AnyValue): void;
+export declare function storeConfig(record: Record<string, AnyValue>): void;
 export declare function sortByName(objA: {
     Name: string;
 }, objB: {