asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore(medusa,orchestration,link-modules,modules-sdk): internal services as modules (#4925)

Browse Source
This commit is contained in:
Carlos R. L. Rodrigues
2023-09-04 11:36:05 -03:00
committed by GitHub
parent 85fa90d9c6
commit a4906d0ac0
15 changed files with 348 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/orchestration/src/__tests__/joiner/remote-joiner.ts
+5 -5
View File
@@ -317,13 +317,13 @@ describe("RemoteJoiner", () => {
expect(serviceMock.productService).toHaveBeenCalledTimes(2)
expect(serviceMock.productService).toHaveBeenNthCalledWith(1, {
fields: ["name", "id"],
options: { id: expect.arrayContaining([103, 102]) },
})
expect(serviceMock.productService).toHaveBeenNthCalledWith(2, {
fields: ["handler", "id"],
options: { id: expect.arrayContaining([101, 103]) },
})
expect(serviceMock.productService).toHaveBeenNthCalledWith(2, {
fields: ["name", "id"],
options: { id: expect.arrayContaining([103, 102]) },
})
})
})
packages/orchestration/src/joiner/remote-joiner.ts
+50 -75
View File
@@ -290,46 +290,38 @@ export class RemoteJoiner {
if (!parsedExpands) {
return
}
const stack: [
any[],
Partial<RemoteJoinerQuery>,
Map<string, RemoteExpandProperty>,
string,
Set<string>
][] = [[items, query, parsedExpands, BASE_PATH, new Set()]]
const resolvedPaths = new Set<string>()
const stack: [any[], Partial<RemoteJoinerQuery>, string][] = [
[items, query, BASE_PATH],
]
while (stack.length > 0) {
const [
currentItems,
currentQuery,
currentParsedExpands,
basePath,
resolvedPaths,
] = stack.pop()!
const [currentItems, currentQuery, basePath] = stack.pop()!
for (const [expandedPath, expand] of currentParsedExpands.entries()) {
const isImmediateChildPath = basePath === expand.parent
for (const [expandedPath, expand] of parsedExpands.entries()) {
const isParentPath = expandedPath.startsWith(basePath)
if (!isImmediateChildPath || resolvedPaths.has(expandedPath)) {
if (!isParentPath || resolvedPaths.has(expandedPath)) {
continue
}
resolvedPaths.add(expandedPath)
const property = expand.property || ""
const parentServiceConfig = this.getServiceConfig(
currentQuery.service,
currentQuery.alias
)
await this.expandProperty(currentItems, parentServiceConfig!, expand)
let curItems = currentItems
const expandedPathLevels = expandedPath.split(".")
for (let idx = 1; idx < expandedPathLevels.length - 1; idx++) {
curItems = RemoteJoiner.getNestedItems(
curItems,
expandedPathLevels[idx]
)
}
await this.expandProperty(curItems, expand.parentConfig!, expand)
const nestedItems = RemoteJoiner.getNestedItems(currentItems, property)
if (nestedItems.length > 0) {
const relationship = expand.serviceConfig
let nextProp = currentQuery
if (relationship) {
const relQuery = {
@@ -337,14 +329,7 @@ export class RemoteJoiner {
}
nextProp = relQuery
}
stack.push([
nestedItems,
nextProp,
currentParsedExpands,
expandedPath,
new Set(),
])
stack.push([nestedItems, nextProp, expandedPath])
}
}
}
@@ -538,12 +523,14 @@ export class RemoteJoiner {
}
if (!parsedExpands.has(fullPath)) {
const parentPath = [BASE_PATH, ...currentPath].join(".")
parsedExpands.set(fullPath, {
property: prop,
serviceConfig: currentServiceConfig,
fields,
args,
parent: [BASE_PATH, ...currentPath].join("."),
parent: parentPath,
parentConfig: parsedExpands.get(parentPath).serviceConfig,
})
}
@@ -556,53 +543,41 @@ export class RemoteJoiner {
private groupExpands(
parsedExpands: Map<string, RemoteExpandProperty>
): Map<string, RemoteExpandProperty> {
const sortedParsedExpands = new Map(
Array.from(parsedExpands.entries()).sort()
)
const mergedExpands = new Map<string, RemoteExpandProperty>(
sortedParsedExpands
)
const mergedExpands = new Map<string, RemoteExpandProperty>(parsedExpands)
const mergedPaths = new Map<string, string>()
let lastServiceName = ""
for (const [path, expand] of sortedParsedExpands.entries()) {
for (const [path, expand] of mergedExpands.entries()) {
const currentServiceName = expand.serviceConfig.serviceName
let parentPath = expand.parent
// Check if the parentPath was merged before
while (mergedPaths.has(parentPath)) {
parentPath = mergedPaths.get(parentPath)!
}
const canMerge = currentServiceName === lastServiceName
if (mergedExpands.has(parentPath) && canMerge) {
const parentExpand = mergedExpands.get(parentPath)!
if (parentExpand.serviceConfig.serviceName === currentServiceName) {
const nestedKeys = path.split(".").slice(parentPath.split(".").length)
let targetExpand: any = parentExpand
for (let key of nestedKeys) {
if (!targetExpand.expands) {
targetExpand.expands = {}
}
if (!targetExpand.expands[key]) {
targetExpand.expands[key] = {} as any
}
targetExpand = targetExpand.expands[key]
}
targetExpand.fields = expand.fields
targetExpand.args = expand.args
mergedPaths.set(path, parentPath)
while (parentPath) {
const parentExpand = mergedExpands.get(parentPath)
if (
!parentExpand ||
parentExpand.serviceConfig.serviceName !== currentServiceName
) {
break
}
} else {
lastServiceName = currentServiceName
// Merge the current expand into its parent
const nestedKeys = path.split(".").slice(parentPath.split(".").length)
let targetExpand = parentExpand as Omit<
RemoteExpandProperty,
"expands"
> & { expands?: {} }
for (const key of nestedKeys) {
targetExpand.expands ??= {}
targetExpand = targetExpand.expands[key] ??= {}
}
targetExpand.fields = expand.fields
targetExpand.args = expand.args
mergedExpands.delete(path)
mergedPaths.set(path, parentPath)
parentPath = parentExpand.parent
}
}