Skip to content

Commit b015f08

Browse files
author
nicosammito
committed
refactor: use dataTypeIdentifier directly for reference type resolution and update dependencies
1 parent 099fbdd commit b015f08

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

src/components/d-flow-suggestion/DFlowReferenceSuggestions.hook.tsx

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ interface ExtendedReferenceValue extends ReferenceValue {
3030
parameterIndex?: number
3131
inputTypeIndex?: number
3232
inputTypeIdentifier?: string
33+
dataTypeIdentifier?: DataTypeIdentifier
3334
node: number
3435
depth: number
3536
scope: number[]
@@ -61,7 +62,8 @@ export const useReferenceSuggestions = (
6162
), [dataTypeIdentifier, dataTypeService, dataTypeStore, genericKeys])
6263

6364
const refObjects = useRefObjects(flowId)
64-
const returnTypes = useReturnTypes(flowId)
65+
66+
console.log(refObjects)
6567

6668
return React.useMemo(() => {
6769
if (!resolvedType || !nodeContext) return []
@@ -82,8 +84,7 @@ export const useReferenceSuggestions = (
8284
if (value.depth > depth!) return []
8385
if (value.scope.some(r => !scope!.includes(r))) return []
8486

85-
const returnTypeIdentifier = returnTypes.get(value.nodeFunctionId)
86-
const resolvedRefObjectType = replaceGenericsAndSortType(resolveType(returnTypeIdentifier!, dataTypeService), [])
87+
const resolvedRefObjectType = replaceGenericsAndSortType(resolveType(value.dataTypeIdentifier!, dataTypeService), [])
8788
if (!isMatchingType(resolvedType, resolvedRefObjectType)) return []
8889

8990
return [{
@@ -93,7 +94,7 @@ export const useReferenceSuggestions = (
9394
value: value as ReferenceValue,
9495
}]
9596
})
96-
}, [dataTypeService, nodeContext, nodeParameters, refObjects, resolvedType, returnTypes])
97+
}, [dataTypeService, nodeContext, nodeParameters, refObjects, resolvedType])
9798
}
9899

99100

@@ -144,7 +145,10 @@ const useRefObjects = (flowId: Flow['id']): Array<ExtendedReferenceValue> => {
144145
node: 0,
145146
depth: 0,
146147
nodeFunctionId: "gid://sagittarius/NodeFunction/-1",
147-
scope: [0]
148+
scope: [0],
149+
dataTypeIdentifier: {
150+
dataType: flow?.inputType
151+
},
148152
}, {
149153
dataType: flow?.inputType
150154
})
@@ -201,7 +205,8 @@ const useRefObjects = (flowId: Flow['id']): Array<ExtendedReferenceValue> => {
201205
nodeFunctionId: node?.id!,
202206
parameterIndex: index,
203207
inputTypeIndex: inputIndex,
204-
inputTypeIdentifier: inputType.inputIdentifier!
208+
inputTypeIdentifier: inputType.inputIdentifier!,
209+
dataTypeIdentifier: resolved,
205210
}, resolved, dataTypeService)
206211
})
207212
})
@@ -226,6 +231,7 @@ const referenceExtraction = (nodeContext: ExtendedReferenceValue, dataTypeIdenti
226231
if (!dataTypeIdentifier) return
227232
return referenceExtraction({
228233
...nodeContext,
234+
dataTypeIdentifier: dataTypeIdentifier,
229235
referencePath: [
230236
...(nodeContext.referencePath ?? []),
231237
{

0 commit comments

Comments
 (0)