@waron97/prbot 2.0.0 → 2.2.0

package/src/commands/init.js

@@ -1,144 +1,147 @@
-import { readFileSync, existsSync, mkdirSync, writeFileSync, appendFileSync } from "fs";
-import path from "path";
-import inquirer from "inquirer";
-import { CONFIG_DIR, CONFIG_FILE, COMPLETION_SCRIPT } from "../config.js";
+import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
+import path from 'path';
+import inquirer from 'inquirer';
+import { COMPLETION_SCRIPT, CONFIG_DIR, CONFIG_FILE } from '../config.js';
 
 async function init(completion) {
-  if (!existsSync(CONFIG_DIR)) {
-    mkdirSync(CONFIG_DIR, { recursive: true });
-  }
+    if (!existsSync(CONFIG_DIR)) {
+        mkdirSync(CONFIG_DIR, { recursive: true });
+    }
 
-  const existing = existsSync(CONFIG_FILE)
-    ? Object.fromEntries(
-        readFileSync(CONFIG_FILE, "utf-8")
-          .split("\n")
-          .flatMap((line) => {
-            const m = line.match(/^([A-Z_]+)=(.*)$/);
-            return m ? [[m[1], m[2]]] : [];
-          }),
-      )
-    : {};
+    const existing = existsSync(CONFIG_FILE)
+        ? Object.fromEntries(
+              readFileSync(CONFIG_FILE, 'utf-8')
+                  .split('\n')
+                  .flatMap((line) => {
+                      const m = line.match(/^([A-Z_]+)=(.*)$/);
+                      return m ? [[m[1], m[2]]] : [];
+                  })
+          )
+        : {};
 
-  const answers = await inquirer.prompt([
-    {
-      type: "input",
-      name: "ADDONS_PATH",
-      message: "Addons path:",
-      default: existing.ADDONS_PATH ?? "~/codebase/sorgenia/addons",
-    },
-    {
-      type: "input",
-      name: "KC_URL",
-      message: "Keycloak URL:",
-      default: existing.KC_URL ?? "",
-    },
-    {
-      type: "input",
-      name: "KC_USER",
-      message: "Keycloak user:",
-      default: existing.KC_USER ?? "",
-    },
-    {
-      type: "password",
-      name: "KC_PASSWORD",
-      message: "Keycloak password:",
-      default: existing.KC_PASSWORD ?? "",
-      mask: "*",
-    },
-    {
-      type: "input",
-      name: "KC_ID",
-      message: "Keycloak client ID:",
-      default: existing.KC_ID ?? "",
-    },
-    {
-      type: "input",
-      name: "KC_SECRET",
-      message: "Keycloak client secret:",
-      default: existing.KC_SECRET ?? "",
-    },
-    {
-      type: "input",
-      name: "RIP_URL",
-      message: "RIP URL:",
-      default: existing.RIP_URL ?? "",
-    },
-    {
-      type: "input",
-      name: "TRIDENT_URL",
-      message: "Trident URL:",
-      default: existing.TRIDENT_URL ?? "",
-    },
-    {
-      type: "input",
-      name: "TRIDENT_UID",
-      message: "Trident UID:",
-      default: existing.TRIDENT_UID ?? "",
-    },
-    {
-      type: "input",
-      name: "TRIDENT_TOKEN",
-      message: "Trident token:",
-      default: existing.TRIDENT_TOKEN ?? "",
-    },
-    {
-      type: "input",
-      name: "DEVOPS_TOKEN",
-      message: "DevOps token:",
-      default: existing.DEVOPS_TOKEN ?? "",
-    },
-    {
-      type: "input",
-      name: "DEVOPS_ORG",
-      message: "DevOps org:",
-      default: existing.DEVOPS_ORG ?? "",
-    },
-    {
-      type: "input",
-      name: "DEVOPS_PROJECT",
-      message: "DevOps project:",
-      default: existing.DEVOPS_PROJECT ?? "",
-    },
-    {
-      type: "input",
-      name: "DEVOPS_REPO",
-      message: "DevOps repo:",
-      default: existing.DEVOPS_REPO ?? "",
-    },
-    {
-      type: "input",
-      name: "TRIDENT_DB",
-      message: "Trident DB name:",
-      default: existing.TRIDENT_DB ?? "",
-    },
-    {
-      type: "input",
-      name: "AUTOPR_TARGET_BRANCH",
-      message: "AutoPR target branch:",
-      default: existing.AUTOPR_TARGET_BRANCH ?? "15.0-dev",
-    },
-  ]);
+    const answers = await inquirer.prompt([
+        {
+            type: 'input',
+            name: 'ADDONS_PATH',
+            message: 'Addons path:',
+            default: existing.ADDONS_PATH ?? '~/codebase/sorgenia/addons',
+        },
+        {
+            type: 'input',
+            name: 'KC_URL',
+            message: 'Keycloak URL:',
+            default: existing.KC_URL ?? '',
+        },
+        {
+            type: 'input',
+            name: 'KC_USER',
+            message: 'Keycloak user:',
+            default: existing.KC_USER ?? '',
+        },
+        {
+            type: 'password',
+            name: 'KC_PASSWORD',
+            message: `Keycloak password${existing.KC_PASSWORD ? ' (leave blank to keep existing)' : ''}:`,
+            mask: '*',
+        },
+        {
+            type: 'input',
+            name: 'KC_ID',
+            message: 'Keycloak client ID:',
+            default: existing.KC_ID ?? '',
+        },
+        {
+            type: 'input',
+            name: 'KC_SECRET',
+            message: 'Keycloak client secret:',
+            default: existing.KC_SECRET ?? '',
+        },
+        {
+            type: 'input',
+            name: 'RIP_URL',
+            message: 'RIP URL:',
+            default: existing.RIP_URL ?? '',
+        },
+        {
+            type: 'input',
+            name: 'TRIDENT_URL',
+            message: 'Trident URL:',
+            default: existing.TRIDENT_URL ?? '',
+        },
+        {
+            type: 'input',
+            name: 'TRIDENT_UID',
+            message: 'Trident UID:',
+            default: existing.TRIDENT_UID ?? '',
+        },
+        {
+            type: 'input',
+            name: 'TRIDENT_TOKEN',
+            message: 'Trident token:',
+            default: existing.TRIDENT_TOKEN ?? '',
+        },
+        {
+            type: 'input',
+            name: 'DEVOPS_TOKEN',
+            message: 'DevOps token:',
+            default: existing.DEVOPS_TOKEN ?? '',
+        },
+        {
+            type: 'input',
+            name: 'DEVOPS_ORG',
+            message: 'DevOps org:',
+            default: existing.DEVOPS_ORG ?? '',
+        },
+        {
+            type: 'input',
+            name: 'DEVOPS_PROJECT',
+            message: 'DevOps project:',
+            default: existing.DEVOPS_PROJECT ?? '',
+        },
+        {
+            type: 'input',
+            name: 'DEVOPS_REPO',
+            message: 'DevOps repo:',
+            default: existing.DEVOPS_REPO ?? '',
+        },
+        {
+            type: 'input',
+            name: 'TRIDENT_DB',
+            message: 'Trident DB name:',
+            default: existing.TRIDENT_DB ?? 'trident-agora',
+        },
+        {
+            type: 'input',
+            name: 'AUTOPR_TARGET_BRANCH',
+            message: 'AutoPR target branch:',
+            default: existing.AUTOPR_TARGET_BRANCH ?? '15.0-dev',
+        },
+    ]);
 
-  writeFileSync(
-    CONFIG_FILE,
-    Object.entries(answers)
-      .map(([k, v]) => `${k}=${v}`)
-      .join("\n") + "\n",
-  );
-  console.log(`Config written to ${CONFIG_FILE}`);
+    if (!answers.KC_PASSWORD && existing.KC_PASSWORD) {
+        answers.KC_PASSWORD = existing.KC_PASSWORD;
+    }
 
-  writeFileSync(COMPLETION_SCRIPT, completion.generateCompletionCode());
-  console.log(`Completion script written to ${COMPLETION_SCRIPT}`);
+    writeFileSync(
+        CONFIG_FILE,
+        Object.entries(answers)
+            .map(([k, v]) => `${k}=${v}`)
+            .join('\n') + '\n'
+    );
+    console.log(`Config written to ${CONFIG_FILE}`);
 
-  const rcFile = path.join(process.env.HOME || "", ".bashrc");
-  const sourceLine = `source ${COMPLETION_SCRIPT}`;
-  const rcContent = existsSync(rcFile) ? readFileSync(rcFile, "utf-8") : "";
-  if (!rcContent.includes(sourceLine)) {
-    appendFileSync(rcFile, `\n# prbot completion\n${sourceLine}\n`);
-    console.log(`Registered completion in ${rcFile} — run: source ~/.bashrc`);
-  } else {
-    console.log("Completion already registered in ~/.bashrc");
-  }
+    writeFileSync(COMPLETION_SCRIPT, completion.generateCompletionCode());
+    console.log(`Completion script written to ${COMPLETION_SCRIPT}`);
+
+    const rcFile = path.join(process.env.HOME || '', '.bashrc');
+    const sourceLine = `source ${COMPLETION_SCRIPT}`;
+    const rcContent = existsSync(rcFile) ? readFileSync(rcFile, 'utf-8') : '';
+    if (!rcContent.includes(sourceLine)) {
+        appendFileSync(rcFile, `\n# prbot completion\n${sourceLine}\n`);
+        console.log(`Registered completion in ${rcFile} — run: source ~/.bashrc`);
+    } else {
+        console.log('Completion already registered in ~/.bashrc');
+    }
 }
 
 export { init };

