@lowerdeck/error 1.0.8 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowerdeck/error",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "publishConfig": {
     "access": "public"
   },

package/src/defaultErrors.ts

@@ -25,7 +25,9 @@ export let badRequestError = createError({
   message: 'The request is invalid.'
 });
 
-export function notFoundError(p1: { entity: string; id?: string } & Partial<ErrorData<'not_found', 404>>): ReturnType<typeof createError>;
+export function notFoundError(
+  p1: { entity: string; id?: string } & Partial<ErrorData<'not_found', 404>>
+): ReturnType<typeof createError>;
 export function notFoundError(p1: string, p2?: string | null): ReturnType<typeof createError>;
 export function notFoundError(p1: any, p2?: any): ReturnType<typeof createError> {
   let entity = typeof p1 == 'string' ? p1 : p1.entity;

package/src/error.test.ts

@@ -20,7 +20,7 @@ describe('createError', () => {
     };
     let errorRecord = createError(data);
     let response = errorRecord.toResponse();
-    expect(response).toEqual({ ...data, __typename: 'error', ok: false });
+    expect(response).toEqual({ ...data, object: 'error', ok: false });
   });
 
   test('should create an error record with a response function that can be extended', () => {
@@ -33,7 +33,7 @@ describe('createError', () => {
     let response = errorRecord({ hint: 'This is a hint' }).toResponse();
     expect(response).toEqual({
       ...data,
-      __typename: 'error',
+      object: 'error',
       ok: false,
       hint: 'This is a hint'
     });
@@ -69,6 +69,6 @@ describe('ServiceError', () => {
     });
     let apiError = new ServiceError(errorRecord);
     let response = apiError.toResponse();
-    expect(response).toEqual({ ...errorRecord.data, __typename: 'error', ok: false });
+    expect(response).toEqual({ ...errorRecord.data, object: 'error', ok: false });
   });
 });

package/src/error.ts

@@ -8,31 +8,39 @@ export interface ErrorData<Code extends string, Status extends number> {
   [key: string]: any;
 }
 
+export type ErrorRecordExtension<Code extends string, Status extends number> = <
+  NewCode extends string = Code
+>(
+  extension?: Partial<ErrorData<NewCode, Status>>
+) => ErrorRecord<NewCode, Status>;
+
 export type ErrorRecord<Code extends string, Status extends number> = {
-  __typename: 'error';
+  object: 'error';
   data: ErrorData<Code, Status>;
-  toResponse: () => ErrorData<Code, Status> & { __typename: 'error'; ok: false };
-} & ((extension?: Partial<ErrorData<Code, Status>>) => ErrorRecord<Code, Status>);
+  toResponse: () => ErrorData<Code, Status> & { object: 'error'; ok: false };
+} & ErrorRecordExtension<Code, Status>;
 
 export let createError = <Code extends string, Status extends number>(
   data: ErrorData<Code, Status>
 ): ErrorRecord<Code, Status> => {
   return Object.assign(
-    (extension: Partial<ErrorData<Code, Status>> = {}): ErrorRecord<Code, Status> =>
+    <NewCode extends string = Code>(
+      extension: Partial<ErrorData<NewCode, Status>> = {}
+    ): ErrorRecord<NewCode, Status> =>
       createError({
         ...data,
         ...extension
-      }),
+      }) as any,
     {
-      __typename: 'error' as const,
+      object: 'error' as const,
       data,
-      toResponse: () => ({ __typename: 'error' as const, ok: false as const, ...data })
+      toResponse: () => ({ object: 'error' as const, ok: false as const, ...data })
     }
-  );
+  ) as any;
 };
 
 export class ServiceError<InnerError extends ErrorRecord<any, any>> extends Error {
-  __typename = 'ServiceError' as const;
+  object = 'ServiceError' as const;
 
   private _parent: Error | null = null;
 
@@ -60,12 +68,12 @@ export class ServiceError<InnerError extends ErrorRecord<any, any>> extends Erro
   static fromResponse(raw: ErrorData<any, any>) {
     let data = raw;
     delete data.ok;
-    delete data.__typename;
+    delete data.object;
 
     return new ServiceError(createError(data));
   }
 }
 
 export let isServiceError = (e: any): e is ServiceError<any> => {
-  return e?.__typename === 'ServiceError' || e?.__typename === 'ErrorRecord';
+  return e?.object === 'ServiceError' || e?.object === 'ErrorRecord';
 };