merchi_sdk_ts 1.43.0 → 1.43.2

package/dist/entities/file.js

@@ -213,6 +213,10 @@ var MerchiFile = /** @class */ (function (_super) {
         MerchiFile.property({ arrayType: 'ProductionComment' }),
         __metadata("design:type", Array)
     ], MerchiFile.prototype, "productionComments", void 0);
+    __decorate([
+        MerchiFile.property({ arrayType: 'Quote' }),
+        __metadata("design:type", Array)
+    ], MerchiFile.prototype, "quotes", void 0);
     return MerchiFile;
 }(Entity));
 export { MerchiFile };

package/dist/entities/quote.js

@@ -155,6 +155,10 @@ var Quote = /** @class */ (function (_super) {
         Quote.property({ arrayType: 'QuoteItem' }),
         __metadata("design:type", Array)
     ], Quote.prototype, "quoteItems", void 0);
+    __decorate([
+        Quote.property({ arrayType: 'MerchiFile' }),
+        __metadata("design:type", Array)
+    ], Quote.prototype, "files", void 0);
     __decorate([
         Quote.property({ arrayType: 'Assignment' }),
         __metadata("design:type", Array)

package/dist/request.js

@@ -26,17 +26,25 @@ var __values = (this && this.__values) || function(o) {
 };
 // eslint-disable-next-line no-unused-vars
 import { getErrorFromCode } from './constants/errors.js';
+function resolveApiErrorMessage(err) {
+    if (err && typeof err === 'object' && typeof err.message === 'string' && err.message) {
+        return err.message;
+    }
+    if (typeof err === 'string' && err) {
+        return err;
+    }
+    return 'No error message';
+}
 var ApiError = /** @class */ (function (_super) {
     __extends(ApiError, _super);
     function ApiError(err) {
         var _this = this;
-        var message = JSON.stringify(err);
+        var message = resolveApiErrorMessage(err);
         /* istanbul ignore next */
         _this = _super.call(this, message) || this;
         _this.statusCode = err.statusCode;
         _this.errorCode = getErrorFromCode(err.errorCode);
-        _this.errorMessage = err.message ?
-            err.message : 'No error message';
+        _this.errorMessage = message;
         _this.details = err.details;
         _this.name = 'ApiError';
         _this.original = err;

package/dist/request.test.js

@@ -1,4 +1,4 @@
-import { apiFetch } from './request.js';
+import { apiFetch, ApiError } from './request.js';
 import { ErrorType } from './constants/errors.js';
 import { setup, mockFetch } from './test_util.js';
 setup();
@@ -28,11 +28,30 @@ test('will get default errorCode', function () {
     mockFetch(false, { 'statusCode': 404,
         'errorCode': -1,
         'message': 'just a test' }, 404);
-    apiFetch('https://api.merchi.co/', '/test').catch(function (e) {
+    return apiFetch('https://api.merchi.co/', '/test').catch(function (e) {
         expect(e.statusCode).toBe(404);
         expect(e.name).toBe('ApiError');
         expect(e.errorCode).toBe(ErrorType.UNKNOWN_ERROR);
         expect(e.errorMessage).toBe('just a test');
+        expect(e.message).toBe('just a test');
+    });
+});
+test('ApiError keeps plain string messages', function () {
+    var e = new ApiError('empty response');
+    expect(e.message).toBe('empty response');
+    expect(e.errorMessage).toBe('empty response');
+});
+test('ApiError.message is the human-readable text, not serialized JSON', function () {
+    mockFetch(false, {
+        'statusCode': 403,
+        'errorCode': ErrorType.UNKNOWN_ERROR,
+        'message': 'cannot set referrer',
+    }, 403);
+    return apiFetch('https://api.merchi.co/', '/test').catch(function (e) {
+        expect(e.message).toBe('cannot set referrer');
+        expect(e.errorMessage).toBe('cannot set referrer');
+        expect(e.message).not.toContain('errorCode');
+        expect(e.message).not.toContain('statusCode');
     });
 });
 test('ApiError exposes details when the server supplies them', function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merchi_sdk_ts",
-  "version": "1.43.0",
+  "version": "1.43.2",
   "main": "dist/index.js",
   "type": "module",
   "repository": "git@github.com:merchisdk/merchi_sdk_ts.git",

package/src/entities/file.ts

@@ -10,6 +10,7 @@ import { JobNote } from './job_note.js';
 import { Notification } from './notification.js';
 import { Product } from './product.js';
 import { ProductionComment } from './production_comment.js';
+import { Quote } from './quote.js';
 import { Theme } from './theme.js';
 import { User } from './user.js';
 import { Variation } from './variation.js';
@@ -152,6 +153,9 @@ export class MerchiFile extends Entity {
   @MerchiFile.property({arrayType: 'ProductionComment'})
   public productionComments?: ProductionComment[];
 
+  @MerchiFile.property({arrayType: 'Quote'})
+  public quotes?: Quote[];
+
   public isImage = () => {
     if (this.mimetype === undefined) {
       const err = 'mimetype is undefined, did you forget to embed it?';

package/src/entities/quote.ts

@@ -2,6 +2,7 @@ import { Assignment } from './assignment.js';
 import { QuoteItem } from './quote_item.js';
 import { Shipment } from './shipment.js';
 import { Invoice } from './invoice.js';
+import { MerchiFile } from './file.js';
 import { Entity } from '../entity.js';
 import { kahanSum } from '../util/float.js';
 
@@ -32,6 +33,9 @@ export class Quote extends Entity {
   @Quote.property({arrayType: 'QuoteItem'})
   public quoteItems?: QuoteItem[];
 
+  @Quote.property({arrayType: 'MerchiFile'})
+  public files?: MerchiFile[];
+
   @Quote.property({arrayType: 'Assignment'})
   public assignments?: Assignment[];
 

package/src/request.test.ts

@@ -1,4 +1,4 @@
-import { apiFetch } from './request.js';
+import { apiFetch, ApiError } from './request.js';
 import { ErrorType } from './constants/errors.js';
 import { setup, mockFetch } from './test_util.js';
 
@@ -34,11 +34,32 @@ test('will get default errorCode', () => {
     {'statusCode': 404,
       'errorCode': -1,
       'message': 'just a test'}, 404);
-  apiFetch('https://api.merchi.co/', '/test').catch(e => {
+  return apiFetch('https://api.merchi.co/', '/test').catch(e => {
     expect(e.statusCode).toBe(404);
     expect(e.name).toBe('ApiError');
     expect(e.errorCode).toBe(ErrorType.UNKNOWN_ERROR);
     expect(e.errorMessage).toBe('just a test');
+    expect(e.message).toBe('just a test');
+  });
+});
+
+test('ApiError keeps plain string messages', () => {
+  const e = new ApiError('empty response');
+  expect(e.message).toBe('empty response');
+  expect(e.errorMessage).toBe('empty response');
+});
+
+test('ApiError.message is the human-readable text, not serialized JSON', () => {
+  mockFetch(false, {
+    'statusCode': 403,
+    'errorCode': ErrorType.UNKNOWN_ERROR,
+    'message': 'cannot set referrer',
+  }, 403);
+  return apiFetch('https://api.merchi.co/', '/test').catch(e => {
+    expect(e.message).toBe('cannot set referrer');
+    expect(e.errorMessage).toBe('cannot set referrer');
+    expect(e.message).not.toContain('errorCode');
+    expect(e.message).not.toContain('statusCode');
   });
 });
 

package/src/request.ts

@@ -38,6 +38,16 @@ export interface ApiErrorDetails {
   [key: string]: any;
 }
 
+function resolveApiErrorMessage(err: any): string {
+  if (err && typeof err === 'object' && typeof err.message === 'string' && err.message) {
+    return err.message;
+  }
+  if (typeof err === 'string' && err) {
+    return err;
+  }
+  return 'No error message';
+}
+
 export class ApiError extends Error {
   public statusCode?: number;
   public errorCode?: ErrorType;
@@ -52,13 +62,12 @@ export class ApiError extends Error {
   public details?: ApiErrorDetails;
   public original: any;
   public constructor(err: any) {
-    const message = JSON.stringify(err);
+    const message = resolveApiErrorMessage(err);
     /* istanbul ignore next */
     super(message);
     this.statusCode = err.statusCode;
     this.errorCode = getErrorFromCode(err.errorCode);
-    this.errorMessage = err.message ?
-      err.message : 'No error message';
+    this.errorMessage = message;
     this.details = err.details;
     this.name = 'ApiError';
     this.original = err;