c-next 0.2.2 → 0.2.4

package/src/transpiler/__tests__/Transpiler.test.ts

@@ -16,8 +16,8 @@ describe("Transpiler", () => {
       mockFs = new MockFileSystem();
     });
 
-    describe("transpileSource (primary unit testing target)", () => {
-      // transpileSource is the main API that benefits from MockFileSystem
+    describe("transpile source mode (primary unit testing target)", () => {
+      // transpile({ kind: 'source' }) is the main API that benefits from MockFileSystem
       // because it doesn't rely on FileDiscovery for the main code path
 
       it("transpiles source string without file I/O", async () => {
@@ -26,9 +26,12 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.transpileSource(
-          "u32 add(u32 a, u32 b) { return a + b; }",
-        );
+        const result = (
+          await transpiler.transpile({
+            kind: "source",
+            source: "u32 add(u32 a, u32 b) { return a + b; }",
+          })
+        ).files[0];
 
         expect(result.success).toBe(true);
         expect(result.code).toContain("uint32_t");
@@ -41,7 +44,10 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.transpileSource("@@@invalid");
+        const result = await transpiler.transpile({
+          kind: "source",
+          source: "@@@invalid",
+        });
 
         expect(result.success).toBe(false);
         expect(result.errors.length).toBeGreaterThan(0);
@@ -53,11 +59,16 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.transpileSource(`
+        const result = (
+          await transpiler.transpile({
+            kind: "source",
+            source: `
           scope API {
             public void doSomething() { }
           }
-        `);
+        `,
+          })
+        ).files[0];
 
         expect(result.success).toBe(true);
         expect(result.headerCode).toBeDefined();
@@ -70,9 +81,12 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.transpileSource(
-          "void privateFunc() { }",
-        );
+        const result = (
+          await transpiler.transpile({
+            kind: "source",
+            source: "void privateFunc() { }",
+          })
+        ).files[0];
 
         expect(result.success).toBe(true);
         expect(result.headerCode).toBeUndefined();
@@ -84,9 +98,12 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.transpileSource(
-          "u32 test() { return 42; }",
-        );
+        const result = (
+          await transpiler.transpile({
+            kind: "source",
+            source: "u32 test() { return 42; }",
+          })
+        ).files[0];
 
         expect(result.success).toBe(true);
         expect(result.code).toBe("");
@@ -99,9 +116,12 @@ describe("Transpiler", () => {
         );
 
         // This should parse but might have semantic issues
-        const result = await transpiler.transpileSource(
-          "void test() { undefinedVar <- 5; }",
-        );
+        const result = (
+          await transpiler.transpile({
+            kind: "source",
+            source: "void test() { undefinedVar <- 5; }",
+          })
+        ).files[0];
 
         // Should still succeed (undefined vars become C identifiers)
         expect(result.success).toBe(true);
@@ -113,9 +133,12 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.transpileSource(
-          `void test() {\n  u32 large <- 1000;\n  u8 small <- large;\n}`,
-        );
+        const result = (
+          await transpiler.transpile({
+            kind: "source",
+            source: `void test() {\n  u32 large <- 1000;\n  u8 small <- large;\n}`,
+          })
+        ).files[0];
 
         expect(result.success).toBe(false);
         expect(result.errors).toHaveLength(1);
@@ -131,9 +154,12 @@ describe("Transpiler", () => {
         );
 
         // Ternary with bare variable produces error without line prefix
-        const result = await transpiler.transpileSource(
-          `void test() { u32 x <- 5; u32 r <- (x) ? 1 : 0; }`,
-        );
+        const result = (
+          await transpiler.transpile({
+            kind: "source",
+            source: `void test() { u32 x <- 5; u32 r <- (x) ? 1 : 0; }`,
+          })
+        ).files[0];
 
         expect(result.success).toBe(false);
         expect(result.errors[0].line).toBe(1);
@@ -147,7 +173,10 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.transpileSource(`
+        const result = (
+          await transpiler.transpile({
+            kind: "source",
+            source: `
           u8 byte <- 255;
           u16 word <- 65535;
           u32 dword <- 0xFFFFFFFF;
@@ -156,7 +185,9 @@ describe("Transpiler", () => {
           i32 sdword <- -1;
           f32 floatVal <- 3.14;
           f64 doubleVal <- 2.718;
-        `);
+        `,
+          })
+        ).files[0];
 
         expect(result.success).toBe(true);
         expect(result.code).toContain("uint8_t");
@@ -175,12 +206,17 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.transpileSource(`
+        const result = (
+          await transpiler.transpile({
+            kind: "source",
+            source: `
           void test() {
             u32 x;
             x <- 42;
           }
-        `);
+        `,
+          })
+        ).files[0];
 
         expect(result.success).toBe(true);
         expect(result.code).toContain("x = 42");
@@ -192,11 +228,16 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.transpileSource(`
+        const result = (
+          await transpiler.transpile({
+            kind: "source",
+            source: `
           bool test(u32 a, u32 b) {
             return a = b;
           }
-        `);
+        `,
+          })
+        ).files[0];
 
         expect(result.success).toBe(true);
         expect(result.code).toContain("a == b");
@@ -208,12 +249,17 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.transpileSource(`
+        const result = (
+          await transpiler.transpile({
+            kind: "source",
+            source: `
           struct Point {
             i32 x;
             i32 y;
           }
-        `);
+        `,
+          })
+        ).files[0];
 
         expect(result.success).toBe(true);
         expect(result.code).toContain("typedef struct");
