diff --git a/package-lock.json b/package-lock.json
index d9b8a61..da5917f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,24 +5,24 @@
   "requires": true,
   "dependencies": {
     "@babel/helper-validator-identifier": {
-      "version": "7.14.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
-      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
       "dev": true
     },
     "@babel/parser": {
-      "version": "7.15.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz",
-      "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==",
+      "version": "7.16.12",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz",
+      "integrity": "sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==",
       "dev": true
     },
     "@babel/types": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz",
-      "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz",
+      "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -118,60 +118,86 @@
       "dev": true
     },
     "@volar/code-gen": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@volar/code-gen/-/code-gen-0.27.3.tgz",
-      "integrity": "sha512-uWbfplUJZl11zTe3RtCLWa2KJKd29QsmP4vFpzAxJhOz9VrfjjtQOUViTpFrztX6Vgs8Ug+b8voI1eVaKn5WMw==",
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/@volar/code-gen/-/code-gen-0.31.1.tgz",
+      "integrity": "sha512-HsUNJHBdq4vGxenYlREqtBNf1Gh5JV1GBkD703bcH8clauc7ADTkUrayfLAF2ulXP/U0l7dFL8C8bwqJ7PZbMw==",
       "dev": true,
       "requires": {
-        "@volar/shared": "^0.27.3",
-        "@volar/source-map": "^0.27.3"
+        "@volar/shared": "0.31.1",
+        "@volar/source-map": "0.31.1"
       }
     },
     "@volar/html2pug": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@volar/html2pug/-/html2pug-0.27.3.tgz",
-      "integrity": "sha512-TaRdYyoG0ZdWdQLzWN1pfhtpzeKNj4b0g5iH/Yl2sya616fEKi5qzbb6xUXiZW/MaGf6pFlcaUWxup8EUMb5YA==",
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/@volar/html2pug/-/html2pug-0.31.1.tgz",
+      "integrity": "sha512-m/lbsz9t+zXx9HsuLH17Z/5nNtefv5qxncL8rycR+GaypHQKF5kg+GqQNOURMQ8T8lq2D6fNsGQOcMXoo3IqWQ==",
       "dev": true,
       "requires": {
         "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0",
-        "htmlparser2": "^6.1.0",
+        "domhandler": "^4.3.0",
+        "htmlparser2": "^7.2.0",
         "pug": "^3.0.2"
       }
     },
     "@volar/shared": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@volar/shared/-/shared-0.27.3.tgz",
-      "integrity": "sha512-XQ6xNEaQ4AmfjcRwzsab7tJ7x9MPwrhDueaRLp9zFkHSrJZJ9vc0DXJO5KVndswfVD+Cn1Y2EFsNVvKpgbtkYg==",
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/@volar/shared/-/shared-0.31.1.tgz",
+      "integrity": "sha512-WbMiPOlXbpFinZnQ+/qsJQ7+YW6MFla2fLdD6Er5bLW5DEXI+GupLQ2gnia7F0w6QborMowfOIEXnrnMPPYGOA==",
       "dev": true,
       "requires": {
         "upath": "^2.0.1",
-        "vscode-jsonrpc": "^8.0.0-next.1",
-        "vscode-uri": "^3.0.2"
+        "vscode-html-languageservice": "^4.2.1",
+        "vscode-jsonrpc": "^8.0.0-next.5",
+        "vscode-uri": "^3.0.3"
       }
     },
     "@volar/source-map": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-0.27.3.tgz",
-      "integrity": "sha512-qvfpLB2MNEL7QbFz7kPOwRY0Mtt5b9dS+dPa0h+z27u53J7QnFHsgwttr1c91rMinmi3Jxiw6iQhjtyHwvIvxw==",
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-0.31.1.tgz",
+      "integrity": "sha512-t+bUmxI5bkunBxX6UYpBX6+xnYYJhpciL3Hqv0dkHSaS63kJqY13OhV/utmQMjto3b3FAbYLSVqpt09FtdTPzg==",
       "dev": true,
       "requires": {
-        "@volar/shared": "^0.27.3"
+        "@volar/shared": "0.31.1",
+        "vscode-languageserver-textdocument": "^1.0.3"
       }
     },
     "@volar/transforms": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@volar/transforms/-/transforms-0.27.3.tgz",
