c-next 0.2.13 → 0.2.14

package/dist/index.js

@@ -11,7 +11,7 @@ import { hideBin } from "yargs/helpers";
 // package.json
 var package_default = {
   name: "c-next",
-  version: "0.2.13",
+  version: "0.2.14",
   description: "A safer C for embedded systems development. Transpiles to clean, readable C.",
   packageManager: "npm@11.9.0",
   type: "module",
@@ -195,10 +195,8 @@ var ConfigPrinter_default = ConfigPrinter;
 function configureYargs(args, argv) {
   return yargs(args).scriptName("cnext").usage(
     `Usage:
-  cnext <file.cnx>                          Single file (outputs file.c)
+  cnext <file.cnx>                          Entry point file (follows includes)
   cnext <file.cnx> -o <output.c>            Single file with explicit output
-  cnext <files...> -o <dir>                 Multi-file mode
-  cnext <dir>                               Directory mode (recursive)
 
 A safer C for embedded systems development.`
   ).option("o", {
@@ -275,10 +273,8 @@ A safer C for embedded systems development.`
     default: false
   }).epilogue(
     `Examples:
-  cnext main.cnx                            # Outputs main.c (same dir)
+  cnext src/main.cnx                        # Entry point (follows includes)
   cnext main.cnx -o build/main.c            # Explicit output path
-  cnext src/*.cnx -o build/                 # Multiple files to directory
-  cnext src/                                # Compile all .cnx files in src/ (recursive)
 
 Target platforms: teensy41, cortex-m7, cortex-m4, cortex-m3, cortex-m0+, cortex-m0, avr
 
@@ -415,37 +411,36 @@ var PlatformIOCommand = class {
    */
   static install() {
     const { pioIniPath, scriptPath } = getPioProjectPaths();
-    const buildScript = `Import("env")
+    const buildScript = String.raw`Import("env")
 import subprocess
 import sys
 from pathlib import Path
 
 def transpile_cnext():
-    """Transpile all .cnx files before build"""
-    # Find all .cnx files in src directory
-    src_dir = Path("src")
-    if not src_dir.exists():
+    """Transpile from main.cnx entry point — cnext follows includes"""
+    entry = Path("src/main.cnx")
+    if not entry.exists():
         return
 
-    cnx_files = list(src_dir.rglob("*.cnx"))
-    if not cnx_files:
-        return
-
-    print(f"Transpiling {len(cnx_files)} c-next files...")
+    print("Transpiling from main.cnx...")
 
-    for cnx_file in cnx_files:
-        try:
-            result = subprocess.run(
-                ["cnext", str(cnx_file)],
-                check=True,
-                capture_output=True,
-                text=True
-            )
-            print(f"  \u2713 {cnx_file.name}")
-        except subprocess.CalledProcessError as e:
-            print(f"  \u2717 Error: {cnx_file.name}")
-            print(e.stderr)
-            sys.exit(1)
+    try:
+        result = subprocess.run(
+            ["cnext", str(entry)],
+            check=True,
+            capture_output=True,
+            text=True
+        )
+        if result.stdout:
+            lines = result.stdout.strip().split("\n")
+            for line in lines:
+                if line.startswith(("Compiled", "Collected", "Generated")):
+                    print(f"  {line}")
+        print("  ✓ Transpilation complete")
+    except subprocess.CalledProcessError as e:
+        print(f"  ✗ Transpilation failed")
+        print(e.stderr)
+        sys.exit(1)
 
 # Run transpilation at import time (before compilation starts)
 transpile_cnext()
@@ -475,13 +470,12 @@ transpile_cnext()
     console.log("\u2713 PlatformIO integration configured!");
     console.log("");
     console.log("Next steps:");
-    console.log(
-      "  1. Create .cnx files in src/ (alongside your .c/.cpp files)"
-    );
-    console.log("  2. Run: pio run");
+    console.log("  1. Create src/main.cnx as your entry point");
+    console.log("  2. Use #include to pull in other .cnx files");
+    console.log("  3. Run: pio run");
     console.log("");
     console.log(
-      "The transpiler will automatically convert .cnx \u2192 .c before each build."
+      "The transpiler will follow includes from main.cnx automatically."
     );
     console.log("Commit both .cnx and generated .c files to version control.");
   }
@@ -133386,16 +133380,23 @@ var HeaderGeneratorUtils = class _HeaderGeneratorUtils {
       }
     }
     const userIncludeSet = new Set(options.userIncludes ?? []);
-    if (options.cppMode && options.userIncludes) {
-      for (const inc of options.userIncludes) {
-        const hVersion = inc.replace(/\.hpp"/, '.h"').replace(/\.hpp>/, ".h>");
-        userIncludeSet.add(hVersion);
-      }
-    }
+    const extractStem = (inc) => {
+      const match = /["<]([^">]+)[">]/.exec(inc);
+      if (!match) return inc;
+      return match[1].replace(/^.*\//, "").replace(/\.(?:h|hpp)$/, "");
+    };
+    const userIncludeStems = new Set(
+      (options.userIncludes ?? []).map(extractStem)
+    );
     for (const directive of headersToInclude) {
-      if (!userIncludeSet.has(directive)) {
-        lines.push(directive);
+      if (userIncludeSet.has(directive)) {
+        continue;
+      }
+      const stem = extractStem(directive);
+      if (stem && userIncludeStems.has(stem)) {
+        continue;
       }
+      lines.push(directive);
     }
     const hasIncludes = options.includeSystemHeaders !== false || options.userIncludes && options.userIncludes.length > 0 || headersToInclude.size > 0;
     if (hasIncludes) {
@@ -137760,9 +137761,16 @@ var DependencyGraph_default = DependencyGraph;
 // src/transpiler/data/IncludeResolver.ts
 var defaultFs5 = NodeFileSystem_default.instance;
 var IncludeResolver = class _IncludeResolver {
-  constructor(searchPaths, fs = defaultFs5) {
+  /**
+   * @param cppMode Controls .h vs .hpp extension for .cnx include directives.
+   *   Note: In the Transpiler, cppDetected may change after IncludeResolver runs
+   *   (e.g., when a .hpp header is discovered during Stage 2). HeaderGeneratorUtils
+   *   uses stem-based dedup to handle any resulting .h/.hpp mismatch.
+   */
+  constructor(searchPaths, fs = defaultFs5, cppMode = false) {
     this.searchPaths = searchPaths;
     this.fs = fs;
+    this.cppMode = cppMode;
   }
   /**
    * Type helper for accessing IResolvedIncludes externally.
@@ -137771,6 +137779,7 @@ var IncludeResolver = class _IncludeResolver {
   static _resolvedIncludesType = void 0;
   resolvedPaths = /* @__PURE__ */ new Set();
   fs;
+  cppMode;
   /**
    * Extract includes from source content and resolve them to files
    *
@@ -137835,7 +137844,8 @@ var IncludeResolver = class _IncludeResolver {
     }
     if (file.type === EFileType_default.CNext) {
       result.cnextIncludes.push(file);
-      const headerPath = includeInfo.path.replace(/\.cnx$|\.cnext$/, ".h");
+      const ext = this.cppMode ? ".hpp" : ".h";
+      const headerPath = includeInfo.path.replace(/\.cnx$|\.cnext$/, ext);
       const directive = includeInfo.isLocal ? `#include "${headerPath}"` : `#include <${headerPath}>`;
       result.headerIncludeDirectives.set(absolutePath, directive);
     }
@@ -141708,7 +141718,11 @@ var Transpiler = class {
       void 0,
       this.fs
     );
-    const resolver = new IncludeResolver_default(searchPaths, this.fs);
+    const resolver = new IncludeResolver_default(
+      searchPaths,
+      this.fs,
+      this.cppDetected
+    );
     const resolved = resolver.resolve(source, sourcePath);
     this.warnings.push(...resolved.warnings);
     const { headers: allHeaders, warnings: headerWarnings } = IncludeResolver_default.resolveHeadersTransitively(
@@ -141980,7 +141994,11 @@ var Transpiler = class {
       void 0,
       this.fs
     );
-    const resolver = new IncludeResolver_default(searchPaths, this.fs);
+    const resolver = new IncludeResolver_default(
+      searchPaths,
+      this.fs,
+      this.cppDetected
+    );
     const resolved = resolver.resolve(content, cnxFile.path);
     this._collectHeaders(resolved, cnextBaseNames, headerSet);
     this._processCnextIncludes(