package/src/commands/pr.js

@@ -1,124 +1,119 @@
-import fetch from "node-fetch";
-import fs from "fs/promises";
-import path from "path";
-import { execFile } from "child_process";
-import { resolveAddonsPath } from "../lib/addons.js";
+import { execFile } from 'child_process';
+import fs from 'fs/promises';
+import path from 'path';
+import fetch from 'node-fetch';
+import { resolveAddonsPath } from '../lib/addons.js';
 
 async function getToken() {
-  const url = process.env.KC_URL;
-  const payload = new URLSearchParams();
-
-  payload.append("username", process.env.KC_USER);
-  payload.append("password", process.env.KC_PASSWORD);
-  payload.append("client_id", process.env.KC_ID);
-  payload.append("client_secret", process.env.KC_SECRET);
-  payload.append("grant_type", "password");
-
-  const response = await fetch(url, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded",
-    },
-    body: payload.toString(),
-  });
-
-  const json = await response.json();
-  return json.access_token;
+    const url = process.env.KC_URL;
+    const payload = new URLSearchParams();
+
+    payload.append('username', process.env.KC_USER);
+    payload.append('password', process.env.KC_PASSWORD);
+    payload.append('client_id', process.env.KC_ID);
+    payload.append('client_secret', process.env.KC_SECRET);
+    payload.append('grant_type', 'password');
+
+    const response = await fetch(url, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+        },
+        body: payload.toString(),
+    });
+
+    const json = await response.json();
+    return json.access_token;
 }
 
 async function getFiles(module_name, token) {
-  const url = `${process.env.RIP_URL}/ir.model/xml_prbot`;
-  const body = JSON.stringify({ module_name });
-  const headers = {
-    Authorization: `Bearer ${token}`,
-    "Content-Type": "application/json",
-  };
-
-  const response = await fetch(url, { method: "POST", body, headers });
-  if (!response.ok) {
-    throw new Error(await response.text());
-  }
-  return await response.json();
+    const url = `${process.env.RIP_URL}/ir.model/xml_prbot`;
+    const body = JSON.stringify({ module_name });
+    const headers = {
+        Authorization: `Bearer ${token}`,
+        'Content-Type': 'application/json',
+    };
+
+    const response = await fetch(url, { method: 'POST', body, headers });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+    return await response.json();
 }
 
 async function main(module_name) {
-  const token = await getToken();
-  const files = await getFiles(module_name, token);
-
-  let ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
-
-  for (const file of files) {
-    const buffer = Buffer.from(file.data, "base64");
-    let content = buffer.toString();
-    const lines = content.split("\n");
-
-    const odooCloseIndex = lines.findIndex((l) => l.trim() === "</odoo>");
-    if (odooCloseIndex !== -1 && odooCloseIndex < lines.length - 1) {
-      const footer = lines.slice(odooCloseIndex + 1).join("\n");
-      const skippedMatch = footer.match(/Skipped records:\s*(\d+)/);
-      if (skippedMatch && parseInt(skippedMatch[1]) > 0) {
-        throw new Error(
-          `[${file.name}] Export contains skipped records:\n${footer.trim()}`,
+    const token = await getToken();
+    const files = await getFiles(module_name, token);
+
+    let ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
+
+    for (const file of files) {
+        const buffer = Buffer.from(file.data, 'base64');
+        let content = buffer.toString();
+        const lines = content.split('\n');
+
+        const odooCloseIndex = lines.findIndex((l) => l.trim() === '</odoo>');
+        if (odooCloseIndex !== -1 && odooCloseIndex < lines.length - 1) {
+            const footer = lines.slice(odooCloseIndex + 1).join('\n');
+            const skippedMatch = footer.match(/Skipped records:\s*(\d+)/);
+            if (skippedMatch && parseInt(skippedMatch[1]) > 0) {
+                throw new Error(
+                    `[${file.name}] Export contains skipped records:\n${footer.trim()}`
+                );
+            }
+            const duplicatedMatch = footer.match(/Duplicated records:\s*(\d+)/);
+            if (duplicatedMatch && parseInt(duplicatedMatch[1]) > 0) {
+                throw new Error(
+                    `[${file.name}] Export contains duplicated records:\n${footer.trim()}`
+                );
+            }
+        }
+
+        if (lines.length > 2) {
+            lines.splice(-2);
+        }
+        content = lines.join('\n');
+        content = content.replace(
+            /<field name="bpmn_diagram"><!\[CDATA\[[\s\S]*?\]\]><\/field>/g,
+            ''
         );
-      }
-      const duplicatedMatch = footer.match(/Duplicated records:\s*(\d+)/);
-      if (duplicatedMatch && parseInt(duplicatedMatch[1]) > 0) {
-        throw new Error(
-          `[${file.name}] Export contains duplicated records:\n${footer.trim()}`,
-        );
-      }
-    }
 
-    if (lines.length > 2) {
-      lines.splice(-2);
-    }
-    content = lines.join("\n");
-    content = content.replace(
-      /<field name="bpmn_diagram"><!\[CDATA\[[\s\S]*?\]\]><\/field>/g,
-      "",
-    );
-
-    let destPath;
-    if (file.name.includes("Relazioni mancanti")) {
-      destPath = `${ADDONS_PATH}/config/${module_name}/data/workflow_missing_relations.xml`;
-    } else {
-      destPath = `${ADDONS_PATH}/config/${module_name}/data/workflow_configuration.xml`;
-    }
+        let destPath;
+        if (file.name.includes('Relazioni mancanti')) {
+            destPath = `${ADDONS_PATH}/config/${module_name}/data/workflow_missing_relations.xml`;
+        } else {
+            destPath = `${ADDONS_PATH}/config/${module_name}/data/workflow_configuration.xml`;
+        }
 
-    await fs.mkdir(path.dirname(destPath), { recursive: true });
-    await fs.writeFile(destPath, content);
-    console.log(`Processed: ${file.name} -> ${destPath}`);
-  }
+        await fs.mkdir(path.dirname(destPath), { recursive: true });
+        await fs.writeFile(destPath, content);
+        console.log(`Processed: ${file.name} -> ${destPath}`);
+    }
 
-  const workflowDir = path.join(ADDONS_PATH, "config", module_name, "data");
-  const filesToAdd = [
-    path.join(workflowDir, "workflow_missing_relations.xml"),
-    path.join(workflowDir, "workflow_configuration.xml"),
-  ];
+    const workflowDir = path.join(ADDONS_PATH, 'config', module_name, 'data');
+    const filesToAdd = [
+        path.join(workflowDir, 'workflow_missing_relations.xml'),
+        path.join(workflowDir, 'workflow_configuration.xml'),
+    ];
+
+    for (const filePath of filesToAdd) {
+        await new Promise((resolve, reject) => {
+            execFile('git', ['add', filePath], { cwd: ADDONS_PATH }, (error) => {
+                if (error) reject(error);
+                else resolve();
+            });
+        });
+    }
 
-  for (const filePath of filesToAdd) {
+    const commitMessage = `[IMP][${module_name}] Update workflow`;
     await new Promise((resolve, reject) => {
-      execFile("git", ["add", filePath], { cwd: ADDONS_PATH }, (error) => {
-        if (error) reject(error);
-        else resolve();
-      });
+        execFile('git', ['commit', '-m', commitMessage], { cwd: ADDONS_PATH }, (error) => {
+            if (error) reject(error);
+            else resolve();
+        });
     });
-  }
-
-  const commitMessage = `[IMP][${module_name}] Update workflow`;
-  await new Promise((resolve, reject) => {
-    execFile(
-      "git",
-      ["commit", "-m", commitMessage],
-      { cwd: ADDONS_PATH },
-      (error) => {
-        if (error) reject(error);
-        else resolve();
-      },
-    );
-  });
-
-  console.log(`Committed with message: ${commitMessage}`);
+
+    console.log(`Committed with message: ${commitMessage}`);
 }
 
 export { main };

package/src/commands/ver.js

@@ -1,83 +1,73 @@
-import fs from "fs/promises";
-import path from "path";
-import { execFile } from "child_process";
-import { resolveAddonsPath } from "../lib/addons.js";
+import { execFile } from 'child_process';
+import fs from 'fs/promises';
+import path from 'path';
+import { resolveAddonsPath } from '../lib/addons.js';
 
 async function verbot(module_name, level) {
-  if (!["major", "minor", "patch"].includes(level)) {
-    throw new Error("Level must be one of major, minor, patch");
-  }
+    if (!['major', 'minor', 'patch'].includes(level)) {
+        throw new Error('Level must be one of major, minor, patch');
+    }
 
-  let ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
+    let ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
 
-  let manifestPath = path.join(ADDONS_PATH, module_name, "__manifest__.py");
-  try {
-    await fs.access(manifestPath);
-  } catch {
-    manifestPath = path.join(
-      ADDONS_PATH,
-      "config",
-      module_name,
-      "__manifest__.py",
-    );
+    let manifestPath = path.join(ADDONS_PATH, module_name, '__manifest__.py');
     try {
-      await fs.access(manifestPath);
+        await fs.access(manifestPath);
     } catch {
-      throw new Error(`__manifest__.py not found for module ${module_name}`);
+        manifestPath = path.join(ADDONS_PATH, 'config', module_name, '__manifest__.py');
+        try {
+            await fs.access(manifestPath);
+        } catch {
+            throw new Error(`__manifest__.py not found for module ${module_name}`);
+        }
     }
-  }
 
-  const content = await fs.readFile(manifestPath, "utf-8");
-  const versionMatch = content.match(/"version":\s*"(15\.0\.\d+\.\d+\.\d+)"/);
-  if (!versionMatch) {
-    throw new Error("Version not found in manifest");
-  }
+    const content = await fs.readFile(manifestPath, 'utf-8');
+    const versionMatch = content.match(/"version":\s*"(15\.0\.\d+\.\d+\.\d+)"/);
+    if (!versionMatch) {
+        throw new Error('Version not found in manifest');
+    }
 
-  const currentVersion = versionMatch[1];
-  const parts = currentVersion.split(".");
-  const base = `${parts[0]}.${parts[1]}`;
-  const major = parseInt(parts[2]);
-  const minor = parseInt(parts[3]);
-  const patch = parseInt(parts[4]);
+    const currentVersion = versionMatch[1];
+    const parts = currentVersion.split('.');
+    const base = `${parts[0]}.${parts[1]}`;
+    const major = parseInt(parts[2]);
+    const minor = parseInt(parts[3]);
+    const patch = parseInt(parts[4]);
 
-  let newVersion;
-  if (level === "patch") {
-    newVersion = `${base}.${major}.${minor}.${patch + 1}`;
-  } else if (level === "minor") {
-    newVersion = `${base}.${major}.${minor + 1}.0`;
-  } else if (level === "major") {
-    newVersion = `${base}.${major + 1}.0.0`;
-  }
+    let newVersion;
+    if (level === 'patch') {
+        newVersion = `${base}.${major}.${minor}.${patch + 1}`;
+    } else if (level === 'minor') {
+        newVersion = `${base}.${major}.${minor + 1}.0`;
+    } else if (level === 'major') {
+        newVersion = `${base}.${major + 1}.0.0`;
+    }
 
-  const newContent = content.replace(
-    `"version": "${currentVersion}"`,
-    `"version": "${newVersion}"`,
-  );
+    const newContent = content.replace(
+        `"version": "${currentVersion}"`,
+        `"version": "${newVersion}"`
+    );
 
-  await fs.writeFile(manifestPath, newContent);
-  console.log(`Updated version: ${currentVersion} -> ${newVersion}`);
+    await fs.writeFile(manifestPath, newContent);
+    console.log(`Updated version: ${currentVersion} -> ${newVersion}`);
 
-  await new Promise((resolve, reject) => {
-    execFile("git", ["add", manifestPath], { cwd: ADDONS_PATH }, (error) => {
-      if (error) reject(error);
-      else resolve();
+    await new Promise((resolve, reject) => {
+        execFile('git', ['add', manifestPath], { cwd: ADDONS_PATH }, (error) => {
+            if (error) reject(error);
+            else resolve();
+        });
     });
-  });
 
-  const commitMessage = `[VER][${module_name}] Bump`;
-  await new Promise((resolve, reject) => {
-    execFile(
-      "git",
-      ["commit", "-m", commitMessage],
-      { cwd: ADDONS_PATH },
-      (error) => {
-        if (error) reject(error);
-        else resolve();
-      },
-    );
-  });
+    const commitMessage = `[VER][${module_name}] Bump`;
+    await new Promise((resolve, reject) => {
+        execFile('git', ['commit', '-m', commitMessage], { cwd: ADDONS_PATH }, (error) => {
+            if (error) reject(error);
+            else resolve();
+        });
+    });
 
-  console.log(`Committed with message: ${commitMessage}`);
+    console.log(`Committed with message: ${commitMessage}`);
 }
 
 export { verbot };