-      "integrity": "sha512-JMmAuooBoaXFUjTKCtUdW4PctCciEZwYl7txtRMKL3tbXWrMo5DGEKutmzVYWzT7AW3+1mzBW2Xn9aqATeokUQ==",
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/@volar/transforms/-/transforms-0.31.1.tgz",
+      "integrity": "sha512-O9rrGwCTzzsVFe06WOKUx7f9rkPg396ugWkMX6O0M15EF1a3ykqH7QX1uxVhFS0NwvWDnIeJYe7NG1uf1BwR+w==",
       "dev": true,
       "requires": {
-        "@volar/shared": "^0.27.3"
+        "@volar/shared": "0.31.1",
+        "vscode-languageserver-types": "^3.17.0-next.6"
+      },
+      "dependencies": {
+        "vscode-languageserver-types": {
+          "version": "3.17.0-next.6",
+          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.6.tgz",
+          "integrity": "sha512-rHYeCotiabJHgvIYzWjV8g0dHCxyOQtcryTv1Xa1horaQ4jx2V+rjLBstc6zMpCyrnZcjorwEcAvGBDCd6wudw==",
+          "dev": true
+        }
+      }
+    },
+    "@volar/vue-code-gen": {
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/@volar/vue-code-gen/-/vue-code-gen-0.31.1.tgz",
+      "integrity": "sha512-MBMqhE+Z7xt2MSeQQA4ld0qx894gr5eLFWkTORdNoCbK8+02oB3yrZVr3T+i9jprjiV6svXKBoyk0RZ6YsgNqw==",
+      "dev": true,
+      "requires": {
+        "@volar/code-gen": "0.31.1",
+        "@volar/shared": "0.31.1",
+        "@volar/source-map": "0.31.1",
+        "@vue/compiler-core": "^3.2.27",
+        "@vue/compiler-dom": "^3.2.27",
+        "@vue/shared": "^3.2.27",
+        "upath": "^2.0.1"
       }
     },
     "@vscode/emmet-helper": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.7.0.tgz",
-      "integrity": "sha512-LL7MoKNLUQASacQROO7hBdx5IAxsEnA0UdJFd9xXyf3sBQgz8NE3QEfo3IezE7uin8W2fkG2+EXMst3oqK6+KQ==",
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.3.tgz",
+      "integrity": "sha512-dkTSL+BaBBS8gFgPm/GMOU+XfxaMyI+Fl1IUYxEi8Iv24RfHf9/q2eCpV2hs7sncLcoKWEbMYe5gv4Ppmp2Oxw==",
       "dev": true,
       "requires": {
         "emmet": "^2.3.0",
@@ -191,26 +217,25 @@
       }
     },
     "@vue/compiler-core": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.4.tgz",
-      "integrity": "sha512-c8NuQq7mUXXxA4iqD5VUKpyVeklK53+DMbojYMyZ0VPPrb0BUWrZWFiqSDT+MFDv0f6Hv3QuLiHWb1BWMXBbrw==",
+      "version": "3.2.28",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.28.tgz",
+      "integrity": "sha512-mQpfEjmHVxmWKaup0HL6tLMv2HqjjJu7XT4/q0IoUXYXC4xKG8lIVn5YChJqxBTLPuQjzas7u7i9L4PAWJZRtA==",
       "dev": true,
       "requires": {
-        "@babel/parser": "^7.12.0",
-        "@babel/types": "^7.12.0",
-        "@vue/shared": "3.2.4",
-        "estree-walker": "^2.0.1",
+        "@babel/parser": "^7.16.4",
+        "@vue/shared": "3.2.28",
+        "estree-walker": "^2.0.2",
         "source-map": "^0.6.1"
       }
     },
     "@vue/compiler-dom": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.4.tgz",
