Refactor read/write logics

LitoMore · May 3, 2024 · 0e5d99b · 0e5d99b
1 parent 1c8b26b
commit 0e5d99b
Show file tree

Hide file tree

Showing 11 changed files with 234 additions and 54 deletions.
diff --git a/Makefile b/Makefile
@@ -5,27 +5,27 @@ lint:
 	deno lint -q
 
 add:
-	cd source && deno run --allow-env --allow-read --allow-write add.ts "$(anchor)" "$(name)" "$(website)"
+	deno run --allow-env --allow-read --allow-write source/add.ts
 
 add-platform:
-	cd source && deno run --allow-env --allow-read --allow-write add-platform.ts "$(anchor)" "$(name)" "$(badge)" "$(hostnames)"
+	deno run --allow-env --allow-read --allow-write source/add-platform.ts
 
 check:
-	cd source && deno run --allow-env --allow-read check.ts
+	deno run --allow-env --allow-read source/check.ts
 
 fix:
-	cd source && deno run --allow-env --allow-read --allow-write check.ts --fix
+	deno run --allow-env --allow-read --allow-write source/check.ts --fix
 
 build:
-	cd source && deno run --allow-env --allow-read --allow-write build.ts
+	deno run --allow-env --allow-read --allow-write source/build.ts
 
 reset:
-	cd source && deno run --allow-env --allow-read --allow-write reset.ts
+	deno run --allow-env --allow-read --allow-write source/reset.ts
 
 search:
-	cd source && deno run --allow-env --allow-read search.ts "$(anchor)" "$(name)"
+	deno run --allow-env --allow-read source/search.ts
 
 summary:
-	cd source && deno run --allow-read summary.ts
+	deno run --allow-env --allow-read source/summary.ts
 
 default: lint check build
diff --git a/deno.json b/deno.json
@@ -1,5 +1,6 @@
 {
   "imports": {
-    "@std/fmt": "jsr:@std/fmt@^0.224.0"
+    "@std/fmt": "jsr:@std/fmt@^0.224.0",
+    "@std/path": "jsr:@std/path@^0.224.0"
   }
 }
diff --git a/deno.lock b/deno.lock
diff --git a/source/add-platform.ts b/source/add-platform.ts
@@ -1,12 +1,13 @@
 import { bold, cyan } from "@std/fmt/colors";
 import logSymbols from "npm:log-symbols";
-import { GamesJson } from "./types.ts";
-import { nameCompare } from "./utils.ts";
+import input from "npm:@inquirer/input";
+import { loadGamesJson, nameCompare, writeGamesJson } from "./utils.ts";
 
