@aptly-as/types 2.7.15 → 2.8.1

package/enums/index.d.ts

@@ -83,11 +83,6 @@ export declare enum AptlySignageSignerRef {
     Customer = "customer",
     Admin = "admin"
 }
-export declare enum AptlyErrorCode {
-    Default = "default",
-    InvalidFields = "invalid-fields",
-    SessionExpired = "session-expired"
-}
 export declare enum AptlyQueueDownloadType {
     Document = "document",
     Image = "image"

package/enums/index.js

@@ -95,12 +95,6 @@ export var AptlySignageSignerRef;
     AptlySignageSignerRef["Customer"] = "customer";
     AptlySignageSignerRef["Admin"] = "admin";
 })(AptlySignageSignerRef || (AptlySignageSignerRef = {}));
-export var AptlyErrorCode;
-(function (AptlyErrorCode) {
-    AptlyErrorCode["Default"] = "default";
-    AptlyErrorCode["InvalidFields"] = "invalid-fields";
-    AptlyErrorCode["SessionExpired"] = "session-expired";
-})(AptlyErrorCode || (AptlyErrorCode = {}));
 export var AptlyQueueDownloadType;
 (function (AptlyQueueDownloadType) {
     AptlyQueueDownloadType["Document"] = "document";

package/error/error.d.ts

@@ -1,25 +1,29 @@
+import { AptlyErrorCode } from './error.utils.js';
 export interface AptlyErrorBody {
     name: 'AptlyError';
     status: number;
-    title: string;
+    message: string;
     id?: string;
-    code?: number;
+    code?: AptlyErrorCode;
     detail?: string;
     errors?: AptlyErrorBodySimple[];
     link?: string;
+    title?: string;
     error?: string;
 }
-export type AptlyErrorBodySimple = Pick<AptlyErrorBody, 'status' | 'title' | 'detail' | 'link'>;
+export type AptlyErrorBodySimple = Pick<AptlyErrorBody, 'status' | 'message' | 'detail' | 'link'>;
 export declare class AptlyError extends Error {
     readonly data: Omit<AptlyErrorBody, 'name'>;
     readonly error?: Error | undefined;
     readonly name = "AptlyError";
-    id: string;
-    constructor(data: Omit<AptlyErrorBody, 'name'>, error?: Error | undefined);
+    readonly _status: number;
+    readonly id: string;
     static fromFetchResponse(response: Response): Promise<AptlyError>;
+    static fromResponse(response: Response): Promise<AptlyError>;
+    constructor(data: Omit<AptlyErrorBody, 'name'>, error?: Error | undefined);
     get status(): number;
     get title(): string;
-    get code(): number | undefined;
+    get code(): AptlyErrorCode | undefined;
     get detail(): string | undefined;
     get link(): string | undefined;
     get errors(): AptlyErrorBodySimple[];

package/error/error.js

@@ -1,14 +1,14 @@
 export class AptlyError extends Error {
-    constructor(data, error) {
-        super(data.title);
-        this.data = data;
-        this.error = error;
-        this.name = 'AptlyError';
-        this.id = data.id || '';
+    static fromFetchResponse(response) {
+        return AptlyError.fromResponse(response);
     }
-    static async fromFetchResponse(response) {
-        if (response.headers.get('content-type') !== 'application/json') {
+    static async fromResponse(response) {
+        const contentType = response.headers.get('content-type');
+        if (contentType?.includes('application/json')) {
             const body = await response.json();
+            if (!body.link) {
+                body.link = response.url;
+            }
             if (body.name === AptlyError.name) {
                 return new AptlyError(body);
             }
@@ -16,15 +16,24 @@ export class AptlyError extends Error {
         throw new AptlyError({
             id: 'unknown',
             status: response.status,
-            title: response.statusText,
+            message: response.statusText,
             detail: `Failed to fetch from url: ${response.url}`,
         });
     }
+    constructor(data, error) {
+        super(data.title || data.message);
+        this.data = data;
+        this.error = error;
+        this.name = 'AptlyError';
+        this._status = 500;
+        this._status = data.status;
+        this.id = data.id || '';
+    }
     get status() {
-        return this.data.status;
+        return this._status;
     }
     get title() {
-        return this.data.title;
+        return this.data.message;
     }
     get code() {
         return this.data.code;

package/error/error.utils.d.ts

@@ -0,0 +1,5 @@
+export declare enum AptlyErrorCode {
+    NotFound = 4040,
+    Duplicate = 4090,
+    Error = 5000
+}

package/error/error.utils.js

@@ -0,0 +1,6 @@
+export var AptlyErrorCode;
+(function (AptlyErrorCode) {
+    AptlyErrorCode[AptlyErrorCode["NotFound"] = 4040] = "NotFound";
+    AptlyErrorCode[AptlyErrorCode["Duplicate"] = 4090] = "Duplicate";
+    AptlyErrorCode[AptlyErrorCode["Error"] = 5000] = "Error";
+})(AptlyErrorCode || (AptlyErrorCode = {}));

package/error/index.d.ts

@@ -1 +1,2 @@
 export * from './error.js';
+export * from './error.utils.js';

package/error/index.js

@@ -1 +1,2 @@
 export * from './error.js';
+export * from './error.utils.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptly-as/types",
-  "version": "2.7.15",
+  "version": "2.8.1",
   "description": "Aptly types and enums",
   "type": "module",
   "main": "./index.js",