-      "integrity": "sha512-uj1nwO4794fw2YsYas5QT+FU/YGrXbS0Qk+1c7Kp1kV7idhZIghWLTjyvYibpGoseFbYLPd+sW2/noJG5H04EQ==",
+      "version": "3.2.28",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.28.tgz",
+      "integrity": "sha512-KA4yXceLteKC7VykvPnViUixemQw3A+oii+deSbZJOQKQKVh1HLosI10qxa8ImPCyun41+wG3uGR+tW7eu1W6Q==",
       "dev": true,
       "requires": {
-        "@vue/compiler-core": "3.2.4",
-        "@vue/shared": "3.2.4"
+        "@vue/compiler-core": "3.2.28",
+        "@vue/shared": "3.2.28"
       }
     },
     "@vue/compiler-sfc": {
@@ -309,12 +334,12 @@
       "integrity": "sha512-quBx4Jjpexo6KDiNUGFr/zF/2A4srKM9S9v2uHgMXSU//hjgq1eGzqkIFql8T9gfX5ZaVOUzYBP3jIdIR3PKIA=="
     },
     "@vue/reactivity": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.4.tgz",
-      "integrity": "sha512-ljWTR0hr8Tn09hM2tlmWxZzCBPlgGLnq/k8K8X6EcJhtV+C8OzFySnbWqMWataojbrQOocThwsC8awKthSl2uQ==",
+      "version": "3.2.28",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.28.tgz",
+      "integrity": "sha512-WamM5LGv7JIarW+EYAzYFqYonZXjTnOjNW0sBO93jRE9I1ReAwfH8NvQXkPA3JZ3fuF6SGDdG8Y9/+dKjd/1Gw==",
       "dev": true,
       "requires": {
-        "@vue/shared": "3.2.4"
+        "@vue/shared": "3.2.28"
       }
     },
     "@vue/reactivity-transform": {
@@ -410,9 +435,9 @@
       }
     },
     "@vue/shared": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.4.tgz",
-      "integrity": "sha512-j2j1MRmjalVKr3YBTxl/BClSIc8UQ8NnPpLYclxerK65JIowI4O7n8O8lElveEtEoHxy1d7BelPUDI0Q4bumqg==",
+      "version": "3.2.28",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.28.tgz",
+      "integrity": "sha512-eMQ8s9j8FpbGHlgUAaj/coaG3Q8YtMsoWL/RIHTsE3Ex7PUTyr7V91vB5HqWB5Sn8m4RXTHGO22/skoTUYvp0A==",
       "dev": true
     },
     "acorn": {
@@ -699,6 +724,14 @@
         "domelementtype": "^2.0.1",
         "domhandler": "^4.2.0",
         "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+          "dev": true
+        }
       }
     },
     "domelementtype": {
@@ -708,18 +741,18 @@
       "dev": true
     },
     "domhandler": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
-      "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz",
+      "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
       "dev": true,
       "requires": {
         "domelementtype": "^2.2.0"
       }
     },
     "domutils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
-      "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
       "requires": {
         "dom-serializer": "^1.0.1",
@@ -736,9 +769,9 @@
       }
     },
     "emmet": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.3.4.tgz",
-      "integrity": "sha512-3IqSwmO+N2ZGeuhDyhV/TIOJFUbkChi53bcasSNRE7Yd+4eorbbYz4e53TpMECt38NtYkZNupQCZRlwdAYA42A==",
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.3.5.tgz",
+      "integrity": "sha512-LcWfTamJnXIdMfLvJEC5Ld3hY5/KHXgv1L1bp6I7eEvB0ZhacHZ1kX0BYovJ8FroEsreLcq7n7kZhRMsf6jkXQ==",
       "dev": true,
       "requires": {
         "@emmetio/abbreviation": "^2.2.2",
@@ -762,9 +795,9 @@
       }
     },
     "entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
       "dev": true
     },
     "esbuild": {
@@ -1113,15 +1146,15 @@
       }
     },
     "htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
+      "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
       "dev": true,
       "requires": {
         "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
+        "domhandler": "^4.2.2",
+        "domutils": "^2.8.0",
+        "entities": "^3.0.1"
       }
     },
     "iconv-lite": {
@@ -1311,6 +1344,15 @@
       "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
       "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4="
     },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
     "magic-string": {
       "version": "0.25.7",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
@@ -1760,12 +1802,6 @@
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
       "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="
     },
