From ee30f0ef1a93e12d2b9777d11cd01e23328fa96a Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Fri, 5 Jul 2024 18:30:17 +0200
Subject: [PATCH] (ts) migrate src/parseMarkdown.ts

---
 middleware/atom.js                         |  2 +-
 routes/blogEntry.vue                       |  2 +-
 routes/license.vue                         |  2 +-
 src/{parseMarkdown.js => parseMarkdown.ts} | 25 +++++++++++-----------
 4 files changed, 16 insertions(+), 15 deletions(-)
 rename src/{parseMarkdown.js => parseMarkdown.ts} (86%)

diff --git a/middleware/atom.js b/middleware/atom.js
index 6a1d531e8..2437401c1 100644
--- a/middleware/atom.js
+++ b/middleware/atom.js
@@ -1,5 +1,5 @@
 import { Feed } from 'feed';
-import parseMarkdown from '../src/parseMarkdown.js';
+import parseMarkdown from '../src/parseMarkdown.ts';
 import fetch from 'node-fetch';
 
 export default async function ({ app, route, res }) {
diff --git a/routes/blogEntry.vue b/routes/blogEntry.vue
index 051a04923..f8fc82235 100644
--- a/routes/blogEntry.vue
+++ b/routes/blogEntry.vue
@@ -29,7 +29,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import { head } from '../src/helpers.ts';
-import parseMarkdown from '../src/parseMarkdown.js';
+import parseMarkdown from '../src/parseMarkdown.ts';
 import Columnist from 'avris-columnist';
 
 export default Vue.extend({
diff --git a/routes/license.vue b/routes/license.vue
index 9a6278ae4..6fc14de01 100644
--- a/routes/license.vue
+++ b/routes/license.vue
@@ -15,7 +15,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import { head } from '../src/helpers.ts';
-import parseMarkdown from '../src/parseMarkdown.js';
+import parseMarkdown from '../src/parseMarkdown.ts';
 
 export default Vue.extend({
     async asyncData({ app }) {
diff --git a/src/parseMarkdown.js b/src/parseMarkdown.ts
similarity index 86%
rename from src/parseMarkdown.js
rename to src/parseMarkdown.ts
index d32d50add..52f399ddd 100644
--- a/src/parseMarkdown.js
+++ b/src/parseMarkdown.ts
@@ -1,10 +1,11 @@
 import { fetchJson } from './fetchJson.js';
+import type { Translator } from './translator.ts';
 
-let census_groups = {};
-let census_comparisons = {};
+let census_groups: Record<string, string> = {};
+let census_comparisons: Record<string, string> = {};
 
-const mainPlusDetails = (dict, wide) => (_, keys, content) => {
-    let selectedDict = {};
+const mainPlusDetails = (dict: Record<string, string>, wide: boolean) => (_: string, keys: string, content: string) => {
+    let selectedDict: Record<string, string> = {};
     if (keys === undefined) {
         selectedDict = dict;
     } else {
@@ -25,12 +26,12 @@ const mainPlusDetails = (dict, wide) => (_, keys, content) => {
 }</div>`;
 };
 
-const generateToC = (content, translator) => (_) => {
+const generateToC = (content: string, translator: Translator) => (_: string) => {
     const tags = [];
     let curentLevel = 2;
     let needsClosing = false;
-    for (let [, level, id, title] of content.matchAll(/<h([2-6]) id="([^"]+)">([^<]+)<\/h\1>/g)) {
-        level = parseInt(level);
+    for (const [, levelString, id, title] of content.matchAll(/<h([2-6]) id="([^"]+)">([^<]+)<\/h\1>/g)) {
+        const level = parseInt(levelString);
         while (level < curentLevel) {
             tags.push('</li>'); tags.push('</ul>'); curentLevel--;
         }
@@ -61,10 +62,10 @@ const generateToC = (content, translator) => (_) => {
     `;
 };
 
-const generateGallery = (_, itemsString) => {
-    const items = JSON.parse(`{${itemsString.replace(/&quot;/g, '"').replace(/,\s*$/, '')}}`);
+const generateGallery = (_: string, itemsString: string) => {
+    const items: Record<string, string> = JSON.parse(`{${itemsString.replace(/&quot;/g, '"').replace(/,\s*$/, '')}}`);
 
-    const label = (alt) => {
+    const label = (alt: string): string => {
         if (!alt.startsWith('! ')) {
             return '';
         }
@@ -84,7 +85,7 @@ const generateGallery = (_, itemsString) => {
     return `<div class="row columnist-wall--disabled">${cells.join('')}</div>`;
 };
 
-export default async function parseMarkdown(markdown, translator) {
+export default async function parseMarkdown(markdown: string, translator: Translator) {
     let content = `<div>${
         markdown
             .replace(/<table>/g, '<div class="table-responsive"><table class="table table-striped small">')
@@ -142,7 +143,7 @@ export default async function parseMarkdown(markdown, translator) {
     const title = titleMatch ? titleMatch[1] : null;
     const imgMatch = content.match('<img src="([^"]+)"[^>]*>');
     const img = imgMatch ? imgMatch[1] : null;
-    let intro = [];
+    let intro: string[] = [];
 
     for (const introMatch of content.matchAll(/<p[^>]*>(.+?)<\/p>/gms)) {
         const p = introMatch[1].replace(/(<([^>]+)>)/ig, '').replace(/\s+/g, ' ');