added dynamical import of components via vite

2023-07-22 09:29:40 +02:00 · 2023-07-22 09:29:40 +02:00 · 1ba7a9a28b
commit 1ba7a9a28b
parent 01c742e6ce
7 changed files with 53 additions and 69 deletions
--- a/package.json
+++ b/package.json
@ -46,6 +46,7 @@
 		"@lit-protocol/pkp-walletconnect": "^2.2.41",
 		"@lit-protocol/types": "^2.2.41",
 		"@rollup/plugin-node-resolve": "^15.1.0",
+		"@sveltejs/vite-plugin-svelte": "^2.4.2",
 		"@wagmi/core": "^1.3.8",
 		"rollup": "^3.26.3",
 		"rollup-plugin-glob-import": "^0.5.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -28,9 +28,15 @@ dependencies:
  '@rollup/plugin-node-resolve':
    specifier: ^15.1.0
    version: 15.1.0(rollup@3.26.3)
+  '@sveltejs/vite-plugin-svelte':
+    specifier: ^2.4.2
+    version: 2.4.2(svelte@4.0.5)(vite@4.4.4)
  '@wagmi/core':
    specifier: ^1.3.8
    version: 1.3.8(react@18.2.0)(typescript@5.1.6)(viem@1.3.0)
+  fs:
+    specifier: 0.0.1-security
+    version: 0.0.1-security
  rollup:
    specifier: ^3.26.3
    version: 3.26.3
@ -122,7 +128,6 @@ packages:
    dependencies:
      '@jridgewell/gen-mapping': 0.3.3
      '@jridgewell/trace-mapping': 0.3.18
-    dev: true

  /@assemblyscript/loader@0.9.4:
    resolution: {integrity: sha512-HazVq9zwTVwGmqdwYzu7WyQ6FQVZ7SwET0KKQuKm55jD0IfUpZgN0OPIiZG3zV1iSrVYcN0bdwLRXI/VNCYsUA==}
@ -292,7 +297,6 @@ packages:
    cpu: [arm64]
    os: [android]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/android-arm@0.18.14:
@ -301,7 +305,6 @@ packages:
    cpu: [arm]
    os: [android]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/android-x64@0.18.14:
@ -310,7 +313,6 @@ packages:
    cpu: [x64]
    os: [android]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/darwin-arm64@0.18.14:
@ -319,7 +321,6 @@ packages:
    cpu: [arm64]
    os: [darwin]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/darwin-x64@0.18.14:
@ -328,7 +329,6 @@ packages:
    cpu: [x64]
    os: [darwin]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/freebsd-arm64@0.18.14:
@ -337,7 +337,6 @@ packages:
    cpu: [arm64]
    os: [freebsd]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/freebsd-x64@0.18.14:
@ -346,7 +345,6 @@ packages:
    cpu: [x64]
    os: [freebsd]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/linux-arm64@0.18.14:
@ -355,7 +353,6 @@ packages:
    cpu: [arm64]
    os: [linux]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/linux-arm@0.18.14:
@ -364,7 +361,6 @@ packages:
    cpu: [arm]
    os: [linux]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/linux-ia32@0.18.14:
@ -373,7 +369,6 @@ packages:
    cpu: [ia32]
    os: [linux]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/linux-loong64@0.18.14:
@ -382,7 +377,6 @@ packages:
    cpu: [loong64]
    os: [linux]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/linux-mips64el@0.18.14:
@ -391,7 +385,6 @@ packages:
    cpu: [mips64el]
    os: [linux]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/linux-ppc64@0.18.14:
@ -400,7 +393,6 @@ packages:
    cpu: [ppc64]
    os: [linux]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/linux-riscv64@0.18.14:
@ -409,7 +401,6 @@ packages:
    cpu: [riscv64]
    os: [linux]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/linux-s390x@0.18.14:
@ -418,7 +409,6 @@ packages:
    cpu: [s390x]
    os: [linux]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/linux-x64@0.18.14:
@ -427,7 +417,6 @@ packages:
    cpu: [x64]
    os: [linux]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/netbsd-x64@0.18.14:
@ -436,7 +425,6 @@ packages:
    cpu: [x64]
    os: [netbsd]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/openbsd-x64@0.18.14:
@ -445,7 +433,6 @@ packages:
    cpu: [x64]
    os: [openbsd]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/sunos-x64@0.18.14:
@ -454,7 +441,6 @@ packages:
    cpu: [x64]
    os: [sunos]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/win32-arm64@0.18.14:
@ -463,7 +449,6 @@ packages:
    cpu: [arm64]
    os: [win32]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/win32-ia32@0.18.14:
@ -472,7 +457,6 @@ packages:
    cpu: [ia32]
    os: [win32]
    requiresBuild: true
-    dev: true
    optional: true

  /@esbuild/win32-x64@0.18.14:
@ -481,7 +465,6 @@ packages:
    cpu: [x64]
    os: [win32]
    requiresBuild: true
-    dev: true
    optional: true

  /@eslint-community/eslint-utils@4.4.0(eslint@8.45.0):
@ -919,32 +902,26 @@ packages:
      '@jridgewell/set-array': 1.1.2
      '@jridgewell/sourcemap-codec': 1.4.15
      '@jridgewell/trace-mapping': 0.3.18
-    dev: true

  /@jridgewell/resolve-uri@3.1.0:
    resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
    engines: {node: '>=6.0.0'}
-    dev: true

  /@jridgewell/set-array@1.1.2:
    resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
    engines: {node: '>=6.0.0'}
-    dev: true

  /@jridgewell/sourcemap-codec@1.4.14:
    resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
-    dev: true

  /@jridgewell/sourcemap-codec@1.4.15:
    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
-    dev: true

  /@jridgewell/trace-mapping@0.3.18:
    resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==}
    dependencies:
      '@jridgewell/resolve-uri': 3.1.0
      '@jridgewell/sourcemap-codec': 1.4.14
-    dev: true

  /@json-rpc-tools/provider@1.7.6:
    resolution: {integrity: sha512-z7D3xvJ33UfCGv77n40lbzOYjZKVM3k2+5cV7xS8G6SCvKTzMkhkUYuD/qzQUNT4cG/lv0e9mRToweEEVLVVmA==}
@ -2522,7 +2499,6 @@ packages:
      vite: 4.4.4(@types/node@20.4.2)
    transitivePeerDependencies:
      - supports-color
-    dev: true

  /@sveltejs/vite-plugin-svelte@2.4.2(svelte@4.0.5)(vite@4.4.4):
    resolution: {integrity: sha512-ePfcC48ftMKhkT0OFGdOyycYKnnkT6i/buzey+vHRTR/JpQvuPzzhf1PtKqCDQfJRgoPSN2vscXs6gLigx/zGw==}
@ -2542,7 +2518,6 @@ packages:
      vitefu: 0.2.4(vite@4.4.4)
    transitivePeerDependencies:
      - supports-color
-    dev: true

  /@types/chai-subset@1.3.3:
    resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==}
@ -3642,7 +3617,6 @@ packages:
    resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
    engines: {node: '>=0.4.0'}
    hasBin: true
-    dev: true

  /aes-js@3.0.0:
    resolution: {integrity: sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==}
@ -3719,7 +3693,6 @@ packages:
    resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}
    dependencies:
      dequal: 2.0.3
-    dev: true

  /array-union@2.1.0:
    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
@ -3774,7 +3747,6 @@ packages:
    resolution: {integrity: sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==}
    dependencies:
      dequal: 2.0.3
-    dev: true

  /balanced-match@1.0.2:
    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
@ -4034,7 +4006,6 @@ packages:
      acorn: 8.10.0
      estree-walker: 3.0.3
      periscopic: 3.1.0
-    dev: true

  /color-convert@2.0.1:
    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
@ -4102,7 +4073,6 @@ packages:
    dependencies:
      mdn-data: 2.0.30
      source-map-js: 1.0.2
-    dev: true

  /cssesc@3.0.0:
    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
@ -4174,7 +4144,6 @@ packages:
  /dequal@2.0.3:
    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
    engines: {node: '>=6'}
