From 0e6d28984e4df07f36f10ff0d9ef3675c81e63a0 Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Sun, 19 Jan 2025 21:23:46 +0100
Subject: [PATCH] (test) reorganize imports, dynamic import() is not necessary
 anymore as morphemes.ts does not need to be mocked anymore

---
 test/buildPronoun.test.ts         | 16 ++++++----------
 test/classes.test.ts              | 12 +++++-------
 test/composables/timezone.test.ts |  2 +-
 test/fixtures/config.ts           |  2 +-
 test/fixtures/pronouns.ts         |  4 ++--
 test/flags.test.ts                |  2 +-
 test/locales/blog.test.ts         | 13 ++++++-------
 test/locales/data.test.ts         | 13 ++++++-------
 test/locales/translations.test.ts | 11 +++++------
 test/plugins/track.test.ts        |  2 +-
 10 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/test/buildPronoun.test.ts b/test/buildPronoun.test.ts
index 71fc4eacc..cf8c4d5a9 100644
--- a/test/buildPronoun.test.ts
+++ b/test/buildPronoun.test.ts
@@ -1,12 +1,12 @@
 import { beforeEach, describe, expect, test } from 'vitest';
 
-import type { NullPronounsConfig } from '../locale/config.ts';
-import { Translator } from '../src/translator.ts';
-
-import { configWithPronouns } from './fixtures/config.ts';
-
+import type { NullPronounsConfig } from '~/locale/config.ts';
 import type { Translations } from '~/locale/translations.ts';
-import { PronounGroup } from '~/src/classes.ts';
+import { buildPronoun, buildPronounUsage } from '~/src/buildPronoun.ts';
+import { PronounGroup, Pronoun, PronounLibrary } from '~/src/classes.ts';
+import { Translator } from '~/src/translator.ts';
+import { configWithPronouns } from '~/test/fixtures/config.ts';
+import pronounsFactory, { generated as generatedPronouns } from '~/test/fixtures/pronouns.ts';
 
 const translations: Translations = {};
 
