scai 0.1.100 → 0.1.101

package/dist/pipeline/modules/preserveCodeModule.js

@@ -22,29 +22,27 @@ export const preserveCodeModule = {
             // --- Single-line comment ---
             for (const s of syntax.singleLine) {
                 if (trimmed.startsWith(s))
-                    return line; // return actual line
+                    return "comment";
             }
             // --- Multi-line comment ---
             for (const { start, end } of syntax.multiLine) {
                 if (!inBlockComment) {
                     if (trimmed.startsWith(start) && trimmed.includes(end)) {
-                        return line; // entire block on a single line
+                        return "comment"; // entire block on one line
                     }
                     if (trimmed.startsWith(start)) {
                         inBlockComment = true;
                         blockLines = [line];
-                        return line; // start of multi-line block
+                        return ""; // wait until block ends
                     }
                 }
                 else {
                     blockLines.push(line);
                     if (trimmed.includes(end)) {
                         inBlockComment = false;
-                        const fullBlock = blockLines.join("\n");
-                        blockLines = [];
-                        return fullBlock; // return entire multi-line block
+                        return "comment"; // end of block
                     }
-                    return ""; // middle lines, wait until block ends
+                    return ""; // inside block
                 }
             }
             return "code";
@@ -55,9 +53,9 @@ export const preserveCodeModule = {
             let commentBuffer = [];
             for (const line of lines) {
                 const type = classifyLine(line);
-                if (type && type !== "code") {
-                    // Collect comment lines
-                    commentBuffer.push(type.trim());
+                if (type === "comment") {
+                    // Collect full comment line
+                    commentBuffer.push(line);
                 }
                 else if (type === "code") {
                     // Flush buffer when hitting code
@@ -65,8 +63,7 @@ export const preserveCodeModule = {
                         const key = line.trim().toLowerCase();
                         if (!map.has(key))
                             map.set(key, new Set());
-                        // Join consecutive comments into one block
-                        const commentBlock = commentBuffer.join("\n").toLowerCase();
+                        const commentBlock = commentBuffer.map(l => l.trimEnd()).join("\n").toLowerCase();
                         map.get(key).add(commentBlock);
                         commentBuffer = [];
                     }
@@ -77,7 +74,7 @@ export const preserveCodeModule = {
                 const key = "";
                 if (!map.has(key))
                     map.set(key, new Set());
-                const commentBlock = commentBuffer.join("\n").toLowerCase();
+                const commentBlock = commentBuffer.map(l => l.trimEnd()).join("\n").toLowerCase();
                 map.get(key).add(commentBlock);
             }
             return map;
@@ -120,18 +117,32 @@ export const preserveCodeModule = {
         console.log(chalk.bold.blue("\n=== LINE CLASSIFICATION (original) ==="));
         origLines.forEach((line, i) => {
             const type = classifyLine(line);
-            const colored = type === "code" ? chalk.green(line) : chalk.yellow(line);
+            const colored = type === "code"
+                ? chalk.green(line)
+                : type === "comment"
+                    ? chalk.yellow(line)
+                    : chalk.gray(line); // "" means middle of block
             console.log(`${i + 1}: ${colored} ${chalk.gray(`[${type}]`)}`);
         });
         console.log(chalk.bold.blue("\n=== LINE CLASSIFICATION (model) ==="));
         newLines.forEach((line, i) => {
             const type = classifyLine(line);
-            const colored = type === "code" ? chalk.green(line) : chalk.yellow(line);
+            const colored = type === "code"
+                ? chalk.green(line)
+                : type === "comment"
+                    ? chalk.yellow(line)
+                    : chalk.gray(line);
             console.log(`${i + 1}: ${colored} ${chalk.gray(`[${type}]`)}`);
         });
         console.log(chalk.bold.blue("\n=== FIXED CONTENT ==="));
         fixedLines.forEach((line, i) => {
-            const type = classifyLine(line);
+            // classifyLine might not be ideal here since fixedLines are final
+            // so we treat anything starting with a comment marker as "comment"
+            const trimmed = line.trimStart();
+            const type = syntax.singleLine.some(s => trimmed.startsWith(s)) ||
+                syntax.multiLine.some(({ start }) => trimmed.startsWith(start))
+                ? "comment"
+                : "code";
             const colored = type === "code" ? chalk.green(line) : chalk.yellow(line);
             console.log(`${i + 1}: ${colored} ${chalk.gray(`[${type}]`)}`);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scai",
-  "version": "0.1.100",
+  "version": "0.1.101",
   "type": "module",
   "bin": {
     "scai": "./dist/index.js"