-    "request-light": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.5.4.tgz",
-      "integrity": "sha512-t3566CMweOFlUk7Y1DJMu5OrtpoZEb6aSTsLQVT3wtrIEJ5NhcY9G/Oqxvjllzl4a15zXfFlcr9q40LbLVQJqw==",
-      "dev": true
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -2168,9 +2204,9 @@
       "dev": true
     },
     "vscode-css-languageservice": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.4.tgz",
-      "integrity": "sha512-fIJZJMXbaBsK0ifBb2RmSiLtzwn6NrZnKn7O+0ziIjwAY+rPvSK9St2qqQXFU3reZVRAt/I4GBp40dC/THcUDA==",
+      "version": "5.1.9",
+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.9.tgz",
+      "integrity": "sha512-/tFOWeZBL3Oc9Zc+2MAi3rEwiXJTSZsvjB+M7nSjWLbGPUIjukUA7YzLgsBoUfR35sPJYnXWUkL56PdfIYM8GA==",
       "dev": true,
       "requires": {
         "vscode-languageserver-textdocument": "^1.0.1",
@@ -2180,9 +2216,9 @@
       }
     },
     "vscode-html-languageservice": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.0.7.tgz",
-      "integrity": "sha512-P5TQMYpgxAdLs+PwpC7Lm+0lXCyQAC6kZ41YuPYNHVooC4XO7Y2+ncHBcQJVK4C9LU2cTOAl0lzq4WAxuwRHYw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.2.1.tgz",
+      "integrity": "sha512-PgaToZVXJ44nFWEBuSINdDgVV6EnpC3MnXBsysR3O5TKcAfywbYeRGRy+Y4dVR7YeUgDvtb+JkJoSkaYC0mxXQ==",
       "dev": true,
       "requires": {
         "vscode-languageserver-textdocument": "^1.0.1",
@@ -2192,9 +2228,9 @@
       }
     },
     "vscode-json-languageservice": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.7.tgz",
-      "integrity": "sha512-cwG5TwZyHYthsk2aS3W1dVgVP6Vwn3o+zscwN58uMgZt/nKuyxd9vdEB1F58Ix+S5kSKAnkUCP6hvulcoImQQQ==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.10.tgz",
+      "integrity": "sha512-IHliMEEYSY0tJjJt0ECb8ESx/nRXpoy9kN42WVQXgaqGyizFAf3jibSiezDQTrrY7f3kywXggCU+kkJEM+OLZQ==",
       "dev": true,
       "requires": {
         "jsonc-parser": "^3.0.0",
@@ -2213,42 +2249,33 @@
       }
     },
     "vscode-jsonrpc": {
-      "version": "8.0.0-next.2",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.2.tgz",
-      "integrity": "sha512-gxUyTBAjmwGkiHW/UaRScre2s4i98P8M7gnc3VB4DrVQUm3vQ0idi2cN9nbkfcjATx+uEt8C22j+MLN/8UzsJA==",
+      "version": "8.0.0-next.5",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.5.tgz",
+      "integrity": "sha512-owRllqcFTnz5rXxcbmHPFGmpFmLqj9Z1V3Dzrv+s8ejOHLIT62Pyb5Uqzyl2/in2VP22DmzErPgZwrxjLCIKiQ==",
       "dev": true
     },
