@typecad/expect 1.0.0-alpha.3 → 1.0.0-alpha.6

package/README.md

@@ -152,13 +152,13 @@ All numeric matchers return the parent `Suite`, so you can continue the chain wi
 
 ```bash
 # Run a specific file
-npx cuttlefish-test examples/my-sensor.test.ts
+npx --package=@typecad/expect cuttlefish-test examples/my-sensor.test.ts
 
 # Run all test files matched by config include patterns
-npx cuttlefish-test
+npx --package=@typecad/expect cuttlefish-test
 
 # Override the port at run-time
-npx cuttlefish-test --port /dev/ttyACM0 examples/my-sensor.test.ts
+npx --package=@typecad/expect cuttlefish-test --port /dev/ttyACM0 examples/my-sensor.test.ts
 ```
 
 Or via the npm script defined in the root `package.json`:
@@ -253,10 +253,10 @@ Example flow:
 
 ```bash
 # 1. Compile and upload the serial-output showcase
-npx cuttlefish src/23-transpiler-showcase.ts --compile --upload --port COM4
+npx @typecad/cuttlefish src/23-transpiler-showcase.ts --compile --upload --port COM4
 
 # 2. Run the on-hardware expect test against the connected Uno
-npx cuttlefish-test examples/24-uno-validation.test.ts --port COM4
+npx --package=@typecad/expect cuttlefish-test examples/24-uno-validation.test.ts --port COM4
 ```
 
 This hybrid workflow is the recommended way to confirm that simple variables, arithmetic, arrays, enums, functions, GPIO, and analog input are behaving correctly on real Uno hardware.

package/dist/host/compiler.js

@@ -8,6 +8,14 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { spawnSync } from 'node:child_process';
 import { parseConfigAST } from './config.js';
+import { checkArduinoEnv } from '@typecad/arduino-cli';
+/** Format a check failure into the `error` field used by CompileResult/UploadResult. */
+function formatEnvFailure(failure) {
+    const lines = [...failure.messages];
+    if (failure.fixCommand)
+        lines.push(`  Fix: ${failure.fixCommand}`);
+    return lines.join('\n');
+}
 /**
  * Transpile preprocessed TypeScript source to a C++ Arduino sketch.
  *
@@ -77,6 +85,14 @@ export function transpileTestFile(preprocessedSource, originalFilePath, projectR
  * Compile the Arduino sketch using arduino-cli.
  */
 export function compileSketch(sketchDir, buildTarget) {
+    // Hard gate: verify arduino-cli + core before spawning.
+    {
+        const gate = checkArduinoEnv(buildTarget);
+        if (!gate.ok) {
+            const message = formatEnvFailure(gate);
+            return { success: false, sketchDir, sketchPath: '', output: message, error: message };
+        }
+    }
     const result = spawnSync('arduino-cli', ['compile', '--fqbn', buildTarget, sketchDir], { encoding: 'utf8', timeout: 120000 });
     const output = `${result.stdout ?? ''}\n${result.stderr ?? ''}`.trim();
     return {
@@ -91,6 +107,14 @@ export function compileSketch(sketchDir, buildTarget) {
  * Upload the compiled sketch to the board.
  */
 export function uploadSketch(sketchDir, buildTarget, port) {
+    // Hard gate: verify arduino-cli + core before spawning.
+    {
+        const gate = checkArduinoEnv(buildTarget);
+        if (!gate.ok) {
+            const message = formatEnvFailure(gate);
+            return { success: false, output: message, error: message };
+        }
+    }
     const result = spawnSync('arduino-cli', ['upload', '--fqbn', buildTarget, '--port', port, sketchDir], { encoding: 'utf8', timeout: 60000 });
     const output = `${result.stdout ?? ''}\n${result.stderr ?? ''}`.trim();
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typecad/expect",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.6",
   "description": "Hardware test framework for TypeCAD — vitest-style assertions over serial",
   "type": "module",
   "main": "./dist/index.js",
@@ -39,10 +39,11 @@
   },
   "dependencies": {
     "typescript": "^5.7.3",
-    "serialport": "^12.0.0"
+    "serialport": "^12.0.0",
+    "@typecad/arduino-cli": "1.0.0-alpha.6"
   },
   "devDependencies": {
-    "@typecad/cuttlefish": "1.0.0-alpha.3",
+    "@typecad/cuttlefish": "1.0.0-alpha.6",
     "@types/node": "^22.10.7"
   },
   "license": "MIT",