fix: index file for 'lib/utils' causes errors

Signed-off-by: Robert Goniszewski <robertgoniszewski@outlook.com>
goniszewski · Apr 15, 2024 · e939bc5 · e939bc5
1 parent 52f5e94
commit e939bc5
Show file tree

Hide file tree

Showing 22 changed files with 35 additions and 35 deletions.
diff --git a/src/lib/components/AddBookmarkForm/AddBookmarkForm.svelte b/src/lib/components/AddBookmarkForm/AddBookmarkForm.svelte
@@ -5,7 +5,10 @@
 	import { searchEngine } from '$lib/stores/search.store';
 	import { userSettingsStore } from '$lib/stores/user-settings.store';
 	import type { Metadata } from '$lib/types/Metadata.type';
-	import { addBookmarkToSearchIndex, showToast, validateUrlRegex } from '$lib/utils';
+	import { validateUrlRegex } from '$lib/utils/regex-library';
+	import { addBookmarkToSearchIndex } from '$lib/utils/search';
+	import { showToast } from '$lib/utils/show-toast';
+
 	import { IconInfoCircle } from '@tabler/icons-svelte';
 	import _ from 'lodash';
 	import { onDestroy } from 'svelte';

diff --git a/src/lib/components/AddCategoryForm/AddCategoryForm.svelte b/src/lib/components/AddCategoryForm/AddCategoryForm.svelte
@@ -7,7 +7,7 @@
 	import Icon from '$lib/components/Icon/Icon.svelte';
 	import { icons } from '$lib/enums/icons';
 	import type { Category } from '$lib/types/Category.type';
-	import { showToast } from '$lib/utils';
+	import { showToast } from '$lib/utils/show-toast';
 
 	const category = writable<
 		Partial<

diff --git a/src/lib/components/BookmarkCard/BookmarkCard.svelte b/src/lib/components/BookmarkCard/BookmarkCard.svelte
@@ -7,7 +7,8 @@
 	import { searchEngine } from '$lib/stores/search.store';
 	import { showBookmarkStore } from '$lib/stores/show-bookmark.store';
 	import { userSettingsStore } from '$lib/stores/user-settings.store';
