rtgl 1.0.0-rc3 → 1.0.0-rc32

package/cli.js

@@ -1,10 +1,12 @@
 #!/usr/bin/env node
 
 import { build, check, scaffold, watch, examples } from "@rettangoli/fe/cli";
-import { generate, report, accept } from "@rettangoli/vt/cli";
-import { buildSite, watchSite, screenshotCommand, initSite } from "@rettangoli/sites/cli";
+import { check as checkContracts } from "@rettangoli/check/cli";
+import { build as buildBe, check as checkBe, watch as watchBe } from "@rettangoli/be/cli";
+import { generate, screenshot, report, accept } from "@rettangoli/vt/cli";
+import { buildSite, watchSite, initSite } from "@rettangoli/sites/cli";
 import { buildSvg } from "@rettangoli/ui/cli";
-import { Command } from "commander";
+import { Command, InvalidArgumentError } from "commander";
 import { readFileSync, existsSync } from "fs";
 import { resolve } from "path";
 import yaml from "js-yaml";
@@ -33,6 +35,27 @@ function collectValues(value, previous = []) {
   return [...previous, value];
 }
 
+function parseIntegerOption(value) {
+  if (!/^-?\d+$/.test(String(value))) {
+    throw new InvalidArgumentError(`Expected an integer but received "${value}"`);
+  }
+
+  const parsed = Number.parseInt(value, 10);
+  if (!Number.isSafeInteger(parsed)) {
+    throw new InvalidArgumentError(`Expected a safe integer but received "${value}"`);
+  }
+
+  return parsed;
+}
+
+function parsePortOption(value) {
+  const parsed = parseIntegerOption(value);
+  if (parsed < 1 || parsed > 65535) {
+    throw new InvalidArgumentError(`Port must be between 1 and 65535, received "${value}"`);
+  }
+  return parsed;
+}
+
 const program = new Command();
 
 program
