From 1b9a3927b608ad2d6a42c12e660d63b3ccd25555 Mon Sep 17 00:00:00 2001
From: Lucas Koehler <lkoehler@eclipsesource.com>
Date: Wed, 25 Sep 2024 11:59:25 +0200
Subject: [PATCH] vue-vuetify: Extract control entries and fix usage
 instructions

fix #2378

The registry entries for the renderers were configured in the same files
as the renderers. This lead to the entries being removed due to tree shaking
during production builds using esbuild (as used by Vite).

This extracts all entries to separate files and improves the README to no
longer import the renderers asynchronously .
---
 packages/vue-vuetify/README.md                |  3 +-
 .../src/additional/LabelRenderer.entry.ts     | 11 +++++
 .../src/additional/LabelRenderer.vue          | 12 +----
 .../ListWithDetailRenderer.entry.ts           | 13 ++++++
 .../src/additional/ListWithDetailRenderer.vue |  5 ---
 packages/vue-vuetify/src/additional/index.ts  |  4 +-
 .../src/complex/AllOfRenderer.entry.ts        | 11 +++++
 .../vue-vuetify/src/complex/AllOfRenderer.vue |  8 ----
 .../src/complex/AnyOfRenderer.entry.ts        | 11 +++++
 .../vue-vuetify/src/complex/AnyOfRenderer.vue |  8 ----
 .../src/complex/ArrayControlRenderer.entry.ts | 13 ++++++
 .../src/complex/ArrayControlRenderer.vue      | 10 -----
 .../src/complex/EnumArrayRenderer.entry.ts    | 42 ++++++++++++++++++
 .../src/complex/EnumArrayRenderer.vue         | 44 +------------------
 .../src/complex/ObjectRenderer.entry.ts       | 11 +++++
 .../src/complex/ObjectRenderer.vue            |  5 ---
 .../src/complex/OneOfRenderer.entry.ts        | 11 +++++
 .../vue-vuetify/src/complex/OneOfRenderer.vue |  8 ----
 .../src/complex/OneOfTabRenderer.entry.ts     | 13 ++++++
 .../src/complex/OneOfTabRenderer.vue          | 10 -----
 packages/vue-vuetify/src/complex/index.ts     | 14 +++---
 .../AnyOfStringOrEnumControlRenderer.entry.ts | 40 +++++++++++++++++
 .../AnyOfStringOrEnumControlRenderer.vue      | 34 +-------------
 .../controls/BooleanControlRenderer.entry.ts  | 11 +++++
 .../src/controls/BooleanControlRenderer.vue   | 12 +----
 .../BooleanToggleControlRenderer.entry.ts     | 13 ++++++
 .../controls/BooleanToggleControlRenderer.vue | 14 +-----
 .../src/controls/DateControlRenderer.entry.ts | 11 +++++
 .../src/controls/DateControlRenderer.vue      | 19 ++------
 .../controls/DateTimeControlRenderer.entry.ts | 11 +++++
 .../src/controls/DateTimeControlRenderer.vue  | 19 ++------
 .../src/controls/EnumControlRenderer.entry.ts | 11 +++++
 .../src/controls/EnumControlRenderer.vue      | 12 +----
 .../controls/IntegerControlRenderer.entry.ts  | 11 +++++
 .../src/controls/IntegerControlRenderer.vue   | 12 +----
 .../MultiStringControlRenderer.entry.ts       | 13 ++++++
 .../controls/MultiStringControlRenderer.vue   | 14 +-----
 .../controls/NumberControlRenderer.entry.ts   | 11 +++++
 .../src/controls/NumberControlRenderer.vue    | 12 +----
 .../OneOfEnumControlRenderer.entry.ts         | 11 +++++
 .../src/controls/OneOfEnumControlRenderer.vue | 12 +----
 .../OneOfRadioGroupControlRenderer.entry.ts   | 13 ++++++
 .../OneOfRadioGroupControlRenderer.vue        | 14 +-----
 .../controls/PasswordControlRenderer.entry.ts | 13 ++++++
 .../src/controls/PasswordControlRenderer.vue  | 14 +-----
 .../RadioGroupControlRenderer.entry.ts        | 13 ++++++
 .../controls/RadioGroupControlRenderer.vue    | 14 +-----
 .../controls/SliderControlRenderer.entry.ts   | 11 +++++
 .../src/controls/SliderControlRenderer.vue    | 12 +----
 .../controls/StringControlRenderer.entry.ts   | 10 +++++
 .../src/controls/StringControlRenderer.vue    | 12 +----
 .../StringMaskControlRenderer.entry.ts        | 13 ++++++
 .../controls/StringMaskControlRenderer.vue    |  9 ----
 .../src/controls/TimeControlRenderer.entry.ts | 11 +++++
 .../src/controls/TimeControlRenderer.vue      | 19 ++------
 packages/vue-vuetify/src/controls/index.ts    | 34 +++++++-------
 .../AutocompleteEnumControlRenderer.entry.ts  | 11 +++++
 .../AutocompleteEnumControlRenderer.vue       | 12 +----
 ...ocompleteOneOfEnumControlRenderer.entry.ts | 11 +++++
 .../AutocompleteOneOfEnumControlRenderer.vue  | 12 +----
 packages/vue-vuetify/src/extended/index.ts    |  4 +-
 .../src/layouts/ArrayLayoutRenderer.entry.ts  | 11 +++++
 .../src/layouts/ArrayLayoutRenderer.vue       |  8 ----
 .../layouts/CategorizationRenderer.entry.ts   | 13 ++++++
 .../src/layouts/CategorizationRenderer.vue    |  5 ---
 .../CategorizationStepperRenderer.entry.ts    | 21 +++++++++
 .../layouts/CategorizationStepperRenderer.vue | 22 +---------
 .../src/layouts/GroupRenderer.entry.ts        | 13 ++++++
 .../vue-vuetify/src/layouts/GroupRenderer.vue | 14 +-----
 .../layouts/HorizontalLayoutRenderer.entry.ts | 11 +++++
 .../src/layouts/HorizontalLayoutRenderer.vue  | 12 +----
 .../layouts/VerticalLayoutRenderer.entry.ts   | 11 +++++
 .../src/layouts/VerticalLayoutRenderer.vue    | 12 +----
 packages/vue-vuetify/src/layouts/index.ts     | 12 ++---
 .../unit/additional/LabelRenderer.spec.ts     |  5 +--
 .../additional/ListWithDetailRenderer.spec.ts |  5 +--
 .../unit/complex/ArrayControlRenderer.spec.ts |  5 +--
 .../tests/unit/complex/OneOfRenderer.spec.ts  |  5 +--
 .../controls/BooleanControlRenderer.spec.ts   |  5 +--
 .../unit/controls/DateControlRenderer.spec.ts |  5 +--
 .../controls/DateTimeControlRenderer.spec.ts  |  5 +--
 .../unit/controls/EnumControlRenderer.spec.ts |  5 +--
 .../controls/IntegerControlRenderer.spec.ts   |  5 +--
 .../MultiStringControlRenderer.spec.ts        |  5 +--
 .../controls/NumberControlRenderer.spec.ts    |  5 +--
 .../controls/OneOfEnumControlRenderer.spec.ts |  5 +--
 .../controls/StringControlRenderer.spec.ts    |  5 +--
 .../unit/controls/TimeControlRenderer.spec.ts |  5 +--
 .../unit/layout/ArrayLayoutRenderer.spec.ts   |  5 +--
 89 files changed, 563 insertions(+), 509 deletions(-)
 create mode 100644 packages/vue-vuetify/src/additional/LabelRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/additional/ListWithDetailRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/complex/AllOfRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/complex/AnyOfRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/complex/ArrayControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/complex/EnumArrayRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/complex/ObjectRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/complex/OneOfRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/complex/OneOfTabRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/AnyOfStringOrEnumControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/BooleanControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/BooleanToggleControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/DateControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/DateTimeControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/EnumControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/IntegerControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/MultiStringControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/NumberControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/OneOfEnumControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/OneOfRadioGroupControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/PasswordControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/RadioGroupControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/SliderControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/StringControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/StringMaskControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/controls/TimeControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/extended/AutocompleteEnumControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/extended/AutocompleteOneOfEnumControlRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/layouts/ArrayLayoutRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/layouts/CategorizationRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/layouts/CategorizationStepperRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/layouts/GroupRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/layouts/HorizontalLayoutRenderer.entry.ts
 create mode 100644 packages/vue-vuetify/src/layouts/VerticalLayoutRenderer.entry.ts