-	import { removeBookmarkFromSearchIndex, showToast } from '$lib/utils';
+	import { removeBookmarkFromSearchIndex } from '$lib/utils/search';
+	import { showToast } from '$lib/utils/show-toast';
 	import {
 		IconBookmark,
 		IconBookmarkFilled,

diff --git a/src/lib/components/BookmarkListItem/BookmarkListItem.svelte b/src/lib/components/BookmarkListItem/BookmarkListItem.svelte
@@ -6,7 +6,8 @@
 	import { showBookmarkStore } from '$lib/stores/show-bookmark.store';
 	import { userSettingsStore } from '$lib/stores/user-settings.store';
 	import type { Bookmark } from '$lib/types/Bookmark.type';
-	import { removeBookmarkFromSearchIndex, showToast } from '$lib/utils';
+	import { removeBookmarkFromSearchIndex } from '$lib/utils/search';
+	import { showToast } from '$lib/utils/show-toast';
 	import {
 		IconBackspace,
 		IconBookmark,

diff --git a/src/lib/components/EditBookmarkForm/EditBookmarkForm.svelte b/src/lib/components/EditBookmarkForm/EditBookmarkForm.svelte
@@ -8,7 +8,8 @@
 	import { editBookmarkStore } from '$lib/stores/edit-bookmark.store';
 	import { searchEngine } from '$lib/stores/search.store';
 	import type { Bookmark } from '$lib/types/Bookmark.type';
-	import { showToast, updateBookmarkInSearchIndex } from '$lib/utils';
+	import { updateBookmarkInSearchIndex } from '$lib/utils/search';
+	import { showToast } from '$lib/utils/show-toast';
 
 	let form: HTMLFormElement;
 	export let closeModal: () => void;

diff --git a/src/lib/components/EditCategoryForm/EditCategoryForm.svelte b/src/lib/components/EditCategoryForm/EditCategoryForm.svelte
@@ -8,7 +8,7 @@
 	import { icons } from '$lib/enums/icons';
 	import { editCategoryStore } from '$lib/stores/edit-category.store';
 	import type { Category } from '$lib/types/Category.type';
-	import { showToast } from '$lib/utils';
+	import { showToast } from '$lib/utils/show-toast';
 
 	const category = writable<Partial<Category>>({});
 	$: $category = { ...$editCategoryStore };

diff --git a/src/lib/integrations/ollama/index.ts b/src/lib/integrations/ollama/index.ts
@@ -1,5 +1,5 @@
 import type { ollamaSettings } from '$lib/types/UserSettings.type';
-import { validateUrlRegex } from '$lib/utils';
+import { validateUrlRegex } from '$lib/utils/regex-library';
 
 export const defaultConfig = {
 	url: 'http://localhost:11434',

diff --git a/src/lib/types/UserSettings.type.ts b/src/lib/types/UserSettings.type.ts
@@ -1,4 +1,4 @@
-import type { sortByType } from '$lib/utils';
+import type { sortByType } from '$lib/utils/sort-bookmarks';
 
 export type ollamaSettings = {
 	url: string;

diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
@@ -4,9 +4,10 @@ import type { Category } from '$lib/types/Category.type';
 import type { Tag } from '$lib/types/Tag.type';
 import type { BookmarkDto } from '$lib/types/dto/Bookmark.dto';
 import type { CategoryDto } from '$lib/types/dto/Category.dto';
-import { searchIndexKeys, serializeBookmarkList } from '$lib/utils';
 
 import type { TagWithBookmarks } from '$lib/types/dto/Tag.dto';
+import { searchIndexKeys } from '$lib/utils/search';
+import { serializeBookmarkList } from '$lib/utils/serialize-bookmark-list';
 
 function tagWithBookmarkIds(bookmarks: BookmarkDto[], tags: Tag[]): TagWithBookmarks[] {
 	return tags.map((tag) => {

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -13,7 +13,8 @@
 	import { checkPocketbaseConnection, user } from '$lib/pb';
 	import { searchedValue } from '$lib/stores/search.store';
 	import type { Category } from '$lib/types/Category.type';
-	import { ToastNode, buildCategoryTree, showToast } from '$lib/utils';
+	import { buildCategoryTree } from '$lib/utils/build-category-tree';
+	import { ToastNode, showToast } from '$lib/utils/show-toast';
 	import { IconMenu, IconX } from '@tabler/icons-svelte';
 	import { onDestroy, onMount } from 'svelte';
 	import { writable } from 'svelte/store';

diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
@@ -1,6 +1,7 @@
 import type { Actions } from './$types';
 import { handlePBError, pb } from '$lib/pb';
-import { createSlug, prepareTags } from '$lib/utils';
+import { createSlug } from '$lib/utils/create-slug';
+import { prepareTags } from '$lib/utils/handle-tags-input';
 
 import type { Bookmark } from '$lib/types/Bookmark.type';
 export const actions = {

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -12,7 +12,8 @@
 	import { userSettingsStore } from '$lib/stores/user-settings.store';
 	import type { Bookmark } from '$lib/types/Bookmark.type';
 	import type { UserSettings } from '$lib/types/UserSettings.type';
-	import { initializeSearch, sortBookmarks } from '$lib/utils';
+	import { initializeSearch } from '$lib/utils/search';
+	import { sortBookmarks } from '$lib/utils/sort-bookmarks';
 	import {
 		IconLayout2,
 		IconListDetails,

diff --git a/src/routes/admin/+page.svelte b/src/routes/admin/+page.svelte
@@ -2,7 +2,7 @@
 	import { enhance } from '$app/forms';
 	import { user } from '$lib/pb';
 	import type { UserSettings } from '$lib/types/UserSettings.type';
-	import { showToast } from '$lib/utils';
+	import { showToast } from '$lib/utils/show-toast';
 	import { IconInfoCircle, IconLock, IconLockOpen, IconTrash } from '@tabler/icons-svelte';
 	import { writable } from 'svelte/store';
 	import type { PageData } from './$types';

diff --git a/src/routes/api/bookmarks/+server.ts b/src/routes/api/bookmarks/+server.ts
@@ -1,5 +1,8 @@
 import { authenticateUserApiRequest, removePocketbaseFields } from '$lib/pb';
-import { getFileUrl, getMetadataFromHtml, prepareTags, urlDataToBlobConverter } from '$lib/utils';
+import { getFileUrl } from '$lib/utils/get-file-url';
+import { getMetadataFromHtml } from '$lib/utils/get-metadata';
+import { prepareTags } from '$lib/utils/handle-tags-input';
+import { urlDataToBlobConverter } from '$lib/utils/url-data-to-blob-converter';
 import joi from 'joi';
 
 import { json } from '@sveltejs/kit';
@@ -11,7 +14,6 @@ import type {
 	UpdateBookmarkRequestBody
 } from '$lib/types/api/Bookmarks.type';
 import type Client from 'pocketbase';
-
 const prepareRequestedTags = (
 	requestBody: AddBookmarkRequestBody | UpdateBookmarkRequestBody,
 	userTags: { id: string; name: string }[]

diff --git a/src/routes/api/bookmarks/simple/+server.ts b/src/routes/api/bookmarks/simple/+server.ts
@@ -1,12 +1,11 @@
 import { authenticateUserApiRequest, removePocketbaseFields } from '$lib/pb';
-import { getMetadata } from '$lib/utils';
+import { getMetadata } from '$lib/utils/get-metadata';
 import joi from 'joi';
 
 import { json } from '@sveltejs/kit';
 
 import type { Bookmark } from '$lib/types/Bookmark.type.js';
 import type { RequestHandler } from '@sveltejs/kit';
-
 export const POST: RequestHandler = async ({ locals, request, url }) => {
 	const { owner, error: authError } = await authenticateUserApiRequest(locals.pb, request);
 

diff --git a/src/routes/api/categories/+server.ts b/src/routes/api/categories/+server.ts
@@ -1,5 +1,5 @@
 import { authenticateUserApiRequest, pb, removePocketbaseFields } from '$lib/pb.js';
-import { createSlug } from '$lib/utils';
+import { createSlug } from '$lib/utils/create-slug.js';
 import joi from 'joi';
 
 import { json } from '@sveltejs/kit';

diff --git a/src/routes/api/fetch-metadata/+server.ts b/src/routes/api/fetch-metadata/+server.ts
@@ -1,4 +1,4 @@
-import { getMetadata } from '$lib/utils';
+import { getMetadata } from '$lib/utils/get-metadata';
 
 import { json } from '@sveltejs/kit';
 

diff --git a/src/routes/api/tags/+server.ts b/src/routes/api/tags/+server.ts
@@ -1,5 +1,5 @@
 import { authenticateUserApiRequest, pb, removePocketbaseFields } from '$lib/pb';
-import { createSlug } from '$lib/utils';
+import { createSlug } from '$lib/utils/create-slug';
 import joi from 'joi';
 
 import { json } from '@sveltejs/kit';

diff --git a/src/routes/categories/[slug]/+layout.server.ts b/src/routes/categories/[slug]/+layout.server.ts
@@ -1,6 +1,6 @@
 import type { BookmarkDto } from '$lib/types/dto/Bookmark.dto';
 import type { CategoryDto } from '$lib/types/dto/Category.dto';
-import { serializeBookmarkList } from '$lib/utils';
+import { serializeBookmarkList } from '$lib/utils/serialize-bookmark-list';
 
 export const load = async ({ locals, url, parent }) => {
 	if (!locals.user) {

diff --git a/src/routes/profile/edit/+page.svelte b/src/routes/profile/edit/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { enhance } from '$app/forms';
 	import { user } from '$lib/pb';
-	import { showToast } from '$lib/utils';
+	import { showToast } from '$lib/utils/show-toast';
 
 	let showPasswordForm = false;
 

diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
@@ -5,7 +5,8 @@
 	import { user } from '$lib/pb';
 	import { userSettingsStore } from '$lib/stores/user-settings.store';
 	import type { UserSettings } from '$lib/types/UserSettings.type';
-	import { showToast, themeChange } from '$lib/utils';
+	import { showToast } from '$lib/utils/show-toast';
+	import { themeChange } from '$lib/utils/theme-change';
 	import { IconPlug, IconPlugConnected } from '@tabler/icons-svelte';
 	import { writable } from 'svelte/store';