[codex] structure source-control repository failures (#3336)

Julius Marminge committed 4 months ago

Commit a26f0dc1 parent 6ff6c132 files · +98 −45Browse files

Showing the changes to apps/server/src/sourceControl/SourceControlRepositoryService.ts (1 of 2 files). Show all

Unified · Split

apps/server/src/sourceControl/SourceControlRepositoryService.ts+15−41

   }
 >()("t3/sourceControl/SourceControlRepositoryService") {}
-function detailFromUnknown(cause: unknown): string {
-  if (typeof cause === "object" && cause !== null) {
-    if ("detail" in cause && typeof cause.detail === "string" && cause.detail.length > 0) {
-      return cause.detail;
-    }
-    if ("message" in cause && typeof cause.message === "string" && cause.message.length > 0) {
-      return cause.message;
-    }
-  }
-  return "An unexpected source control error occurred.";
-}
-function repositoryError(input: {
-  readonly operation: string;
-  readonly provider: SourceControlProviderKind;
-  readonly detail: string;
-  readonly cause?: unknown;
-}): SourceControlRepositoryError {
-  return new SourceControlRepositoryError({
-    provider: input.provider,
-    operation: input.operation,
-    detail: input.detail,
-    ...(input.cause === undefined ? {} : { cause: input.cause }),
-  });
-}
 function mapRepositoryError(operation: string, provider: SourceControlProviderKind) {
   return Effect.mapError((cause: unknown) =>
     isSourceControlRepositoryError(cause)
       ? cause
-      : repositoryError({
+      : new SourceControlRepositoryError({
           operation,
           provider,
-          detail: detailFromUnknown(cause),
+          detail: "The source control operation could not be completed.",
           cause,
         }),
   );
     }
     return Effect.fail(
-      repositoryError({
+      new SourceControlRepositoryError({
         operation: input.operation,
         provider: input.provider,
         detail: "Choose a source control provider before continuing.",
     function* (destinationPath: string) {
       const trimmed = destinationPath.trim();
       if (trimmed.length === 0) {
-        return yield* repositoryError({
+        return yield* new SourceControlRepositoryError({
           operation: "cloneRepository",
           provider: "unknown",
           detail: "Choose a destination path before cloning.",
   const prepareDestination = Effect.fn("SourceControlRepositoryService.prepareDestination")(
     function* (destinationPath: string) {
       const normalizedDestination = yield* normalizeDestinationPath(destinationPath);
-      if (yield* fileSystem.exists(normalizedDestination).pipe(Effect.orElseSucceed(() => false))) {
+      if (yield* fileSystem.exists(normalizedDestination)) {
         const entries = yield* fileSystem
           .readDirectory(normalizedDestination, { recursive: false })
           .pipe(
-            Effect.mapError((cause) =>
+            Effect.mapError(
-              repositoryError({
+              (cause) =>
-                operation: "cloneRepository",
+                new SourceControlRepositoryError({
-                provider: "unknown",
+                  operation: "cloneRepository",
-                detail: "Destination path already exists and is not a directory.",
+                  provider: "unknown",
-                cause,
+                  detail: "Destination path already exists and is not a directory.",
-              }),
+                  cause,
+                }),
             ),
           );
         if (entries.length > 0) {
-          return yield* repositoryError({
+          return yield* new SourceControlRepositoryError({
             operation: "cloneRepository",
             provider: "unknown",
             detail: "Destination path already exists and is not empty.",
     }
     if (!remoteUrl) {
-      return yield* repositoryError({
+      return yield* new SourceControlRepositoryError({
         operation: "cloneRepository",
         provider,
         detail: "Enter a repository path or clone URL before cloning.",