@@ -26,10 +26,6 @@ beforeEach(() => {
 
 const translator = new Translator(translations, translations, configWithPronouns);
 
-const { Pronoun, PronounLibrary } = await import('../src/classes.ts');
-const { buildPronoun, buildPronounUsage } = await import('../src/buildPronoun.ts');
-const { default: pronounsFactory, generated: generatedPronouns } = await import('./fixtures/pronouns.ts');
-
 let config = structuredClone(configWithPronouns);
 const pronouns = Object.fromEntries(Object.entries(pronounsFactory)
     .map(([name, pronounFactory]) => [name, pronounFactory(config)]));
diff --git a/test/classes.test.ts b/test/classes.test.ts
index edfbc932d..ac8bf53aa 100644
--- a/test/classes.test.ts
+++ b/test/classes.test.ts
@@ -1,10 +1,10 @@
 import { beforeEach, describe, expect, test } from 'vitest';
 
-import type { Translations } from '../locale/translations.ts';
-import { Example, ExamplePart, MergedPronounGroup, PronounGroup, PronounLibrary } from '../src/classes.ts';
-import { Translator } from '../src/translator.ts';
-
-import { configWithPronouns } from './fixtures/config.ts';
+import type { Translations } from '~/locale/translations.ts';
+import { Example, ExamplePart, MergedPronounGroup, PronounGroup, PronounLibrary } from '~/src/classes.ts';
+import { Translator } from '~/src/translator.ts';
+import { configWithPronouns } from '~/test/fixtures/config.ts';
+import pronounsFactory, { generated as generatedPronouns } from '~/test/fixtures/pronouns.ts';
 
 const translations: Translations = {
     pronouns: {
@@ -20,8 +20,6 @@ const translations: Translations = {
 };
 const translator = new Translator(translations, translations, configWithPronouns);
 
-const { default: pronounsFactory, generated: generatedPronouns } = await import('./fixtures/pronouns.ts');
-
 let config = structuredClone(configWithPronouns);
 const pronouns = Object.fromEntries(Object.entries(pronounsFactory)
     .map(([name, pronounFactory]) => [name, pronounFactory(config)]));
diff --git a/test/composables/timezone.test.ts b/test/composables/timezone.test.ts
index ec46716bb..179dc28c5 100644
--- a/test/composables/timezone.test.ts
+++ b/test/composables/timezone.test.ts
@@ -3,7 +3,7 @@
 import { DateTime } from 'luxon';
 import { beforeAll, describe, expect, test, vi } from 'vitest';
 
-import useTimezone from '../../composables/useTimezone.ts';
+import useTimezone from '~/composables/useTimezone.ts';
 
 describe('timezone info', () => {
     const { getTimezoneInfo } = useTimezone();
diff --git a/test/fixtures/config.ts b/test/fixtures/config.ts
index 733d7c1b5..dc9bb9994 100644
--- a/test/fixtures/config.ts
+++ b/test/fixtures/config.ts
@@ -1,4 +1,4 @@
-import type { ConfigWithEnabled } from '../../locale/config.ts';
+import type { ConfigWithEnabled } from '~/locale/config.ts';
 
 export const configWithPronouns: ConfigWithEnabled<'pronouns'> = {
     locale: 'en',
diff --git a/test/fixtures/pronouns.ts b/test/fixtures/pronouns.ts
index 4ef6501b6..3ea955977 100644
--- a/test/fixtures/pronouns.ts
+++ b/test/fixtures/pronouns.ts
@@ -1,5 +1,5 @@
-import type { ConfigWithEnabled } from '../../locale/config.ts';
-import { Pronoun } from '../../src/classes.ts';
+import type { ConfigWithEnabled } from '~/locale/config.ts';
+import { Pronoun } from '~/src/classes.ts';
 
 const he = (config: ConfigWithEnabled<'pronouns'>): Pronoun => new Pronoun(
     config,
diff --git a/test/flags.test.ts b/test/flags.test.ts
index 9aeb99fe2..f890b4fda 100644
--- a/test/flags.test.ts
+++ b/test/flags.test.ts
@@ -2,7 +2,7 @@ import fs from 'fs';
 
 import { expect, test } from 'vitest';
 
-import { buildFlags, flags } from '../src/flags.ts';
+import { buildFlags, flags } from '~/src/flags.ts';
 
 const __dirname = new URL('.', import.meta.url).pathname;
 
diff --git a/test/locales/blog.test.ts b/test/locales/blog.test.ts
index 19f26825b..1258efd3d 100644
--- a/test/locales/blog.test.ts
+++ b/test/locales/blog.test.ts
@@ -8,14 +8,13 @@ import type { Result } from 'html-validate/node';
 import marked from 'marked';
 import { describe, expect, test } from 'vitest';
 
-import type { Config } from '../../locale/config.ts';
-import allLocales from '../../locale/locales.ts';
-import type { Translations } from '../../locale/translations.ts';
-import { loadSumlFromBase } from '../../server/loader.ts';
-import parseMarkdown from '../../src/parseMarkdown.ts';
-import { Translator } from '../../src/translator.ts';
-
+import type { Config } from '~/locale/config.ts';
+import allLocales from '~/locale/locales.ts';
+import type { Translations } from '~/locale/translations.ts';
+import { loadSumlFromBase } from '~/server/loader.ts';
 import { extractMetadata } from '~/src/blog/metadata.ts';
+import parseMarkdown from '~/src/parseMarkdown.ts';
+import { Translator } from '~/src/translator.ts';
 
 const validator = new HtmlValidate({
     extends: [
diff --git a/test/locales/data.test.ts b/test/locales/data.test.ts
index 5585003d0..ab0e28ce7 100644
--- a/test/locales/data.test.ts
+++ b/test/locales/data.test.ts
@@ -1,15 +1,14 @@
 import type { SyncExpectationResult } from '@vitest/expect';
 import { describe, expect, test } from 'vitest';
 
-import type { Config } from '../../locale/config.ts';
-import type { NounTemplatesData, PronounGroupData, PronounExamplesData, PronounData } from '../../locale/data.ts';
-import allLocales from '../../locale/locales.ts';
-import { loadSumlFromBase } from '../../server/loader.ts';
-import { Example } from '../../src/classes.ts';
-import { loadTsv } from '../../src/tsv.ts';
-
+import type { Config } from '~/locale/config.ts';
+import type { NounTemplatesData, PronounGroupData, PronounExamplesData, PronounData } from '~/locale/data.ts';
+import allLocales from '~/locale/locales.ts';
+import { loadSumlFromBase } from '~/server/loader.ts';
 import { normaliseKey } from '~/src/buildPronoun.ts';
+import { Example } from '~/src/classes.ts';
 import { gendersWithNumerus } from '~/src/nouns.ts';
+import { loadTsv } from '~/src/tsv.ts';
 
 const __dirname = new URL('.', import.meta.url).pathname;
 
diff --git a/test/locales/translations.test.ts b/test/locales/translations.test.ts
index 26ce37b4f..f31adbd0f 100644
--- a/test/locales/translations.test.ts
+++ b/test/locales/translations.test.ts
@@ -7,13 +7,12 @@ import pathToRegexp from 'path-to-regexp';
 import { beforeAll, describe, expect, test, vi } from 'vitest';
 import type { RouteRecordRaw } from 'vue-router';
 
-import routerOptions from '../../app/router.options.ts';
-import allLocales from '../../locale/locales.ts';
-import type { Translations } from '../../locale/translations.ts';
-import { loadSumlFromBase } from '../../server/loader.ts';
-import { deepGet, deepListKeys } from '../../src/helpers.ts';
-
+import routerOptions from '~/app/router.options.ts';
 import type { Config } from '~/locale/config.ts';
+import allLocales from '~/locale/locales.ts';
+import type { Translations } from '~/locale/translations.ts';
+import { loadSumlFromBase } from '~/server/loader.ts';
+import { deepGet, deepListKeys } from '~/src/helpers.ts';
 
 const baseTranslations = loadSumlFromBase('locale/_base/translations') as Translations;
 const typeFlexibleKeys = new Set(['home.generator.alt']);
diff --git a/test/plugins/track.test.ts b/test/plugins/track.test.ts
index c1e51b114..d5b414809 100644
--- a/test/plugins/track.test.ts
+++ b/test/plugins/track.test.ts
@@ -2,7 +2,7 @@
 
 import { describe, expect, test } from 'vitest';
 
-import { normalizeUrl } from '../../plugins/track.client.ts';
+import { normalizeUrl } from '~/plugins/track.client.ts';
 
 describe('when tracking', () => {
     const base = 'https://pronouns.page';