-    "vscode-languageserver": {
-      "version": "8.0.0-next.2",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.2.tgz",
-      "integrity": "sha512-7qCEXTeGZKkI8BGvlKh0JPXTY7BaWoiwQYKCcGaUgnMs34wt6F/yaKcxoC3XIouBBVyRxiI6Ml/JdztM3XYEaA==",
-      "dev": true,
-      "requires": {
-        "vscode-languageserver-protocol": "3.17.0-next.8"
-      }
-    },
     "vscode-languageserver-protocol": {
-      "version": "3.17.0-next.8",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.8.tgz",
-      "integrity": "sha512-P89vSuJ+FA5JzFmcOoZN13Ig1yd6LsiPOig0O5m5BSGuO/rplQegCd9J0wKpaTy7trf/SYHRoypnbUBdzy14sg==",
+      "version": "3.17.0-next.12",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.12.tgz",
+      "integrity": "sha512-VLRcWKOpCXcx9UrqrS+NSF6pNxV498VGYGW+eyp9a79/F9ElUq3wdG6acXYlEfpWHuIxpm6MXps8FU88wqIgTg==",
       "dev": true,
       "requires": {
-        "vscode-jsonrpc": "8.0.0-next.2",
-        "vscode-languageserver-types": "3.17.0-next.3"
+        "vscode-jsonrpc": "8.0.0-next.5",
+        "vscode-languageserver-types": "3.17.0-next.6"
       },
       "dependencies": {
         "vscode-languageserver-types": {
-          "version": "3.17.0-next.3",
-          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.3.tgz",
-          "integrity": "sha512-VQcXnhKYxUW6OiRMhG++SzmZYMJwusXknJGd+FfdOnS1yHAo734OHyR0e2eEHDlv0/oWc8RZPgx/VKSKyondVg==",
+          "version": "3.17.0-next.6",
+          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.6.tgz",
+          "integrity": "sha512-rHYeCotiabJHgvIYzWjV8g0dHCxyOQtcryTv1Xa1horaQ4jx2V+rjLBstc6zMpCyrnZcjorwEcAvGBDCd6wudw==",
           "dev": true
         }
       }
     },
     "vscode-languageserver-textdocument": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz",
-      "integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.3.tgz",
+      "integrity": "sha512-ynEGytvgTb6HVSUwPJIAZgiHQmPCx8bZ8w5um5Lz+q5DjP0Zj8wTFhQpyg8xaMvefDytw2+HH5yzqS+FhsR28A==",
       "dev": true
     },
     "vscode-languageserver-types": {
@@ -2264,63 +2291,83 @@
       "dev": true
     },
     "vscode-pug-languageservice": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/vscode-pug-languageservice/-/vscode-pug-languageservice-0.27.3.tgz",
-      "integrity": "sha512-MmVoXja+JhipmWzeyT1yVisL62T5mcF/Hpqxu9sX0Wkdv8Vw+wOeKaiR/dq06/ivknpk6aQs+g+jD0+309WTeA==",
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/vscode-pug-languageservice/-/vscode-pug-languageservice-0.31.1.tgz",
+      "integrity": "sha512-71aQbVF3RjE+dUbUA/DnL1oGaLXXIMEy5z4TkE/irO/qodMjfwVbW/bxMCBwrVrXmIObIMlsWYPD+S/+EE3CXQ==",
       "dev": true,
       "requires": {
-        "@volar/code-gen": "^0.27.3",
-        "@volar/shared": "^0.27.3",
-        "@volar/source-map": "^0.27.3",
-        "@volar/transforms": "^0.27.3",
+        "@volar/code-gen": "0.31.1",
+        "@volar/shared": "0.31.1",
+        "@volar/source-map": "0.31.1",
+        "@volar/transforms": "0.31.1",
         "pug-lexer": "^5.0.1",
         "pug-parser": "^6.0.0",
-        "vscode-languageserver": "^8.0.0-next.1"
+        "vscode-languageserver-textdocument": "^1.0.3",
+        "vscode-languageserver-types": "^3.17.0-next.6"
+      },
+      "dependencies": {
+        "vscode-languageserver-types": {
+          "version": "3.17.0-next.6",
+          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.6.tgz",
+          "integrity": "sha512-rHYeCotiabJHgvIYzWjV8g0dHCxyOQtcryTv1Xa1horaQ4jx2V+rjLBstc6zMpCyrnZcjorwEcAvGBDCd6wudw==",
+          "dev": true
+        }
       }
     },
     "vscode-typescript-languageservice": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/vscode-typescript-languageservice/-/vscode-typescript-languageservice-0.27.3.tgz",