@@ -227,13 +273,18 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.transpileSource(`
+        const result = (
+          await transpiler.transpile({
+            kind: "source",
+            source: `
           enum Color {
             RED,
             GREEN,
             BLUE
           }
-        `);
+        `,
+          })
+        ).files[0];
 
         expect(result.success).toBe(true);
         expect(result.code).toContain("typedef enum");
@@ -248,12 +299,17 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.transpileSource(`
+        const result = (
+          await transpiler.transpile({
+            kind: "source",
+            source: `
           scope LED {
             public void on() { }
             public void off() { }
           }
-        `);
+        `,
+          })
+        ).files[0];
 
         expect(result.success).toBe(true);
         expect(result.code).toContain("LED_on");
@@ -277,7 +333,7 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.run();
+        const result = await transpiler.transpile({ kind: "files" });
 
         expect(result.success).toBe(true);
         expect(result.filesProcessed).toBe(1);
@@ -300,7 +356,7 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        await transpiler.run();
+        await transpiler.transpile({ kind: "files" });
 
         const mkdirCalls = mockFs.getMkdirLog();
         expect(mkdirCalls.some((c) => c.path === "/project/build")).toBe(true);
@@ -319,7 +375,7 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        await transpiler.run();
+        await transpiler.transpile({ kind: "files" });
 
         const mkdirCalls = mockFs.getMkdirLog();
         expect(mkdirCalls.some((c) => c.path === "/project/include")).toBe(
@@ -346,7 +402,7 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.run();
+        const result = await transpiler.transpile({ kind: "files" });
 
         expect(result.success).toBe(true);
 
@@ -365,7 +421,7 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.run();
+        const result = await transpiler.transpile({ kind: "files" });
 
         expect(result.success).toBe(false);
         expect(result.errors[0].message).toContain("Input not found");
@@ -382,7 +438,7 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.run();
+        const result = await transpiler.transpile({ kind: "files" });
 
         expect(result.warnings).toContain("No C-Next source files found");
       });
@@ -398,7 +454,7 @@ describe("Transpiler", () => {
           mockFs,
         );
 
-        const result = await transpiler.run();
+        const result = await transpiler.transpile({ kind: "files" });
 
         expect(result.success).toBe(false);
         expect(result.errors.length).toBeGreaterThan(0);
@@ -429,7 +485,7 @@ describe("Transpiler", () => {
           noCache: true,
         });
 
-        const result = await transpiler.run();
+        const result = await transpiler.transpile({ kind: "files" });
 
         expect(result.success).toBe(true);
         expect(result.filesProcessed).toBe(1);
@@ -445,7 +501,7 @@ describe("Transpiler", () => {
           noCache: true,
         });
 
-        const result = await transpiler.run();
+        const result = await transpiler.transpile({ kind: "files" });
 
         expect(result.success).toBe(false);
         expect(result.errors.length).toBeGreaterThan(0);
@@ -461,7 +517,7 @@ describe("Transpiler", () => {
           noCache: true,
         });
 
-        const result = await transpiler.run();
+        const result = await transpiler.transpile({ kind: "files" });
 
         expect(result.success).toBe(false);
         expect(result.errors.length).toBeGreaterThan(0);
@@ -478,7 +534,7 @@ describe("Transpiler", () => {
           noCache: true,
         });
 
-        const result = await transpiler.run();
+        const result = await transpiler.transpile({ kind: "files" });
 
         expect(result.success).toBe(false);
         expect(result.errors.length).toBeGreaterThan(0);
@@ -495,7 +551,7 @@ describe("Transpiler", () => {
           noCache: true,
         });
 
-        const result = await transpiler.run();
+        const result = await transpiler.transpile({ kind: "files" });
 
         expect(result.success).toBe(true);
         expect(result.outputFiles.length).toBeGreaterThan(0);
@@ -518,7 +574,7 @@ describe("Transpiler", () => {
           noCache: true,
         });
 
-        const result = await transpiler.run();
+        const result = await transpiler.transpile({ kind: "files" });
 
         expect(result.success).toBe(true);
         // Should have both .c and .h output
@@ -527,4 +583,50 @@ describe("Transpiler", () => {
       });
     });
   });