@@ -52,6 +75,39 @@ Examples:
 `,
 );
 
+program
+  .command("check")
+  .description("Run Rettangoli static contract checks")
+  .option("--dir <path>", "Component directory to scan (repeatable)", collectValues, [])
+  .option("--format <format>", "Output format: text, json, or sarif", "text")
+  .option("--warn-as-error", "Treat warnings as errors")
+  .option("--no-yahtml", "Disable YAHTML attr/prop validation")
+  .option("--expr", "Enable expression scope/type checks")
+  .option("--watch", "Watch for file changes and re-run checks")
+  .option("--watch-interval-ms <ms>", "Watch poll interval in milliseconds", parseIntegerOption, 800)
+  .addHelpText(
+    "after",
+    `
+
+Examples:
+  $ rtgl check
+  $ rtgl check --dir src/components --format json
+  $ rtgl check --warn-as-error
+`,
+  )
+  .action(async (options) => {
+    await checkContracts({
+      cwd: process.cwd(),
+      dirs: options.dir,
+      format: options.format,
+      warnAsError: !!options.warnAsError,
+      includeYahtml: options.yahtml !== false,
+      includeExpression: !!options.expr,
+      watch: !!options.watch,
+      watchIntervalMs: Number.isFinite(options.watchIntervalMs) ? options.watchIntervalMs : 800,
+    });
+  });
+
 const feCommand = program.command("fe").description("Frontend framework");
 
 feCommand
@@ -169,7 +225,7 @@ Examples:
 feCommand
   .command("watch")
   .description("Watch for changes")
-  .option("-p, --port <port>", "The port to use", parseInt, 3001)
+  .option("-p, --port <port>", "The port to use", parsePortOption, 3001)
   .option("-s, --setup-path <path>", "Custom setup file path")
   .addHelpText(
     "after",
@@ -225,16 +281,112 @@ feCommand
     examples(options);
   });
 
+const beCommand = program.command("be").description("Backend framework");
+
+beCommand
+  .command("build")
+  .description("Build backend method registry and app entry")
+  .option("-s, --setup-path <path>", "Custom setup file path")
+  .option("-m, --middleware-dir <path>", "Custom middleware directory path")
+  .option("-o, --outdir <path>", "Generated output directory")
+  .action((options) => {
+    const config = readConfig();
+
+    if (!config) {
+      throw new Error("rettangoli.config.yaml not found");
+    }
+
+    if (!config.be?.dirs?.length) {
+      throw new Error("be.dirs not found or empty in config");
+    }
+
+    const missingDirs = config.be.dirs.filter(
+      (dir) => !existsSync(resolve(process.cwd(), dir)),
+    );
+    if (missingDirs.length > 0) {
+      throw new Error(`Directories do not exist: ${missingDirs.join(", ")}`);
+    }
+
+    options.dirs = config.be.dirs;
+    options.middlewareDir = options.middlewareDir || config.be.middlewareDir || "./src/middleware";
+    options.setup = options.setupPath || config.be.setup || "./src/setup.js";
+    options.outdir = options.outdir || config.be.outdir || "./.rtgl-be/generated";
+    options.domainErrors = config.be.domainErrors || {};
+
+    buildBe(options);
+  });
+
+beCommand
+  .command("check")
+  .description("Validate backend RPC contracts")
+  .option("--format <format>", "Output format: text or json", "text")
+  .option("-m, --middleware-dir <path>", "Custom middleware directory path")
+  .action((options) => {
+    const config = readConfig();
+
+    if (!config) {
+      throw new Error("rettangoli.config.yaml not found");
+    }
+
+    if (!config.be?.dirs?.length) {
+      throw new Error("be.dirs not found or empty in config");
+    }
+
+    const missingDirs = config.be.dirs.filter(
+      (dir) => !existsSync(resolve(process.cwd(), dir)),
+    );
+    if (missingDirs.length > 0) {
+      throw new Error(`Directories do not exist: ${missingDirs.join(", ")}`);
+    }
+
+    options.dirs = config.be.dirs;
+    options.middlewareDir = options.middlewareDir || config.be.middlewareDir || "./src/middleware";
+
+    checkBe(options);
+  });
+
+beCommand
+  .command("watch")
+  .description("Watch backend files and rebuild generated registry")
+  .option("-s, --setup-path <path>", "Custom setup file path")
+  .option("-m, --middleware-dir <path>", "Custom middleware directory path")
+  .option("-o, --outdir <path>", "Generated output directory")
+  .action((options) => {
+    const config = readConfig();
+
+    if (!config) {
+      throw new Error("rettangoli.config.yaml not found");
+    }
+
+    if (!config.be?.dirs?.length) {
+      throw new Error("be.dirs not found or empty in config");
+    }
+
+    const missingDirs = config.be.dirs.filter(
+      (dir) => !existsSync(resolve(process.cwd(), dir)),
+    );
+    if (missingDirs.length > 0) {
+      throw new Error(`Directories do not exist: ${missingDirs.join(", ")}`);
+    }
+
+    options.dirs = config.be.dirs;
+    options.middlewareDir = options.middlewareDir || config.be.middlewareDir || "./src/middleware";
+    options.setup = options.setupPath || config.be.setup || "./src/setup.js";
+    options.outdir = options.outdir || config.be.outdir || "./.rtgl-be/generated";
+    options.domainErrors = config.be.domainErrors || {};
+
+    watchBe(options);
+  });
+
 const vtCommand = program
   .command("vt")
   .description("Rettangoli Visual Testing");
 
 vtCommand
   .command("generate")
-  .description("Generate visualizations")
-  .option("--skip-screenshots", "Skip screenshot generation")
-  .option("--concurrency <number>", "Number of parallel capture workers", parseInt)
-  .option("--timeout <ms>", "Global capture timeout in ms", parseInt)
+  .description("Generate candidate HTML pages only (no screenshots)")
+  .option("--concurrency <number>", "Number of parallel capture workers", parseIntegerOption)
+  .option("--timeout <ms>", "Global capture timeout in ms", parseIntegerOption)
   .option("--wait-event <name>", "Custom event name to mark page ready (uses event wait strategy)")
   .option("--folder <path>", "Run only specs under folder prefix (repeatable)", collectValues, [])
   .option("--group <section-key>", "Run only one section key from vt.sections (repeatable)", collectValues, [])
@@ -253,10 +405,36 @@ vtCommand
     if (options.headed) {
       options.headless = false;
     }
+    options.captureScreenshots = false;
 
     await generate(options);
   });
 
+vtCommand
+  .command("screenshot")
+  .description("Generate candidate HTML pages and capture screenshots")
+  .option("--concurrency <number>", "Number of parallel capture workers", parseIntegerOption)
+  .option("--timeout <ms>", "Global capture timeout in ms", parseIntegerOption)
+  .option("--wait-event <name>", "Custom event name to mark page ready (uses event wait strategy)")
+  .option("--folder <path>", "Run only specs under folder prefix (repeatable)", collectValues, [])
+  .option("--group <section-key>", "Run only one section key from vt.sections (repeatable)", collectValues, [])
+  .option("--item <spec-path>", "Run only one spec path relative to vt/specs (repeatable)", collectValues, [])
+  .option("--headed", "Run Playwright in headed mode")
+  .action(async (options) => {
+    console.log(`rtgl v${packageJson.version}`);
+    const config = readConfig();
+
+    if (!config) {
+      throw new Error("rettangoli.config.yaml not found");
+    }
+
+    options.vtPath = config.vt?.path || "vt";
+    if (options.headed) {
+      options.headless = false;
+    }
+    await screenshot(options);
+  });
+
 vtCommand
   .command("report")
   .description("Create reports")
@@ -315,51 +493,39 @@ sitesCommand
 sitesCommand
   .command("build")
   .description("Build the site")
-  .option("-r, --rootDir <path>", "Path to root directory", "./")
-  .option("-o, --outputPath <path>", "Path to destination directory", "./_site")
-  .option("-s, --screenshots", "Capture screenshots after build", false)
+  .option("-r, --root-dir <path>", "Path to root directory", "./")
+  .option("--rootDir <path>", "Deprecated alias for --root-dir")
+  .option("-o, --output-path <path>", "Path to destination directory", "./_site")
+  .option("--outputPath <path>", "Deprecated alias for --output-path")
+  .option("-q, --quiet", "Suppress non-error logs")
   .action(async (options) => {
-    console.log("Building site with options:", options);
     await buildSite({
       rootDir: options.rootDir,
       outputPath: options.outputPath,
+      quiet: !!options.quiet,
     });
-    console.log("Build completed successfully!");
-
-    // If screenshots option is enabled, run screenshot command
-    if (options.screenshots) {
-      console.log("Capturing screenshots...");
-      await screenshotCommand({
-        rootDir: options.rootDir,
-      });
+    if (!options.quiet) {
+      console.log("Build completed successfully!");
     }
   });
 
 sitesCommand
   .command("watch")
   .description("Watch and rebuild site on changes")
-  .option("-p, --port <port>", "The port to use", parseInt, 3001)
-  .option("-r, --rootDir <path>", "Path to root directory", ".")
-  .option("-s, --screenshots", "Enable automatic screenshot capture on page changes", false)
-  .action(async (options) => {
-    console.log("Starting watch mode with options:", options);
-    watchSite({
-      port: options.port,
-      rootDir: options.rootDir,
-      screenshots: options.screenshots,
-    });
-  });
-
-sitesCommand
-  .command("screenshot")
-  .description("Capture screenshots of all pages")
-  .option("-p, --port <port>", "The port to use for temp server", parseInt, 3001)
-  .option("-r, --rootDir <path>", "Path to root directory", ".")
+  .option("-p, --port <port>", "The port to use", parsePortOption, 3001)
+  .option("-r, --root-dir <path>", "Path to root directory", ".")
+  .option("--rootDir <path>", "Deprecated alias for --root-dir")
+  .option("-o, --output-path <path>", "Path to destination directory", "./_site")
+  .option("--outputPath <path>", "Deprecated alias for --output-path")
+  .option("--reload-mode <mode>", "Reload mode: body (hot body replacement) or full (full-page reload)", "body")
+  .option("-q, --quiet", "Suppress non-error logs")
   .action(async (options) => {
-    console.log("Capturing screenshots with options:", options);
-    await screenshotCommand({
+    await watchSite({
       port: options.port,
       rootDir: options.rootDir,
+      outputPath: options.outputPath,
+      reloadMode: options.reloadMode,
+      quiet: !!options.quiet,
     });
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rtgl",
-  "version": "1.0.0-rc3",
+  "version": "1.0.0-rc32",
   "description": "CLI tool for Rettangoli - A frontend framework and development toolkit",
   "type": "module",
   "bin": {
@@ -47,9 +47,11 @@
   "dependencies": {
     "commander": "^14.0.0",
     "js-yaml": "^4.1.0",
-    "@rettangoli/fe": "1.0.0-rc1",
-    "@rettangoli/sites": "0.2.7",
-    "@rettangoli/vt": "1.0.0-rc2",
-    "@rettangoli/ui": "0.1.31"
+    "@rettangoli/check": "0.1.2",
+    "@rettangoli/be": "1.0.0-rc1",
+    "@rettangoli/fe": "1.0.0-rc5",
+    "@rettangoli/sites": "1.0.0-rc13",
+    "@rettangoli/vt": "1.0.0-rc16",
+    "@rettangoli/ui": "1.0.0-rc16"
   }
 }