From edfbcce5a2a2e167e254d29123f42b66bd7b0314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Jaenisch?= <andre.jaenisch@posteo.de>
Date: Fri, 15 Mar 2024 10:49:30 +0100
Subject: [PATCH] refactor: drop lang="ts" from script elements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I noticed that tooling isn't capable of handling it.

Signed-off-by: André Jaenisch <andre.jaenisch@posteo.de>
---
 src/lib/components/atoms/Avatar.svelte        |  6 ++---
 src/lib/components/atoms/BlockOrReport.svelte |  2 +-
 src/lib/components/atoms/Created.svelte       | 17 +++++++-----
 src/lib/components/atoms/DisplayName.svelte   | 20 +++++++++-----
 src/lib/components/organisms/LoginForm.svelte | 27 ++++++++++++++++---
 src/lib/components/pages/ImportProject.svelte |  4 +--
 src/lib/components/pages/Login.svelte         |  6 ++---
 src/lib/components/pages/Profile.svelte       |  4 +--
 .../components/templates/ImportProject.svelte |  4 +--
 src/lib/components/templates/Login.svelte     |  6 ++---
 src/lib/components/templates/Profile.svelte   | 24 ++++++++++-------
 11 files changed, 78 insertions(+), 42 deletions(-)

diff --git a/src/lib/components/atoms/Avatar.svelte b/src/lib/components/atoms/Avatar.svelte
index 0852233..f6fb609 100644
--- a/src/lib/components/atoms/Avatar.svelte
+++ b/src/lib/components/atoms/Avatar.svelte
@@ -11,18 +11,18 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<script lang="ts">
+<script>
 	import { Avatar } from '@skeletonlabs/skeleton';
 
 	/**
 	 * URL to Avatar image.
 	 */
-	export let avatar: string | undefined = '';
+	export let avatar = '';
 
 	/**
 	 * Name to derive initials from if no avatar is given.
 	 */
-	export let displayName: string | undefined = '';
+	export let displayName = '';
 </script>
 
 <Avatar src={avatar} alt={displayName} width="w-32" rounded="rounded-full" initials={displayName} />
diff --git a/src/lib/components/atoms/BlockOrReport.svelte b/src/lib/components/atoms/BlockOrReport.svelte
index 2bf70a9..c81ad55 100644
--- a/src/lib/components/atoms/BlockOrReport.svelte
+++ b/src/lib/components/atoms/BlockOrReport.svelte
@@ -11,7 +11,7 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<script lang="ts">
+<script>
 	import { _ } from 'svelte-i18n';
 </script>
 
diff --git a/src/lib/components/atoms/Created.svelte b/src/lib/components/atoms/Created.svelte
index b7e1944..a271166 100644
--- a/src/lib/components/atoms/Created.svelte
+++ b/src/lib/components/atoms/Created.svelte
@@ -11,16 +11,19 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<script lang="ts">
-	/**
-	 * Formatted datetime according to the locale.
-	 */
-	export let created_at_formatted: string | null = '';
-
+<script>
 	/**
 	 * Date object for created time.
+	 * @type {Date | null}
 	 */
