style: group component imports separately from script ones

michaelhthomas · Nov 12, 2023 · b41ab86 · b41ab86
1 parent 675b36a
commit b41ab86
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 17 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -9,7 +9,8 @@
 	"importOrder": [
 		"^(assert|buffer|child_process|cluster|crypto|dgram|dns|domain|events|fs|http|https|net|os|path|punycode|querystring|readline|stream|string_decoder|timers|tls|tty|url|util|v8|vm|zlib)",
 		"<THIRD_PARTY_MODULES>",
-		"^\\$lib/(.*)$",
+		"^\\$lib/(?!.*\\.svelte$)(.*)$",
+		"^\\$lib/(.*)\\.svelte$",
 		"^[./]"
 	],
 	"importOrderSeparation": true,

diff --git a/src/lib/components/layout/DateDropdown.svelte b/src/lib/components/layout/DateDropdown.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
 	import { DropdownItem } from 'flowbite-svelte';
 
-	import Dropdown from '$lib/components/Dropdown.svelte';
 	import {
 		DateRangeChoice,
 		formatDateRange,
 		getDateRange
 	} from '$lib/models/DateRange';
 	import { usePreferencesStore } from '$lib/stores/preferences';
 
+	import Dropdown from '$lib/components/Dropdown.svelte';
+
 	const choices = Object.keys(DateRangeChoice)
 		.filter((k) => !isNaN(Number(k)))
 		.map((n) => Number(n)) as DateRangeChoice[];

diff --git a/src/lib/components/transactions/PeriodSummary.svelte b/src/lib/components/transactions/PeriodSummary.svelte
@@ -4,15 +4,16 @@
 	import { Table, TableBody, TableBodyCell, TableBodyRow } from 'flowbite-svelte';
 
 	import { InsightApi, type ListTransactionRequest, TransactionsApi } from '$lib/api';
-	import Currency from '$lib/components/format/Currency.svelte';
-	import Section from '$lib/components/layout/Section.svelte';
 	import type { DateRange } from '$lib/models/DateRange';
 	import {
 		TransactionCategory,
 		getTransactionCategoryTypeFilter
 	} from '$lib/models/TransactionCategory';
 	import { useService } from '$lib/services';
 
+	import Currency from '$lib/components/format/Currency.svelte';
+	import Section from '$lib/components/layout/Section.svelte';
+
 	export let range: DateRange;
 	export let category: TransactionCategory;
 	let type = getTransactionCategoryTypeFilter(category);

diff --git a/src/lib/components/transactions/TransactionSplit.svelte b/src/lib/components/transactions/TransactionSplit.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
 	import { TransactionTypeProperty } from '$lib/api';
-	import Currency from '$lib/components/format/Currency.svelte';
 	import type { TransactionMeta } from '$lib/models/TransactionMeta';
 
+	import Currency from '$lib/components/format/Currency.svelte';
+
 	export let data: TransactionMeta & { isGroup: true };
 
 	$: groupAmount = data.group.transactions.reduce(

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -3,12 +3,13 @@
 	import { QueryClientProvider } from '@tanstack/svelte-query';
 
 	import { queryClient } from '$lib/client';
+	import type { PageMeta } from '$lib/models/PageMeta';
+
 	import AppModals from '$lib/components/layout/AppModals.svelte';
 	import AppShell from '$lib/components/layout/AppShell.svelte';
 	import Navbar from '$lib/components/layout/Navbar.svelte';
 	import Sidebar from '$lib/components/layout/Sidebar.svelte';
 	import LocalizationProvider from '$lib/components/providers/LocalizationProvider.svelte';
-	import type { PageMeta } from '$lib/models/PageMeta';
 
 	import '../app.postcss';
 

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -2,11 +2,12 @@
 	import { createQuery } from '@tanstack/svelte-query';
 
 	import { SummaryApi } from '$lib/api';
-	import Icon from '$lib/components/Icon.svelte';
-	import BasicSummary from '$lib/components/dashboard/BasicSummary.svelte';
 	import { useService } from '$lib/services';
 	import { usePreferencesStore } from '$lib/stores/preferences';
 
+	import Icon from '$lib/components/Icon.svelte';
+	import BasicSummary from '$lib/components/dashboard/BasicSummary.svelte';
+
 	const summaryService = useService(SummaryApi);
 	$: preferences = usePreferencesStore();
 

diff --git a/src/routes/export/+page.svelte b/src/routes/export/+page.svelte
@@ -3,11 +3,12 @@
 	import { Button, Spinner } from 'flowbite-svelte';
 
 	import { DataApi } from '$lib/api';
+	import { useService } from '$lib/services';
+	import { downloadBlob } from '$lib/utils/download';
+
 	import Icon from '$lib/components/Icon.svelte';
 	import DashboardPage from '$lib/components/layout/DashboardPage.svelte';
 	import Section from '$lib/components/layout/Section.svelte';
-	import { useService } from '$lib/services';
-	import { downloadBlob } from '$lib/utils/download';
 
 	const exportService = useService(DataApi);
 

diff --git a/src/routes/transactions/TransactionsPage.svelte b/src/routes/transactions/TransactionsPage.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
 	import { page } from '$app/stores';
 
+	import type { TransactionCategory } from '$lib/models/TransactionCategory';
+
 	import DashboardPage from '$lib/components/layout/DashboardPage.svelte';
 	import Section from '$lib/components/layout/Section.svelte';
 	import TransactionsGrid from '$lib/components/transactions/TransactionsGrid.svelte';
 	import TransactionsSidebar from '$lib/components/transactions/TransactionsSidebar.svelte';
-	import type { TransactionCategory } from '$lib/models/TransactionCategory';
 
 	export let category: TransactionCategory;
 </script>

diff --git a/src/routes/transactions/deposit/+page.svelte b/src/routes/transactions/deposit/+page.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
-	import Section from '$lib/components/layout/Section.svelte';
-	import InsightChart from '$lib/components/visualization/InsightChart.svelte';
 	import { InsightCategory } from '$lib/models/InsightCategory';
 	import { TransactionCategory } from '$lib/models/TransactionCategory';
 
+	import Section from '$lib/components/layout/Section.svelte';
+	import InsightChart from '$lib/components/visualization/InsightChart.svelte';
+
 	import TransactionsPage from '../TransactionsPage.svelte';
 </script>
 

diff --git a/src/routes/transactions/transfers/+page.svelte b/src/routes/transactions/transfers/+page.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
-	import Section from '$lib/components/layout/Section.svelte';
-	import InsightChart from '$lib/components/visualization/InsightChart.svelte';
 	import { InsightCategory } from '$lib/models/InsightCategory';
 	import { TransactionCategory } from '$lib/models/TransactionCategory';
 
+	import Section from '$lib/components/layout/Section.svelte';
+	import InsightChart from '$lib/components/visualization/InsightChart.svelte';
+
 	import TransactionsPage from '../TransactionsPage.svelte';
 </script>
 

diff --git a/src/routes/transactions/withdrawal/+page.svelte b/src/routes/transactions/withdrawal/+page.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
-	import Section from '$lib/components/layout/Section.svelte';
-	import InsightChart from '$lib/components/visualization/InsightChart.svelte';
 	import { InsightCategory } from '$lib/models/InsightCategory';
 	import { TransactionCategory } from '$lib/models/TransactionCategory';
 
+	import Section from '$lib/components/layout/Section.svelte';
+	import InsightChart from '$lib/components/visualization/InsightChart.svelte';
+
 	import TransactionsPage from '../TransactionsPage.svelte';
 </script>