From 838c8d2ffb749ab423e7fb5574abbac45b891ab6 Mon Sep 17 00:00:00 2001
From: Romein van Buren <romein@vburen.nl>
Date: Wed, 15 Feb 2023 19:27:51 +0100
Subject: [PATCH] Housekeeping

---
 .vscode/tasks.json                            |  51 +++++++
 frontend/jsconfig.json                        |  25 +---
 frontend/src/app.svelte                       |  18 +--
 frontend/src/components/datepicker.svelte     |   2 +-
 .../src/components/directorychooser.svelte    |   2 +-
 frontend/src/components/forminput.svelte      |   8 +-
 frontend/src/components/grid-items.svelte     |   6 +-
 frontend/src/components/objectgrid.svelte     |   2 +-
 frontend/src/lib/actions/controlkey.js        |  13 ++
 .../src/lib/{actions.js => actions/input.js}  |   5 +-
 frontend/src/lib/constants.js                 |   7 +
 frontend/src/lib/keypaths.js                  |  58 ++++++++
 frontend/src/lib/math.js                      |  23 +++
 frontend/src/lib/mongo.js                     |  34 +++++
 frontend/src/lib/stores/environment.js        |   2 +-
 frontend/src/lib/stores/queries.js            |   2 +-
 frontend/src/lib/stores/settings.js           |   2 +-
 frontend/src/lib/stores/views.js              |   2 +-
 frontend/src/lib/utils.js                     | 138 ------------------
 frontend/src/main.js                          |   5 +-
 frontend/src/organisms/about/index.svelte     |   2 +-
 .../collection/components/form.svelte         |   7 +-
 .../collection/components/indexdetail.svelte  |   8 +-
 .../collection/components/querychooser.svelte |  12 +-
 .../collection/components/viewconfig.svelte   |  12 +-
 .../connection/collection/find.svelte         |  20 +--
 .../connection/collection/index.svelte        |   8 +-
 .../connection/collection/indexes.svelte      |   8 +-
 .../connection/collection/insert.svelte       |  21 +--
 .../connection/collection/remove.svelte       |   8 +-
 .../connection/collection/stats.svelte        |   4 +-
 .../connection/collection/update.svelte       |   8 +-
 .../organisms/connection/export/export.svelte |  14 +-
 .../organisms/connection/hostdetail.svelte    |   6 +-
 .../src/organisms/connection/hosttree.svelte  |   8 +-
 .../src/organisms/connection/index.svelte     |  20 +--
 frontend/src/organisms/settings/index.svelte  |   8 +-
 frontend/vite.config.js                       |  13 +-
 38 files changed, 322 insertions(+), 270 deletions(-)
 create mode 100644 .vscode/tasks.json
 create mode 100644 frontend/src/lib/actions/controlkey.js
 rename frontend/src/lib/{actions.js => actions/input.js} (91%)
 create mode 100644 frontend/src/lib/constants.js
 create mode 100644 frontend/src/lib/keypaths.js
 create mode 100644 frontend/src/lib/math.js
 create mode 100644 frontend/src/lib/mongo.js
 delete mode 100644 frontend/src/lib/utils.js

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..6d57a96
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,51 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "npm install",
+      "type": "npm",
+      "script": "install",
+      "options": {
+        "cwd": "${workspaceFolder}/frontend"
+      },
+      "presentation": {
+        "clear": true,
+        "panel": "shared",
+        "showReuseMessage": false
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "npm run build",
+      "type": "npm",
+      "script": "build",
+      "options": {
+        "cwd": "${workspaceFolder}/frontend"
+      },
+      "presentation": {
+        "clear": true,
+        "panel": "shared",
+        "showReuseMessage": false
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "build",
+      "type": "shell",
+      "options": {
+        "cwd": "${workspaceFolder}"
+      },
+      "command": "go",
+      "args": [
+        "build",
+        "-tags",
+        "dev",
+        "-gcflags",
+        "all=-N -l",
+        "-o",
+        "build/bin/vscode.exe"
+      ],
+      "dependsOn": ["npm install", "npm run build"]
+    }
+  ]
+}
diff --git a/frontend/jsconfig.json b/frontend/jsconfig.json
index 3918b4f..9660d5f 100644
--- a/frontend/jsconfig.json
+++ b/frontend/jsconfig.json
@@ -3,33 +3,22 @@
     "moduleResolution": "Node",
     "target": "ESNext",
     "module": "ESNext",
-    /**
-     * svelte-preprocess cannot figure out whether you have
-     * a value or a type, so tell TypeScript to enforce using
-     * `import type` instead of `import` for Types.
-     */
     "importsNotUsedAsValues": "error",
     "isolatedModules": true,
     "resolveJsonModule": true,
-    /**
-     * To have warnings / errors of the Svelte compiler at the
-     * correct position, enable source maps by default.
-     */
     "sourceMap": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
-    /**
-     * Typecheck JS in `.svelte` and `.js` files by default.
-     * Disable this if you'd like to use dynamic types.
-     */
-    "checkJs": true
+    "checkJs": true,
+    "paths": {
+      "$components/*": ["src/components/*"],
+      "$organisms/*": ["src/organisms/*"],
+      "$wails/*": ["wailsjs/*"],
+      "$lib/*": ["src/lib/*"]
+    }
   },
