c-next 0.2.11 → 0.2.13

package/src/cli/__tests__/ConfigPrinter.test.ts

@@ -41,7 +41,7 @@ describe("ConfigPrinter", () => {
 
     it("displays config file path when provided", () => {
       const config: ICliConfig = {
-        inputs: [],
+        input: "",
         outputPath: "",
         includeDirs: [],
         defines: {},
@@ -63,7 +63,7 @@ describe("ConfigPrinter", () => {
 
     it("displays (none) when no config file is loaded", () => {
       const config: ICliConfig = {
-        inputs: [],
+        input: "",
         outputPath: "",
         includeDirs: [],
         defines: {},
@@ -83,7 +83,7 @@ describe("ConfigPrinter", () => {
 
     it("displays cppRequired value", () => {
       const config: ICliConfig = {
-        inputs: [],
+        input: "",
         outputPath: "",
         includeDirs: [],
         defines: {},
@@ -102,7 +102,7 @@ describe("ConfigPrinter", () => {
 
     it("displays debugMode value", () => {
       const config: ICliConfig = {
-        inputs: [],
+        input: "",
         outputPath: "",
         includeDirs: [],
         defines: {},
@@ -122,7 +122,7 @@ describe("ConfigPrinter", () => {
 
     it("displays target value when set", () => {
       const config: ICliConfig = {
-        inputs: [],
+        input: "",
         outputPath: "",
         includeDirs: [],
         defines: {},
@@ -142,7 +142,7 @@ describe("ConfigPrinter", () => {
 
     it("displays (none) for target when not set", () => {
       const config: ICliConfig = {
-        inputs: [],
+        input: "",
         outputPath: "",
         includeDirs: [],
         defines: {},
@@ -161,7 +161,7 @@ describe("ConfigPrinter", () => {
 
     it("displays output path when set", () => {
       const config: ICliConfig = {
-        inputs: [],
+        input: "",
         outputPath: "build/",
         includeDirs: [],
         defines: {},
@@ -180,7 +180,7 @@ describe("ConfigPrinter", () => {
 
     it("displays (same dir as input) when output not set", () => {
       const config: ICliConfig = {
-        inputs: [],
+        input: "",
         outputPath: "",
         includeDirs: [],
         defines: {},
@@ -199,7 +199,7 @@ describe("ConfigPrinter", () => {
 
     it("displays include directories", () => {
       const config: ICliConfig = {
-        inputs: [],
+        input: "",
         outputPath: "",
         includeDirs: ["lib/", "vendor/include/"],
         defines: {},
@@ -219,7 +219,7 @@ describe("ConfigPrinter", () => {
 
     it("displays (none) when no include directories", () => {
       const config: ICliConfig = {
-        inputs: [],
+        input: "",
         outputPath: "",
         includeDirs: [],
         defines: {},
@@ -238,7 +238,7 @@ describe("ConfigPrinter", () => {
 
     it("displays defines with values", () => {
       const config: ICliConfig = {
-        inputs: [],
+        input: "",
         outputPath: "",
         includeDirs: [],
         defines: { DEBUG: true, VERSION: "1.0" },
@@ -258,7 +258,7 @@ describe("ConfigPrinter", () => {
 
     it("displays header text", () => {
       const config: ICliConfig = {
-        inputs: [],
+        input: "",
         outputPath: "",
         includeDirs: [],
         defines: {},

package/src/cli/__tests__/PathNormalizer.test.ts

@@ -321,7 +321,7 @@ describe("PathNormalizer", () => {
       };
 
       const config: ICliConfig = {
-        inputs: ["file.cnx"],
+        input: "file.cnx",
         outputPath: "~/build",
         includeDirs: ["~/sdk/include"],
         defines: {},
@@ -344,7 +344,7 @@ describe("PathNormalizer", () => {
 
     it("handles undefined optional fields", () => {
       const config: ICliConfig = {
-        inputs: ["file.cnx"],
+        input: "file.cnx",
         outputPath: "",
         includeDirs: [],
         defines: {},
@@ -363,7 +363,7 @@ describe("PathNormalizer", () => {
 
     it("expands ** in include paths", () => {
       const config: ICliConfig = {
-        inputs: [],
+        input: "",
         outputPath: "",
         includeDirs: [`${tempDir}/include/**`],
         defines: {},
@@ -382,7 +382,7 @@ describe("PathNormalizer", () => {
 
     it("preserves non-path fields unchanged", () => {
       const config: ICliConfig = {
-        inputs: ["a.cnx", "b.cnx"],
+        input: "a.cnx",
         outputPath: "",
         includeDirs: [],
         defines: { DEBUG: true },
@@ -397,7 +397,7 @@ describe("PathNormalizer", () => {
 
       const result = PathNormalizer.normalizeConfig(config);
 
-      expect(result.inputs).toEqual(["a.cnx", "b.cnx"]);
+      expect(result.input).toBe("a.cnx");
       expect(result.defines).toEqual({ DEBUG: true });
       expect(result.preprocess).toBe(true);
       expect(result.verbose).toBe(true);

package/src/cli/__tests__/Runner.test.ts

@@ -4,16 +4,16 @@
 
 import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
 import Runner from "../Runner";
-import InputExpansion from "../../transpiler/data/InputExpansion";
 import Transpiler from "../../transpiler/Transpiler";
 import ResultPrinter from "../ResultPrinter";
 import ICliConfig from "../types/ICliConfig";
+import InputExpansion from "../../transpiler/data/InputExpansion";
 import * as fs from "node:fs";
 
 // Mock dependencies
-vi.mock("../../transpiler/data/InputExpansion");
 vi.mock("../../transpiler/Transpiler");
 vi.mock("../ResultPrinter");
+vi.mock("../../transpiler/data/InputExpansion");
 vi.mock("node:fs", async () => {
   const actual = await vi.importActual("node:fs");
   return {
@@ -42,7 +42,7 @@ describe("Runner", () => {
 
     // Default config
     mockConfig = {
-      inputs: ["src/main.cnx"],
+      input: "src/main.cnx",
       outputPath: "",
       includeDirs: [],
       defines: {},
@@ -59,11 +59,6 @@ describe("Runner", () => {
       isDirectory: () => false,
     } as fs.Stats);
 
-    // Mock InputExpansion
-    vi.mocked(InputExpansion.expandInputs).mockReturnValue([
-      "/project/src/main.cnx",
-    ]);
-
     // Mock Transpiler
     mockTranspilerInstance = {
       transpile: vi.fn().mockResolvedValue({
@@ -76,6 +71,9 @@ describe("Runner", () => {
     vi.mocked(Transpiler).mockImplementation(function () {
       return mockTranspilerInstance as unknown as Transpiler;
     });
+
+    // Default: not a C++ entry point
+    vi.mocked(InputExpansion.isCppEntryPoint).mockReturnValue(false);
   });
 
   afterEach(() => {
@@ -85,48 +83,17 @@ describe("Runner", () => {
   });
 
   describe("execute", () => {
-    it("expands inputs and runs transpiler", async () => {
+    it("resolves input and runs transpiler", async () => {
       await expect(Runner.execute(mockConfig)).rejects.toThrow(
         "process.exit(0)",
       );
 
-      expect(InputExpansion.expandInputs).toHaveBeenCalledWith([
-        "src/main.cnx",
-      ]);
       expect(Transpiler).toHaveBeenCalled();
       expect(mockTranspilerInstance.transpile).toHaveBeenCalled();
       expect(ResultPrinter.print).toHaveBeenCalled();
     });
 
-    it("exits with error when InputExpansion throws", async () => {
-      vi.mocked(InputExpansion.expandInputs).mockImplementation(() => {
-        throw new Error("Path not found");
-      });
-
-      await expect(Runner.execute(mockConfig)).rejects.toThrow(
-        "process.exit(1)",
-      );
-
-      expect(consoleErrorSpy).toHaveBeenCalledWith(
-        "Error: Error: Path not found",
-      );
-    });
-
-    it("exits with error when no .cnx files found", async () => {
-      vi.mocked(InputExpansion.expandInputs).mockReturnValue([]);
-
-      await expect(Runner.execute(mockConfig)).rejects.toThrow(
-        "process.exit(1)",
-      );
-
-      expect(consoleErrorSpy).toHaveBeenCalledWith(
-        "Error: No .cnx files found",
-      );
-    });
-
     it("passes include paths to Transpiler", async () => {
-      // Include discovery now happens inside Transpiler.discoverIncludes()
-      // Runner just passes config.includeDirs directly
       mockConfig.includeDirs = ["/extra/include"];
 
       await expect(Runner.execute(mockConfig)).rejects.toThrow(
@@ -162,10 +129,11 @@ describe("Runner", () => {
       );
 
       const transpilerCall = vi.mocked(Transpiler).mock.calls[0][0];
-      expect(transpilerCall.outDir).toBe("/project/src");
+      // outDir should be dirname of resolved input
+      expect(transpilerCall.outDir).toBeDefined();
     });
 
-    it("handles explicit output filename for single file", async () => {
+    it("handles explicit output filename", async () => {
       mockConfig.outputPath = "output/result.c";
 
       mockTranspilerInstance.transpile.mockResolvedValue({
@@ -181,25 +149,9 @@ describe("Runner", () => {
       expect(fs.renameSync).toHaveBeenCalled();
     });
 
-    it("errors on explicit filename with multiple files", async () => {
-      mockConfig.outputPath = "output/result.c";
-      vi.mocked(InputExpansion.expandInputs).mockReturnValue([
-        "/project/src/a.cnx",
-        "/project/src/b.cnx",
-      ]);
-
-      await expect(Runner.execute(mockConfig)).rejects.toThrow(
-        "process.exit(1)",
-      );
-
-      expect(consoleErrorSpy).toHaveBeenCalledWith(
-        "Error: Cannot use explicit output filename with multiple input files",
-      );
-    });
-
     it("passes all config options to Transpiler", async () => {
       mockConfig = {
-        inputs: ["src/"],
+        input: "src/main.cnx",
         outputPath: "build/",
         includeDirs: ["/inc"],
         defines: { DEBUG: true },
@@ -259,29 +211,6 @@ describe("Runner", () => {
       );
     });
 
-    it("separates directory and file inputs", async () => {
-      mockConfig.inputs = ["src/", "extra/main.cnx"];
-
-      vi.mocked(fs.existsSync).mockImplementation((path) => {
-        return (
-          (path as string).endsWith("src/") ||
-          (path as string).includes("main.cnx")
-        );
-      });
-      vi.mocked(fs.statSync).mockImplementation((path) => {
-        return {
-          isDirectory: () => (path as string).endsWith("src/"),
-        } as fs.Stats;
-      });
-
-      await expect(Runner.execute(mockConfig)).rejects.toThrow(
-        "process.exit(0)",
-      );
-
-      const transpilerCall = vi.mocked(Transpiler).mock.calls[0][0];
-      expect(transpilerCall.inputs).toHaveLength(2);
-    });
-
     it("doesn't rename when generated file matches explicit path", async () => {
       mockConfig.outputPath = "/project/output/main.c";
 
@@ -297,5 +226,102 @@ describe("Runner", () => {
 
       expect(fs.renameSync).not.toHaveBeenCalled();
     });
+
+    describe("C++ entry point", () => {
+      beforeEach(() => {
+        vi.mocked(InputExpansion.isCppEntryPoint).mockReturnValue(true);
+        mockConfig.input = "src/main.cpp";
+      });
+
+      it("prints scanning message for C++ entry point", async () => {
+        mockTranspilerInstance.transpile.mockResolvedValue({
+          success: true,
+          outputFiles: [],
+          errors: [],
+          filesProcessed: 1,
+          files: [{ sourcePath: "/project/src/led.cnx" }],
+        });
+
+        await expect(Runner.execute(mockConfig)).rejects.toThrow(
+          "process.exit(0)",
+        );
+
+        expect(consoleLogSpy).toHaveBeenCalledWith(
+          expect.stringContaining("Scanning main.cpp for C-Next includes..."),
+        );
+      });
+
+      it("prints found files when C-Next sources discovered", async () => {
+        mockTranspilerInstance.transpile.mockResolvedValue({
+          success: true,
+          outputFiles: ["/project/src/led.c"],
+          errors: [],
+          filesProcessed: 2,
+          files: [
+            { sourcePath: "/project/src/led.cnx" },
+            { sourcePath: "/project/src/motor.cnx" },
+          ],
+        });
+
+        await expect(Runner.execute(mockConfig)).rejects.toThrow(
+          "process.exit(0)",
+        );
+
+        expect(consoleLogSpy).toHaveBeenCalledWith(
+          expect.stringContaining("Found 2 C-Next source file(s)"),
+        );
+        expect(consoleLogSpy).toHaveBeenCalledWith(
+          expect.stringContaining("led.cnx"),
+        );
+        expect(consoleLogSpy).toHaveBeenCalledWith(
+          expect.stringContaining("motor.cnx"),
+        );
+      });
+
+      it("prints getting started guide when no C-Next files found", async () => {
+        mockTranspilerInstance.transpile.mockResolvedValue({
+          success: true,
+          outputFiles: [],
+          errors: [],
+          filesProcessed: 0,
+          files: [],
+        });
+
+        await expect(Runner.execute(mockConfig)).rejects.toThrow(
+          "process.exit(0)",
+        );
+
+        expect(consoleLogSpy).toHaveBeenCalledWith(
+          expect.stringContaining("No C-Next files found"),
+        );
+        expect(consoleLogSpy).toHaveBeenCalledWith(
+          expect.stringContaining("Create a .cnx file"),
+        );
+      });
+
+      it("does not print C++ entry point messages for .cnx files", async () => {
+        vi.mocked(InputExpansion.isCppEntryPoint).mockReturnValue(false);
+        mockConfig.input = "src/main.cnx";
+
+        mockTranspilerInstance.transpile.mockResolvedValue({
+          success: true,
+          outputFiles: ["/project/src/main.c"],
+          errors: [],
+          filesProcessed: 1,
+          files: [{ sourcePath: "/project/src/main.cnx" }],
+        });
+
+        await expect(Runner.execute(mockConfig)).rejects.toThrow(
+          "process.exit(0)",
+        );
+
+        expect(consoleLogSpy).not.toHaveBeenCalledWith(
+          expect.stringContaining("Scanning"),
+        );
+        expect(consoleLogSpy).not.toHaveBeenCalledWith(
+          expect.stringContaining("Found"),
+        );
+      });
+    });
   });
 });

package/src/cli/serve/ServeCommand.ts

@@ -247,7 +247,7 @@ class ServeCommand {
     const config = ConfigLoader.load(workspacePath);
 
     ServeCommand.transpiler = new Transpiler({
-      inputs: [],
+      input: "",
       includeDirs: config.include ?? [],
       cppRequired: config.cppRequired ?? false,
       target: config.target ?? "",

package/src/cli/types/ICliConfig.ts

@@ -5,8 +5,8 @@
  * CLI flags with config file settings. CLI flags take precedence.
  */
 interface ICliConfig {
-  /** Input files or directories to transpile */
-  inputs: string[];
+  /** Entry point .cnx file to transpile */
+  input: string;
   /** Output path (file or directory) */
   outputPath: string;
   /** Additional include directories */

package/src/lib/parseWithSymbols.ts

@@ -57,14 +57,14 @@ function convertBitmap(
   bitmap: import("../transpiler/types/symbols/IBitmapSymbol").default,
 ): ISymbolInfo[] {
   const result: ISymbolInfo[] = [];
-  const mangledName = SymbolNameUtils.getMangledName(bitmap);
+  const cName = SymbolNameUtils.getTranspiledCName(bitmap);
   const parent = bitmap.scope.name || undefined;
   const bitmapId = getDotPathId(bitmap);
   const bitmapParentId = getParentId(bitmap.scope);
 
   result.push({
     name: bitmap.name,
-    fullName: mangledName,
+    fullName: cName,
     kind: "bitmap",
     type: bitmap.backingType,
     parent,
@@ -77,9 +77,9 @@ function convertBitmap(
   for (const [fieldName, fieldInfo] of bitmap.fields) {
     result.push({
       name: fieldName,
-      fullName: `${mangledName}.${fieldName}`,
+      fullName: `${cName}.${fieldName}`,
       kind: "bitmapField",
-      parent: mangledName,
+      parent: cName,
       id: `${bitmapId}.${fieldName}`,
       parentId: bitmapId,
       line: bitmap.sourceLine,
@@ -94,14 +94,14 @@ function convertEnum(
   enumSym: import("../transpiler/types/symbols/IEnumSymbol").default,
 ): ISymbolInfo[] {
   const result: ISymbolInfo[] = [];
-  const mangledName = SymbolNameUtils.getMangledName(enumSym);
+  const cName = SymbolNameUtils.getTranspiledCName(enumSym);
   const parent = enumSym.scope.name || undefined;
   const enumId = getDotPathId(enumSym);
   const enumParentId = getParentId(enumSym.scope);
 
   result.push({
     name: enumSym.name,
-    fullName: mangledName,
+    fullName: cName,
     kind: "enum",
     parent,
     id: enumId,
@@ -113,9 +113,9 @@ function convertEnum(
   for (const [memberName] of enumSym.members) {
     result.push({
       name: memberName,
-      fullName: `${mangledName}_${memberName}`,
+      fullName: `${cName}_${memberName}`,
       kind: "enumMember",
-      parent: mangledName,
+      parent: cName,
       id: `${enumId}.${memberName}`,
       parentId: enumId,
       line: enumSym.sourceLine,
@@ -129,14 +129,14 @@ function convertStruct(
   struct: import("../transpiler/types/symbols/IStructSymbol").default,
 ): ISymbolInfo[] {
   const result: ISymbolInfo[] = [];
-  const mangledName = SymbolNameUtils.getMangledName(struct);
+  const cName = SymbolNameUtils.getTranspiledCName(struct);
   const parent = struct.scope.name || undefined;
   const structId = getDotPathId(struct);
   const structParentId = getParentId(struct.scope);
 
   result.push({
     name: struct.name,
-    fullName: mangledName,
+    fullName: cName,
     kind: "struct",
     parent,
     id: structId,
@@ -148,10 +148,10 @@ function convertStruct(
   for (const [fieldName, fieldInfo] of struct.fields) {
     result.push({
       name: fieldName,
-      fullName: `${mangledName}.${fieldName}`,
+      fullName: `${cName}.${fieldName}`,
       kind: "field",
       type: TypeResolver.getTypeName(fieldInfo.type),
-      parent: mangledName,
+      parent: cName,
       id: `${structId}.${fieldName}`,
       parentId: structId,
       line: struct.sourceLine,
@@ -165,7 +165,7 @@ function convertFunction(
   func: import("../transpiler/types/symbols/IFunctionSymbol").default,
 ): ISymbolInfo[] {
   const result: ISymbolInfo[] = [];
-  const mangledName = SymbolNameUtils.getMangledName(func);
+  const cName = SymbolNameUtils.getTranspiledCName(func);
   const parent = func.scope.name || undefined;
   const returnType = TypeResolver.getTypeName(func.returnType);
 
@@ -173,11 +173,11 @@ function convertFunction(
   const paramTypes = func.parameters.map((p) =>
     TypeResolver.getTypeName(p.type),
   );
-  const signature = `${returnType} ${mangledName}(${paramTypes.join(", ")})`;
+  const signature = `${returnType} ${cName}(${paramTypes.join(", ")})`;
 
   result.push({
     name: func.name,
-    fullName: mangledName,
+    fullName: cName,
     kind: "function",
     type: returnType,
     parent,
@@ -194,13 +194,13 @@ function convertFunction(
 function convertVariable(
   variable: import("../transpiler/types/symbols/IVariableSymbol").default,
 ): ISymbolInfo {
-  const mangledName = SymbolNameUtils.getMangledName(variable);
+  const cName = SymbolNameUtils.getTranspiledCName(variable);
   const parent = variable.scope.name || undefined;
   const typeStr = TypeResolver.getTypeName(variable.type);
 
   return {
     name: variable.name,
-    fullName: mangledName,
+    fullName: cName,
     kind: "variable",
     type: typeStr,
     parent,
@@ -214,14 +214,14 @@ function convertRegister(
   register: import("../transpiler/types/symbols/IRegisterSymbol").default,
 ): ISymbolInfo[] {
   const result: ISymbolInfo[] = [];
-  const mangledName = SymbolNameUtils.getMangledName(register);
+  const cName = SymbolNameUtils.getTranspiledCName(register);
   const parent = register.scope.name || undefined;
   const registerId = getDotPathId(register);
   const registerParentId = getParentId(register.scope);
 
   result.push({
     name: register.name,
-    fullName: mangledName,
+    fullName: cName,
     kind: "register",
     parent,
     id: registerId,
@@ -233,9 +233,9 @@ function convertRegister(
   for (const [memberName, memberInfo] of register.members) {
     result.push({
       name: memberName,
-      fullName: `${mangledName}.${memberName}`,
+      fullName: `${cName}.${memberName}`,
       kind: "registerMember",
-      parent: mangledName,
+      parent: cName,
       id: `${registerId}.${memberName}`,
       parentId: registerId,
       accessModifier: memberInfo.access,