-      "integrity": "sha512-M3DAeqzy6HOWoX3Hr3IyPXGZj33vzQFjvRhOYUqXB7PxIgrTR2X1BEPq0E7YaYlabhuRLYxaa1QPpNA+B4CABQ==",
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/vscode-typescript-languageservice/-/vscode-typescript-languageservice-0.31.1.tgz",
+      "integrity": "sha512-qJlkrznmRJGHAxIclfnAuJSbNfmKwDfAn7o3PLM7bBqtBvJG6HAFCBXaBWaE1kkM/ELG20Dn8Xi7lCfT15DlpA==",
       "dev": true,
       "requires": {
-        "@volar/shared": "^0.27.3",
+        "@volar/shared": "0.31.1",
+        "semver": "^7.3.5",
         "upath": "^2.0.1",
-        "vscode-languageserver": "^8.0.0-next.1",
-        "vscode-languageserver-textdocument": "^1.0.1"
+        "vscode-languageserver-protocol": "^3.17.0-next.12",
+        "vscode-languageserver-textdocument": "^1.0.3",
+        "vscode-nls": "^5.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "vscode-uri": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz",
-      "integrity": "sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz",
+      "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==",
       "dev": true
     },
     "vscode-vue-languageservice": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/vscode-vue-languageservice/-/vscode-vue-languageservice-0.27.3.tgz",
-      "integrity": "sha512-veHGBvVFx90gchdMQNwxjUZrX35gPhHnlOecB6rP6NgKQN1/d/WgQgm6a+Lx6uc4q5DhJs3R4B987FQ/VYwQFQ==",
-      "dev": true,
-      "requires": {
-        "@volar/code-gen": "^0.27.3",
-        "@volar/html2pug": "^0.27.3",
-        "@volar/shared": "^0.27.3",
-        "@volar/source-map": "^0.27.3",
-        "@volar/transforms": "^0.27.3",
-        "@vscode/emmet-helper": "^2.7.0",
-        "@vue/compiler-dom": "^3.2.2",
-        "@vue/compiler-sfc": "^3.2.2",
-        "@vue/reactivity": "^3.2.2",
-        "@vue/shared": "^3.2.2",
-        "request-light": "^0.5.4",
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/vscode-vue-languageservice/-/vscode-vue-languageservice-0.31.1.tgz",
+      "integrity": "sha512-7HY4VkD00iyfWyWpJcl3zObnsa9gBKGjTtrWflFR0SqGHMsccfh7QXdrPmgy/2nFRkD6n60XU7eSYg2rN/QexA==",
+      "dev": true,
+      "requires": {
+        "@volar/code-gen": "0.31.1",
+        "@volar/html2pug": "0.31.1",
+        "@volar/shared": "0.31.1",
+        "@volar/source-map": "0.31.1",
+        "@volar/transforms": "0.31.1",
+        "@volar/vue-code-gen": "0.31.1",
+        "@vscode/emmet-helper": "^2.8.3",
+        "@vue/reactivity": "^3.2.27",
+        "@vue/shared": "^3.2.27",
         "upath": "^2.0.1",
-        "vscode-css-languageservice": "^5.1.4",
-        "vscode-html-languageservice": "^4.0.7",
-        "vscode-json-languageservice": "^4.1.5",
-        "vscode-languageserver": "^8.0.0-next.1",
-        "vscode-languageserver-textdocument": "^1.0.1",
-        "vscode-pug-languageservice": "^0.27.3",
-        "vscode-typescript-languageservice": "^0.27.3"
+        "vscode-css-languageservice": "^5.1.9",
+        "vscode-html-languageservice": "^4.2.1",
+        "vscode-json-languageservice": "^4.1.10",
+        "vscode-languageserver-protocol": "^3.17.0-next.12",
+        "vscode-languageserver-textdocument": "^1.0.3",
+        "vscode-pug-languageservice": "0.31.1",
+        "vscode-typescript-languageservice": "0.31.1"
       }
     },
     "vue": {
@@ -2383,12 +2430,13 @@
       }
     },
     "vue-tsc": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-0.2.3.tgz",