-  /**
-   * Use global.d.ts instead of compilerOptions.types
-   * to avoid limiting type declarations.
-   */
   "include": [
     "src/**/*.d.ts",
     "src/**/*.js",
diff --git a/frontend/src/app.svelte b/frontend/src/app.svelte
index 14d65de..f03b9d7 100644
--- a/frontend/src/app.svelte
+++ b/frontend/src/app.svelte
@@ -1,13 +1,13 @@
 <script>
-  import { EventsOn } from '../wailsjs/runtime';
-  import ContextMenu from './components/contextmenu.svelte';
-  import { connections } from './lib/stores/connections';
-  import contextMenu from './lib/stores/contextmenu';
-  import environment from './lib/stores/environment';
-  import applicationInited from './lib/stores/inited';
-  import About from './organisms/about/index.svelte';
-  import Connection from './organisms/connection/index.svelte';
-  import Settings from './organisms/settings/index.svelte';
+  import ContextMenu from '$components/contextmenu.svelte';
+  import { connections } from '$lib/stores/connections';
+  import contextMenu from '$lib/stores/contextmenu';
+  import environment from '$lib/stores/environment';
+  import applicationInited from '$lib/stores/inited';
+  import About from '$organisms/about/index.svelte';
+  import Connection from '$organisms/connection/index.svelte';
+  import Settings from '$organisms/settings/index.svelte';
+  import { EventsOn } from '$wails/runtime';
 
   const hosts = {};
   const activeHostKey = '';
diff --git a/frontend/src/components/datepicker.svelte b/frontend/src/components/datepicker.svelte
index b629017..879cfdd 100644
--- a/frontend/src/components/datepicker.svelte
+++ b/frontend/src/components/datepicker.svelte
@@ -1,7 +1,7 @@
 <script>
+  import { daysAbbr, months } from '$lib/constants';
   import { addDays, getWeek, isDate, isSameDay, startOfWeek } from 'date-fns';
   import { onMount } from 'svelte';
-  import { daysAbbr, months } from '../lib/utils';
   import Clock from './clock.svelte';
   import Icon from './icon.svelte';
   import Modal from './modal.svelte';
diff --git a/frontend/src/components/directorychooser.svelte b/frontend/src/components/directorychooser.svelte
index 3b854b4..83f60e0 100644
--- a/frontend/src/components/directorychooser.svelte
+++ b/frontend/src/components/directorychooser.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { OpenDirectory } from '../../wailsjs/go/app/App';
+  import { OpenDirectory } from '$wails/go/app/App';
 
   export let value = '';
   export let id = '';
diff --git a/frontend/src/components/forminput.svelte b/frontend/src/components/forminput.svelte
index 90cb236..48f2ff2 100644
--- a/frontend/src/components/forminput.svelte
+++ b/frontend/src/components/forminput.svelte
@@ -1,10 +1,10 @@
 <script>
-  import { canBeObjectId, numericInputTypes } from '../lib/utils';
-  import { input } from '../lib/actions';
-  import Icon from './icon.svelte';
+  import input from '$lib/actions/input';
+  import { canBeObjectId, numericInputTypes } from '$lib/mongo';
   import { ObjectId } from 'bson';
-  import Datepicker from './datepicker.svelte';
   import { onMount } from 'svelte';
+  import Datepicker from './datepicker.svelte';
+  import Icon from './icon.svelte';
 
   export let column = {};
   export let value = undefined;
diff --git a/frontend/src/components/grid-items.svelte b/frontend/src/components/grid-items.svelte
index bfe1c7c..9f5af73 100644
--- a/frontend/src/components/grid-items.svelte
+++ b/frontend/src/components/grid-items.svelte
@@ -1,9 +1,9 @@
 <script>
+  import { resolveKeypath, setValue } from '$lib/keypaths';
+  import contextMenu from '$lib/stores/contextmenu';
   import { createEventDispatcher } from 'svelte';
-  import Icon from './icon.svelte';
-  import { resolveKeypath, setValue } from '../lib/utils';
   import FormInput from './forminput.svelte';
-  import contextMenu from '../lib/stores/contextmenu';
+  import Icon from './icon.svelte';
 
   export let items = [];
   export let columns = [];
diff --git a/frontend/src/components/objectgrid.svelte b/frontend/src/components/objectgrid.svelte
index 9c68ccc..ea681a4 100644
--- a/frontend/src/components/objectgrid.svelte
+++ b/frontend/src/components/objectgrid.svelte
@@ -1,6 +1,6 @@
 <script>
+  import { isBsonBuiltin } from '$lib/mongo';
   import { isDate } from 'date-fns';
-  import { isBsonBuiltin } from '../lib/utils';
   import Grid from './grid.svelte';
 
   export let data = [];
diff --git a/frontend/src/lib/actions/controlkey.js b/frontend/src/lib/actions/controlkey.js
new file mode 100644
index 0000000..5fd8bb2
--- /dev/null
+++ b/frontend/src/lib/actions/controlkey.js
@@ -0,0 +1,13 @@
+import environment from '$lib/stores/environment';
+import { get } from 'svelte/store';
+
+export function controlKeyDown(event) {
+  const env = get(environment);
+  // @ts-ignore
+  if (env?.platform === 'darwin') {
+    return event?.metaKey;
+  }
+  else {
+    return event?.ctrlKey;
+  }
+}
diff --git a/frontend/src/lib/actions.js b/frontend/src/lib/actions/input.js
similarity index 91%
rename from frontend/src/lib/actions.js
rename to frontend/src/lib/actions/input.js
index ac3da8c..bfd974a 100644
--- a/frontend/src/lib/actions.js
+++ b/frontend/src/lib/actions/input.js
@@ -1,6 +1,7 @@
-import { canBeObjectId, int32, int64, isInt, uint64 } from './utils';
+import { isInt } from '$lib/math';
+import { canBeObjectId, int32, int64, uint64 } from '$lib/mongo';
 
-export function input(node, { autofocus, type, onValid, onInvalid, mandatory } = {
+export default function input(node, { autofocus, type, onValid, onInvalid, mandatory } = {
   autofocus: false,
   type: '',
   onValid: () => 0,
diff --git a/frontend/src/lib/constants.js b/frontend/src/lib/constants.js
new file mode 100644
index 0000000..b6d1d9b
--- /dev/null
+++ b/frontend/src/lib/constants.js
@@ -0,0 +1,7 @@
+// Months
+export const months = [ 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' ];
+export const monthsAbbr = months.map(m => m.slice(0, 3));
+
+// Days
+export const days = [ 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday' ];
+export const daysAbbr = days.map(d => d.slice(0, 3));
diff --git a/frontend/src/lib/keypaths.js b/frontend/src/lib/keypaths.js
new file mode 100644
index 0000000..b597d77
--- /dev/null
+++ b/frontend/src/lib/keypaths.js
@@ -0,0 +1,58 @@
+// Get a value from an object with a JSON path, from Webdesq core
+export function resolveKeypath(object, path) {
+  const parts = path.split('.').flatMap(part => {
+    const indexMatch = part.match(/\[\d+\]/g);
+    if (indexMatch) {
+      // Convert strings to numbers
+      const indexes = indexMatch.map(index => Number(index.slice(1, -1)));
+      const base = part.slice(0, part.indexOf(indexMatch[0]));
+      return base.length ? [ base, ...indexes ] : indexes;
+    }
+    return part;
+  });
+
+  let result = object;
+  while (result && parts.length) {
+    result = result[parts.shift()];
+  }
+
+  return result;
+}
+
+// Set a value in an object with a JSON path, from Webdesq core
+export function setValue(object, path, value) {
+  const parts = path.split('.').flatMap(part => {
+    let indexMatch = part.match(/\[\d+\]/g);
+    if (indexMatch) {
+      // Convert strings to numbers
+      const indexes = indexMatch.map(index => Number(index.slice(1, -1)));
+      const base = part.slice(0, part.indexOf(indexMatch[0]));
+      return base.length ? [ base, ...indexes ] : indexes;
+    }
+    indexMatch = part.match(/^\d+$/g);
+    if (indexMatch) {
+      // Convert strings to numbers
+      const indexes = indexMatch.map(index => Number(index.slice(1, -1)));
+      const base = part.slice(0, part.indexOf(indexMatch[0]));
+      return base.length ? [ base, ...indexes ] : indexes;
+    }
+    return part;
+  });
+
+  let result = object;
+  while (parts.length) {
+    const part = parts.shift();
+    if (!parts.length) {
+      // No parts left, we can set the value
+      result[part] = value;
+      break;
+    }
+    if (!result[part]) {
+      // Default value if none is found
+      result[part] = (typeof parts[0] === 'number') ? [] : {};
+    }
+    result = result[part];
+  }
+
+  return object;
+}
diff --git a/frontend/src/lib/math.js b/frontend/src/lib/math.js
new file mode 100644
index 0000000..c76ca77
--- /dev/null
+++ b/frontend/src/lib/math.js
@@ -0,0 +1,23 @@
+// https://stackoverflow.com/a/14794066
+export function isInt(value) {
+  if (isNaN(value)) {
+    return false;
+  }
+  const x = parseFloat(value);
+  return (x | 0) === x;
+}
+
+export function randInt(min, max) {
+  return Math.round(Math.random() * (max - min) + min);
+}
+
+export function randomString(length = 12) {
+  const chars = 'qwertyuiopasdfghjklzxcvbnm1234567890';
+  let output = '';
+
+  Array(length).fill('').forEach(() => {
+    output += chars[randInt(0, chars.length - 1)];
+  });
+
+  return output;
+}
diff --git a/frontend/src/lib/mongo.js b/frontend/src/lib/mongo.js
new file mode 100644
index 0000000..b4d8052
--- /dev/null
+++ b/frontend/src/lib/mongo.js
@@ -0,0 +1,34 @@
+import { ObjectId } from 'bson';
+
+// Calculate the min and max values of (un)signed integers with n bits
+export const intMin = bits => Math.pow(2, bits - 1) * -1;
+export const intMax = bits => Math.pow(2, bits - 1) - 1;
+export const uintMax = bits => Math.pow(2, bits) - 1;
+
+// Boundaries for some ubiquitous integer types
+export const int32 = [ intMin(32), intMax(32) ];
+export const int64 = [ intMin(64), intMax(64) ];
+export const uint64 = [ 0, uintMax(64) ];
+
+// Input types
+export const numericInputTypes = [ 'int', 'long', 'uint64', 'double', 'decimal' ];
+export const inputTypes = [ 'string', 'objectid', 'bool', 'date', ...numericInputTypes ];
+
+export function isBsonBuiltin(value) {
+  return (
+    (typeof value === 'object') &&
+    (value !== null) &&
+    (typeof value._bsontype === 'string') &&
+    (typeof value.inspect === 'function')
+  );
+}
+
+export function canBeObjectId(value) {
+  try {
+    new ObjectId(value);
+    return true;
+  }
+  catch {
+    return false;
+  }
+}
diff --git a/frontend/src/lib/stores/environment.js b/frontend/src/lib/stores/environment.js
index 3c2333a..a7ece2b 100644
--- a/frontend/src/lib/stores/environment.js
+++ b/frontend/src/lib/stores/environment.js
@@ -1,5 +1,5 @@
+import { Environment } from '$wails/go/app/App';
 import { writable } from 'svelte/store';
-import { Environment } from '../../../wailsjs/go/app/App';
 
 const { set, subscribe } = writable({});
 
diff --git a/frontend/src/lib/stores/queries.js b/frontend/src/lib/stores/queries.js
index 6bc983c..a3e1f97 100644
--- a/frontend/src/lib/stores/queries.js
+++ b/frontend/src/lib/stores/queries.js
@@ -1,5 +1,5 @@
+import { RemoveQuery, SavedQueries, SaveQuery, UpdateQueries } from '$wails/go/app/App';
 import { get, writable } from 'svelte/store';
-import { RemoveQuery, SavedQueries, SaveQuery, UpdateQueries } from '../../../wailsjs/go/app/App';
 
 const { set, subscribe } = writable({});
 let skipUpdate = true;
diff --git a/frontend/src/lib/stores/settings.js b/frontend/src/lib/stores/settings.js
index 456b1fa..45175c2 100644
--- a/frontend/src/lib/stores/settings.js
+++ b/frontend/src/lib/stores/settings.js
@@ -1,5 +1,5 @@
+import { Settings, UpdateSettings } from '$wails/go/app/App';
 import { writable } from 'svelte/store';
-import { Settings, UpdateSettings } from '../../../wailsjs/go/app/App';
 
 const { set, subscribe } = writable({});
 let skipUpdate = true;
diff --git a/frontend/src/lib/stores/views.js b/frontend/src/lib/stores/views.js
index c98db74..062739e 100644
--- a/frontend/src/lib/stores/views.js
+++ b/frontend/src/lib/stores/views.js
@@ -1,5 +1,5 @@
+import { UpdateViewStore, Views } from '$wails/go/app/App';
 import { get, writable } from 'svelte/store';
-import { UpdateViewStore, Views } from '../../../wailsjs/go/app/App';
 
 const { set, subscribe } = writable({});
 let skipUpdate = true;
diff --git a/frontend/src/lib/utils.js b/frontend/src/lib/utils.js
deleted file mode 100644
index af566b1..0000000
--- a/frontend/src/lib/utils.js
+++ /dev/null
@@ -1,138 +0,0 @@
-import { ObjectId } from 'bson';
-import { get } from 'svelte/store';
-import environment from './stores/environment';
-
-// Calculate the min and max values of (un)signed integers with n bits
-export const intMin = bits => Math.pow(2, bits - 1) * -1;
-export const intMax = bits => Math.pow(2, bits - 1) - 1;
-export const uintMax = bits => Math.pow(2, bits) - 1;
-
-// Boundaries for some ubiquitous integer types
-export const int32 = [ intMin(32), intMax(32) ];
-export const int64 = [ intMin(64), intMax(64) ];
-export const uint64 = [ 0, uintMax(64) ];
-
-// Input types
-export const numericInputTypes = [ 'int', 'long', 'uint64', 'double', 'decimal' ];
-export const inputTypes = [ 'string', 'objectid', 'bool', 'date', ...numericInputTypes ];
-
-// Months
-export const months = [ 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' ];
-export const monthsAbbr = months.map(m => m.slice(0, 3));
-
-// Days
-export const days = [ 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday' ];
-export const daysAbbr = days.map(d => d.slice(0, 3));
-
-// Get a value from an object with a JSON path, from Webdesq core
-export function resolveKeypath(object, path) {
-  const parts = path.split('.').flatMap(part => {
-    const indexMatch = part.match(/\[\d+\]/g);
-    if (indexMatch) {
-      // Convert strings to numbers
-      const indexes = indexMatch.map(index => Number(index.slice(1, -1)));
-      const base = part.slice(0, part.indexOf(indexMatch[0]));
-      return base.length ? [ base, ...indexes ] : indexes;
-    }
-    return part;
-  });
-
-  let result = object;
-  while (result && parts.length) {
-    result = result[parts.shift()];
-  }
-
-  return result;
-}
-
-// Set a value in an object with a JSON path, from Webdesq core
-export function setValue(object, path, value) {
-  const parts = path.split('.').flatMap(part => {
-    let indexMatch = part.match(/\[\d+\]/g);
-    if (indexMatch) {
-      // Convert strings to numbers
-      const indexes = indexMatch.map(index => Number(index.slice(1, -1)));
-      const base = part.slice(0, part.indexOf(indexMatch[0]));
-      return base.length ? [ base, ...indexes ] : indexes;
-    }
-    indexMatch = part.match(/^\d+$/g);
-    if (indexMatch) {
-      // Convert strings to numbers
-      const indexes = indexMatch.map(index => Number(index.slice(1, -1)));
-      const base = part.slice(0, part.indexOf(indexMatch[0]));
-      return base.length ? [ base, ...indexes ] : indexes;
-    }
-    return part;
-  });
-
-  let result = object;
-  while (parts.length) {
-    const part = parts.shift();
-    if (!parts.length) {
-      // No parts left, we can set the value
-      result[part] = value;
-      break;
-    }
-    if (!result[part]) {
-      // Default value if none is found
-      result[part] = (typeof parts[0] === 'number') ? [] : {};
-    }
-    result = result[part];
-  }
-
-  return object;
-}
-
-export function controlKeyDown(event) {
-  const env = get(environment);
-  // @ts-ignore
-  if (env?.platform === 'darwin') {
-    return event?.metaKey;
-  }
-  else {
-    return event?.ctrlKey;
-  }
-}
-
-// https://stackoverflow.com/a/14794066
-export function isInt(value) {
-  if (isNaN(value)) {
-    return false;
-  }
-  const x = parseFloat(value);
-  return (x | 0) === x;
-}
-
-export function randInt(min, max) {
-  return Math.round(Math.random() * (max - min) + min);
-}
-
-export function randomString(length = 12) {
-  const chars = 'qwertyuiopasdfghjklzxcvbnm1234567890';
-  let output = '';
-
-  Array(length).fill('').forEach(() => {
-    output += chars[randInt(0, chars.length - 1)];
-  });
-
-  return output;
-}
-
-export function isBsonBuiltin(value) {
-  return (
-    (typeof value === 'object') &&
-    (value !== null) &&
-    (typeof value._bsontype === 'string') &&
-    (typeof value.inspect === 'function')
-  );
-}
-
-export function canBeObjectId(value) {
-  try {
-    new ObjectId(value);
-    return true;
-  }
-  catch {
-    return false;
-  }
-}
diff --git a/frontend/src/main.js b/frontend/src/main.js
index f909258..a2b139c 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -1,15 +1,16 @@
+import './styles/loading.css';
 import './styles/reset.css';
 import './styles/style.css';
-import './styles/loading.css';
 
+import { LogError } from '$wails/runtime';
 import App from './app.svelte';
-import { LogError } from '../wailsjs/runtime/runtime';
 
 window.addEventListener('unhandledrejection', event => {
   LogError('Unhandled Rejection in JS! Reason:');
   LogError(String(event.reason));
 });
 
+// @ts-ignore Argument IS correct.
 const app = new App({ target: document.getElementById('app') });
 
 export default app;
diff --git a/frontend/src/organisms/about/index.svelte b/frontend/src/organisms/about/index.svelte
index 7f64385..f573f45 100644
--- a/frontend/src/organisms/about/index.svelte
+++ b/frontend/src/organisms/about/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Modal from '../../components/modal.svelte';
+  import Modal from '$components/modal.svelte';
 
   export let show = false;
 </script>
diff --git a/frontend/src/organisms/connection/collection/components/form.svelte b/frontend/src/organisms/connection/collection/components/form.svelte
index b5e2798..eb777ce 100644
--- a/frontend/src/organisms/connection/collection/components/form.svelte
+++ b/frontend/src/organisms/connection/collection/components/form.svelte
@@ -1,7 +1,8 @@
 <script>
-  import { inputTypes, resolveKeypath, setValue } from '../../../../lib/utils';
-  import Icon from '../../../../components/icon.svelte';
-  import FormInput from '../../../../components/forminput.svelte';
+  import FormInput from '$components/forminput.svelte';
+  import Icon from '$components/icon.svelte';
+  import { inputTypes } from '$lib/mongo';
+  import { resolveKeypath, setValue } from '$lib/keypaths';
 
   export let item = {};
   export let view = {};
diff --git a/frontend/src/organisms/connection/collection/components/indexdetail.svelte b/frontend/src/organisms/connection/collection/components/indexdetail.svelte
index 918eae6..2c9b62c 100644
--- a/frontend/src/organisms/connection/collection/components/indexdetail.svelte
+++ b/frontend/src/organisms/connection/collection/components/indexdetail.svelte
@@ -1,8 +1,8 @@
 <script>
-  import Icon from '../../../../components/icon.svelte';
-  import { input } from '../../../../lib/actions';
-  import Modal from '../../../../components/modal.svelte';
-  import { CreateIndex } from '../../../../../wailsjs/go/app/App';
+  import Icon from '$components/icon.svelte';
+  import Modal from '$components/modal.svelte';
+  import input from '$lib/actions/input';
+  import { CreateIndex } from '$wails/go/app/App';
   import { createEventDispatcher } from 'svelte';
 
   export let collection = {};
diff --git a/frontend/src/organisms/connection/collection/components/querychooser.svelte b/frontend/src/organisms/connection/collection/components/querychooser.svelte
index 88c2558..b036099 100644
--- a/frontend/src/organisms/connection/collection/components/querychooser.svelte
+++ b/frontend/src/organisms/connection/collection/components/querychooser.svelte
@@ -1,11 +1,11 @@
 <script>
-  import Icon from '../../../../components/icon.svelte';
+  import Grid from '$components/grid.svelte';
+  import Hint from '$components/hint.svelte';
+  import Icon from '$components/icon.svelte';
+  import Modal from '$components/modal.svelte';
+  import input from '$lib/actions/input';
+  import queries from '$lib/stores/queries';
   import { createEventDispatcher } from 'svelte';
-  import Modal from '../../../../components/modal.svelte';
-  import { input } from '../../../../lib/actions';
-  import queries from '../../../../lib/stores/queries';
-  import Grid from '../../../../components/grid.svelte';
-  import Hint from '../../../../components/hint.svelte';
 
   export let queryToSave = undefined;
   export let collection = {};
diff --git a/frontend/src/organisms/connection/collection/components/viewconfig.svelte b/frontend/src/organisms/connection/collection/components/viewconfig.svelte
index f7c0abd..059c830 100644
--- a/frontend/src/organisms/connection/collection/components/viewconfig.svelte
+++ b/frontend/src/organisms/connection/collection/components/viewconfig.svelte
@@ -1,10 +1,10 @@
 <script>
-  import TabBar from '../../../../components/tabbar.svelte';
-  import Modal from '../../../../components/modal.svelte';
-  import Icon from '../../../../components/icon.svelte';
-  import { randomString } from '../../../../lib/utils';
-  import { input } from '../../../../lib/actions';
-  import views from '../../../../lib/stores/views';
+  import Icon from '$components/icon.svelte';
+  import Modal from '$components/modal.svelte';
+  import TabBar from '$components/tabbar.svelte';
+  import input from '$lib/actions/input';
+  import { randomString } from '$lib/math';
+  import views from '$lib/stores/views';
 
   export let collection;
   export let show = false;
diff --git a/frontend/src/organisms/connection/collection/find.svelte b/frontend/src/organisms/connection/collection/find.svelte
index 1436af5..af56ee5 100644
--- a/frontend/src/organisms/connection/collection/find.svelte
+++ b/frontend/src/organisms/connection/collection/find.svelte
@@ -1,17 +1,17 @@
 <script>
+  import CodeExample from '$components/code-example.svelte';
+  import Grid from '$components/grid.svelte';
+  import Icon from '$components/icon.svelte';
+  import ObjectGrid from '$components/objectgrid.svelte';
+  import input from '$lib/actions/input';
+  import queries from '$lib/stores/queries';
+  import applicationSettings from '$lib/stores/settings';
+  import views from '$lib/stores/views';
+  import { FindItems, RemoveItemById } from '$wails/go/app/App';
   import { EJSON } from 'bson';
-  import applicationSettings from '../../../lib/stores/settings';
   import { createEventDispatcher, onMount } from 'svelte';
-  import { FindItems, RemoveItemById } from '../../../../wailsjs/go/app/App';
-  import { input } from '../../../lib/actions';
-  import CodeExample from '../../../components/code-example.svelte';
-  import Grid from '../../../components/grid.svelte';
-  import Icon from '../../../components/icon.svelte';
-  import ObjectGrid from '../../../components/objectgrid.svelte';
-  import views from '../../../lib/stores/views';
   import QueryChooser from './components/querychooser.svelte';
-  import queries from '../../../lib/stores/queries';
-  // import ObjectViewer from '../../../components/objectviewer.svelte';
+  // import ObjectViewer from '$components/objectviewer.svelte';
 
   export let collection;
 
diff --git a/frontend/src/organisms/connection/collection/index.svelte b/frontend/src/organisms/connection/collection/index.svelte
index f824e5f..9a4c5b7 100644
--- a/frontend/src/organisms/connection/collection/index.svelte
+++ b/frontend/src/organisms/connection/collection/index.svelte
@@ -1,15 +1,15 @@
 <script>
-  import BlankState from '../../../components/blankstate.svelte';
+  import BlankState from '$components/blankstate.svelte';
+  import TabBar from '$components/tabbar.svelte';
+  import { EventsOn } from '$wails/runtime/runtime';
   import { tick } from 'svelte';
-  import TabBar from '../../../components/tabbar.svelte';
+  import ViewConfig from './components/viewconfig.svelte';
   import Find from './find.svelte';
   import Indexes from './indexes.svelte';
   import Insert from './insert.svelte';
   import Remove from './remove.svelte';
   import Stats from './stats.svelte';
   import Update from './update.svelte';
-  import { EventsOn } from '../../../../wailsjs/runtime/runtime';
-  import ViewConfig from './components/viewconfig.svelte';
 
   export let collection;
   export let hostKey;
diff --git a/frontend/src/organisms/connection/collection/indexes.svelte b/frontend/src/organisms/connection/collection/indexes.svelte
index 93a9cae..c72efd2 100644
--- a/frontend/src/organisms/connection/collection/indexes.svelte
+++ b/frontend/src/organisms/connection/collection/indexes.svelte
@@ -1,8 +1,8 @@
 <script>
-  import ObjectViewer from '../../../components/objectviewer.svelte';
-  import ObjectGrid from '../../../components/objectgrid.svelte';
-  import { DropIndex, GetIndexes } from '../../../../wailsjs/go/app/App';
-  import Icon from '../../../components/icon.svelte';
+  import Icon from '$components/icon.svelte';
+  import ObjectGrid from '$components/objectgrid.svelte';
+  import ObjectViewer from '$components/objectviewer.svelte';
+  import { DropIndex, GetIndexes } from '$wails/go/app/App';
   import IndexDetail from './components/indexdetail.svelte';
 
   export let collection;
diff --git a/frontend/src/organisms/connection/collection/insert.svelte b/frontend/src/organisms/connection/collection/insert.svelte
index 03d0c6f..9c0dd99 100644
--- a/frontend/src/organisms/connection/collection/insert.svelte
+++ b/frontend/src/organisms/connection/collection/insert.svelte
@@ -1,15 +1,16 @@
 <script>
-  import { createEventDispatcher } from 'svelte';
-  import { InsertItems } from '../../../../wailsjs/go/app/App';
-  import { input } from '../../../lib/actions';
-  import Icon from '../../../components/icon.svelte';
-  import Form from './components/form.svelte';
-  import ObjectViewer from '../../../components/objectviewer.svelte';
-  import Grid from '../../../components/grid.svelte';
-  import { inputTypes, randomString } from '../../../lib/utils';
+  import Details from '$components/details.svelte';
+  import Grid from '$components/grid.svelte';
+  import Icon from '$components/icon.svelte';
+  import ObjectViewer from '$components/objectviewer.svelte';
+  import input from '$lib/actions/input';
+  import { randomString } from '$lib/math';
+  import { inputTypes } from '$lib/mongo';
+  import views from '$lib/stores/views';
+  import { InsertItems } from '$wails/go/app/App';
   import { EJSON } from 'bson';
-  import Details from '../../../components/details.svelte';
-  import views from '../../../lib/stores/views';
+  import { createEventDispatcher } from 'svelte';
+  import Form from './components/form.svelte';
 
   export let collection;
 
diff --git a/frontend/src/organisms/connection/collection/remove.svelte b/frontend/src/organisms/connection/collection/remove.svelte
index ca3dcca..c54e0c1 100644
--- a/frontend/src/organisms/connection/collection/remove.svelte
+++ b/frontend/src/organisms/connection/collection/remove.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { input } from '../../../lib/actions';
-  import { RemoveItems } from '../../../../wailsjs/go/app/App';
-  import CodeExample from '../../../components/code-example.svelte';
-  import Icon from '../../../components/icon.svelte';
+  import CodeExample from '$components/code-example.svelte';
+  import Icon from '$components/icon.svelte';
+  import input from '$lib/actions/input';
+  import { RemoveItems } from '$wails/go/app/App';
 
   export let collection;
 
diff --git a/frontend/src/organisms/connection/collection/stats.svelte b/frontend/src/organisms/connection/collection/stats.svelte
index 427240f..ccc276c 100644
--- a/frontend/src/organisms/connection/collection/stats.svelte
+++ b/frontend/src/organisms/connection/collection/stats.svelte
@@ -1,6 +1,6 @@
 <script>
-  import ObjectGrid from '../../../components/objectgrid.svelte';
-  import CodeExample from '../../../components/code-example.svelte';
+  import CodeExample from '$components/code-example.svelte';
+  import ObjectGrid from '$components/objectgrid.svelte';
 
   export let collection;
 </script>
diff --git a/frontend/src/organisms/connection/collection/update.svelte b/frontend/src/organisms/connection/collection/update.svelte
index 4482472..ad68597 100644
--- a/frontend/src/organisms/connection/collection/update.svelte
+++ b/frontend/src/organisms/connection/collection/update.svelte
@@ -1,8 +1,8 @@
 <script>
-  import Icon from '../../../components/icon.svelte';
-  import { input } from '../../../lib/actions';
-  import { UpdateItems } from '../../../../wailsjs/go/app/App';
-  import CodeExample from '../../../components/code-example.svelte';
+  import CodeExample from '$components/code-example.svelte';
+  import Icon from '$components/icon.svelte';
+  import input from '$lib/actions/input';
+  import { UpdateItems } from '$wails/go/app/App';
 
   export let collection = {};
 
diff --git a/frontend/src/organisms/connection/export/export.svelte b/frontend/src/organisms/connection/export/export.svelte
index 071090f..fff07a7 100644
--- a/frontend/src/organisms/connection/export/export.svelte
+++ b/frontend/src/organisms/connection/export/export.svelte
@@ -1,11 +1,11 @@
 <script>
-  import Grid from '../../../components/grid.svelte';
-  import Modal from '../../../components/modal.svelte';
-  import { OpenConnection, OpenDatabase, PerformExport } from '../../../../wailsjs/go/app/App';
-  import DirectoryChooser from '../../../components/directorychooser.svelte';
-  import applicationSettings from '../../../lib/stores/settings';
-  import { connections } from '../../../lib/stores/connections';
-  import busy from '../../../lib/stores/busy';
+  import DirectoryChooser from '$components/directorychooser.svelte';
+  import Grid from '$components/grid.svelte';
+  import Modal from '$components/modal.svelte';
+  import busy from '$lib/stores/busy';
+  import { connections } from '$lib/stores/connections';
+  import applicationSettings from '$lib/stores/settings';
+  import { OpenConnection, OpenDatabase, PerformExport } from '$wails/go/app/App';
 
   export let info;
   export let hosts = {};
diff --git a/frontend/src/organisms/connection/hostdetail.svelte b/frontend/src/organisms/connection/hostdetail.svelte
index 911b796..180e305 100644
--- a/frontend/src/organisms/connection/hostdetail.svelte
+++ b/frontend/src/organisms/connection/hostdetail.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { input } from '../../lib/actions';
+  import Modal from '$components/modal.svelte';
+  import input from '$lib/actions/input';
+  import { AddHost, UpdateHost } from '$wails/go/app/App';
   import { createEventDispatcher } from 'svelte';
-  import { AddHost, UpdateHost } from '../../../wailsjs/go/app/App';
-  import Modal from '../../components/modal.svelte';
 
   export let show = false;
   export let hostKey = '';
diff --git a/frontend/src/organisms/connection/hosttree.svelte b/frontend/src/organisms/connection/hosttree.svelte
index 53f006b..9ab3987 100644
--- a/frontend/src/organisms/connection/hosttree.svelte
+++ b/frontend/src/organisms/connection/hosttree.svelte
@@ -1,10 +1,10 @@
 <script>
+  import Grid from '$components/grid.svelte';
+  import busy from '$lib/stores/busy';
+  import { connections } from '$lib/stores/connections';
+  import { WindowSetTitle } from '$wails/runtime/runtime';
   import { createEventDispatcher } from 'svelte';
   import { DropCollection, DropDatabase, OpenCollection, OpenConnection, OpenDatabase, TruncateCollection } from '../../../wailsjs/go/app/App';
-  import Grid from '../../components/grid.svelte';
-  import { WindowSetTitle } from '../../../wailsjs/runtime/runtime';
-  import { connections } from '../../lib/stores/connections';
-  import busy from '../../lib/stores/busy';
 
   export let hosts = {};
   export let activeHostKey = '';
diff --git a/frontend/src/organisms/connection/index.svelte b/frontend/src/organisms/connection/index.svelte
index 7e8797c..46965a2 100644
--- a/frontend/src/organisms/connection/index.svelte
+++ b/frontend/src/organisms/connection/index.svelte
@@ -1,17 +1,17 @@
 <script>
+  import Hint from '$components/hint.svelte';
+  import Icon from '$components/icon.svelte';
+  import Modal from '$components/modal.svelte';
+  import input from '$lib/actions/input';
+  import busy from '$lib/stores/busy';
+  import { connections } from '$lib/stores/connections';
+  import { Hosts, RenameCollection } from '$wails/go/app/App';
+  import { EventsOn } from '$wails/runtime/runtime';
   import { onMount } from 'svelte';
-  import { Hosts, RenameCollection } from '../../../wailsjs/go/app/App';
-  import { input } from '../../lib/actions';
-  import Modal from '../../components/modal.svelte';
-  import HostTree from './hosttree.svelte';
   import CollectionDetail from './collection/index.svelte';
-  import HostDetail from './hostdetail.svelte';
-  import Icon from '../../components/icon.svelte';
-  import { EventsOn } from '../../../wailsjs/runtime/runtime';
   import Export from './export/export.svelte';
-  import Hint from '../../components/hint.svelte';
-  import { connections } from '../../lib/stores/connections';
-  import busy from '../../lib/stores/busy';
+  import HostDetail from './hostdetail.svelte';
+  import HostTree from './hosttree.svelte';
 
   export let hosts = {};
   export let activeHostKey = '';
diff --git a/frontend/src/organisms/settings/index.svelte b/frontend/src/organisms/settings/index.svelte
index d3eecd4..418b75b 100644
--- a/frontend/src/organisms/settings/index.svelte
+++ b/frontend/src/organisms/settings/index.svelte
@@ -1,8 +1,8 @@
 <script>
-  import DirectoryChooser from '../../components/directorychooser.svelte';
-  import { input } from '../../lib/actions';
-  import Modal from '../../components/modal.svelte';
-  import settings from '../../lib/stores/settings';
+  import DirectoryChooser from '$components/directorychooser.svelte';
+  import Modal from '$components/modal.svelte';
+  import input from '$lib/actions/input';
+  import settings from '$lib/stores/settings';
 
   export let show = false;
 </script>
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index f7acf5d..f0efb9a 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -1,7 +1,18 @@
 import { defineConfig } from 'vite';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const currentDir = dirname(fileURLToPath(import.meta.url));
 
-// https://vitejs.dev/config/
 export default defineConfig({
   plugins: [ svelte() ],
+  resolve: {
+    alias: {
+      '$components': currentDir + '/src/components',
+      '$organisms': currentDir + '/src/organisms',
+      '$wails': currentDir + '/wailsjs',
+      '$lib': currentDir + '/src/lib',
+    },
+  },
 });