diff --git a/packages/ui-vue/components/code-editor/src/code-textbox.props.ts b/packages/ui-vue/components/code-editor/src/code-textbox.props.ts index 50e71c881fc9153ac07752d8f2d5966a7219a009..8f2abe82ff6d75c6e5b605fc492a4f4211625d92 100644 --- a/packages/ui-vue/components/code-editor/src/code-textbox.props.ts +++ b/packages/ui-vue/components/code-editor/src/code-textbox.props.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { ExtractPropTypes, PropType } from 'vue'; -import { createPropsResolver } from "../../dynamic-resolver"; +import { createPropsResolver } from "@farris/ui-vue/components/dynamic-resolver"; import codeEditorSchema from './schema/code-editor.schema.json'; import { schemaMapper } from './schema/schema-mapper'; import { schemaResolver } from './schema/schema-resolver'; diff --git a/packages/ui-vue/components/code-editor/src/schema/schema-mapper.ts b/packages/ui-vue/components/code-editor/src/schema/schema-mapper.ts index ec92a2a712f693a0b6d694d3475dcf191812651b..8e0bbfafa574bca386aab01db7d9596c4992e6b5 100644 --- a/packages/ui-vue/components/code-editor/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/code-editor/src/schema/schema-mapper.ts @@ -1,3 +1,3 @@ -import { MapperFunction } from '../../../dynamic-resolver'; +import { MapperFunction } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([]); diff --git a/packages/ui-vue/components/code-editor/src/schema/schema-resolver.ts b/packages/ui-vue/components/code-editor/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/code-editor/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/code-editor/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/combo-tree/index.ts b/packages/ui-vue/components/combo-tree/index.ts index 397c7d5773aa3024cc65736fb869d45007a9d9c2..97afc1ea3d4cf807edd154c29db3399ec3f67d05 100644 --- a/packages/ui-vue/components/combo-tree/index.ts +++ b/packages/ui-vue/components/combo-tree/index.ts @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import FComboTree from './src/combo-tree.component'; import { withInstall } from '@farris/ui-vue/components/common'; +import FComboTree from './src/combo-tree.component'; import { propsResolver } from './src/combo-tree.props'; export * from './src/combo-tree.props'; diff --git a/packages/ui-vue/components/combo-tree/src/combo-tree.component.tsx b/packages/ui-vue/components/combo-tree/src/combo-tree.component.tsx index 4881cf5a634c0d88be67a75cf6b3e1b16f0dd433..9a30d9864c3002349aac2ad060399799d7b4177f 100644 --- a/packages/ui-vue/components/combo-tree/src/combo-tree.component.tsx +++ b/packages/ui-vue/components/combo-tree/src/combo-tree.component.tsx @@ -1,9 +1,9 @@ import { Ref, SetupContext, computed, defineComponent, ref, watch, watchEffect } from "vue"; +import { cloneDeep } from "lodash-es"; import FButtonEdit from '@farris/ui-vue/components/button-edit'; import { ComboTreeProps, comboTreeProps, Option } from "./combo-tree.props"; import ComboTreeContainer from './components/tree-container.component'; import { useDataSource } from "./composition/use-data-source"; -import { cloneDeep } from "lodash-es"; export default defineComponent({ name: 'FComboTree', diff --git a/packages/ui-vue/components/combo-tree/src/combo-tree.props.ts b/packages/ui-vue/components/combo-tree/src/combo-tree.props.ts index 97937e4e799d53433691037e8f36471f6c0b7a95..e1c2e3b8abf850c53a4f91b8b872029164052ce7 100644 --- a/packages/ui-vue/components/combo-tree/src/combo-tree.props.ts +++ b/packages/ui-vue/components/combo-tree/src/combo-tree.props.ts @@ -15,7 +15,7 @@ * limitations under the License. */ import { ExtractPropTypes, PropType } from 'vue'; -import { createPropsResolver } from '../../dynamic-resolver'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { schemaMapper } from './schema/schema-mapper'; import comboTreeSchema from './schema/combo-tree.schema.json'; import { schemaResolver } from './schema/schema-resolver'; diff --git a/packages/ui-vue/components/combo-tree/src/schema/schema-mapper.ts b/packages/ui-vue/components/combo-tree/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/combo-tree/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/combo-tree/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/combo-tree/src/schema/schema-resolver.ts b/packages/ui-vue/components/combo-tree/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/combo-tree/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/combo-tree/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/component/index.ts b/packages/ui-vue/components/component/index.ts index 2eecb92deb73e90b9e0a92a6b42c8e334339ab81..b36866466dc3c40fbc70581041f5848136c51d2c 100644 --- a/packages/ui-vue/components/component/index.ts +++ b/packages/ui-vue/components/component/index.ts @@ -19,8 +19,9 @@ import Component from './src/component.component'; import ComponentDesign from './src/designer/component.design.component'; import { propsResolver } from './src/component.props'; import { componentPropsResolver } from './src/component-ref.props'; +import { ComponentBuildInfo } from './src/composition/inner-component-build-info'; export * from './src/component.props'; -export { Component, ComponentDesign }; +export { Component, ComponentDesign, type ComponentBuildInfo }; export default { install(app: App): void { diff --git a/packages/ui-vue/components/dropdown/src/designer/dropdown.design.component.tsx b/packages/ui-vue/components/dropdown/src/designer/dropdown.design.component.tsx index b71bef6980d61bc98d5db9aa5b72c4020f693f72..a31d4055b10f0b418f2cf2f4e0a736051b205c33 100644 --- a/packages/ui-vue/components/dropdown/src/designer/dropdown.design.component.tsx +++ b/packages/ui-vue/components/dropdown/src/designer/dropdown.design.component.tsx @@ -19,8 +19,7 @@ import { defineComponent, SetupContext, ref, inject, onMounted } from 'vue'; import { dropdownProps, DropdownProps } from '../dropdown.props'; import { useDropdown } from '../composition/use-dropdown'; import FDropdownItem from '../dropdown.item.component'; -import { DesignerItemContext } from '../../../designer-canvas/src/types'; -import { useDesignerComponent } from '../../../designer-canvas/src/composition/function/use-designer-component'; +import { DesignerItemContext, useDesignerComponent } from '@farris/ui-vue/components/designer-canvas'; export default defineComponent({ name: 'FDropdownDesign', diff --git a/packages/ui-vue/components/dropdown/src/dropdown.props.ts b/packages/ui-vue/components/dropdown/src/dropdown.props.ts index cd622ce46c98f7584d52b42d6c9c543735409bd6..1167f35a4c49d7fd54057d0b4649004b9fad85aa 100644 --- a/packages/ui-vue/components/dropdown/src/dropdown.props.ts +++ b/packages/ui-vue/components/dropdown/src/dropdown.props.ts @@ -16,7 +16,7 @@ */ import { ExtractPropTypes, PropType } from 'vue'; import { DropdownItem } from './types/types'; -import { createPropsResolver } from '../../dynamic-resolver'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { schemaResolver } from './schema/schema-resolver'; import { schemaMapper } from './schema/schema-mapper'; import dropdownSchema from './schema/dropdown.schema.json'; diff --git a/packages/ui-vue/components/dropdown/src/schema/schema-mapper.ts b/packages/ui-vue/components/dropdown/src/schema/schema-mapper.ts index 97964aee23bbb8b523c7692723ea02db00d4f4c0..2ca33ca080647b9edc66a133396282d6a3b1698f 100644 --- a/packages/ui-vue/components/dropdown/src/schema/schema-mapper.ts +++ b/packages/ui-vue/components/dropdown/src/schema/schema-mapper.ts @@ -1,4 +1,4 @@ -import { MapperFunction, resolveAppearance } from '../../../dynamic-resolver'; +import { MapperFunction, resolveAppearance } from '@farris/ui-vue/components/dynamic-resolver'; export const schemaMapper = new Map([ ['appearance', resolveAppearance] diff --git a/packages/ui-vue/components/dropdown/src/schema/schema-resolver.ts b/packages/ui-vue/components/dropdown/src/schema/schema-resolver.ts index b02bdf93eec9060948f579c53aa81e3963a7d706..d36ae7457434b7381b796814e9926d352feacff6 100644 --- a/packages/ui-vue/components/dropdown/src/schema/schema-resolver.ts +++ b/packages/ui-vue/components/dropdown/src/schema/schema-resolver.ts @@ -1,4 +1,4 @@ -import { DynamicResolver } from "../../../dynamic-resolver"; +import { DynamicResolver } from "@farris/ui-vue/components/dynamic-resolver"; export function schemaResolver(resolver: DynamicResolver, schema: Record, context: Record): Record { return schema; diff --git a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.design.component.tsx b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.design.component.tsx index 80cdec0c46b3484eed2d32820e3d11abd063d8f4..65135641cd21a373646d58fc285071a62aa346dd 100644 --- a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.design.component.tsx +++ b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.design.component.tsx @@ -1,9 +1,8 @@ import { SetupContext, computed, defineComponent, ref, watch, inject } from 'vue'; +import { DesignerItemContext, DesignerHostService } from '@farris/ui-vue/components/designer-canvas'; import { DynamicFormGroupPropsType, dynamicFormGroupProps } from './dynamic-form-group.props'; import Label from '../dynamic-form-label/dynamic-form-label.component'; import { useTypeResolverDesign } from '../../composition/use-type-resolver-design'; -import { DesignerHostService } from '../../../../../components/designer-canvas/src/composition/types'; -import { DesignerItemContext } from '../../../../designer-canvas/src/types'; import { useFormBindingResolverDesign } from '../../composition/form-binding-resolver-design'; export default defineComponent({ diff --git a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.props.ts b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.props.ts index 66860ea7b2ca50d3a425acd4c9f8156731c49232..d793be5543da20f99cfda676decd7f299261d6f3 100644 --- a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.props.ts +++ b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-group/dynamic-form-group.props.ts @@ -1,9 +1,8 @@ import { ExtractPropTypes, PropType } from 'vue'; +import { createPropsResolver, createFormGroupEditorResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { EditorType, EditorConfig } from '../../types'; -import { createPropsResolver } from '../../../../dynamic-resolver'; import { schemaMapper } from '../../schema/schema-mapper'; import formGroupSchema from '../../schema/form-group.schema.json'; -import { createFormGroupEditorResolver } from '../../../../dynamic-resolver/src/editor-resolver'; import { FormValidationInfo } from '../validation-message/validation-message.props'; export const dynamicFormGroupProps = { diff --git a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.props.ts b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.props.ts index 60b6b8872707055f51c1fabb03c634cef03b1f67..ca1e683748bf2c7215bc0d70b0efb1bf9e9e7020 100644 --- a/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.props.ts +++ b/packages/ui-vue/components/dynamic-form/src/component/dynamic-form-input/dynamic-form-input.props.ts @@ -1,6 +1,6 @@ import { ExtractPropTypes, PropType } from 'vue'; +import { createPropsResolver } from '@farris/ui-vue/components/dynamic-resolver'; import { EditorConfig } from '../../types'; -import { createPropsResolver } from '../../../../dynamic-resolver'; import { schemaMapper } from '../../schema/schema-mapper'; import formGroupSchema from '../../schema/form-group.schema.json'; diff --git a/packages/ui-vue/components/dynamic-form/src/composition/form-binding-resolver-design.ts b/packages/ui-vue/components/dynamic-form/src/composition/form-binding-resolver-design.ts index 51ddabb2f8e0c7f8a7dcfde2a5aa144ea9c0a5c6..0a9ca047534908c583d4cf9927a31b91a551fb6f 100644 --- a/packages/ui-vue/components/dynamic-form/src/composition/form-binding-resolver-design.ts +++ b/packages/ui-vue/components/dynamic-form/src/composition/form-binding-resolver-design.ts @@ -1,7 +1,6 @@ -import { FormBindingType } from "../../../../components/property-panel"; -import { DesignerHostService } from "../../../../components/designer-canvas/src/composition/types"; -import { DesignerItemContext } from "../../../../components/designer-canvas"; -import { FormSchemaEntityField$Type } from "../../../../components/common/entity/entity-schema"; +import { FormBindingType } from "@farris/ui-vue/components/property-panel"; +import { DesignerHostService, DesignerItemContext } from "@farris/ui-vue/components/designer-canvas"; +import { FormSchemaEntityField$Type } from "@farris/ui-vue/components/common"; import { DynamicFormGroupPropsType } from "../component/dynamic-form-group/dynamic-form-group.props"; export function useFormBindingResolverDesign(designerHostService: DesignerHostService, designItemContext: DesignerItemContext, props: DynamicFormGroupPropsType) { diff --git a/packages/ui-vue/components/dynamic-form/src/composition/response-form-component-creator.service.ts b/packages/ui-vue/components/dynamic-form/src/composition/response-form-component-creator.service.ts index 1a4dcd986fa0f382dda1b9777eee730209a65c0a..e59782da37c79dbbc0490397a8c960ba00d011f8 100644 --- a/packages/ui-vue/components/dynamic-form/src/composition/response-form-component-creator.service.ts +++ b/packages/ui-vue/components/dynamic-form/src/composition/response-form-component-creator.service.ts @@ -1,10 +1,8 @@ -import { inject } from 'vue'; -import { DesignerHostService } from '../../../designer-canvas/src/composition/types'; -import { DynamicResolver } from '../../../../components/dynamic-resolver'; -import { ComponentBuildInfo } from '../../../component/src/composition/inner-component-build-info'; -import { ComponentSchema } from '../../../../components/designer-canvas'; -import { FormSchemaEntityFieldTypeName } from '@farris/ui-vue/components/common'; import { cloneDeep } from 'lodash-es'; +import { FormSchemaEntityFieldTypeName } from '@farris/ui-vue/components/common'; +import { DesignerHostService, ComponentSchema } from '@farris/ui-vue/components/designer-canvas'; +import { DynamicResolver } from '@farris/ui-vue/components/dynamic-resolver'; +import { ComponentBuildInfo } from '@farris/ui-vue/components/component'; const ROOT_VIEW_MODEL_ID = 'root-viewmodel'; /**