fix vite not including SFC template part of component, move entries t…

…o index as described here eclipsesource/jsonforms-vue-seed#13

src/components/form/array/ArrayListElement.vue

@@ -23,6 +23,7 @@
 
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { classes, Styles } from '../styles';
 
 const listItem = defineComponent({

src/components/form/array/ArrayListRenderer.vue

@@ -40,16 +40,7 @@
 </template>
 
 <script lang="ts">
-import {
-  composePaths,
-  createDefaultValue,
-  JsonFormsRendererRegistryEntry,
-  rankWith,
-  ControlElement,
-  schemaTypeIs,
-  Resolve,
-  JsonSchema,
-} from '@jsonforms/core';
+import { composePaths, createDefaultValue, ControlElement, Resolve, JsonSchema } from '@jsonforms/core';
 import { defineComponent } from 'vue';
 import { DispatchRenderer, rendererProps, useJsonFormsArrayControl, RendererProps } from '@jsonforms/vue';
 import { useQuasarArrayControl } from '../util';
@@ -101,9 +92,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(2.1, schemaTypeIs('array')),
-};
 </script>

src/components/form/array/index.ts

@@ -1,5 +1,9 @@
-export { default as ArrayListRenderer } from './ArrayListRenderer.vue';
+import { JsonFormsRendererRegistryEntry, rankWith, schemaTypeIs } from '@jsonforms/core';
 
-import { entry as arrayListRendererEntry } from './ArrayListRenderer.vue';
+import { default as ArrayListRenderer } from './ArrayListRenderer.vue';
 
-export const arrayRenderers = [arrayListRendererEntry];
+export const ArrayListRendererEntry: JsonFormsRendererRegistryEntry = {
+  renderer: ArrayListRenderer,
+  tester: rankWith(2.1, schemaTypeIs('array')),
+};
+export const arrayRenderers = [ArrayListRendererEntry];

src/components/form/complex/AllOfRenderer.vue

@@ -29,16 +29,7 @@
 </template>
 
 <script lang="ts">
-import {
-  CombinatorSubSchemaRenderInfo,
-  ControlElement,
-  createCombinatorRenderInfos,
-  findMatchingUISchema,
-  isAllOfControl,
-  JsonFormsRendererRegistryEntry,
-  rankWith,
-  UISchemaElement,
-} from '@jsonforms/core';
+import { CombinatorSubSchemaRenderInfo, ControlElement, createCombinatorRenderInfos, findMatchingUISchema, UISchemaElement } from '@jsonforms/core';
 import { DispatchRenderer, rendererProps, RendererProps, useJsonFormsAllOfControl } from '@jsonforms/vue';
 import { defineComponent } from 'vue';
 import { useQuasarControl } from '../util';
@@ -68,7 +59,7 @@ const controlRenderer = defineComponent({
         'allOf',
         this.control.uischema,
         this.control.path,
-        this.control.uischemas
+        this.control.uischemas,
       );
 
       return result.filter((info) => info.uischema);
@@ -77,9 +68,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(3, isAllOfControl),
-};
 </script>

src/components/form/complex/EnumArrayRenderer.vue

@@ -16,17 +16,7 @@
 </template>
 
 <script lang="ts">
-import {
-  ControlElement,
-  JsonFormsRendererRegistryEntry,
-  rankWith,
-  and,
-  hasType,
-  JsonSchema,
-  schemaMatches,
-  schemaSubPathMatches,
-  uiTypeIs,
-} from '@jsonforms/core';
+import { ControlElement } from '@jsonforms/core';
 import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsMultiEnumControl, RendererProps } from '@jsonforms/vue';
 import { useQuasarBasicControl } from '../util';
@@ -51,29 +41,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.1,
-    and(
-      uiTypeIs('Control'),
-      and(
-        schemaMatches((schema) => hasType(schema, 'array') && !Array.isArray(schema.items)),
-        schemaSubPathMatches('items', (schema) => {
-          return hasOneOfItems(schema) || hasEnumItems(schema);
-        })
-      )
-    )
-  ),
-};
 </script>

src/components/form/complex/index.ts

@@ -1,24 +1,58 @@
-export { default as AllOfRenderer } from './AllOfRenderer.vue';
+import {
+  isAllOfControl,
+  JsonFormsRendererRegistryEntry,
+  rankWith,
+  and,
+  hasType,
+  JsonSchema,
+  schemaMatches,
+  schemaSubPathMatches,
+  uiTypeIs,
+} from '@jsonforms/core';
+
+import { default as AllOfRenderer } from './AllOfRenderer.vue';
 // export { default as AnyOfRenderer } from "./AnyOfRenderer.vue";
 // export { default as ArrayControlRenderer } from "./ArrayControlRenderer.vue";
-export { default as EnumArrayRenderer } from './EnumArrayRenderer.vue';
+import { default as EnumArrayRenderer } from './EnumArrayRenderer.vue';
 // 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";