-	export let created_at: Date | null = null;
+	export let created_at = null;
+
+	/**
+	 * Locale to format the datetime according to.
+	 */
+	export let locale = 'en';
+
+	$: created_at_formatted = new Intl.DateTimeFormat(locale).format(created_at);
 </script>
 
 {#if created_at && created_at_formatted}
diff --git a/src/lib/components/atoms/DisplayName.svelte b/src/lib/components/atoms/DisplayName.svelte
index 6ee7e11..5b4ab26 100644
--- a/src/lib/components/atoms/DisplayName.svelte
+++ b/src/lib/components/atoms/DisplayName.svelte
@@ -11,23 +11,31 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<script lang="ts">
+<script>
 	import { _ } from 'svelte-i18n';
 
 	/**
 	 * Under which name shall the person be known?
 	 */
-	export let displayName: string = '';
+	export let displayName = '';
+
+	/**
+	 * Translation keys.
+	 */
+	export let i18n = {
+		heading: ''
+	};
 
 	/**
 	 * How to correctly address this person.
 	 */
-	export let pronoun: string = '';
+	export let pronoun = '';
 </script>
 
 <h1 class="h1 font-semibold text-4xl leading-tight">
-	<!-- FIXME: Include placeholder in i18n -->
-	<span class="sr-only">{$_('page.profile.heading')}</span>
+	<span class="sr-only">{$_(i18n.heading)}</span>
 	{displayName}
 </h1>
-<p class="leading-normal my-1">({pronoun})</p>
+{#if pronoun}
+	<p class="leading-normal my-1">({pronoun})</p>
+{/if}
diff --git a/src/lib/components/organisms/LoginForm.svelte b/src/lib/components/organisms/LoginForm.svelte
index 69c0a08..b1fc810 100644
--- a/src/lib/components/organisms/LoginForm.svelte
+++ b/src/lib/components/organisms/LoginForm.svelte
@@ -11,25 +11,44 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<script lang="ts">
+<script>
 	import { _ } from 'svelte-i18n';
 
 	/**
 	 * PageData provided by SvelteKit.
 	 */
-	export let data: unknown = {
+	export let data = {
 		servers: {}
 	};
 
 	/**
 	 * Form handling by SvelteKit
 	 */
-	export let form: unknown = null;
+	export let form = null;
 
 	/**
 	 * Translation keys to enable reuse
 	 */
-	export let i18n: null;
+	export let i18n = {
+		fields: {
+			account: {
+				label: ''
+			},
+			passphrase: {
+				label: '',
+				placeholder: ''
+			},
+			server: {
+				label: ''
+			}
+		},
+		reset: '',
+		submit: '',
+		validation: {
+			incorrect: '',
+			missing: ''
+		}
+	};
 
 	/**
 	 * Allow for linking stories in Storybook.
diff --git a/src/lib/components/pages/ImportProject.svelte b/src/lib/components/pages/ImportProject.svelte
index 2c18688..e29ebc7 100644
--- a/src/lib/components/pages/ImportProject.svelte
+++ b/src/lib/components/pages/ImportProject.svelte
@@ -11,13 +11,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<script lang="ts">
+<script>
 	import ImportProjectTemplate from '../templates/ImportProject.svelte';
 
 	/**
 	 * Data populated by SvelteKit
 	 */
-	export let data: unknown = null;
+	export let data = null;
 </script>
 
 <ImportProjectTemplate {data} />
diff --git a/src/lib/components/pages/Login.svelte b/src/lib/components/pages/Login.svelte
index 84524a0..30d5b0a 100644
--- a/src/lib/components/pages/Login.svelte
+++ b/src/lib/components/pages/Login.svelte
@@ -11,20 +11,20 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<script lang="ts">
+<script>
 	import LoginTemplate from '../templates/Login.svelte';
 
 	/**
 	 * PageData provided by SvelteKit.
 	 */
-	export let data: unknown = {
+	export let data = {
 		servers: {}
 	};
 
 	/**
 	 * Form handling by SvelteKit
 	 */
-	export let form: unknown = null;
+	export let form = null;
 </script>
 
 <LoginTemplate {data} {form} />
diff --git a/src/lib/components/pages/Profile.svelte b/src/lib/components/pages/Profile.svelte
index c4b42ae..7105b4e 100644
--- a/src/lib/components/pages/Profile.svelte
+++ b/src/lib/components/pages/Profile.svelte
@@ -11,13 +11,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<script lang="ts">
+<script>
 	import ProfileTemplate from '../templates/Profile.svelte';
 
 	/**
 	 * Data populated by SvelteKit
 	 */
-	export let data: unknown = null;
+	export let data = null;
 </script>
 
 <ProfileTemplate {data} />
diff --git a/src/lib/components/templates/ImportProject.svelte b/src/lib/components/templates/ImportProject.svelte
index 78ed87d..f86db68 100644
--- a/src/lib/components/templates/ImportProject.svelte
+++ b/src/lib/components/templates/ImportProject.svelte
@@ -11,14 +11,14 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<script lang="ts">
+<script>
 	import { AlertFill16, Info16, Repo24, Upload16 } from 'svelte-octicons';
 	import { _ } from 'svelte-i18n';
 
 	/**
 	 * Required context for populating the template.
 	 */
-	export const data: unknown = null;
+	export const data = null;
 </script>
 
 <section class="w-full">
diff --git a/src/lib/components/templates/Login.svelte b/src/lib/components/templates/Login.svelte
index a7be89b..c701bca 100644
--- a/src/lib/components/templates/Login.svelte
+++ b/src/lib/components/templates/Login.svelte
@@ -11,7 +11,7 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<script lang="ts">
+<script>
 	import { _ } from 'svelte-i18n';
 
 	import LoginForm from '../organisms/LoginForm.svelte';
@@ -19,14 +19,14 @@ You should have received a copy of the GNU Affero General Public License along w
 	/**
 	 * PageData provided by SvelteKit.
 	 */
-	export let data: unknown = {
+	export let data = {
 		servers: {}
 	};
 
 	/**
 	 * Form handling by SvelteKit
 	 */
-	export let form: unknown = {
+	export let form = {
 		servers: {}
 	};
 
diff --git a/src/lib/components/templates/Profile.svelte b/src/lib/components/templates/Profile.svelte
index 44d7a82..dfcfa48 100644
--- a/src/lib/components/templates/Profile.svelte
+++ b/src/lib/components/templates/Profile.svelte
@@ -11,7 +11,7 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<script lang="ts">
+<script>
 	import { _, date } from 'svelte-i18n';
 	import { NorthStar24, Star16 } from 'svelte-octicons';
 
@@ -20,12 +20,21 @@ You should have received a copy of the GNU Affero General Public License along w
 	import Created from '../atoms/Created.svelte';
 	import DisplayName from '../atoms/DisplayName.svelte';
 
-	import type { ProfileData } from './Profile.d.ts';
-
 	/**
 	 * Required context for populating the template.
 	 */
-	export let data: ProfileData = null;
+	export let data = {
+		locale: '',
+		user: {
+			avatar: '',
+			created_at: null,
+			created_with: '',
+			display_name: '',
+			instance: '',
+			pronoun: '',
+			username: ''
+		}
+	};
 
 	/**
 	 * Allow for linking stories in Storybook.
@@ -41,10 +50,7 @@ You should have received a copy of the GNU Affero General Public License along w
 	<!-- Board -->
 	<div class="flex flex-1 flex-col ps-8">
 		<div class="self-end">
-			<Created
-				created_at={data.user.created_at}
-				created_at_formatted={data.user.created_at_formatted}
-			/>
+			<Created created_at={data.user.created_at} locale={data.locale} />
 			<BlockOrReport />
 		</div>
 		<!-- Top Row -->
@@ -52,7 +58,7 @@ You should have received a copy of the GNU Affero General Public License along w
 			<!-- Board -->
 			<div class="flex flex-col flex-1 gap-2">
 				<div class="flex items-end">
-					<DisplayName displayName={data.user.display_name} pronoun={data.user.pronoun} />
+					<DisplayName displayName={data.user.display_name} {i18n} pronoun={data.user.pronoun} />
 				</div>
 				<span class="leading-tight">
 					{data.user.username}@{data.user.instance}