cispacempt-v2 0.0.4 → 0.0.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "main": "src/index.js",
   "name": "cispacempt-v2",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "Fast CI engine for CodespaceMPT with script stages and file system hooks",
   "author": "argentidev",
   "license": "MIT",

package/src/index.js

@@ -2,6 +2,7 @@ const path = require("path"),
     os = require("os"),
     fs = require("fs"),
     { spawn } = require("child_process"),
+    yaml = require("js-yaml"),
     getCPUUsageSnapshot = function () {
         const cpus = os.cpus();
         return cpus.map(cpu => ({ ...cpu.times }));
@@ -90,6 +91,7 @@ module.exports = {
 
     parse: async function (ciScript, repoName, fileSystem, tmp = true) {
         let errorIn = [];
+        let successIn = [];
         let finalResult = [];
         let timeTaken;
         let combinedExitCode = 0;
@@ -107,6 +109,49 @@ module.exports = {
             });
         };
 
+        const findFileInMap = function (fileSystem, searchFilePath) {
+          const pathParts = searchFilePath.split("/");
+          let currentMap = fileSystem;
+        
+          for (let i = 0; i < pathParts.length; i++) {
+            const part = pathParts[i];
+      
+            if (currentMap[part]) {
+              if (typeof currentMap[part] === "object") {
+                currentMap = currentMap[part];
+              } else {
+                return currentMap[part]; // Return the found file if it exists
+              }
+            } else {
+              return null; // Return null if not found at all
+            }
+          }
+        
+          return null; // Return null if path doesn't exist
+        }
+
+        if (ciScript.include) {
+          for (const includePath of ciScript.include) {
+            const templateContent = findFileInMap(fileSystem, includePath);
+            if (!templateContent) {
+              console.warn(`Included file '${includePath}' not found`);
+              continue;
+            }
+    
+            const includedYaml = yaml.load(templateContent);
+    
+            // Merge included content
+            ciScript.stages = {
+              ...(includedYaml.stages || {}),
+              ...(ciScript.stages || {})
+            };          
+            ciScript.env = {
+              ...(includedYaml.env || {}),
+              ...(ciScript.env || {}),
+            };
+          }
+        }
+
         for (const stage of stages) {
             extensionSystem.runPreExecution(stage.name); // <-- pre execution hook
 
@@ -176,6 +221,7 @@ module.exports = {
                                 !errorIn.includes(stage.name) ? errorIn.push(stage.name) : null;
                             } else {
                                 output += `${result.stdout ? result.stdout : ''}\n`;
+                                !successIn.includes(stage.name) ? successIn.push(stage.name) : null;
                             }
 
                             if (result.exitCode !== 0) {
@@ -189,6 +235,7 @@ module.exports = {
             }
         }
 
+        console.log(successIn, errorIn);
         const finalResultEndTime = Date.now();
         timeTaken = convertMsToSec(finalResultEndTime - startTime);
         const cpuEnd = getCPUUsageSnapshot();
@@ -206,6 +253,7 @@ module.exports = {
                 arch: os.arch(),
             },
             errorIn: errorIn.length > 0 ? errorIn : null,
+            successIn: successIn.length > 0 ? successIn : null,
         };
 
         cleanUpAndRespond(tempDir);