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

package/src/lib/workflow.js

@@ -1,11 +1,15 @@
 const fs = require('fs').promises;
 const path = require('path');
 const { glob } = require('glob');
+const { publishComponent } = require('./api');
 const { getInstanceId, deleteWorkflow } = require('./db');
-const { postWorkflow, activateWorkflow, reinitializeSystem } = require('./api');
+const { getComponentTypes } = require('./vnextConfig');
+const { discoverComponents, findJsonInComponent } = require('./discover');
 
 /**
- * JSON dosyasından key ve version değerlerini alır
+ * Gets key and version values from JSON file
+ * @param {string} jsonPath - JSON file path
+ * @returns {Promise<Object>} Metadata object
  */
 async function getJsonMetadata(jsonPath) {
   const content = await fs.readFile(jsonPath, 'utf8');
@@ -20,11 +24,38 @@ async function getJsonMetadata(jsonPath) {
 }
 
 /**
- * Dosya yolundan flow tipini belirler
+ * Detects component type from file path based on vnext.config.json paths
+ * @param {string} jsonPath - JSON file path
+ * @param {string} projectRoot - Project root folder
+ * @returns {string} Component type (sys-flows, sys-tasks, etc.)
  */
-function detectFlowFromPath(jsonPath) {
+function detectComponentType(jsonPath, projectRoot) {
   const pathLower = jsonPath.toLowerCase();
   
+  try {
+    const componentTypes = getComponentTypes(projectRoot);
+    
+    // Check each component type folder
+    for (const [type, folderName] of Object.entries(componentTypes)) {
+      const folderPattern = `/${folderName.toLowerCase()}/`;
+      if (pathLower.includes(folderPattern)) {
+        // Map to flow type
+        switch (type.toLowerCase()) {
+          case 'workflows': return 'sys-flows';
+          case 'tasks': return 'sys-tasks';
+          case 'schemas': return 'sys-schemas';
+          case 'views': return 'sys-views';
+          case 'functions': return 'sys-functions';
+          case 'extensions': return 'sys-extensions';
+          default: return `sys-${type.toLowerCase()}`;
+        }
+      }
+    }
+  } catch (error) {
+    // Fallback to path-based detection
+  }
+  
+  // Fallback: detect from path directly
   if (pathLower.includes('/workflows/')) return 'sys-flows';
   if (pathLower.includes('/tasks/')) return 'sys-tasks';
   if (pathLower.includes('/schemas/')) return 'sys-schemas';
@@ -36,63 +67,67 @@ function detectFlowFromPath(jsonPath) {
 }
 
 /**
- * Tek bir workflow'u işler (DB'den sil, POST, Activate)
+ * Processes a single component (DB check → delete if exists → publish)
+ * @param {string} jsonPath - JSON file path
+ * @param {Object} dbConfig - Database configuration
+ * @param {string} baseUrl - API base URL
+ * @param {string} projectRoot - Project root folder
+ * @returns {Promise<Object>} Process result
  */
-async function processWorkflow(jsonPath, dbConfig, apiConfig) {
+async function processComponent(jsonPath, dbConfig, baseUrl, projectRoot) {
   const metadata = await getJsonMetadata(jsonPath);
   
   if (!metadata.key || !metadata.version) {
-    throw new Error('JSON\'da key veya version bulunamadı');
+    throw new Error('No key or version found in JSON');
   }
   
-  const flow = metadata.flow || detectFlowFromPath(jsonPath);
+  const componentType = detectComponentType(jsonPath, projectRoot);
+  const flow = metadata.flow || componentType;
   
-  // 1. DB'de var mı kontrol et
-  const instanceId = await getInstanceId(dbConfig, flow, metadata.key, metadata.version);
+  // 1. Check if exists in DB
+  const existingId = await getInstanceId(dbConfig, flow, metadata.key, metadata.version);
   
-  // 2. Varsa sil
-  if (instanceId) {
-    await deleteWorkflow(dbConfig, flow, instanceId);
+  // 2. If exists, delete first
+  let wasDeleted = false;
+  if (existingId) {
+    await deleteWorkflow(dbConfig, flow, existingId);
+    wasDeleted = true;
   }
   
-  // 3. API'ye POST et
-  const apiUrl = apiConfig.baseUrl;
-  const apiVersion = apiConfig.version;
-  
-  const postResult = await postWorkflow(apiUrl, apiVersion, flow, metadata.data);
-  const newInstanceId = postResult.id || postResult.Id;
+  // 3. Publish to API
+  const result = await publishComponent(baseUrl, metadata.data);
   
-  if (!newInstanceId) {
-    throw new Error('API POST başarılı ama instance ID alınamadı');
+  if (!result.success) {
+    throw new Error(result.error);
   }
   
-  // 4. Aktif et
-  await activateWorkflow(apiUrl, apiVersion, flow, newInstanceId, metadata.version);
-  
   return {
     key: metadata.key,
     version: metadata.version,
-    flow: flow,
-    instanceId: newInstanceId,
-    wasDeleted: !!instanceId
+    componentType: componentType,
+    wasDeleted: wasDeleted,
+    success: true
   };
 }
 
 /**
- * Git'te değişen JSON dosyalarını bulur
+ * Finds changed JSON files in Git
+ * Only returns files within PROJECT_ROOT
+ * @param {string} projectRoot - Project root folder
+ * @returns {Promise<string[]>} Changed JSON file paths
  */
 async function getGitChangedJson(projectRoot) {
   const { exec } = require('child_process');
   const util = require('util');
   const execPromise = util.promisify(exec);
-  const fs = require('fs');
+  const fsSync = require('fs');
   
   try {
-    // Git root'u bul
+    // Find git root
     const { stdout: gitRoot } = await execPromise('git rev-parse --show-toplevel', { cwd: projectRoot });
     const gitRootDir = gitRoot.trim();
     
-    // Git status'u git root'tan çalıştır
+    // Run git status from git root
     const { stdout } = await execPromise('git status --porcelain', { cwd: gitRootDir });
     const lines = stdout.split('\n').filter(Boolean);
     
@@ -108,12 +143,13 @@ async function getGitChangedJson(projectRoot) {
         return path.normalize(fullPath);
       })
       .filter(file => {
-        // Workflow JSON'larını filtrele ve sadece project içindekileri al
+        // Filter workflow JSONs and only those in project
         const fileName = path.basename(file);
         return file.endsWith('.json') && 
                !fileName.includes('package') && 
                !fileName.includes('config') &&
-               fs.existsSync(file) &&
+               !fileName.includes('.diagram.') &&
+               fsSync.existsSync(file) &&
                file.startsWith(path.normalize(projectRoot));
       });
     
@@ -124,22 +160,34 @@ async function getGitChangedJson(projectRoot) {
 }
 
 /**
- * Belirli bir component klasöründeki tüm JSON dosyalarını bulur
+ * Finds all JSON files in a component folder
+ * @param {string} componentDir - Component folder
+ * @returns {Promise<string[]>} JSON file paths
  */
 async function findAllJsonInComponent(componentDir) {
   const pattern = path.join(componentDir, '**/*.json');
   const files = await glob(pattern, {
-    ignore: ['**/package*.json', '**/*config*.json', '**/*.diagram.json']
+    ignore: [
+      '**/.meta/**',
+      '**/.meta',
+      '**/*.diagram.json',
+      '**/package*.json',
+      '**/*config*.json'
+    ]
   });
   return files;
 }
 
 /**
- * Tüm component'lerdeki JSON dosyalarını bulur
+ * Finds all JSON files in discovered components ONLY
+ * Does NOT scan folders outside of paths definition
+ * @param {Object} discovered - Discovered component folders
+ * @returns {Promise<string[]>} JSON file paths
  */
 async function findAllJson(discovered) {
   const allJsons = [];
   
+  // Only scan folders that were discovered from paths
   for (const component in discovered) {
     const componentDir = discovered[component];
     if (componentDir) {
@@ -153,10 +201,9 @@ async function findAllJson(discovered) {
 
 module.exports = {
   getJsonMetadata,
-  detectFlowFromPath,
-  processWorkflow,
+  detectComponentType,
+  processComponent,
   getGitChangedJson,
   findAllJsonInComponent,
   findAllJson
 };
-