-      "integrity": "sha512-0ahxAnQolmv6EOnv5zxeMi4vCpM4PkhjU70i/EI44OzMWq4OErjLZhEh8EXOLtMx6FBRuuqS5fiBXcuqLpoL7Q==",
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-0.31.1.tgz",
+      "integrity": "sha512-pyLQG1fCA02is6NAL0uY5SKxDfjJRI167x89iRz0gWOB0tUng6NjJZicE+Oh+3ZuN/LJ3J/wKfdW7O+hnfhxdg==",
       "dev": true,
       "requires": {
-        "vscode-vue-languageservice": "^0.27.0"
+        "@volar/shared": "0.31.1",
+        "vscode-vue-languageservice": "0.31.1"
       }
     },
     "vuex": {
@@ -2514,6 +2562,12 @@
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
       "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
     },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "yaml": {
       "version": "1.10.2",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
diff --git a/package.json b/package.json
index e54bb43..da944ec 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "amplitudejs": "^5.3.2",
     "ansi-regex": "^5.0.1",
     "axios": "^0.24.0",
-    "class-transformer": "^0.4.0",
+    "class-transformer": "^0.5.0",
     "mitt": "^3.0.0",
     "quicktype": "^15.0.260",
     "reflect-metadata": "^0.1.13",
@@ -29,6 +29,6 @@
     "@vue/compiler-sfc": "^3.2.28",
     "typescript": "^4.5.5",
     "vite": "^2.7.13",
-    "vue-tsc": "^0.2.3"
+    "vue-tsc": "^0.31"
   }
 }
diff --git a/src/components/Album/AlbumFavoriteView.vue b/src/components/Album/AlbumFavoriteView.vue
index 57fe733..57ac006 100644
--- a/src/components/Album/AlbumFavoriteView.vue
+++ b/src/components/Album/AlbumFavoriteView.vue
@@ -6,18 +6,19 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from 'vue'
+import { defineComponent } from 'vue'
 import { plainToClass } from 'class-transformer'
 import AlbumCover from './Lib/AlbumCover.vue'
 import AlbumListItem from './Lib/AlbumListItem.vue'
 import Album from '../../model/Album'
 import HttpRequest from '../Lib/HttpRequest'
