Skip to content

P1B: Refactor (packages/core/src/integration.ts): Function with many returns (count = 7): draft #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smalinka wants to merge 2 commits into
base: main
Choose a base branch
from
+20 −10
Open

P1B: Refactor (packages/core/src/integration.ts): Function with many returns (count = 7): draft #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e5f94e
Add devcontainer configuration
smalinka Aug 30, 2026
e7bb1fe
Extract isSameMethod helper to remove many-returns smell in integrati…
smalinka Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "opencode",
"image": "oven/bun:1.3",
"customizations": {
"vscode": {
"extensions": ["oven.bun-vscode"]
}
},
"postCreateCommand": "apt-get update && apt-get install -y python3 make g++ git && bun install"
}
20 changes: 10 additions & 10 deletions packages/core/src/integration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,12 @@ type Data = {
integrations: Map<ID, Entry>
}

function isSameMethod(a: Method, b: Method): boolean {
if (a.type !== b.type) return false
if (a.type !== "oauth" || b.type !== "oauth") return true
return a.id === b.id
}

export type Draft = {
list: () => readonly Ref[]
get: (id: ID) => Ref | undefined
Expand Down Expand Up @@ -255,11 +261,9 @@ export const locationLayer = Layer.effect(
if (!draft.integrations.has(implementation.integrationID)) {
draft.integrations.set(implementation.integrationID, current)
}
const index = current.methods.findIndex((method) => {
if (method.type !== implementation.method.type) return false
if (method.type !== "oauth" || implementation.method.type !== "oauth") return true
return method.id === implementation.method.id
})
const index = current.methods.findIndex((method) =>
isSameMethod(method as Method, implementation.method),
)
if (index === -1) current.methods.push(implementation.method as Types.DeepMutable<Method>)
else current.methods[index] = implementation.method as Types.DeepMutable<Method>
if (implementation.method.type === "oauth") {
Expand All @@ -272,11 +276,7 @@ export const locationLayer = Layer.effect(
remove: (integrationID, method) => {
const current = draft.integrations.get(integrationID)
if (!current) return
const index = current.methods.findIndex((candidate) => {
if (candidate.type !== method.type) return false
if (candidate.type !== "oauth" || method.type !== "oauth") return true
return candidate.id === method.id
})
const index = current.methods.findIndex((candidate) => isSameMethod(candidate as Method, method))
if (index !== -1) current.methods.splice(index, 1)
if (method.type === "oauth") current.implementations.delete(method.id)
},
Expand Down
Loading