Merge remote-tracking branch 'origin/master' into master

dist/index.js

@@ -1031,9 +1031,9 @@ class JsonApiClient {
 }
 exports.JsonApiClient = JsonApiClient;
 function getMethod(request, method) {
- return (method !== null && method !== void 0 ? method : typeof request.getMethod == "function")
+ return method !== null && method !== void 0 ? method : (typeof request.getMethod == "function"
  ? request.getMethod()
- : HttpMethods.Post;
+ : HttpMethods.Post);
 }
 exports.getMethod = getMethod;
 function getResponseStatus(e) {

dist/servicestack-client.mjs

@@ -1142,9 +1142,9 @@ export class JsonApiClient {
  }
 }
 export function getMethod(request, method) {
- return (method ?? typeof request.getMethod == "function")
+ return method ?? (typeof request.getMethod == "function"
  ? request.getMethod()
- : HttpMethods.Post;
+ : HttpMethods.Post);
 }
 export function getResponseStatus(e) {
  return e.responseStatus ?? e.ResponseStatus ??

dist/servicestack-client.umd.js

@@ -1245,9 +1245,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
  }());
  exports.JsonApiClient = JsonApiClient;
  function getMethod(request, method) {
- return (method !== null && method !== void 0 ? method : typeof request.getMethod == "function")
+ return method !== null && method !== void 0 ? method : (typeof request.getMethod == "function"
  ? request.getMethod()
- : HttpMethods.Post;
+ : HttpMethods.Post);
  }
  exports.getMethod = getMethod;
  function getResponseStatus(e) {

package.json

@@ -1,7 +1,7 @@
 {
  "name": "@servicestack/client",
  "title": "ServiceStack Client Utils",
- "version": "2.0.11",
+ "version": "2.0.12",
  "description": "ServiceStack's TypeScript library providing convenience utilities in developing web apps. Integrates with ServiceStack's Server features including ServiceClient, Server Events, Error Handling and Validation",
  "homepage": "https://github.com/ServiceStack/servicestack-client",
  "license": "BSD-3-Clause",

src/index.ts

@@ -1455,9 +1455,9 @@ export class JsonApiClient {
 }
 
 export function getMethod(request:any, method?:string) {
- return method ?? typeof (request as any).getMethod == "function"
+ return method ?? (typeof(request as any).getMethod == "function"
  ? (request as any).getMethod()
- : HttpMethods.Post
+ : HttpMethods.Post)
 }
 
 export function getResponseStatus(e:any) {

tests/utils.spec.ts

@@ -7,8 +7,10 @@ import {
  errorResponse,
  errorResponseExcept,
  toObject,
+ getMethod,
 } from '../src/index';
 import {humanify} from "../dist";
+import { Hello } from "./dtos/test.dtos";
 
 describe ('Util Tests', () => {
  it ('Can parse cookie', done => {
@@ -119,4 +121,10 @@ describe ('Util Tests', () => {
  expect(humanify('TheID2WithWord')).eq('The ID2 With Word')
  expect(humanify('Leave me Alone!')).eq('Leave me Alone!')
  })
+
+ it ('Resolves correct HTTP Method', () => {
+ expect(getMethod(new Hello())).eq('POST')
+ expect(getMethod(new Hello(), 'GET')).eq('GET')
+ expect(getMethod(new Hello(), 'PUT')).eq('PUT')
+ })
 });