skir 0.0.6 → 0.0.7

package/dist/project_initializer.js

@@ -1,31 +1,113 @@
-import * as fs from "fs";
-import * as paths from "path";
+import * as FileSystem from "fs";
+import * as Paths from "path";
+import { rewritePathForRendering } from "./io.js";
 export function initializeProject(rootDir) {
-    const skirYmlPath = paths.join(rootDir, "skir.yml");
+    const skirYmlPath = Paths.join(rootDir, "skir.yml");
     // Check if skir.yml already exists
-    if (fs.existsSync(skirYmlPath)) {
+    if (FileSystem.existsSync(skirYmlPath)) {
         console.log("A skir.yml file already exists in this directory. Skipping project initialization.");
         return;
     }
     // Create skir.yml file
-    fs.writeFileSync(skirYmlPath, SKIR_YML_CONTENT, "utf-8");
+    FileSystem.writeFileSync(skirYmlPath, SKIR_YML_CONTENT, "utf-8");
     // Check if skir-src directory exists
-    const skirSrcDir = paths.join(rootDir, "skir-src");
-    if (!fs.existsSync(skirSrcDir)) {
+    const skirSrcDir = Paths.join(rootDir, "skir-src");
+    if (!FileSystem.existsSync(skirSrcDir)) {
         // Create skir-src directory
-        fs.mkdirSync(skirSrcDir, { recursive: true });
+        FileSystem.mkdirSync(skirSrcDir, { recursive: true });
         // Create hello_world.skir file
-        const helloWorldPath = paths.join(skirSrcDir, "hello_world.skir");
-        fs.writeFileSync(helloWorldPath, HELLO_WORLD_SKIR_CONTENT, "utf-8");
+        const helloWorldPath = Paths.join(skirSrcDir, "hello_world.skir");
+        FileSystem.writeFileSync(helloWorldPath, HELLO_WORLD_SKIR_CONTENT, "utf-8");
     }
-    console.log(`Done. Please edit: ${paths.resolve(skirYmlPath)}`);
+    console.log(`Done. Please edit: ${rewritePathForRendering(skirYmlPath)}`);
 }
-const SKIR_YML_CONTENT = `srcDir: skir-src
+const SKIR_YML_CONTENT = `# Configuration file for Skir code generator
+#
+# Documentation: https://skir.build/
+#
+# Cheat sheet:
+#   npx skir gen          Generate code from .skir files
+#   npx skir gen --watch  Watch for changes and regenerate automatically
+#   npx skir format       Format all .skir files
+#   npx skir snapshot     Take a snapshot of the source directory, verify no
+#                         breaking changes since last snapshot
 
+# Directory containing .skir files
+srcDir: skir-src
+
+# Uncomment and configure the generators for your target language(s).
 generators:
-  - mod: skir-python-gen
-    skiroutDir: ./skirout
-    config: {}
+  # # --------------------------------------------------------------------------
+  # # C++ code generator
+  # # Home: https://github.com/gepheum/skir-cc-gen
+  # # To install runtime dependencies, follow instructions in repository README
+  # # --------------------------------------------------------------------------
+  # - mod: skir-cc-gen
+  #   outDir: ./skirout
+  #   config:
+  #     # Set to true if you use GoogleTest
+  #     writeGoogleTestHeaders: false
+
+  # # --------------------------------------------------------------------------
+  # # Dart code generator
+  # # Home: https://github.com/gepheum/skir-dart-gen
+  # # To install runtime dependencies: dart pub add skir_client
+  # # --------------------------------------------------------------------------
+  # - mod: skir-dart-gen
+  #   outDir: ./skirout
+  #   config: {}
+
+  # # --------------------------------------------------------------------------
+  # # Java code generator
+  # # Home: https://github.com/gepheum/skir-java-gen
+  # # Add the following line to your build.gradle dependencies:
+  # #    implementation("build.skir:skir-client:latest.release")
+  # # --------------------------------------------------------------------------
+  # - mod: skir-java-gen
+  #   outDir: ./src/main/java/skirout
+  #   config: {}
+  #   # Alternatively:
+  #   # outDir: ./src/main/java/skirout/my/project
+  #   # config:
+  #   #   packagePrefix: "my.project."
+
+  # # --------------------------------------------------------------------------
+  # # Kotlin code generator
+  # # Home: https://github.com/gepheum/skir-kotlin-gen
+  # # Add the following line to your build.gradle dependencies:
+  # #   implementation("build.skir:skir-client:latest.release")
+  # # --------------------------------------------------------------------------
+  # - mod: skir-kotlin-gen
+  #   outDir: ./src/main/kotlin/skirout
+  #   config: {}
+  #   # Alternatively:
+  #   # outDir: ./src/main/kotlin/skirout/my/project
+  #   # config:
+  #   #   packagePrefix: "my.project."
+
+  # # --------------------------------------------------------------------------
+  # # Python code generator
+  # # Home: https://github.com/gepheum/skir-python-gen
+  # # To install runtime dependencies: pip install skir-client
+  # # --------------------------------------------------------------------------
+  # - mod: skir-python-gen
+  #   outDir: ./skirout
+  #   config: {}
+  #   # Alternatively:
+  #   # outDir: ./my/project/skirout
+  #   # config:
+  #   #   packagePrefix: "my.project."
+
+  # # --------------------------------------------------------------------------
+  # # TypeScript/JavaScript code generator
+  # # Home: https://github.com/gepheum/skir-typescript-gen
+  # # To install runtime dependencies: npm i skir-client
+  # # --------------------------------------------------------------------------
+  # - mod: skir-typescript-gen
+  #   outDir: ./src/skirout
+  #   config:
+  #     # Use ".js" for ES modules, "" for CommonJS
+  #     importPathExtension: ".js"
 `;
 const HELLO_WORLD_SKIR_CONTENT = `/// A point in 2D space.
 struct Point {

package/dist/project_initializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"project_initializer.js","sourceRoot":"","sources":["../src/project_initializer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,KAAK,MAAM,MAAM,CAAC;AAE9B,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEpD,mCAAmC;IACnC,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,CACT,oFAAoF,CACrF,CAAC;QACF,OAAO;IACT,CAAC;IAED,uBAAuB;IACvB,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAEzD,qCAAqC;IACrC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACnD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,4BAA4B;QAC5B,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE9C,+BAA+B;QAC/B,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;QAClE,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,wBAAwB,EAAE,OAAO,CAAC,CAAC;IACtE,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,sBAAsB,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,gBAAgB,GAAG;;;;;;CAMxB,CAAC;AAEF,MAAM,wBAAwB,GAAG;;;;;;;CAOhC,CAAC"}
+{"version":3,"file":"project_initializer.js","sourceRoot":"","sources":["../src/project_initializer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,IAAI,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAElD,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEpD,mCAAmC;IACnC,IAAI,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CACT,oFAAoF,CACrF,CAAC;QACF,OAAO;IACT,CAAC;IAED,uBAAuB;IACvB,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAEjE,qCAAqC;IACrC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACnD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACvC,4BAA4B;QAC5B,UAAU,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEtD,+BAA+B;QAC/B,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;QAClE,UAAU,CAAC,aAAa,CAAC,cAAc,EAAE,wBAAwB,EAAE,OAAO,CAAC,CAAC;IAC9E,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,sBAAsB,uBAAuB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuFxB,CAAC;AAEF,MAAM,wBAAwB,GAAG;;;;;;;CAOhC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skir",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "",
   "homepage": "https://github.com/gepheum/skir#readme",
   "bugs": {
@@ -54,17 +54,19 @@
     "zod": "^4.2.1"
   },
   "devDependencies": {
+    "@eslint/js": "^9.39.2",
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.6.0",
-    "@typescript-eslint/eslint-plugin": "^6.13.0",
-    "@typescript-eslint/parser": "^6.13.0",
+    "@typescript-eslint/eslint-plugin": "^8.50.1",
+    "@typescript-eslint/parser": "^8.50.1",
     "buckwheat": "^1.1.2",
-    "eslint": "^8.54.0",
-    "mocha": "^10.8.2",
+    "eslint": "^9.39.2",
+    "mocha": "^11.7.5",
     "prettier": "^3.2.4",
     "prettier-plugin-organize-imports": "^4.2.0",
     "ts-node": "^10.9.2",
     "tsx": "^4.21.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "typescript-eslint": "^8.50.1"
   }
 }

package/src/command_line_parser.ts

@@ -80,30 +80,33 @@ export function parseCommandLine(args: string[]): ParsedArgs {
 const COMMAND_BASE = "npx skir";
 
 const HELP_TEXT = `
-Usage: ${COMMAND_BASE} <command> [subcommand] [options]
+Usage: ${COMMAND_BASE} <command> [options]
 
 Commands:
-  gen [watch]           Generate code from Skir source files to target languages
-                        watch: Automatically regenerate when .skir files change
-  format [check]        Format all .skir files in the specified directory
-                        check: Fail if code is not properly formatted
-  snapshot [check|view] Manage .skir file snapshots for compatibility checking
-                        check: Fail if there are breaking changes since last snapshot
-                        view: Display the last snapshot
-  init                  Initialize a new Skir project with a minimal skir.yml file
-  help                  Display this help message
+  init               Initialize a new project with a minimal skir.yml file
+  gen                Generate code from .skir files to target languages
+  format             Format all .skir files in the source directory
+  snapshot           Take a snapshot of the source directory, look for
+                       breaking changes since the last snapshot
+  help               Display this help message
 
 Options:
-  --root, -r <path>    Path to the directory containing the skir.yml configuration file
+  --root, -r <path>  Path to the directory containing the skir.yml file
+  --watch, -w        Automatically run code generation when .skir files change
+                       (gen only)
+  --check            Fail if code is not properly formatted (format) or if there
+                       are breaking changes (snapshot)
+  --view             Display the last snapshot (snapshot only)
 
 Examples:
+  ${COMMAND_BASE} init
   ${COMMAND_BASE} gen
-  ${COMMAND_BASE} gen watch
+  ${COMMAND_BASE} gen --watch
   ${COMMAND_BASE} format --root path/to/root/dir
-  ${COMMAND_BASE} format check -r path/to/root/dir
+  ${COMMAND_BASE} format --check -r path/to/root/dir
   ${COMMAND_BASE} snapshot
-  ${COMMAND_BASE} snapshot check
-  ${COMMAND_BASE} snapshot view --root path/to/root/dir
+  ${COMMAND_BASE} snapshot --check
+  ${COMMAND_BASE} snapshot --view --root path/to/root/dir
 `;
 
 export class CommandLineParseError extends Error {
@@ -115,7 +118,9 @@ export class CommandLineParseError extends Error {
 
 type ParsedOptions = {
   root?: string;
-  subcommand?: string;
+  watch?: boolean;
+  check?: boolean;
+  view?: boolean;
   unknown: string[];
 };
 
@@ -128,7 +133,21 @@ function parseOptions(args: string[]): ParsedOptions {
     const arg = args[i];
     if (!arg) continue;
 
-    if (arg === "--root" || arg === "-r") {
+    // Check for --option=value syntax
+    if (arg.startsWith("--root=") || arg.startsWith("-r=")) {
+      const value = arg.substring(arg.indexOf("=") + 1);
+      if (!value) {
+        throw new CommandLineParseError(
+          `Option ${arg.split("=")[0]} requires a value`,
+        );
+      }
+      if (options.root !== undefined) {
+        throw new CommandLineParseError(
+          `Option ${arg.split("=")[0]} specified multiple times`,
+        );
+      }
+      options.root = value;
+    } else if (arg === "--root" || arg === "-r") {
       if (i + 1 >= args.length) {
         throw new CommandLineParseError(`Option ${arg} requires a value`);
       }
@@ -139,14 +158,32 @@ function parseOptions(args: string[]): ParsedOptions {
       }
       options.root = args[i + 1];
       i++; // Skip the next argument as it's the value
+    } else if (arg === "--watch" || arg === "-w") {
+      if (options.watch) {
+        throw new CommandLineParseError(
+          `Option ${arg} specified multiple times`,
+        );
+      }
+      options.watch = true;
+    } else if (arg === "--check") {
+      if (options.check) {
+        throw new CommandLineParseError(
+          `Option --check specified multiple times`,
+        );
+      }
+      options.check = true;
+    } else if (arg === "--view") {
+      if (options.view) {
+        throw new CommandLineParseError(
+          `Option --view specified multiple times`,
+        );
+      }
+      options.view = true;
     } else if (arg.startsWith("-")) {
       options.unknown.push(arg);
     } else {
-      // Positional argument - treat as subcommand
-      if (options.subcommand !== undefined) {
-        throw new CommandLineParseError(`Unexpected argument: ${arg}`);
-      }
-      options.subcommand = arg;
+      // Positional argument - not allowed anymore
+      throw new CommandLineParseError(`Unexpected argument: ${arg}`);
     }
   }
 
@@ -156,64 +193,82 @@ function parseOptions(args: string[]): ParsedOptions {
 function buildGenCommand(options: ParsedOptions): ParsedArgs {
   validateNoUnknownOptions(options, "gen");
 
-  if (options.subcommand !== undefined && options.subcommand !== "watch") {
+  if (options.check) {
+    throw new CommandLineParseError(
+      `Option --check is not valid for 'gen' command`,
+    );
+  }
+  if (options.view) {
     throw new CommandLineParseError(
-      `Unknown subcommand for 'gen': ${options.subcommand}`,
+      `Option --view is not valid for 'gen' command`,
     );
   }
 
   return {
     kind: "gen",
     root: options.root,
-    subcommand: options.subcommand === "watch" ? "watch" : undefined,
+    subcommand: options.watch ? "watch" : undefined,
   };
 }
 
 function buildFormatCommand(options: ParsedOptions): ParsedArgs {
   validateNoUnknownOptions(options, "format");
 
-  if (options.subcommand !== undefined && options.subcommand !== "check") {
+  if (options.watch) {
     throw new CommandLineParseError(
-      `Unknown subcommand for 'format': ${options.subcommand}`,
+      `Option --watch is not valid for 'format' command`,
+    );
+  }
+  if (options.view) {
+    throw new CommandLineParseError(
+      `Option --view is not valid for 'format' command`,
     );
   }
 
   return {
     kind: "format",
     root: options.root,
-    subcommand: options.subcommand === "check" ? "check" : undefined,
+    subcommand: options.check ? "check" : undefined,
   };
 }
 
 function buildSnapshotCommand(options: ParsedOptions): ParsedArgs {
   validateNoUnknownOptions(options, "snapshot");
 
-  if (
-    options.subcommand !== undefined &&
-    options.subcommand !== "check" &&
-    options.subcommand !== "view"
-  ) {
+  if (options.watch) {
+    throw new CommandLineParseError(
+      `Option --watch is not valid for 'snapshot' command`,
+    );
+  }
+  if (options.check && options.view) {
     throw new CommandLineParseError(
-      `Unknown subcommand for 'snapshot': ${options.subcommand}`,
+      `Options --check and --view cannot be used together`,
     );
   }
 
   return {
     kind: "snapshot",
     root: options.root,
-    subcommand:
-      options.subcommand === "check" || options.subcommand === "view"
-        ? options.subcommand
-        : undefined,
+    subcommand: options.check ? "check" : options.view ? "view" : undefined,
   };
 }
 
 function buildInitCommand(options: ParsedOptions): ParsedArgs {
   validateNoUnknownOptions(options, "init");
 
-  if (options.subcommand !== undefined) {
+  if (options.watch) {
+    throw new CommandLineParseError(
+      `Option --watch is not valid for 'init' command`,
+    );
+  }
+  if (options.check) {
+    throw new CommandLineParseError(
+      `Option --check is not valid for 'init' command`,
+    );
+  }
+  if (options.view) {
     throw new CommandLineParseError(
-      `Unknown subcommand for 'init': ${options.subcommand}`,
+      `Option --view is not valid for 'init' command`,
     );
   }
 

package/src/compiler.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import * as fs from "fs/promises";
+import * as FileSystem from "fs/promises";
 import { glob } from "glob";
-import * as paths from "path";
+import * as Paths from "path";
 import type { CodeGenerator } from "skir-internal";
 import Watcher from "watcher";
 import { parseCommandLine } from "./command_line_parser.js";
@@ -14,8 +14,13 @@ import {
   renderErrors,
   renderSkirConfigErrors,
 } from "./error_renderer.js";
+import { ExitError } from "./exit_error.js";
 import { formatModule } from "./formatter.js";
-import { REAL_FILE_SYSTEM } from "./io.js";
+import {
+  isDirectory,
+  REAL_FILE_SYSTEM,
+  rewritePathForRendering,
+} from "./io.js";
 import { collectModules } from "./module_collector.js";
 import { ModuleSet } from "./module_set.js";
 import { initializeProject } from "./project_initializer.js";
@@ -35,14 +40,12 @@ async function makeGeneratorBundle(
 ): Promise<GeneratorBundle> {
   const generator = await importCodeGenerator(config.mod);
   let skiroutDirs: string[];
-  if (config.outDir === undefined) {
-    skiroutDirs = ["skirout"];
-  } else if (typeof config.outDir === "string") {
+  if (typeof config.outDir === "string") {
     skiroutDirs = [config.outDir];
   } else {
     skiroutDirs = config.outDir;
   }
-  skiroutDirs = skiroutDirs.map((d) => paths.join(root, d));
+  skiroutDirs = skiroutDirs.map((d) => Paths.join(root, d));
   return {
     generator: generator,
     config: config.config,
@@ -133,7 +136,7 @@ class WatchModeMainLoop {
           const successMessage = `Generation succeeded at ${date}`;
           console.log(makeGreen(successMessage));
           console.log("\nWaiting for changes in files matching:");
-          const glob = paths.resolve(paths.join(this.srcDir, "/**/*.skir"));
+          const glob = Paths.resolve(Paths.join(this.srcDir, "/**/*.skir"));
           console.log(`  ${glob}`);
         }
         return true;
@@ -150,11 +153,11 @@ class WatchModeMainLoop {
     const { skiroutDirs } = this;
     const preExistingAbsolutePaths = new Set<string>();
     for (const skiroutDir of skiroutDirs) {
-      await fs.mkdir(skiroutDir, { recursive: true });
+      await FileSystem.mkdir(skiroutDir, { recursive: true });
 
       // Collect all the files in all the skirout dirs.
       (
-        await glob(paths.join(skiroutDir, "**/*"), { withFileTypes: true })
+        await glob(Paths.join(skiroutDir, "**/*"), { withFileTypes: true })
       ).forEach((p) => preExistingAbsolutePaths.add(p.fullpath()));
     }
 
@@ -169,7 +172,9 @@ class WatchModeMainLoop {
       for (const file of files) {
         const { path } = file;
         if (pathToFile.has(path)) {
-          throw new Error(`Multiple generators produce ${path}`);
+          throw new ExitError(
+            "Multiple generators produce " + rewritePathForRendering(path),
+          );
         }
         pathToFile.set(path, file);
         pathToGenerator.set(path, generator);
@@ -179,10 +184,10 @@ class WatchModeMainLoop {
           for (
             let pathToKeep = path;
             pathToKeep !== ".";
-            pathToKeep = paths.dirname(pathToKeep)
+            pathToKeep = Paths.dirname(pathToKeep)
           ) {
             preExistingAbsolutePaths.delete(
-              paths.resolve(paths.join(skiroutDir, pathToKeep)),
+              Paths.resolve(Paths.join(skiroutDir, pathToKeep)),
             );
           }
         }
@@ -196,9 +201,9 @@ class WatchModeMainLoop {
         const oldFile = lastWriteBatch.pathToFile.get(p);
         const generator = pathToGenerator.get(p)!;
         for (const skiroutDir of generator.skiroutDirs) {
-          const fsPath = paths.join(skiroutDir, p);
+          const fsPath = Paths.join(skiroutDir, p);
           if (oldFile?.code === newFile.code) {
-            const mtime = (await fs.stat(fsPath)).mtime;
+            const mtime = (await FileSystem.stat(fsPath)).mtime;
             if (
               mtime !== null &&
               mtime.getDate() <= lastWriteBatch.writeTime.getDate()
@@ -206,8 +211,8 @@ class WatchModeMainLoop {
               return;
             }
           }
-          await fs.mkdir(paths.dirname(fsPath), { recursive: true });
-          await fs.writeFile(fsPath, newFile.code, "utf-8");
+          await FileSystem.mkdir(Paths.dirname(fsPath), { recursive: true });
+          await FileSystem.writeFile(fsPath, newFile.code, "utf-8");
         }
       }),
     );
@@ -218,8 +223,8 @@ class WatchModeMainLoop {
         .sort((a, b) => b.localeCompare(a, "en-US"))
         .map(async (p) => {
           try {
-            await fs.rm(p, { force: true, recursive: true });
-          } catch (e) {
+            await FileSystem.rm(p, { force: true, recursive: true });
+          } catch (_e) {
             // Ignore error.
           }
         }),
@@ -240,25 +245,19 @@ class WatchModeMainLoop {
   };
 }
 
-async function isDirectory(path: string): Promise<boolean> {
-  try {
-    return (await fs.lstat(path)).isDirectory();
-  } catch (e) {
-    return false;
-  }
-}
-
 function checkNoOverlappingSkiroutDirs(skiroutDirs: readonly string[]): void {
   for (let i = 0; i < skiroutDirs.length; ++i) {
     for (let j = i + 1; j < skiroutDirs.length; ++j) {
-      const dirA = paths.normalize(skiroutDirs[i]!);
-      const dirB = paths.normalize(skiroutDirs[j]!);
+      const dirA = Paths.normalize(skiroutDirs[i]!);
+      const dirB = Paths.normalize(skiroutDirs[j]!);
 
       if (
-        dirA.startsWith(dirB + paths.sep) ||
-        dirB.startsWith(dirA + paths.sep)
+        dirA.startsWith(dirB + Paths.sep) ||
+        dirB.startsWith(dirA + Paths.sep)
       ) {
-        throw new Error(`Overlapping skirout directories: ${dirA} and ${dirB}`);
+        throw new ExitError(
+          `Overlapping skirout directories: ${dirA} and ${dirB}`,
+        );
       }
     }
   }
@@ -270,7 +269,7 @@ interface ModuleFormatResult {
 }
 
 async function format(root: string, mode: "fix" | "check"): Promise<void> {
-  const skirFiles = await glob(paths.join(root, "**/*.skir"), {
+  const skirFiles = await glob(Paths.join(root, "**/*.skir"), {
     withFileTypes: true,
   });
   const pathToFormatResult = new Map<string, ModuleFormatResult>();
@@ -280,7 +279,9 @@ async function format(root: string, mode: "fix" | "check"): Promise<void> {
     }
     const unformattedCode = REAL_FILE_SYSTEM.readTextFile(skirFile.fullpath());
     if (unformattedCode === undefined) {
-      throw new Error(`Cannot read ${skirFile.fullpath()}`);
+      throw new ExitError(
+        "Cannot read " + rewritePathForRendering(skirFile.fullpath()),
+      );
     }
     const tokens = tokenizeModule(unformattedCode, "");
     if (tokens.errors.length) {
@@ -295,7 +296,7 @@ async function format(root: string, mode: "fix" | "check"): Promise<void> {
   }
   let numFilesNotFormatted = 0;
   for (const [path, result] of pathToFormatResult) {
-    const relativePath = paths.relative(root, path).replace(/\\/g, "/");
+    const relativePath = Paths.relative(root, path).replace(/\\/g, "/");
     if (mode === "fix") {
       if (result.alreadyFormatted) {
         console.log(`${makeGray(relativePath)} (unchanged)`);
@@ -333,14 +334,14 @@ async function main(): Promise<void> {
 
   const root = args.root || ".";
 
-  if (!(await isDirectory(root!))) {
+  if (!(await isDirectory(root))) {
     console.error(makeRed(`Not a directory: ${root}`));
     process.exit(1);
   }
 
   switch (args.kind) {
     case "init": {
-      initializeProject(root!);
+      initializeProject(root);
       return;
     }
     case "help":
@@ -349,14 +350,7 @@ async function main(): Promise<void> {
     }
   }
 
-  let skirConfigPath = paths.join(root!, "skir.yml");
-  if (
-    !paths.isAbsolute(skirConfigPath) &&
-    !/^\.{1,2}[/\\]$/.test(skirConfigPath)
-  ) {
-    // To make it clear that it's a path, prepend "./"
-    skirConfigPath = `.${paths.sep}${skirConfigPath}`;
-  }
+  const skirConfigPath = rewritePathForRendering(Paths.join(root, "skir.yml"));
   const skirConfigCode = REAL_FILE_SYSTEM.readTextFile(skirConfigPath);
   if (skirConfigCode === undefined) {
     console.error(makeRed(`Cannot find ${skirConfigPath}`));
@@ -366,12 +360,16 @@ async function main(): Promise<void> {
   const skirConfigResult = await parseSkirConfig(skirConfigCode, "import-mods");
   if (skirConfigResult.errors.length > 0) {
     console.error(makeRed("Invalid skir config"));
-    renderSkirConfigErrors(skirConfigResult.errors, { skirConfigPath });
+    const { maybeForgotToEditAfterInit } = skirConfigResult;
+    renderSkirConfigErrors(skirConfigResult.errors, {
+      skirConfigPath,
+      maybeForgotToEditAfterInit,
+    });
     process.exit(1);
   }
   const skirConfig = skirConfigResult.skirConfig!;
 
-  const srcDir = paths.join(root!, skirConfig.srcDir || ".");
+  const srcDir = Paths.join(root, skirConfig.srcDir || ".");
 
   switch (args.kind) {
     case "format": {
@@ -383,15 +381,9 @@ async function main(): Promise<void> {
       // Run the skir code generators in watch mode or once.
       const generatorBundles: GeneratorBundle[] = await Promise.all(
         skirConfig.generators.map((config) =>
-          makeGeneratorBundle(config, root!),
+          makeGeneratorBundle(config, root),
         ),
       );
-      // Sort for consistency.
-      generatorBundles.sort((a, b) => {
-        const aId = a.generator.id;
-        const bId = b.generator.id;
-        return aId.localeCompare(bId, "en-US");
-      });
       // Look for duplicates.
       for (let i = 0; i < generatorBundles.length - 1; ++i) {
         const { id } = generatorBundles[i]!.generator;
@@ -417,11 +409,11 @@ async function main(): Promise<void> {
     case "snapshot": {
       if (args.subcommand === "view") {
         viewSnapshot({
-          rootDir: root!,
+          rootDir: root,
         });
       } else {
         takeSnapshot({
-          rootDir: root!,
+          rootDir: root,
           srcDir: srcDir,
           check: args.subcommand === "check",
         });
@@ -435,4 +427,14 @@ async function main(): Promise<void> {
   }
 }
 
-main();
+try {
+  await main();
+} catch (e) {
+  if (e instanceof Error) {
+    console.error(makeRed(e.message));
+    if (e instanceof ExitError) {
+      process.exit(1);
+    }
+  }
+  throw e;
+}