fix: better create error types

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

arduino-ide-extension/src/browser/contributions/create-contribution.ts

@@ -1,3 +1,4 @@
+import { CompositeTreeNode } from '@theia/core/lib/browser';
 import URI from '@theia/core/lib/common/uri';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { Sketch } from '../../common/protocol';
@@ -25,19 +26,26 @@ export abstract class CloudSketchContribution extends SketchContribution {
     return this.localCacheFsProvider.from(new URI(sketch.uri));
   }
 
-  protected async treeModel(): Promise<CloudSketchbookTreeModel | undefined> {
+  protected async treeModel(): Promise<
+    (CloudSketchbookTreeModel & { root: CompositeTreeNode }) | undefined
+  > {
     const { enabled, session } = this.createFeatures;
     if (enabled && session) {
       const widget = await this.widgetContribution.widget;
       const treeModel = this.treeModelFrom(widget);
       if (treeModel) {
-        return treeModel;
+        const root = treeModel.root;
+        if (CompositeTreeNode.is(root)) {
+          return treeModel as CloudSketchbookTreeModel & {
+            root: CompositeTreeNode;
+          };
+        }
       }
     }
     return undefined;
   }
 
-  treeModelFrom(
+  private treeModelFrom(
     widget: SketchbookWidget
   ): CloudSketchbookTreeModel | undefined {
     for (const treeWidget of widget.getTreeWidgets()) {

arduino-ide-extension/src/browser/contributions/new-cloud-sketch.ts

@@ -18,7 +18,13 @@ import { injectable } from '@theia/core/shared/inversify';
 import { WorkspaceInputDialogProps } from '@theia/workspace/lib/browser/workspace-input-dialog';
 import { v4 } from 'uuid';
 import { CreateUri } from '../create/create-uri';
-import { Create, isConflict, isNotFound } from '../create/typings';
+import {
+  ConflictError,
+  Create,
+  CreateError,
+  isConflict,
+  isNotFound,
+} from '../create/typings';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { WorkspaceInputDialog } from '../theia/workspace/workspace-input-dialog';
 import { CloudSketchbookTree } from '../widgets/cloud-sketchbook/cloud-sketchbook-tree';
@@ -72,24 +78,19 @@ export class NewCloudSketch extends CloudSketchContribution {
     initialValue?: string | undefined
   ): Promise<unknown> {
     const treeModel = await this.treeModel();
-    if (!treeModel) {
-      return undefined;
-    }
-    const rootNode = CompositeTreeNode.is(treeModel.root)
-      ? treeModel.root
-      : undefined;
-    if (!rootNode) {
-      return undefined;
+    if (treeModel) {
+      const rootNode = treeModel.root;
+      return this.openWizard(rootNode, treeModel, initialValue);
     }
-    return this.openWizard(rootNode, treeModel, initialValue);
+    return undefined;
   }
 
   private createNewWithProgress(
     value: string,
     treeModel: CloudSketchbookTreeModel
   ): (progress: Progress) => Promise<unknown> {
     return async (progress: Progress) => {
-      let result: Create.Sketch | undefined | 'conflict';
+      let result: Create.Sketch | undefined | ConflictError;
       try {
         progress.report({
           message: nls.localize(
@@ -101,7 +102,7 @@ export class NewCloudSketch extends CloudSketchContribution {
         result = await this.createApi.createSketch(value);
       } catch (err) {
         if (isConflict(err)) {
-          result = 'conflict';
+          result = err;
         } else {
           throw err;
         }
@@ -117,7 +118,7 @@ export class NewCloudSketch extends CloudSketchContribution {
           await treeModel.refresh();
         }
       }
-      if (result === 'conflict') {
+      if (result instanceof CreateError) {
         return this.createNewSketch(value);
       }
       if (result) {

arduino-ide-extension/src/browser/create/typings.ts

@@ -72,16 +72,20 @@ export class CreateError extends Error {
   }
 }
 
-export function isConflict(err: unknown): boolean {
+export type ConflictError = CreateError & { status: 409 };
+export function isConflict(err: unknown): err is ConflictError {
   return isErrorWithStatusOf(err, 409);
 }
-export function isNotFound(err: unknown): boolean {
+
+export type NotFoundError = CreateError & { status: 404 };
+export function isNotFound(err: unknown): err is NotFoundError {
   return isErrorWithStatusOf(err, 404);
 }
+
 function isErrorWithStatusOf(
   err: unknown,
   status: number
-): err is Error & { status: number } {
+): err is CreateError & { status: number } {
   if (err instanceof CreateError) {
     return err.status === status;
   }