feat: simplify import paths across multiple files for improved clarity and organization

nicosammito · nicosammito · commit 87feb9ccd546 · 2025-12-17T16:10:42.000+01:00
diff --git a/src/components/d-flow-data-type/rules/DFlowDataTypeContainsKeyRule.ts b/src/components/d-flow-data-type/rules/DFlowDataTypeContainsKeyRule.ts
@@ -1,9 +1,10 @@
 import {DFlowDataTypeRule, genericMapping, staticImplements} from "./DFlowDataTypeRule";
 import {DFlowDataTypeReactiveService} from "../DFlowDataType.service";
 import type {
-    DataTypeRulesContainsKeyConfig, Flow,
-    GenericCombinationStrategyType,
-    GenericMapper, LiteralValue,
+    DataTypeRulesContainsKeyConfig,
+    Flow,
+    GenericMapper,
+    LiteralValue,
     NodeParameterValue
 } from "@code0-tech/sagittarius-graphql-types";
 import {useValueValidation} from "../../d-flow-validation/DValueValidation.hook";
diff --git a/src/components/d-flow-data-type/rules/DFlowDataTypeContainsTypeRule.ts b/src/components/d-flow-data-type/rules/DFlowDataTypeContainsTypeRule.ts
@@ -1,8 +1,8 @@
 import {DFlowDataTypeRule, genericMapping, staticImplements} from "./DFlowDataTypeRule";
 import {DFlowDataTypeReactiveService} from "../DFlowDataType.service";
 import type {
-    DataTypeRulesContainsKeyConfig, Flow,
-    GenericCombinationStrategyType,
+    DataTypeRulesContainsKeyConfig,
+    Flow,
     GenericMapper,
     GenericType,
     LiteralValue,
@@ -36,9 +36,15 @@ export class DFlowDataTypeContainsTypeRule {
             const checkAllTypes: boolean[] = genericTypes.map(genericType => {
                 return (value as LiteralValue).value.every((value1: any) => {
                     if (genericType.genericType) {
-                        return useValueValidation({__typename: "LiteralValue", value: value1}, service?.getDataType(genericType)!!, service!!, flow, ((genericType.genericType as GenericType)!!.genericMappers as GenericMapper[]))
+                        return useValueValidation({
+                            __typename: "LiteralValue",
+                            value: value1
+                        }, service?.getDataType(genericType)!!, service!!, flow, ((genericType.genericType as GenericType)!!.genericMappers as GenericMapper[]))
                     }
-                    return useValueValidation({__typename: "LiteralValue", value: value1}, service?.getDataType(genericType)!!, service!!, flow)
+                    return useValueValidation({
+                        __typename: "LiteralValue",
+                        value: value1
+                    }, service?.getDataType(genericType)!!, service!!, flow)
                 })
             })
 
diff --git a/src/components/d-flow-data-type/rules/DFlowDataTypeReturnTypeRule.ts b/src/components/d-flow-data-type/rules/DFlowDataTypeReturnTypeRule.ts
@@ -1,11 +1,12 @@
 import {DFlowDataTypeRule, genericMapping, staticImplements} from "./DFlowDataTypeRule";
 import {DFlowDataTypeReactiveService} from "../DFlowDataType.service";
 import type {
-    DataTypeRulesReturnTypeConfig, Flow,
-    GenericCombinationStrategyType,
+    DataTypeRulesReturnTypeConfig,
+    Flow,
     GenericMapper,
     GenericType,
-    NodeFunction, NodeFunctionIdWrapper,
+    NodeFunction,
+    NodeFunctionIdWrapper,
     NodeParameterValue,
     ReferenceValue
 } from "@code0-tech/sagittarius-graphql-types";
diff --git a/src/components/d-flow-folder/DFlowFolder.tsx b/src/components/d-flow-folder/DFlowFolder.tsx
@@ -5,7 +5,7 @@ import React from "react"
 import {Code0Component, mergeCode0Props, useService, useStore} from "../../utils"
 import {IconChevronDown, IconChevronRight, IconDots, IconFolder, IconFolderOpen} from "@tabler/icons-react"
 import type {Flow, FlowType, Scalars} from "@code0-tech/sagittarius-graphql-types"
-import {DFlowReactiveService} from "../d-flow/DFlow.service"
+import {DFlowReactiveService} from "../d-flow"
 import {ScrollArea, ScrollAreaScrollbar, ScrollAreaThumb, ScrollAreaViewport} from "../scroll-area/ScrollArea"
 import {Flex} from "../flex/Flex"
 import {Text} from "../text/Text"
diff --git a/src/components/d-flow-function/DFlowFunction.input.hook.ts b/src/components/d-flow-function/DFlowFunction.input.hook.ts
@@ -1,5 +1,5 @@
 import {FunctionDefinitionView} from "./DFlowFunction.view";
-import {DFlowDataTypeReactiveService} from "../d-flow-data-type/DFlowDataType.service";
+import {DFlowDataTypeReactiveService} from "../d-flow-data-type";
 import {replaceGenericKeysInType, resolveGenericKeys} from "../../utils/generics";
 import type {DataTypeIdentifier, NodeParameterValue} from "@code0-tech/sagittarius-graphql-types";
 
diff --git a/src/components/d-flow-function/DFlowFunction.return.hook.ts b/src/components/d-flow-function/DFlowFunction.return.hook.ts
@@ -1,5 +1,5 @@
 import {FunctionDefinitionView} from "./DFlowFunction.view";
-import {DFlowDataTypeReactiveService} from "../d-flow-data-type/DFlowDataType.service";
+import {DFlowDataTypeReactiveService} from "../d-flow-data-type";
 import {replaceGenericKeysInType, resolveGenericKeys} from "../../utils/generics";
 import type {DataTypeIdentifier, NodeParameterValue} from "@code0-tech/sagittarius-graphql-types";
 
diff --git a/src/components/d-flow-function/DFlowFunction.service.ts b/src/components/d-flow-function/DFlowFunction.service.ts
@@ -1,4 +1,4 @@
-import {ReactiveArrayService} from "../../utils/reactiveArrayService";
+import {ReactiveArrayService} from "../../utils";
 import {FunctionDefinitionView} from "./DFlowFunction.view";
 import type {FunctionDefinition} from "@code0-tech/sagittarius-graphql-types";
 
diff --git a/src/components/d-flow-function/DFlowFunctionGroupCard.tsx b/src/components/d-flow-function/DFlowFunctionGroupCard.tsx
@@ -1,6 +1,5 @@
 import React, {memo} from "react";
-import {Handle, Node, NodeProps, Position, useStore} from "@xyflow/react";
-import {FLOW_EDGE_RAINBOW} from "../d-flow/DFlow.edges.hook";
+import {Handle, Node, NodeProps, Position} from "@xyflow/react";
 import {Card} from "../card/Card";
 import {Code0Component} from "../../utils";
 
diff --git a/src/components/d-flow-function/DFlowFunctionSuggestionCard.tsx b/src/components/d-flow-function/DFlowFunctionSuggestionCard.tsx
@@ -5,7 +5,7 @@ import {Button} from "../button/Button";
 import {IconPlus} from "@tabler/icons-react";
 import {useSuggestions} from "../d-flow-suggestion/DFlowSuggestion.hook";
 import {useService} from "../../utils";
-import {DFlowReactiveService} from "../d-flow/DFlow.service";
+import {DFlowReactiveService} from "../d-flow";
 import {DFlowSuggestionMenu} from "../d-flow-suggestion/DFlowSuggestionMenu";
 import type {Flow, NodeFunction} from "@code0-tech/sagittarius-graphql-types";
 
diff --git a/src/components/d-flow-function/DFlowFunctionTriggerCard.tsx b/src/components/d-flow-function/DFlowFunctionTriggerCard.tsx
@@ -1,8 +1,8 @@
 import React, {memo} from "react";
-import {Code0Component} from "../../utils/types";
+import {Code0Component} from "../../utils";
 import {Handle, Node, NodeProps, Position, useReactFlow, useStore} from "@xyflow/react";
 import {Text} from "../text/Text";
-import {useService} from "../../utils/contextStore";
+import {useService} from "../../utils";
 import {FileTabsService} from "../file-tabs/FileTabs.service";
 import {Card} from "../card/Card";
 import {Flex} from "../flex/Flex";
diff --git a/src/components/d-flow-input/DFlowInputDataType.tsx b/src/components/d-flow-input/DFlowInputDataType.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import {ValidationProps} from "../form/useForm";
+import {ValidationProps} from "../form";
 import type {
     DataType,
     DataTypeIdentifier,
@@ -13,25 +13,25 @@ import type {
     GenericMapper,
     GenericType
 } from "@code0-tech/sagittarius-graphql-types";
-import {InputMessage} from "../form/InputMessage";
+import {InputMessage} from "../form";
 import "./DFlowInputDataType.style.scss";
-import {TextInput} from "../form/TextInput";
+import {TextInput} from "../form";
 import {Button} from "../button/Button";
 import {IconSettings, IconTrash} from "@tabler/icons-react";
 import {Text} from "../text/Text";
 import {Flex} from "../flex/Flex";
 import {Badge} from "../badge/Badge";
-import {InputLabel} from "../form/InputLabel";
+import {InputLabel} from "../form";
 import {useSuggestions} from "../d-flow-suggestion/DFlowSuggestion.hook";
 import {DFlowSuggestionMenuFooter} from "../d-flow-suggestion/DFlowSuggestionMenuFooter";
 import {toInputSuggestions} from "../d-flow-suggestion/DFlowSuggestionMenu.util";
-import {DFlowSuggestionType} from "../d-flow-suggestion/DFlowSuggestion.view";
+import {DFlowSuggestionType} from "../d-flow-suggestion";
 import {Menu, MenuPortal, MenuTrigger} from "../menu/Menu";
 import {
     InputSuggestion,
     InputSuggestionMenuContent,
     InputSuggestionMenuContentItems
-} from "../form/InputSuggestion";
+} from "../form";
 
 const NON_TYPE_RULE_VARIANTS = new Set<DataTypeRulesVariant>([
     "ITEM_OF_COLLECTION" as DataTypeRulesVariant.ItemOfCollection,
diff --git a/src/components/d-flow-panel/DFlowMiniMap.tsx b/src/components/d-flow-panel/DFlowMiniMap.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import {MiniMap, Panel, useNodes} from "@xyflow/react";
-import {FLOW_EDGE_RAINBOW} from "../d-flow/DFlow.edges.hook";
+import {FLOW_EDGE_RAINBOW} from "../d-flow";
 import "./DFlowMiniMap.style.scss"
 
 export const DFlowMiniMap: React.FC = (props) => {
diff --git a/src/components/d-flow-panel/DFlowPanelControl.tsx b/src/components/d-flow-panel/DFlowPanelControl.tsx
@@ -5,7 +5,7 @@ import {IconPlus, IconTrash} from "@tabler/icons-react";
 import {Panel} from "@xyflow/react";
 import {useService, useStore} from "../../utils";
 import {FileTabsService} from "../file-tabs/FileTabs.service";
-import {DFlowReactiveService} from "../d-flow/DFlow.service";
+import {DFlowReactiveService} from "../d-flow";
 import {Flow, NodeFunction} from "@code0-tech/sagittarius-graphql-types";
 import {Tooltip, TooltipArrow, TooltipContent, TooltipPortal, TooltipTrigger} from "../tooltip/Tooltip";
 import {Text} from "../text/Text";
diff --git a/src/components/d-flow-suggestion/DFlowSuggestion.hook.tsx b/src/components/d-flow-suggestion/DFlowSuggestion.hook.tsx
@@ -3,7 +3,7 @@ import {DFlowDataTypeReactiveService} from "../d-flow-data-type";
 import {DFlowSuggestion, DFlowSuggestionType} from "./DFlowSuggestion.view";
 import {DFlowFunctionReactiveService} from "../d-flow-function";
 import {isMatchingType, replaceGenericsAndSortType, resolveType} from "../../utils/generics";
-import {DFlowReactiveService} from "../d-flow/DFlow.service";
+import {DFlowReactiveService} from "../d-flow";
 import {useReturnType} from "../d-flow-function/DFlowFunction.return.hook";
 import {useInputType} from "../d-flow-function/DFlowFunction.input.hook";
 import type {
diff --git a/src/components/d-flow-suggestion/DFlowSuggestionMenu.tsx b/src/components/d-flow-suggestion/DFlowSuggestionMenu.tsx
@@ -6,7 +6,7 @@ import {
     InputSuggestionMenuContent,
     InputSuggestionMenuContentItems,
     InputSuggestionMenuContentItemsHandle
-} from "../form/InputSuggestion";
+} from "../form";
 import {toInputSuggestions} from "./DFlowSuggestionMenu.util";
 import {DFlowSuggestionMenuSearchBar} from "./DFlowSuggestionMenuSearchBar";
 import {useStoreApi} from "@xyflow/react";
diff --git a/src/components/d-flow-suggestion/DFlowSuggestionMenu.util.tsx b/src/components/d-flow-suggestion/DFlowSuggestionMenu.util.tsx
@@ -1,5 +1,5 @@
 import {DFlowSuggestion, DFlowSuggestionType} from "./DFlowSuggestion.view";
-import {InputSuggestion} from "../form/InputSuggestion";
+import {InputSuggestion} from "../form";
 import React from "react";
 import {IconCircleDot, IconCirclesRelation, IconFileFunctionFilled} from "@tabler/icons-react";
 import {Text} from "../text/Text";
diff --git a/src/components/d-flow-suggestion/DFlowSuggestionMenuSearchBar.tsx b/src/components/d-flow-suggestion/DFlowSuggestionMenuSearchBar.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import {DFlowSuggestionSearchInput} from "./DFlowSuggestionSearchInput";
 import {IconSearch} from "@tabler/icons-react";
-import {Code0Component} from "../../utils/types";
+import {Code0Component} from "../../utils";
 
 export interface DFlowSuggestionMenuSearchBarProps extends Code0Component<HTMLDivElement> {
     onType: (event: React.KeyboardEvent<HTMLInputElement>) => void
diff --git a/src/components/d-flow-validation/DDataTypeValidation.hook.ts b/src/components/d-flow-validation/DDataTypeValidation.hook.ts
@@ -1,4 +1,4 @@
-import {DataTypeView} from "../d-flow-data-type/DFlowDataType.view";
+import {DataTypeView} from "../d-flow-data-type";
 
 const IGNORE_ID_KEYS = ["id", "__typename", "createdAt", "updatedAt", "aliases", "displayMessages", "name", "runtime"];
 
diff --git a/src/components/d-flow-validation/DFlowValidation.tsx b/src/components/d-flow-validation/DFlowValidation.tsx
@@ -2,7 +2,7 @@ import {Panel} from "@xyflow/react";
 import React from "react";
 import type {Scalars} from "@code0-tech/sagittarius-graphql-types";
 import {Flex} from "../flex/Flex";
-import {InspectionSeverity, ValidationResult} from "../../utils/inspection";
+import {InspectionSeverity, ValidationResult} from "../../utils";
 import {Badge} from "../badge/Badge";
 import {IconAlertTriangle, IconExclamationCircle, IconMessageExclamation} from "@tabler/icons-react";
 import "./DFlowValidation.style.scss"
diff --git a/src/components/d-flow-validation/DValueValidation.hook.ts b/src/components/d-flow-validation/DValueValidation.hook.ts
@@ -1,7 +1,7 @@
 import type {Flow, GenericMapper, NodeParameterValue} from "@code0-tech/sagittarius-graphql-types";
 import {RuleMap} from "../d-flow-data-type/rules/DFlowDataTypeRules";
-import {DataTypeView} from "../d-flow-data-type/DFlowDataType.view";
-import {DFlowDataTypeReactiveService} from "../d-flow-data-type/DFlowDataType.service";
+import {DataTypeView} from "../d-flow-data-type";
+import {DFlowDataTypeReactiveService} from "../d-flow-data-type";
 
 export const useValueValidation = (
     value: NodeParameterValue,
diff --git a/src/components/d-resizable/DResizable.stories.tsx b/src/components/d-resizable/DResizable.stories.tsx
@@ -24,6 +24,9 @@ import {Flex} from "../flex/Flex";
 import {Button} from "../button/Button";
 import {Text} from "../text/Text";
 import {DFlowFolder} from "../d-flow-folder";
+import {DataTypeView, DFlowDataTypeReactiveService} from "../d-flow-data-type";
+import {DFlowFunctionReactiveService, FunctionDefinitionView} from "../d-flow-function";
+import {DFlowTypeReactiveService, FlowTypeView} from "../d-flow-type";
 
 const meta: Meta = {
     title: "Dashboard Resizable",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {ReactiveArrayService} from "../../utils/reactiveArrayService";`
	`1`	`+import {ReactiveArrayService} from "../../utils";`
`2`	`2`	`import {FunctionDefinitionView} from "./DFlowFunction.view";`
`3`	`3`	`import type {FunctionDefinition} from "@code0-tech/sagittarius-graphql-types";`
`4`	`4`