Move crash and common methods to util.ts

README.md

@@ -19,7 +19,7 @@ for Estilo 1, please check out
 ### Deno users
 
 ```sh
-deno install -n estilo jsr:@jacoborus/estilo
+deno install -n estilo --allow-write --allow-read jsr:@jacoborus/estilo
 ```
 
 ### Other plaforms
@@ -34,11 +34,7 @@ Commands:
 
 - **`create [folder]`**: Create an estilo project in [folder] or current folder
 - **`render [folder]`**: Render project in [folder] or current folder
-- **`add-syntax`**: Add more syntax templates
-- **`add-airline [styleName]`**: Add a new Airline style
-- **`add-lightline [styleName]`**: Add a new Lightline style
-- **`help [command]`**: Show this help or the help of a sub-command.
-- **`--version`**: Show the version number.
+- **`help [command]`**: Show this help
 
 ## Guide
 

estilo.ts

@@ -1 +1 @@
-import "./src/cli/cli.ts";
+import "./src/cli.ts";

src/cli/cli.ts → src/cli.ts

@@ -1,11 +1,10 @@
 import { resolve } from "jsr:@std/[email protected]";
 
-import { existsSync } from "../common.ts";
-import { crash } from "../crash.ts";
-import { createProject } from "./create.ts";
-import { loadProjectFiles } from "../load-project.ts";
-import { renderProject } from "../render-project.ts";
-import denojson from "../../deno.json" with { type: "json" };
+import { crash, existsSync } from "./util.ts";
+import { createProject } from "./create-project.ts";
+import { loadProjectFiles } from "./load-project.ts";
+import { renderProject } from "./render-project.ts";
+import denojson from "../deno.json" with { type: "json" };
 
 const helpText = `
   Estilo ${denojson.version}

src/cli/create.ts → src/create-project.ts

@@ -2,8 +2,8 @@ import { ensureDirSync } from "jsr:@std/[email protected]";
 import { basename, resolve } from "jsr:@std/[email protected]";
 import { render } from "npm:[email protected]";
 
-import { List } from "../types.ts";
-import assets from "../assets.ts";
+import { List } from "./types.ts";
+import assets from "./assets.ts";
 
 interface ProjectOptions {
   name: string;

src/format-project.ts

@@ -7,8 +7,7 @@ import {
   SyntaxRule,
   YmlFile,
 } from "./types.ts";
-import { crash } from "./crash.ts";
-import { assertIsList } from "./common.ts";
+import { assertIsList, crash } from "./util.ts";
 
 function formatSyntaxFile(file: YmlFile): SyntaxRule[] {
   const filepath = file.filepath;

src/load-project.ts

@@ -20,11 +20,10 @@ import {
 import {
   assertIsList,
   assertIsObject,
+  crash,
   existsSync,
   isHexColor,
-} from "./common.ts";
-
-import { crash } from "./crash.ts";
+} from "./util.ts";
 
 export function loadProjectFiles(projectUrl: string): Project {
   const config = loadYml(projectUrl, "estilo.yml").content as ProjectConfig;

src/render-colorscheme.ts

@@ -1,9 +1,8 @@
 import { render } from "npm:[email protected]";
 import { hexterm } from "jsr:@jacoborus/[email protected]";
 import assets from "./assets.ts";
-import { crash } from "./crash.ts";
 import denojson from "../deno.json" with { type: "json" };
-import { isHexColor } from "./common.ts";
+import { crash, isHexColor } from "./util.ts";
 import { isLegacyUi, parseLegacyUi } from "./legacy-ui.ts";
 
 import {

src/render-project.ts

@@ -13,7 +13,7 @@ export async function renderProject(project: Project): Promise<void> {
   const { config: projectConfig } = project;
 
   for (const config of projectConfig.colorschemes) {
-    const rendered = await renderColorscheme(config, project);
+    const rendered = renderColorscheme(config, project);
     writeThing("colors", rendered, config.name, project.projectUrl);
   }
 

src/render-status.ts

@@ -1,7 +1,7 @@
 import { render } from "npm:[email protected]";
 import denojson from "../deno.json" with { type: "json" };
 import assets from "./assets.ts";
-import { crash } from "./crash.ts";
+import { crash } from "./util.ts";
 
 import {
   DataRenderStatus,

src/common.ts → src/util.ts

@@ -1,4 +1,17 @@
-import { crash } from "./crash.ts";
+export function crash(message: string, data?: Record<string, string>): never {
+  console.log("%cError: " + message, "color: red");
+
+  if (data) {
+    console.log(
+      "%c" +
+        Object.keys(data)
+          .map((key) => `- ${key}: ${data[key]}`)
+          .join("\n"),
+      "color: red",
+    );
+  }
+  Deno.exit(1);
+}
 
 export function isHexColor(color: string): boolean {
   return /(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(color);