-    dev: true

  /detect-browser@5.3.0:
    resolution: {integrity: sha512-53rsFbGdwMwlF7qvCt0ypLM5V5/Mbl0szB7GPN8y9NCcbknYOeVVXdrXEq+90IwAfrrzt6Hd+u2E2ntakICU8w==}
@ -4340,7 +4309,6 @@ packages:
      '@esbuild/win32-arm64': 0.18.14
      '@esbuild/win32-ia32': 0.18.14
      '@esbuild/win32-x64': 0.18.14
-    dev: true

  /escalade@3.1.1:
    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
@ -4505,7 +4473,6 @@ packages:
    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
    dependencies:
      '@types/estree': 1.0.1
-    dev: true

  /esutils@2.0.3:
    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
@ -4744,6 +4711,10 @@ packages:
    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
    dev: true

+  /fs@0.0.1-security:
+    resolution: {integrity: sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==}
+    dev: false
+
  /fsevents@2.3.2:
    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@ -5223,7 +5194,6 @@ packages:
    resolution: {integrity: sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w==}
    dependencies:
      '@types/estree': 1.0.1
-    dev: true

  /is-typed-array@1.1.12:
    resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==}
@ -5450,7 +5420,6 @@ packages:
  /kleur@4.1.5:
    resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
    engines: {node: '>=6'}
-    dev: true

  /known-css-properties@0.27.0:
    resolution: {integrity: sha512-uMCj6+hZYDoffuvAJjFAPz56E9uoowFHmTkqRtRq5WyC5Q6Cu/fTZKNQpX/RbzChBYLLl3lo8CjFZBAZXq9qFg==}
@ -5549,7 +5518,6 @@ packages:

  /locate-character@3.0.0:
    resolution: {integrity: sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==}
-    dev: true

  /locate-path@5.0.0:
    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
@ -5612,11 +5580,9 @@ packages:
    engines: {node: '>=12'}
    dependencies:
      '@jridgewell/sourcemap-codec': 1.4.15
-    dev: true

  /mdn-data@2.0.30:
    resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
-    dev: true

  /merge-options@3.0.4:
    resolution: {integrity: sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==}
@ -5988,11 +5954,9 @@ packages:
      '@types/estree': 1.0.1
      estree-walker: 3.0.3
      is-reference: 3.0.1
-    dev: true

  /picocolors@1.0.0:
    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
-    dev: true

  /picomatch@2.3.1:
    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
@ -6168,7 +6132,6 @@ packages:
      nanoid: 3.3.6
      picocolors: 1.0.0
      source-map-js: 1.0.2
-    dev: true

  /preact@10.16.0:
    resolution: {integrity: sha512-XTSj3dJ4roKIC93pald6rWuB2qQJO9gO2iLLyTe87MrjQN+HklueLsmskbywEWqCHlclgz3/M4YLL2iBr9UmMA==}
@ -6667,7 +6630,6 @@ packages:
  /source-map-js@1.0.2:
    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
    engines: {node: '>=0.10.0'}
-    dev: true

  /sparse-array@1.3.2:
    resolution: {integrity: sha512-ZT711fePGn3+kQyLuv1fpd3rNSkNF8vd5Kv2D+qnOANeyKs3fx6bUMGWRPvgTTcYV64QMqZKZwcuaQSP3AZ0tg==}
@ -6855,7 +6817,6 @@ packages:
      svelte: ^3.19.0 || ^4.0.0-next.0
    dependencies:
      svelte: 4.0.5
-    dev: true

  /svelte-preprocess@5.0.4(postcss@8.4.26)(svelte@4.0.5)(typescript@5.1.6):
    resolution: {integrity: sha512-ABia2QegosxOGsVlsSBJvoWeXy1wUKSfF7SWJdTjLAbx/Y3SrVevvvbFNQqrSJw89+lNSsM58SipmZJ5SRi5iw==}
@ -6922,7 +6883,6 @@ packages:
      locate-character: 3.0.0
      magic-string: 0.30.1
      periscopic: 3.1.0