+
+  describe("transpile() unified entry point", () => {
+    let mockFs: MockFileSystem;
+
+    beforeEach(() => {
+      mockFs = new MockFileSystem();
+    });
+
+    it("transpile({ kind: 'source' }) returns ITranspilerResult with files[]", async () => {
+      const transpiler = new Transpiler({ inputs: [], noCache: true }, mockFs);
+
+      const result = await transpiler.transpile({
+        kind: "source",
+        source: "void main() { }",
+      });
+      expect(result.success).toBe(true);
+      expect(result.files).toHaveLength(1);
+      expect(result.files[0].code).toContain("int main");
+    });
+
+    it("transpile({ kind: 'source' }) returns header in files[0].headerCode", async () => {
+      const transpiler = new Transpiler({ inputs: [], noCache: true }, mockFs);
+
+      const result = await transpiler.transpile({
+        kind: "source",
+        source: `
+          scope API {
+            public void doSomething() { }
+          }
+        `,
+      });
+      expect(result.success).toBe(true);
+      expect(result.files[0].headerCode).toContain("API_doSomething");
+    });
+
+    it("transpile({ kind: 'source' }) returns errors in result", async () => {
+      const transpiler = new Transpiler({ inputs: [], noCache: true }, mockFs);
+
+      const result = await transpiler.transpile({
+        kind: "source",
+        source: "@@@invalid",
+      });
+      expect(result.success).toBe(false);
+      expect(result.errors.length).toBeGreaterThan(0);
+    });
+  });
 });

package/src/transpiler/__tests__/determineProjectRoot.test.ts

@@ -422,7 +422,7 @@ describe("Transpiler.determineProjectRoot", () => {
       });
 
       // Run transpiler to trigger cache creation
-      await transpiler.run();
+      await transpiler.transpile({ kind: "files" });
 
       // Cache directory should be in project root, not src dir
       expect(existsSync(join(projectDir, ".cnx"))).toBe(true);
@@ -440,7 +440,7 @@ describe("Transpiler.determineProjectRoot", () => {
         noCache: true,
       });
 
-      await transpiler.run();
+      await transpiler.transpile({ kind: "files" });
 
       // No cache directory should be created
       expect(existsSync(join(projectDir, ".cnx"))).toBe(false);

package/src/transpiler/data/IncludeResolver.ts

@@ -37,7 +37,7 @@ interface IResolvedIncludes {
  * Unified include resolution for the C-Next Pipeline
  *
  * This class encapsulates the complete include resolution workflow,
- * used by both `run()` (CLI) and `transpileSource()` (API) paths.
+ * used by the unified `transpile()` entry point for both file and source modes.
  *
  * Key responsibilities:
  * - Extract #include directives from source content
@@ -161,6 +161,14 @@ class IncludeResolver {
 
     if (file.type === EFileType.CNext) {
       result.cnextIncludes.push(file);
+      // Issue #854: Track header directive for cnext includes so their types
+      // can be mapped by ExternalTypeHeaderBuilder, preventing duplicate
+      // forward declarations (MISRA Rule 5.6)
+      const headerPath = includeInfo.path.replace(/\.cnx$|\.cnext$/, ".h");
+      const directive = includeInfo.isLocal
+        ? `#include "${headerPath}"`
+        : `#include <${headerPath}>`;
+      result.headerIncludeDirectives.set(absolutePath, directive);
     }
   }
 
@@ -351,8 +359,8 @@ class IncludeResolver {
   /**
    * Build search paths from a source file location
    *
-   * Consolidates the search path building logic used by both `run()` and
-   * `transpileSource()` code paths.
+   * Consolidates the search path building logic used by the unified
+   * transpile() entry point.
    *
    * Search order (highest to lowest priority):
    * 1. Source file's directory (for relative includes)

package/src/transpiler/data/__tests__/IncludeResolver.test.ts

@@ -1,8 +1,8 @@
 /**
  * Unit tests for IncludeResolver
  *
- * Tests the unified include resolution logic used by both
- * Pipeline.run() and Pipeline.transpileSource().
+ * Tests the unified include resolution logic used by
+ * the transpile() entry point for both file and source modes.
  */
 import { describe, it, expect, beforeEach, afterEach } from "vitest";
 import { mkdirSync, writeFileSync, rmSync, existsSync } from "node:fs";