From f3c453b1b2c53306ff953e562cb933fd4a266ef3 Mon Sep 17 00:00:00 2001
From: Peaceultime <clem31470@gmail.com>
Date: Wed, 29 Jan 2025 22:51:55 +0100
Subject: [PATCH] Renaming general.utils to general.util

---
 components/CanvasEditor.vue                  |  8 ++------
 components/MarkdownRenderer.vue              |  2 +-
 components/page/Canvas.vue                   |  2 +-
 components/prose/ProseA.vue                  |  2 +-
 components/prose/ProseH1.vue                 |  2 +-
 components/prose/ProseH2.vue                 |  2 +-
 components/prose/ProseH3.vue                 |  2 +-
 components/prose/ProseH4.vue                 |  2 +-
 components/prose/ProseH5.vue                 |  2 +-
 components/prose/ProseH6.vue                 |  2 +-
 layouts/default.vue                          |  2 +-
 pages/admin/index.vue                        |  2 +-
 pages/explore/edit/index.vue                 |  5 ++---
 server/api/file.post.ts                      |  2 +-
 server/api/file/content/[path].get.ts        |  2 +-
 server/api/project.post.ts                   |  2 +-
 server/components/mail/reset-password.vue    |  2 +-
 shared/canvas.util.ts                        |  2 +-
 shared/{general.utils.ts => general.util.ts} | 14 ++++++--------
 19 files changed, 26 insertions(+), 33 deletions(-)
 rename shared/{general.utils.ts => general.util.ts} (93%)

diff --git a/components/CanvasEditor.vue b/components/CanvasEditor.vue
index 95ed656..bfe10e0 100644
--- a/components/CanvasEditor.vue
+++ b/components/CanvasEditor.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import type { Position } from '#shared/canvas.util';
+import { type Position, InfiniteGrid } from '#shared/canvas.util';
 import type CanvasNodeEditor from './canvas/CanvasNodeEditor.vue';
 import type CanvasEdgeEditor from './canvas/CanvasEdgeEditor.vue';
 export type Element = { type: 'node' | 'edge', id: string };
@@ -52,15 +52,11 @@ function distance(touches: TouchList): number
     const [A, B] = touches;
     return Math.hypot(B.clientX - A.clientX, B.clientY - A.clientY);
 }
-function contains(group: CanvasNode, node: CanvasNode): boolean
-{
-    return group.x < node.x && group.y < node.y && group.x + group.width > node.x + node.width && group.y + group.height > node.y + node.height;
-}
 </script>
 
 <script setup lang="ts">
 import { Icon } from '@iconify/vue/dist/iconify.js';
-import { clamp } from '#shared/general.utils';
+import { clamp } from '#shared/general.util';
 import type { CanvasContent, CanvasEdge, CanvasNode } from '~/types/canvas';
 
 const canvas = defineModel<CanvasContent>({ required: true, });
diff --git a/components/MarkdownRenderer.vue b/components/MarkdownRenderer.vue
index 633e17b..03dbf51 100644
--- a/components/MarkdownRenderer.vue
+++ b/components/MarkdownRenderer.vue
@@ -8,7 +8,7 @@
 import type { Component } from 'vue';
 import { heading } from 'hast-util-heading';
 import { headingRank } from 'hast-util-heading-rank';
-import { parseId } from '~/shared/general.utils';
+import { parseId } from '~/shared/general.util';
 import type { Root } from 'hast';
 
 const { content, proses, filter } = defineProps<{
diff --git a/components/page/Canvas.vue b/components/page/Canvas.vue
index 183a429..c7ede25 100644
--- a/components/page/Canvas.vue
+++ b/components/page/Canvas.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useDrag, useHover, usePinch, useWheel } from '@vueuse/gesture';
 import { Icon } from '@iconify/vue/dist/iconify.js';
-import { clamp } from '#shared/general.utils';
+import { clamp } from '#shared/general.util';
 
 const { path } = defineProps<{ path: string }>();
 const { user } = useUserSession();
diff --git a/components/prose/ProseA.vue b/components/prose/ProseA.vue
index b6b4055..2f62e89 100644
--- a/components/prose/ProseA.vue
+++ b/components/prose/ProseA.vue
@@ -16,7 +16,7 @@
 <script setup lang="ts">
 import { parseURL } from 'ufo';
 import { Icon } from '@iconify/vue/dist/iconify.js';
