fix cyclic and self imports

iOvergaard · iOvergaard · commit df9e39a8fb94 · 2024-02-07T11:54:54.000+01:00
diff --git a/src/libs/class-api/class.interface.ts b/src/libs/class-api/class.interface.ts
@@ -1,13 +1,12 @@
-import type { UmbControllerHost } from '../controller-api/controller-host.interface.js';
-import type { UmbObserverController } from '../observable-api/index.js';
 import type {
 	UmbContextCallback,
 	UmbContextConsumerController,
 	UmbContextProviderController,
 	UmbContextToken,
 } from '../context-api/index.js';
+import type { UmbControllerHost, UmbController } from '@umbraco-cms/backoffice/controller-api';
+import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
 import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
-import type { UmbController } from '@umbraco-cms/backoffice/controller-api';
 
 export interface UmbClassMixinInterface extends UmbControllerHost, UmbController {
 	observe<T>(
diff --git a/src/libs/class-api/controller-base.class.ts b/src/libs/class-api/controller-base.class.ts
@@ -1,5 +1,5 @@
 import type { UmbController } from '../controller-api/controller.interface.js';
-import { UmbClassMixin } from './index.js';
+import { UmbClassMixin } from './class.mixin.js';
 
 /**
  * This mixin enables a web-component to host controllers.
diff --git a/src/libs/context-api/provide/context-provider.element.ts b/src/libs/context-api/provide/context-provider.element.ts
@@ -1,9 +1,8 @@
-import type { UmbControllerHostElement} from '@umbraco-cms/backoffice/controller-api';
+import { UmbContextProviderController } from './context-provider.controller.js';
+import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UmbControllerHostElementMixin } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import { UmbContextProviderController } from '@umbraco-cms/backoffice/context-api';
 
-// TODO: There is some circular reference from this to Controller-api which is not good. We should move this elsewhere as we do not encourage the use of this element. Its only purpose is within Storybook and tests.
 /**
  * Provides a value to the context down the DOM tree.
  *
diff --git a/src/libs/extension-api/controller/base-extension-initializer.controller.ts b/src/libs/extension-api/controller/base-extension-initializer.controller.ts
@@ -1,7 +1,7 @@
+import { createExtensionApi } from '../functions/index.js';
 import type { UmbExtensionCondition } from '../condition/extension-condition.interface.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
-import { createExtensionApi } from '@umbraco-cms/backoffice/extension-api';
 import type {
 	UmbConditionConfigBase,
 	ManifestCondition,
diff --git a/src/libs/extension-api/controller/extensions-element-initializer.controller.ts b/src/libs/extension-api/controller/extensions-element-initializer.controller.ts
@@ -1,13 +1,11 @@
+import type { ManifestBase } from '../types/index.js';
+import type { UmbExtensionRegistry } from '../registry/extension.registry.js';
 import type { ManifestTypeMap, SpecificManifestTypeOrManifestBase } from '../types/map.types.js';
+import { UmbExtensionElementInitializer } from './extension-element-initializer.controller.js';
 import {
 	type PermittedControllerType,
 	UmbBaseExtensionsInitializer,
 } from './base-extensions-initializer.controller.js';
-import {
-	type ManifestBase,
-	UmbExtensionElementInitializer,
-	type UmbExtensionRegistry,
-} from '@umbraco-cms/backoffice/extension-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
 /**
diff --git a/src/libs/observable-api/states/string-state.ts b/src/libs/observable-api/states/string-state.ts
@@ -1,4 +1,5 @@
-import { createObservablePart, type MappingFunction, type MemoizationFunction } from '../index.js';
+import type { MappingFunction, MemoizationFunction } from '../types/index.js';
+import { createObservablePart } from '../utils/index.js';
 import { UmbBasicState } from './basic-state.js';
 
 /**
diff --git a/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid-inner-test.element.ts b/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid-inner-test.element.ts
@@ -22,7 +22,7 @@ export class UmbPropertyEditorUIBlockGridInnerTestElement extends UmbLitElement
 		{
 			path: 'inner-1',
 			component: () => {
-				return import('./property-editor-ui-block-grid-inner-test.element.js');
+				return new UmbPropertyEditorUIBlockGridInnerTestElement();
 			},
 			setup: (component) => {
 				if (component instanceof HTMLElement) {
@@ -33,7 +33,7 @@ export class UmbPropertyEditorUIBlockGridInnerTestElement extends UmbLitElement
 		{
 			path: 'inner-2',
 			component: () => {
-				return import('./property-editor-ui-block-grid-inner-test.element.js');
+				return new UmbPropertyEditorUIBlockGridInnerTestElement();
 			},
 			setup: (component) => {
 				if (component instanceof HTMLElement) {
diff --git a/src/packages/core/collection/components/collection-selection-actions.element.ts b/src/packages/core/collection/components/collection-selection-actions.element.ts
@@ -1,8 +1,7 @@
+import { UMB_DEFAULT_COLLECTION_CONTEXT } from '../default/collection-default.context.js';
 import type { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit';
-import type { UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection';
-import { UMB_DEFAULT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 @customElement('umb-collection-selection-actions')
@@ -18,7 +17,7 @@ export class UmbCollectionSelectionActionsElement extends UmbLitElement {
 
 	private _selection: Array<string | null> = [];
 
-	private _collectionContext?: UmbDefaultCollectionContext<any, any>;
+	private _collectionContext?: typeof UMB_DEFAULT_COLLECTION_CONTEXT.TYPE;
 
 	constructor() {
 		super();
diff --git a/src/packages/core/collection/components/pagination/collection-pagination.element.ts b/src/packages/core/collection/components/pagination/collection-pagination.element.ts
@@ -1,8 +1,8 @@
+import { UMB_DEFAULT_COLLECTION_CONTEXT } from '../../default/collection-default.context.js';
 import type { UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, nothing, state } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection';
-import { UMB_DEFAULT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
 @customElement('umb-collection-pagination')
diff --git a/src/packages/core/data-type/tree/folder/data-type-folder.repository.ts b/src/packages/core/data-type/tree/folder/data-type-folder.repository.ts
@@ -1,5 +1,5 @@
 import { UMB_DATA_TYPE_FOLDER_ENTITY_TYPE } from '../../entity.js';
-import { UMB_DATA_TYPE_TREE_STORE_CONTEXT } from '../../tree/index.js';
+import { UMB_DATA_TYPE_TREE_STORE_CONTEXT } from '../data-type-tree.store.js';
 import { UmbDataTypeFolderServerDataSource } from './data-type-folder.server.data-source.js';
 import type { UmbDataTypeFolderTreeItemModel } from './types.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
diff --git a/src/packages/core/modal/modal-manager.context.ts b/src/packages/core/modal/modal-manager.context.ts
@@ -1,5 +1,5 @@
 import type { UmbModalToken } from './token/modal-token.js';
-import { UmbModalContext, type UmbModalContextClassArgs } from './index.js';
+import { UmbModalContext, type UmbModalContextClassArgs } from './modal.context.js';
 import type { UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui';
 import { UmbBasicState, appendToFrozenArray } from '@umbraco-cms/backoffice/observable-api';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
diff --git a/src/packages/core/modal/token/change-password-modal.token.ts b/src/packages/core/modal/token/change-password-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from './modal-token.js';
 
 export interface UmbChangePasswordModalData {
 	user: {
diff --git a/src/packages/core/modal/token/code-editor-modal.token.ts b/src/packages/core/modal/token/code-editor-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from './modal-token.js';
 
 // TODO => investigate why exporting CodeEditorLanguage in code-editor barrel
 // causes the schema generation task to fail... For now, language property below
diff --git a/src/packages/core/modal/token/confirm-modal.token.ts b/src/packages/core/modal/token/confirm-modal.token.ts
@@ -1,5 +1,5 @@
+import { UmbModalToken } from './modal-token.js';
 import type { TemplateResult } from '@umbraco-cms/backoffice/external/lit';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbConfirmModalData {
 	headline: string;
diff --git a/src/packages/core/modal/token/create-dictionary-modal.token.ts b/src/packages/core/modal/token/create-dictionary-modal.token.ts
@@ -1,5 +1,5 @@
+import { UmbModalToken } from './modal-token.js';
 import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbCreateDictionaryModalData {
 	parentId: string | null;
diff --git a/src/packages/core/modal/token/data-type-picker-flow-data-type-picker-modal.token.ts b/src/packages/core/modal/token/data-type-picker-flow-data-type-picker-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from './modal-token.js';
 
 export interface UmbDataTypePickerFlowDataTypePickerModalData {
 	propertyEditorUiAlias: string;
diff --git a/src/packages/core/modal/token/data-type-picker-flow-modal.token.ts b/src/packages/core/modal/token/data-type-picker-flow-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from './modal-token.js';
 
 export interface UmbDataTypePickerFlowModalData {
 	submitLabel?: string;
diff --git a/src/packages/core/modal/token/data-type-picker-modal.token.ts b/src/packages/core/modal/token/data-type-picker-modal.token.ts
@@ -1,5 +1,5 @@
-import type { UmbTreePickerModalData, UmbPickerModalValue } from '@umbraco-cms/backoffice/modal';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import type { UmbPickerModalValue, UmbTreePickerModalData } from '../modal.interfaces.js';
+import { UmbModalToken } from './modal-token.js';
 import type { UmbEntityTreeItemModel } from '@umbraco-cms/backoffice/tree';
 
 export type UmbDataTypePickerModalData = UmbTreePickerModalData<UmbEntityTreeItemModel>;
diff --git a/src/packages/core/modal/token/debug-modal.token.ts b/src/packages/core/modal/token/debug-modal.token.ts
@@ -1,5 +1,5 @@
+import { UmbModalToken } from './modal-token.js';
 import type { TemplateResult } from '@umbraco-cms/backoffice/external/lit';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbContextDebuggerModalData {
 	content: TemplateResult | string;
diff --git a/src/packages/core/modal/token/dictionary-item-picker-modal.token.ts b/src/packages/core/modal/token/dictionary-item-picker-modal.token.ts
@@ -1,6 +1,6 @@
 import type { UmbEntityTreeItemModel } from '../../tree/types.js';
+import { UmbModalToken } from './modal-token.js';
 import type { UmbPickerModalValue, UmbTreePickerModalData } from '@umbraco-cms/backoffice/modal';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export type UmbDictionaryItemPickerModalData = UmbTreePickerModalData<UmbEntityTreeItemModel>;
 export type UmbDictionaryItemPickerModalValue = UmbPickerModalValue;
diff --git a/src/packages/core/modal/token/document-picker-modal.token.ts b/src/packages/core/modal/token/document-picker-modal.token.ts
@@ -1,5 +1,5 @@
+import { UmbModalToken } from './modal-token.js';
 import type { UmbPickerModalValue, UmbTreePickerModalData } from '@umbraco-cms/backoffice/modal';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 import type { UmbDocumentItemModel } from '@umbraco-cms/backoffice/document';
 
 export type UmbDocumentPickerModalData = UmbTreePickerModalData<UmbDocumentItemModel>;
diff --git a/src/packages/core/modal/token/document-type-picker-modal.token.ts b/src/packages/core/modal/token/document-type-picker-modal.token.ts
@@ -1,6 +1,6 @@
+import { UmbModalToken } from './modal-token.js';
 import type { UmbDocumentTypeTreeItemModel } from '@umbraco-cms/backoffice/document-type';
 import type { UmbPickerModalValue, UmbTreePickerModalData } from '@umbraco-cms/backoffice/modal';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export type UmbDocumentTypePickerModalData = UmbTreePickerModalData<UmbDocumentTypeTreeItemModel>;
 export type UmbDocumentTypePickerModalValue = UmbPickerModalValue;
diff --git a/src/packages/core/modal/token/embedded-media-modal.token.ts b/src/packages/core/modal/token/embedded-media-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from './modal-token.js';
 
 export enum OEmbedStatus {
 	NotSupported,
diff --git a/src/packages/core/modal/token/entity-user-permission-settings-modal.token.ts b/src/packages/core/modal/token/entity-user-permission-settings-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from './modal-token.js';
 
 export interface UmbEntityUserPermissionSettingsModalData {
 	unique: string;
diff --git a/src/packages/core/modal/token/examine-fields-settings-modal.token.ts b/src/packages/core/modal/token/examine-fields-settings-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from './modal-token.js';
 
 export type UmbExamineFieldsSettingsModalData = never;
 
diff --git a/src/packages/core/modal/token/icon-picker-modal.token.ts b/src/packages/core/modal/token/icon-picker-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from './modal-token.js';
 
 export type UmbIconPickerModalData = never;
 
diff --git a/src/packages/core/modal/token/link-picker-modal.token.ts b/src/packages/core/modal/token/link-picker-modal.token.ts
@@ -1,5 +1,5 @@
+import { UmbModalToken } from './modal-token.js';
 import type { UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbLinkPickerModalData {
 	config: UmbLinkPickerConfig;
diff --git a/src/packages/core/modal/token/media-tree-picker-modal.token.ts b/src/packages/core/modal/token/media-tree-picker-modal.token.ts
@@ -1,5 +1,5 @@
+import { UmbModalToken } from './modal-token.js';
 import type { UmbPickerModalValue, UmbTreePickerModalData } from '@umbraco-cms/backoffice/modal';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 import type { ContentTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api';
 
 export type UmbMediaTreePickerModalData = UmbTreePickerModalData<ContentTreeItemResponseModel>;
diff --git a/src/packages/core/modal/token/media-type-picker-modal.token.ts b/src/packages/core/modal/token/media-type-picker-modal.token.ts
@@ -1,5 +1,5 @@
+import { UmbModalToken } from './modal-token.js';
 import type { UmbPickerModalValue, UmbTreePickerModalData } from '@umbraco-cms/backoffice/modal';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 import type { UmbEntityTreeItemModel } from '@umbraco-cms/backoffice/tree';
 
 export type UmbMediaTypePickerModalData = UmbTreePickerModalData<UmbEntityTreeItemModel>;
diff --git a/src/packages/core/modal/token/member-type-picker-modal.token.ts b/src/packages/core/modal/token/member-type-picker-modal.token.ts
@@ -1,19 +1,19 @@
+import { UmbModalToken } from './modal-token.js';
 import type { UmbPickerModalValue, UmbTreePickerModalData } from '@umbraco-cms/backoffice/modal';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 import type { UmbEntityTreeItemModel } from '@umbraco-cms/backoffice/tree';
 
 export type UmbMemberTypePickerModalData = UmbTreePickerModalData<UmbEntityTreeItemModel>;
 export type UmbMemberTypePickerModalValue = UmbPickerModalValue;
 
-export const UMB_MEMBER_TYPE_PICKER_MODAL = new UmbModalToken<UmbMemberTypePickerModalData, UmbMemberTypePickerModalValue>(
-	'Umb.Modal.TreePicker',
-	{
-		modal: {
-			type: 'sidebar',
-			size: 'small',
-		},
-		data: {
-			treeAlias: 'Umb.Tree.MemberType',
-		},
+export const UMB_MEMBER_TYPE_PICKER_MODAL = new UmbModalToken<
+	UmbMemberTypePickerModalData,
+	UmbMemberTypePickerModalValue
+>('Umb.Modal.TreePicker', {
+	modal: {
+		type: 'sidebar',
+		size: 'small',
 	},
-);
+	data: {
+		treeAlias: 'Umb.Tree.MemberType',
+	},
+});
diff --git a/src/packages/core/modal/token/partial-view-picker-modal.token.ts b/src/packages/core/modal/token/partial-view-picker-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from './modal-token.js';
 
 export interface UmbPartialViewPickerModalData {
 	multiple: boolean;
diff --git a/src/packages/core/modal/token/permissions-modal.token.ts b/src/packages/core/modal/token/permissions-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from './modal-token.js';
 
 export interface UmbPermissionsModalData {
 	unique: string;
diff --git a/src/packages/core/modal/token/property-editor-ui-picker-modal.token.ts b/src/packages/core/modal/token/property-editor-ui-picker-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from './modal-token.js';
 
 export interface UmbPropertyEditorUIPickerModalData {
 	submitLabel?: string;
diff --git a/src/packages/core/modal/token/property-settings-modal.token.ts b/src/packages/core/modal/token/property-settings-modal.token.ts
@@ -1,5 +1,5 @@
+import { UmbModalToken } from './modal-token.js';
 import type { UmbPropertyTypeModel, UmbPropertyTypeScaffoldModel } from '@umbraco-cms/backoffice/content-type';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export type UmbPropertySettingsModalData = {
 	documentTypeId: string;
diff --git a/src/packages/core/modal/token/section-picker-modal.token.ts b/src/packages/core/modal/token/section-picker-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from './modal-token.js';
 
 export interface UmbSectionPickerModalData {
 	multiple: boolean;
diff --git a/src/packages/core/modal/token/template-picker-modal.token.ts b/src/packages/core/modal/token/template-picker-modal.token.ts
@@ -1,5 +1,5 @@
+import { UmbModalToken } from './modal-token.js';
 import type { UmbPickerModalValue, UmbTreePickerModalData } from '@umbraco-cms/backoffice/modal';
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 import type { UmbTemplateTreeItemModel } from '@umbraco-cms/backoffice/template';
 
 export type UmbTemplatePickerModalData = UmbTreePickerModalData<UmbTemplateTreeItemModel>;
diff --git a/src/packages/core/modal/token/workspace-modal.token.ts b/src/packages/core/modal/token/workspace-modal.token.ts
@@ -1,4 +1,4 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+import { UmbModalToken } from './modal-token.js';
 export interface UmbWorkspaceData<DataModelType = unknown> {
 	entityType: string;
 	preset: Partial<DataModelType>;
diff --git a/src/packages/core/property/property-dataset/property-dataset-base-context.ts b/src/packages/core/property/property-dataset/property-dataset-base-context.ts
@@ -1,9 +1,7 @@
 import type { UmbPropertyValueData } from '../types/property-value-data.type.js';
-import {
-	UMB_PROPERTY_DATASET_CONTEXT,
-	type UmbNameablePropertyDatasetContext,
-	type UmbPropertyDatasetContext,
-} from '@umbraco-cms/backoffice/property';
+import { UMB_PROPERTY_DATASET_CONTEXT } from './property-dataset-context.token.js';
+import type { UmbPropertyDatasetContext } from './property-dataset-context.interface.js';
+import type { UmbNameablePropertyDatasetContext } from './nameable-property-dataset-context.interface.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbArrayState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
diff --git a/src/packages/core/property/property/property.context.ts b/src/packages/core/property/property/property.context.ts
@@ -1,10 +1,8 @@
-import type { UmbPropertyEditorUiElement } from '../../extension-registry/interfaces/property-editor-ui-element.interface.js';
-import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
+import { UMB_PROPERTY_DATASET_CONTEXT } from '../property-dataset/index.js';
 import type { UmbVariantId } from '@umbraco-cms/backoffice/variant';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UmbBaseController } from '@umbraco-cms/backoffice/class-api';
-import type {
-	UmbObserverController} from '@umbraco-cms/backoffice/observable-api';
+import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
 import {
 	UmbArrayState,
 	UmbBasicState,
@@ -13,11 +11,9 @@ import {
 	UmbStringState,
 } from '@umbraco-cms/backoffice/observable-api';
 import { UmbContextProviderController, UmbContextToken } from '@umbraco-cms/backoffice/context-api';
-import type {
-	UmbPropertyEditorConfigProperty} from '@umbraco-cms/backoffice/property-editor';
-import {
-	UmbPropertyEditorConfigCollection
-} from '@umbraco-cms/backoffice/property-editor';
+import type { UmbPropertyEditorConfigProperty } from '@umbraco-cms/backoffice/property-editor';
+import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
+import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
 
 export class UmbPropertyContext<ValueType = any> extends UmbBaseController {
 	private _providerController: UmbContextProviderController;
diff --git a/src/packages/core/store/detail-store-base.ts b/src/packages/core/store/detail-store-base.ts
@@ -1,6 +1,6 @@
+import { UmbStoreBase } from './store-base.js';
 import type { UmbDetailStore } from './detail-store.interface.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { UmbStoreBase } from '@umbraco-cms/backoffice/store';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
 
 /**
diff --git a/src/packages/core/store/entity-item.store.ts b/src/packages/core/store/entity-item.store.ts
@@ -1,6 +1,6 @@
+import { UmbStoreBase } from './store-base.js';
 import type { ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { UmbStoreBase } from '@umbraco-cms/backoffice/store';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
 
 /**
diff --git a/src/packages/core/store/item-store-base.ts b/src/packages/core/store/item-store-base.ts
@@ -1,6 +1,6 @@
+import { UmbStoreBase } from './store-base.js';
+import type { UmbItemStore } from './item-store.interface.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import type { UmbItemStore} from '@umbraco-cms/backoffice/store';
-import { UmbStoreBase } from '@umbraco-cms/backoffice/store';
 import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
 
 /**
diff --git a/src/packages/core/tree/reload-tree-item-children/reload-tree-item-children.action.ts b/src/packages/core/tree/reload-tree-item-children/reload-tree-item-children.action.ts
diff --git a/src/packages/core/tree/tree-item-base/tree-item-base.context.ts b/src/packages/core/tree/tree-item-base/tree-item-base.context.ts
diff --git a/src/packages/core/workspace/workspace-context/editable-workspace-context-base.ts b/src/packages/core/workspace/workspace-context/editable-workspace-context-base.ts
diff --git a/src/packages/documents/document-types/tree/folder/document-type-folder.repository.ts b/src/packages/documents/document-types/tree/folder/document-type-folder.repository.ts
diff --git a/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/manifests.ts b/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/manifests.ts
diff --git a/src/packages/media/media-types/tree/folder/media-type-folder.repository.ts b/src/packages/media/media-types/tree/folder/media-type-folder.repository.ts
diff --git a/src/packages/static-file/modals/static-file-picker-modal.token.ts b/src/packages/static-file/modals/static-file-picker-modal.token.ts
diff --git a/src/packages/templating/scripts/tree/folder/script-folder.repository.ts b/src/packages/templating/scripts/tree/folder/script-folder.repository.ts
diff --git a/src/packages/user/user-group/workspace/user-group-workspace.context.ts b/src/packages/user/user-group/workspace/user-group-workspace.context.ts
diff --git a/src/shared/router/router-slot.element.ts b/src/shared/router/router-slot.element.ts
diff --git a/src/shared/router/variant-router-slot.element.ts b/src/shared/router/variant-router-slot.element.ts
