scai 0.1.100 → 0.1.102

package/dist/pipeline/modules/preserveCodeModule.js

@@ -17,23 +17,24 @@ export const preserveCodeModule = {
         // --- Classify line ---
         let inBlockComment = false;
         let blockLines = [];
+        // returns: "code" | comment string | null
         const classifyLine = (line) => {
             const trimmed = line.trimStart();
             // --- Single-line comment ---
             for (const s of syntax.singleLine) {
                 if (trimmed.startsWith(s))
-                    return line; // return actual line
+                    return line;
             }
             // --- 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 line; // entire block on one line
                     }
                     if (trimmed.startsWith(start)) {
                         inBlockComment = true;
                         blockLines = [line];
-                        return line; // start of multi-line block
+                        return null; // wait until block ends
                     }
                 }
                 else {
@@ -42,9 +43,9 @@ export const preserveCodeModule = {
                         inBlockComment = false;
                         const fullBlock = blockLines.join("\n");
                         blockLines = [];
-                        return fullBlock; // return entire multi-line block
+                        return fullBlock; // emit entire block
                     }
-                    return ""; // middle lines, wait until block ends
+                    return null; // still inside block
                 }
             }
             return "code";
@@ -54,84 +55,78 @@ export const preserveCodeModule = {
             const map = new Map();
             let commentBuffer = [];
             for (const line of lines) {
-                const type = classifyLine(line);
-                if (type && type !== "code") {
-                    // Collect comment lines
-                    commentBuffer.push(type.trim());
-                }
-                else if (type === "code") {
-                    // Flush buffer when hitting code
+                const result = classifyLine(line);
+                if (result === "code") {
                     if (commentBuffer.length > 0) {
                         const key = line.trim().toLowerCase();
+                        const block = commentBuffer.join("\n").trim().toLowerCase();
                         if (!map.has(key))
                             map.set(key, new Set());
-                        // Join consecutive comments into one block
-                        const commentBlock = commentBuffer.join("\n").toLowerCase();
-                        map.get(key).add(commentBlock);
+                        map.get(key).add(block);
                         commentBuffer = [];
                     }
+                    continue;
+                }
+                if (typeof result === "string") {
+                    // comment line or block
+                    commentBuffer.push(result);
                 }
+                // result === null => inside multi-line block, do nothing
             }
-            // Flush remaining comments at EOF
+            // flush at EOF
             if (commentBuffer.length > 0) {
                 const key = "";
+                const block = commentBuffer.join("\n").trim().toLowerCase();
                 if (!map.has(key))
                     map.set(key, new Set());
-                const commentBlock = commentBuffer.join("\n").toLowerCase();
-                map.get(key).add(commentBlock);
+                map.get(key).add(block);
             }
             return map;
         }
         // --- Step 1: Collect comments ---
         const modelComments = collectCommentsMap(newLines); // model first
         const origComments = collectCommentsMap(origLines); // original
-        // --- Step 2: Remove duplicates ---
-        for (const [key, commentSet] of modelComments.entries()) {
-            if (origComments.has(key)) {
-                commentSet.forEach(c => {
-                    origComments.get(key).delete(c.trim().toLowerCase());
-                });
-                if (origComments.get(key).size === 0)
-                    origComments.delete(key);
+        // --- Step 2: Remove duplicates from model (since we insert model) ---
+        for (const [key, modelSet] of modelComments.entries()) {
+            const origSet = origComments.get(key);
+            if (!origSet)
+                continue;
+            for (const c of Array.from(modelSet)) {
+                if (origSet.has(c))
+                    modelSet.delete(c);
             }
+            if (modelSet.size === 0)
+                modelComments.delete(key);
         }
-        // --- Step 3: Build fixed lines with model comments inserted above original ---
+        // --- Step 3: Build fixed lines ---
         const fixedLines = [];
         for (const origLine of origLines) {
             const key = origLine.trim().toLowerCase();
-            // Insert model comment blocks if any
             if (modelComments.has(key)) {
-                modelComments.get(key).forEach(block => {
-                    const lines = block.split("\n");
-                    for (const line of lines) {
-                        if (!fixedLines.includes(line)) {
+                for (const block of modelComments.get(key)) {
+                    for (const line of block.split("\n")) {
+                        const norm = line.trim().toLowerCase();
+                        const already = fixedLines.some(l => l.trim().toLowerCase() === norm);
+                        if (!already) {
                             fixedLines.push(line);
                             console.log(chalk.blue("Inserted comment:"), line.trim());
                         }
                         else {
-                            console.log(chalk.gray("Skipped duplicate comment:"), line.trim());
+                            console.log(chalk.gray("Skipped duplicate:"), line.trim());
                         }
                     }
-                });
+                }
             }
-            fixedLines.push(origLine);
+            fixedLines.push(origLine); // always keep original
         }
-        // --- Logging for debugging ---
-        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);
-            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);
-            console.log(`${i + 1}: ${colored} ${chalk.gray(`[${type}]`)}`);
-        });
+        // --- Logging ---
         console.log(chalk.bold.blue("\n=== FIXED CONTENT ==="));
         fixedLines.forEach((line, i) => {
-            const type = classifyLine(line);
+            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.102",
   "type": "module",
   "bin": {
     "scai": "./dist/index.js"