feat: implement cross-tag task movement functionality (#1088)
* feat: enhance move command with cross-tag functionality - Updated the `move` command to allow moving tasks between different tags, including options for handling dependencies. - Added new options: `--from-tag`, `--to-tag`, `--with-dependencies`, `--ignore-dependencies`, and `--force`. - Implemented validation for cross-tag moves and dependency checks. - Introduced helper functions in the dependency manager for validating and resolving cross-tag dependencies. - Added integration and unit tests to cover new functionality and edge cases. * fix: refactor cross-tag move logic and enhance validation - Moved the import of `moveTasksBetweenTags` to the correct location in `commands.js` for better clarity. - Added new helper functions in `dependency-manager.js` to improve validation and error handling for cross-tag moves. - Enhanced existing functions to ensure proper handling of task dependencies and conflicts. - Updated tests to cover new validation scenarios and ensure robust error messaging for invalid task IDs and tags. * fix: improve task ID handling and error messaging in cross-tag moves - Refactored `moveTasksBetweenTags` to normalize task IDs for comparison, ensuring consistent handling of string and numeric IDs. - Enhanced error messages for cases where source and target tags are the same but no destination is specified. - Updated tests to validate new behavior, including handling string dependencies correctly during cross-tag moves. - Cleaned up existing code for better readability and maintainability. * test: add comprehensive tests for cross-tag move and dependency validation - Introduced new test files for `move-cross-tag` and `cross-tag-dependencies` to cover various scenarios in cross-tag task movement. - Implemented tests for handling task movement with and without dependencies, including edge cases for error handling. - Enhanced existing tests in `fix-dependencies-command` and `move-task` to ensure robust validation of task IDs and dependencies. - Mocked necessary modules and functions to isolate tests and improve reliability. - Ensured coverage for both successful and failed cross-tag move operations, validating expected outcomes and error messages. * test: refactor cross-tag move tests for better clarity and reusability - Introduced a helper function `simulateCrossTagMove` to streamline cross-tag move test cases, reducing redundancy and improving readability. - Updated existing tests to utilize the new helper function, ensuring consistent handling of expected messages and options. - Enhanced test coverage for various scenarios, including handling of dependencies and flags. * feat: add cross-tag task movement functionality - Introduced new commands for moving tasks between different tags, enhancing project organization capabilities. - Updated README with usage examples for cross-tag movement, including options for handling dependencies. - Created comprehensive documentation for cross-tag task movement, detailing usage, error handling, and best practices. - Implemented core logic for cross-tag moves, including validation for dependencies and error handling. - Added integration and unit tests to ensure robust functionality and coverage for various scenarios, including edge cases. * fix: enhance error handling and logging in cross-tag task movement - Improved logging in `moveTaskCrossTagDirect` to include detailed arguments for better traceability. - Refactored error handling to utilize structured error objects, providing clearer suggestions for resolving cross-tag dependency conflicts and subtask movement restrictions. - Updated documentation to reflect changes in error handling and provide clearer guidance on task movement options. - Added integration tests for cross-tag movement scenarios, ensuring robust validation of error handling and task movement logic. - Cleaned up existing tests for clarity and reusability, enhancing overall test coverage. * feat: enhance dependency resolution and error handling in task movement - Added recursive dependency resolution for tasks in `moveTasksBetweenTags`, improving handling of complex task relationships. - Introduced helper functions to find all dependencies and reverse dependencies, ensuring comprehensive coverage during task moves. - Enhanced error messages in `validateSubtaskMove` and `displaySubtaskMoveError` for better clarity on movement restrictions. - Updated tests to cover new functionality, including integration tests for complex cross-tag movement scenarios and edge cases. - Refactored existing code for improved readability and maintainability, ensuring consistent handling of task IDs and dependencies. * feat: unify dependency traversal and enhance task management utilities - Introduced `traverseDependencies` utility for unified forward and reverse dependency traversal, improving code reusability and clarity. - Refactored `findAllDependenciesRecursively` to leverage the new utility, streamlining dependency resolution in task management. - Added `formatTaskIdForDisplay` helper for better task ID formatting in UI, enhancing user experience during error displays. - Updated tests to cover new utility functions and ensure robust validation of dependency handling across various scenarios. - Improved overall code organization and readability, ensuring consistent handling of task dependencies and IDs. * fix: improve validation for dependency parameters in `findAllDependenciesRecursively` - Added checks to ensure `sourceTasks` and `allTasks` are arrays, throwing errors if not, to prevent runtime issues. - Updated documentation comment for clarity on the function's purpose and parameters. * fix: remove `force` option from task movement parameters - Eliminated the `force` parameter from the `moveTaskCrossTagDirect` function and related tools, simplifying the task movement logic. - Updated documentation and tests to reflect the removal of the `force` option, ensuring clarity and consistency across the codebase. - Adjusted related functions and tests to focus on `ignoreDependencies` as the primary control for handling dependency conflicts during task moves. * Add cross-tag task movement functionality - Introduced functionality for organizing tasks across different contexts by enabling cross-tag movement. - Added `formatTaskIdForDisplay` helper to improve task ID formatting in UI error messages. - Updated relevant tests to incorporate new functionality and ensure accurate error displays during task movements. * Update scripts/modules/dependency-manager.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * refactor(dependency-manager): Fix subtask resolution and extract helper functions 1. Fix subtask finding logic (lines 1315-1330): - Correctly locate parent task by numeric ID - Search within parent's subtasks array instead of top-level tasks - Properly handle relative subtask references 2. Extract helper functions from getDependentTaskIds (lines 1440-1636): - Move findTasksThatDependOn as module-level function - Move taskDependsOnSource as module-level function - Move subtasksDependOnSource as module-level function - Improves readability, maintainability, and testability Both fixes address architectural issues and improve code organization. * refactor(dependency-manager): Enhance subtask resolution and dependency validation - Improved subtask resolution logic to correctly find parent tasks and their subtasks, ensuring accurate identification of dependencies. - Filtered out null/undefined dependencies before processing, enhancing robustness in dependency checks. - Updated comments for clarity on the logic flow and purpose of changes, improving code maintainability. * refactor(move-task): clarify destination ID description and improve skipped task handling - Updated the description for the destination ID to clarify its usage in cross-tag moves. - Simplified the handling of skipped tasks during multiple task movements, improving readability and logging. - Enhanced the API result response to include detailed information about moved and skipped tasks, ensuring better feedback for users. * refactor(commands): remove redundant tag validation logic - Eliminated the check for identical source and target tags in the task movement logic, simplifying the code. - This change streamlines the flow for within-tag moves, enhancing readability and maintainability. * refactor(commands): enhance move command logic and error handling - Introduced helper functions for better organization of cross-tag and within-tag move logic, improving code readability and maintainability. - Enhanced error handling with structured error objects, providing clearer feedback for dependency conflicts and invalid tag combinations. - Updated move command help output to include best practices and error resolution tips, ensuring users have comprehensive guidance during task movements. - Streamlined task movement logic to handle multiple tasks more effectively, including detailed logging of successful and failed moves. * test(dependency-manager): add subtasks to task structure and mock dependency traversal - Updated `circular-dependencies.test.js` to include subtasks in task definitions, enhancing test coverage for task structures with nested dependencies. - Mocked `traverseDependencies` in `fix-dependencies-command.test.js` to ensure consistent behavior during tests, improving reliability of dependency-related tests. * refactor(dependency-manager): extract subtask finding logic into helper function - Added `findSubtaskInParent` function to encapsulate subtask resolution within a parent task's subtasks array, improving code organization and readability. - Updated `findDependencyTask` to utilize the new helper function, streamlining the logic for finding subtasks and enhancing maintainability. - Enhanced comments for clarity on the purpose and functionality of the new subtask finding logic. * refactor(ui): enhance subtask ID validation and improve error handling - Added validation for subtask ID format in `formatDependenciesWithStatus` and `taskExists`, ensuring proper handling of invalid formats. - Updated error logging in `displaySubtaskMoveError` to provide warnings for unexpected task ID formats, improving user feedback. - Converted hints to a Set in `displayDependencyValidationHints` to ensure unique hints are displayed, enhancing clarity in the UI. * test(cli): remove redundant timing check in complex cross-tag scenarios - Eliminated the timing check for task completion within 5 seconds in `complex-cross-tag-scenarios.test.js`, streamlining the test logic. - This change focuses on verifying task success without unnecessary timing constraints, enhancing test clarity and maintainability. * test(integration): enhance task movement tests with mock file system - Added integration tests for moving tasks within the same tag and between different tags using the actual `moveTask` and `moveTasksBetweenTags` functions. - Implemented `mock-fs` to simulate file system interactions, improving test isolation and reliability. - Verified task movement success and ensured proper handling of subtasks and dependencies, enhancing overall test coverage for task management functionality. - Included error handling tests for missing tags and task IDs to ensure robustness in task movement operations. * test(unit): add comprehensive tests for moveTaskCrossTagDirect functionality - Introduced new test cases to verify mock functionality, ensuring that mocks for `findTasksPath` and `readJSON` are working as expected. - Added tests for parameter validation, error handling, and function call flow, including scenarios for missing project roots and identical source/target tags. - Enhanced coverage for ID parsing and move options, ensuring robust handling of various input conditions and improving overall test reliability. * test(integration): skip tests for dependency conflict handling and withDependencies option - Marked tests for handling dependency conflicts and the withDependencies option as skipped due to issues with the mock setup. - Added TODOs to address the mock-fs setup for complex dependency scenarios, ensuring future improvements in test reliability. * test(unit): expand cross-tag move command tests with comprehensive mocks - Added extensive mocks for various modules to enhance the testing of the cross-tag move functionality in `move-cross-tag.test.js`. - Implemented detailed test cases for handling cross-tag moves, including validation for missing parameters and identical source/target tags. - Improved error handling tests to ensure robust feedback for invalid operations, enhancing overall test reliability and coverage. * test(integration): add complex dependency scenarios to task movement tests - Introduced new integration tests for handling complex dependency scenarios in task movement, utilizing the actual `moveTasksBetweenTags` function. - Added tests for circular dependencies, nested dependency chains, and cross-tag dependency resolution, enhancing coverage and reliability. - Documented limitations of the mock-fs setup for complex scenarios and provided warnings in the test output to guide future improvements. - Skipped tests for dependency conflicts and the withDependencies option due to mock setup issues, with TODOs for resolution. * test(unit): refactor move-cross-tag tests with focused mock system - Simplified mocking in `move-cross-tag.test.js` by implementing a configuration-driven mock system, reducing the number of mocked modules from 20+ to 5 core functionalities. - Introduced a reusable mock factory to streamline the creation of mocks based on configuration, enhancing maintainability and clarity. - Added documentation for the new mock system, detailing usage examples and benefits, including reduced complexity and improved test focus. - Implemented tests to validate the mock configuration, ensuring flexibility in enabling/disabling specific mocks. * test(unit): clean up mocks and improve isEmpty function in fix-dependencies-command tests - Removed the mock for `traverseDependencies` as it was unnecessary, simplifying the test setup. - Updated the `isEmpty` function to clarify its behavior regarding null and undefined values, enhancing code readability and maintainability. * test(unit): update traverseDependencies mock for consistency across tests - Standardized the mock implementation of `traverseDependencies` in both `fix-dependencies-command.test.js` and `complexity-report-tag-isolation.test.js` to accept `sourceTasks`, `allTasks`, and `options` parameters, ensuring uniformity in test setups. - This change enhances clarity and maintainability of the tests by aligning the mock behavior across different test files. * fix(core): improve task movement error handling and ID normalization - Wrapped task movement logic in a try-finally block to ensure console output is restored even on errors, enhancing reliability. - Normalized source IDs to handle mixed string/number comparisons, preventing potential issues in dependency checks. - Added tests for ID type consistency to verify that the normalization fix works correctly across various scenarios, improving test coverage and robustness. * refactor(task-manager): restructure task movement logic for improved validation and execution - Renamed and refactored `moveTasksBetweenTags` to streamline the task movement process into distinct phases: validation, data preparation, dependency resolution, execution, and finalization. - Introduced `validateMove`, `prepareTaskData`, `resolveDependencies`, `executeMoveOperation`, and `finalizeMove` functions to enhance modularity and clarity. - Updated documentation comments to reflect changes in function responsibilities and parameters. - Added comprehensive unit tests for the new structure, ensuring robust validation and error handling across various scenarios. - Improved handling of dependencies and task existence checks during the move operation, enhancing overall reliability. * fix(move-task): streamline task movement logic and improve error handling - Refactored the task movement process to enhance clarity and maintainability by replacing `forEach` with a `for...of` loop for better async handling. - Consolidated error handling and result logging to ensure consistent feedback during task moves. - Updated the logic for generating files only on the last move, improving performance and reducing unnecessary operations. - Enhanced validation for skipped tasks, ensuring accurate reporting of moved and skipped tasks in the final result. * fix(docs): update error message formatting and enhance clarity in task movement documentation - Changed code block syntax from generic to `text` for better readability in error messages related to task movement and dependency conflicts. - Ensured consistent formatting across all error message examples to improve user understanding of task movement restrictions and resolutions. - Added a newline at the end of the file for proper formatting. * Update .changeset/crazy-meals-hope.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * chore: improve changeset * chore: improve changeset * fix referenced bug in docs and remove docs * chore: fix format --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Ralph Khreish <35776126+Crunchyman-ralph@users.noreply.github.com>
This commit is contained in:
Parthy
@@ -1,7 +1,65 @@
|
||||
import path from 'path';
|
||||
import { log, readJSON, writeJSON, setTasksForTag } from '../utils.js';
|
||||
import { isTaskDependentOn } from '../task-manager.js';
|
||||
import {
|
||||
log,
|
||||
readJSON,
|
||||
writeJSON,
|
||||
setTasksForTag,
|
||||
traverseDependencies
|
||||
} from '../utils.js';
|
||||
import generateTaskFiles from './generate-task-files.js';
|
||||
import {
|
||||
findCrossTagDependencies,
|
||||
getDependentTaskIds,
|
||||
validateSubtaskMove
|
||||
} from '../dependency-manager.js';
|
||||
|
||||
/**
|
||||
* Find all dependencies recursively for a set of source tasks with depth limiting
|
||||
* @param {Array} sourceTasks - The source tasks to find dependencies for
|
||||
* @param {Array} allTasks - All available tasks from all tags
|
||||
* @param {Object} options - Options object
|
||||
* @param {number} options.maxDepth - Maximum recursion depth (default: 50)
|
||||
* @param {boolean} options.includeSelf - Whether to include self-references (default: false)
|
||||
* @returns {Array} Array of all dependency task IDs
|
||||
*/
|
||||
function findAllDependenciesRecursively(sourceTasks, allTasks, options = {}) {
|
||||
return traverseDependencies(sourceTasks, allTasks, {
|
||||
...options,
|
||||
direction: 'forward',
|
||||
logger: { warn: console.warn }
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Structured error class for move operations
|
||||
*/
|
||||
class MoveTaskError extends Error {
|
||||
constructor(code, message, data = {}) {
|
||||
super(message);
|
||||
this.name = 'MoveTaskError';
|
||||
this.code = code;
|
||||
this.data = data;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Error codes for move operations
|
||||
*/
|
||||
const MOVE_ERROR_CODES = {
|
||||
CROSS_TAG_DEPENDENCY_CONFLICTS: 'CROSS_TAG_DEPENDENCY_CONFLICTS',
|
||||
CANNOT_MOVE_SUBTASK: 'CANNOT_MOVE_SUBTASK',
|
||||
SOURCE_TARGET_TAGS_SAME: 'SOURCE_TARGET_TAGS_SAME',
|
||||
TASK_NOT_FOUND: 'TASK_NOT_FOUND',
|
||||
SUBTASK_NOT_FOUND: 'SUBTASK_NOT_FOUND',
|
||||
PARENT_TASK_NOT_FOUND: 'PARENT_TASK_NOT_FOUND',
|
||||
PARENT_TASK_NO_SUBTASKS: 'PARENT_TASK_NO_SUBTASKS',
|
||||
DESTINATION_TASK_NOT_FOUND: 'DESTINATION_TASK_NOT_FOUND',
|
||||
TASK_ALREADY_EXISTS: 'TASK_ALREADY_EXISTS',
|
||||
INVALID_TASKS_FILE: 'INVALID_TASKS_FILE',
|
||||
ID_COUNT_MISMATCH: 'ID_COUNT_MISMATCH',
|
||||
INVALID_SOURCE_TAG: 'INVALID_SOURCE_TAG',
|
||||
INVALID_TARGET_TAG: 'INVALID_TARGET_TAG'
|
||||
};
|
||||
|
||||
/**
|
||||
* Move one or more tasks/subtasks to new positions
|
||||
@@ -27,7 +85,8 @@ async function moveTask(
|
||||
const destinationIds = destinationId.split(',').map((id) => id.trim());
|
||||
|
||||
if (sourceIds.length !== destinationIds.length) {
|
||||
throw new Error(
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.ID_COUNT_MISMATCH,
|
||||
`Number of source IDs (${sourceIds.length}) must match number of destination IDs (${destinationIds.length})`
|
||||
);
|
||||
}
|
||||
@@ -72,7 +131,8 @@ async function moveTask(
|
||||
|
||||
// Ensure the tag exists in the raw data
|
||||
if (!rawData || !rawData[tag] || !Array.isArray(rawData[tag].tasks)) {
|
||||
throw new Error(
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.INVALID_TASKS_FILE,
|
||||
`Invalid tasks file or tag "${tag}" not found at ${tasksPath}`
|
||||
);
|
||||
}
|
||||
@@ -137,10 +197,14 @@ function moveSubtaskToSubtask(tasks, sourceId, destinationId) {
|
||||
const destParentTask = tasks.find((t) => t.id === destParentId);
|
||||
|
||||
if (!sourceParentTask) {
|
||||
throw new Error(`Source parent task with ID ${sourceParentId} not found`);
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.PARENT_TASK_NOT_FOUND,
|
||||
`Source parent task with ID ${sourceParentId} not found`
|
||||
);
|
||||
}
|
||||
if (!destParentTask) {
|
||||
throw new Error(
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.PARENT_TASK_NOT_FOUND,
|
||||
`Destination parent task with ID ${destParentId} not found`
|
||||
);
|
||||
}
|
||||
@@ -158,7 +222,10 @@ function moveSubtaskToSubtask(tasks, sourceId, destinationId) {
|
||||
(st) => st.id === sourceSubtaskId
|
||||
);
|
||||
if (sourceSubtaskIndex === -1) {
|
||||
throw new Error(`Source subtask ${sourceId} not found`);
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.SUBTASK_NOT_FOUND,
|
||||
`Source subtask ${sourceId} not found`
|
||||
);
|
||||
}
|
||||
|
||||
const sourceSubtask = sourceParentTask.subtasks[sourceSubtaskIndex];
|
||||
@@ -216,10 +283,16 @@ function moveSubtaskToTask(tasks, sourceId, destinationId) {
|
||||
const sourceParentTask = tasks.find((t) => t.id === sourceParentId);
|
||||
|
||||
if (!sourceParentTask) {
|
||||
throw new Error(`Source parent task with ID ${sourceParentId} not found`);
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.PARENT_TASK_NOT_FOUND,
|
||||
`Source parent task with ID ${sourceParentId} not found`
|
||||
);
|
||||
}
|
||||
if (!sourceParentTask.subtasks) {
|
||||
throw new Error(`Source parent task ${sourceParentId} has no subtasks`);
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.PARENT_TASK_NO_SUBTASKS,
|
||||
`Source parent task ${sourceParentId} has no subtasks`
|
||||
);
|
||||
}
|
||||
|
||||
// Find source subtask
|
||||
@@ -227,7 +300,10 @@ function moveSubtaskToTask(tasks, sourceId, destinationId) {
|
||||
(st) => st.id === sourceSubtaskId
|
||||
);
|
||||
if (sourceSubtaskIndex === -1) {
|
||||
throw new Error(`Source subtask ${sourceId} not found`);
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.SUBTASK_NOT_FOUND,
|
||||
`Source subtask ${sourceId} not found`
|
||||
);
|
||||
}
|
||||
|
||||
const sourceSubtask = sourceParentTask.subtasks[sourceSubtaskIndex];
|
||||
@@ -235,7 +311,8 @@ function moveSubtaskToTask(tasks, sourceId, destinationId) {
|
||||
// Check if destination task exists
|
||||
const existingDestTask = tasks.find((t) => t.id === destTaskId);
|
||||
if (existingDestTask) {
|
||||
throw new Error(
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.TASK_ALREADY_EXISTS,
|
||||
`Cannot move to existing task ID ${destTaskId}. Choose a different ID or use subtask destination.`
|
||||
);
|
||||
}
|
||||
@@ -282,10 +359,14 @@ function moveTaskToSubtask(tasks, sourceId, destinationId) {
|
||||
const destParentTask = tasks.find((t) => t.id === destParentId);
|
||||
|
||||
if (sourceTaskIndex === -1) {
|
||||
throw new Error(`Source task with ID ${sourceTaskId} not found`);
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.TASK_NOT_FOUND,
|
||||
`Source task with ID ${sourceTaskId} not found`
|
||||
);
|
||||
}
|
||||
if (!destParentTask) {
|
||||
throw new Error(
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.PARENT_TASK_NOT_FOUND,
|
||||
`Destination parent task with ID ${destParentId} not found`
|
||||
);
|
||||
}
|
||||
@@ -340,7 +421,10 @@ function moveTaskToTask(tasks, sourceId, destinationId) {
|
||||
// Find source task
|
||||
const sourceTaskIndex = tasks.findIndex((t) => t.id === sourceTaskId);
|
||||
if (sourceTaskIndex === -1) {
|
||||
throw new Error(`Source task with ID ${sourceTaskId} not found`);
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.TASK_NOT_FOUND,
|
||||
`Source task with ID ${sourceTaskId} not found`
|
||||
);
|
||||
}
|
||||
|
||||
const sourceTask = tasks[sourceTaskIndex];
|
||||
@@ -353,7 +437,8 @@ function moveTaskToTask(tasks, sourceId, destinationId) {
|
||||
const destTask = tasks[destTaskIndex];
|
||||
|
||||
// For now, throw an error to avoid accidental overwrites
|
||||
throw new Error(
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.TASK_ALREADY_EXISTS,
|
||||
`Task with ID ${destTaskId} already exists. Use a different destination ID.`
|
||||
);
|
||||
} else {
|
||||
@@ -478,4 +563,434 @@ function moveTaskToNewId(tasks, sourceTaskIndex, sourceTask, destTaskId) {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all tasks from all tags with tag information
|
||||
* @param {Object} rawData - The raw tagged data object
|
||||
* @returns {Array} A flat array of all task objects with tag property
|
||||
*/
|
||||
function getAllTasksWithTags(rawData) {
|
||||
let allTasks = [];
|
||||
for (const tagName in rawData) {
|
||||
if (
|
||||
Object.prototype.hasOwnProperty.call(rawData, tagName) &&
|
||||
rawData[tagName] &&
|
||||
Array.isArray(rawData[tagName].tasks)
|
||||
) {
|
||||
const tasksWithTag = rawData[tagName].tasks.map((task) => ({
|
||||
...task,
|
||||
tag: tagName
|
||||
}));
|
||||
allTasks = allTasks.concat(tasksWithTag);
|
||||
}
|
||||
}
|
||||
return allTasks;
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate move operation parameters and data
|
||||
* @param {string} tasksPath - Path to tasks.json file
|
||||
* @param {Array} taskIds - Array of task IDs to move
|
||||
* @param {string} sourceTag - Source tag name
|
||||
* @param {string} targetTag - Target tag name
|
||||
* @param {Object} context - Context object
|
||||
* @returns {Object} Validation result with rawData and sourceTasks
|
||||
*/
|
||||
async function validateMove(tasksPath, taskIds, sourceTag, targetTag, context) {
|
||||
const { projectRoot } = context;
|
||||
|
||||
// Read the raw data without tag resolution to preserve tagged structure
|
||||
let rawData = readJSON(tasksPath, projectRoot, sourceTag);
|
||||
|
||||
// Handle the case where readJSON returns resolved data with _rawTaggedData
|
||||
if (rawData && rawData._rawTaggedData) {
|
||||
rawData = rawData._rawTaggedData;
|
||||
}
|
||||
|
||||
// Validate source tag exists
|
||||
if (
|
||||
!rawData ||
|
||||
!rawData[sourceTag] ||
|
||||
!Array.isArray(rawData[sourceTag].tasks)
|
||||
) {
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.INVALID_SOURCE_TAG,
|
||||
`Source tag "${sourceTag}" not found or invalid`
|
||||
);
|
||||
}
|
||||
|
||||
// Create target tag if it doesn't exist
|
||||
if (!rawData[targetTag]) {
|
||||
rawData[targetTag] = { tasks: [] };
|
||||
log('info', `Created new tag "${targetTag}"`);
|
||||
}
|
||||
|
||||
// Normalize all IDs to strings once for consistent comparison
|
||||
const normalizedSearchIds = taskIds.map((id) => String(id));
|
||||
|
||||
const sourceTasks = rawData[sourceTag].tasks.filter((t) => {
|
||||
const normalizedTaskId = String(t.id);
|
||||
return normalizedSearchIds.includes(normalizedTaskId);
|
||||
});
|
||||
|
||||
// Validate subtask movement
|
||||
taskIds.forEach((taskId) => {
|
||||
validateSubtaskMove(taskId, sourceTag, targetTag);
|
||||
});
|
||||
|
||||
return { rawData, sourceTasks };
|
||||
}
|
||||
|
||||
/**
|
||||
* Load and prepare task data for move operation
|
||||
* @param {Object} validation - Validation result from validateMove
|
||||
* @returns {Object} Prepared data with rawData, sourceTasks, and allTasks
|
||||
*/
|
||||
async function prepareTaskData(validation) {
|
||||
const { rawData, sourceTasks } = validation;
|
||||
|
||||
// Get all tasks for validation
|
||||
const allTasks = getAllTasksWithTags(rawData);
|
||||
|
||||
return { rawData, sourceTasks, allTasks };
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve dependencies and determine tasks to move
|
||||
* @param {Array} sourceTasks - Source tasks to move
|
||||
* @param {Array} allTasks - All available tasks from all tags
|
||||
* @param {Object} options - Move options
|
||||
* @param {Array} taskIds - Original task IDs
|
||||
* @param {string} sourceTag - Source tag name
|
||||
* @param {string} targetTag - Target tag name
|
||||
* @returns {Object} Tasks to move and dependency resolution info
|
||||
*/
|
||||
async function resolveDependencies(
|
||||
sourceTasks,
|
||||
allTasks,
|
||||
options,
|
||||
taskIds,
|
||||
sourceTag,
|
||||
targetTag
|
||||
) {
|
||||
const { withDependencies = false, ignoreDependencies = false } = options;
|
||||
|
||||
// Handle --with-dependencies flag first (regardless of cross-tag dependencies)
|
||||
if (withDependencies) {
|
||||
// Move dependent tasks along with main tasks
|
||||
// Find ALL dependencies recursively within the same tag
|
||||
const allDependentTaskIds = findAllDependenciesRecursively(
|
||||
sourceTasks,
|
||||
allTasks,
|
||||
{ maxDepth: 100, includeSelf: false }
|
||||
);
|
||||
const allTaskIdsToMove = [...new Set([...taskIds, ...allDependentTaskIds])];
|
||||
|
||||
log(
|
||||
'info',
|
||||
`Moving ${allTaskIdsToMove.length} tasks (including dependencies): ${allTaskIdsToMove.join(', ')}`
|
||||
);
|
||||
|
||||
return {
|
||||
tasksToMove: allTaskIdsToMove,
|
||||
dependencyResolution: {
|
||||
type: 'with-dependencies',
|
||||
dependentTasks: allDependentTaskIds
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
// Find cross-tag dependencies (these shouldn't exist since dependencies are only within tags)
|
||||
const crossTagDependencies = findCrossTagDependencies(
|
||||
sourceTasks,
|
||||
sourceTag,
|
||||
targetTag,
|
||||
allTasks
|
||||
);
|
||||
|
||||
if (crossTagDependencies.length > 0) {
|
||||
if (ignoreDependencies) {
|
||||
// Break cross-tag dependencies (edge case - shouldn't normally happen)
|
||||
sourceTasks.forEach((task) => {
|
||||
task.dependencies = task.dependencies.filter((depId) => {
|
||||
// Handle both task IDs and subtask IDs (e.g., "1.2")
|
||||
let depTask = null;
|
||||
if (typeof depId === 'string' && depId.includes('.')) {
|
||||
// It's a subtask ID - extract parent task ID and find the parent task
|
||||
const [parentId, subtaskId] = depId
|
||||
.split('.')
|
||||
.map((id) => parseInt(id, 10));
|
||||
depTask = allTasks.find((t) => t.id === parentId);
|
||||
} else {
|
||||
// It's a regular task ID - normalize to number for comparison
|
||||
const normalizedDepId =
|
||||
typeof depId === 'string' ? parseInt(depId, 10) : depId;
|
||||
depTask = allTasks.find((t) => t.id === normalizedDepId);
|
||||
}
|
||||
return !depTask || depTask.tag === targetTag;
|
||||
});
|
||||
});
|
||||
|
||||
log(
|
||||
'warn',
|
||||
`Removed ${crossTagDependencies.length} cross-tag dependencies`
|
||||
);
|
||||
|
||||
return {
|
||||
tasksToMove: taskIds,
|
||||
dependencyResolution: {
|
||||
type: 'ignored-dependencies',
|
||||
conflicts: crossTagDependencies
|
||||
}
|
||||
};
|
||||
} else {
|
||||
// Block move and show error
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.CROSS_TAG_DEPENDENCY_CONFLICTS,
|
||||
`Cannot move tasks: ${crossTagDependencies.length} cross-tag dependency conflicts found`,
|
||||
{
|
||||
conflicts: crossTagDependencies,
|
||||
sourceTag,
|
||||
targetTag,
|
||||
taskIds
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
tasksToMove: taskIds,
|
||||
dependencyResolution: { type: 'no-conflicts' }
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute the actual move operation
|
||||
* @param {Array} tasksToMove - Array of task IDs to move
|
||||
* @param {string} sourceTag - Source tag name
|
||||
* @param {string} targetTag - Target tag name
|
||||
* @param {Object} rawData - Raw data object
|
||||
* @param {Object} context - Context object
|
||||
* @param {string} tasksPath - Path to tasks.json file
|
||||
* @returns {Object} Move operation result
|
||||
*/
|
||||
async function executeMoveOperation(
|
||||
tasksToMove,
|
||||
sourceTag,
|
||||
targetTag,
|
||||
rawData,
|
||||
context,
|
||||
tasksPath
|
||||
) {
|
||||
const { projectRoot } = context;
|
||||
const movedTasks = [];
|
||||
|
||||
// Move each task from source to target tag
|
||||
for (const taskId of tasksToMove) {
|
||||
// Normalize taskId to number for comparison
|
||||
const normalizedTaskId =
|
||||
typeof taskId === 'string' ? parseInt(taskId, 10) : taskId;
|
||||
|
||||
const sourceTaskIndex = rawData[sourceTag].tasks.findIndex(
|
||||
(t) => t.id === normalizedTaskId
|
||||
);
|
||||
|
||||
if (sourceTaskIndex === -1) {
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.TASK_NOT_FOUND,
|
||||
`Task ${taskId} not found in source tag "${sourceTag}"`
|
||||
);
|
||||
}
|
||||
|
||||
const taskToMove = rawData[sourceTag].tasks[sourceTaskIndex];
|
||||
|
||||
// Check for ID conflicts in target tag
|
||||
const existingTaskIndex = rawData[targetTag].tasks.findIndex(
|
||||
(t) => t.id === normalizedTaskId
|
||||
);
|
||||
if (existingTaskIndex !== -1) {
|
||||
throw new MoveTaskError(
|
||||
MOVE_ERROR_CODES.TASK_ALREADY_EXISTS,
|
||||
`Task ${taskId} already exists in target tag "${targetTag}"`
|
||||
);
|
||||
}
|
||||
|
||||
// Remove from source tag
|
||||
rawData[sourceTag].tasks.splice(sourceTaskIndex, 1);
|
||||
|
||||
// Preserve task metadata and add to target tag
|
||||
const taskWithPreservedMetadata = preserveTaskMetadata(
|
||||
taskToMove,
|
||||
sourceTag,
|
||||
targetTag
|
||||
);
|
||||
rawData[targetTag].tasks.push(taskWithPreservedMetadata);
|
||||
|
||||
movedTasks.push({
|
||||
id: taskId,
|
||||
fromTag: sourceTag,
|
||||
toTag: targetTag
|
||||
});
|
||||
|
||||
log('info', `Moved task ${taskId} from "${sourceTag}" to "${targetTag}"`);
|
||||
}
|
||||
|
||||
return { rawData, movedTasks };
|
||||
}
|
||||
|
||||
/**
|
||||
* Finalize the move operation by saving data and returning result
|
||||
* @param {Object} moveResult - Result from executeMoveOperation
|
||||
* @param {string} tasksPath - Path to tasks.json file
|
||||
* @param {Object} context - Context object
|
||||
* @param {string} sourceTag - Source tag name
|
||||
* @param {string} targetTag - Target tag name
|
||||
* @returns {Object} Final result object
|
||||
*/
|
||||
async function finalizeMove(
|
||||
moveResult,
|
||||
tasksPath,
|
||||
context,
|
||||
sourceTag,
|
||||
targetTag
|
||||
) {
|
||||
const { projectRoot } = context;
|
||||
const { rawData, movedTasks } = moveResult;
|
||||
|
||||
// Write the updated data
|
||||
writeJSON(tasksPath, rawData, projectRoot, null);
|
||||
|
||||
return {
|
||||
message: `Successfully moved ${movedTasks.length} tasks from "${sourceTag}" to "${targetTag}"`,
|
||||
movedTasks
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Move tasks between different tags with dependency handling
|
||||
* @param {string} tasksPath - Path to tasks.json file
|
||||
* @param {Array} taskIds - Array of task IDs to move
|
||||
* @param {string} sourceTag - Source tag name
|
||||
* @param {string} targetTag - Target tag name
|
||||
* @param {Object} options - Move options
|
||||
* @param {boolean} options.withDependencies - Move dependent tasks along with main task
|
||||
* @param {boolean} options.ignoreDependencies - Break cross-tag dependencies during move
|
||||
* @param {Object} context - Context object containing projectRoot and tag information
|
||||
* @returns {Object} Result object with moved task details
|
||||
*/
|
||||
async function moveTasksBetweenTags(
|
||||
tasksPath,
|
||||
taskIds,
|
||||
sourceTag,
|
||||
targetTag,
|
||||
options = {},
|
||||
context = {}
|
||||
) {
|
||||
// 1. Validation phase
|
||||
const validation = await validateMove(
|
||||
tasksPath,
|
||||
taskIds,
|
||||
sourceTag,
|
||||
targetTag,
|
||||
context
|
||||
);
|
||||
|
||||
// 2. Load and prepare data
|
||||
const { rawData, sourceTasks, allTasks } = await prepareTaskData(validation);
|
||||
|
||||
// 3. Handle dependencies
|
||||
const { tasksToMove } = await resolveDependencies(
|
||||
sourceTasks,
|
||||
allTasks,
|
||||
options,
|
||||
taskIds,
|
||||
sourceTag,
|
||||
targetTag
|
||||
);
|
||||
|
||||
// 4. Execute move
|
||||
const moveResult = await executeMoveOperation(
|
||||
tasksToMove,
|
||||
sourceTag,
|
||||
targetTag,
|
||||
rawData,
|
||||
context,
|
||||
tasksPath
|
||||
);
|
||||
|
||||
// 5. Save and return
|
||||
return await finalizeMove(
|
||||
moveResult,
|
||||
tasksPath,
|
||||
context,
|
||||
sourceTag,
|
||||
targetTag
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Detect ID conflicts in target tag
|
||||
* @param {Array} taskIds - Array of task IDs to check
|
||||
* @param {string} targetTag - Target tag name
|
||||
* @param {Object} rawData - Raw data object
|
||||
* @returns {Array} Array of conflicting task IDs
|
||||
*/
|
||||
function detectIdConflicts(taskIds, targetTag, rawData) {
|
||||
const conflicts = [];
|
||||
|
||||
if (!rawData[targetTag] || !Array.isArray(rawData[targetTag].tasks)) {
|
||||
return conflicts;
|
||||
}
|
||||
|
||||
taskIds.forEach((taskId) => {
|
||||
// Normalize taskId to number for comparison
|
||||
const normalizedTaskId =
|
||||
typeof taskId === 'string' ? parseInt(taskId, 10) : taskId;
|
||||
const existingTask = rawData[targetTag].tasks.find(
|
||||
(t) => t.id === normalizedTaskId
|
||||
);
|
||||
if (existingTask) {
|
||||
conflicts.push(taskId);
|
||||
}
|
||||
});
|
||||
|
||||
return conflicts;
|
||||
}
|
||||
|
||||
/**
|
||||
* Preserve task metadata during cross-tag moves
|
||||
* @param {Object} task - Task object
|
||||
* @param {string} sourceTag - Source tag name
|
||||
* @param {string} targetTag - Target tag name
|
||||
* @returns {Object} Task object with preserved metadata
|
||||
*/
|
||||
function preserveTaskMetadata(task, sourceTag, targetTag) {
|
||||
// Update the tag property to reflect the new location
|
||||
task.tag = targetTag;
|
||||
|
||||
// Add move history to task metadata
|
||||
if (!task.metadata) {
|
||||
task.metadata = {};
|
||||
}
|
||||
|
||||
if (!task.metadata.moveHistory) {
|
||||
task.metadata.moveHistory = [];
|
||||
}
|
||||
|
||||
task.metadata.moveHistory.push({
|
||||
fromTag: sourceTag,
|
||||
toTag: targetTag,
|
||||
timestamp: new Date().toISOString()
|
||||
});
|
||||
|
||||
return task;
|
||||
}
|
||||
|
||||
export default moveTask;
|
||||
export {
|
||||
moveTasksBetweenTags,
|
||||
getAllTasksWithTags,
|
||||
detectIdConflicts,
|
||||
preserveTaskMetadata,
|
||||
MoveTaskError,
|
||||
MOVE_ERROR_CODES
|
||||
};
|
||||
|
||||
@@ -7,7 +7,15 @@
|
||||
function taskExists(tasks, taskId) {
|
||||
// Handle subtask IDs (e.g., "1.2")
|
||||
if (typeof taskId === 'string' && taskId.includes('.')) {
|
||||
const [parentIdStr, subtaskIdStr] = taskId.split('.');
|
||||
const parts = taskId.split('.');
|
||||
// Validate that it's a proper subtask format (parentId.subtaskId)
|
||||
if (parts.length !== 2 || !parts[0] || !parts[1]) {
|
||||
// Invalid format - treat as regular task ID
|
||||
const id = parseInt(taskId, 10);
|
||||
return tasks.some((t) => t.id === id);
|
||||
}
|
||||
|
||||
const [parentIdStr, subtaskIdStr] = parts;
|
||||
const parentId = parseInt(parentIdStr, 10);
|
||||
const subtaskId = parseInt(subtaskIdStr, 10);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user