+export const AllOfRendererEntry: JsonFormsRendererRegistryEntry = {
+  renderer: AllOfRenderer,
+  tester: rankWith(3, isAllOfControl),
+};
+
+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 EnumArrayRendererEntry: JsonFormsRendererRegistryEntry = {
+  renderer: EnumArrayRenderer,
+  tester: rankWith(
+    5.1,
+    and(
+      uiTypeIs('Control'),
+      and(
+        schemaMatches((schema) => hasType(schema, 'array') && !Array.isArray(schema.items)),
+        schemaSubPathMatches('items', (schema) => {
+          return hasOneOfItems(schema) || hasEnumItems(schema);
+        }),
+      ),
+    ),
+  ),
+};
 
 export const complexRenderers = [
-  allOfRendererEntry,
+  AllOfRendererEntry,
   // anyOfRendererEntry,
   // arrayControlRendererEntry,
-  enumArrayRendererEntry,
+  EnumArrayRendererEntry,
   // objectRendererEntry,
   // oneOfRendererEntry,
   // oneOfTabRendererEntry,

src/components/form/controls/BooleanToggleControlRenderer.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script lang="ts">
-import { ControlElement, JsonFormsRendererRegistryEntry, rankWith, isBooleanControl } from '@jsonforms/core';
+import { ControlElement } from '@jsonforms/core';
 import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl, RendererProps } from '@jsonforms/vue';
 import { default as ControlWrapper } from './ControlWrapper.vue';
@@ -32,9 +32,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(1.1, isBooleanControl),
-};
 </script>

src/components/form/controls/ColorControlRenderer.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script lang="ts">
-import { ControlElement, JsonFormsRendererRegistryEntry, rankWith, isStringControl, and, or, formatIs, optionIs } from '@jsonforms/core';
+import { ControlElement } from '@jsonforms/core';
 import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl, RendererProps } from '@jsonforms/vue';
 import { default as ControlWrapper } from './ControlWrapper.vue';
@@ -37,9 +37,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(1.1, and(isStringControl, or(formatIs('color'), optionIs('format', 'color')))),
-};
 </script>

src/components/form/controls/EnumArrayControlRenderer.vue

@@ -18,17 +18,7 @@
 </template>
 
 <script lang="ts">
-import {
-  ControlElement,
-  JsonFormsRendererRegistryEntry,
-  rankWith,
-  and,
-  hasType,
-  JsonSchema,
-  schemaMatches,
-  schemaSubPathMatches,
-  uiTypeIs,
-} from '@jsonforms/core';
+import { ControlElement } from '@jsonforms/core';
 import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsMultiEnumControl, RendererProps } from '@jsonforms/vue';
 import { useQuasarBasicControl } from '../util';
@@ -54,29 +44,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.2,
-    and(
-      uiTypeIs('Control'),
-      and(
-        schemaMatches((schema) => hasType(schema, 'array') && !Array.isArray(schema.items)),
-        schemaSubPathMatches('items', (schema) => {
-          return hasOneOfItems(schema) || hasEnumItems(schema);
-        })
-      )
-    )
-  ),
-};
 </script>

src/components/form/controls/EnumControlRenderer.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script lang="ts">
-import { ControlElement, JsonFormsRendererRegistryEntry, rankWith, isEnumControl } from '@jsonforms/core';
+import { ControlElement } from '@jsonforms/core';
 import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsEnumControl, RendererProps } from '@jsonforms/vue';
 import { default as ControlWrapper } from './ControlWrapper.vue';
@@ -37,9 +37,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(2.1, isEnumControl),
-};
 </script>

src/components/form/controls/NumberControlRenderer.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script lang="ts">
-import { ControlElement, JsonFormsRendererRegistryEntry, rankWith, isNumberControl, or, isIntegerControl } from '@jsonforms/core';
+import { ControlElement } from '@jsonforms/core';
 import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl, RendererProps } from '@jsonforms/vue';
 import { default as ControlWrapper } from './ControlWrapper.vue';
@@ -38,9 +38,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(1.1, or(isNumberControl, isIntegerControl)),
-};
 </script>

src/components/form/controls/SliderControlRenderer.vue

@@ -20,7 +20,7 @@
 </template>
 
 <script lang="ts">
-import { ControlElement, JsonFormsRendererRegistryEntry, rankWith, isRangeControl } from '@jsonforms/core';
+import { ControlElement } from '@jsonforms/core';
 import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl, RendererProps } from '@jsonforms/vue';
 import { default as ControlWrapper } from './ControlWrapper.vue';
@@ -40,15 +40,10 @@ const controlRenderer = defineComponent({
       (value) => {
         return Number(value);
       },
-      300
+      300,
     );
   },
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(4.1, isRangeControl), //TODO: Tester not working as expected.
-};
 </script>

src/components/form/controls/StringControlRenderer.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script lang="ts">
-import { ControlElement, JsonFormsRendererRegistryEntry, rankWith, isStringControl } from '@jsonforms/core';
+import { ControlElement } from '@jsonforms/core';
 import { defineComponent } from 'vue';
 import { rendererProps, useJsonFormsControl, RendererProps } from '@jsonforms/vue';
 import { default as ControlWrapper } from './ControlWrapper.vue';
@@ -35,9 +35,4 @@ const controlRenderer = defineComponent({
 });
 
 export default controlRenderer;
-
-export const entry: JsonFormsRendererRegistryEntry = {
-  renderer: controlRenderer,
-  tester: rankWith(1.1, isStringControl),
-};
 </script>