wip updating types and adding error catching

Author: ReeceM

.gitignore

@@ -1,3 +1,9 @@
+.vscode
 node_modules
+
+# Builds
 dist
+
+# Environment stuff
 env.json
+

.npmignore

@@ -1,3 +1,4 @@
+.github
 node_modules
 env.json
 src

src/API/Slices/index.ts

@@ -1,4 +1,5 @@
 import { Response } from "node-fetch";
+import { SliceModel } from "../../Models/SliceModel";
 import HttpFetch from "../../utils/interface";
 
 
@@ -13,25 +14,40 @@ class Slices {
     });
   }
 
-  public async getOne(slice: string): Promise<Response> {
+  public async getOne(slice: string): Promise<SliceModel> {
+    try {
+      const response = await this.http.get(`https://customtypes.prismic.io/slices/${slice}`);
+      const sliceModel: SliceModel = await response.json();
 
-    return await this.http.get(`https://customtypes.prismic.io/slices/${slice}`);
+      return sliceModel;
+    } catch (error) {
+      console.error(`[ERROR] Unable to fetch the slice: ${slice}`);
+      throw new Error(`[ERROR] Unable to fetch the slice: ${slice}`)
+    }
   }
 
-  public async getAll(): Promise<Response> {
+  public async getAll(): Promise<Array<SliceModel>> {
+    try {
 
-    return await this.http.get('https://customtypes.prismic.io/slices');
+      const response = await this.http.get('https://customtypes.prismic.io/slices');
+
+      const types: Array<SliceModel> = await response.json();
+
+      return types;
+    } catch (error) {
+      throw new Error(error)
+    }
   }
 
-  public async insert(customType: object): Promise<Response> {
+  public async insert(slice: SliceModel): Promise<Response> {
 
-    return await this.http.post('https://customtypes.prismic.io/slices/insert', customType);
+    return await this.http.post('https://slices.prismic.io/slices/insert', slice);
   }
 
-  public async update(customType: object): Promise<Response> {
+  public async update(slice: SliceModel): Promise<Response> {
 
-    return await this.http.post('https://customtypes.prismic.io/slices/update', customType);
+    return await this.http.post('https://customtypes.prismic.io/slices/update', slice);
   }
 }
 
-export default Slices;
+export default Slices;

src/API/Types/index.ts

@@ -1,4 +1,5 @@
 import { Response } from "node-fetch";
+import { TypeModel } from "../../Models/TypeModel";
 import HttpFetch from "../../utils/interface";
 
 class Types {
@@ -13,26 +14,54 @@ class Types {
     });
   }
 
-  public async getOne(customType: string): Promise<Response> {
+  public async getOne(customType: string): Promise<TypeModel> {
 
-    return await this.http.get(`https://customtypes.prismic.io/customtypes/${customType}`);
+    try {
+      const response = await this.http.get(`https://customtypes.prismic.io/customtypes/${customType}`);
+
+      const type: TypeModel = await response.json();
+
+      return type;
+
+    } catch (error) {
+      throw new Error(error)
+    }
   }
 
-  public async getAll(): Promise<Response> {
+  public async getAll(): Promise<Array<TypeModel>> {
+
+    try {
+      const response = await this.http.get('https://customtypes.prismic.io/customtypes');
+      const types: Array<TypeModel> = await response.json()
 
-    return await this.http.get('https://customtypes.prismic.io/customtypes');
+      return types;
+    } catch (error) {
+      throw new Error(error)
+    }
   }
 
 
-  public async insert(customType: object, safe?: boolean): Promise<Response> {
+  public async insert(customType: TypeModel): Promise<Response> {
+
+    if (typeof customType.json !== 'object') {
+      throw new Error("JSON field of custom type isn't and object. Please check if it is correct")
+    }
+
+    try {
+
+      const insertResponse = await this.http.post('https://customtypes.prismic.io/customtypes/insert', customType);
+      const result = insertResponse.json()
+      return result;
 
-    return await this.http.post('https://customtypes.prismic.io/customtypes/insert', customType);
+    } catch (error) {
+      throw new Error(error)
+    }
   }
 
-  public async update(customType: object): Promise<Response> {
+  public async update(customType: TypeModel): Promise<Response> {
 
     return await this.http.post('https://customtypes.prismic.io/customtypes/update', customType);
   }
 }
 
-export default Types;
+export default Types;

src/API/api-interface.ts

@@ -0,0 +1,10 @@
+import { Response } from "node-fetch";
+
+interface ApiInterface {
+  getOne(name: string): Promise<Response>;
+  getAll(): Promise<Response>;
+  insert(data: object): Promise<Response>;
+  update(data: object): Promise<Response>;
+}
+
+export default ApiInterface;

src/Models/SliceModel.ts

@@ -0,0 +1,18 @@
+export interface SliceModel {
+  id: string,
+  type: string,
+  name: string,
+  description?: string,
+  variations: Array<SliceVariation>
+}
+
+export interface SliceVariation {
+  id: string,
+  name: string,
+  docURL?: string | null,
+  imageUrl?: string,
+  version: string,
+  description?: string|null,
+  primary?: Object,
+  items?: Object
+}

src/Models/TypeModel.ts

@@ -0,0 +1,13 @@
+/**
+ * This is a custom type interface.
+ *
+ * This is to make it possible to determine if the returns are correct.
+ */
+
+export interface TypeModel {
+  id: string,
+  label: string,
+  repeatable: boolean,
+  json: Object,
+  status: boolean
+}

src/index.ts

@@ -44,7 +44,7 @@ class Api {
 
       return token;
     } catch (error) {
-      throw new Error(`[Custom Type API] Unable to log in with login details`)
+      throw new Error(`[Custom Type API] Unable to log in with using password & email details`)
     }
   }
 

src/utils/interface.ts

@@ -43,4 +43,4 @@ class HttpFetch implements Handler{
   }
 }
 
-export default HttpFetch
+export default HttpFetch