Skip to content

Commit 6901fea

Browse files
chore(lint): enforce catchToOrElseSucceed
1 parent a5d7321 commit 6901fea

7 files changed

Lines changed: 14 additions & 13 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2985,7 +2985,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
29852985
}
29862986
: null,
29872987
),
2988-
Effect.catch(() => Effect.succeed(null)),
2988+
Effect.orElseSucceed(() => null),
29892989
Effect.flatMap((response) =>
29902990
response === null
29912991
? client.raw

‎apps/server/src/preview/ServerBrowserStream.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ const makeHandler = Effect.fnUntraced(function* (browser: ServerBrowser.ServerBr
206206
Effect.as(HttpServerResponse.text("Service Unavailable", { status: 503 })),
207207
),
208208
}),
209-
Effect.catch(() => Effect.succeed(HttpServerResponse.empty())),
209+
Effect.orElseSucceed(() => HttpServerResponse.empty()),
210210
);
211211
});
212212

‎apps/server/src/workspace/WorkspaceFileSystem.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@ export const make = Effect.gen(function* () {
167167
}
168168
},
169169
catch: () => undefined,
170-
// @effect-diagnostics-next-line effectSucceedWithVoid:off - This optional result requires undefined, not the wider void type.
171-
}).pipe(Effect.catch(() => Effect.succeed(undefined)));
170+
}).pipe(Effect.orElseSucceed(() => undefined));
172171
}
173172
return {
174173
kind: "file",

‎packages/client-runtime/src/state/commandPermissions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function makeCommandPermissions<R, E>(
5353
suspendOnWaiting: false,
5454
}).pipe(
5555
Effect.timeoutOption(6_000),
56-
Effect.catch(() => Effect.succeed(Option.none<AuthSessionState>())),
56+
Effect.orElseSucceed(() => Option.none<AuthSessionState>()),
5757
);
5858
const missing = scopes.find(
5959
(scope) => Option.isNone(session) || !sessionGrantsScope(session.value, scope),

‎packages/provider-cursor/src/server/accountUsage.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -355,13 +355,14 @@ export const readCursorAccountUsage = Effect.fn("readCursorAccountUsage")(functi
355355
duration: Duration.seconds(60),
356356
orElse: () => invalid("Account usage read timed out"),
357357
}),
358-
Effect.catch(() =>
359-
Effect.succeed({
360-
accountKey,
361-
records: [],
362-
missing: false,
363-
error: "Cursor account usage could not be read.",
364-
} satisfies CursorAccountUsageReadResult),
358+
Effect.orElseSucceed(
359+
() =>
360+
({
361+
accountKey,
362+
records: [],
363+
missing: false,
364+
error: "Cursor account usage could not be read.",
365+
}) satisfies CursorAccountUsageReadResult,
365366
),
366367
);
367368
});

‎scripts/mobile-native-client.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ const remoteCache = Effect.fn("nativeClient.remoteCache")(
448448
...login,
449449
} satisfies RemoteCache;
450450
},
451-
Effect.catch(() => Effect.succeed(null)),
451+
Effect.orElseSucceed(() => null),
452452
);
453453

454454
const authorized = (remote: RemoteCache, request: HttpClientRequest.HttpClientRequest) =>

‎tsconfig.base.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"namespaceImportPackages": ["@effect/platform-node", "effect"],
2525
"effectFn": ["span", "inferred-span", "suggested-span"],
2626
"diagnosticSeverity": {
27+
"catchToOrElseSucceed": "error",
2728
"unnecessaryFailYieldableError": "error",
2829
"preferSucceedSomeOrNone": "error",
2930
"effectSucceedWithVoid": "error",

0 commit comments

Comments
 (0)