@typecad/cuttlefish 1.0.0-alpha.10 → 1.0.0-alpha.12

package/dist/platform/async-runtime.d.ts

@@ -5,4 +5,4 @@ import type { RuntimePolyfillIR } from "../api/shared/index.js";
  * Build a RuntimePolyfillIR for the async Promise runtime, if the program
  * has async functions and the target architecture has stdlib support.
  */
-export declare function buildAsyncRuntimePolyfill(program: ProgramIR, ctx: PlatformContext | undefined, target: string, queueCapacity?: number): RuntimePolyfillIR | null;
+export declare function buildAsyncRuntimePolyfill(program: ProgramIR, ctx: PlatformContext | undefined, target: string, queueCapacity?: number, strategy?: import("../api/shared/platform-strategy.js").PlatformStrategy): RuntimePolyfillIR | null;

package/dist/platform/async-runtime.js

@@ -3,7 +3,7 @@ import { getStdLibSupport, generatePromiseRuntime } from "../api/shared/index.js
  * Build a RuntimePolyfillIR for the async Promise runtime, if the program
  * has async functions and the target architecture has stdlib support.
  */
-export function buildAsyncRuntimePolyfill(program, ctx, target, queueCapacity) {
+export function buildAsyncRuntimePolyfill(program, ctx, target, queueCapacity, strategy) {
     const hasAsync = program.functions.some(fn => fn.isAsync);
     if (!hasAsync)
         return null;
@@ -11,13 +11,22 @@ export function buildAsyncRuntimePolyfill(program, ctx, target, queueCapacity) {
     const stdlib = getStdLibSupport(architecture);
     if (!stdlib.hasVector || !stdlib.hasString)
         return null;
+    // Pass the strategy through so the runtime's now-expression matches the
+    // target (generic bakes a std::chrono expression via currentTimeMillis()
+    // instead of a millis() token the generic target never defines). When the
+    // expression uses std::chrono, the polyfill must carry <chrono> itself —
+    // the generic strategy's forcedIncludes are empty by design.
+    const now = strategy?.currentTimeMillis?.() ?? "millis()";
+    const requiredIncludes = ["<functional>", "<vector>", "<utility>", "<string>"];
+    if (now.includes("std::chrono"))
+        requiredIncludes.push("<chrono>");
     return {
         kind: "polyfill",
         id: "async_runtime",
         domain: "standard",
-        requiredIncludes: ["<functional>", "<vector>", "<utility>", "<string>"],
+        requiredIncludes,
         forwardDeclarations: [],
-        helperStructs: [generatePromiseRuntime(queueCapacity ?? 256)],
+        helperStructs: [generatePromiseRuntime(queueCapacity ?? 256, false, strategy)],
         helperFunctions: [],
         shimMacros: [],
         dependencies: [],

package/dist/platform/generic-strategy.js

@@ -184,7 +184,7 @@ export class GenericStrategy {
     }
     generateNativePolyfills(program, ctx) {
         const helpers = [];
-        const asyncRuntime = buildAsyncRuntimePolyfill(program, ctx, "generic", this.asyncQueueCapacity());
+        const asyncRuntime = buildAsyncRuntimePolyfill(program, ctx, "generic", this.asyncQueueCapacity(), this);
         if (asyncRuntime)
             helpers.push(asyncRuntime);
         return helpers;

package/dist/transpile.js

@@ -29,7 +29,7 @@ import { loadSafetyEngine } from "./safety/safety-bridge.js";
 import { setDisplayProfile, resetDisplayProfile } from "./stores/display-profile-store.js";
 import { setThemeCss, resetThemeCss, setThemeClass } from "./stores/theme-store.js";
 import { emitCpp, registerAllEnumNames } from "./emit/cpp-emitter.js";
-import { readText, writeText } from "./utils/fs.js";
+import { readText, writeText, resetWrittenFiles, wasWrittenThisRun } from "./utils/fs.js";
 import { debug as logDebug, info } from "./utils/logger.js";
 import { loadLibraryDefinitions, generateLibdefStubs } from "./libdef/registry.js";
 import { buildCallGraph } from "./ir/call-graph.js";
@@ -66,12 +66,53 @@ function loadExpectPreprocessor() {
     }
 }
 function cleanOutput(_entryDir, outDir) {
-    // Preserved for incremental-build support: writeText now skips writing when
-    // content is identical, so keeping the existing output dir intact lets
-    // downstream build tools (idf.py/ninja, arduino-cli) reuse their build
-    // caches. Stale files from removed source modules are harmless — they're
-    // not referenced by the current entry file and won't be compiled.
-    // The output dir is still created (via writeText → ensureDir) on first run.
+    // The out dir is NOT wiped: writeText skips writing when content is
+    // identical, so keeping it lets downstream build tools (idf.py/ninja,
+    // arduino-cli) reuse their build caches. Stale generated SOURCES are handled
+    // precisely instead — after emission, sweepStaleGeneratedSources() removes
+    // compiled-source files in the out dir that this run did not write (e.g. a
+    // main.cpp left behind by the old emit naming next to the current src.cpp;
+    // Zephyr's CMakeLists globs src/*.cpp, so a leftover compiles into
+    // duplicate-symbol link errors). The output dir is still created (via
+    // writeText → ensureDir) on first run.
+    void outDir;
+    resetWrittenFiles();
+}
+const GENERATED_SOURCE_EXTENSIONS = [".cpp", ".cc", ".c", ".h", ".ino"];
+/**
+ * Remove stale generated source files from the out dir: compiled-source files
+ * that THIS transpile run did not write. Sweeps only the source layouts the
+ * emit pipeline uses (out dir root, src/, main/) and never recurses — build
+ * trees (e.g. Zephyr's out/build with its own generated .c files) are
+ * untouched, and neither are sidecar JSONs.
+ */
+function sweepStaleGeneratedSources(outDir) {
+    for (const sub of ["", "src", "main"]) {
+        const dir = sub ? path.join(outDir, sub) : outDir;
+        let entries;
+        try {
+            entries = fs.readdirSync(dir, { withFileTypes: true });
+        }
+        catch {
+            continue; // layout subdir not used by this framework
+        }
+        for (const entry of entries) {
+            if (!entry.isFile())
+                continue;
+            if (!GENERATED_SOURCE_EXTENSIONS.some((ext) => entry.name.toLowerCase().endsWith(ext)))
+                continue;
+            const full = path.join(dir, entry.name);
+            if (wasWrittenThisRun(full))
+                continue;
+            try {
+                fs.unlinkSync(full);
+                info(`Removed stale generated source: ${path.relative(process.cwd(), full)}`);
+            }
+            catch {
+                // Locked/read-only file — leave it; best-effort cleanup.
+            }
+        }
+    }
 }
 /**
  * Auto-generates .d.ts files for C++ modules that are missing declarations.
@@ -822,6 +863,13 @@ export async function transpileFile(options) {
         }
     }
     profiler.endTimer("post:flatten");
+    // Remove stale generated sources (renamed entries, removed modules) so
+    // downstream globs (Zephyr's CMakeLists src/*.cpp) don't compile leftovers
+    // into duplicate-symbol link errors. Runs after every write of this run,
+    // including the toolchain prepare hook above.
+    profiler.startTimer("post:sweep-stale");
+    sweepStaleGeneratedSources(outDir);
+    profiler.endTimer("post:sweep-stale");
     // Profiler session ends (profiling disabled - no report generation)
     // ── Generate diagnostics report if enabled ──────────────────────────────
     let diagnosticsReportPath;

package/dist/utils/cli.js

@@ -409,8 +409,9 @@ export function parseCommandLine(argv) {
             platformContext: {},
         };
     }
-    // licenses subcommand — scan installed Arduino libraries for SPDX licenses
-    if (firstArg === "licenses") {
+    // licenses subcommand — scan the project's dependencies for SPDX licenses.
+    // Accept `license` (singular) as an alias so both spellings work.
+    if (firstArg === "licenses" || firstArg === "license") {
         return {
             command: "licenses",
             strict: argv.includes("--strict"),

package/dist/utils/fs.d.ts

@@ -1,5 +1,7 @@
 export declare function ensureDir(dirPath: string): void;
 export declare function readText(filePath: string): string;
+export declare function resetWrittenFiles(): void;
+export declare function wasWrittenThisRun(filePath: string): boolean;
 export declare function writeText(filePath: string, content: string): void;
 export declare function listFiles(dirPath: string, extension: string): string[];
 /**

package/dist/utils/fs.js

@@ -8,10 +8,26 @@ export function ensureDir(dirPath) {
 export function readText(filePath) {
     return fs.readFileSync(filePath, "utf8");
 }
+// Paths written (or confirmed identical) via writeText since the last
+// resetWrittenFiles() call. The transpiler uses this to sweep stale generated
+// sources from the out dir — files left behind by renamed entries or removed
+// source modules that a downstream glob (e.g. Zephyr's CMakeLists
+// `file(GLOB src/*.cpp)`) would otherwise compile, producing duplicate-symbol
+// link errors.
+const writtenFiles = new Set();
+export function resetWrittenFiles() {
+    writtenFiles.clear();
+}
+export function wasWrittenThisRun(filePath) {
+    return writtenFiles.has(path.resolve(filePath));
+}
 export function writeText(filePath, content) {
     ensureDir(path.dirname(filePath));
+    const resolved = path.resolve(filePath);
     // Skip writing when content is identical — preserves mtime so downstream
     // build tools (idf.py/ninja, arduino-cli, make) can skip recompilation.
+    // The file still counts as "written this run" (it is current output).
+    writtenFiles.add(resolved);
     try {
         if (fs.readFileSync(filePath, "utf8") === content)
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typecad/cuttlefish",
-  "version": "1.0.0-alpha.10",
+  "version": "1.0.0-alpha.12",
   "description": "TypeScript to C++ transpiler — native, Arduino, and bare-metal targets",
   "type": "module",
   "main": "./dist/transpile.js",
@@ -99,8 +99,8 @@
     "zod": "^3.24.0"
   },
   "peerDependencies": {
-    "@typecad/ui": "1.0.0-alpha.10",
-    "@typecad/safety": "1.0.0-alpha.10"
+    "@typecad/ui": "1.0.0-alpha.12",
+    "@typecad/safety": "1.0.0-alpha.12"
   },
   "peerDependenciesMeta": {
     "@typecad/ui": {
@@ -111,7 +111,8 @@
     }
   },
   "optionalDependencies": {
-    "@typecad/framework-native": "1.0.0-alpha.10"
+    "@typecad/expect": "1.0.0-alpha.12",
+    "@typecad/framework-native": "1.0.0-alpha.12"
   },
   "devDependencies": {
     "@types/node": "^22.10.7"