-const gamesJson = await Deno.readTextFile("./games.json");
-const games = JSON.parse(gamesJson) as GamesJson;
-
-const [anchor, name, badge, hostnames] = Deno.args;
+const games = await loadGamesJson();
+const anchor = await input({ message: "anchor:" });
+const name = await input({ message: "name:" });
+const badge = await input({ message: "badge:" });
+const hostnames = await input({ message: "hostnames:" });
 
 if (!(anchor && name && badge && hostnames)) {
   console.error(
@@ -33,10 +34,8 @@ const platform = {
 };
 
 games.platforms.push(platform);
-
 games.platforms.sort(nameCompare());
 
-const jsonFile = JSON.stringify(games, null, 2);
-await Deno.writeTextFile("./games.json", jsonFile + "\n");
+await writeGamesJson(games);
 console.log(logSymbols.success, `${name} added.`);
 console.log(platform);
diff --git a/source/add.ts b/source/add.ts
@@ -1,12 +1,17 @@
 import { bold, cyan, green } from "@std/fmt/colors";
 import logSymbols from "npm:log-symbols";
-import { GamesJson } from "./types.ts";
-import { nameCompare, websiteChecks } from "./utils.ts";
+import input from "npm:@inquirer/input";
+import {
+  loadGamesJson,
+  nameCompare,
+  websiteChecks,
+  writeGamesJson,
+} from "./utils.ts";
 
-const gamesJson = await Deno.readTextFile("./games.json");
-const games = JSON.parse(gamesJson) as GamesJson;
-
-let [anchor, name, website] = Deno.args;
+const games = await loadGamesJson();
+const anchor = await input({ message: "anchor:" });
+const name = await input({ message: "name:" });
+let website = await input({ message: "website:" });
 
 if (!(anchor && name && website)) {
   console.error(
@@ -60,11 +65,9 @@ const game = {
 };
 
 foundPlatform.gameList.push(game);
-
 foundPlatform.gameList.sort(nameCompare());
 
-const jsonFile = JSON.stringify(games, null, 2);
-await Deno.writeTextFile("./games.json", jsonFile + "\n");
+await writeGamesJson(games);
 console.log(
   logSymbols.success,
   `${green(bold(name))} added to ${cyan(bold(foundPlatform.name))}.`,

diff --git a/source/build.ts b/source/build.ts
@@ -1,9 +1,7 @@
 import logSymbols from "npm:log-symbols";
-import { GamesJson } from "./types.ts";
-import { nameCompare } from "./utils.ts";
+import { loadGamesJson, nameCompare, writeReadme } from "./utils.ts";
 
-const gamesJson = await Deno.readTextFile("./games.json");
-const games = JSON.parse(gamesJson) as GamesJson;
+const games = await loadGamesJson();
 
 const titleSection = `<h1 align="center">GAMES</h1>
 `;
@@ -77,5 +75,5 @@ const relatedSection = games.related.length > 0
 const markdownContent = titleSection + badgesSection + descriptionSection +
   ciSection + gamesSection + relatedSection;
 
-await Deno.writeTextFile("../README.md", markdownContent);
+await writeReadme(markdownContent);
 console.log(logSymbols.success, "Compiled successfully.");
diff --git a/source/check.ts b/source/check.ts
@@ -1,9 +1,14 @@
 import logSymbols from "npm:log-symbols";
 import { Game, Platform } from "./types.ts";
-import { nameChecks, nameCompare, websiteChecks } from "./utils.ts";
-
-const gamesJson = await Deno.readTextFile("./games.json");
-const games = JSON.parse(gamesJson);
+import {
+  loadGamesJson,
+  nameChecks,
+  nameCompare,
+  websiteChecks,
+  writeGamesJson,
+} from "./utils.ts";
+
+const games = await loadGamesJson();
 const withFix = Deno.args.includes("--fix");
 
 const checkWebsite = () => {
@@ -49,8 +54,7 @@ checkPlatformOrder();
 checkGamesOrder();
 
 if (withFix) {
-  const jsonFile = JSON.stringify(games, null, 2);
-  await Deno.writeTextFile("./games.json", jsonFile + "\n");
+  await writeGamesJson(games);
 }
 
 console.log(logSymbols.success, "Validation passed.");
diff --git a/source/reset.ts b/source/reset.ts
@@ -1,8 +1,7 @@
 import logSymbols from "npm:log-symbols";
-import { GamesJson } from "./types.ts";
+import { loadGamesJson, writeGamesJson } from "./utils.ts";
 
-const gamesJson = await Deno.readTextFile("./games.json");
-const games = JSON.parse(gamesJson) as GamesJson;
+const games = await loadGamesJson();
 
 games.platforms.forEach((platform) => {
   platform.hostnames = [];
@@ -11,6 +10,5 @@ games.platforms.forEach((platform) => {
 
 games.related = [];
 
-const jsonFile = JSON.stringify(games, null, 2);
-await Deno.writeTextFile("./games.json", jsonFile + "\n");
+await writeGamesJson(games);
 console.log(logSymbols.success, "Reset to default done.");
diff --git a/source/search.ts b/source/search.ts
@@ -1,10 +1,9 @@
-import { GamesJson } from "./types.ts";
-import { fuzzyMatched } from "./utils.ts";
+import input from "npm:@inquirer/input";
+import { fuzzyMatched, loadGamesJson } from "./utils.ts";
 
-const gamesJson = await Deno.readTextFile("./games.json");
-const games = JSON.parse(gamesJson) as GamesJson;
-
-const [anchor, name] = Deno.args;
+const games = await loadGamesJson();
+const anchor = await input({ message: "author:" });
+const name = await input({ message: "name:" });
 
 const matchedGames = [];