@burgan-tech/vnext-workflow-cli 1.0.0 → 1.0.2

package/src/commands/csx.js

@@ -2,83 +2,164 @@ const chalk = require('chalk');
 const ora = require('ora');
 const path = require('path');
 const config = require('../lib/config');
-const {
-  processCsxFile,
-  getGitChangedCsx,
-  findAllCsx
-} = require('../lib/csx');
+const { getDomain } = require('../lib/vnextConfig');
+const { processCsxFile, getGitChangedCsx, findAllCsx } = require('../lib/csx');
+
+// Logging helpers
+const LOG = {
+  separator: () => console.log(chalk.cyan('═'.repeat(60))),
+  subSeparator: () => console.log(chalk.cyan('─'.repeat(60))),
+  header: (text) => {
+    console.log();
+    LOG.separator();
+    console.log(chalk.cyan.bold(`  ${text}`));
+    LOG.separator();
+  },
+  success: (text) => console.log(chalk.green(`  ✓ ${text}`)),
+  error: (text) => console.log(chalk.red(`  ✗ ${text}`)),
+  warning: (text) => console.log(chalk.yellow(`  ⚠ ${text}`)),
+  info: (text) => console.log(chalk.dim(`  ○ ${text}`)),
+  component: (type, name, status, detail = '') => {
+    const typeLabel = chalk.cyan(`[${type}]`);
+    const nameLabel = chalk.white(name);
+    if (status === 'success') {
+      console.log(`  ${typeLabel} ${chalk.green('✓')} ${nameLabel} ${chalk.dim(detail)}`);
+    } else if (status === 'error') {
+      console.log(`  ${typeLabel} ${chalk.red('✗')} ${nameLabel}`);
+      if (detail) console.log(chalk.red(`    └─ ${detail}`));
+    } else if (status === 'skip') {
+      console.log(`  ${typeLabel} ${chalk.dim('○')} ${nameLabel} ${chalk.dim(detail)}`);
+    }
+  }
+};
 
 async function csxCommand(options) {
-  console.log(chalk.cyan.bold('\n🔄 CSX Güncelleme\n'));
+  LOG.header('CSX UPDATE');
   
   const projectRoot = config.get('PROJECT_ROOT');
+  
+  // Check domain
+  try {
+    const domain = getDomain(projectRoot);
+    console.log(chalk.dim(`  Domain: ${domain}`));
+    console.log();
+  } catch (error) {
+    LOG.error(`Failed to read vnext.config.json: ${error.message}`);
+    return;
+  }
+  
   let csxFiles = [];
   
-  // Hangi CSX dosyalarını işleyeceğiz?
+  // Which CSX files to process?
   if (options.file) {
-    // Belirli dosya
+    // Specific file
     const filePath = path.isAbsolute(options.file) 
       ? options.file 
       : path.join(projectRoot, options.file);
     csxFiles = [filePath];
-    console.log(chalk.blue(`Dosya: ${path.basename(filePath)}\n`));
+    console.log(chalk.blue(`  File: ${path.basename(filePath)}\n`));
   } else if (options.all) {
-    // Tüm CSX dosyaları
-    const spinner = ora('Tüm CSX dosyaları bulunuyor...').start();
-    csxFiles = await findAllCsx(projectRoot);
-    spinner.succeed(chalk.green(`${csxFiles.length} CSX dosyası bulundu`));
+    // All CSX files
+    const spinner = ora('  Finding all CSX files...').start();
+    try {
+      csxFiles = await findAllCsx(projectRoot);
+      spinner.succeed(chalk.green(`  ${csxFiles.length} CSX files found`));
+    } catch (error) {
+      spinner.fail(chalk.red(`  CSX scan error: ${error.message}`));
+      return;
+    }
   } else {
-    // Git'te değişenler (default)
-    const spinner = ora('Git\'te değişen CSX dosyaları aranıyor...').start();
-    csxFiles = await getGitChangedCsx(projectRoot);
-    
-    if (csxFiles.length === 0) {
-      spinner.info(chalk.yellow('Git\'te değişen CSX dosyası bulunamadı'));
-      console.log(chalk.green('\n✓ Tüm CSX dosyaları güncel\n'));
+    // Changed files in Git (default)
+    const spinner = ora('  Finding changed CSX files in Git...').start();
+    try {
+      csxFiles = await getGitChangedCsx(projectRoot);
+      
+      if (csxFiles.length === 0) {
+        spinner.info(chalk.yellow('  No changed CSX files in Git'));
+        console.log(chalk.green('\n  ✓ All CSX files up to date\n'));
+        return;
+      }
+      
+      spinner.succeed(chalk.green(`  ${csxFiles.length} changed CSX files found`));
+    } catch (error) {
+      spinner.fail(chalk.red(`  CSX scan error: ${error.message}`));
       return;
     }
-    
-    spinner.succeed(chalk.green(`${csxFiles.length} değişen CSX dosyası bulundu`));
   }
   
-  // Her CSX dosyasını işle
-  let successCount = 0;
-  let failCount = 0;
+  // Process each CSX file
+  const results = { success: 0, failed: 0, errors: [] };
+  const updatedFiles = [];
+  
+  console.log(chalk.blue('\n  Writing CSX files to JSONs...\n'));
   
-  console.log();
   for (const csxFile of csxFiles) {
     const fileName = path.basename(csxFile);
-    const spinner = ora(`İşleniyor: ${fileName}`).start();
     
     try {
       const result = await processCsxFile(csxFile, projectRoot);
       
       if (result.success) {
-        spinner.succeed(chalk.green(`✓ ${fileName} → ${result.updatedCount} JSON güncellendi`));
-        successCount++;
+        LOG.component('CSX', fileName, 'success', `→ ${result.updatedJsonCount} JSON, ${result.totalUpdates} refs`);
+        results.success++;
+        updatedFiles.push({
+          file: fileName,
+          jsonCount: result.updatedJsonCount,
+          totalUpdates: result.totalUpdates,
+          jsonFiles: result.jsonFiles
+        });
       } else {
-        spinner.fail(chalk.red(`✗ ${fileName} → ${result.message}`));
-        failCount++;
+        LOG.component('CSX', fileName, 'skip', result.message);
       }
     } catch (error) {
-      spinner.fail(chalk.red(`✗ ${fileName} → Hata: ${error.message}`));
-      failCount++;
+      LOG.component('CSX', fileName, 'error', error.message);
+      results.failed++;
+      results.errors.push({ file: fileName, error: error.message });
+    }
+  }
+  
+  // SUMMARY REPORT
+  LOG.header('CSX UPDATE SUMMARY');
+  
+  // Results
+  console.log(chalk.white.bold('\n  Results:\n'));
+  
+  const successLabel = results.success > 0 ? chalk.green(`${results.success} success`) : chalk.dim('0 success');
+  const failedLabel = results.failed > 0 ? chalk.red(`, ${results.failed} failed`) : '';
+  console.log(`  ${chalk.cyan('CSX Files'.padEnd(16))} : ${successLabel}${failedLabel}`);
+  
+  // Updated JSON details
+  if (updatedFiles.length > 0) {
+    console.log();
+    LOG.subSeparator();
+    console.log(chalk.white.bold('\n  Updated JSON Files:\n'));
+    
+    for (const item of updatedFiles) {
+      console.log(chalk.green(`  ${item.file}:`));
+      for (const json of item.jsonFiles) {
+        console.log(chalk.dim(`    └─ ${json.file} (${json.updates} refs)`));
+      }
     }
   }
   
-  // Özet
-  console.log();
-  console.log(chalk.cyan('─'.repeat(50)));
-  console.log(chalk.white(`Toplam: ${csxFiles.length} dosya`));
-  console.log(chalk.green(`✓ Başarılı: ${successCount}`));
-  if (failCount > 0) {
-    console.log(chalk.red(`✗ Başarısız: ${failCount}`));
+  // Errors
+  if (results.errors.length > 0) {
+    console.log();
+    LOG.subSeparator();
+    console.log(chalk.red.bold('\n  ERRORS:\n'));
+    
+    for (const err of results.errors) {
+      console.log(chalk.red(`  [CSX] ${err.file}`));
+      console.log(chalk.dim(`    └─ ${err.error}`));
+    }
   }
-  console.log(chalk.cyan('─'.repeat(50)));
-  console.log();
   
-  if (successCount > 0) {
-    console.log(chalk.green.bold('✓ CSX güncelleme tamamlandı\n'));
+  LOG.separator();
+  
+  if (results.success > 0 && results.failed === 0) {
+    console.log(chalk.green.bold('\n  ✓ CSX update completed\n'));
+  } else if (results.failed > 0) {
+    console.log(chalk.yellow.bold(`\n  ⚠ CSX update completed (${results.failed} errors)\n`));
   }
 }
 

package/src/commands/reset.js

@@ -1,161 +1,279 @@
 const chalk = require('chalk');
 const ora = require('ora');
 const inquirer = require('inquirer');
+const path = require('path');
+const { glob } = require('glob');
 const config = require('../lib/config');
 const { discoverComponents } = require('../lib/discover');
-const { processWorkflow, findAllJson } = require('../lib/workflow');
-const { reinitializeSystem } = require('../lib/api');
+const { getDomain, getComponentTypes } = require('../lib/vnextConfig');
+const { getJsonMetadata, findAllJson, detectComponentType } = require('../lib/workflow');
+const { publishComponent, reinitializeSystem } = require('../lib/api');
+const { getInstanceId, deleteWorkflow } = require('../lib/db');
+
+// Logging helpers
+const LOG = {
+  separator: () => console.log(chalk.cyan('═'.repeat(60))),
+  subSeparator: () => console.log(chalk.cyan('─'.repeat(60))),
+  header: (text) => {
+    console.log();
+    LOG.separator();
+    console.log(chalk.cyan.bold(`  ${text}`));
+    LOG.separator();
+  },
+  success: (text) => console.log(chalk.green(`  ✓ ${text}`)),
+  error: (text) => console.log(chalk.red(`  ✗ ${text}`)),
+  warning: (text) => console.log(chalk.yellow(`  ⚠ ${text}`)),
+  info: (text) => console.log(chalk.dim(`  ○ ${text}`)),
+  component: (type, name, status, detail = '') => {
+    const typeLabel = chalk.cyan(`[${type}]`);
+    const nameLabel = chalk.white(name);
+    if (status === 'success') {
+      console.log(`  ${typeLabel} ${chalk.green('✓')} ${nameLabel} ${chalk.dim(detail)}`);
+    } else if (status === 'error') {
+      console.log(`  ${typeLabel} ${chalk.red('✗')} ${nameLabel}`);
+      if (detail) console.log(chalk.red(`    └─ ${detail}`));
+    } else if (status === 'skip') {
+      console.log(`  ${typeLabel} ${chalk.dim('○')} ${nameLabel} ${chalk.dim(detail)}`);
+    }
+  }
+};
 
 async function resetCommand(options) {
-  console.log(chalk.cyan.bold('\n🔄 Workflow Reset (Force Update)\n'));
+  LOG.header('COMPONENT RESET (Force Update)');
   
   const projectRoot = config.get('PROJECT_ROOT');
-  const autoDiscover = config.get('AUTO_DISCOVER');
+  
+  // Get domain from vnext.config.json
+  let domain, componentTypes;
+  try {
+    domain = getDomain(projectRoot);
+    componentTypes = getComponentTypes(projectRoot);
+  } catch (error) {
+    LOG.error(`Failed to read vnext.config.json: ${error.message}`);
+    return;
+  }
   
   // DB Config
+  const useDockerValue = config.get('USE_DOCKER');
   const dbConfig = {
     host: config.get('DB_HOST'),
     port: config.get('DB_PORT'),
     database: config.get('DB_NAME'),
     user: config.get('DB_USER'),
     password: config.get('DB_PASSWORD'),
-    useDocker: config.get('USE_DOCKER'),
+    useDocker: useDockerValue === true || useDockerValue === 'true',
     dockerContainer: config.get('DOCKER_POSTGRES_CONTAINER')
   };
   
   // API Config
   const apiConfig = {
     baseUrl: config.get('API_BASE_URL'),
-    version: config.get('API_VERSION')
+    version: config.get('API_VERSION'),
+    domain: domain
   };
   
-  // Klasörleri keşfet
-  const spinner = ora('Klasörler taranıyor...').start();
-  const discovered = await discoverComponents(projectRoot);
-  spinner.succeed(chalk.green('Klasörler bulundu'));
-  
-  // Seçenekler
-  const choices = [
-    { name: '🔵 Workflows (sys-flows)', value: 'Workflows' },
-    { name: '📋 Tasks (sys-tasks)', value: 'Tasks' },
-    { name: '📊 Schemas (sys-schemas)', value: 'Schemas' },
-    { name: '👁️  Views (sys-views)', value: 'Views' },
-    { name: '⚙️  Functions (sys-functions)', value: 'Functions' },
-    { name: '🔌 Extensions (sys-extensions)', value: 'Extensions' },
-    new inquirer.Separator(),
-    { name: '🔴 TÜMÜ (Tüm klasörler)', value: 'ALL' }
-  ];
-  
-  // Kullanıcıdan seç
+  console.log(chalk.dim(`  Domain: ${domain}`));
+  console.log(chalk.dim(`  API: ${apiConfig.baseUrl}`));
+  console.log();
+  
+  // Discover folders
+  const spinner = ora('  Scanning folders...').start();
+  let discovered;
+  try {
+    discovered = await discoverComponents(projectRoot);
+    spinner.succeed(chalk.green('  Folders discovered'));
+  } catch (error) {
+    spinner.fail(chalk.red(`  Folder scan error: ${error.message}`));
+    return;
+  }
+  
+  // Build choices dynamically
+  const choices = [];
+  for (const [type, folderName] of Object.entries(componentTypes)) {
+    if (discovered[type]) {
+      choices.push({ name: `${type} (${folderName}/)`, value: type });
+    }
+  }
+  
+  choices.push(new inquirer.Separator());
+  choices.push({ name: 'ALL (All folders)', value: 'ALL' });
+  
+  // User selection
   const { selected } = await inquirer.prompt([{
     type: 'list',
     name: 'selected',
-    message: 'Hangi klasör resetlensin?',
+    message: 'Which folder to reset?',
     choices: choices
   }]);
   
-  // Dosyaları bul
+  // Find files
   let jsonFiles = [];
   
   if (selected === 'ALL') {
-    jsonFiles = await findAllJson(discovered);
+    const files = await findAllJson(discovered);
+    jsonFiles = files.map(f => ({
+      path: f,
+      type: detectComponentType(f, projectRoot),
+      fileName: path.basename(f)
+    }));
   } else {
     const dir = discovered[selected];
     if (!dir) {
-      console.log(chalk.red(`\n✗ ${selected} klasörü bulunamadı\n`));
+      LOG.error(`${selected} folder not found`);
       return;
     }
     
-    // Sadece bu klasördeki JSON'ları bul
-    const fs = require('fs').promises;
-    const path = require('path');
-    const { glob } = require('glob');
-    
+    // Find JSONs in this folder only
     const pattern = path.join(dir, '**/*.json');
-    jsonFiles = await glob(pattern);
+    const files = await glob(pattern, {
+      ignore: [
+        '**/.meta/**',
+        '**/.meta',
+        '**/*.diagram.json',
+        '**/package*.json',
+        '**/*config*.json'
+      ]
+    });
+    
+    jsonFiles = files.map(f => ({
+      path: f,
+      type: selected,
+      fileName: path.basename(f)
+    }));
   }
   
   if (jsonFiles.length === 0) {
-    console.log(chalk.yellow('\n⚠ JSON dosyası bulunamadı\n'));
+    LOG.warning('No JSON files found');
+    console.log();
     return;
   }
   
-  // Son onay
-  console.log(chalk.yellow(`\n⚠️  ${jsonFiles.length} workflow resetlenecek (DB'den silinip tekrar eklenecek)!\n`));
+  // Final confirmation
+  LOG.warning(`${jsonFiles.length} components will be reset!`);
+  console.log();
   
   const { confirm } = await inquirer.prompt([{
     type: 'confirm',
     name: 'confirm',
-    message: 'Devam edilsin mi?',
+    message: 'Continue?',
     default: false
   }]);
   
   if (!confirm) {
-    console.log(chalk.yellow('\nİşlem iptal edildi.\n'));
+    LOG.warning('Operation cancelled.');
+    console.log();
     return;
   }
   
-  // İşle
-  let successCount = 0;
-  let failCount = 0;
+  // Group by component type
+  const componentStats = {};
+  const errors = [];
   
-  console.log();
-  for (const jsonFile of jsonFiles) {
-    const fileName = require('path').basename(jsonFile);
-    const spinner = ora(`İşleniyor: ${fileName}`).start();
+  console.log(chalk.blue('\n  Resetting components...\n'));
+  
+  for (const jsonInfo of jsonFiles) {
+    const { path: jsonPath, type, fileName } = jsonInfo;
+    
+    // Initialize stats
+    if (!componentStats[type]) {
+      componentStats[type] = { success: 0, failed: 0, skipped: 0, deleted: 0 };
+    }
     
     try {
-      const result = await processWorkflow(jsonFile, dbConfig, apiConfig);
+      const metadata = await getJsonMetadata(jsonPath);
       
-      const status = result.wasDeleted ? 'resetlendi' : 'oluşturuldu';
-      spinner.succeed(chalk.green(`✓ ${fileName} → ${status}`));
-      successCount++;
-    } catch (error) {
-      let errorMsg = error.message;
-      if (error.response?.data) {
-        if (typeof error.response.data === 'string') {
-          errorMsg = error.response.data;
-        } else if (error.response.data.error?.message) {
-          errorMsg = error.response.data.error.message;
-        } else if (error.response.data.message) {
-          errorMsg = error.response.data.message;
-        } else {
-          errorMsg = JSON.stringify(error.response.data);
-        }
+      if (!metadata.key || !metadata.version) {
+        LOG.component(type, fileName, 'skip', 'no key/version');
+        componentStats[type].skipped++;
+        continue;
+      }
+      
+      // Detect flow type
+      const flow = metadata.flow || detectComponentType(jsonPath, projectRoot);
+      
+      // Check if exists in DB
+      const existingId = await getInstanceId(dbConfig, flow, metadata.key, metadata.version);
+      
+      // If exists, delete first (force reset)
+      let wasDeleted = false;
+      if (existingId) {
+        await deleteWorkflow(dbConfig, flow, existingId);
+        wasDeleted = true;
+        componentStats[type].deleted++;
       }
-      spinner.fail(chalk.red(`✗ ${fileName} → ${errorMsg}`));
-      failCount++;
+      
+      // Publish to API
+      const result = await publishComponent(apiConfig.baseUrl, metadata.data);
+      
+      if (result.success) {
+        const action = wasDeleted ? 'reset' : 'created';
+        LOG.component(type, fileName, 'success', `→ ${action}`);
+        componentStats[type].success++;
+      } else {
+        LOG.component(type, fileName, 'error', result.error);
+        componentStats[type].failed++;
+        errors.push({ type, file: fileName, error: result.error });
+      }
+    } catch (error) {
+      const errorMsg = error.message || 'Unknown error';
+      LOG.component(type, fileName, 'error', errorMsg);
+      componentStats[type].failed++;
+      errors.push({ type, file: fileName, error: errorMsg });
     }
   }
   
   // Re-initialize
-  if (successCount > 0) {
+  const totalSuccess = Object.values(componentStats).reduce((sum, s) => sum + s.success, 0);
+  
+  if (totalSuccess > 0) {
     console.log();
-    const reinitSpinner = ora('Sistem yeniden başlatılıyor...').start();
+    const reinitSpinner = ora('  Re-initializing system...').start();
     const reinitSuccess = await reinitializeSystem(apiConfig.baseUrl, apiConfig.version);
     
     if (reinitSuccess) {
-      reinitSpinner.succeed(chalk.green('✓ Sistem yenilendi'));
+      reinitSpinner.succeed(chalk.green('  System re-initialized'));
     } else {
-      reinitSpinner.warn(chalk.yellow('⚠ Sistem yenilenemedi (devam edildi)'));
+      reinitSpinner.warn(chalk.yellow('  System re-initialization failed (continuing)'));
     }
   }
   
-  // Özet
-  console.log();
-  console.log(chalk.cyan('═'.repeat(50)));
-  console.log(chalk.white(`Toplam: ${jsonFiles.length} dosya`));
-  console.log(chalk.green(`✓ Başarılı: ${successCount}`));
-  if (failCount > 0) {
-    console.log(chalk.red(`✗ Başarısız: ${failCount}`));
+  // SUMMARY REPORT
+  LOG.header('RESET SUMMARY');
+  
+  // Component statistics
+  console.log(chalk.white.bold('\n  Component Reset Results:\n'));
+  
+  for (const [type, stats] of Object.entries(componentStats)) {
+    const successLabel = stats.success > 0 ? chalk.green(`${stats.success} reset`) : '';
+    const deletedLabel = stats.deleted > 0 ? chalk.yellow(`${stats.deleted} deleted`) : '';
+    const failedLabel = stats.failed > 0 ? chalk.red(`${stats.failed} failed`) : '';
+    const skippedLabel = stats.skipped > 0 ? chalk.dim(`${stats.skipped} skipped`) : '';
+    
+    const parts = [successLabel, deletedLabel, failedLabel, skippedLabel].filter(Boolean);
+    console.log(`  ${chalk.cyan(type.padEnd(12))} : ${parts.join(', ') || chalk.dim('0')}`);
+  }
+  
+  // Errors
+  if (errors.length > 0) {
+    console.log();
+    LOG.subSeparator();
+    console.log(chalk.red.bold('\n  ERRORS:\n'));
+    
+    for (const err of errors) {
+      console.log(chalk.red(`  [${err.type}] ${err.file}`));
+      console.log(chalk.dim(`    └─ ${err.error}`));
+    }
   }
-  console.log(chalk.cyan('═'.repeat(50)));
-  console.log();
   
-  if (successCount > 0) {
-    console.log(chalk.green.bold('✓ Reset tamamlandı\n'));
+  LOG.separator();
+  
+  const totalFailed = Object.values(componentStats).reduce((sum, s) => sum + s.failed, 0);
+  
+  if (totalSuccess > 0 && totalFailed === 0) {
+    console.log(chalk.green.bold('\n  ✓ Reset completed\n'));
+  } else if (totalFailed > 0) {
+    console.log(chalk.yellow.bold(`\n  ⚠ Reset completed (${totalFailed} errors)\n`));
   }
 }
 
 module.exports = resetCommand;
-