c-next 0.1.58 → 0.1.60

package/README.md

@@ -1,10 +1,9 @@
 # C-Next
 
-[![CI](https://github.com/jlaustill/c-next/actions/workflows/pr-checks.yml/badge.svg)](https://github.com/jlaustill/c-next/actions/workflows/pr-checks.yml)
 [![npm version](https://img.shields.io/npm/v/c-next)](https://www.npmjs.com/package/c-next)
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
+[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=jlaustill_c-next&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=jlaustill_c-next)
-[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=jlaustill_c-next&metric=coverage)](https://sonarcloud.io/summary/new_code?id=jlaustill_c-next)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=jlaustill_c-next&metric=coverage)](https://sonarcloud.io/summary/overall?id=jlaustill_c-next)
 [![Coverage Report](https://img.shields.io/badge/Coverage-Report-blue)](https://jlaustill.github.io/c-next/coverage/)
 [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=jlaustill_c-next&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=jlaustill_c-next)
 

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "c-next",
-  "version": "0.1.58",
+  "version": "0.1.60",
   "description": "A safer C for embedded systems development. Transpiles to clean, readable C.",
+  "packageManager": "npm@11.9.0",
   "type": "module",
   "main": "src/index.ts",
   "bin": {
@@ -48,7 +49,13 @@
     "duplication": "npx jscpd src/ scripts/ --reporters console",
     "duplication:json": "npx jscpd src/ scripts/ --reporters json --output .jscpd",
     "duplication:sonar": "curl -s 'https://sonarcloud.io/api/measures/component_tree?component=jlaustill_c-next&metricKeys=duplicated_blocks,duplicated_lines&s=metric&metricSort=duplicated_blocks&metricSortFilter=withMeasuresOnly&asc=false&ps=20' | jq -r '.components[] | \"\\(.path)\\t\\(.measures[0].value) blocks\\t\\(.measures[1].value) lines\"'",
-    "duplication:all": "echo '=== Local (jscpd) ===' && npm run duplication && echo '\n=== SonarCloud ===' && npm run duplication:sonar"
+    "duplication:all": "echo '=== Local (jscpd) ===' && npm run duplication && echo '\n=== SonarCloud ===' && npm run duplication:sonar",
+    "analyze:prune": "ts-prune",
+    "analyze:madge": "madge src/ --circular --extensions ts",
+    "analyze:madge:graph": "madge src/ --image docs/architecture/dependency-graph.svg --extensions ts --exclude '(parser/(grammar|c/grammar|cpp/grammar)|__tests__)' --layout sfdp",
+    "analyze:cpd": "./scripts/cpd.sh",
+    "analyze:duplication": "npx jscpd src/ scripts/",
+    "analyze:all": "npm run analyze:duplication && npm run analyze:prune && npm run analyze:madge"
   },
   "keywords": [
     "c",
@@ -78,7 +85,7 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "@types/node": "^25.2.0",
+    "@types/node": "^25.2.1",
     "@types/yargs": "^17.0.35",
     "@vitest/coverage-v8": "^4.0.18",
     "antlr4ng-cli": "^2.0.0",
@@ -86,10 +93,12 @@
     "cspell": "^9.6.4",
     "dependency-cruiser": "^17.3.7",
     "husky": "^9.1.7",
-    "knip": "^5.83.0",
+    "knip": "^5.83.1",
     "lint-staged": "^16.2.7",
+    "madge": "^8.0.0",
     "oxlint": "^1.43.0",
     "prettier": "^3.8.1",
+    "ts-prune": "^0.10.3",
     "vitest": "^4.0.18"
   },
   "dependencies": {

package/src/cli/ArgParser.ts

@@ -30,6 +30,7 @@ interface IYargsResult {
   cache: boolean;
   "pio-install": boolean;
   "pio-uninstall": boolean;
+  serve: boolean;
 }
 
 /**
@@ -145,6 +146,13 @@ A safer C for embedded systems development.`,
         default: false,
       })
 
+      // Server mode
+      .option("serve", {
+        type: "boolean",
+        describe: "Start JSON-RPC server on stdin/stdout",
+        default: false,
+      })
+
       // Config file documentation (shown in help)
       .epilogue(
         `Examples:
@@ -180,6 +188,9 @@ Config options:
       .help("help")
       .alias("help", "h")
 
+      // Strict mode - reject unknown options (but allow positional args)
+      .strictOptions()
+
       // Fail handler for unknown options
       .fail((msg, err, yargsInstance) => {
         if (err) throw err;
@@ -253,6 +264,7 @@ class ArgParser {
       pioInstall: parsed["pio-install"],
       pioUninstall: parsed["pio-uninstall"],
       debugMode: parsed.debug,
+      serveMode: parsed.serve,
     };
   }
 }

package/src/cli/CleanCommand.ts

@@ -12,6 +12,45 @@ import PathResolver from "../transpiler/data/PathResolver";
  * Command to clean generated output files
  */
 class CleanCommand {
+  /**
+   * Discover CNX files from inputs.
+   * Returns null if none found or on error.
+   */
+  private static discoverCnxFiles(inputs: string[]): string[] | null {
+    try {
+      const cnxFiles = InputExpansion.expandInputs(inputs);
+      if (cnxFiles.length === 0) {
+        console.log("No .cnx files found. Nothing to clean.");
+        return null;
+      }
+      return cnxFiles;
+    } catch (error) {
+      console.error(`Error: ${error}`);
+      return null;
+    }
+  }
+
+  /**
+   * Delete generated files for a given set of extensions.
+   */
+  private static deleteGeneratedFiles(
+    baseName: string,
+    relativePath: string | null,
+    targetDir: string,
+    extensions: string[],
+  ): number {
+    let count = 0;
+    for (const ext of extensions) {
+      const outputPath = relativePath
+        ? join(targetDir, relativePath.replace(/\.cnx$|\.cnext$/, ext))
+        : join(targetDir, baseName + ext);
+      if (this.deleteIfExists(outputPath)) {
+        count++;
+      }
+    }
+    return count;
+  }
+
   /**
    * Execute the clean command
    *
@@ -24,32 +63,19 @@ class CleanCommand {
     outDir: string,
     headerOutDir?: string,
   ): void {
-    // If no outDir specified, we can't determine where to clean
     if (!outDir) {
       console.log("No output directory specified. Nothing to clean.");
       return;
     }
 
-    // Discover all .cnx files
-    let cnxFiles: string[];
-    try {
-      cnxFiles = InputExpansion.expandInputs(inputs);
-    } catch (error) {
-      console.error(`Error: ${error}`);
-      return;
-    }
-
-    if (cnxFiles.length === 0) {
-      console.log("No .cnx files found. Nothing to clean.");
-      return;
-    }
+    const cnxFiles = this.discoverCnxFiles(inputs);
+    if (!cnxFiles) return;
 
     const resolvedOutDir = resolve(outDir);
     const resolvedHeaderDir = headerOutDir
       ? resolve(headerOutDir)
       : resolvedOutDir;
 
-    // Issue #586: Use PathResolver for consistent path calculation
     const pathResolver = new PathResolver({
       inputs,
       outDir,
@@ -58,39 +84,25 @@ class CleanCommand {
 
     let deletedCount = 0;
 
-    // For each .cnx file, calculate and delete generated files
     for (const cnxFile of cnxFiles) {
       const baseName = basename(cnxFile).replace(/\.cnx$|\.cnext$/, "");
-
-      // Calculate relative path from input directories
       const relativePath = pathResolver.getRelativePathFromInputs(cnxFile);
 
-      // Code files (.c and .cpp) go to outDir
-      const codeExtensions = [".c", ".cpp"];
-      for (const ext of codeExtensions) {
-        const outputPath = relativePath
-          ? join(resolvedOutDir, relativePath.replace(/\.cnx$|\.cnext$/, ext))
-          : join(resolvedOutDir, baseName + ext);
-
-        if (this.deleteIfExists(outputPath)) {
-          deletedCount++;
-        }
-      }
-
-      // Header files (.h and .hpp) go to headerOutDir
-      const headerExtensions = [".h", ".hpp"];
-      for (const ext of headerExtensions) {
-        const headerPath = relativePath
-          ? join(
-              resolvedHeaderDir,
-              relativePath.replace(/\.cnx$|\.cnext$/, ext),
-            )
-          : join(resolvedHeaderDir, baseName + ext);
-
-        if (this.deleteIfExists(headerPath)) {
-          deletedCount++;
-        }
-      }
+      // Delete code files (.c and .cpp)
+      deletedCount += this.deleteGeneratedFiles(
+        baseName,
+        relativePath,
+        resolvedOutDir,
+        [".c", ".cpp"],
+      );
+
+      // Delete header files (.h and .hpp)
+      deletedCount += this.deleteGeneratedFiles(
+        baseName,
+        relativePath,
+        resolvedHeaderDir,
+        [".h", ".hpp"],
+      );
     }
 
     if (deletedCount === 0) {

package/src/cli/Cli.ts

@@ -38,6 +38,16 @@ class Cli {
       return { shouldRun: false, exitCode: 0 };
     }
 
+    // Early exit for serve mode (JSON-RPC server)
+    if (args.serveMode) {
+      return {
+        shouldRun: false,
+        exitCode: 0,
+        serveMode: true,
+        serveDebug: args.verbose,
+      };
+    }
+
     // Load config file (searches up from input file directory)
     const configDir =
       args.inputFiles.length > 0

package/src/cli/PlatformIOCommand.ts

@@ -6,6 +6,31 @@
 import { resolve } from "node:path";
 import { existsSync, readFileSync, writeFileSync, unlinkSync } from "node:fs";
 
+/**
+ * Resolved paths for PlatformIO project.
+ */
+interface IPioProjectPaths {
+  pioIniPath: string;
+  scriptPath: string;
+}
+
+/**
+ * Get PlatformIO project paths and validate that platformio.ini exists.
+ * Exits with error if not in a PlatformIO project directory.
+ */
+function getPioProjectPaths(): IPioProjectPaths {
+  const pioIniPath = resolve(process.cwd(), "platformio.ini");
+  const scriptPath = resolve(process.cwd(), "cnext_build.py");
+
+  if (!existsSync(pioIniPath)) {
+    console.error("Error: platformio.ini not found in current directory");
+    console.error("Run this command from your PlatformIO project root");
+    process.exit(1);
+  }
+
+  return { pioIniPath, scriptPath };
+}
+
 /**
  * PlatformIO integration commands
  */
@@ -15,15 +40,7 @@ class PlatformIOCommand {
    * Creates cnext_build.py and modifies platformio.ini
    */
   static install(): void {
-    const pioIniPath = resolve(process.cwd(), "platformio.ini");
-    const scriptPath = resolve(process.cwd(), "cnext_build.py");
-
-    // Check if platformio.ini exists
-    if (!existsSync(pioIniPath)) {
-      console.error("Error: platformio.ini not found in current directory");
-      console.error("Run this command from your PlatformIO project root");
-      process.exit(1);
-    }
+    const { pioIniPath, scriptPath } = getPioProjectPaths();
 
     // Create cnext_build.py script
     const buildScript = `Import("env")
@@ -110,15 +127,7 @@ env.AddPreAction("buildprog", transpile_cnext)
    * Deletes cnext_build.py and removes extra_scripts from platformio.ini
    */
   static uninstall(): void {
-    const pioIniPath = resolve(process.cwd(), "platformio.ini");
-    const scriptPath = resolve(process.cwd(), "cnext_build.py");
-
-    // Check if platformio.ini exists
-    if (!existsSync(pioIniPath)) {
-      console.error("Error: platformio.ini not found in current directory");
-      console.error("Run this command from your PlatformIO project root");
-      process.exit(1);
-    }
+    const { pioIniPath, scriptPath } = getPioProjectPaths();
 
     let hasChanges = false;
 

package/src/cli/Runner.ts

@@ -9,6 +9,19 @@ import InputExpansion from "../transpiler/data/InputExpansion";
 import Transpiler from "../transpiler/Transpiler";
 import ICliConfig from "./types/ICliConfig";
 import ResultPrinter from "./ResultPrinter";
+import ITranspilerResult from "../transpiler/types/ITranspilerResult";
+
+/** Result of categorizing inputs into directories and files */
+interface ICategorizedInputs {
+  srcDirs: string[];
+  explicitFiles: string[];
+}
+
+/** Result of determining output path */
+interface IOutputPathResult {
+  outDir: string;
+  explicitOutputFile: string | null;
+}
 
 /**
  * Execute the transpiler
@@ -19,24 +32,63 @@ class Runner {
    * @param config - CLI configuration
    */
   static async execute(config: ICliConfig): Promise<void> {
-    // Identify which inputs are directories (for structure preservation)
-    // These will be passed to Transpiler so it can preserve directory structure
+    const { srcDirs, explicitFiles } = this._categorizeInputs(config.inputs);
+    const files = this._expandInputFiles(config.inputs);
+    const { outDir, explicitOutputFile } = this._determineOutputPath(
+      config,
+      files,
+    );
+
+    const pipeline = new Transpiler({
+      inputs: [...srcDirs, ...explicitFiles],
+      includeDirs: config.includeDirs,
+      outDir,
+      headerOutDir: config.headerOutDir,
+      basePath: config.basePath,
+      preprocess: config.preprocess,
+      defines: config.defines,
+      cppRequired: config.cppRequired,
+      noCache: config.noCache,
+      parseOnly: config.parseOnly,
+      target: config.target,
+      debugMode: config.debugMode,
+    });
+
+    const result = await pipeline.run();
+    this._renameOutputIfNeeded(result, explicitOutputFile);
+
+    ResultPrinter.print(result);
+    process.exit(result.success ? 0 : 1);
+  }
+
+  /**
+   * Categorize inputs into directories and explicit files.
+   */
+  private static _categorizeInputs(inputs: string[]): ICategorizedInputs {
     const srcDirs: string[] = [];
     const explicitFiles: string[] = [];
 
-    for (const input of config.inputs) {
+    for (const input of inputs) {
       const resolvedPath = resolve(input);
-      if (existsSync(resolvedPath) && statSync(resolvedPath).isDirectory()) {
+      const isDir =
+        existsSync(resolvedPath) && statSync(resolvedPath).isDirectory();
+      if (isDir) {
         srcDirs.push(resolvedPath);
       } else {
         explicitFiles.push(resolvedPath);
       }
     }
 
-    // Step 1: Expand directories to .cnx files
+    return { srcDirs, explicitFiles };
+  }
+
+  /**
+   * Expand input paths to .cnx files.
+   */
+  private static _expandInputFiles(inputs: string[]): string[] {
     let files: string[];
     try {
-      files = InputExpansion.expandInputs(config.inputs);
+      files = InputExpansion.expandInputs(inputs);
     } catch (error) {
       console.error(`Error: ${error}`);
       process.exit(1);
@@ -47,77 +99,71 @@ class Runner {
       process.exit(1);
     }
 
-    // Step 2: Determine output directory and explicit filename
-    // Note: Include path auto-discovery happens inside Transpiler.discoverSources()
-    let outDir: string;
-    let explicitOutputFile: string | null = null;
+    return files;
+  }
 
-    // Check if outputPath is an explicit file (ends with .c or .cpp)
-    const isExplicitFile =
-      config.outputPath &&
-      /\.(c|cpp)$/.test(config.outputPath) &&
-      !config.outputPath.endsWith("/");
-
-    if (config.outputPath) {
-      // User specified -o
-      const stats = existsSync(config.outputPath)
-        ? statSync(config.outputPath)
-        : null;
-      if (stats?.isDirectory() || config.outputPath.endsWith("/")) {
-        outDir = config.outputPath;
-      } else if (isExplicitFile) {
-        // Explicit output file path
-        if (files.length > 1) {
-          console.error(
-            "Error: Cannot use explicit output filename with multiple input files",
-          );
-          console.error("Use a directory path instead: -o <directory>/");
-          process.exit(1);
-        }
-        outDir = dirname(config.outputPath);
-        explicitOutputFile = resolve(config.outputPath);
-      } else {
-        outDir = config.outputPath;
-      }
-    } else {
-      // No -o flag: use same directory as first input file
-      outDir = dirname(files[0]);
+  /**
+   * Determine output directory and explicit filename from config.
+   */
+  private static _determineOutputPath(
+    config: ICliConfig,
+    files: string[],
+  ): IOutputPathResult {
+    if (!config.outputPath) {
+      return { outDir: dirname(files[0]), explicitOutputFile: null };
     }
 
-    // Step 3: Create Transpiler
-    // Combine srcDirs and explicitFiles into inputs - Transpiler handles both
-    const pipelineInputs = [...srcDirs, ...explicitFiles];
-    const pipeline = new Transpiler({
-      inputs: pipelineInputs,
-      includeDirs: config.includeDirs,
-      outDir,
-      headerOutDir: config.headerOutDir,
-      basePath: config.basePath,
-      preprocess: config.preprocess,
-      defines: config.defines,
-      cppRequired: config.cppRequired,
-      noCache: config.noCache,
-      parseOnly: config.parseOnly,
-      target: config.target,
-      debugMode: config.debugMode,
-    });
+    const isExplicitFile =
+      /\.(c|cpp)$/.test(config.outputPath) && !config.outputPath.endsWith("/");
 
-    // Step 4: Compile
-    const result = await pipeline.run();
+    const stats = existsSync(config.outputPath)
+      ? statSync(config.outputPath)
+      : null;
 
-    // Step 5: Rename output file if explicit filename was specified
-    if (explicitOutputFile && result.success && result.outputFiles.length > 0) {
-      const generatedFile = result.outputFiles[0];
-      // Only rename if it's different from the desired path
-      if (generatedFile !== explicitOutputFile) {
-        renameSync(generatedFile, explicitOutputFile);
-        // Update the result to show the correct path
-        result.outputFiles[0] = explicitOutputFile;
+    // Directory path
+    if (stats?.isDirectory() || config.outputPath.endsWith("/")) {
+      return { outDir: config.outputPath, explicitOutputFile: null };
+    }
+
+    // Explicit output file
+    if (isExplicitFile) {
+      if (files.length > 1) {
+        console.error(
+          "Error: Cannot use explicit output filename with multiple input files",
+        );
+        console.error("Use a directory path instead: -o <directory>/");
+        process.exit(1);
       }
+      return {
+        outDir: dirname(config.outputPath),
+        explicitOutputFile: resolve(config.outputPath),
+      };
     }
 
-    ResultPrinter.print(result);
-    process.exit(result.success ? 0 : 1);
+    // Default: treat as directory
+    return { outDir: config.outputPath, explicitOutputFile: null };
+  }
+
+  /**
+   * Rename output file if explicit filename was specified.
+   */
+  private static _renameOutputIfNeeded(
+    result: ITranspilerResult,
+    explicitOutputFile: string | null,
+  ): void {
+    if (
+      !explicitOutputFile ||
+      !result.success ||
+      result.outputFiles.length === 0
+    ) {
+      return;
+    }
+
+    const generatedFile = result.outputFiles[0];
+    if (generatedFile !== explicitOutputFile) {
+      renameSync(generatedFile, explicitOutputFile);
+      result.outputFiles[0] = explicitOutputFile;
+    }
   }
 }
 

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

@@ -281,20 +281,24 @@ describe("ArgParser", () => {
         expect(consoleLogSpy).toHaveBeenCalled();
       });
 
-      it("ignores -I flag (yargs without strict mode)", () => {
-        // yargs without strict mode accepts unknown options
-        // The fail handler only triggers on actual parse errors (e.g., missing requiresArg values)
-        // In practice, users will see -I being ignored and the help text shows --include
-        const result = ArgParser.parse(argv("input.cnx", "-I", "path"));
-        expect(result.inputFiles).toEqual(["input.cnx"]);
-        // -I doesn't populate includeDirs - shows users to use --include
-        expect(result.includeDirs).toEqual([]);
+      it("shows helpful message for -I flag (GCC-style)", () => {
+        // Use "-I path" with a space (yargs parses "-I<dir>" as multiple short flags)
+        expect(() => ArgParser.parse(argv("input.cnx", "-I", "path"))).toThrow(
+          "process.exit(1)",
+        );
+        expect(consoleErrorSpy).toHaveBeenCalledWith(
+          "Error: Unknown flag '-I...'",
+        );
+        expect(consoleErrorSpy).toHaveBeenCalledWith(
+          "  Did you mean: --include <dir>",
+        );
       });
 
-      it("ignores unknown flags (yargs without strict mode)", () => {
-        // yargs without strict mode accepts unknown options
-        const result = ArgParser.parse(argv("input.cnx", "--unknown-flag"));
-        expect(result.inputFiles).toEqual(["input.cnx"]);
+      it("rejects unknown flags with error", () => {
+        expect(() =>
+          ArgParser.parse(argv("input.cnx", "--unknown-flag")),
+        ).toThrow("process.exit(1)");
+        expect(exitSpy).toHaveBeenCalledWith(1);
       });
     });
   });

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

@@ -50,6 +50,7 @@ describe("Cli", () => {
       pioInstall: false,
       pioUninstall: false,
       debugMode: false,
+      serveMode: false,
     };
 
     // Default mocks
@@ -95,6 +96,17 @@ describe("Cli", () => {
       expect(result.exitCode).toBe(0);
     });
 
+    it("handles --serve flag", () => {
+      mockParsedArgs.serveMode = true;
+      vi.mocked(ArgParser.parse).mockReturnValue(mockParsedArgs);
+
+      const result = Cli.run();
+
+      expect(result.shouldRun).toBe(false);
+      expect(result.exitCode).toBe(0);
+      expect(result.serveMode).toBe(true);
+    });
+
     it("handles --config flag", () => {
       mockParsedArgs.showConfig = true;
       vi.mocked(ArgParser.parse).mockReturnValue(mockParsedArgs);
@@ -294,6 +306,7 @@ describe("Cli", () => {
         showConfig: false,
         pioInstall: false,
         pioUninstall: false,
+        serveMode: false,
       };
       vi.mocked(ArgParser.parse).mockReturnValue(mockParsedArgs);