-    dev: true

  /symbol-observable@2.0.3:
    resolution: {integrity: sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==}
@ -7304,7 +7264,6 @@ packages:
      rollup: 3.26.3
    optionalDependencies:
      fsevents: 2.3.2
-    dev: true

  /vitefu@0.2.4(vite@4.4.4):
    resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==}
@ -7315,7 +7274,6 @@ packages:
        optional: true
    dependencies:
      vite: 4.4.4(@types/node@20.4.2)
-    dev: true

  /vitest@0.32.4:
    resolution: {integrity: sha512-3czFm8RnrsWwIzVDu/Ca48Y/M+qh3vOnF16czJm98Q/AN1y3B6PBsyV8Re91Ty5s7txKNjEhpgtGPcfdbh2MZg==}
--- a/src/lib/components.ts
+++ b/src/lib/components.ts
@ -1,8 +1,9 @@
-import LitStatus from '$lib/LitStatus.svelte';
-import Composite from '$lib/components/Composite.svelte';
+import componentNames from 'virtual:components-list';

-const components = {
-    "LitStatus": LitStatus,
-};
+const components = {};

-export default components;
+componentNames.forEach(name => {
+    components[name] = () => import(`$lib/components/${name}.svelte`);
+});
+
+export default components;
--- a/src/lib/components/Composite.svelte
+++ b/src/lib/components/Composite.svelte
@ -4,9 +4,8 @@
 	export let name = '';

 	async function getComponent(componentName) {
-		if (components[componentName]) return components[componentName];
-		if (componentName === 'Composite') {
-			const module = await import('$lib/components/Composite.svelte');
+		if (components[componentName]) {
+			const module = await components[componentName]();
 			return module.default;
 		}
 		return null;
@ -26,5 +25,3 @@
 		{/if}
 	{/await}
 {/each}
-
-<p>Composite: {name}</p>
--- a/src/lib/components/LitStatus.svelte
+++ b/src/lib/components/LitStatus.svelte
@ -2,7 +2,7 @@

 <script>
 	import { onMount } from 'svelte';
-	import Lit from '../lib/lit';
+	import Lit from '../lit';

 	let networkStatus = 'Disconnected';
 	let isNetworkLoading = true;
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@ -1,5 +1,5 @@
 <script>
-	import LitStatus from '$lib/LitStatus.svelte';
+	import LitStatus from '$lib/components/LitStatus.svelte';
 	import AuthSign from '$lib/AuthSig.svelte';
 	import Wallet from '$lib/Wallet.svelte';
 	import Send from '$lib/Send.svelte';
@ -14,12 +14,17 @@
 		{
 			id: 2,
 			componentName: 'Composite',
-			name: 'Nested Composite 1',
+			name: 'Nested Composite',
 			components: [
 				{
 					id: 3,
 					componentName: 'LitStatus',
-					name: 'Leaf 2'
+					name: 'LitStatus'
+				},
+				{
+					id: 4,
+					componentName: 'MessageInput',
+					name: 'MessageInput'
 				}
 			]
 		}
--- a/vite.config.ts
+++ b/vite.config.ts
@ -1,8 +1,30 @@
 import { sveltekit } from '@sveltejs/kit/vite';
-import { defineConfig } from 'vitest/config';
+import { defineConfig } from 'vite';
+import * as fs from 'fs';
+import { resolve } from 'path';

 export default defineConfig({
-	plugins: [sveltekit()],
+	plugins: [
+		sveltekit(),
+		{
+			name: 'components-resolver',
+			resolveId(source) {
+				if (source === 'virtual:components-list') return source;
+				return null;
+			},
+			load(id) {
+				if (id === 'virtual:components-list') {
+					const componentsDir = resolve(__dirname, 'src/lib/components');
+					const components = fs.readdirSync(componentsDir)
+						.filter(f => f.endsWith('.svelte'))
+						.map(f => f.replace('.svelte', ''));
+
+					return `export default ${JSON.stringify(components)};`;
+				}
+				return null;
+			}
+		}
+	],
 	test: {
 		include: ['src/**/*.{test,spec}.{js,ts}']
 	}