-import { iconByType } from '#shared/general.utils';
+import { iconByType } from '#shared/general.util';
 
 const { href } = defineProps<{
 	href: string
diff --git a/components/prose/ProseH1.vue b/components/prose/ProseH1.vue
index 5e0042a..4d95051 100644
--- a/components/prose/ProseH1.vue
+++ b/components/prose/ProseH1.vue
@@ -5,6 +5,6 @@
 </template>
 
 <script setup lang="ts">
-import { parseId } from '#shared/general.utils';
+import { parseId } from '#shared/general.util';
 const props = defineProps<{ id?: string }>()
 </script>
diff --git a/components/prose/ProseH2.vue b/components/prose/ProseH2.vue
index 9b91709..df6e18a 100644
--- a/components/prose/ProseH2.vue
+++ b/components/prose/ProseH2.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import { parseId } from '#shared/general.utils';
+import { parseId } from '#shared/general.util';
 const props = defineProps<{ id?: string }>()
 
 const generate = computed(() => props.id)
diff --git a/components/prose/ProseH3.vue b/components/prose/ProseH3.vue
index cac9e80..6e10a26 100644
--- a/components/prose/ProseH3.vue
+++ b/components/prose/ProseH3.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import { parseId } from '#shared/general.utils';
+import { parseId } from '#shared/general.util';
 const props = defineProps<{ id?: string }>()
 
 const generate = computed(() => props.id)
diff --git a/components/prose/ProseH4.vue b/components/prose/ProseH4.vue
index bb5d37d..0cf538a 100644
--- a/components/prose/ProseH4.vue
+++ b/components/prose/ProseH4.vue
@@ -5,6 +5,6 @@
 </template>
 
 <script setup lang="ts">
-import { parseId } from '#shared/general.utils';
+import { parseId } from '#shared/general.util';
 const props = defineProps<{ id?: string }>()
 </script>
diff --git a/components/prose/ProseH5.vue b/components/prose/ProseH5.vue
index dcea685..c419cd8 100644
--- a/components/prose/ProseH5.vue
+++ b/components/prose/ProseH5.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import { parseId } from '#shared/general.utils';
+import { parseId } from '#shared/general.util';
 const props = defineProps<{ id?: string }>()
 
 const generate = computed(() => props.id)
diff --git a/components/prose/ProseH6.vue b/components/prose/ProseH6.vue
index 08ffd6a..21a007c 100644
--- a/components/prose/ProseH6.vue
+++ b/components/prose/ProseH6.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import { parseId } from '#shared/general.utils';
+import { parseId } from '#shared/general.util';
 const props = defineProps<{ id?: string }>()
 
 const generate = computed(() => props.id)
diff --git a/layouts/default.vue b/layouts/default.vue
index 73fe681..579c5db 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -89,7 +89,7 @@
 
 <script setup lang="ts">
 import { Icon } from '@iconify/vue/dist/iconify.js';
-import { iconByType } from '#shared/general.utils';
+import { iconByType } from '#shared/general.util';
 import type { DropdownOption } from '~/components/base/DropdownMenu.vue';
 import { hasPermissions } from '~/shared/auth.util';
 import type { TreeItem } from '~/types/content';
diff --git a/pages/admin/index.vue b/pages/admin/index.vue
index 49729e3..3f746f2 100644
--- a/pages/admin/index.vue
+++ b/pages/admin/index.vue
@@ -31,7 +31,7 @@
 </script>
 
 <script setup lang="ts">
-import { format, iconByType } from '~/shared/general.utils';
+import { format, iconByType } from '~/shared/general.util';
 import { Icon } from '@iconify/vue/dist/iconify.js';
 
 interface File
diff --git a/pages/explore/edit/index.vue b/pages/explore/edit/index.vue
index 27f9352..4f088ed 100644
--- a/pages/explore/edit/index.vue
+++ b/pages/explore/edit/index.vue
@@ -206,9 +206,8 @@
 <script setup lang="ts">
 import { Icon } from '@iconify/vue/dist/iconify.js';
 import type { Instruction } from '@atlaskit/pragmatic-drag-and-drop-hitbox/dist/types/tree-item';
-import { convertContentFromText, convertContentToText, parsePath } from '#shared/general.utils';
-import type { CanvasContent, ExploreContent, FileType, TreeItem } from '~/types/content';
-import { iconByType } from '#shared/general.utils';
+import { iconByType, convertContentFromText, convertContentToText, parsePath } from '#shared/general.util';
+import type { ExploreContent, FileType, TreeItem } from '~/types/content';
 import FakeA from '~/components/prose/FakeA.vue';
 
 export type TreeItemEditable = TreeItem &
diff --git a/server/api/file.post.ts b/server/api/file.post.ts
index 83a2dad..c722c82 100644
--- a/server/api/file.post.ts
+++ b/server/api/file.post.ts
@@ -1,7 +1,7 @@
 import useDatabase from '~/composables/useDatabase';
 import { explorerContentTable } from '~/db/schema';
 import { schema } from '~/schemas/file';
-import { parsePath } from '~/shared/general.utils';
+import { parsePath } from '~/shared/general.util';
 
 export default defineEventHandler(async (e) => {
     const body = await readValidatedBody(e, schema.safeParse);
diff --git a/server/api/file/content/[path].get.ts b/server/api/file/content/[path].get.ts
index ba74597..a4727df 100644
--- a/server/api/file/content/[path].get.ts
+++ b/server/api/file/content/[path].get.ts
@@ -1,7 +1,7 @@
 import { eq, sql } from 'drizzle-orm';
 import useDatabase from '~/composables/useDatabase';
 import { explorerContentTable } from '~/db/schema';
-import { convertContentFromText } from '~/shared/general.utils';
+import { convertContentFromText } from '~/shared/general.util';
 
 export default defineEventHandler(async (e) => {
     const path = decodeURIComponent(getRouterParam(e, "path") ?? '');
diff --git a/server/api/project.post.ts b/server/api/project.post.ts
index 654844b..3bdd558 100644
--- a/server/api/project.post.ts
+++ b/server/api/project.post.ts
@@ -2,7 +2,7 @@ import { hasPermissions } from "#shared/auth.util";
 import useDatabase from '~/composables/useDatabase';
 import { explorerContentTable } from '~/db/schema';
 import { project, type ProjectItem } from '~/schemas/project';
-import { parsePath } from "#shared/general.utils";
+import { parsePath } from "#shared/general.util";
 import { eq, getTableColumns, sql } from "drizzle-orm";
 import type { ExploreContent, TreeItem } from "~/types/content";
 import type { TreeItemEditable } from "~/pages/explore/edit/index.vue";
diff --git a/server/components/mail/reset-password.vue b/server/components/mail/reset-password.vue
index d0fcf0d..d3b5ad0 100644
--- a/server/components/mail/reset-password.vue
+++ b/server/components/mail/reset-password.vue
@@ -17,7 +17,7 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import Bun from 'bun';
-import { format } from '~/shared/general.utils';
+import { format } from '~/shared/general.util';
 
 const { id, userId, username, timestamp } = defineProps<{
     id: number
diff --git a/shared/canvas.util.ts b/shared/canvas.util.ts
index a2562ec..ef5104a 100644
--- a/shared/canvas.util.ts
+++ b/shared/canvas.util.ts
@@ -1,5 +1,5 @@
 import type { CanvasNode } from "~/types/canvas";
-import { clamp } from "#shared/general.utils";
+import { clamp } from "#shared/general.util";
 
 export type Direction = 'bottom' | 'top' | 'left' | 'right';
 export type Position = { x: number, y: number };
diff --git a/shared/general.utils.ts b/shared/general.util.ts
similarity index 93%
rename from shared/general.utils.ts
rename to shared/general.util.ts
index 73facb6..bed13b6 100644
--- a/shared/general.utils.ts
+++ b/shared/general.util.ts
@@ -40,15 +40,13 @@ export function format(date: Date, template: string): string
 
     return template;
 }
-export function clamp(x: number, min: number, max: number): number {
-    if (x > max)
-        return max;
-    if (x < min)
-        return min;
-    return x;
+export function clamp(x: number, min: number, max: number): number
+{
+    return x > max ? max : x < min ? min : x;
 }
-export function lerp(a: number, b: number, t: number) {
-    return a + t * (b - a);
+export function lerp(x: number, a: number, b: number): number
+{
+    return (1-x)*a+x*b;
 }
 export function convertContentFromText(type: FileType, content: string): CanvasContent | string {
     switch(type)