+import AlbumInterface from '../../model/AlbumInterface'
 
 export default defineComponent({
-  name: 'AlbumList',
+  name: 'AlbumFavoriteView',
   data() {
     return { 
-      albumList: [] as PropType<Array<Album>>
+      albumList: [] as Array<AlbumInterface>
     }
   },
   components: {
diff --git a/src/components/Album/AlbumListView.vue b/src/components/Album/AlbumListView.vue
index 1e1b6a8..80497f3 100644
--- a/src/components/Album/AlbumListView.vue
+++ b/src/components/Album/AlbumListView.vue
@@ -11,18 +11,19 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from 'vue'
+import { defineComponent } from 'vue'
 import { plainToClass } from 'class-transformer'
 import Album from '../../model/Album'
 import AlbumListItem from './Lib/AlbumListItem.vue'
 import HttpRequest from '../Lib/HttpRequest'
 import formatDurationLength from '../Lib/FormatDurationLength'
+import AlbumInterface from '../../model/AlbumInterface'
 
 export default defineComponent({
   name: 'AlbumList',
   data() {
     return { 
-      albumList: [] as PropType<Array<Album>>,
+      albumList: [] as Array<AlbumInterface>,
       quantity: 0,
     }
   },
diff --git a/src/components/Album/Lib/AlbumCover.vue b/src/components/Album/Lib/AlbumCover.vue
index 46f2fee..8d0b993 100644
--- a/src/components/Album/Lib/AlbumCover.vue
+++ b/src/components/Album/Lib/AlbumCover.vue
@@ -10,13 +10,13 @@
 <script lang="ts">
 import { defineComponent } from 'vue'
 import Player from '../../Lib/Player';
-import Album from '../../../model/Album';
+import AlbumInterface from '../../../model/AlbumInterface';
 
 export default defineComponent({
   name: 'AlbumCover',
   props: {
     album: {
-      type: Album,
+      type: Object as () => AlbumInterface,
       required: true
     },
     size: {
@@ -25,7 +25,7 @@ export default defineComponent({
     }
   },
   methods: {
-    async play(album: Album): Promise<void> {
+    async play(album: AlbumInterface): Promise<void> {
       Player.playAlbum(album.getId(), this);
     }
   }
diff --git a/src/components/Album/Lib/AlbumListItem.vue b/src/components/Album/Lib/AlbumListItem.vue
index 369ff4d..10dca62 100644
--- a/src/components/Album/Lib/AlbumListItem.vue
+++ b/src/components/Album/Lib/AlbumListItem.vue
@@ -15,13 +15,13 @@
 <script lang="ts">
 import { defineComponent } from 'vue'
 import AlbumCover from './AlbumCover.vue';
-import Album from '../../../model/Album';
+import AlbumInterface from '../../../model/AlbumInterface';
 
 export default defineComponent({
   name: 'AlbumListItem',
   props: {
     album: {
-      type: Album,
+      type: Object as () => AlbumInterface,
       required: true
     }
   },
diff --git a/src/components/Artist/ArtistListView.vue b/src/components/Artist/ArtistListView.vue
index 7e2031e..470cc11 100644
--- a/src/components/Artist/ArtistListView.vue
+++ b/src/components/Artist/ArtistListView.vue
@@ -27,7 +27,7 @@ export default defineComponent({
   name: 'ArtistList',
   data() {
     return { 
-      artistList: [] as PropType<Array<Artist>>
+      artistList: []
     }
   },
   async created(): Promise<void> {
diff --git a/src/components/Home/LoginView.vue b/src/components/Home/LoginView.vue
index 057b7e6..5e949fb 100644
--- a/src/components/Home/LoginView.vue
+++ b/src/components/Home/LoginView.vue
@@ -22,11 +22,12 @@
   </div>
 </template>
 <script lang="ts">
+import { defineComponent } from '@vue/runtime-core';
 import { AxiosResponse } from 'axios';
 import HttpRequest from '../Lib/HttpRequest';
 
-export default {
-  data() {
+export default defineComponent({
+  setup() {
     return {
       username: '',
       password: '',
@@ -64,7 +65,7 @@ export default {
       });
     }
   }
-};
+});
 </script>
 <style scoped>
 div.errorMessage {
diff --git a/src/components/Random/RandomSongsView.vue b/src/components/Random/RandomSongsView.vue
index 8a65a4e..767dfbf 100644
--- a/src/components/Random/RandomSongsView.vue
+++ b/src/components/Random/RandomSongsView.vue
@@ -44,7 +44,7 @@
 <script lang="ts">
 import { AxiosResponse } from 'axios';
 import { plainToClass } from 'class-transformer';
-import { defineComponent, PropType } from 'vue'
+import { defineComponent } from 'vue'
 import { useRoute } from 'vue-router';
 import SongListItem from '../../model/SongListItem';
 import SongListItemInterface from '../../model/SongListItemInterface';
@@ -56,7 +56,7 @@ import SongCover from '../Lib/SongCover.vue'
 export default defineComponent({
   data() {
     return {
-      songList: [] as PropType<Array<SongListItemInterface>>,
+      songList: [] as Array<SongListItemInterface>,
       limit: 100,
       length: 0
     };
diff --git a/src/model/Album.ts b/src/model/Album.ts
index a922c88..ab9d24b 100644
--- a/src/model/Album.ts
+++ b/src/model/Album.ts
@@ -1,4 +1,6 @@
-export default class Album {
+import AlbumInterface from "./AlbumInterface";
+
+export default class Album implements AlbumInterface {
   private id: number = 0;
   private name: string = '';
   private artistId: number = 0;
diff --git a/src/model/AlbumInterface.ts b/src/model/AlbumInterface.ts
new file mode 100644
index 0000000..56a0e96
--- /dev/null
+++ b/src/model/AlbumInterface.ts
@@ -0,0 +1,12 @@
+export default interface AlbumInterface {
+
+  getId(): number;
+
+  getName(): string;
+
+  getArtistId(): number;
+
+  getCover(): string;
+
+  getArtistName(): string;
+}
\ No newline at end of file