rtgl 0.0.11-rc8 → 0.0.12

package/cli.js

@@ -2,7 +2,8 @@
 
 import { build, scaffold, watch, examples } from "@rettangoli/fe/cli";
 import { generate, report, accept } from "@rettangoli/vt/cli";
-import { copyPagesToSite } from "@rettangoli/sites/cli";
+import { buildSite, watchSite, screenshotCommand } from "@rettangoli/sites/cli";
+import { buildSvg } from "@rettangoli/ui/cli";
 import { Command } from "commander";
 import { readFileSync, existsSync } from "fs";
 import { resolve } from "path";
@@ -54,6 +55,8 @@ feCommand
   .command("build")
   .description("Build UI components")
   .option("-o, --outfile <path>", "The output file")
+  .option("-s, --setup-path <path>", "Custom setup file path")
+  .option("-d, --development", "Development mode (no minification, no source maps)")
   .addHelpText(
     "after",
     `
@@ -62,6 +65,10 @@ Examples:
   $ rettangoli fe build
   $ rettangoli fe build --outfile ./dist/bundle.js
   $ rettangoli fe build -o ./public/js/main.js
+  $ rettangoli fe build --development
+  $ rettangoli fe build -d -o ./dist/dev.js
+  $ rettangoli fe build -s src/setup.tauri.js
+  $ rettangoli fe build --setup-path src/setup.web.js
 `,
   )
   .action((options) => {
@@ -85,7 +92,8 @@ Examples:
 
     // Pass dirs, setup, and outfile from config
     options.dirs = config.fe.dirs;
-    options.setup = config.fe.setup || "setup.js";
+    // Use setup-path if provided, otherwise use config setup
+    options.setup = options.setupPath || config.fe.setup || "setup.js";
 
     // Use config outfile if not specified via CLI option
     if (!options.outfile && config.fe.outfile) {
@@ -124,6 +132,7 @@ feCommand
   .command("watch")
   .description("Watch for changes")
   .option("-p, --port <port>", "The port to use", parseInt, 3001)
+  .option("-s, --setup-path <path>", "Custom setup file path")
   .addHelpText(
     "after",
     `
@@ -132,6 +141,8 @@ Examples:
   $ rettangoli fe watch
   $ rettangoli fe watch --port 8080
   $ rettangoli fe watch -p 4000
+  $ rettangoli fe watch -s src/setup.tauri.js
+  $ rettangoli fe watch --setup-path src/setup.web.js
 `,
   )
   .action((options) => {
@@ -155,7 +166,8 @@ Examples:
 
     // Pass dirs, setup, and outfile from config
     options.dirs = config.fe.dirs;
-    options.setup = config.fe.setup || "setup.js";
+    // Use setup-path if provided, otherwise use config setup
+    options.setup = options.setupPath || config.fe.setup || "setup.js";
 
     // Use config outfile if not specified via CLI option
     if (!options.outfile && config.fe.outfile) {
@@ -230,17 +242,89 @@ const sitesCommand = program.command("sites").description("Rettangoli Sites");
 sitesCommand
   .command("build")
   .description("Build the site")
-  .option("-r, --resources <path>", "Path to resources directory", "./sitic")
-  .option("-p, --pages <path>", "Path to pages directory", "./pages")
-  .option("-o, --output <path>", "Path to destination directory", "./_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)
   .action(async (options) => {
     console.log("Building site with options:", options);
-    await copyPagesToSite({
-      resourcesPath: options.resources,
-      pagesPath: options.pages,
-      outputPath: options.output,
+    await buildSite({
+      rootDir: options.rootDir,
+      outputPath: options.outputPath,
     });
     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,
+      });
+    }
+  });
+
+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", ".")
+  .action(async (options) => {
+    console.log("Capturing screenshots with options:", options);
+    await screenshotCommand({
+      port: options.port,
+      rootDir: options.rootDir,
+    });
+  });
+
+const uiCommand = program.command("ui").description("UI component tools");
+
+uiCommand
+  .command("build-svg")
+  .description("Build SVG icons from directory")
+  .option("-d, --dir <dir>", "Directory containing SVG files")
+  .option("-o, --outfile <path>", "Output file path")
+  .addHelpText(
+    "after",
+    `
+
+Examples:
+  $ rettangoli ui build-svg
+  $ rettangoli ui build-svg --dir ./icons --outfile ./dist/icons.js
+  $ rettangoli ui build-svg -d ./assets/svg -o ./public/js/icons.js
+`,
+  )
+  .action((options) => {
+    const config = readConfig();
+
+    // Use config values if options not provided
+    if (!options.dir && config?.ui?.svg?.dir) {
+      options.dir = config.ui.svg.dir;
+    }
+    if (!options.outfile && config?.ui?.svg?.outfile) {
+      options.outfile = config.ui.svg.outfile;
+    }
+
+    // Check if required options are available (either from CLI or config)
+    if (!options.dir || !options.outfile) {
+      console.error("Error: Both dir and outfile are required. Provide them via CLI options or in rettangoli.config.yaml under ui.svg");
+      process.exit(1);
+    }
+
+    buildSvg(options);
   });
 
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rtgl",
-  "version": "0.0.11-rc8",
+  "version": "0.0.12",
   "description": "CLI tool for Rettangoli - A frontend framework and development toolkit",
   "type": "module",
   "bin": {
@@ -47,8 +47,9 @@
   "dependencies": {
     "commander": "^14.0.0",
     "js-yaml": "^4.1.0",
-    "@rettangoli/fe": "0.0.7-rc5",
-    "@rettangoli/sites": "0.1.1",
-    "@rettangoli/vt": "0.0.2-rc3"
+    "@rettangoli/fe": "0.0.8",
+    "@rettangoli/sites": "0.2.0-rc7",
+    "@rettangoli/vt": "0.0.2-rc3",
+    "@rettangoli/ui": "0.1.3"
   }
 }