canvaslms-cli 1.3.3 → 1.4.1

package/lib/interactive.js

@@ -2,9 +2,11 @@
  * Interactive prompt utilities
  */
 
-const readline = require('readline');
-const fs = require('fs');
-const path = require('path');
+import readline from 'readline';
+import fs from 'fs';
+import path from 'path';
+import AdmZip from 'adm-zip';
+import chalk from 'chalk';
 
 /**
  * Create readline interface for user input
@@ -100,37 +102,69 @@ async function selectFromList(rl, items, displayProperty = null, allowCancel = t
   return items[choice - 1];
 }
 
+function getSubfoldersRecursive(startDir = process.cwd()) {
+  const result = [];
+  function walk(dir) {
+    const items = fs.readdirSync(dir);
+    for (const item of items) {
+      const fullPath = path.join(dir, item);
+      try {
+        const stat = fs.statSync(fullPath);
+        if (stat.isDirectory()) {
+          const baseName = path.basename(fullPath);
+          if (['node_modules', '.git', 'dist', 'build'].includes(baseName)) continue;
+          result.push(fullPath);
+          walk(fullPath); // recurse into subdirectory
+        }
+      } catch (err) {
+        // Optionally log: console.warn(`Skipped unreadable folder: ${fullPath}`);
+      }
+    }
+  }
+  walk(startDir);
+  return result;
+}
+
 /**
  * Get files matching a wildcard pattern
  */
 function getFilesMatchingWildcard(pattern, currentDir = process.cwd()) {
   try {
-    const files = fs.readdirSync(currentDir);
-    const matchedFiles = [];
-    
+    // Gather all subfolders
+    const allFolders = [currentDir, ...getSubfoldersRecursive(currentDir)];
+    let allFiles = [];
+    for (const folder of allFolders) {
+      const files = fs.readdirSync(folder).map(f => path.join(folder, f));
+      for (const filePath of files) {
+        try {
+          if (fs.statSync(filePath).isFile()) {
+            allFiles.push(filePath);
+          }
+        } catch (e) {}
+      }
+    }
     // Convert wildcard pattern to regex
     let regexPattern;
-    if (pattern.startsWith('*.')) {
-      // Handle *.extension patterns
+    let matchFullPath = false;
+    if (pattern === '*' || (!pattern.includes('.') && !pattern.includes('/'))) {
+      regexPattern = new RegExp('.*', 'i');
+      matchFullPath = true;
+    } else if (pattern.startsWith('*.')) {
       const extension = pattern.slice(2);
       regexPattern = new RegExp(`\\.${extension.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}$`, 'i');
     } else if (pattern.includes('*')) {
-      // Handle other wildcard patterns
       regexPattern = new RegExp(pattern.replace(/\*/g, '.*').replace(/\?/g, '.'), 'i');
     } else {
-      // Exact match
       regexPattern = new RegExp(`^${pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}$`, 'i');
     }
-    
-    files.forEach(file => {
-      const filePath = path.join(currentDir, file);
-      const stats = fs.statSync(filePath);
-      
-      if (stats.isFile() && regexPattern.test(file)) {
-        matchedFiles.push(filePath);
+    const matchedFiles = allFiles.filter(filePath => {
+      if (matchFullPath) {
+        const relPath = path.relative(currentDir, filePath);
+        return regexPattern.test(relPath);
+      } else {
+        return regexPattern.test(path.basename(filePath));
       }
     });
-    
     return matchedFiles;
   } catch (error) {
     console.error(`Error reading directory: ${error.message}`);
@@ -138,188 +172,202 @@ function getFilesMatchingWildcard(pattern, currentDir = process.cwd()) {
   }
 }
 
+function pad(str, len) {
+  return str + ' '.repeat(Math.max(0, len - str.length));
+}
+
 /**
  * Enhanced file selection with wildcard support
  */
 async function selectFilesImproved(rl, currentDir = process.cwd()) {
   const selectedFiles = [];
-  
-  console.log('\n📁 Enhanced File Selection');
-  console.log('💡 Tips:');
+  console.log(chalk.cyan.bold('\n' + '-'.repeat(50)));
+  console.log(chalk.cyan.bold('File Selection'));
+  console.log(chalk.cyan('-'.repeat(50)));
+  console.log(chalk.yellow('Tips:'));
   console.log('  • Type filename to add individual files');
   console.log('  • Use wildcards: *.html, *.js, *.pdf, etc.');
   console.log('  • Type "browse" to see available files');
   console.log('  • Type "remove" to remove files from selection');
+  console.log('  • Type ".." or "back" to return to previous menu');
   console.log('  • Press Enter with no input to finish selection\n');
-  
   while (true) {
-    // Show current selection
     if (selectedFiles.length > 0) {
-      console.log(`\n📋 Currently selected (${selectedFiles.length} files):`);
+      console.log(chalk.cyan('\n' + '-'.repeat(50)));
+      console.log(chalk.cyan.bold(`Currently selected (${selectedFiles.length} files):`));
       selectedFiles.forEach((file, index) => {
         const stats = fs.statSync(file);
         const size = (stats.size / 1024).toFixed(1) + ' KB';
-        console.log(`  ${index + 1}. ${path.basename(file)} (${size})`);
+        console.log(pad(chalk.white((index + 1) + '.'), 5) + pad(path.basename(file), 35) + chalk.gray(size));
       });
+      console.log(chalk.cyan('-'.repeat(50)));
     }
-    
-    const input = await askQuestion(rl, '\n📎 Add file (or press Enter to finish): ');
-    
-    if (!input.trim()) {
-      // Empty input - finish selection
-      break;
+    const input = await askQuestion(rl, chalk.bold.cyan('\nAdd file (or press Enter to finish): '));
+    if (!input.trim()) break;
+    if (input === '..' || input.toLowerCase() === 'back') {
+      return selectedFiles;
     }
-    
     if (input.toLowerCase() === 'browse') {
-      // Show available files
-      console.log('\n📂 Available files in current directory:');
+      console.log(chalk.cyan('\n' + '-'.repeat(50)));
+      console.log(chalk.cyan.bold('Browsing available files:'));
       try {
-        const files = fs.readdirSync(currentDir);
-        const filteredFiles = files.filter(file => {
-          const filePath = path.join(currentDir, file);
-          const stats = fs.statSync(filePath);
-          return stats.isFile() && 
-                 !file.startsWith('.') && 
-                 !['package.json', 'package-lock.json', 'node_modules'].includes(file);
-        });
-        
-        if (filteredFiles.length === 0) {
-          console.log('  No suitable files found.');
+        const listedFiles = [];
+        function walk(dir) {
+          const entries = fs.readdirSync(dir);
+          for (const entry of entries) {
+            const fullPath = path.join(dir, entry);
+            const relPath = path.relative(currentDir, fullPath);
+            if (['node_modules', '.git', 'dist', 'build'].includes(entry)) continue;
+            try {
+              const stat = fs.statSync(fullPath);
+              if (stat.isDirectory()) {
+                walk(fullPath);
+              } else if (stat.isFile()) {
+                listedFiles.push({ path: fullPath, rel: relPath, size: stat.size });
+              }
+            } catch (e) { continue; }
+          }
+        }
+        walk(currentDir);
+        if (listedFiles.length === 0) {
+          console.log(chalk.red('  No suitable files found.'));
         } else {
-          filteredFiles.forEach((file, index) => {
-            const filePath = path.join(currentDir, file);
-            const stats = fs.statSync(filePath);
-            const size = (stats.size / 1024).toFixed(1) + ' KB';
-            const ext = path.extname(file);
-            const icon = getFileIcon(ext);
-            console.log(`  ${index + 1}. ${icon} ${file} (${size})`);
+          listedFiles.forEach((file, index) => {
+            const sizeKB = (file.size / 1024).toFixed(1);
+            console.log(pad(chalk.white((index + 1) + '.'), 5) + pad(file.rel, 35) + chalk.gray(sizeKB + ' KB'));
           });
         }
       } catch (error) {
-        console.log(`  Error reading directory: ${error.message}`);
+        console.log(chalk.red('  Error reading directory: ' + error.message));
       }
       continue;
     }
-    
     if (input.toLowerCase() === 'remove') {
-      // Remove files from selection
       if (selectedFiles.length === 0) {
-        console.log('❌ No files selected to remove.');
+        console.log(chalk.red('No files selected to remove.'));
         continue;
       }
-      
-      console.log('\nSelect file to remove:');
+      console.log(chalk.cyan('\nSelect file to remove:'));
       selectedFiles.forEach((file, index) => {
-        console.log(`${index + 1}. ${path.basename(file)}`);
+        console.log(pad(chalk.white((index + 1) + '.'), 5) + path.basename(file));
       });
-      
-      const removeChoice = await askQuestion(rl, '\nEnter number to remove (or press Enter to cancel): ');
+      const removeChoice = await askQuestion(rl, chalk.bold.cyan('\nEnter number to remove (or press Enter to cancel): '));
       if (removeChoice.trim()) {
         const removeIndex = parseInt(removeChoice) - 1;
         if (removeIndex >= 0 && removeIndex < selectedFiles.length) {
           const removedFile = selectedFiles.splice(removeIndex, 1)[0];
-          console.log(`✅ Removed: ${path.basename(removedFile)}`);
+          console.log(chalk.green(`Removed: ${path.basename(removedFile)}`));
         } else {
-          console.log('❌ Invalid selection.');
+          console.log(chalk.red('Invalid selection.'));
         }
       }
       continue;
     }
-    
-    // Check if input contains wildcards
-    if (input.includes('*') || input.includes('?')) {
-      const matchedFiles = getFilesMatchingWildcard(input, currentDir);
-      
-      if (matchedFiles.length === 0) {
-        console.log(`❌ No files found matching pattern: ${input}`);
-        continue;
-      }
-      
-      console.log(`\n🎯 Found ${matchedFiles.length} files matching "${input}":`);
-      matchedFiles.forEach((file, index) => {
-        const stats = fs.statSync(file);
-        const size = (stats.size / 1024).toFixed(1) + ' KB';
-        console.log(`  ${index + 1}. ${path.basename(file)} (${size})`);
-      });
-      
-      const confirmAll = await askConfirmation(rl, `Add all ${matchedFiles.length} files?`, true);
-      
-      if (confirmAll) {
-        const newFiles = matchedFiles.filter(file => !selectedFiles.includes(file));
-        selectedFiles.push(...newFiles);
-        console.log(`✅ Added ${newFiles.length} new files (${matchedFiles.length - newFiles.length} were already selected)`);
-      }
-      continue;
-    }
-    
-    // Handle individual file selection
     let filePath = input;
-    
-    // If not absolute path, make it relative to current directory
+    let zipRequested = false;
+    if (filePath.endsWith(' -zip')) {
+      filePath = filePath.slice(0, -5).trim();
+      zipRequested = true;
+    }
     if (!path.isAbsolute(filePath)) {
       filePath = path.join(currentDir, filePath);
     }
-    
     try {
       if (!fs.existsSync(filePath)) {
-        console.log(`❌ File not found: ${input}`);
+        console.log(chalk.red('Error: File not found: ' + input));
         continue;
       }
-      
       const stats = fs.statSync(filePath);
-      if (!stats.isFile()) {
-        console.log(`❌ Not a file: ${input}`);
+      if (zipRequested) {
+        const baseName = path.basename(filePath);
+        const zipName = baseName.replace(/\.[^/.]+$/, '') + '.zip';
+        const zipPath = path.join(currentDir, zipName);
+        const zip = new AdmZip();
+        process.stdout.write(chalk.yellow('Zipping, please wait... '));
+        if (stats.isDirectory()) {
+          zip.addLocalFolder(filePath);
+        } else if (stats.isFile()) {
+          zip.addLocalFile(filePath);
+        } else {
+          console.log(chalk.red('Not a file or folder.'));
+          continue;
+        }
+        zip.writeZip(zipPath);
+        console.log(chalk.green('Done.'));
+        console.log(chalk.green(`Created ZIP: ${zipName}`));
+        if (selectedFiles.includes(zipPath)) {
+          console.log(chalk.yellow(`File already selected: ${zipName}`));
+          continue;
+        }
+        selectedFiles.push(zipPath);
+        const size = (fs.statSync(zipPath).size / 1024).toFixed(1) + ' KB';
+        console.log(chalk.green(`Added: ${zipName} (${size})`));
+        continue;
+      }
+      if (stats.isDirectory()) {
+        const baseName = path.basename(filePath);
+        if (['node_modules', '.git', 'dist', 'build'].includes(baseName)) continue;
+        const collectedFiles = [];
+        function walk(dir) {
+          const entries = fs.readdirSync(dir);
+          for (const entry of entries) {
+            const fullPath = path.join(dir, entry);
+            const stat = fs.statSync(fullPath);
+            if (stat.isDirectory()) {
+              const baseName = path.basename(fullPath);
+              if (['node_modules', '.git', 'dist', 'build'].includes(baseName)) continue;
+              walk(fullPath);
+            } else if (stat.isFile()) {
+              collectedFiles.push(fullPath);
+            }
+          }
+        }
+        walk(filePath);
+        if (collectedFiles.length === 0) {
+          console.log(chalk.yellow(`Folder is empty: ${input}`));
+          continue;
+        }
+        console.log(chalk.cyan(`\nFound ${collectedFiles.length} file(s) in folder "${path.relative(currentDir, filePath)}":`));
+        let totalSize = 0;
+        collectedFiles.forEach((f, i) => {
+          const stat = fs.statSync(f);
+          totalSize += stat.size;
+          const relativePath = path.relative(currentDir, f);
+          console.log(pad(chalk.white((i + 1) + '.'), 5) + pad(relativePath, 35) + chalk.gray((stat.size / 1024).toFixed(1) + ' KB'));
+        });
+        console.log(chalk.cyan('-'.repeat(50)));
+        console.log(chalk.cyan(`Total size: ${(totalSize / 1024).toFixed(1)} KB`));
+        const confirmFolder = await askConfirmation(rl, chalk.bold.cyan(`Add all ${collectedFiles.length} files from this folder?`), true);
+        if (confirmFolder) {
+          const newFiles = collectedFiles.filter(f => !selectedFiles.includes(f));
+          selectedFiles.push(...newFiles);
+          console.log(chalk.green(`Added ${newFiles.length} new files (${collectedFiles.length - newFiles.length} already selected)`));
+        }
         continue;
       }
-      
       if (selectedFiles.includes(filePath)) {
-        console.log(`⚠️  File already selected: ${path.basename(filePath)}`);
+        console.log(chalk.yellow(`File already selected: ${path.basename(filePath)}`));
         continue;
       }
-      
       selectedFiles.push(filePath);
       const size = (stats.size / 1024).toFixed(1) + ' KB';
-      console.log(`✅ Added: ${path.basename(filePath)} (${size})`);
-      
+      console.log(chalk.green(`Added: ${path.basename(filePath)} (${size})`));
     } catch (error) {
-      console.log(`❌ Error accessing file: ${error.message}`);
+      console.log(chalk.red('Error accessing file: ' + error.message));
     }
   }
-  
   return selectedFiles;
 }
 
-/**
- * Get file icon based on extension
- */
-function getFileIcon(extension) {
-  const iconMap = {
-    '.js': '📜',
-    '.html': '🌐',
-    '.css': '🎨',
-    '.pdf': '📄',
-    '.doc': '📝',
-    '.docx': '📝',
-    '.txt': '📄',
-    '.md': '📖',
-    '.json': '⚙️',
-    '.xml': '📋',
-    '.zip': '📦',
-    '.png': '🖼️',
-    '.jpg': '🖼️',
-    '.jpeg': '🖼️',
-    '.gif': '🖼️'
-  };
-  
-  return iconMap[extension.toLowerCase()] || '📎';
-}
 
-module.exports = {
+export {
   createReadlineInterface,
   askQuestion,
   askQuestionWithValidation,
   askConfirmation,
   selectFromList,
   selectFilesImproved,
-  getFilesMatchingWildcard
-};
+  getFilesMatchingWildcard,
+  getSubfoldersRecursive,
+  pad
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canvaslms-cli",
-  "version": "1.3.3",
+  "version": "1.4.1",
   "description": "A command line tool for interacting with Canvas LMS API",
   "keywords": [
     "canvas",
@@ -24,7 +24,7 @@
     "name": "Your Name",
     "email": "your.email@example.com"
   },
-  "type": "commonjs",
+  "type": "module",
   "main": "src/index.js",
   "bin": {
     "canvaslms-cli": "src/index.js",
@@ -47,7 +47,9 @@
     "postinstall": "echo \"Canvas CLI installed successfully! Run 'canvas config' to get started.\""
   },
   "dependencies": {
+    "adm-zip": "^0.5.16",
     "axios": "^1.6.0",
+    "chalk": "^5.4.1",
     "commander": "^11.1.0",
     "form-data": "^4.0.3"
   },

package/src/index.js

@@ -7,18 +7,15 @@
  * @version 1.0.0
  */
 
-const { Command } = require('commander');
-
-// Import command handlers
-const { listCourses } = require('../commands/list');
-const { showConfig, setupConfig, editConfig, showConfigPath, deleteConfigFile } = require('../commands/config');
-const { listAssignments } = require('../commands/assignments');
-const { showGrades } = require('../commands/grades');
-const { showAnnouncements } = require('../commands/announcements');
-const { showProfile } = require('../commands/profile');
-const { submitAssignment } = require('../commands/submit');
-const { createQueryHandler } = require('../commands/api');
-const { requireConfig } = require('../lib/config-validator');
+import { Command } from 'commander';
+import { listCourses } from '../commands/list.js';
+import { showConfig, setupConfig, editConfig, showConfigPath, deleteConfigFile } from '../commands/config.js';
+import { listAssignments } from '../commands/assignments.js';
+import { showGrades } from '../commands/grades.js';
+import { showAnnouncements } from '../commands/announcements.js';
+import { showProfile } from '../commands/profile.js';
+import { submitAssignment } from '../commands/submit.js';
+import { requireConfig } from '../lib/config-validator.js';
 
 const program = new Command();
 
@@ -28,25 +25,6 @@ program
   .description('Canvas API Command Line Tool')
   .version('1.3.3');
 
-// Raw API commands
-function createQueryCommand(method) {
-  return program
-    .command(method)
-    .alias(method === 'query' ? 'q' : method.charAt(0))
-    .argument('<endpoint>', 'Canvas API endpoint to query')
-    .option('-q, --query <param>', 'Query parameter (can be used multiple times)', [])
-    .option('-d, --data <data>', 'Request body (JSON string or @filename)')
-    .description(`${method.toUpperCase()} request to Canvas API`)
-    .action(requireConfig(createQueryHandler(method)));
-}
-
-// Create raw API commands
-createQueryCommand('get');
-createQueryCommand('post');
-createQueryCommand('put');
-createQueryCommand('delete');
-createQueryCommand('query');
-
 // List command to show enrolled courses
 program
   .command('list')
@@ -54,42 +32,42 @@ program
   .description('List starred courses (default) or all courses with -a')
   .option('-a, --all', 'Show all enrolled courses instead of just starred ones')
   .option('-v, --verbose', 'Show detailed course information')
-  .action(requireConfig(listCourses));
+  .action((...args) => requireConfig(listCourses)(...args));
 
 // Config command with subcommands
 const configCommand = program
   .command('config')
   .description('Manage Canvas CLI configuration')
-  .action(showConfig); // Default action when no subcommand is provided
+  .action((...args) => showConfig(...args)); // Default action when no subcommand is provided
 
 configCommand
   .command('show')
   .alias('status')
   .description('Show current configuration')
-  .action(showConfig);
+  .action((...args) => showConfig(...args));
 
 configCommand
   .command('setup')
   .alias('init')
   .description('Interactive configuration setup')
-  .action(setupConfig);
+  .action((...args) => setupConfig(...args));
 
 configCommand
   .command('edit')
   .alias('update')
   .description('Edit existing configuration')
-  .action(editConfig);
+  .action((...args) => editConfig(...args));
 
 configCommand
   .command('path')
   .description('Show configuration file path')
-  .action(showConfigPath);
+  .action((...args) => showConfigPath(...args));
 
 configCommand
   .command('delete')
   .alias('remove')
   .description('Delete configuration file')
-  .action(deleteConfigFile);
+  .action((...args) => deleteConfigFile(...args));
 
 // Assignments command to show assignments for a course
 program
@@ -100,7 +78,7 @@ program
   .option('-v, --verbose', 'Show detailed assignment information')
   .option('-s, --submitted', 'Only show submitted assignments')
   .option('-p, --pending', 'Only show pending assignments')
-  .action(requireConfig(listAssignments));
+  .action((...args) => requireConfig(listAssignments)(...args));
 
 // Grades command to show grades
 program
@@ -109,16 +87,16 @@ program
   .description('Show grades for all courses or a specific course')
   .argument('[course-id]', 'Optional course ID to get grades for specific course')
   .option('-v, --verbose', 'Show detailed grade information')
-  .action(requireConfig(showGrades));
+  .action((...args) => requireConfig(showGrades)(...args));
 
 // Announcements command
 program
   .command('announcements')
-  .alias('announce')
-  .description('Show recent announcements')
+  .alias('an')
+  .description('Show recent announcements (interactive if no course-id)')
   .argument('[course-id]', 'Optional course ID to get announcements for specific course')
   .option('-l, --limit <number>', 'Number of announcements to show', '5')
-  .action(requireConfig(showAnnouncements));
+  .action((...args) => requireConfig(showAnnouncements)(...args));
 
 // Profile command
 program
@@ -126,17 +104,17 @@ program
   .alias('me')
   .description('Show current user profile information')
   .option('-v, --verbose', 'Show detailed profile information')
-  .action(requireConfig(showProfile));
+  .action((...args) => requireConfig(showProfile)(...args));
 
-// Submit command for interactive assignment submission
+// Submit command for interactive assignment submission (always list files in current directory)
 program
   .command('submit')
   .alias('sub')
   .description('Interactively submit one or multiple files to an assignment')
   .option('-c, --course <course-id>', 'Skip course selection and use specific course ID')
-  .option('-a, --assignment <assignment-id>', 'Skip assignment selection and use specific assignment ID')
   .option('-f, --file <file-path>', 'Skip file selection and use specific file path')
-  .action(requireConfig(submitAssignment));
+  .option('-a, --all', 'Show all enrolled courses instead of just starred ones')
+  .action((...args) => requireConfig(submitAssignment)(...args));
 
 // Parse command line arguments
 program.parse();