diff --git a/packages/vue-vuetify/README.md b/packages/vue-vuetify/README.md
index 3fd325204..0a714a053 100644
--- a/packages/vue-vuetify/README.md
+++ b/packages/vue-vuetify/README.md
@@ -36,10 +36,9 @@ Use the `json-forms` component for each form you want to render and hand over th
 ```vue
 <script>
 import { JsonForms } from '@jsonforms/vue';
+import { extendedVuetifyRenderers } from '@jsonforms/vue-vuetify';
 import { markRaw } from 'vue';
 
-const { extendedVuetifyRenderers } = await import('@jsonforms/vue-vuetify');
-
 const renderers = markRaw([
   ...extendedVuetifyRenderers,
   // here you can add custom renderers
diff --git a/packages/vue-vuetify/src/additional/LabelRenderer.entry.ts b/packages/vue-vuetify/src/additional/LabelRenderer.entry.ts
new file mode 100644
index 000000000..aa50aa71d
--- /dev/null
+++ b/packages/vue-vuetify/src/additional/LabelRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  rankWith,
+  uiTypeIs,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import labelRenderer from './LabelRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: labelRenderer,
+  tester: rankWith(1, uiTypeIs('Label')),
+};
diff --git a/packages/vue-vuetify/src/additional/LabelRenderer.vue b/packages/vue-vuetify/src/additional/LabelRenderer.vue
index d39c916ef..d29ad9019 100644
--- a/packages/vue-vuetify/src/additional/LabelRenderer.vue
+++ b/packages/vue-vuetify/src/additional/LabelRenderer.vue
@@ -9,12 +9,7 @@
 </template>
 
 <script lang="ts">
-import {
-  rankWith,
-  uiTypeIs,
-  type JsonFormsRendererRegistryEntry,
-  type LabelElement,
-} from '@jsonforms/core';
+import { type LabelElement } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsLabel,
@@ -38,9 +33,4 @@ const labelRenderer = defineComponent({
 });
 
 export default labelRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: labelRenderer,
-  tester: rankWith(1, uiTypeIs('Label')),
-};
 </script>
diff --git a/packages/vue-vuetify/src/additional/ListWithDetailRenderer.entry.ts b/packages/vue-vuetify/src/additional/ListWithDetailRenderer.entry.ts
new file mode 100644
index 000000000..8d2fb6111
--- /dev/null
+++ b/packages/vue-vuetify/src/additional/ListWithDetailRenderer.entry.ts
@@ -0,0 +1,13 @@
+import {
+  and,
+  isObjectArray,
+  rankWith,
+  uiTypeIs,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import controlRenderer from './ListWithDetailRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(4, and(uiTypeIs('ListWithDetail'), isObjectArray)),
+};
diff --git a/packages/vue-vuetify/src/additional/ListWithDetailRenderer.vue b/packages/vue-vuetify/src/additional/ListWithDetailRenderer.vue
index 4fb649661..7d77ae9ee 100644
--- a/packages/vue-vuetify/src/additional/ListWithDetailRenderer.vue
+++ b/packages/vue-vuetify/src/additional/ListWithDetailRenderer.vue
@@ -318,11 +318,6 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(4, and(uiTypeIs('ListWithDetail'), isObjectArray)),
-};
 </script>
 
 <style scoped>
diff --git a/packages/vue-vuetify/src/additional/index.ts b/packages/vue-vuetify/src/additional/index.ts
index 2372fc30f..3e8ec07fa 100644
--- a/packages/vue-vuetify/src/additional/index.ts
+++ b/packages/vue-vuetify/src/additional/index.ts
@@ -1,8 +1,8 @@
 export { default as LabelRenderer } from './LabelRenderer.vue';
 export { default as ListWithDetailRenderer } from './ListWithDetailRenderer.vue';
 
-import { entry as labelRendererEntry } from './LabelRenderer.vue';
-import { entry as listWithDetailRendererEntry } from './ListWithDetailRenderer.vue';
+import { entry as labelRendererEntry } from './LabelRenderer.entry';
+import { entry as listWithDetailRendererEntry } from './ListWithDetailRenderer.entry';
 
 export const additionalRenderers = [
   labelRendererEntry,
diff --git a/packages/vue-vuetify/src/complex/AllOfRenderer.entry.ts b/packages/vue-vuetify/src/complex/AllOfRenderer.entry.ts
new file mode 100644
index 000000000..d388c5568
--- /dev/null
+++ b/packages/vue-vuetify/src/complex/AllOfRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  isAllOfControl,
+  rankWith,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import controlRenderer from './AllOfRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(3, isAllOfControl),
+};
diff --git a/packages/vue-vuetify/src/complex/AllOfRenderer.vue b/packages/vue-vuetify/src/complex/AllOfRenderer.vue
index 396ba0a52..3105de6d2 100644
--- a/packages/vue-vuetify/src/complex/AllOfRenderer.vue
+++ b/packages/vue-vuetify/src/complex/AllOfRenderer.vue
@@ -36,11 +36,8 @@
 import {
   createCombinatorRenderInfos,
   findMatchingUISchema,
-  isAllOfControl,
-  rankWith,
   type CombinatorSubSchemaRenderInfo,
   type ControlElement,
-  type JsonFormsRendererRegistryEntry,
   type UISchemaElement,
 } from '@jsonforms/core';
 import {
@@ -90,9 +87,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(3, isAllOfControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/complex/AnyOfRenderer.entry.ts b/packages/vue-vuetify/src/complex/AnyOfRenderer.entry.ts
new file mode 100644
index 000000000..423684a39
--- /dev/null
+++ b/packages/vue-vuetify/src/complex/AnyOfRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  isAnyOfControl,
+  rankWith,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import controlRenderer from './AnyOfRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(3, isAnyOfControl),
+};
diff --git a/packages/vue-vuetify/src/complex/AnyOfRenderer.vue b/packages/vue-vuetify/src/complex/AnyOfRenderer.vue
index ee8e49f58..0b18414c0 100644
--- a/packages/vue-vuetify/src/complex/AnyOfRenderer.vue
+++ b/packages/vue-vuetify/src/complex/AnyOfRenderer.vue
@@ -39,9 +39,6 @@ import {
   type CombinatorSubSchemaRenderInfo,
   type ControlElement,
   createCombinatorRenderInfos,
-  isAnyOfControl,
-  type JsonFormsRendererRegistryEntry,
-  rankWith,
 } from '@jsonforms/core';
 import {
   DispatchRenderer,
@@ -94,9 +91,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(3, isAnyOfControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/complex/ArrayControlRenderer.entry.ts b/packages/vue-vuetify/src/complex/ArrayControlRenderer.entry.ts
new file mode 100644
index 000000000..42d6ac822
--- /dev/null
+++ b/packages/vue-vuetify/src/complex/ArrayControlRenderer.entry.ts
@@ -0,0 +1,13 @@
+import {
+  isObjectArrayControl,
+  isPrimitiveArrayControl,
+  or,
+  rankWith,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import controlRenderer from './ArrayControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(3, or(isObjectArrayControl, isPrimitiveArrayControl)),
+};
diff --git a/packages/vue-vuetify/src/complex/ArrayControlRenderer.vue b/packages/vue-vuetify/src/complex/ArrayControlRenderer.vue
index be3e94070..f6ea8ccd8 100644
--- a/packages/vue-vuetify/src/complex/ArrayControlRenderer.vue
+++ b/packages/vue-vuetify/src/complex/ArrayControlRenderer.vue
@@ -181,12 +181,7 @@ import {
   Resolve,
   composePaths,
   createDefaultValue,
-  isObjectArrayControl,
-  isPrimitiveArrayControl,
-  or,
-  rankWith,
   type ControlElement,
-  type JsonFormsRendererRegistryEntry,
   type JsonSchema,
 } from '@jsonforms/core';
 import {
@@ -303,11 +298,6 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(3, or(isObjectArrayControl, isPrimitiveArrayControl)),
-};
 </script>
 
 <style scoped>
diff --git a/packages/vue-vuetify/src/complex/EnumArrayRenderer.entry.ts b/packages/vue-vuetify/src/complex/EnumArrayRenderer.entry.ts
new file mode 100644
index 000000000..721b04017
--- /dev/null
+++ b/packages/vue-vuetify/src/complex/EnumArrayRenderer.entry.ts
@@ -0,0 +1,42 @@
+import {
+  and,
+  hasType,
+  rankWith,
+  schemaMatches,
+  schemaSubPathMatches,
+  uiTypeIs,
+  type JsonFormsRendererRegistryEntry,
+  type JsonSchema,
+} from '@jsonforms/core';
+import controlRenderer from './EnumArrayRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(
+    5,
+    and(
+      uiTypeIs('Control'),
+      and(
+        schemaMatches(
+          (schema) =>
+            hasType(schema, 'array') &&
+            !Array.isArray(schema.items) &&
+            schema.uniqueItems === true,
+        ),
+        schemaSubPathMatches('items', (schema) => {
+          return hasOneOfItems(schema) || hasEnumItems(schema);
+        }),
+      ),
+    ),
+  ),
+};
+
+const hasOneOfItems = (schema: JsonSchema): boolean =>
+  schema.oneOf !== undefined &&
+  schema.oneOf.length > 0 &&
+  (schema.oneOf as JsonSchema[]).every((entry: JsonSchema) => {
+    return entry.const !== undefined;
+  });
+
+const hasEnumItems = (schema: JsonSchema): boolean =>
+  schema.type === 'string' && schema.enum !== undefined;
diff --git a/packages/vue-vuetify/src/complex/EnumArrayRenderer.vue b/packages/vue-vuetify/src/complex/EnumArrayRenderer.vue
index 8d2643899..4faf9142a 100644
--- a/packages/vue-vuetify/src/complex/EnumArrayRenderer.vue
+++ b/packages/vue-vuetify/src/complex/EnumArrayRenderer.vue
@@ -19,18 +19,7 @@
 </template>
 
 <script lang="ts">
-import {
-  and,
-  type ControlElement,
-  hasType,
-  type JsonFormsRendererRegistryEntry,
-  type JsonSchema,
-  rankWith,
-  schemaMatches,
-  schemaSubPathMatches,
-  uiTypeIs,
-  composePaths,
-} from '@jsonforms/core';
+import { type ControlElement, composePaths } from '@jsonforms/core';
 import { VCheckbox, VContainer, VRow, VCol } from 'vuetify/components';
 import {
   rendererProps,
@@ -71,35 +60,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-const hasOneOfItems = (schema: JsonSchema): boolean =>
-  schema.oneOf !== undefined &&
-  schema.oneOf.length > 0 &&
-  (schema.oneOf as JsonSchema[]).every((entry: JsonSchema) => {
-    return entry.const !== undefined;
-  });
-
-const hasEnumItems = (schema: JsonSchema): boolean =>
-  schema.type === 'string' && schema.enum !== undefined;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(
-    5,
-    and(
-      uiTypeIs('Control'),
-      and(
-        schemaMatches(
-          (schema) =>
-            hasType(schema, 'array') &&
-            !Array.isArray(schema.items) &&
-            schema.uniqueItems === true,
-        ),
-        schemaSubPathMatches('items', (schema) => {
-          return hasOneOfItems(schema) || hasEnumItems(schema);
-        }),
-      ),
-    ),
-  ),
-};
 </script>
diff --git a/packages/vue-vuetify/src/complex/ObjectRenderer.entry.ts b/packages/vue-vuetify/src/complex/ObjectRenderer.entry.ts
new file mode 100644
index 000000000..0852ea8ef
--- /dev/null
+++ b/packages/vue-vuetify/src/complex/ObjectRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  isObjectControl,
+  rankWith,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import controlRenderer from './ObjectRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(2, isObjectControl),
+};
diff --git a/packages/vue-vuetify/src/complex/ObjectRenderer.vue b/packages/vue-vuetify/src/complex/ObjectRenderer.vue
index b693b9a6f..cd191974b 100644
--- a/packages/vue-vuetify/src/complex/ObjectRenderer.vue
+++ b/packages/vue-vuetify/src/complex/ObjectRenderer.vue
@@ -111,9 +111,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(2, isObjectControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/complex/OneOfRenderer.entry.ts b/packages/vue-vuetify/src/complex/OneOfRenderer.entry.ts
new file mode 100644
index 000000000..5b2e8c1b9
--- /dev/null
+++ b/packages/vue-vuetify/src/complex/OneOfRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  isOneOfControl,
+  rankWith,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import controlRenderer from './OneOfRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(3, isOneOfControl),
+};
diff --git a/packages/vue-vuetify/src/complex/OneOfRenderer.vue b/packages/vue-vuetify/src/complex/OneOfRenderer.vue
index f5a72835e..4a15e36a7 100644
--- a/packages/vue-vuetify/src/complex/OneOfRenderer.vue
+++ b/packages/vue-vuetify/src/complex/OneOfRenderer.vue
@@ -80,9 +80,6 @@ import {
   type ControlElement,
   createCombinatorRenderInfos,
   createDefaultValue,
-  isOneOfControl,
-  type JsonFormsRendererRegistryEntry,
-  rankWith,
 } from '@jsonforms/core';
 import {
   DispatchRenderer,
@@ -213,9 +210,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(3, isOneOfControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/complex/OneOfTabRenderer.entry.ts b/packages/vue-vuetify/src/complex/OneOfTabRenderer.entry.ts
new file mode 100644
index 000000000..3b7f93497
--- /dev/null
+++ b/packages/vue-vuetify/src/complex/OneOfTabRenderer.entry.ts
@@ -0,0 +1,13 @@
+import {
+  and,
+  isOneOfControl,
+  optionIs,
+  rankWith,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import controlRenderer from './OneOfTabRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(4, and(isOneOfControl, optionIs('variant', 'tab'))),
+};
diff --git a/packages/vue-vuetify/src/complex/OneOfTabRenderer.vue b/packages/vue-vuetify/src/complex/OneOfTabRenderer.vue
index f509de8af..4b41ca9c4 100644
--- a/packages/vue-vuetify/src/complex/OneOfTabRenderer.vue
+++ b/packages/vue-vuetify/src/complex/OneOfTabRenderer.vue
@@ -59,15 +59,10 @@
 
 <script lang="ts">
 import {
-  and,
   type CombinatorSubSchemaRenderInfo,
   type ControlElement,
   createCombinatorRenderInfos,
   createDefaultValue,
-  isOneOfControl,
-  type JsonFormsRendererRegistryEntry,
-  optionIs,
-  rankWith,
 } from '@jsonforms/core';
 import {
   DispatchRenderer,
@@ -187,9 +182,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(4, and(isOneOfControl, optionIs('variant', 'tab'))),
-};
 </script>
diff --git a/packages/vue-vuetify/src/complex/index.ts b/packages/vue-vuetify/src/complex/index.ts
index 588456fb4..335567cd5 100644
--- a/packages/vue-vuetify/src/complex/index.ts
+++ b/packages/vue-vuetify/src/complex/index.ts
@@ -6,13 +6,13 @@ export { default as ObjectRenderer } from './ObjectRenderer.vue';
 export { default as OneOfRenderer } from './OneOfRenderer.vue';
 export { default as OneOfTabRenderer } from './OneOfTabRenderer.vue';
 
-import { entry as allOfRendererEntry } from './AllOfRenderer.vue';
-import { entry as anyOfRendererEntry } from './AnyOfRenderer.vue';
-import { entry as arrayControlRendererEntry } from './ArrayControlRenderer.vue';
-import { entry as enumArrayRendererEntry } from './EnumArrayRenderer.vue';
-import { entry as objectRendererEntry } from './ObjectRenderer.vue';
-import { entry as oneOfRendererEntry } from './OneOfRenderer.vue';
-import { entry as oneOfTabRendererEntry } from './OneOfTabRenderer.vue';
+import { entry as allOfRendererEntry } from './AllOfRenderer.entry';
+import { entry as anyOfRendererEntry } from './AnyOfRenderer.entry';
+import { entry as arrayControlRendererEntry } from './ArrayControlRenderer.entry';
+import { entry as enumArrayRendererEntry } from './EnumArrayRenderer.entry';
+import { entry as objectRendererEntry } from './ObjectRenderer.entry';
+import { entry as oneOfRendererEntry } from './OneOfRenderer.entry';
+import { entry as oneOfTabRendererEntry } from './OneOfTabRenderer.entry';
 
 export const complexRenderers = [
   allOfRendererEntry,
diff --git a/packages/vue-vuetify/src/controls/AnyOfStringOrEnumControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/AnyOfStringOrEnumControlRenderer.entry.ts
new file mode 100644
index 000000000..a5c15d3e0
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/AnyOfStringOrEnumControlRenderer.entry.ts
@@ -0,0 +1,40 @@
+import {
+  and,
+  rankWith,
+  schemaMatches,
+  uiTypeIs,
+  type JsonFormsRendererRegistryEntry,
+  type JsonSchema,
+} from '@jsonforms/core';
+import controlRenderer from './AnyOfStringOrEnumControlRenderer.vue';
+
+const findEnumSchema = (schemas: JsonSchema[]) =>
+  schemas.find(
+    (s) =>
+      s.enum !== undefined && (s.type === 'string' || s.type === undefined),
+  );
+const findTextSchema = (schemas: JsonSchema[]) =>
+  schemas.find((s) => s.type === 'string' && s.enum === undefined);
+
+const hasEnumAndText = (schemas: JsonSchema[]): boolean => {
+  // idea: map to type,enum and check that all types are string and at least one item is of type enum,
+  const enumSchema = findEnumSchema(schemas);
+  const stringSchema = findTextSchema(schemas);
+  const remainingSchemas = schemas.filter(
+    (s) => s !== enumSchema || s !== stringSchema,
+  );
+  const wrongType = remainingSchemas.find((s) => s.type && s.type !== 'string');
+  return !!enumSchema && !!stringSchema && !wrongType;
+};
+
+const simpleAnyOf = and(
+  uiTypeIs('Control'),
+  schemaMatches(
+    (schema) => Array.isArray(schema.anyOf) && hasEnumAndText(schema.anyOf),
+  ),
+);
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(5, simpleAnyOf),
+};
diff --git a/packages/vue-vuetify/src/controls/AnyOfStringOrEnumControlRenderer.vue b/packages/vue-vuetify/src/controls/AnyOfStringOrEnumControlRenderer.vue
index ef9121d40..772d6e73f 100644
--- a/packages/vue-vuetify/src/controls/AnyOfStringOrEnumControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/AnyOfStringOrEnumControlRenderer.vue
@@ -37,15 +37,7 @@
 </template>
 
 <script lang="ts">
-import {
-  and,
-  rankWith,
-  schemaMatches,
-  uiTypeIs,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-  type JsonSchema,
-} from '@jsonforms/core';
+import { type ControlElement, type JsonSchema } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsControl,
@@ -91,28 +83,4 @@ const findEnumSchema = (schemas: JsonSchema[]) =>
     (s) =>
       s.enum !== undefined && (s.type === 'string' || s.type === undefined),
   );
-const findTextSchema = (schemas: JsonSchema[]) =>
-  schemas.find((s) => s.type === 'string' && s.enum === undefined);
-
-const hasEnumAndText = (schemas: JsonSchema[]): boolean => {
-  // idea: map to type,enum and check that all types are string and at least one item is of type enum,
-  const enumSchema = findEnumSchema(schemas);
-  const stringSchema = findTextSchema(schemas);
-  const remainingSchemas = schemas.filter(
-    (s) => s !== enumSchema || s !== stringSchema,
-  );
-  const wrongType = remainingSchemas.find((s) => s.type && s.type !== 'string');
-  return !!enumSchema && !!stringSchema && !wrongType;
-};
-const simpleAnyOf = and(
-  uiTypeIs('Control'),
-  schemaMatches(
-    (schema) => Array.isArray(schema.anyOf) && hasEnumAndText(schema.anyOf),
-  ),
-);
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(5, simpleAnyOf),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/BooleanControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/BooleanControlRenderer.entry.ts
new file mode 100644
index 000000000..3eabe34aa
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/BooleanControlRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  isBooleanControl,
+} from '@jsonforms/core';
+import controlRenderer from './BooleanControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(1, isBooleanControl),
+};
diff --git a/packages/vue-vuetify/src/controls/BooleanControlRenderer.vue b/packages/vue-vuetify/src/controls/BooleanControlRenderer.vue
index 37d75f058..8dafe3874 100644
--- a/packages/vue-vuetify/src/controls/BooleanControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/BooleanControlRenderer.vue
@@ -27,12 +27,7 @@
 </template>
 
 <script lang="ts">
-import {
-  isBooleanControl,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsControl,
@@ -58,9 +53,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(1, isBooleanControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/BooleanToggleControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/BooleanToggleControlRenderer.entry.ts
new file mode 100644
index 000000000..b9937ef32
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/BooleanToggleControlRenderer.entry.ts
@@ -0,0 +1,13 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  and,
+  isBooleanControl,
+  optionIs,
+} from '@jsonforms/core';
+import controlRenderer from './BooleanToggleControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(3, and(isBooleanControl, optionIs('toggle', true))),
+};
diff --git a/packages/vue-vuetify/src/controls/BooleanToggleControlRenderer.vue b/packages/vue-vuetify/src/controls/BooleanToggleControlRenderer.vue
index 8a5b560ba..307f36b8e 100644
--- a/packages/vue-vuetify/src/controls/BooleanToggleControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/BooleanToggleControlRenderer.vue
@@ -30,14 +30,7 @@
 </template>
 
 <script lang="ts">
-import {
-  and,
-  isBooleanControl,
-  optionIs,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsControl,
@@ -63,9 +56,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(3, and(isBooleanControl, optionIs('toggle', true))),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/DateControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/DateControlRenderer.entry.ts
new file mode 100644
index 000000000..3783bb16a
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/DateControlRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  isDateControl,
+} from '@jsonforms/core';
+import controlRenderer from './DateControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(2, isDateControl),
+};
diff --git a/packages/vue-vuetify/src/controls/DateControlRenderer.vue b/packages/vue-vuetify/src/controls/DateControlRenderer.vue
index 0eae0c770..188324cc1 100644
--- a/packages/vue-vuetify/src/controls/DateControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/DateControlRenderer.vue
@@ -77,13 +77,7 @@
 </template>
 
 <script lang="ts">
-import {
-  isDateControl,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-  type JsonSchema,
-} from '@jsonforms/core';
+import { type ControlElement, type JsonSchema } from '@jsonforms/core';
 import { computed, defineComponent, ref, unref } from 'vue';
 
 import {
@@ -149,9 +143,9 @@ const controlRenderer = defineComponent({
     const dateFormat = computed<string>(
       () =>
         typeof control.appliedOptions.value.dateFormat == 'string'
-          ? expandLocaleFormat(control.appliedOptions.value.dateFormat) ??
-            control.appliedOptions.value.dateFormat
-          : expandLocaleFormat('L') ?? 'YYYY-MM-DD', // by default try to use localized default if unavailable then YYYY-MM-DD
+          ? (expandLocaleFormat(control.appliedOptions.value.dateFormat) ??
+            control.appliedOptions.value.dateFormat)
+          : (expandLocaleFormat('L') ?? 'YYYY-MM-DD'), // by default try to use localized default if unavailable then YYYY-MM-DD
     );
 
     const useMask = control.appliedOptions.value.mask !== false;
@@ -323,9 +317,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(2, isDateControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/DateTimeControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/DateTimeControlRenderer.entry.ts
new file mode 100644
index 000000000..6e5a94173
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/DateTimeControlRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  isDateTimeControl,
+} from '@jsonforms/core';
+import controlRenderer from './DateTimeControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(2, isDateTimeControl),
+};
diff --git a/packages/vue-vuetify/src/controls/DateTimeControlRenderer.vue b/packages/vue-vuetify/src/controls/DateTimeControlRenderer.vue
index fd095e8b5..abfbd3648 100644
--- a/packages/vue-vuetify/src/controls/DateTimeControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/DateTimeControlRenderer.vue
@@ -175,13 +175,7 @@
 </template>
 
 <script lang="ts">
-import {
-  isDateTimeControl,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-  type JsonSchema,
-} from '@jsonforms/core';
+import { type ControlElement, type JsonSchema } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsControl,
@@ -276,9 +270,9 @@ const controlRenderer = defineComponent({
 
     const dateTimeFormat = computed<string>(() =>
       typeof control.appliedOptions.value.dateTimeFormat == 'string'
-        ? expandLocaleFormat(control.appliedOptions.value.dateTimeFormat) ??
-          control.appliedOptions.value.dateTimeFormat
-        : expandLocaleFormat('L LT') ?? 'YYYY-MM-DD H:mm',
+        ? (expandLocaleFormat(control.appliedOptions.value.dateTimeFormat) ??
+          control.appliedOptions.value.dateTimeFormat)
+        : (expandLocaleFormat('L LT') ?? 'YYYY-MM-DD H:mm'),
     );
 
     const useMask = control.appliedOptions.value.mask !== false;
@@ -592,11 +586,6 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(2, isDateTimeControl),
-};
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/vue-vuetify/src/controls/EnumControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/EnumControlRenderer.entry.ts
new file mode 100644
index 000000000..e8a4f3a1d
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/EnumControlRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  isEnumControl,
+} from '@jsonforms/core';
+import controlRenderer from './EnumControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(2, isEnumControl),
+};
diff --git a/packages/vue-vuetify/src/controls/EnumControlRenderer.vue b/packages/vue-vuetify/src/controls/EnumControlRenderer.vue
index 1bc174c46..7a22784aa 100644
--- a/packages/vue-vuetify/src/controls/EnumControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/EnumControlRenderer.vue
@@ -31,12 +31,7 @@
 </template>
 
 <script lang="ts">
-import {
-  isEnumControl,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsEnumControl,
@@ -68,9 +63,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(2, isEnumControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/IntegerControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/IntegerControlRenderer.entry.ts
new file mode 100644
index 000000000..e9c235335
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/IntegerControlRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  isIntegerControl,
+} from '@jsonforms/core';
+import controlRenderer from './IntegerControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(1, isIntegerControl),
+};
diff --git a/packages/vue-vuetify/src/controls/IntegerControlRenderer.vue b/packages/vue-vuetify/src/controls/IntegerControlRenderer.vue
index dec58b92d..fce822266 100644
--- a/packages/vue-vuetify/src/controls/IntegerControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/IntegerControlRenderer.vue
@@ -29,12 +29,7 @@
 </template>
 
 <script lang="ts">
-import {
-  isIntegerControl,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsControl,
@@ -118,9 +113,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(1, isIntegerControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/MultiStringControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/MultiStringControlRenderer.entry.ts
new file mode 100644
index 000000000..e932518a8
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/MultiStringControlRenderer.entry.ts
@@ -0,0 +1,13 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  and,
+  isStringControl,
+  isMultiLineControl,
+} from '@jsonforms/core';
+import controlRenderer from './MultiStringControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(2, and(isStringControl, isMultiLineControl)),
+};
diff --git a/packages/vue-vuetify/src/controls/MultiStringControlRenderer.vue b/packages/vue-vuetify/src/controls/MultiStringControlRenderer.vue
index d45c87a26..185766099 100644
--- a/packages/vue-vuetify/src/controls/MultiStringControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/MultiStringControlRenderer.vue
@@ -37,14 +37,7 @@
 </template>
 
 <script lang="ts">
-import {
-  and,
-  isMultiLineControl,
-  isStringControl,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsControl,
@@ -78,9 +71,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(2, and(isStringControl, isMultiLineControl)),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/NumberControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/NumberControlRenderer.entry.ts
new file mode 100644
index 000000000..dde8beb84
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/NumberControlRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  isNumberControl,
+} from '@jsonforms/core';
+import controlRenderer from './NumberControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(1, isNumberControl),
+};
diff --git a/packages/vue-vuetify/src/controls/NumberControlRenderer.vue b/packages/vue-vuetify/src/controls/NumberControlRenderer.vue
index 66aa2189d..524008ba1 100644
--- a/packages/vue-vuetify/src/controls/NumberControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/NumberControlRenderer.vue
@@ -29,12 +29,7 @@
 </template>
 
 <script lang="ts">
-import {
-  isNumberControl,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsControl,
@@ -129,9 +124,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(1, isNumberControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/OneOfEnumControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/OneOfEnumControlRenderer.entry.ts
new file mode 100644
index 000000000..3044059b0
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/OneOfEnumControlRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  isOneOfEnumControl,
+} from '@jsonforms/core';
+import controlRenderer from './OneOfEnumControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(5, isOneOfEnumControl),
+};
diff --git a/packages/vue-vuetify/src/controls/OneOfEnumControlRenderer.vue b/packages/vue-vuetify/src/controls/OneOfEnumControlRenderer.vue
index 7675e05b2..c5c48035b 100644
--- a/packages/vue-vuetify/src/controls/OneOfEnumControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/OneOfEnumControlRenderer.vue
@@ -31,12 +31,7 @@
 </template>
 
 <script lang="ts">
-import {
-  isOneOfEnumControl,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsOneOfEnumControl,
@@ -68,9 +63,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(5, isOneOfEnumControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/OneOfRadioGroupControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/OneOfRadioGroupControlRenderer.entry.ts
new file mode 100644
index 000000000..9a72956bc
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/OneOfRadioGroupControlRenderer.entry.ts
@@ -0,0 +1,13 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  and,
+  isOneOfEnumControl,
+  optionIs,
+} from '@jsonforms/core';
+import controlRenderer from './OneOfRadioGroupControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(20, and(isOneOfEnumControl, optionIs('format', 'radio'))),
+};
diff --git a/packages/vue-vuetify/src/controls/OneOfRadioGroupControlRenderer.vue b/packages/vue-vuetify/src/controls/OneOfRadioGroupControlRenderer.vue
index 5fa6ddd5d..0f91f2a83 100644
--- a/packages/vue-vuetify/src/controls/OneOfRadioGroupControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/OneOfRadioGroupControlRenderer.vue
@@ -36,14 +36,7 @@
 </template>
 
 <script lang="ts">
-import {
-  and,
-  isOneOfEnumControl,
-  optionIs,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsOneOfEnumControl,
@@ -71,9 +64,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(20, and(isOneOfEnumControl, optionIs('format', 'radio'))),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/PasswordControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/PasswordControlRenderer.entry.ts
new file mode 100644
index 000000000..550131849
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/PasswordControlRenderer.entry.ts
@@ -0,0 +1,13 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  and,
+  isStringControl,
+  formatIs,
+} from '@jsonforms/core';
+import controlRenderer from './PasswordControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(2, and(isStringControl, formatIs('password'))),
+};
diff --git a/packages/vue-vuetify/src/controls/PasswordControlRenderer.vue b/packages/vue-vuetify/src/controls/PasswordControlRenderer.vue
index c582a90be..3069d51e3 100644
--- a/packages/vue-vuetify/src/controls/PasswordControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/PasswordControlRenderer.vue
@@ -41,14 +41,7 @@
 </template>
 
 <script lang="ts">
-import {
-  and,
-  formatIs,
-  isStringControl,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsControl,
@@ -85,9 +78,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(2, and(isStringControl, formatIs('password'))),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/RadioGroupControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/RadioGroupControlRenderer.entry.ts
new file mode 100644
index 000000000..c29a1e381
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/RadioGroupControlRenderer.entry.ts
@@ -0,0 +1,13 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  and,
+  isEnumControl,
+  optionIs,
+} from '@jsonforms/core';
+import controlRenderer from './RadioGroupControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(20, and(isEnumControl, optionIs('format', 'radio'))),
+};
diff --git a/packages/vue-vuetify/src/controls/RadioGroupControlRenderer.vue b/packages/vue-vuetify/src/controls/RadioGroupControlRenderer.vue
index bb4e386c2..85147661c 100644
--- a/packages/vue-vuetify/src/controls/RadioGroupControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/RadioGroupControlRenderer.vue
@@ -36,14 +36,7 @@
 </template>
 
 <script lang="ts">
-import {
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-  rankWith,
-  isEnumControl,
-  optionIs,
-  and,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import { defineComponent } from 'vue';
 import {
   rendererProps,
@@ -71,9 +64,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(20, and(isEnumControl, optionIs('format', 'radio'))),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/SliderControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/SliderControlRenderer.entry.ts
new file mode 100644
index 000000000..7b03d03e7
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/SliderControlRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  isRangeControl,
+} from '@jsonforms/core';
+import controlRenderer from './SliderControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(4, isRangeControl),
+};
diff --git a/packages/vue-vuetify/src/controls/SliderControlRenderer.vue b/packages/vue-vuetify/src/controls/SliderControlRenderer.vue
index 4835c849d..0d641cf37 100644
--- a/packages/vue-vuetify/src/controls/SliderControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/SliderControlRenderer.vue
@@ -30,12 +30,7 @@
 </template>
 
 <script lang="ts">
-import {
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-  rankWith,
-  isRangeControl,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import { defineComponent } from 'vue';
 import {
   rendererProps,
@@ -63,9 +58,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(4, isRangeControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/StringControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/StringControlRenderer.entry.ts
new file mode 100644
index 000000000..2c22b0861
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/StringControlRenderer.entry.ts
@@ -0,0 +1,10 @@
+import {
+  isStringControl,
+  rankWith,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import controlRenderer from './StringControlRenderer.vue';
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(1, isStringControl),
+};
diff --git a/packages/vue-vuetify/src/controls/StringControlRenderer.vue b/packages/vue-vuetify/src/controls/StringControlRenderer.vue
index df4ed7fc2..90ebe5f1b 100644
--- a/packages/vue-vuetify/src/controls/StringControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/StringControlRenderer.vue
@@ -67,12 +67,7 @@
 </template>
 
 <script lang="ts">
-import {
-  isStringControl,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsControl,
@@ -125,9 +120,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(1, isStringControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/StringMaskControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/StringMaskControlRenderer.entry.ts
new file mode 100644
index 000000000..afb090f52
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/StringMaskControlRenderer.entry.ts
@@ -0,0 +1,13 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  and,
+  isStringControl,
+  hasOption,
+} from '@jsonforms/core';
+import controlRenderer from './StringMaskControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(2, and(isStringControl, hasOption('mask'))),
+};
diff --git a/packages/vue-vuetify/src/controls/StringMaskControlRenderer.vue b/packages/vue-vuetify/src/controls/StringMaskControlRenderer.vue
index 674ec6338..471fe00a9 100644
--- a/packages/vue-vuetify/src/controls/StringMaskControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/StringMaskControlRenderer.vue
@@ -38,11 +38,7 @@
 
 <script lang="ts">
 import {
-  and,
   type ControlElement,
-  isStringControl,
-  type JsonFormsRendererRegistryEntry,
-  rankWith,
   type Tester,
   type UISchemaElement,
 } from '@jsonforms/core';
@@ -206,9 +202,4 @@ const hasOption =
       false
     );
   };
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(2, and(isStringControl, hasOption('mask'))),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/TimeControlRenderer.entry.ts b/packages/vue-vuetify/src/controls/TimeControlRenderer.entry.ts
new file mode 100644
index 000000000..5dde013e1
--- /dev/null
+++ b/packages/vue-vuetify/src/controls/TimeControlRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  isTimeControl,
+} from '@jsonforms/core';
+import controlRenderer from './TimeControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(2, isTimeControl),
+};
diff --git a/packages/vue-vuetify/src/controls/TimeControlRenderer.vue b/packages/vue-vuetify/src/controls/TimeControlRenderer.vue
index 5d5646bbc..b0be761d6 100644
--- a/packages/vue-vuetify/src/controls/TimeControlRenderer.vue
+++ b/packages/vue-vuetify/src/controls/TimeControlRenderer.vue
@@ -80,13 +80,7 @@
 </template>
 
 <script lang="ts">
-import {
-  isTimeControl,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-  type JsonSchema,
-} from '@jsonforms/core';
+import { type ControlElement, type JsonSchema } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsControl,
@@ -164,9 +158,9 @@ const controlRenderer = defineComponent({
     const timeFormat = computed(
       () =>
         typeof control.appliedOptions.value.timeFormat == 'string'
-          ? expandLocaleFormat(control.appliedOptions.value.timeFormat) ??
-            control.appliedOptions.value.timeFormat
-          : expandLocaleFormat('LT') ?? 'H:mm', // by default try to use localized default if unavailable then H:mm,
+          ? (expandLocaleFormat(control.appliedOptions.value.timeFormat) ??
+            control.appliedOptions.value.timeFormat)
+          : (expandLocaleFormat('LT') ?? 'H:mm'), // by default try to use localized default if unavailable then H:mm,
     );
 
     const useMask = control.appliedOptions.value.mask !== false;
@@ -374,9 +368,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(2, isTimeControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/controls/index.ts b/packages/vue-vuetify/src/controls/index.ts
index 2ef1550c0..4f8c76817 100644
--- a/packages/vue-vuetify/src/controls/index.ts
+++ b/packages/vue-vuetify/src/controls/index.ts
@@ -20,23 +20,23 @@ export { default as StringControlRenderer } from './StringControlRenderer.vue';
 export { default as StringMaskControlRenderer } from './StringMaskControlRenderer.vue';
 export { default as TimeControlRenderer } from './TimeControlRenderer.vue';
 
-import { entry as anyOfStringOrEnumControlRendererEntry } from './AnyOfStringOrEnumControlRenderer.vue';
-import { entry as booleanControlRendererEntry } from './BooleanControlRenderer.vue';
-import { entry as booleanToggleControlRendererEntry } from './BooleanToggleControlRenderer.vue';
-import { entry as dateControlRendererEntry } from './DateControlRenderer.vue';
-import { entry as dateTimeControlRendererEntry } from './DateTimeControlRenderer.vue';
-import { entry as enumControlRendererEntry } from './EnumControlRenderer.vue';
-import { entry as integerControlRendererEntry } from './IntegerControlRenderer.vue';
-import { entry as multiStringControlRendererEntry } from './MultiStringControlRenderer.vue';
-import { entry as numberControlRendererEntry } from './NumberControlRenderer.vue';
-import { entry as oneOfEnumControlRendererEntry } from './OneOfEnumControlRenderer.vue';
-import { entry as oneOfRadioGroupControlRendererEntry } from './OneOfRadioGroupControlRenderer.vue';
-import { entry as passwordControlRendererEntry } from './PasswordControlRenderer.vue';
-import { entry as radioGroupControlRendererEntry } from './RadioGroupControlRenderer.vue';
-import { entry as sliderControlRendererEntry } from './SliderControlRenderer.vue';
-import { entry as stringControlRendererEntry } from './StringControlRenderer.vue';
-import { entry as stringMaskControlRendererEntry } from './StringMaskControlRenderer.vue';
-import { entry as timeControlRendererEntry } from './TimeControlRenderer.vue';
+import { entry as anyOfStringOrEnumControlRendererEntry } from './AnyOfStringOrEnumControlRenderer.entry';
+import { entry as booleanControlRendererEntry } from './BooleanControlRenderer.entry';
+import { entry as booleanToggleControlRendererEntry } from './BooleanToggleControlRenderer.entry';
+import { entry as dateControlRendererEntry } from './DateControlRenderer.entry';
+import { entry as dateTimeControlRendererEntry } from './DateTimeControlRenderer.entry';
+import { entry as enumControlRendererEntry } from './EnumControlRenderer.entry';
+import { entry as integerControlRendererEntry } from './IntegerControlRenderer.entry';
+import { entry as multiStringControlRendererEntry } from './MultiStringControlRenderer.entry';
+import { entry as numberControlRendererEntry } from './NumberControlRenderer.entry';
+import { entry as oneOfEnumControlRendererEntry } from './OneOfEnumControlRenderer.entry';
+import { entry as oneOfRadioGroupControlRendererEntry } from './OneOfRadioGroupControlRenderer.entry';
+import { entry as passwordControlRendererEntry } from './PasswordControlRenderer.entry';
+import { entry as radioGroupControlRendererEntry } from './RadioGroupControlRenderer.entry';
+import { entry as sliderControlRendererEntry } from './SliderControlRenderer.entry';
+import { entry as stringControlRendererEntry } from './StringControlRenderer.entry';
+import { entry as stringMaskControlRendererEntry } from './StringMaskControlRenderer.entry';
+import { entry as timeControlRendererEntry } from './TimeControlRenderer.entry';
 
 export const controlRenderers = [
   anyOfStringOrEnumControlRendererEntry,
diff --git a/packages/vue-vuetify/src/extended/AutocompleteEnumControlRenderer.entry.ts b/packages/vue-vuetify/src/extended/AutocompleteEnumControlRenderer.entry.ts
new file mode 100644
index 000000000..9bab08d9d
--- /dev/null
+++ b/packages/vue-vuetify/src/extended/AutocompleteEnumControlRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  isEnumControl,
+  rankWith,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import controlRenderer from './AutocompleteEnumControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(10, isEnumControl),
+};
diff --git a/packages/vue-vuetify/src/extended/AutocompleteEnumControlRenderer.vue b/packages/vue-vuetify/src/extended/AutocompleteEnumControlRenderer.vue
index 925e7b00c..565452923 100644
--- a/packages/vue-vuetify/src/extended/AutocompleteEnumControlRenderer.vue
+++ b/packages/vue-vuetify/src/extended/AutocompleteEnumControlRenderer.vue
@@ -55,12 +55,7 @@
 </template>
 
 <script lang="ts">
-import {
-  isEnumControl,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsEnumControl,
@@ -95,9 +90,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(10, isEnumControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/extended/AutocompleteOneOfEnumControlRenderer.entry.ts b/packages/vue-vuetify/src/extended/AutocompleteOneOfEnumControlRenderer.entry.ts
new file mode 100644
index 000000000..e6622f1b4
--- /dev/null
+++ b/packages/vue-vuetify/src/extended/AutocompleteOneOfEnumControlRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  isOneOfEnumControl,
+  rankWith,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import controlRenderer from './AutocompleteOneOfEnumControlRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(10, isOneOfEnumControl),
+};
diff --git a/packages/vue-vuetify/src/extended/AutocompleteOneOfEnumControlRenderer.vue b/packages/vue-vuetify/src/extended/AutocompleteOneOfEnumControlRenderer.vue
index 9356ce35e..e7eb31339 100644
--- a/packages/vue-vuetify/src/extended/AutocompleteOneOfEnumControlRenderer.vue
+++ b/packages/vue-vuetify/src/extended/AutocompleteOneOfEnumControlRenderer.vue
@@ -55,12 +55,7 @@
 </template>
 
 <script lang="ts">
-import {
-  isOneOfEnumControl,
-  rankWith,
-  type ControlElement,
-  type JsonFormsRendererRegistryEntry,
-} from '@jsonforms/core';
+import { type ControlElement } from '@jsonforms/core';
 import {
   rendererProps,
   useJsonFormsOneOfEnumControl,
@@ -95,9 +90,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(10, isOneOfEnumControl),
-};
 </script>
diff --git a/packages/vue-vuetify/src/extended/index.ts b/packages/vue-vuetify/src/extended/index.ts
index c019ce299..c1bbd859b 100644
--- a/packages/vue-vuetify/src/extended/index.ts
+++ b/packages/vue-vuetify/src/extended/index.ts
@@ -1,8 +1,8 @@
 export { default as AutocompleteEnumControlRenderer } from './AutocompleteEnumControlRenderer.vue';
 export { default as AutocompleteOneOfEnumControlRenderer } from './AutocompleteOneOfEnumControlRenderer.vue';
 
-import { entry as autocompleteEnumControlRendererEntry } from './AutocompleteEnumControlRenderer.vue';
-import { entry as autocompleteOneOfEnumControlRendererEntry } from './AutocompleteOneOfEnumControlRenderer.vue';
+import { entry as autocompleteEnumControlRendererEntry } from './AutocompleteEnumControlRenderer.entry';
+import { entry as autocompleteOneOfEnumControlRendererEntry } from './AutocompleteOneOfEnumControlRenderer.entry';
 
 export const extendedRenderers = [
   autocompleteEnumControlRendererEntry,
diff --git a/packages/vue-vuetify/src/layouts/ArrayLayoutRenderer.entry.ts b/packages/vue-vuetify/src/layouts/ArrayLayoutRenderer.entry.ts
new file mode 100644
index 000000000..6e7c4d01a
--- /dev/null
+++ b/packages/vue-vuetify/src/layouts/ArrayLayoutRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  isObjectArrayWithNesting,
+  rankWith,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import controlRenderer from './ArrayLayoutRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: controlRenderer,
+  tester: rankWith(4, isObjectArrayWithNesting),
+};
diff --git a/packages/vue-vuetify/src/layouts/ArrayLayoutRenderer.vue b/packages/vue-vuetify/src/layouts/ArrayLayoutRenderer.vue
index dfbc3148d..81884eb13 100644
--- a/packages/vue-vuetify/src/layouts/ArrayLayoutRenderer.vue
+++ b/packages/vue-vuetify/src/layouts/ArrayLayoutRenderer.vue
@@ -255,10 +255,7 @@ import {
   createDefaultValue,
   findUISchema,
   getControlPath,
-  isObjectArrayWithNesting,
-  rankWith,
   type ControlElement,
-  type JsonFormsRendererRegistryEntry,
   type JsonSchema,
   type UISchemaElement,
 } from '@jsonforms/core';
@@ -421,11 +418,6 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(4, isObjectArrayWithNesting),
-};
 </script>
 
 <style scoped>
diff --git a/packages/vue-vuetify/src/layouts/CategorizationRenderer.entry.ts b/packages/vue-vuetify/src/layouts/CategorizationRenderer.entry.ts
new file mode 100644
index 000000000..58a776195
--- /dev/null
+++ b/packages/vue-vuetify/src/layouts/CategorizationRenderer.entry.ts
@@ -0,0 +1,13 @@
+import {
+  and,
+  categorizationHasCategory,
+  isCategorization,
+  rankWith,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import layoutRenderer from './CategorizationRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: layoutRenderer,
+  tester: rankWith(2, and(isCategorization, categorizationHasCategory)),
+};
diff --git a/packages/vue-vuetify/src/layouts/CategorizationRenderer.vue b/packages/vue-vuetify/src/layouts/CategorizationRenderer.vue
index 17e964d92..66466835f 100644
--- a/packages/vue-vuetify/src/layouts/CategorizationRenderer.vue
+++ b/packages/vue-vuetify/src/layouts/CategorizationRenderer.vue
@@ -134,11 +134,6 @@ const layoutRenderer = defineComponent({
 });
 
 export default layoutRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: layoutRenderer,
-  tester: rankWith(2, and(isCategorization, categorizationHasCategory)),
-};
 </script>
 
 <style scoped>
diff --git a/packages/vue-vuetify/src/layouts/CategorizationStepperRenderer.entry.ts b/packages/vue-vuetify/src/layouts/CategorizationStepperRenderer.entry.ts
new file mode 100644
index 000000000..8181e1093
--- /dev/null
+++ b/packages/vue-vuetify/src/layouts/CategorizationStepperRenderer.entry.ts
@@ -0,0 +1,21 @@
+import {
+  and,
+  categorizationHasCategory,
+  isCategorization,
+  optionIs,
+  rankWith,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import layoutRenderer from './CategorizationStepperRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: layoutRenderer,
+  tester: rankWith(
+    3,
+    and(
+      isCategorization,
+      categorizationHasCategory,
+      optionIs('variant', 'stepper'),
+    ),
+  ),
+};
diff --git a/packages/vue-vuetify/src/layouts/CategorizationStepperRenderer.vue b/packages/vue-vuetify/src/layouts/CategorizationStepperRenderer.vue
index 4f1b1902d..972c13e0b 100644
--- a/packages/vue-vuetify/src/layouts/CategorizationStepperRenderer.vue
+++ b/packages/vue-vuetify/src/layouts/CategorizationStepperRenderer.vue
@@ -78,15 +78,7 @@
 </template>
 
 <script lang="ts">
-import {
-  and,
-  categorizationHasCategory,
-  isCategorization,
-  optionIs,
-  rankWith,
-  type JsonFormsRendererRegistryEntry,
-  type Layout,
-} from '@jsonforms/core';
+import { type Layout } from '@jsonforms/core';
 import {
   DispatchRenderer,
   rendererProps,
@@ -149,16 +141,4 @@ const layoutRenderer = defineComponent({
 });
 
 export default layoutRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: layoutRenderer,
-  tester: rankWith(
-    3,
-    and(
-      isCategorization,
-      categorizationHasCategory,
-      optionIs('variant', 'stepper'),
-    ),
-  ),
-};
 </script>
diff --git a/packages/vue-vuetify/src/layouts/GroupRenderer.entry.ts b/packages/vue-vuetify/src/layouts/GroupRenderer.entry.ts
new file mode 100644
index 000000000..0c7de5411
--- /dev/null
+++ b/packages/vue-vuetify/src/layouts/GroupRenderer.entry.ts
@@ -0,0 +1,13 @@
+import {
+  type JsonFormsRendererRegistryEntry,
+  rankWith,
+  and,
+  isLayout,
+  uiTypeIs,
+} from '@jsonforms/core';
+import layoutRenderer from './GroupRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: layoutRenderer,
+  tester: rankWith(2, and(isLayout, uiTypeIs('Group'))),
+};
diff --git a/packages/vue-vuetify/src/layouts/GroupRenderer.vue b/packages/vue-vuetify/src/layouts/GroupRenderer.vue
index b2ac7965d..cb7a8fe00 100644
--- a/packages/vue-vuetify/src/layouts/GroupRenderer.vue
+++ b/packages/vue-vuetify/src/layouts/GroupRenderer.vue
@@ -32,14 +32,7 @@
 </template>
 
 <script lang="ts">
-import {
-  and,
-  isLayout,
-  rankWith,
-  uiTypeIs,
-  type JsonFormsRendererRegistryEntry,
-  type Layout,
-} from '@jsonforms/core';
+import { type Layout } from '@jsonforms/core';
 import {
   DispatchRenderer,
   rendererProps,
@@ -85,11 +78,6 @@ const layoutRenderer = defineComponent({
 });
 
 export default layoutRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: layoutRenderer,
-  tester: rankWith(2, and(isLayout, uiTypeIs('Group'))),
-};
 </script>
 
 <!-- Default styles for the 'nested' feature -->
diff --git a/packages/vue-vuetify/src/layouts/HorizontalLayoutRenderer.entry.ts b/packages/vue-vuetify/src/layouts/HorizontalLayoutRenderer.entry.ts
new file mode 100644
index 000000000..4e9919494
--- /dev/null
+++ b/packages/vue-vuetify/src/layouts/HorizontalLayoutRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  rankWith,
+  uiTypeIs,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import layoutRenderer from './HorizontalLayoutRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: layoutRenderer,
+  tester: rankWith(2, uiTypeIs('HorizontalLayout')),
+};
diff --git a/packages/vue-vuetify/src/layouts/HorizontalLayoutRenderer.vue b/packages/vue-vuetify/src/layouts/HorizontalLayoutRenderer.vue
index f326433ec..fb2b07c5e 100644
--- a/packages/vue-vuetify/src/layouts/HorizontalLayoutRenderer.vue
+++ b/packages/vue-vuetify/src/layouts/HorizontalLayoutRenderer.vue
@@ -26,12 +26,7 @@
 </template>
 
 <script lang="ts">
-import {
-  rankWith,
-  uiTypeIs,
-  type JsonFormsRendererRegistryEntry,
-  type Layout,
-} from '@jsonforms/core';
+import { type Layout } from '@jsonforms/core';
 import {
   DispatchRenderer,
   rendererProps,
@@ -113,9 +108,4 @@ const layoutRenderer = defineComponent({
 });
 
 export default layoutRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: layoutRenderer,
-  tester: rankWith(2, uiTypeIs('HorizontalLayout')),
-};
 </script>
diff --git a/packages/vue-vuetify/src/layouts/VerticalLayoutRenderer.entry.ts b/packages/vue-vuetify/src/layouts/VerticalLayoutRenderer.entry.ts
new file mode 100644
index 000000000..a32a980db
--- /dev/null
+++ b/packages/vue-vuetify/src/layouts/VerticalLayoutRenderer.entry.ts
@@ -0,0 +1,11 @@
+import {
+  rankWith,
+  uiTypeIs,
+  type JsonFormsRendererRegistryEntry,
+} from '@jsonforms/core';
+import layoutRenderer from './VerticalLayoutRenderer.vue';
+
+export const entry: JsonFormsRendererRegistryEntry = {
+  renderer: layoutRenderer,
+  tester: rankWith(2, uiTypeIs('VerticalLayout')),
+};
diff --git a/packages/vue-vuetify/src/layouts/VerticalLayoutRenderer.vue b/packages/vue-vuetify/src/layouts/VerticalLayoutRenderer.vue
index 82d8e6703..73f4d959f 100644
--- a/packages/vue-vuetify/src/layouts/VerticalLayoutRenderer.vue
+++ b/packages/vue-vuetify/src/layouts/VerticalLayoutRenderer.vue
@@ -29,12 +29,7 @@
 </template>
 
 <script lang="ts">
-import {
-  rankWith,
-  uiTypeIs,
-  type JsonFormsRendererRegistryEntry,
-  type Layout,
-} from '@jsonforms/core';
+import { type Layout } from '@jsonforms/core';
 import {
   DispatchRenderer,
   rendererProps,
@@ -62,9 +57,4 @@ const layoutRenderer = defineComponent({
 });
 
 export default layoutRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: layoutRenderer,
-  tester: rankWith(2, uiTypeIs('VerticalLayout')),
-};
 </script>
diff --git a/packages/vue-vuetify/src/layouts/index.ts b/packages/vue-vuetify/src/layouts/index.ts
index c868e9021..7ae0fed22 100644
--- a/packages/vue-vuetify/src/layouts/index.ts
+++ b/packages/vue-vuetify/src/layouts/index.ts
@@ -4,12 +4,12 @@ import {
   type JsonFormsRendererRegistryEntry,
 } from '@jsonforms/core';
 
-import { entry as arrayLayoutRendererEntry } from './ArrayLayoutRenderer.vue';
-import { entry as categorizationRendererEntry } from './CategorizationRenderer.vue';
-import { entry as categorizationStepperRendererEntry } from './CategorizationStepperRenderer.vue';
-import { entry as groupRendererEntry } from './GroupRenderer.vue';
-import { entry as horizontalLayoutRendererEntry } from './HorizontalLayoutRenderer.vue';
-import { entry as verticalLayoutRendererEntry } from './VerticalLayoutRenderer.vue';
+import { entry as arrayLayoutRendererEntry } from './ArrayLayoutRenderer.entry';
+import { entry as categorizationRendererEntry } from './CategorizationRenderer.entry';
+import { entry as categorizationStepperRendererEntry } from './CategorizationStepperRenderer.entry';
+import { entry as groupRendererEntry } from './GroupRenderer.entry';
+import { entry as horizontalLayoutRendererEntry } from './HorizontalLayoutRenderer.entry';
+import { entry as verticalLayoutRendererEntry } from './VerticalLayoutRenderer.entry';
 
 import { default as VerticalLayoutRenderer } from './VerticalLayoutRenderer.vue';
 export { default as ArrayLayoutRenderer } from './ArrayLayoutRenderer.vue';
diff --git a/packages/vue-vuetify/tests/unit/additional/LabelRenderer.spec.ts b/packages/vue-vuetify/tests/unit/additional/LabelRenderer.spec.ts
index e837dc193..c7220b47c 100644
--- a/packages/vue-vuetify/tests/unit/additional/LabelRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/additional/LabelRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds } from '@jsonforms/core';
-import LabelRenderer, {
-  entry as labelRendererEntry,
-} from '../../../src/additional/LabelRenderer.vue';
+import LabelRenderer from '../../../src/additional/LabelRenderer.vue';
+import { entry as labelRendererEntry } from '../../../src/additional/LabelRenderer.entry';
 import { mountJsonForms } from '../util';
 
 describe('LabelRenderer.vue', () => {
diff --git a/packages/vue-vuetify/tests/unit/additional/ListWithDetailRenderer.spec.ts b/packages/vue-vuetify/tests/unit/additional/ListWithDetailRenderer.spec.ts
index b304b6c8a..190b5ff49 100644
--- a/packages/vue-vuetify/tests/unit/additional/ListWithDetailRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/additional/ListWithDetailRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds, type Translator } from '@jsonforms/core';
-import ListWithDetailRenderer, {
-  entry as listWithDetailRendererEntry,
-} from '../../../src/additional/ListWithDetailRenderer.vue';
+import ListWithDetailRenderer from '../../../src/additional/ListWithDetailRenderer.vue';
+import { entry as listWithDetailRendererEntry } from '../../../src/additional/ListWithDetailRenderer.entry';
 import { mountJsonForms } from '../util';
 
 describe('ListWithDetailRenderer.vue', () => {
diff --git a/packages/vue-vuetify/tests/unit/complex/ArrayControlRenderer.spec.ts b/packages/vue-vuetify/tests/unit/complex/ArrayControlRenderer.spec.ts
index f9787b3bd..0422ca64f 100644
--- a/packages/vue-vuetify/tests/unit/complex/ArrayControlRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/complex/ArrayControlRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds, type Translator } from '@jsonforms/core';
-import ArrayControlRenderer, {
-  entry as arrayControlRendererEntry,
-} from '../../../src/complex/ArrayControlRenderer.vue';
+import ArrayControlRenderer from '../../../src/complex/ArrayControlRenderer.vue';
+import { entry as arrayControlRendererEntry } from '../../../src/complex/ArrayControlRenderer.entry';
 import { mountJsonForms } from '../util';
 
 describe('ArrayControlRenderer.vue', () => {
diff --git a/packages/vue-vuetify/tests/unit/complex/OneOfRenderer.spec.ts b/packages/vue-vuetify/tests/unit/complex/OneOfRenderer.spec.ts
index 283d24a2f..9cae6a50e 100644
--- a/packages/vue-vuetify/tests/unit/complex/OneOfRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/complex/OneOfRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds, type Translator } from '@jsonforms/core';
-import OneOfControlRenderer, {
-  entry as oneOfControlRendererEntry,
-} from '../../../src/complex/OneOfRenderer.vue';
+import OneOfControlRenderer from '../../../src/complex/OneOfRenderer.vue';
+import { entry as oneOfControlRendererEntry } from '../../../src/complex/OneOfRenderer.entry';
 import { mountJsonForms } from '../util';
 
 describe('OneOfRenderer.vue', () => {
diff --git a/packages/vue-vuetify/tests/unit/controls/BooleanControlRenderer.spec.ts b/packages/vue-vuetify/tests/unit/controls/BooleanControlRenderer.spec.ts
index a50e6204a..1c1c592a0 100644
--- a/packages/vue-vuetify/tests/unit/controls/BooleanControlRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/controls/BooleanControlRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds } from '@jsonforms/core';
-import BooleanControlRenderer, {
-  entry as booleanControlRendererEntry,
-} from '../../../src/controls/BooleanControlRenderer.vue';
+import BooleanControlRenderer from '../../../src/controls/BooleanControlRenderer.vue';
+import { entry as booleanControlRendererEntry } from '../../../src/controls/BooleanControlRenderer.entry';
 import { mountJsonForms } from '../util';
 
 describe('BooleanControlRenderer.vue', () => {
diff --git a/packages/vue-vuetify/tests/unit/controls/DateControlRenderer.spec.ts b/packages/vue-vuetify/tests/unit/controls/DateControlRenderer.spec.ts
index 1a042e60c..4365a8486 100644
--- a/packages/vue-vuetify/tests/unit/controls/DateControlRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/controls/DateControlRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds } from '@jsonforms/core';
-import DateControlRenderer, {
-  entry as dateControlRendererEntry,
-} from '../../../src/controls/DateControlRenderer.vue';
+import DateControlRenderer from '../../../src/controls/DateControlRenderer.vue';
+import { entry as dateControlRendererEntry } from '../../../src/controls/DateControlRenderer.entry';
 import { mountJsonForms } from '../util';
 
 describe('DateControlRenderer.vue', () => {
diff --git a/packages/vue-vuetify/tests/unit/controls/DateTimeControlRenderer.spec.ts b/packages/vue-vuetify/tests/unit/controls/DateTimeControlRenderer.spec.ts
index 285676f1c..08f994643 100644
--- a/packages/vue-vuetify/tests/unit/controls/DateTimeControlRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/controls/DateTimeControlRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds } from '@jsonforms/core';
-import DateTimeControlRenderer, {
-  entry as dateTimeControlRendererEntry,
-} from '../../../src/controls/DateTimeControlRenderer.vue';
+import DateTimeControlRenderer from '../../../src/controls/DateTimeControlRenderer.vue';
+import { entry as dateTimeControlRendererEntry } from '../../../src/controls/DateTimeControlRenderer.entry';
 import { mountJsonForms } from '../util';
 
 describe('DateTimeControlRenderer.vue', () => {
diff --git a/packages/vue-vuetify/tests/unit/controls/EnumControlRenderer.spec.ts b/packages/vue-vuetify/tests/unit/controls/EnumControlRenderer.spec.ts
index 0e1db6aeb..9f9c19c33 100644
--- a/packages/vue-vuetify/tests/unit/controls/EnumControlRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/controls/EnumControlRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds } from '@jsonforms/core';
-import EnumControlRenderer, {
-  entry as enumControlRendererEntry,
-} from '../../../src/controls/EnumControlRenderer.vue';
+import EnumControlRenderer from '../../../src/controls/EnumControlRenderer.vue';
+import { entry as enumControlRendererEntry } from '../../../src/controls/EnumControlRenderer.entry';
 import { wait } from '../../../tests';
 import { mountJsonForms } from '../util';
 
diff --git a/packages/vue-vuetify/tests/unit/controls/IntegerControlRenderer.spec.ts b/packages/vue-vuetify/tests/unit/controls/IntegerControlRenderer.spec.ts
index a74a99432..ef64f124a 100644
--- a/packages/vue-vuetify/tests/unit/controls/IntegerControlRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/controls/IntegerControlRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds } from '@jsonforms/core';
-import IntegerControlRenderer, {
-  entry as integerControlRendererEntry,
-} from '../../../src/controls/IntegerControlRenderer.vue';
+import IntegerControlRenderer from '../../../src/controls/IntegerControlRenderer.vue';
+import { entry as integerControlRendererEntry } from '../../../src/controls/IntegerControlRenderer.entry';
 import { wait } from '../../../tests';
 import { mountJsonForms } from '../util';
 
diff --git a/packages/vue-vuetify/tests/unit/controls/MultiStringControlRenderer.spec.ts b/packages/vue-vuetify/tests/unit/controls/MultiStringControlRenderer.spec.ts
index 2ba98eb1f..77a6b14e9 100644
--- a/packages/vue-vuetify/tests/unit/controls/MultiStringControlRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/controls/MultiStringControlRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds } from '@jsonforms/core';
-import MultiStringControlRenderer, {
-  entry as multiStringControlRendererEntry,
-} from '../../../src/controls/MultiStringControlRenderer.vue';
+import MultiStringControlRenderer from '../../../src/controls/MultiStringControlRenderer.vue';
+import { entry as multiStringControlRendererEntry } from '../../../src/controls/MultiStringControlRenderer.entry';
 import { wait } from '../../../tests';
 import { mountJsonForms } from '../util';
 
diff --git a/packages/vue-vuetify/tests/unit/controls/NumberControlRenderer.spec.ts b/packages/vue-vuetify/tests/unit/controls/NumberControlRenderer.spec.ts
index c2c5581cd..0f76ffd83 100644
--- a/packages/vue-vuetify/tests/unit/controls/NumberControlRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/controls/NumberControlRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds } from '@jsonforms/core';
-import NumberControlRenderer, {
-  entry as numberControlRendererEntry,
-} from '../../../src/controls/NumberControlRenderer.vue';
+import NumberControlRenderer from '../../../src/controls/NumberControlRenderer.vue';
+import { entry as numberControlRendererEntry } from '../../../src/controls/NumberControlRenderer.entry';
 import { wait } from '../../../tests';
 import { mountJsonForms } from '../util';
 
diff --git a/packages/vue-vuetify/tests/unit/controls/OneOfEnumControlRenderer.spec.ts b/packages/vue-vuetify/tests/unit/controls/OneOfEnumControlRenderer.spec.ts
index 9d6a76c21..f8f293037 100644
--- a/packages/vue-vuetify/tests/unit/controls/OneOfEnumControlRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/controls/OneOfEnumControlRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds } from '@jsonforms/core';
-import OneOfEnumControlRenderer, {
-  entry as oneOfEnumControlRendererEntry,
-} from '../../../src/controls/OneOfEnumControlRenderer.vue';
+import OneOfEnumControlRenderer from '../../../src/controls/OneOfEnumControlRenderer.vue';
+import { entry as oneOfEnumControlRendererEntry } from '../../../src/controls/OneOfEnumControlRenderer.entry';
 import { wait } from '../../../tests';
 import { mountJsonForms } from '../util';
 
diff --git a/packages/vue-vuetify/tests/unit/controls/StringControlRenderer.spec.ts b/packages/vue-vuetify/tests/unit/controls/StringControlRenderer.spec.ts
index 73dc1d555..345f9287d 100644
--- a/packages/vue-vuetify/tests/unit/controls/StringControlRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/controls/StringControlRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds } from '@jsonforms/core';
-import StringControlRenderer, {
-  entry as stringControlRendererEntry,
-} from '../../../src/controls/StringControlRenderer.vue';
+import StringControlRenderer from '../../../src/controls/StringControlRenderer.vue';
+import { entry as stringControlRendererEntry } from '../../../src/controls/StringControlRenderer.entry';
 import { wait } from '../../../tests';
 import { mountJsonForms } from '../util';
 
diff --git a/packages/vue-vuetify/tests/unit/controls/TimeControlRenderer.spec.ts b/packages/vue-vuetify/tests/unit/controls/TimeControlRenderer.spec.ts
index 14954d5c3..556200c44 100644
--- a/packages/vue-vuetify/tests/unit/controls/TimeControlRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/controls/TimeControlRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds } from '@jsonforms/core';
-import TimeControlRenderer, {
-  entry as timeControlRendererEntry,
-} from '../../../src/controls/TimeControlRenderer.vue';
+import TimeControlRenderer from '../../../src/controls/TimeControlRenderer.vue';
+import { entry as timeControlRendererEntry } from '../../../src/controls/TimeControlRenderer.entry';
 import { mountJsonForms } from '../util';
 
 describe('TimeControlRenderer.vue', () => {
diff --git a/packages/vue-vuetify/tests/unit/layout/ArrayLayoutRenderer.spec.ts b/packages/vue-vuetify/tests/unit/layout/ArrayLayoutRenderer.spec.ts
index afd7d1247..ba8a591c5 100644
--- a/packages/vue-vuetify/tests/unit/layout/ArrayLayoutRenderer.spec.ts
+++ b/packages/vue-vuetify/tests/unit/layout/ArrayLayoutRenderer.spec.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { clearAllIds, type Translator } from '@jsonforms/core';
-import ArrayLayoutRenderer, {
-  entry as arrayLayoutRendererEntry,
-} from '../../../src/layouts/ArrayLayoutRenderer.vue';
+import ArrayLayoutRenderer from '../../../src/layouts/ArrayLayoutRenderer.vue';
+import { entry as arrayLayoutRendererEntry } from '../../../src/layouts/ArrayLayoutRenderer.entry';
 import { mountJsonForms } from '../util';
 
 describe('ArrayLayoutRenderer.vue', () => {