fix: mend cli errors

Author: ismtabo

src/cli/create.ts

@@ -1,11 +1,11 @@
-import { ensureDirSync, exists } from "https://deno.land/std/fs/mod.ts";
-import { dirname, join } from "https://deno.land/std/path/mod.ts";
+import { ensureDirSync } from "https://deno.land/std@0.166.0/fs/mod.ts";
+import { dirname, join } from "https://deno.land/std@0.166.0/path/mod.ts";
 import { renderFileToString } from "https://deno.land/x/dejs@0.9.3/mod.ts";
 import { listDays, SOLUTIONS_MODULE, SOLUTIONS_PATH } from "./load.ts";
 
 const __dirname = dirname(new URL(import.meta.url).pathname);
 
-export async function createDay(day: number) {
+export async function createDay(day: number | undefined) {
  if (day == null) {
  const days = await listDays();
  day = 1;
@@ -16,13 +16,15 @@ export async function createDay(day: number) {
 
  const mainFolder = join(SOLUTIONS_PATH, `day${day}`);
 
- if (await exists(mainFolder)) {
- console.error(`Error - Day ${day} already exists`);
- Deno.exit(1);
+ try {
+ Deno.mkdirSync(mainFolder);
+ } catch (error) {
+ if (error instanceof Deno.errors.AlreadyExists) {
+ throw new Error(`Error - Day ${day} already exists`, error);
+ }
+ throw error;
  }
 
- ensureDirSync(mainFolder);
-
  Deno.writeTextFileSync(
  join(mainFolder, "mod.ts"),
  await renderFileToString(

src/cli/load.ts

@@ -1,5 +1,4 @@
-import { existsSync } from "https://deno.land/std/fs/mod.ts";
-import { dirname, join } from "https://deno.land/std/path/mod.ts";
+import { dirname, join } from "https://deno.land/std@0.166.0/path/mod.ts";
 import { Solution, Solutions } from "./types.d.ts";
 import { dayKey, extractDayNumber } from "./utils.ts";
 
@@ -18,33 +17,42 @@ export async function listDays() {
 export function readDaySampleInput(day: number) {
  const dayName = dayKey(day);
  const daySampleInput = join(SOLUTIONS_PATH, dayName, "sample.txt");
- if (!existsSync(daySampleInput)) {
- console.error(`Day ${day} sample input not found`);
- Deno.exit(1);
+ try {
+ return Deno.readTextFileSync(daySampleInput);
+ } catch (error) {
+ if (error instanceof Deno.errors.NotFound) {
+ throw new Error(`Day ${day} sample input not found`, error);
+ }
+ throw error;
  }
- return Deno.readTextFileSync(daySampleInput);
 }
 
-export function readDayInput(day: number) {
+export function readDayInput(day: number): string {
  const dayName = dayKey(day);
  const daySampleInput = join(SOLUTIONS_PATH, dayName, "input.txt");
- if (!existsSync(daySampleInput)) {
- console.error(`Day ${day} input not found`);
- Deno.exit(1);
+ try {
+ return Deno.readTextFileSync(daySampleInput);
+ } catch (error) {
+ if (error instanceof Deno.errors.NotFound) {
+ throw Error(`Day ${day} input not found`, error);
+ }
+ throw error;
  }
- return Deno.readTextFileSync(daySampleInput);
 }
 
-export async function loadSolutionsModules(): Promise<Solutions> {
+export function loadSolutionsModules(): Promise<Solutions> {
  return import(SOLUTIONS_MODULE);
 }
 
 export async function loadModule(day: number): Promise<Solution> {
  const dayName = dayKey(day);
  const dayModule = join(SOLUTIONS_PATH, dayName, "mod.ts");
- if (!existsSync(dayModule)) {
- console.error(`Day ${day} module not found`);
- Deno.exit(1);
+ try {
+ return await import(dayModule);
+ } catch (error) {
+ if (error instanceof TypeError) {
+ throw new Error(`Day ${day} module not found`, error);
+ }
+ throw error;
  }
- return await import(dayModule);
 }

src/cli/mod.ts

@@ -1,26 +1,29 @@
-import { Command } from "https://deno.land/x/cliffy/command/mod.ts";
+import { Command } from "https://deno.land/x/cliffy@v0.25.4/command/mod.ts";
 import { createDay } from "./create.ts";
 import { runAllDays, runDay } from "./run.ts";
+import { Format } from "./types.d.ts";
+import { isFormat } from "./utils.ts";
 
 try {
  await new Command()
  .name("aoc")
- .version("<version>")
+ .version("0.1.1")
  .description("Solutions for Advent of Code. https://adventofcode.com/")
  .throwErrors()
  .command(
  "run",
  new Command()
  .description("Run day solution")
- .option("-d, --day <day:number>", "Day to run")
+ .option("-d, --day <day:number>", "Day to run", { required: true })
  .option(
  "-p, --part <part:number>",
  "Part of the day solution to run.",
- { default: 1 },
+ { required: true },
  )
  .option(
  "-a, --all-parts",
  "Execute both parts. If present part option will be ignore.",
+ { conflicts: ["part"] },
  )
  .option("-t, --time", "Show spent time")
  .option(
@@ -37,8 +40,8 @@ try {
  "Output format.",
  {
  default: "plain",
- value(value: string) {
- if (!["plain", "json", "csv"].includes(value)) {
+ value(value: string): Format {
+ if (!isFormat(value)) {
  throw new Error(
  `Format must be one of plain, json or csv but got: ${value}`,
  );
@@ -48,7 +51,11 @@ try {
  },
  )
  .action(({ day, part, allParts, time, sample, format, file }) =>
- runDay(day, file, { part, allParts, time, sample, format })
+ runDay(
+ day,
+ file,
+ { part, allParts, time, sample, format },
+ )
  ),
  )
  .command(
@@ -62,7 +69,8 @@ try {
  )
  .option(
  "-a, --all-parts",
- "Execute both parts. If present part option will be ignore.",
+ "Execute both parts. If present 'part' option will be ignore.",
+ { conflicts: ["part"] },
  )
  .option("-t, --time", "Show spent time")
  .option(
@@ -74,13 +82,13 @@ try {
  "Output format.",
  {
  default: "plain",
- value(value: string) {
- if (!["plain", "json", "csv"].includes(value)) {
- throw new Error(
- `Format must be one of plain, json or csv but got: ${value}`,
- );
+ value(value: string): Format {
+ if (isFormat(value)) {
+ return value;
  }
- return value;
+ throw new Error(
+ `Format must be one of plain, json or csv but got: ${value}`,
+ );
  },
  },
  )
@@ -92,7 +100,7 @@ try {
  .description("Create new day solution folder skeleton")
  .option(
  "-d, --day <day:number>",
- "Day of the solution. By default the corresponding next day will be created.",
+ "Day of the solution. If omit the corresponding next day will be created.",
  )
  .action(({ day }) => createDay(day)),
  )

src/cli/run.ts

@@ -5,13 +5,7 @@ import {
  readDaySampleInput,
 } from "./load.ts";
 import { log } from "./log.ts";
-import {
- Result,
- ResultDay,
- RunOptions,
- Solution,
- SolutionPart,
-} from "./types.d.ts";
+import { Result, ResultDay, RunOptions, Solution } from "./types.d.ts";
 import { dayKey, extractDayNumber } from "./utils.ts";
 
 function runWithTime<T>(fn: () => Result<T>): Result<T> {
@@ -21,16 +15,6 @@ function runWithTime<T>(fn: () => Result<T>): Result<T> {
  return { ...result, time };
 }
 
-function runPart<Input, Output>(
- part: SolutionPart<Input, Output>,
- input: Input,
- { time: time = false }: Pick<RunOptions, "time">,
-): Result<Output> {
- return !time
- ? { result: part(input) }
- : runWithTime(() => ({ result: part(input) }));
-}
-
 function runModule(
  module: Solution,
  text: string,
@@ -42,7 +26,7 @@ function runModule(
  const moduleFn = sampleExtraArgs
  ? () => module.main(text, part === 2, sampleExtraArgs)
  : () => module.main(text, part === 2);
- return !time
+ return time !== true
  ? { result: moduleFn() }
  : runWithTime(() => ({ result: moduleFn() }));
 }
@@ -59,13 +43,13 @@ function runAllParts(
 
 export async function runDay(
  day: number,
- file: string,
+ file: string | undefined,
  { part, allParts, time, sample, format }: RunOptions,
 ) {
  const module: Solution = await loadModule(day);
- const text = file
+ const text = file != null
  ? Deno.readTextFileSync(file)
- : sample
+ : sample === true
  ? readDaySampleInput(day)
  : readDayInput(day);
  const result = allParts

src/cli/types.d.ts

@@ -6,9 +6,9 @@ declare enum Format {
 
 export interface RunOptions {
  part: number;
- allParts: boolean;
- time: boolean;
- sample: boolean;
+ allParts?: boolean;
+ time?: boolean;
+ sample?: boolean;
  format: Format;
 }
 

src/cli/utils.ts

@@ -1,4 +1,4 @@
-import { Result, ResultDay, ResultsDays } from "./types.d.ts";
+import { Format, Result, ResultDay, ResultsDays } from "./types.d.ts";
 
 export function isResult(obj: Result | ResultDay | ResultsDays): obj is Result {
  return typeof obj === "object" && "result" in obj;
@@ -24,3 +24,10 @@ export function extractDayNumber(day: string) {
 export function dayKey(day: number) {
  return `day${day}`;
 }
+
+export function isFormat(value: string | null): value is Format {
+ if (value == null) {
+ return false;
+ }
+ return ["plain", "json", "csv"].includes(value);
+}