npm - e-pick - Versions diffs - 1.0.0 → 2.0.0 - Mend

e-pick 1.0.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/cli.js CHANGED Viewed

@@ -2,7 +2,9 @@
 import meow from 'meow';
 import fs from 'fs';
 import pickCommit from './lib/pick-commit.js';
+import { startServer } from './server.js';
+// Define CLI options and usage
 const cli = meow(`
 Usage
   $ epick [options] <file_path>
@@ -16,6 +18,8 @@ Options
   --execute, -x       Execute the cherry-pick command. Without this flag, the command will only simulate execution.
   --allow-empty-commit, -a Allows empty commits. Default is false.
   --verbose, -v       Print detailed logs.
+  --serve, -s         Start the server to serve the pick code UI.
+  --port, -p          Port to run the server on. Default is 3000.
 Examples
   $ epick --commit-index 3 --repo-index 2 --repo-name "your-repo" --execute ./commits.csv
@@ -55,27 +59,53 @@ Examples
       shortFlag: 'v',
       default: false
     },
+    serve: {
+      type: 'boolean',
+      shortFlag: 's',
+      default: false,
+    },
+    port: {
+      type: 'number',
+      shortFlag: 'p',
+      default: 3000,
+    },
   },
   allowUnknownFlags: false
 });
-if (cli.input.length === 0) {
-  console.error("Error: No file path provided. Please specify the path to the CSV file.");
-  process.exit(1);
-}
+// Start the server if the --serve flag is provided
+if (cli.flags.serve) {
+  startServer(cli.flags.port);
+} else {
+  // Ensure a file path is provided
+  if (cli.input.length === 0) {
+    console.error("Error: No file path provided. Please specify the path to the CSV file.");
+    process.exit(1);
+  }
-const filePath = cli.input[0];
+  const filePath = cli.input[0];
-if (!fs.existsSync(filePath)) {
-  console.error(`Error: The file "${filePath}" does not exist.`);
-  process.exit(1);
-}
+  // Check if the file exists
+  if (!fs.existsSync(filePath)) {
+    console.error(`Error: The file "${filePath}" does not exist.`);
+    process.exit(1);
+  }
-const options = cli.flags;
+  const options = cli.flags;
-if (options.verbose) {
-  console.log("Options:", options);
-  console.log("Processing file:", filePath);
-}
+  // Log options and file path if verbose flag is set
+  if (options.verbose) {
+    console.log("Options:", options);
+    console.log("Processing file:", filePath);
+  }
-await pickCommit(filePath, options);
+  // Process the file and execute the pickCommit function
+  (async () => {
+    try {
+      await pickCommit(filePath, options);
+    } catch (error) {
+      console.error("Error processing the file:", error);
+      process.exit(1);
+    }
+  })();
+}

package/lib/pick-commit.js CHANGED Viewed

@@ -8,6 +8,9 @@ const uniqueArray = (array) => [...new Set(array)];
 function isExistCommit(commitId, repoPath) {
   try {
+    if (!isValidCommit(commitId)) {
+      return false;
+    }
     // Change the current working directory to the repository path
     const originalCwd = process.cwd();
     process.chdir(repoPath);

package/package.json CHANGED Viewed

@@ -1,9 +1,8 @@
 {
   "name": "e-pick",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "",
-  "scripts": {
-  },
+  "scripts": {},
   "bin": {
     "epick": "./cli.js"
   },
@@ -12,6 +11,8 @@
   "type": "module",
   "license": "MIT",
   "dependencies": {
+    "express": "^4.21.0",
+    "joi": "^17.13.3",
     "meow": "^13.2.0"
   }
 }

package/public/index.html ADDED Viewed

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Excel File Processor</title>
+  <link rel="stylesheet" href="styles.css">
+</head>
+<body>
+  <div class="container">
+    <h1>Excel File Processor</h1>
+    <input type="file" id="fileInput" accept=".xlsx, .xls">
+    <div id="loading" style="display: none;">Loading...</div>
+    <div id="searchContainer" style="display: none;">
+      <input type="text" id="searchBox" list="sheetSuggestions" placeholder="Search for a sheet...">
+      <datalist id="sheetSuggestions"></datalist>
+    </div>
+    <ul id="selectedSheetList"></ul>
+    <div id="tableContainer"></div>
+    <div>
+      <label for="headerSelector1">Repo Column:</label>
+      <select id="headerSelector1" disabled></select>
+    </div>
+    <div>
+      <label for="headerSelector2">Commit ID Column:</label>
+      <select id="headerSelector2" disabled></select>
+    </div>
+    <div id="submitContainer">
+      <button id="submitButton">Submit</button>
+    </div>
+  </div>
+  <!-- Modal for displaying success and error messages -->
+  <div id="modal" class="modal">
+    <div class="modal-content">
+      <span class="close-button" id="closeButton">&times;</span>
+      <p id="modalMessage"></p>
+      <button id="copyButton" style="display: none;">Copy Command</button>
+    </div>
+  </div>
+  <!-- Include the xlsx library -->
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.16.9/xlsx.full.min.js"></script>
+  <script src="script.js"></script>
+</body>
+</html>

package/public/script.js ADDED Viewed

@@ -0,0 +1,263 @@
+const COMMIT_HASH_REGEX = /^[0-9a-f]{40}$/;
+const isValidCommit = (commit_id) => COMMIT_HASH_REGEX.test(commit_id);
+document.addEventListener('DOMContentLoaded', () => {
+  const fileInput = document.getElementById('fileInput');
+  const loading = document.getElementById('loading');
+  const searchContainer = document.getElementById('searchContainer');
+  const searchBox = document.getElementById('searchBox');
+  const sheetSuggestions = document.getElementById('sheetSuggestions');
+  const selectedSheetList = document.getElementById('selectedSheetList');
+  const tableContainer = document.getElementById('tableContainer');
+  const submitContainer = document.getElementById('submitContainer');
+  const headerSelector1 = document.getElementById('headerSelector1');
+  const headerSelector2 = document.getElementById('headerSelector2');
+  let workbook;
+  fileInput.addEventListener('change', () => {
+    console.log('File selected:', fileInput.files[0].name);
+    if (fileInput.files.length) {
+      uploadFile(fileInput.files[0]);
+    }
+  });
+  function uploadFile(file) {
+    console.log('Uploading file:', file.name);
+    const reader = new FileReader();
+    reader.onload = (e) => {
+      const data = new Uint8Array(e.target.result);
+      workbook = XLSX.read(data, { type: 'array' });
+      console.log('Workbook loaded:', workbook);
+      // Hide loading indicator
+      loading.style.display = 'none';
+      // Show search box
+      searchContainer.style.display = 'block';
+      // Populate datalist with sheet names and valid row counts
+      sheetSuggestions.innerHTML = '';
+      workbook.SheetNames.forEach(sheet => {
+        const sheetData = XLSX.utils.sheet_to_json(workbook.Sheets[sheet]);
+        const validRowCount = sheetData.filter(row => {
+          const validCellCount = Object.values(row).filter(value => value !== undefined && value !== '').length;
+          return validCellCount >= 3;
+        }).length;
+        const option = document.createElement('option');
+        option.value = `${sheet} (Valid Rows: ${validRowCount})`;
+        sheetSuggestions.appendChild(option);
+        console.log(`Sheet: ${sheet}, Valid Rows: ${validRowCount}`);
+      });
+      // Handle sheet selection
+      searchBox.addEventListener('change', () => {
+        const selectedSheet = searchBox.value.split(' (')[0]; // Extract sheet name
+        if (selectedSheet && !Array.from(selectedSheetList.children).some(item => item.textContent.includes(selectedSheet))) {
+          console.log('Sheet selected:', selectedSheet);
+          const listItem = document.createElement('li');
+          listItem.textContent = selectedSheet;
+          // Create remove button
+          const removeButton = document.createElement('button');
+          removeButton.textContent = 'x';
+          removeButton.style.marginLeft = '10px';
+          removeButton.addEventListener('click', () => {
+            console.log('Removing sheet:', selectedSheet);
+            selectedSheetList.removeChild(listItem);
+            updateTable();
+          });
+          listItem.appendChild(removeButton);
+          selectedSheetList.appendChild(listItem);
+          searchBox.value = ''; // Clear the search box
+          updateTable();
+        }
+      });
+    };
+    // Show loading indicator
+    loading.style.display = 'block';
+    searchContainer.style.display = 'none';
+    selectedSheetList.innerHTML = ''; // Clear selected sheets
+    tableContainer.innerHTML = ''; // Clear previous table
+    submitContainer.innerHTML = ''; // Clear previous submit button
+    reader.readAsArrayBuffer(file);
+  }
+  // Update the table with merged data from selected sheets
+  function updateTable() {
+    const selectedSheets = Array.from(selectedSheetList.children).map(item => item.textContent.replace('x', '').trim());
+    let mergedData = [];
+    let validRowCounts = {};
+    selectedSheets.forEach(sheetName => {
+      console.log(`Processing sheet: ${sheetName}`);
+      const sheet = workbook.Sheets[sheetName];
+      let sheetData = XLSX.utils.sheet_to_json(sheet);
+      // Filter out rows with fewer than 3 valid (non-empty) cells
+      sheetData = sheetData.filter(row => {
+        const validCellCount = Object.values(row).filter(value => value !== undefined && value !== '').length;
+        const isValid = validCellCount >= 3;
+        console.log(`Row: ${JSON.stringify(row)}, Valid Cells: ${validCellCount}, Valid: ${isValid}`);
+        return isValid;
+      });
+      validRowCounts[sheetName] = sheetData.length;
+      console.log(`Valid rows in sheet ${sheetName}: ${validRowCounts[sheetName]}`);
+      mergedData = mergedData.concat(sheetData);
+    });
+    console.log('Merged Data:', mergedData);
+    displayTable(mergedData, validRowCounts);
+  }
+  // Display merged data in a table
+  function displayTable(data, validRowCounts) {
+    tableContainer.innerHTML = ''; // Clear previous table
+    submitContainer.innerHTML = ''; // Clear previous submit button
+    if (data.length === 0) {
+      tableContainer.textContent = 'No valid data to display.';
+      return;
+    }
+    const table = document.createElement('table');
+    const thead = document.createElement('thead');
+    const tbody = document.createElement('tbody');
+    // Create table headers
+    const headers = Object.keys(data[0]);
+    const headerRow = document.createElement('tr');
+    headers.forEach(header => {
+      const th = document.createElement('th');
+      th.textContent = header;
+      headerRow.appendChild(th);
+    });
+    thead.appendChild(headerRow);
+    // Populate header selectors
+    headerSelector1.innerHTML = '';
+    headerSelector2.innerHTML = '';
+    headers.forEach(header => {
+      const option1 = document.createElement('option');
+      option1.value = header;
+      option1.textContent = header;
+      headerSelector1.appendChild(option1);
+      const option2 = document.createElement('option');
+      option2.value = header;
+      option2.textContent = header;
+      headerSelector2.appendChild(option2);
+    });
+    // Set default values for header selectors
+    const defaultRepoHeader = headers.find(header => header.toLowerCase().includes('repo'));
+    const defaultCommitHeader = headers.find(header => header.toLowerCase().includes('commit'));
+    if (defaultRepoHeader) {
+      headerSelector1.value = defaultRepoHeader;
+    }
+    if (defaultCommitHeader) {
+      headerSelector2.value = defaultCommitHeader;
+    }
+    // Enable header selectors
+    headerSelector1.disabled = false;
+    headerSelector2.disabled = false;
+    // Create table rows
+    data.forEach(row => {
+      const tr = document.createElement('tr');
+      headers.forEach(header => {
+        const td = document.createElement('td');
+        td.textContent = row[header] || '';
+        tr.appendChild(td);
+      });
+      tbody.appendChild(tr);
+    });
+    table.appendChild(thead);
+    table.appendChild(tbody);
+    tableContainer.appendChild(table);
+    // Add title with valid row counts
+    const title = document.createElement('h2');
+    title.textContent = 'Merged Data (Valid Rows: ' + Object.entries(validRowCounts).map(([sheet, count]) => `${sheet}: ${count}`).join(', ') + ')';
+    tableContainer.insertBefore(title, table);
+    // Create and display submit button if there is valid data
+    if (data.length > 0) {
+      const submitButton = document.createElement('button');
+      submitButton.textContent = 'Submit';
+      submitButton.addEventListener('click', () => {
+        console.log('Submit button clicked');
+        submitData(data);
+      });
+      submitContainer.appendChild(submitButton);
+    }
+  }
+  // Submit data to API
+  function submitData(data) {
+    const repoColumn = headerSelector1.value;
+    const commitColumn = headerSelector2.value;
+    const payload = data.map(row => ({
+      repo: row[repoColumn],
+      commit_id: row[commitColumn]
+    }));
+    console.log('Payload:', payload);
+    fetch('/api/submit', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(payload)
+    })
+      .then(response => response.json())
+      .then(result => {
+        if (result.error) {
+          showModal(result.error, false);
+        } else {
+          console.log('Success:', result);
+          showModal(result.command, true);
+        }
+      })
+      .catch(error => {
+        console.error('Error:', error);
+        showModal(error.message, false);
+      });
+  }
+  // Show modal with message and copy button
+  function showModal(message, isSuccess) {
+    const modal = document.getElementById('modal');
+    const modalMessage = document.getElementById('modalMessage');
+    const copyButton = document.getElementById('copyButton');
+    modalMessage.textContent = message;
+    copyButton.style.display = isSuccess ? 'block' : 'none';
+    modal.style.display = 'block';
+    copyButton.onclick = () => {
+      navigator.clipboard.writeText(message).then(() => {
+        alert('Command copied to clipboard!');
+      }).catch(err => {
+        console.error('Failed to copy command:', err);
+      });
+    };
+  }
+  // Close modal when clicking the close button
+  document.getElementById('closeButton').onclick = () => {
+    document.getElementById('modal').style.display = 'none';
+  };
+});

package/public/styles.css ADDED Viewed

@@ -0,0 +1,179 @@
+/* General Styles */
+body {
+  font-family: Arial, sans-serif;
+  background-color: #f4f4f9;
+  margin: 0;
+  padding: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100vh;
+}
+.container {
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 8px;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+  width: 90%;
+  max-width: 600px;
+}
+h1, h2 {
+  color: #333;
+  text-align: center;
+}
+input[type="file"] {
+  display: block;
+  margin: 20px auto;
+}
+button {
+  display: block;
+  width: 100%;
+  padding: 10px;
+  margin: 10px 0;
+  border: none;
+  border-radius: 4px;
+  background-color: #007bff;
+  color: white;
+  font-size: 16px;
+  cursor: pointer;
+  transition: background-color 0.3s ease;
+}
+button:hover {
+  background-color: #0056b3;
+}
+button:disabled {
+  background-color: #cccccc; /* Light gray background */
+  cursor: not-allowed; /* Change cursor to not-allowed */
+}
+input[type="text"], select {
+  width: 100%;
+  padding: 10px;
+  margin: 10px 0;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+input[type="text"]:focus, select:focus {
+  border-color: #007bff;
+  outline: none;
+}
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+ul li {
+  background-color: #f9f9f9;
+  margin: 5px 0;
+  padding: 10px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+}
+ul li button {
+  background-color: #dc3545;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  padding: 5px 10px;
+  cursor: pointer;
+  transition: background-color 0.3s ease;
+  position: absolute;
+  right: 10px;
+  width: 30px;
+  text-align: center;
+}
+ul li button:hover {
+  background-color: #c82333;
+}
+table {
+  width: 100%;
+  border-collapse: collapse;
+  margin: 20px 0;
+  max-height: 400px;
+  overflow-y: auto;
+  display: block;
+}
+table, th, td {
+  border: 1px solid #ddd;
+}
+th, td {
+  padding: 10px;
+  text-align: left;
+}
+th {
+  background-color: #f2f2f2;
+}
+#loading {
+  text-align: center;
+  font-size: 18px;
+  color: #007bff;
+}
+/* Modal styles */
+.modal {
+  display: none;
+  position: fixed;
+  z-index: 1;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgb(0,0,0);
+  background-color: rgba(0,0,0,0.4);
+}
+.modal-content {
+  background-color: #fefefe;
+  margin: 15% auto;
+  padding: 20px;
+  border: 1px solid #888;
+  width: 80%;
+  max-width: 500px;
+  text-align: center;
+}
+.close-button {
+  color: #aaa;
+  float: right;
+  font-size: 28px;
+  font-weight: bold;
+}
+.close-button:hover,
+.close-button:focus {
+  color: black;
+  text-decoration: none;
+  cursor: pointer;
+}
+#copyButton {
+  margin-top: 20px;
+  background-color: #28a745;
+}
+#copyButton:hover {
+  background-color: #218838;
+}

package/server.js ADDED Viewed

@@ -0,0 +1,154 @@
+import express from 'express';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import net from 'net';
+import Joi from 'joi';
+import { execSync } from 'child_process';
+const app = express();
+// Resolve the path to the "public" directory
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const publicDirectoryPath = path.resolve(__dirname, 'public');
+// Serve static files from the "public" directory
+app.use(express.static(publicDirectoryPath));
+// Middleware to parse JSON payloads
+app.use(express.json());
+const COMMIT_HASH_REGEX = /^[0-9a-f]{40}$/;
+const isValidCommit = (commit_id) => COMMIT_HASH_REGEX.test(commit_id);
+function isExistCommit(commitId, repoPath) {
+  try {
+    if (!isValidCommit(commitId)) {
+      return false;
+    }
+    // Change the current working directory to the repository path
+    const originalCwd = process.cwd();
+    process.chdir(repoPath);
+    // Execute the git command to check the commit type
+    const result = execSync(`git cat-file -t ${commitId}`, { stdio: 'pipe' }).toString().trim();
+    // Change back to the original working directory
+    process.chdir(originalCwd);
+    // If the command's output starts with "commit", the ID is valid
+    return result === 'commit';
+  } catch (error) {
+    console.error(`Error checking commit ID: ${error.message}`);
+    return false;
+  }
+}
+const uniqueArray = (array) => [...new Set(array)];
+function getRepoName(data) {
+  const allRepos = uniqueArray(data.map((row) => row.repo).filter(Boolean));
+  return allRepos.find((name) => {
+    const commitId = data.find((row) => row.repo === name && row?.commit_id)?.commit_id;
+    return isExistCommit(commitId, process.cwd());
+  });
+}
+// Validation schema using Joi
+const schema = Joi.array().items(
+  Joi.object({
+    repo: Joi.string().required(),
+    commit_id: Joi.string()
+      .pattern(/^[0-9a-f]{40}$/)
+      .required(),
+  })
+).min(1);
+const orderCommitIds = (commits) => {
+  // Run git show command for each commit
+  const command = `git show -s --format="%ci %H" ${commits.join(' ')}`;
+  let output;
+  try {
+    output = execSync(command, { encoding: 'utf8' }).trim();
+  } catch (err) {
+    return { error: err.message };
+  }
+  // Sort the output data by commit date and hash
+  const outputData = output
+    .split('\n')
+    .sort()
+    .map((line) => line.split(' '));
+  // Extract sorted commit hashes
+  const sortedCommits = outputData.map((line) => line[3]);
+  // Generate cherry-pick command
+  const pickCommand = `git cherry-pick ${sortedCommits.join(' ')}`;
+  return { data: pickCommand };
+};
+// Handle file upload and process Excel file
+app.post('/api/submit', async (req, res) => {
+  const { error, value } = schema.validate(req.body);
+  if (error) {
+    return res.status(400).send({ error: `Invalid data format: ${error.details[0].message}` });
+  }
+  const repoName = getRepoName(value);
+  if (!repoName) {
+    return res.status(404).send({ error: 'No valid repository found.' });
+  }
+  const allMatchRepoCommitIds = value.filter((row) => row.repo === repoName).map((row) => row.commit_id);
+  const orderData = orderCommitIds(allMatchRepoCommitIds);
+  if (orderData.error) {
+    return res.status(500).send({ error: `Failed to execute command: ${orderData.error}` });
+  }
+  res.status(200).json({ repo: repoName, command: orderData.data });
+});
+// Check port availability
+const checkPortAvailability = (port, callback) => {
+  const server = net.createServer();
+  server.once('error', (err) => {
+    if (err.code === 'EADDRINUSE') {
+      callback(false);
+    } else {
+      callback(err);
+    }
+  });
+  server.once('listening', () => {
+    server.close();
+    callback(true);
+  });
+  server.listen(port);
+};
+// Flag to track if the server has already been started
+let serverStarted = false;
+// Start the server
+export const startServer = (port) => {
+  if (serverStarted) {
+    console.log('Server is already running.');
+    return;
+  }
+  checkPortAvailability(port, (isAvailable) => {
+    if (isAvailable) {
+      serverStarted = true;
+      app.listen(port, () => {
+        console.log(`Server is running on http://localhost:${port}`);
+      });
+    } else {
+      console.error(`Port ${port} is already in use.`);
+    }
+  });
+};