Complete transition from TypeScript to typed JavaScript

glacials · Apr 19, 2024 · 5d0183a · 5d0183a
1 parent a4e94f8
commit 5d0183a
Show file tree

Hide file tree

Showing 15 changed files with 259 additions and 593 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing
 
-_What's in Standard?_ has three code bases.
+_What's in Standard?_ has three code bases, all in this repository.
 
 - API and website (see below)
 - Mobile apps (see [`./mobile`](./mobile))
@@ -27,9 +27,7 @@ npm install
 npm start
 ```
 
-Then open [localhost:8080][localhost] in your browser!
-
-[localhost]: http://localhost:8080
+Then open the printed local URL in your browser.
 
 ### Common tasks
 

diff --git a/web/.node-version b/web/.node-version
@@ -1 +1 @@
-18.10.0
+21.7.3
diff --git a/web/index.html b/web/index.html
@@ -60,7 +60,7 @@
 
   <body data-spy="scroll" data-target="#nav" id="sets">
     <div id="app" class="container"></div>
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="/src/main.js"></script>
 
     <script>
       (function (i, s, o, g, r, a, m) {

diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -24,26 +24,16 @@
     "requirejs": "^2.3.6",
     "sass": "^1.69.7",
     "supervisor": "^0.12.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.0.2",
     "vite": "^4.3.9",
     "vue-loader": "^17.2.2",
     "vue-template-compiler": "^2.7.14",
     "webpack-cli": "^5.1.4"
   },
   "engines": {
-    "node": "^20"
+    "node": "^21"
   },
   "license": "MIT",
   "homepage": "https://github.com/glacials/whatsinstandard",
-  "mocha": {
-    "extensions": [
-      "ts"
-    ],
-    "node-option": [
-      "loader=ts-node/esm"
-    ]
-  },
   "name": "whatsinstandard",
   "people": {
     "author": {
@@ -61,7 +51,7 @@
     "prepare": "./node_modules/node/bin/node api/generate.js",
     "preview": "vite preview",
     "start": "vite",
-    "test": "mocha test/api.ts"
+    "test": "mocha test/api.js"
   },
   "type": "module",
   "version": "1.0.1"

diff --git a/web/src/components/App.vue b/web/src/components/App.vue
@@ -17,9 +17,9 @@ const apiURL = "/api/v6/standard.json";
  * @param bans The bans to filter.
  * @returns The bans that apply to the given sets.
  */
-function bansFor(sets: card.Set[], bans: card.Ban[]) {
+function bansFor(sets: card.CardSet[], bans: card.Ban[]) {
   return bans.filter((ban: card.Ban) =>
-    sets.map((set: card.Set) => set.code).includes(ban.setCode)
+    sets.map((set: card.CardSet) => set.code).includes(ban.setCode)
   );
 }
 
@@ -42,7 +42,9 @@ const hideAlert20230507 = ref(
 
 watchEffect(async () => {
   const body = await (await fetch(apiURL)).json();
-  rounds.value = card.Round.ify(body.sets.map((set: any) => new card.Set(set)));
+  rounds.value = card.Round.ify(
+    body.sets.map((set: any) => new card.CardSet(set))
+  );
   bans.value = body.bans.map((ban: any) => new card.Ban(ban));
 });
 

diff --git a/web/src/main.ts → web/src/main.js b/web/src/main.ts → web/src/main.js
diff --git a/web/src/types/card/Ban.js b/web/src/types/card/Ban.js
@@ -1,7 +1,7 @@
 /**
  * A {@link Ban} is a card that is or was banned in Standard.
  */
-export class Ban {
+export default class Ban {
   /**
    * Create a new {@link Ban} from the given JSON.
    */

diff --git a/web/src/types/card/CardSet.js b/web/src/types/card/CardSet.js
@@ -1,5 +1,5 @@
 import { BiDate } from "../BiDate.js";
-import { Symbol } from "./Symbol.js";
+import Symbol from "./Symbol.js";
 
 /**
  * A Magic: The Gathering set.
@@ -152,14 +152,14 @@ export default class CardSet {
    * @returns {string} The card set as a JSON object.
    */
   toJSON() {
-  return JSON.stringify({
+    return JSON.stringify({
       name: this.name,
       codename: this.codename,
       code: this.code,
       symbol: Object.assign({}, this.symbol),
       enterDate: Object.assign({}, this.enterDate),
       exitDate: Object.assign({}, this.exitDate),
       internalId: this.internalId,
-    })
+    });
   }
 }
diff --git a/web/src/types/card/Round.js b/web/src/types/card/Round.js
@@ -1,9 +1,9 @@
-import { CardSet } from "./CardSet";
+import CardSet from "./CardSet";
 
 /**
  * A group of {@link CardSet CardSets} that share an exit date.
  */
-export class Round {
+export default class Round {
   /**
    * Return the {@link Round Rounds} in the given array that have dropped from Standard,
    * according to local time. Order is preserved.

diff --git a/web/src/types/card/Symbol.js b/web/src/types/card/Symbol.js
@@ -1,7 +1,7 @@
 /**
  * A set symbol icon.
  */
-export class Symbol {
+export default class Symbol {
   /**
    * Create a new Symbol.
    *

diff --git a/web/src/types/card/index.js b/web/src/types/card/index.js
@@ -1,3 +1,5 @@
-export { Ban } from "./Ban.js";
-export { Round } from "./Round.js";
-export { Set } from "./Set.js";
+import Ban from "./Ban.js";
+import Round from "./Round.js";
+import CardSet from "./CardSet.js";
+
+export { Ban, Round, CardSet };
diff --git a/web/test/api.ts → web/test/api.js b/web/test/api.ts → web/test/api.js
diff --git a/web/tsconfig.json b/web/tsconfig.json
diff --git a/web/tsconfig.node.json b/web/tsconfig.node.json