@commitspark/graphql-api 1.0.0-beta.2 → 1.0.0-beta.4

package/package.json

@@ -9,7 +9,7 @@
     "gitops",
     "api"
   ],
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "license": "ISC",
   "private": false,
   "files": [
@@ -42,8 +42,8 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@apollo/server": "^5.0.0",
-    "@commitspark/git-adapter": "^0.13.0",
+    "@apollo/server": "~5.0.0",
+    "@commitspark/git-adapter": "^0.20.0",
     "@graphql-tools/schema": "^9.0.0",
     "@graphql-tools/utils": "^9.0.0"
   },

package/src/graphql/errors.ts

@@ -1,6 +1,7 @@
 import { GraphQLError } from 'graphql'
+import { ErrorCode as AdapterErrorCode } from '@commitspark/git-adapter'
 
-export enum ErrorCode {
+export const enum ErrorCode {
   BAD_USER_INPUT = 'BAD_USER_INPUT',
   NOT_FOUND = 'NOT_FOUND',
   BAD_REPOSITORY_DATA = 'BAD_REPOSITORY_DATA',
@@ -21,7 +22,7 @@ export interface ErrorMetadata {
 
 export const createError = (
   message: string,
-  code: ErrorCode,
+  code: ErrorCode | AdapterErrorCode,
   metaData: ErrorMetadata,
 ): GraphQLError => {
   const serializedFieldValue =

package/src/persistence/persistence.ts

@@ -1,4 +1,4 @@
-import { Entry, GitAdapter } from '@commitspark/git-adapter'
+import { Entry, GitAdapter, GitAdapterError } from '@commitspark/git-adapter'
 import { createError, ErrorCode } from '../graphql/errors'
 
 export async function getTypeById(
@@ -6,15 +6,7 @@ export async function getTypeById(
   commitHash: string,
   id: string,
 ): Promise<string> {
-  const allEntries = await gitAdapter.getEntries(commitHash)
-  const requestedEntry = allEntries.find((entry: Entry) => entry.id === id)
-  if (requestedEntry === undefined) {
-    throw createError(`No entry with id "${id}" exists.`, ErrorCode.NOT_FOUND, {
-      argumentName: 'id',
-      argumentValue: id,
-    })
-  }
-
+  const requestedEntry = await findById(gitAdapter, commitHash, id)
   return requestedEntry.metadata.type
 }
 
@@ -23,10 +15,18 @@ export async function findById(
   commitHash: string,
   id: string,
 ): Promise<Entry> {
-  const allEntries = await gitAdapter.getEntries(commitHash)
+  let allEntries: Entry[]
+  try {
+    allEntries = await gitAdapter.getEntries(commitHash)
+  } catch (err) {
+    if (err instanceof GitAdapterError) {
+      throw createError(err.message, err.code, {})
+    }
+    throw err
+  }
   const requestedEntry = allEntries.find((entry: Entry) => entry.id === id)
   if (requestedEntry === undefined) {
-    throw createError(`No entry with id "${id}" exists.`, ErrorCode.NOT_FOUND, {
+    throw createError(`No entry with ID "${id}" exists.`, ErrorCode.NOT_FOUND, {
       argumentName: 'id',
       argumentValue: id,
     })
@@ -40,7 +40,16 @@ export async function findByType(
   commitHash: string,
   type: string,
 ): Promise<Entry[]> {
-  const allEntries = await gitAdapter.getEntries(commitHash)
+  let allEntries: Entry[]
+  try {
+    allEntries = await gitAdapter.getEntries(commitHash)
+  } catch (err) {
+    if (err instanceof GitAdapterError) {
+      throw createError(err.message, err.code, {})
+    }
+    throw err
+  }
+
   return allEntries.filter((entry: Entry) => entry.metadata.type === type)
 }
 
@@ -50,13 +59,21 @@ export async function findByTypeId(
   type: string,
   id: string,
 ): Promise<Entry> {
-  const allEntries = await gitAdapter.getEntries(commitHash)
+  let allEntries: Entry[]
+  try {
+    allEntries = await gitAdapter.getEntries(commitHash)
+  } catch (err) {
+    if (err instanceof GitAdapterError) {
+      throw createError(err.message, err.code, {})
+    }
+    throw err
+  }
   const requestedEntry = allEntries.find(
     (entry: Entry) => entry.id === id && entry.metadata.type === type,
   )
   if (requestedEntry === undefined) {
     throw createError(
-      `No entry of type "${type}" with id "${id}" exists.`,
+      `No entry of type "${type}" with ID "${id}" exists.`,
       ErrorCode.NOT_FOUND,
       {
         typeName: type,