Merge FilesystemAPI and FilesystemUtil to avoid circular dependencies

svelte/package-lock.json

@@ -11,6 +11,7 @@
         "behave-js": "^1.5.0",
         "chart.js": "^4.2.0",
         "pure-color": "^1.3.0",
+        "svelte-preprocess": "^6.0.2",
         "tslib": "^2.7.0"
       },
       "devDependencies": {
@@ -32,7 +33,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
       "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
@@ -46,7 +46,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
       "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/highlight": "^7.24.7",
@@ -60,7 +60,7 @@
       "version": "7.25.4",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
       "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -70,7 +70,7 @@
       "version": "7.25.2",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
       "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
@@ -101,7 +101,7 @@
       "version": "7.25.6",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
       "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.25.6",
@@ -144,7 +144,7 @@
       "version": "7.25.2",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
       "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.25.2",
@@ -232,7 +232,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
       "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/traverse": "^7.24.7",
@@ -246,7 +246,7 @@
       "version": "7.25.2",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
       "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.24.7",
@@ -324,7 +324,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
       "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/traverse": "^7.24.7",
@@ -352,7 +352,7 @@
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
       "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -362,7 +362,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
       "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -372,7 +372,7 @@
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
       "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -397,7 +397,7 @@
       "version": "7.25.6",
       "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
       "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.25.0",
@@ -411,7 +411,7 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
       "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.24.7",
@@ -427,7 +427,7 @@
       "version": "7.25.6",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
       "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.25.6"
@@ -1760,7 +1760,7 @@
       "version": "7.25.0",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
       "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.24.7",
@@ -1775,7 +1775,7 @@
       "version": "7.25.6",
       "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
       "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.24.7",
@@ -1794,7 +1794,7 @@
       "version": "7.25.6",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
       "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.24.8",
@@ -1827,7 +1827,6 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
       "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
@@ -1842,7 +1841,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
@@ -1852,7 +1850,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
       "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
@@ -1873,14 +1870,12 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
       "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
       "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -2284,7 +2279,6 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
       "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/jsmediatags": {
@@ -2305,7 +2299,6 @@
       "version": "8.12.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
       "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -2331,7 +2324,7 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
@@ -2358,7 +2351,6 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
       "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "dequal": "^2.0.3"
@@ -2368,7 +2360,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
       "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
-      "dev": true,
       "license": "Apache-2.0",
       "engines": {
         "node": ">= 0.4"
@@ -2469,7 +2460,7 @@
       "version": "4.23.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
       "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
-      "dev": true,
+      "devOptional": true,
       "funding": [
         {
           "type": "opencollective",
@@ -2522,7 +2513,7 @@
       "version": "1.0.30001655",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
       "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
-      "dev": true,
+      "devOptional": true,
       "funding": [
         {
           "type": "opencollective",
@@ -2543,7 +2534,7 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
@@ -2595,7 +2586,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/code-red/-/code-red-1.0.4.tgz",
       "integrity": "sha512-7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.4.15",
@@ -2609,7 +2599,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
       "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0"
@@ -2619,7 +2608,7 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
@@ -2629,7 +2618,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/commander": {
@@ -2650,7 +2639,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/core-js-compat": {
@@ -2686,7 +2675,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
       "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mdn-data": "2.0.30",
@@ -2700,7 +2688,7 @@
       "version": "4.3.6",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
       "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
@@ -2728,7 +2716,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
       "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -2745,7 +2732,7 @@
       "version": "1.5.13",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz",
       "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -2759,7 +2746,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
       "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -2769,7 +2756,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
@@ -2851,7 +2838,7 @@
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -2895,7 +2882,7 @@
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -2905,7 +2892,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -3056,14 +3043,14 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
@@ -3076,7 +3063,7 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
@@ -3115,7 +3102,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz",
       "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.debounce": {
@@ -3129,7 +3115,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
@@ -3139,7 +3125,6 @@
       "version": "0.30.11",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
       "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0"
@@ -3149,7 +3134,6 @@
       "version": "2.0.30",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
       "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
-      "dev": true,
       "license": "CC0-1.0"
     },
     "node_modules/minimatch": {
@@ -3182,14 +3166,14 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/node-releases": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
       "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/normalize-path": {
@@ -3261,7 +3245,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz",
       "integrity": "sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0",
@@ -3273,7 +3256,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
       "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0"
@@ -3283,7 +3265,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.2.tgz",
       "integrity": "sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "*"
@@ -3293,7 +3274,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
       "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/picomatch": {
@@ -3549,7 +3530,7 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -3622,7 +3603,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
       "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
-      "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -3747,7 +3727,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
@@ -3773,7 +3753,6 @@
       "version": "4.2.19",
       "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.19.tgz",
       "integrity": "sha512-IY1rnGr6izd10B0A8LqsBfmlT5OILVuZ7XsI0vdGPEvuonFV7NYEUK4dAkm9Zg2q0Um92kYjTpS1CAP3Nh/KWw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.1",
@@ -3795,11 +3774,65 @@
         "node": ">=16"
       }
     },
+    "node_modules/svelte-preprocess": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-6.0.2.tgz",
+      "integrity": "sha512-OvDTLfaOkkhjprbDKO0SOCkjNYuHy16dbD4SpqbIi6QiabOMHxRT4km5/dzbFFkmW1L0E2INF3MFltG2pgOyKQ==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.10.2",
+        "coffeescript": "^2.5.1",
+        "less": "^3.11.3 || ^4.0.0",
+        "postcss": "^7 || ^8",
+        "postcss-load-config": ">=3",
+        "pug": "^3.0.0",
+        "sass": "^1.26.8",
+        "stylus": ">=0.55",
+        "sugarss": "^2.0.0 || ^3.0.0 || ^4.0.0",
+        "svelte": "^4.0.0 || ^5.0.0-next.100 || ^5.0.0",
+        "typescript": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@babel/core": {
+          "optional": true
+        },
+        "coffeescript": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "postcss": {
+          "optional": true
+        },
+        "postcss-load-config": {
+          "optional": true
+        },
+        "pug": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/svelte/node_modules/estree-walker": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
       "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0"
@@ -3809,7 +3842,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.2.tgz",
       "integrity": "sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "*"
@@ -3838,7 +3870,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -3867,7 +3899,7 @@
       "version": "5.5.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
       "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
-      "dev": true,
+      "devOptional": true,
       "license": "Apache-2.0",
       "peer": true,
       "bin": {
@@ -3926,7 +3958,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
       "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
-      "dev": true,
+      "devOptional": true,
       "funding": [
         {
           "type": "opencollective",
@@ -4126,7 +4158,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     }
   }

svelte/package.json

@@ -24,6 +24,7 @@
     "behave-js": "^1.5.0",
     "chart.js": "^4.2.0",
     "pure-color": "^1.3.0",
+    "svelte-preprocess": "^6.0.2",
     "tslib": "^2.7.0"
   }
 }

svelte/rollup.config.js

@@ -5,6 +5,7 @@ import livereload from 'rollup-plugin-livereload';
 import terser from '@rollup/plugin-terser';
 import babel from '@rollup/plugin-babel'
 import typescript from '@rollup/plugin-typescript'
+import { sveltePreprocess } from 'svelte-preprocess';
 
 const production = !process.env.ROLLUP_WATCH;
 
@@ -29,14 +30,10 @@ export default [
 	},
 	plugins: [
 		svelte({
+			preprocess: sveltePreprocess(),
 			compilerOptions: {
 				// enable run-time checks when not in production
 				dev: !production,
-				// we'll extract any component CSS out into
-				// a separate file - better for performance
-				// css: css => {
-				// 	css.write(`${name}.css`);
-				// },
 			},
 			emitCss: false,
 		}),
@@ -58,7 +55,10 @@ export default [
 		}),
 		commonjs(),
 		nodeResolve(),
-		typescript({ compilerOptions: { lib: ["es2015", "dom"] } }),
+		typescript({
+			compilerOptions: { lib: ["es2015", "dom"] },
+			verbatimModuleSyntax: true,
+		}),
 
 		// In dev mode, call `npm run start` once
 		// the bundle has been generated

svelte/src/filesystem/Breadcrumbs.svelte

@@ -1,7 +1,8 @@
-<script>
+<script lang="ts">
-import { fs_encode_path } from "./FilesystemUtil";
+import { fs_encode_path } from "./FilesystemAPI";
+import { FSNavigator } from "./FSNavigator";
 
-export let nav
+export let nav: FSNavigator
 </script>
 
 <div class="breadcrumbs">

svelte/src/filesystem/DetailsWindow.svelte

@@ -2,8 +2,7 @@
 import Chart from "../util/Chart.svelte";
 import { formatDataVolume, formatDate, formatThousands } from "../util/Formatting.svelte";
 import Modal from "../util/Modal.svelte";
-import { fs_timeseries } from "./FilesystemAPI";
+import { fs_path_url, fs_timeseries } from "./FilesystemAPI";
-import { fs_path_url } from "./FilesystemUtil";
 import { generate_share_path, generate_share_url } from "./Sharebar.svelte";
 import { color_by_name } from "../util/Util.svelte";
 import { tick } from "svelte";

svelte/src/filesystem/FSNavigator.ts

@@ -1,6 +1,5 @@
-import { fs_get_node, FSNode, FSPath, FSPermissions } from "./FilesystemAPI";
+import { fs_get_node, fs_encode_path, fs_split_path, type FSNode, type FSPath, type FSPermissions } from "./FilesystemAPI";
-import { fs_encode_path, fs_split_path } from "./FilesystemUtil";
+import { type Writable } from "svelte/store"
-import { Writable } from "svelte/store"
 
 export class FSNavigator {
 	// Parts of the raw API response

svelte/src/filesystem/FileStats.svelte

@@ -1,7 +1,7 @@
 <script>
 import { onMount } from "svelte";
 import { formatDataVolume, formatThousands } from "../util/Formatting.svelte"
-import { fs_path_url } from "./FilesystemUtil";
+import { fs_path_url } from "./FilesystemAPI";
 
 export let nav
 

svelte/src/filesystem/Filesystem.svelte

@@ -8,7 +8,7 @@ import DetailsWindow from './DetailsWindow.svelte';
 import FilePreview from './viewers/FilePreview.svelte';
 import SearchView from './SearchView.svelte';
 import UploadWidget from './upload_widget/UploadWidget.svelte';
-import { fs_path_url } from './FilesystemUtil';
+import { fs_path_url } from './FilesystemAPI';
 import { branding_from_path } from './edit_window/Branding.js'
 import Menu from './Menu.svelte';
 import { FSNavigator } from "./FSNavigator"

svelte/src/filesystem/FilesystemAPI.ts

@@ -1,69 +1,11 @@
-import { fs_path_url } from './FilesystemUtil'
+// Response types
+// ==============
 
 export type GenericResponse = {
 	value: string,
 	message: string,
 }
 
-export const fs_check_response = async (resp: Response) => {
-	let text = await resp.text()
-	if (resp.status >= 400) {
-		let error: any
-		try {
-			error = JSON.parse(text) as GenericResponse
-		} catch (err) {
-			error = text
-		}
-		throw error
-	}
-	return JSON.parse(text)
-}
-
-export type NodeOptions = {
-	mode: number | undefined,
-	created: Date | undefined,
-	modified: Date | undefined,
-	shared: boolean | undefined,
-
-	branding_enabled: boolean | undefined,
-	brand_input_color: string | undefined,
-	brand_highlight_color: string | undefined,
-	brand_danger_color: string | undefined,
-	brand_background_color: string | undefined,
-	brand_body_color: string | undefined,
-	brand_card_color: string | undefined,
-	brand_header_image: string | undefined,
-	brand_header_link: string | undefined,
-	brand_background_image: string | undefined,
-}
-
-// mkdir only supports the "mode" option
-export const fs_mkdir = async (path: string, opts: NodeOptions) => {
-	const form = new FormData()
-	form.append("action", "mkdir")
-
-	if (opts && opts.mode) {
-		form.append("mode", opts.mode.toFixed(0))
-	}
-
-	return await fs_check_response(
-		await fetch(fs_path_url(path), { method: "POST", body: form })
-	)
-}
-
-export const fs_mkdirall = async (path: string, opts: NodeOptions) => {
-	const form = new FormData()
-	form.append("action", "mkdirall")
-
-	if (opts && opts.mode) {
-		form.append("mode", opts.mode.toFixed(0))
-	}
-
-	return await fs_check_response(
-		await fetch(fs_path_url(path), { method: "POST", body: form })
-	)
-}
-
 export type FSPath = {
 	path: Array<FSNode>,
 	base_index: number,
@@ -100,6 +42,58 @@ export type FSPermissions = {
 	delete: boolean,
 }
 
+// API parameters
+// ==============
+
+export type NodeOptions = {
+	mode: number | undefined,
+	created: Date | undefined,
+	modified: Date | undefined,
+	shared: boolean | undefined,
+
+	branding_enabled: boolean | undefined,
+	brand_input_color: string | undefined,
+	brand_highlight_color: string | undefined,
+	brand_danger_color: string | undefined,
+	brand_background_color: string | undefined,
+	brand_body_color: string | undefined,
+	brand_card_color: string | undefined,
+	brand_header_image: string | undefined,
+	brand_header_link: string | undefined,
+	brand_background_image: string | undefined,
+}
+
+// API methods
+// ===========
+
+// mkdir only supports the "mode" option
+export const fs_mkdir = async (path: string, opts: NodeOptions) => {
+	const form = new FormData()
+	form.append("action", "mkdir")
+
+	if (opts && opts.mode) {
+		form.append("mode", opts.mode.toFixed(0))
+	}
+
+	return await fs_check_response(
+		await fetch(fs_path_url(path), { method: "POST", body: form })
+	)
+}
+
+export const fs_mkdirall = async (path: string, opts: NodeOptions) => {
+	const form = new FormData()
+	form.append("action", "mkdirall")
+
+	if (opts && opts.mode) {
+		form.append("mode", opts.mode.toFixed(0))
+	}
+
+	return await fs_check_response(
+		await fetch(fs_path_url(path), { method: "POST", body: form })
+	)
+}
+
+
 export const fs_get_node = async (path: string) => {
 	return await fs_check_response(
 		await fetch(fs_path_url(path) + "?stat")
@@ -182,3 +176,102 @@ export const fs_import = async (parent_dir_path = "", filelist: Array<string>) =
 		await fetch(fs_path_url(parent_dir_path), { method: "POST", body: form })
 	) as GenericResponse
 }
+
+// Utility functions
+// =================
+
+export const fs_check_response = async (resp: Response) => {
+	let text = await resp.text()
+	if (resp.status >= 400) {
+		let error: any
+		try {
+			error = JSON.parse(text) as GenericResponse
+		} catch (err) {
+			error = text
+		}
+		throw error
+	}
+	return JSON.parse(text)
+}
+
+export const fs_path_url = (path: string) => {
+	if (!path || path.length === 0) {
+		return ""
+	}
+	if (path[0] !== "/") {
+		path = "/" + path
+	}
+
+	if (window["api_endpoint"] !== undefined) {
+		return window["api_endpoint"] + "/filesystem" + fs_encode_path(path)
+	} else {
+		throw Error("api_endpoint is undefined")
+	}
+}
+
+export const fs_encode_path = (path: string) => {
+	// Encode all path elements separately to preserve forward slashes
+	let split = path.split("/")
+	for (let i = 0; i < split.length; i++) {
+		split[i] = encodeURIComponent(split[i])
+	}
+	return split.join("/")
+}
+
+export const fs_split_path = (path: string) => {
+	let patharr = path.split("/")
+	return { base: patharr.pop(), parent: patharr.join("/") }
+}
+
+export const fs_thumbnail_url = (path: string, width = 64, height = 64) => {
+	return fs_path_url(path) + "?thumbnail&width=" + width + "&height=" + height
+}
+
+export const fs_node_type = (node: FSNode) => {
+	if (node.type === "dir") {
+		return "dir"
+	} else if (node.file_type === "application/bittorrent" || node.file_type === "application/x-bittorrent") {
+		return "torrent"
+	} else if (node.file_type === "application/zip") {
+		return "zip"
+	} else if (node.file_type.startsWith("image")) {
+		return "image"
+	} else if (
+		node.file_type.startsWith("video") ||
+		node.file_type === "application/matroska" ||
+		node.file_type === "application/x-matroska"
+	) {
+		return "video"
+	} else if (
+		node.file_type.startsWith("audio") ||
+		node.file_type === "application/ogg" ||
+		node.name.endsWith(".mp3")
+	) {
+		return "audio"
+	} else if (
+		node.file_type === "application/pdf" ||
+		node.file_type === "application/x-pdf"
+	) {
+		return "pdf"
+	} else if (
+		node.file_type === "application/json" ||
+		node.file_type.startsWith("text")
+	) {
+		return "text"
+	} else {
+		return "file"
+	}
+}
+
+export const fs_node_icon = (node: FSNode, width = 64, height = 64) => {
+	if (node.type === "dir") {
+		// Folders with an ID are publically shared, use the shared folder icon
+		if (node.id) {
+			return "/res/img/mime/folder-remote.png"
+		} else {
+			return "/res/img/mime/folder.png"
+		}
+	}
+
+	return fs_thumbnail_url(node.path, width, height)
+}

svelte/src/filesystem/FilesystemUtil.ts

@@ -1,83 +0,0 @@
-import { FSNode } from "./FilesystemAPI"
-
-export const fs_split_path = (path: string) => {
-	let patharr = path.split("/")
-	return { base: patharr.pop(), parent: patharr.join("/") }
-}
-
-export const fs_encode_path = (path: string) => {
-	// Encode all path elements separately to preserve forward slashes
-	let split = path.split("/")
-	for (let i = 0; i < split.length; i++) {
-		split[i] = encodeURIComponent(split[i])
-	}
-	return split.join("/")
-}
-
-export const fs_path_url = (path: string) => {
-	if (!path || path.length === 0) {
-		return ""
-	}
-	if (path[0] !== "/") {
-		path = "/" + path
-	}
-
-	if (window["api_endpoint"] !== undefined) {
-		return window["api_endpoint"] + "/filesystem" + fs_encode_path(path)
-	} else {
-		throw Error("api_endpoint is undefined")
-	}
-}
-
-export const fs_thumbnail_url = (path: string, width = 64, height = 64) => {
-	return fs_path_url(path) + "?thumbnail&width=" + width + "&height=" + height
-}
-
-export const fs_node_type = (node: FSNode) => {
-	if (node.type === "dir") {
-		return "dir"
-	} else if (node.file_type === "application/bittorrent" || node.file_type === "application/x-bittorrent") {
-		return "torrent"
-	} else if (node.file_type === "application/zip") {
-		return "zip"
-	} else if (node.file_type.startsWith("image")) {
-		return "image"
-	} else if (
-		node.file_type.startsWith("video") ||
-		node.file_type === "application/matroska" ||
-		node.file_type === "application/x-matroska"
-	) {
-		return "video"
-	} else if (
-		node.file_type.startsWith("audio") ||
-		node.file_type === "application/ogg" ||
-		node.name.endsWith(".mp3")
-	) {
-		return "audio"
-	} else if (
-		node.file_type === "application/pdf" ||
-		node.file_type === "application/x-pdf"
-	) {
-		return "pdf"
-	} else if (
-		node.file_type === "application/json" ||
-		node.file_type.startsWith("text")
-	) {
-		return "text"
-	} else {
-		return "file"
-	}
-}
-
-export const fs_node_icon = (node: FSNode, width = 64, height = 64) => {
-	if (node.type === "dir") {
-		// Folders with an ID are publically shared, use the shared folder icon
-		if (node.id) {
-			return "/res/img/mime/folder-remote.png"
-		} else {
-			return "/res/img/mime/folder.png"
-		}
-	}
-
-	return fs_thumbnail_url(node.path, width, height)
-}

svelte/src/filesystem/SearchView.svelte

@@ -1,7 +1,6 @@
 <script>
 import { createEventDispatcher } from "svelte";
-import { fs_search } from "./FilesystemAPI";
+import { fs_search, fs_encode_path, fs_thumbnail_url } from "./FilesystemAPI";
-import { fs_encode_path, fs_thumbnail_url } from "./FilesystemUtil";
 
 export let nav
 

svelte/src/filesystem/Sharebar.svelte

@@ -31,8 +31,7 @@ export const generate_share_path = path => {
 </script>
 
 <script>
-import { fs_update } from "./FilesystemAPI";
+import { fs_update, fs_encode_path } from "./FilesystemAPI";
-import { fs_encode_path } from "./FilesystemUtil";
 
 export let visible = false
 export let share_url = ""

svelte/src/filesystem/edit_window/BrandingOptions.svelte

@@ -1,8 +1,7 @@
 <script>
 import { createEventDispatcher } from "svelte";
 import FilePicker from "../filemanager/FilePicker.svelte";
-import { fs_update } from "../FilesystemAPI";
+import { fs_update, fs_node_type } from "../FilesystemAPI";
-import { fs_node_type } from "../FilesystemUtil";
 import CustomBanner from "../viewers/CustomBanner.svelte";
 
 let dispatch = createEventDispatcher()

svelte/src/filesystem/filemanager/GalleryView.svelte

@@ -1,6 +1,6 @@
 <script>
 import { createEventDispatcher } from "svelte"
-import { fs_encode_path, fs_node_icon, fs_node_type } from "../FilesystemUtil";
+import { fs_node_icon, fs_node_type, fs_encode_path } from "./../FilesystemAPI";
 let dispatch = createEventDispatcher()
 
 export let nav
@@ -11,7 +11,7 @@ export let large_icons = false
 <div class="gallery">
 	{#each $nav.children as child, index (child.path)}
 		<a class="file"
-			href={"/d"+fs_encode_path(child.path)}
+		href={"/d"+fs_encode_path(child.path)}
 			on:click|preventDefault={() => dispatch("node_click", index)}
 			on:contextmenu={e => dispatch("node_context", {event: e, index: index})}
 			class:selected={child.fm_selected}

svelte/src/filesystem/filemanager/ListView.svelte

@@ -1,7 +1,7 @@
 <script>
 import { createEventDispatcher } from "svelte";
-import { formatDataVolume } from "../../util/Formatting.svelte";
+import { formatDataVolume } from "./../../util/Formatting.svelte";
-import { fs_encode_path, fs_node_icon } from "../FilesystemUtil";
+import { fs_encode_path, fs_node_icon } from "./../FilesystemAPI"
 
 let dispatch = createEventDispatcher()
 

svelte/src/filesystem/upload_widget/UploadFunc.js

@@ -9,7 +9,7 @@
 //
 // on_error is called when the upload has failed. The parameters are the error
 
-import { fs_path_url } from "../FilesystemUtil"
+import { fs_path_url } from "./../FilesystemAPI"
 
 // code and an error message
 export const upload_file = (file, path, on_progress, on_success, on_error) => {

svelte/src/filesystem/viewers/Audio.svelte

@@ -1,8 +1,8 @@
 <script>
 import { onMount } from 'svelte'
-import { fs_encode_path, fs_node_icon, fs_path_url } from '../FilesystemUtil';
+import { fs_path_url, fs_encode_path, fs_node_icon } from "./../FilesystemAPI"
-import FileTitle from '../../file_viewer/viewers/FileTitle.svelte';
+import FileTitle from './../../file_viewer/viewers/FileTitle.svelte';
-import TextBlock from '../../file_viewer/viewers/TextBlock.svelte';
+import TextBlock from './../../file_viewer/viewers/TextBlock.svelte';
 
 export let nav
 let player

svelte/src/filesystem/viewers/File.svelte

@@ -1,7 +1,7 @@
 <script>
 import { createEventDispatcher } from "svelte";
 import IconBlock from "../../file_viewer/viewers/IconBlock.svelte";
-import { fs_thumbnail_url } from "../FilesystemUtil";
+import { fs_thumbnail_url } from "../FilesystemAPI";
 import TextBlock from "../../file_viewer/viewers/TextBlock.svelte";
 let dispatch = createEventDispatcher()
 

svelte/src/filesystem/viewers/FilePreview.svelte

@@ -1,7 +1,7 @@
 <script>
 import { onMount, tick } from "svelte";
 import Spinner from "../../util/Spinner.svelte";
-import { fs_node_type } from "../FilesystemUtil";
+import { fs_node_type } from "./../FilesystemAPI";
 import FileManager from "../filemanager/FileManager.svelte";
 import Audio from "./Audio.svelte";
 import File from "./File.svelte";

svelte/src/filesystem/viewers/Image.svelte

@@ -1,14 +1,14 @@
 <script>
 import { createEventDispatcher } from "svelte";
-import { swipe_nav } from "../../file_viewer/viewers/SwipeNavigate.ts";
+import { swipe_nav } from "./../../file_viewer/viewers/SwipeNavigate";
-import { fs_path_url } from "../FilesystemUtil";
+import { fs_path_url } from "./../FilesystemAPI";
 
-let dispatch = createEventDispatcher()
+let dispatch = createEventDispatcher();
 
 export let nav
 let container
 let zoom = false
-let x, y = 0
+let x = 0, y = 0
 let dragging = false
 
 export const update = () => {
@@ -65,7 +65,6 @@ const mouseup = (e) => {
 	<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
 	<img
 		on:dblclick={() => {zoom = !zoom}}
-		on:doubletap={() => {zoom = !zoom}}
 		on:mousedown={mousedown}
 		on:load={on_load}
 		on:error={on_load}

svelte/src/filesystem/viewers/PDF.svelte

@@ -1,5 +1,5 @@
 <script>
-import { fs_path_url } from "../FilesystemUtil";
+import { fs_path_url } from "../FilesystemAPI";
 
 export let nav
 </script>

svelte/src/filesystem/viewers/Text.svelte

@@ -1,6 +1,6 @@
 <script>
 import { tick } from "svelte";
-import { fs_path_url } from "../FilesystemUtil";
+import { fs_path_url } from "../FilesystemAPI";
 
 export let nav
 let text_type = "text"

svelte/src/filesystem/viewers/Torrent.svelte

@@ -5,7 +5,7 @@ import { formatDate } from "../../util/Formatting.svelte"
 import TorrentItem from "./TorrentItem.svelte"
 import IconBlock from "../../file_viewer/viewers/IconBlock.svelte";
 import TextBlock from "../../file_viewer/viewers/TextBlock.svelte";
-import { fs_node_icon, fs_path_url } from "../FilesystemUtil";
+import { fs_node_icon, fs_path_url } from "../FilesystemAPI";
 import CopyButton from "../../layout/CopyButton.svelte";
 
 let dispatch = createEventDispatcher()

svelte/src/filesystem/viewers/Video.svelte

@@ -1,6 +1,6 @@
 <script>
 import { onMount,  createEventDispatcher, tick } from "svelte";
-import { fs_path_url } from "../FilesystemUtil";
+import { fs_path_url } from "../FilesystemAPI";
 let dispatch = createEventDispatcher()
 
 export let nav

svelte/src/filesystem/viewers/Zip.svelte

@@ -4,7 +4,7 @@ import { formatDataVolume, formatDate } from "../../util/Formatting.svelte"
 import ZipItem from "../../file_viewer/viewers/ZipItem.svelte";
 import IconBlock from "../../file_viewer/viewers/IconBlock.svelte";
 import TextBlock from "../../file_viewer/viewers/TextBlock.svelte";
-import { fs_node_icon, fs_path_url } from "../FilesystemUtil";
+import { fs_node_icon, fs_path_url } from "../FilesystemAPI";
 
 let dispatch = createEventDispatcher()
 

svelte/src/user_home/dashboard/CardFSHome.svelte

@@ -1,7 +1,7 @@
 <script>
 import { onMount } from "svelte";
 import { FSNavigator } from "../../filesystem/FSNavigator"
-import { fs_encode_path, fs_node_icon } from "../../filesystem/FilesystemUtil";
+import { fs_encode_path, fs_node_icon } from "../../filesystem/FilesystemAPI";
 
 const nav = new FSNavigator(false)
 onMount(() => {

svelte/tsconfig.json

@@ -0,0 +1,5 @@
+{
+	"compilerOptions": {
+		"verbatimModuleSyntax": true,
+	},
+}