autoforce 0.1.15 → 0.1.17

package/.autoforce.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.15",
+  "version": "0.1.17",
   "backlogColumn": "Todo",
   "model": "modelC",
   "modelTemplates": "modelB",

package/CHANGELOG.md

@@ -1,6 +1,32 @@
 # Versiones
+
+## Version 0.1.16
+- Fecha: 
+- Paquete: [Descargar](https://www.npmjs.com/package/autoforce/v/0.1.16)
+- Cambios:
+    * [new] new milestone 
+        - https://github.com/sebastianclaros/autoforce/issues/34
+    * Pincha en subdirectorios buscando el package.json
+        - https://github.com/sebastianclaros/autoforce/issues/39
+    * Comando new Label
+        - https://github.com/sebastianclaros/autoforce/issues/43
+
+## Version 0.1.15
+- Fecha: 9 Dic 2024
+- Paquete: [Descargar](https://www.npmjs.com/package/autoforce/v/0.1.15)
+- Cambios:
+    * [new] que muestre la url
+        - https://github.com/sebastianclaros/autoforce/issues/37
+    * [list] falta templates en modelA
+        - https://github.com/sebastianclaros/autoforce/issues/38
+
+## Version 0.1.13 y 0.1.14 
+- Fecha: 9 Dic 2024
+- Cambios:
+    * Error en el publish por una dependencia erronea a si mismo
+     
 ## Version 0.1.12
-- Fecha: 8/12/2024
+- Fecha: 8 Dic 2024
 - Paquete: [Descargar](https://www.npmjs.com/package/autoforce/v/0.1.12)
 - Cambios:
     * [Publish] ponga en Changelog todos los issues Closed del milestone asociado. Y los mueva al final de todo  a la Columna "Published"

package/commands/modelA/tasks/start.json

@@ -7,9 +7,9 @@
     {
       "name": "validate issue",
       "function": "validateIssue",
-      "arguments": ["${newIssueNumber}", "Ready,Backlog"],
-      "description": "Valida que Issue este en la Columna Ready o Backlog",
-      "errorMessage": "Por favor verifique que el issue ${newIssueNumber} este en la columna Ready o Backlog"
+      "arguments": ["${newIssueNumber}", "Todo"],
+      "description": "Valida que Issue este en la Columna Todo",
+      "errorMessage": "Por favor verifique que el issue ${newIssueNumber} este en la columna Todo"
     },
     {
       "name": "check Issue type based on Labels",

package/lib/auto.js

@@ -13,6 +13,8 @@ import { logError } from "./helpers/color.js";
 import prompts from "prompts";
 import { createConfigurationFile, getConfigFile } from "./helpers/util.js";
 import context from "./helpers/context.js";
+import { fileURLToPath } from "url";
+import { dirname } from 'path';
 const proxyCommand = {
     'version': showVersion,
     'config': createConfigurationFile
@@ -25,7 +27,8 @@ const taskCommand = {
 };
 function showVersion() {
     return __awaiter(this, void 0, void 0, function* () {
-        const version = getConfigFile('../.autoforce.json', 'version', '0.1.14');
+        const __dirname = dirname(fileURLToPath(import.meta.url));
+        const version = getConfigFile(__dirname + '/../.autoforce.json', 'version', '0.1.14');
         console.log('AutoForce v' + version);
         return true;
     });

package/lib/helpers/context.js

@@ -63,7 +63,7 @@ class Context {
     labels() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const choices = [{ value: '', title: 'Ninguno' }];
+            const choices = [{ value: '', title: 'Ninguno' }, { value: 'new', title: 'Nuevo' }];
             const labels = yield ((_a = this.gitApi) === null || _a === void 0 ? void 0 : _a.getLabels());
             if (labels) {
                 labels.forEach(label => choices.push({ value: label.name, title: label.name }));
@@ -89,7 +89,7 @@ class Context {
     milestones() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const choices = [{ value: '', title: 'Ninguno' }];
+            const choices = [{ value: '', title: 'Ninguno' }, { value: 'new', title: 'Nuevo' }];
             const milestones = yield ((_a = this.gitApi) === null || _a === void 0 ? void 0 : _a.getMilestones());
             if (milestones) {
                 milestones.forEach(milestone => choices.push({ value: milestone.id, title: milestone.title }));

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

@@ -5,30 +5,35 @@ export declare class GitHubApi implements IGitApi {
     };
     projectNumber: number | undefined;
     graphqlAuth: import("@octokit/graphql/types").graphql;
+    octokit: import("@octokit/core").Octokit & {
+        paginate: import("@octokit/plugin-paginate-rest").PaginateInterface;
+    } & import("@octokit/plugin-paginate-graphql").paginateGraphQLInterface & import("@octokit/plugin-rest-endpoint-methods").Api & {
+        retry: {
+            retryRequest: (error: import("octokit").RequestError, retries: number, retryAfter: number) => import("octokit").RequestError;
+        };
+    };
+    _repository: IRepository | undefined;
+    _labels: ILabel[] | undefined;
+    _milestones: IMilestone[] | undefined;
+    _defaultColors: Record<string, string>;
+    getRepository(): Promise<IRepository>;
     constructor(token: string, owner: string, repo: string, projectNumber?: number);
+    createLabel(name: string, color?: string): Promise<ILabel | undefined>;
+    getRandomColor(): string;
+    createMilestone(title: string, state?: string, description?: string, dueOn?: string): Promise<{
+        id: any;
+        title: any;
+        description: any;
+        dueOn: any;
+        url: any;
+    }>;
     getUser(): Promise<{
         login: string;
         id: number;
     }>;
     getLabels(): Promise<ILabel[]>;
     getMilestones(): Promise<IMilestone[]>;
-    getRepository(label?: string): Promise<{
-        id: string;
-        label?: {
-            id: string;
-        };
-        projectV2: {
-            id: string;
-            field: {
-                id: string;
-                name: string;
-                options: {
-                    name: string;
-                    id: string;
-                }[];
-            };
-        };
-    }>;
+    getRepositoryObject(): Promise<IRepository>;
     createPullRequest(branchName: string, title: string, body: string): Promise<boolean>;
     assignBranchToIssue(issueNumber: string, branchName: string, commitSha: string): Promise<boolean>;
     getCommit(commitSha: string): Promise<{

package/lib/helpers/github-graphql.js

@@ -8,8 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { graphql } from "@octokit/graphql";
+import { Octokit } from "octokit";
 export class GitHubApi {
+    getRepository() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._repository === undefined) {
+                const repository = yield this.getRepositoryObject();
+                this._repository = repository;
+            }
+            return this._repository;
+        });
+    }
     constructor(token, owner, repo, projectNumber) {
+        this._defaultColors = { 'red': 'b60205', 'orange': 'd93f0b', 'yellow': 'fbca04', 'green': '0e8a16', 'dupont': '006b75', 'light-blue': '1d76db', 'blue': '0052cc', 'purple': '5319e7', 'pastel-red': 'e99695', 'pastel-orange': 'f9d0c4', 'pastel-yellow': 'fef2c0', 'pastel-green': 'c2e0c6', 'pastel-dupont': 'bfdadc', 'pastel-light': 'c5def5', 'pastel-blue': 'bfd4f2', 'pastel-purple': 'd4c5f9' };
         this.repoVar = { owner, repo };
         this.projectNumber = projectNumber;
         this.graphqlAuth = graphql.defaults({
@@ -18,6 +29,65 @@ export class GitHubApi {
                 "X-Github-Next-Global-ID": 1
             },
         });
+        this.octokit = new Octokit({
+            auth: token
+        });
+    }
+    createLabel(name_1) {
+        return __awaiter(this, arguments, void 0, function* (name, color = 'random') {
+            const repositoryId = (yield this.getRepository()).id;
+            if (color === 'random') {
+                color = this.getRandomColor();
+            }
+            else if (this._defaultColors[color] !== undefined) {
+                color = this._defaultColors[color];
+            }
+            const variables = { name, repositoryId, color };
+            const mutationCreateLabel = `
+      mutation createLabel( $name: String!, $repositoryId: ID!, $color: String! ) {
+        createLabel(
+            input: {
+              repositoryId: $repositoryId,
+              name: $name
+              color: $color
+            }
+        ) {
+          label {
+            id
+            name
+            color
+          }
+        }
+      }`;
+            try {
+                const { createLabel } = yield this.graphqlAuth(mutationCreateLabel, variables);
+                return createLabel.label;
+            }
+            catch (error) {
+                console.log(error);
+            }
+            return;
+        });
+    }
+    getRandomColor() {
+        const colors = Object.values(this._defaultColors);
+        const number = Math.floor(Math.random() * colors.length);
+        return colors[number];
+    }
+    createMilestone(title_1) {
+        return __awaiter(this, arguments, void 0, function* (title, state = 'open', description, dueOn) {
+            const result = yield this.octokit.request(`POST /repos/${this.repoVar.owner}/${this.repoVar.repo}/milestones`, {
+                title,
+                state,
+                description,
+                due_on: dueOn,
+                headers: {
+                    'X-GitHub-Api-Version': '2022-11-28'
+                }
+            });
+            const milestone = { id: result.data.node_id, title: result.data.title, description: result.data.description, dueOn: result.data.due_on, url: result.data.url };
+            return milestone;
+        });
     }
     getUser() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -33,26 +103,30 @@ export class GitHubApi {
     }
     getLabels() {
         return __awaiter(this, void 0, void 0, function* () {
-            const query = `
-        query getRepo($owner:String!, $repo: String! ) {
-          repository(owner: $owner, name: $repo) {
-            labels(last: 10, orderBy:  { field: CREATED_AT, direction: DESC}) {
-              nodes{
-                id
-                name
-                color
+            if (this._labels === undefined) {
+                const query = `
+          query getRepo($owner:String!, $repo: String! ) {
+            repository(owner: $owner, name: $repo) {
+              labels(last: 10, orderBy:  { field: CREATED_AT, direction: DESC}) {
+                nodes{
+                  id
+                  name
+                  color
+                }
               }
             }
           }
-        }
-    `;
-            const { repository } = yield this.graphqlAuth(query, this.repoVar);
-            return repository.labels.nodes;
+      `;
+                const { repository } = yield this.graphqlAuth(query, this.repoVar);
+                this._labels = repository.labels.nodes;
+            }
+            return this._labels;
         });
     }
     getMilestones() {
         return __awaiter(this, void 0, void 0, function* () {
-            const query = `
+            if (this._milestones === undefined) {
+                const query = `
         query getRepo($owner:String!, $repo: String! ) {
           repository(owner: $owner, name: $repo) {
             milestones(last: 10, states: OPEN, orderBy: { field: CREATED_AT, direction: DESC} ) {
@@ -66,20 +140,18 @@ export class GitHubApi {
           }
         }
     `;
-            const { repository } = yield this.graphqlAuth(query, this.repoVar);
-            return repository.milestones.nodes;
+                const { repository } = yield this.graphqlAuth(query, this.repoVar);
+                this._milestones = repository.milestones.nodes;
+            }
+            return this._milestones;
         });
     }
-    getRepository(label) {
+    getRepositoryObject() {
         return __awaiter(this, void 0, void 0, function* () {
             const query = `
-        query getRepo($owner:String!, $repo: String!, $projectNumber: Int!, ${label ? '$label: String!' : ''} ) {
+        query getRepo($owner:String!, $repo: String!, $projectNumber: Int! ) {
           repository(owner: $owner, name: $repo) {
             id
-            ${label ?
-                `label(name: $label) {
-                id
-              }` : ''}
             projectV2( number: $projectNumber ) {
               id
               field(name: "Status") {
@@ -96,14 +168,13 @@ export class GitHubApi {
           }
         }
     `;
-            const { repository } = yield this.graphqlAuth(query, Object.assign({ label, projectNumber: this.projectNumber }, this.repoVar));
+            const { repository } = yield this.graphqlAuth(query, Object.assign({ projectNumber: this.projectNumber }, this.repoVar));
             return repository;
         });
     }
     createPullRequest(branchName, title, body) {
         return __awaiter(this, void 0, void 0, function* () {
-            const repository = yield this.getRepository();
-            const repositoryId = repository.id;
+            const repositoryId = (yield this.getRepository()).id;
             const headRefName = 'main';
             const baseRefName = branchName;
             const mutationPullRequest = `

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

@@ -3,7 +3,9 @@ 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, body?: string, milestoneId?: string): Promise<IIssueObject>;
+    findMilestoneByName(title: string | undefined): Promise<IMilestone | undefined>;
+    findLabelByName(name: string | undefined): Promise<ILabel | undefined>;
+    createIssue(title: string, state?: string, label?: string, body?: string, milestone?: string): Promise<IIssueObject>;
     getIssueState(issueNumber: string): Promise<string>;
     getIssueName(title: string): string;
     _getIssue(issueNumber: string): Promise<{

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

@@ -42,14 +42,46 @@ export class GitHubProjectApi extends GitHubApi {
             return mapValues;
         });
     }
-    createIssue(title, state, label, body, milestoneId) {
+    findMilestoneByName(title) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            if (title) {
+                const milestones = yield this.getMilestones();
+                if (milestones.length > 0) {
+                    for (const milestone of milestones) {
+                        if (milestone.title === title) {
+                            return milestone;
+                        }
+                    }
+                }
+            }
+            return;
+        });
+    }
+    findLabelByName(name) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (name) {
+                const labels = yield this.getLabels();
+                if (labels.length > 0) {
+                    for (const label of labels) {
+                        if (label.name === name) {
+                            return label;
+                        }
+                    }
+                }
+            }
+            return;
+        });
+    }
+    createIssue(title, state, label, body, milestone) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const user = yield this.getUser();
-            const repository = yield this.getRepository(label);
+            const repository = yield this.getRepository();
             const repositoryId = repository.id;
-            const labelId = (_a = repository.label) === null || _a === void 0 ? void 0 : _a.id;
+            const labelId = (label === null || label === void 0 ? void 0 : label.startsWith('LA_')) ? label : (_a = (yield this.findLabelByName(label))) === null || _a === void 0 ? void 0 : _a.id;
+            const milestoneId = (milestone === null || milestone === void 0 ? void 0 : milestone.startsWith('MI_')) ? milestone : (_b = (yield this.findMilestoneByName(milestone))) === null || _b === void 0 ? void 0 : _b.id;
             const projectId = repository.projectV2.id;
+            const variables = { labelId, body, assignId: user.id, projectId, repositoryId, title, milestoneId: milestoneId ? milestoneId : null };
             const mutationIssue = `
       mutation createIssue($repositoryId: ID!, $assignId: ID!, $title: String!, $body: String, $milestoneId: ID ${labelId ? ', $labelId: ID!' : ''}  ) {
         createIssue(
@@ -74,7 +106,7 @@ export class GitHubProjectApi extends GitHubApi {
           }
         }
       }`;
-            const { createIssue } = yield this.graphqlAuth(mutationIssue, { labelId, body, assignId: user.id, projectId, repositoryId, title, milestoneId: milestoneId ? milestoneId : null, label: label ? [label] : null });
+            const { createIssue } = yield this.graphqlAuth(mutationIssue, variables);
             const issue = createIssue.issue;
             if (!state || !issue.number) {
                 return issue;

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

@@ -13,6 +13,17 @@ export declare class GitLabApi implements IGitApi, IProjectApi {
     getIssue(issueNumber: string): Promise<{}>;
     getIssues(): Promise<never[]>;
     getIssuesWithFilter(filter: string): Promise<never[]>;
+    createLabel(name: string, color?: string): Promise<{
+        id: string;
+        name: string;
+        color: string;
+    }>;
+    createMilestone(title: string, state?: string, description?: string, dueOn?: string): Promise<{
+        id: string;
+        title: string;
+        state: string;
+        url: string;
+    }>;
     createIssue(title: string, state?: string, label?: string, body?: string, milestone?: string): Promise<{
         number: number;
     }>;

package/lib/helpers/gitlab-graphql.js

@@ -42,6 +42,18 @@ export class GitLabApi {
             return [];
         });
     }
+    createLabel(name_1) {
+        return __awaiter(this, arguments, void 0, function* (name, color = 'random') {
+            console.log(name, color);
+            return { id: '', name, color };
+        });
+    }
+    createMilestone(title_1) {
+        return __awaiter(this, arguments, void 0, function* (title, state = 'open', description, dueOn) {
+            console.log(title, state, description, dueOn);
+            return { id: '', title: '', state: '', url: '' };
+        });
+    }
     createIssue(title, state, label, body, milestone) {
         return __awaiter(this, void 0, void 0, function* () {
             console.log(title, state, label, body, milestone);

package/lib/helpers/taskFunctions.js

@@ -335,10 +335,43 @@ export const taskFunctions = {
     },
     createIssue(title, label, body, milestone) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (context.projectApi === undefined) {
+            if (context.projectApi === undefined || context.gitApi === undefined) {
                 return false;
             }
-            console.log(milestone);
+            if (label === 'new') {
+                const answer = yield prompts([
+                    {
+                        message: 'Nombre del Label',
+                        name: 'nombre',
+                        type: 'text'
+                    }
+                ]);
+                if (answer.nombre !== undefined) {
+                    const result = yield context.gitApi.createLabel(answer.nombre);
+                    if (result === null || result === void 0 ? void 0 : result.id) {
+                        label = result.id;
+                    }
+                }
+                else {
+                    label = '';
+                }
+            }
+            if (milestone === 'new') {
+                const answer = yield prompts([
+                    {
+                        message: 'Nombre del Milestone',
+                        name: 'nombre',
+                        type: 'text'
+                    }
+                ]);
+                if (answer.nombre !== undefined) {
+                    const result = yield context.gitApi.createMilestone(answer.nombre);
+                    milestone = result === null || result === void 0 ? void 0 : result.id;
+                }
+                else {
+                    milestone = '';
+                }
+            }
             const issue = yield context.projectApi.createIssue(title, context.backlogColumn, label, body, milestone);
             if (issue) {
                 console.log(`Se creo el issue ${issue.number}`);
@@ -373,7 +406,7 @@ export const taskFunctions = {
     },
     validaNoseaBranchActual(newBranchName) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.getBranchName() !== newBranchName;
+            return getBranchName() !== newBranchName;
         });
     },
     checkCommitPending() {
@@ -394,7 +427,7 @@ export const taskFunctions = {
             try {
                 const newBranchName = context.newBranchName;
                 executeShell(`git checkout -b ${newBranchName} origin/main`);
-                context.set('branchName', this.getBranchName());
+                context.set('branchName', getBranchName());
                 return true;
             }
             catch (error) {

package/lib/helpers/util.js

@@ -13,7 +13,7 @@ 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 = process.cwd() + '/.autoforce.json';
+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";
@@ -34,7 +34,10 @@ export function titlesToChoices(list, titleToValue = (title) => title) {
 export function getDataFromPackage() {
     const data = {};
     try {
-        const filename = process.cwd() + "/package.json";
+        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) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "autoforce",
   "homepage": "https://sebastianclaros.github.io/autoforce",
   "private": false,
-  "version": "0.1.15",
+  "version": "0.1.17",
   "keywords": [
     "Salesforce",
     "Automation",