tibber-express-utils 3.1.0 → 3.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7,7 +7,7 @@ const hasOwnProperty_1 = require("./utils/hasOwnProperty");
7
7
  * which may be set on the express Request instance. If one isn't found, it returns undefined.
8
8
  */
9
9
  const DefaultContextSelector = request => {
10
- if (!hasOwnProperty_1.hasOwnProperty(request, 'context'))
10
+ if (!(0, hasOwnProperty_1.hasOwnProperty)(request, 'context'))
11
11
  return undefined;
12
12
  return request['context'];
13
13
  };
@@ -1 +1 @@
1
- {"version":3,"file":"DefaultContextSelector.js","sourceRoot":"","sources":["../../src/DefaultContextSelector.ts"],"names":[],"mappings":";;;AACA,2DAAsD;AAEtD;;;GAGG;AACI,MAAM,sBAAsB,GAA6B,OAAO,CAAC,EAAE;IACxE,IAAI,CAAC,+BAAc,CAAC,OAAO,EAAE,SAAS,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1D,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;AAC5B,CAAC,CAAC;AAHW,QAAA,sBAAsB,0BAGjC"}
1
+ {"version":3,"file":"DefaultContextSelector.js","sourceRoot":"","sources":["../../src/DefaultContextSelector.ts"],"names":[],"mappings":";;;AACA,2DAAsD;AAEtD;;;GAGG;AACI,MAAM,sBAAsB,GAA6B,OAAO,CAAC,EAAE;IACxE,IAAI,CAAC,IAAA,+BAAc,EAAC,OAAO,EAAE,SAAS,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1D,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;AAC5B,CAAC,CAAC;AAHW,QAAA,sBAAsB,0BAGjC"}
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
5
9
  }) : (function(o, m, k, k2) {
6
10
  if (k2 === undefined) k2 = k;
7
11
  o[k2] = m[k];
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/errors/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAAkC;AAClC,kDAAgC;AAChC,8CAA4B;AAC5B,uDAAqC;AACrC,kDAAgC;AAChC,wDAAsC;AACtC,gDAA8B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/errors/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,kDAAgC;AAChC,8CAA4B;AAC5B,uDAAqC;AACrC,kDAAgC;AAChC,wDAAsC;AACtC,gDAA8B"}
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
5
9
  }) : (function(o, m, k, k2) {
6
10
  if (k2 === undefined) k2 = k;
7
11
  o[k2] = m[k];
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/handlers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA6B;AAC7B,4CAA0B;AAC1B,8CAA4B;AAC5B,6CAA2B;AAC3B,4CAA0B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/handlers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,4CAA0B;AAC1B,8CAA4B;AAC5B,6CAA2B;AAC3B,4CAA0B"}
@@ -1,3 +1,3 @@
1
1
  import { PathParams } from 'express-serve-static-core';
2
2
  import { ContextSelector, JsonRequestHandler, JsonRouter, Logger } from '../types';
3
- export declare const jsonDelete: <TContext>(jsonRouter: JsonRouter<TContext>, _contextSelector: ContextSelector<TContext>, logger?: Logger | undefined) => <TPayload>(path: PathParams, handler: JsonRequestHandler<TContext, TPayload>) => JsonRouter<TContext>;
3
+ export declare const jsonDelete: <TContext>(jsonRouter: JsonRouter<TContext>, _contextSelector: ContextSelector<TContext>, logger?: Logger) => <TPayload>(path: PathParams, handler: JsonRequestHandler<TContext, TPayload>) => JsonRouter<TContext>;
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.jsonDelete = void 0;
4
4
  const NoContentIfNoCodeOtherwiseOk_1 = require("../NoContentIfNoCodeOtherwiseOk");
5
5
  const jsonMiddleware_1 = require("../jsonMiddleware");
6
- const jsonDelete = (jsonRouter, _contextSelector, logger) => (path, handler) => jsonRouter.delete(path, jsonMiddleware_1.jsonMiddleware(NoContentIfNoCodeOtherwiseOk_1.NoContentIfNoCodeOtherwiseOk, _contextSelector, handler, logger));
6
+ const jsonDelete = (jsonRouter, _contextSelector, logger) => (path, handler) => jsonRouter.delete(path, (0, jsonMiddleware_1.jsonMiddleware)(NoContentIfNoCodeOtherwiseOk_1.NoContentIfNoCodeOtherwiseOk, _contextSelector, handler, logger));
7
7
  exports.jsonDelete = jsonDelete;
8
8
  //# sourceMappingURL=jsonDelete.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"jsonDelete.js","sourceRoot":"","sources":["../../../src/handlers/jsonDelete.ts"],"names":[],"mappings":";;;AACA,kFAA6E;AAC7E,sDAAiD;AAQ1C,MAAM,UAAU,GAAG,CACxB,UAAgC,EAChC,gBAA2C,EAC3C,MAAe,EACf,EAAE,CAAC,CACH,IAAgB,EAChB,OAA+C,EAC/C,EAAE,CACF,UAAU,CAAC,MAAM,CACf,IAAI,EACJ,+BAAc,CACZ,2DAA4B,EAC5B,gBAAgB,EAChB,OAAO,EACP,MAAM,CACP,CACF,CAAC;AAhBS,QAAA,UAAU,cAgBnB"}
1
+ {"version":3,"file":"jsonDelete.js","sourceRoot":"","sources":["../../../src/handlers/jsonDelete.ts"],"names":[],"mappings":";;;AACA,kFAA6E;AAC7E,sDAAiD;AAQ1C,MAAM,UAAU,GACrB,CACE,UAAgC,EAChC,gBAA2C,EAC3C,MAAe,EACf,EAAE,CACJ,CACE,IAAgB,EAChB,OAA+C,EAC/C,EAAE,CACF,UAAU,CAAC,MAAM,CACf,IAAI,EACJ,IAAA,+BAAc,EACZ,2DAA4B,EAC5B,gBAAgB,EAChB,OAAO,EACP,MAAM,CACP,CACF,CAAC;AAlBO,QAAA,UAAU,cAkBjB"}
@@ -1,3 +1,3 @@
1
1
  import { PathParams } from 'express-serve-static-core';
2
2
  import { ContextSelector, JsonRequestHandler, JsonRouter, Logger } from '../types';
3
- export declare const jsonGet: <TContext>(jsonRouter: JsonRouter<TContext>, _contextSelector: ContextSelector<TContext>, logger?: Logger | undefined) => <TPayload>(path: PathParams, handler: JsonRequestHandler<TContext, TPayload>) => JsonRouter<TContext>;
3
+ export declare const jsonGet: <TContext>(jsonRouter: JsonRouter<TContext>, _contextSelector: ContextSelector<TContext>, logger?: Logger) => <TPayload>(path: PathParams, handler: JsonRequestHandler<TContext, TPayload>) => JsonRouter<TContext>;
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.jsonGet = void 0;
4
4
  const NotFoundIfNoCodeOtherwiseOk_1 = require("../NotFoundIfNoCodeOtherwiseOk");
5
5
  const jsonMiddleware_1 = require("../jsonMiddleware");
6
- const jsonGet = (jsonRouter, _contextSelector, logger) => (path, handler) => jsonRouter.get(path, jsonMiddleware_1.jsonMiddleware(NotFoundIfNoCodeOtherwiseOk_1.NotFoundIfNoCodeOtherwiseOk, _contextSelector, handler, logger));
6
+ const jsonGet = (jsonRouter, _contextSelector, logger) => (path, handler) => jsonRouter.get(path, (0, jsonMiddleware_1.jsonMiddleware)(NotFoundIfNoCodeOtherwiseOk_1.NotFoundIfNoCodeOtherwiseOk, _contextSelector, handler, logger));
7
7
  exports.jsonGet = jsonGet;
8
8
  //# sourceMappingURL=jsonGet.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"jsonGet.js","sourceRoot":"","sources":["../../../src/handlers/jsonGet.ts"],"names":[],"mappings":";;;AACA,gFAA2E;AAC3E,sDAAiD;AAQ1C,MAAM,OAAO,GAAG,CACrB,UAAgC,EAChC,gBAA2C,EAC3C,MAAe,EACf,EAAE,CAAC,CACH,IAAgB,EAChB,OAA+C,EAC/C,EAAE,CACF,UAAU,CAAC,GAAG,CACZ,IAAI,EACJ,+BAAc,CACZ,yDAA2B,EAC3B,gBAAgB,EAChB,OAAO,EACP,MAAM,CACP,CACF,CAAC;AAhBS,QAAA,OAAO,WAgBhB"}
1
+ {"version":3,"file":"jsonGet.js","sourceRoot":"","sources":["../../../src/handlers/jsonGet.ts"],"names":[],"mappings":";;;AACA,gFAA2E;AAC3E,sDAAiD;AAQ1C,MAAM,OAAO,GAClB,CACE,UAAgC,EAChC,gBAA2C,EAC3C,MAAe,EACf,EAAE,CACJ,CACE,IAAgB,EAChB,OAA+C,EAC/C,EAAE,CACF,UAAU,CAAC,GAAG,CACZ,IAAI,EACJ,IAAA,+BAAc,EACZ,yDAA2B,EAC3B,gBAAgB,EAChB,OAAO,EACP,MAAM,CACP,CACF,CAAC;AAlBO,QAAA,OAAO,WAkBd"}
@@ -1,3 +1,3 @@
1
1
  import { PathParams } from 'express-serve-static-core';
2
2
  import { ContextSelector, JsonRequestHandler, JsonRouter, Logger } from '../types';
3
- export declare const jsonPatch: <TContext>(jsonRouter: JsonRouter<TContext>, _contextSelector: ContextSelector<TContext>, logger?: Logger | undefined) => <TPayload>(path: PathParams, handler: JsonRequestHandler<TContext, TPayload>) => JsonRouter<TContext>;
3
+ export declare const jsonPatch: <TContext>(jsonRouter: JsonRouter<TContext>, _contextSelector: ContextSelector<TContext>, logger?: Logger) => <TPayload>(path: PathParams, handler: JsonRequestHandler<TContext, TPayload>) => JsonRouter<TContext>;
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.jsonPatch = void 0;
4
4
  const NoContentIfNoCodeOtherwiseOk_1 = require("../NoContentIfNoCodeOtherwiseOk");
5
5
  const jsonMiddleware_1 = require("../jsonMiddleware");
6
- const jsonPatch = (jsonRouter, _contextSelector, logger) => (path, handler) => jsonRouter.patch(path, jsonMiddleware_1.jsonMiddleware(NoContentIfNoCodeOtherwiseOk_1.NoContentIfNoCodeOtherwiseOk, _contextSelector, handler, logger));
6
+ const jsonPatch = (jsonRouter, _contextSelector, logger) => (path, handler) => jsonRouter.patch(path, (0, jsonMiddleware_1.jsonMiddleware)(NoContentIfNoCodeOtherwiseOk_1.NoContentIfNoCodeOtherwiseOk, _contextSelector, handler, logger));
7
7
  exports.jsonPatch = jsonPatch;
8
8
  //# sourceMappingURL=jsonPatch.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"jsonPatch.js","sourceRoot":"","sources":["../../../src/handlers/jsonPatch.ts"],"names":[],"mappings":";;;AACA,kFAA6E;AAC7E,sDAAiD;AAQ1C,MAAM,SAAS,GAAG,CACvB,UAAgC,EAChC,gBAA2C,EAC3C,MAAe,EACf,EAAE,CAAC,CACH,IAAgB,EAChB,OAA+C,EAC/C,EAAE,CACF,UAAU,CAAC,KAAK,CACd,IAAI,EACJ,+BAAc,CACZ,2DAA4B,EAC5B,gBAAgB,EAChB,OAAO,EACP,MAAM,CACP,CACF,CAAC;AAhBS,QAAA,SAAS,aAgBlB"}
1
+ {"version":3,"file":"jsonPatch.js","sourceRoot":"","sources":["../../../src/handlers/jsonPatch.ts"],"names":[],"mappings":";;;AACA,kFAA6E;AAC7E,sDAAiD;AAQ1C,MAAM,SAAS,GACpB,CACE,UAAgC,EAChC,gBAA2C,EAC3C,MAAe,EACf,EAAE,CACJ,CACE,IAAgB,EAChB,OAA+C,EAC/C,EAAE,CACF,UAAU,CAAC,KAAK,CACd,IAAI,EACJ,IAAA,+BAAc,EACZ,2DAA4B,EAC5B,gBAAgB,EAChB,OAAO,EACP,MAAM,CACP,CACF,CAAC;AAlBO,QAAA,SAAS,aAkBhB"}
@@ -1,3 +1,3 @@
1
1
  import { PathParams } from 'express-serve-static-core';
2
2
  import { ContextSelector, JsonRequestHandler, JsonRouter, Logger } from '../types';
3
- export declare const jsonPost: <TContext>(jsonRouter: JsonRouter<TContext>, _contextSelector: ContextSelector<TContext>, logger?: Logger | undefined) => <TPayload>(path: PathParams, handler: JsonRequestHandler<TContext, TPayload>) => JsonRouter<TContext>;
3
+ export declare const jsonPost: <TContext>(jsonRouter: JsonRouter<TContext>, _contextSelector: ContextSelector<TContext>, logger?: Logger) => <TPayload>(path: PathParams, handler: JsonRequestHandler<TContext, TPayload>) => JsonRouter<TContext>;
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.jsonPost = void 0;
4
4
  const NoContentIfNoCodeOtherwiseOk_1 = require("../NoContentIfNoCodeOtherwiseOk");
5
5
  const jsonMiddleware_1 = require("../jsonMiddleware");
6
- const jsonPost = (jsonRouter, _contextSelector, logger) => (path, handler) => jsonRouter.post(path, jsonMiddleware_1.jsonMiddleware(NoContentIfNoCodeOtherwiseOk_1.NoContentIfNoCodeOtherwiseOk, _contextSelector, handler, logger));
6
+ const jsonPost = (jsonRouter, _contextSelector, logger) => (path, handler) => jsonRouter.post(path, (0, jsonMiddleware_1.jsonMiddleware)(NoContentIfNoCodeOtherwiseOk_1.NoContentIfNoCodeOtherwiseOk, _contextSelector, handler, logger));
7
7
  exports.jsonPost = jsonPost;
8
8
  //# sourceMappingURL=jsonPost.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"jsonPost.js","sourceRoot":"","sources":["../../../src/handlers/jsonPost.ts"],"names":[],"mappings":";;;AACA,kFAA6E;AAC7E,sDAAiD;AAQ1C,MAAM,QAAQ,GAAG,CACtB,UAAgC,EAChC,gBAA2C,EAC3C,MAAe,EACf,EAAE,CAAC,CACH,IAAgB,EAChB,OAA+C,EAC/C,EAAE,CACF,UAAU,CAAC,IAAI,CACb,IAAI,EACJ,+BAAc,CACZ,2DAA4B,EAC5B,gBAAgB,EAChB,OAAO,EACP,MAAM,CACP,CACF,CAAC;AAhBS,QAAA,QAAQ,YAgBjB"}
1
+ {"version":3,"file":"jsonPost.js","sourceRoot":"","sources":["../../../src/handlers/jsonPost.ts"],"names":[],"mappings":";;;AACA,kFAA6E;AAC7E,sDAAiD;AAQ1C,MAAM,QAAQ,GACnB,CACE,UAAgC,EAChC,gBAA2C,EAC3C,MAAe,EACf,EAAE,CACJ,CACE,IAAgB,EAChB,OAA+C,EAC/C,EAAE,CACF,UAAU,CAAC,IAAI,CACb,IAAI,EACJ,IAAA,+BAAc,EACZ,2DAA4B,EAC5B,gBAAgB,EAChB,OAAO,EACP,MAAM,CACP,CACF,CAAC;AAlBO,QAAA,QAAQ,YAkBf"}
@@ -1,3 +1,3 @@
1
1
  import { PathParams } from 'express-serve-static-core';
2
2
  import { ContextSelector, JsonRequestHandler, JsonRouter, Logger } from '../types';
3
- export declare const jsonPut: <TContext>(jsonRouter: JsonRouter<TContext>, _contextSelector: ContextSelector<TContext>, logger?: Logger | undefined) => <TPayload>(path: PathParams, handler: JsonRequestHandler<TContext, TPayload>) => JsonRouter<TContext>;
3
+ export declare const jsonPut: <TContext>(jsonRouter: JsonRouter<TContext>, _contextSelector: ContextSelector<TContext>, logger?: Logger) => <TPayload>(path: PathParams, handler: JsonRequestHandler<TContext, TPayload>) => JsonRouter<TContext>;
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.jsonPut = void 0;
4
4
  const NoContentIfNoCodeOtherwiseOk_1 = require("../NoContentIfNoCodeOtherwiseOk");
5
5
  const jsonMiddleware_1 = require("../jsonMiddleware");
6
- const jsonPut = (jsonRouter, _contextSelector, logger) => (path, handler) => jsonRouter.put(path, jsonMiddleware_1.jsonMiddleware(NoContentIfNoCodeOtherwiseOk_1.NoContentIfNoCodeOtherwiseOk, _contextSelector, handler, logger));
6
+ const jsonPut = (jsonRouter, _contextSelector, logger) => (path, handler) => jsonRouter.put(path, (0, jsonMiddleware_1.jsonMiddleware)(NoContentIfNoCodeOtherwiseOk_1.NoContentIfNoCodeOtherwiseOk, _contextSelector, handler, logger));
7
7
  exports.jsonPut = jsonPut;
8
8
  //# sourceMappingURL=jsonPut.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"jsonPut.js","sourceRoot":"","sources":["../../../src/handlers/jsonPut.ts"],"names":[],"mappings":";;;AACA,kFAA6E;AAC7E,sDAAiD;AAQ1C,MAAM,OAAO,GAAG,CACrB,UAAgC,EAChC,gBAA2C,EAC3C,MAAe,EACf,EAAE,CAAC,CACH,IAAgB,EAChB,OAA+C,EAC/C,EAAE,CACF,UAAU,CAAC,GAAG,CACZ,IAAI,EACJ,+BAAc,CACZ,2DAA4B,EAC5B,gBAAgB,EAChB,OAAO,EACP,MAAM,CACP,CACF,CAAC;AAhBS,QAAA,OAAO,WAgBhB"}
1
+ {"version":3,"file":"jsonPut.js","sourceRoot":"","sources":["../../../src/handlers/jsonPut.ts"],"names":[],"mappings":";;;AACA,kFAA6E;AAC7E,sDAAiD;AAQ1C,MAAM,OAAO,GAClB,CACE,UAAgC,EAChC,gBAA2C,EAC3C,MAAe,EACf,EAAE,CACJ,CACE,IAAgB,EAChB,OAA+C,EAC/C,EAAE,CACF,UAAU,CAAC,GAAG,CACZ,IAAI,EACJ,IAAA,+BAAc,EACZ,2DAA4B,EAC5B,gBAAgB,EAChB,OAAO,EACP,MAAM,CACP,CACF,CAAC;AAlBO,QAAA,OAAO,WAkBd"}
@@ -1,5 +1,5 @@
1
1
  export * from './HttpResult';
2
- export * from './jsonRouting';
3
- export * from './jsonMiddleware';
4
2
  export * as Errors from './errors';
3
+ export * from './jsonMiddleware';
4
+ export * from './jsonRouting';
5
5
  export * from './types';
package/dist/src/index.js CHANGED
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
5
9
  }) : (function(o, m, k, k2) {
6
10
  if (k2 === undefined) k2 = k;
7
11
  o[k2] = m[k];
@@ -24,8 +28,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
24
28
  Object.defineProperty(exports, "__esModule", { value: true });
25
29
  exports.Errors = void 0;
26
30
  __exportStar(require("./HttpResult"), exports);
27
- __exportStar(require("./jsonRouting"), exports);
28
- __exportStar(require("./jsonMiddleware"), exports);
29
31
  exports.Errors = __importStar(require("./errors"));
32
+ __exportStar(require("./jsonMiddleware"), exports);
33
+ __exportStar(require("./jsonRouting"), exports);
30
34
  __exportStar(require("./types"), exports);
31
35
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,gDAA8B;AAC9B,mDAAiC;AACjC,mDAAmC;AACnC,0CAAwB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,mDAAmC;AACnC,mDAAiC;AACjC,gDAA8B;AAC9B,0CAAwB"}
@@ -20,7 +20,7 @@ const jsonMiddleware = (httpStatusCodeSelector, contextSelector, handler, logger
20
20
  * This might be used if the handler returns a different object,
21
21
  * from which the HTTP Status Code needs to be manually extracted.
22
22
  */
23
- if (!isHttpResult_1.isHttpResult(result)) {
23
+ if (!(0, isHttpResult_1.isHttpResult)(result)) {
24
24
  const httpStatusCode = httpStatusCodeSelector(result);
25
25
  return res.status(httpStatusCode).json(result);
26
26
  }
@@ -39,10 +39,16 @@ const jsonMiddleware = (httpStatusCodeSelector, contextSelector, handler, logger
39
39
  return res.status(result.statusCode || 200).json(result.payload);
40
40
  }
41
41
  catch (err) {
42
+ let errorAsString;
42
43
  /**
43
44
  * If 'err' is an object that has a toString method, call it to get its string representation.
44
45
  */
45
- const errorAsString = err && err.toString ? err.toString() : err;
46
+ if (err instanceof Error) {
47
+ errorAsString = err.toString();
48
+ }
49
+ else if (typeof err === 'string' || err instanceof String) {
50
+ errorAsString = err;
51
+ }
46
52
  if (logger && logger.error) {
47
53
  logger.error(`ERROR ${req.method} ${req.url} ${errorAsString}`);
48
54
  }
@@ -1 +1 @@
1
- {"version":3,"file":"jsonMiddleware.js","sourceRoot":"","sources":["../../src/jsonMiddleware.ts"],"names":[],"mappings":";;;AACA,qCAAwD;AAExD,uDAAkD;AAE3C,MAAM,cAAc,GAAmB,CAC5C,sBAAsB,EACtB,eAAe,EACf,OAAO,EACP,MAAM,EACN,EAAE;IACF,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QAC3C,IAAI;YACF;;;eAGG;YACH,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAE3C;;;;;;;eAOG;YACH,IAAI,CAAC,2BAAY,CAAC,MAAM,CAAC,EAAE;gBACzB,MAAM,cAAc,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;gBACtD,OAAO,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAChD;YAED;;eAEG;YACH,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;oBACnC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;iBACzC;aACF;YAED;;;eAGG;YACH,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SAClE;QAAC,OAAO,GAAG,EAAE;YACZ;;eAEG;YACH,MAAM,aAAa,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;YACjE,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,EAAE;gBAC1B,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,aAAa,EAAE,CAAC,CAAC;aACjE;YAED;;;eAGG;YACH,IAAI,GAAG,YAAY,4BAAmB,EAAE;gBACtC,MAAM,EAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAC,GAAG,GAAG,CAAC;gBAChE,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC;oBACrE,MAAM;oBACN,QAAQ;oBACR,MAAM;oBACN,KAAK;oBACL,IAAI;iBACL,CAAC,CAAC;aACJ;YAED;;;eAGG;YACH,IAAI,GAAG,YAAY,kBAAS,EAAE;gBAC5B,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,GAAG,CAAC,OAAO,EAAC,CAAC,CAAC;aACnE;YAED;;eAEG;YACH,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,aAAa,EAAC,CAAC,CAAC;SACnD;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAhFW,QAAA,cAAc,kBAgFzB"}
1
+ {"version":3,"file":"jsonMiddleware.js","sourceRoot":"","sources":["../../src/jsonMiddleware.ts"],"names":[],"mappings":";;;AACA,qCAAwD;AAExD,uDAAkD;AAE3C,MAAM,cAAc,GAAmB,CAC5C,sBAAsB,EACtB,eAAe,EACf,OAAO,EACP,MAAM,EACN,EAAE;IACF,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QAC3C,IAAI;YACF;;;eAGG;YACH,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAE3C;;;;;;;eAOG;YACH,IAAI,CAAC,IAAA,2BAAY,EAAC,MAAM,CAAC,EAAE;gBACzB,MAAM,cAAc,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;gBACtD,OAAO,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAChD;YAED;;eAEG;YACH,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;oBACnC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;iBACzC;aACF;YAED;;;eAGG;YACH,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SAClE;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,aAAa,CAAC;YAElB;;eAEG;YACH,IAAI,GAAG,YAAY,KAAK,EAAE;gBACxB,aAAa,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;aAChC;iBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,YAAY,MAAM,EAAE;gBAC3D,aAAa,GAAG,GAAG,CAAC;aACrB;YAED,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,EAAE;gBAC1B,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,aAAa,EAAE,CAAC,CAAC;aACjE;YAED;;;eAGG;YACH,IAAI,GAAG,YAAY,4BAAmB,EAAE;gBACtC,MAAM,EAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAC,GAAG,GAAG,CAAC;gBAChE,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC;oBACrE,MAAM;oBACN,QAAQ;oBACR,MAAM;oBACN,KAAK;oBACL,IAAI;iBACL,CAAC,CAAC;aACJ;YAED;;;eAGG;YACH,IAAI,GAAG,YAAY,kBAAS,EAAE;gBAC5B,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,GAAG,CAAC,OAAO,EAAC,CAAC,CAAC;aACnE;YAED;;eAEG;YACH,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,aAAa,EAAC,CAAC,CAAC;SACnD;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAvFW,QAAA,cAAc,kBAuFzB"}
@@ -17,11 +17,11 @@ const jsonRouting = routingParams => {
17
17
  // Decorate 'jsonRouter' with each HTTP method by injecting Tibber's jsonMiddleware and providing a default
18
18
  // strategy for determining the request's HTTP status code.
19
19
  //
20
- jsonRouter.jsonGet = handlers_1.jsonGet(jsonRouter, _contextSelector, logger);
21
- jsonRouter.jsonPost = handlers_1.jsonPost(jsonRouter, _contextSelector, logger);
22
- jsonRouter.jsonPatch = handlers_1.jsonPatch(jsonRouter, _contextSelector, logger);
23
- jsonRouter.jsonPut = handlers_1.jsonPut(jsonRouter, _contextSelector, logger);
24
- jsonRouter.jsonDelete = handlers_1.jsonDelete(jsonRouter, _contextSelector, logger);
20
+ jsonRouter.jsonGet = (0, handlers_1.jsonGet)(jsonRouter, _contextSelector, logger);
21
+ jsonRouter.jsonPost = (0, handlers_1.jsonPost)(jsonRouter, _contextSelector, logger);
22
+ jsonRouter.jsonPatch = (0, handlers_1.jsonPatch)(jsonRouter, _contextSelector, logger);
23
+ jsonRouter.jsonPut = (0, handlers_1.jsonPut)(jsonRouter, _contextSelector, logger);
24
+ jsonRouter.jsonDelete = (0, handlers_1.jsonDelete)(jsonRouter, _contextSelector, logger);
25
25
  return jsonRouter;
26
26
  };
27
27
  exports.jsonRouting = jsonRouting;
@@ -1 +1 @@
1
- {"version":3,"file":"jsonRouting.js","sourceRoot":"","sources":["../../src/jsonRouting.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAChE,yCAA6E;AAItE,MAAM,WAAW,GAAgB,aAAa,CAAC,EAAE;IACtD;;OAEG;IACH,MAAM,gBAAgB,GACpB,aAAa,CAAC,eAAe,IAAI,+CAAsB,CAAC;IAQ1D;;OAEG;IACH,MAAM,UAAU,GAAG,aAAa,CAAC,aAAqC,CAAC;IACvE,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;IAEpC,EAAE;IACF,2GAA2G;IAC3G,2DAA2D;IAC3D,EAAE;IACF,UAAU,CAAC,OAAO,GAAG,kBAAO,CAAC,UAAU,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACnE,UAAU,CAAC,QAAQ,GAAG,mBAAQ,CAAC,UAAU,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACrE,UAAU,CAAC,SAAS,GAAG,oBAAS,CAAC,UAAU,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACvE,UAAU,CAAC,OAAO,GAAG,kBAAO,CAAC,UAAU,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACnE,UAAU,CAAC,UAAU,GAAG,qBAAU,CAAC,UAAU,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAEzE,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AA9BW,QAAA,WAAW,eA8BtB"}
1
+ {"version":3,"file":"jsonRouting.js","sourceRoot":"","sources":["../../src/jsonRouting.ts"],"names":[],"mappings":";;;AAAA,qEAAgE;AAChE,yCAA6E;AAItE,MAAM,WAAW,GAAgB,aAAa,CAAC,EAAE;IACtD;;OAEG;IACH,MAAM,gBAAgB,GACpB,aAAa,CAAC,eAAe,IAAI,+CAAsB,CAAC;IAQ1D;;OAEG;IACH,MAAM,UAAU,GAAG,aAAa,CAAC,aAAqC,CAAC;IACvE,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;IAEpC,EAAE;IACF,2GAA2G;IAC3G,2DAA2D;IAC3D,EAAE;IACF,UAAU,CAAC,OAAO,GAAG,IAAA,kBAAO,EAAC,UAAU,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACnE,UAAU,CAAC,QAAQ,GAAG,IAAA,mBAAQ,EAAC,UAAU,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACrE,UAAU,CAAC,SAAS,GAAG,IAAA,oBAAS,EAAC,UAAU,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACvE,UAAU,CAAC,OAAO,GAAG,IAAA,kBAAO,EAAC,UAAU,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACnE,UAAU,CAAC,UAAU,GAAG,IAAA,qBAAU,EAAC,UAAU,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAEzE,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AA9BW,QAAA,WAAW,eA8BtB"}
@@ -59,9 +59,9 @@ export declare type JsonRequestHandlerResult<TPayload> = undefined | HttpResult<
59
59
  * The Logger interface whose implementation is to be supplied by the consuming service.
60
60
  */
61
61
  export interface Logger {
62
- debug?(...args: any[]): unknown;
63
- error?(...args: any[]): unknown;
64
- info?(...args: any[]): unknown;
62
+ debug?(...args: unknown[]): unknown;
63
+ error?(...args: unknown[]): unknown;
64
+ info?(...args: unknown[]): unknown;
65
65
  }
66
66
  /**
67
67
  * Maps the JsonRequestHandlerResult of a JsonRequestHandler to the Response
@@ -5,4 +5,4 @@
5
5
  * @param target
6
6
  * @param propertyKey
7
7
  */
8
- export declare const hasOwnProperty: <TTarget extends {}, TPropertyKey extends string | number | symbol>(target: TTarget, propertyKey: TPropertyKey) => target is TTarget & Record<TPropertyKey, unknown>;
8
+ export declare const hasOwnProperty: <TTarget extends {}, TPropertyKey extends PropertyKey>(target: TTarget, propertyKey: TPropertyKey) => target is Record<TPropertyKey, unknown> & TTarget;
package/package.json CHANGED
@@ -1,10 +1,11 @@
1
1
  {
2
2
  "name": "tibber-express-utils",
3
- "version": "3.1.0",
3
+ "version": "3.3.1",
4
4
  "description": "",
5
5
  "main": "./dist/src/index.js",
6
6
  "scripts": {
7
- "test": "ava --verbose",
7
+ "test": "jest --verbose",
8
+ "test-single": "jest --verbose jsonDelete.spec.ts",
8
9
  "lint": "gts lint",
9
10
  "clean": "gts clean",
10
11
  "compile": "tsc",
@@ -22,45 +23,40 @@
22
23
  "files": [
23
24
  "/dist/src"
24
25
  ],
25
- "ava": {
26
- "typescript": {
27
- "rewritePaths": {
28
- "src/": "dist/src/",
29
- "test/": "dist/test/"
30
- }
31
- }
32
- },
33
26
  "author": "",
34
27
  "license": "ISC",
35
28
  "devDependencies": {
36
- "@ava/typescript": "^1.1.1",
37
- "@semantic-release/changelog": "^5.0.1",
38
- "@semantic-release/git": "^9.0.0",
39
- "@snowcoders/sortier": "^3.2.0",
40
- "@types/express": "^4.17.9",
41
- "@types/node": "^14.11.2",
42
- "@types/supertest": "^2.0.10",
43
- "ava": "^3.12.1",
44
- "commitizen": "^4.2.2",
29
+ "@semantic-release/changelog": "^6.0.1",
30
+ "@semantic-release/git": "^10.0.1",
31
+ "@types/express": "^4.17.13",
32
+ "@types/jest": "^28.1.6",
33
+ "@types/node": "^18.7.2",
34
+ "@types/supertest": "^2.0.12",
35
+ "commitizen": "^4.2.5",
45
36
  "conventional-commits": "^1.6.0",
46
- "cz-conventional-changelog": "3.3.0",
47
- "dotenv-cli": "^4.0.0",
48
- "eslint-plugin-ava": "^11.0.0",
49
- "express": "^4.17.1",
50
- "gts": "^3.0.2",
51
- "husky": "^4.3.5",
52
- "lint-staged": "^10.5.3",
53
- "run.env": "^1.1.0",
54
- "semantic-release": "^17.3.0",
55
- "supertest": "^6.0.1",
56
- "typescript": "^4.0.3"
37
+ "cz-conventional-changelog": "^3.3.0",
38
+ "dotenv-cli": "^6.0.0",
39
+ "eslint-plugin-jest": "^26.8.2",
40
+ "eslint-plugin-node": "^11.1.0",
41
+ "express": "^4.18.1",
42
+ "gts": "^4.0.0",
43
+ "husky": "^8.0.1",
44
+ "jest": "^28.1.3",
45
+ "lint-staged": "^13.0.3",
46
+ "postcss": "^8.4.16",
47
+ "semantic-release": "^19.0.3",
48
+ "sortier": "^1.0.1",
49
+ "supertest": "^6.2.4",
50
+ "ts-jest": "^28.0.7",
51
+ "typescript": "^4.7.4",
52
+ "yarn-upgrade-all": "^0.7.1"
57
53
  },
58
54
  "dependencies": {
59
- "es6-error": "^4.0.0"
55
+ "es6-error": "^4.1.1"
60
56
  },
61
57
  "repository": {
62
58
  "type": "git",
63
- "url": "https://github.com/tibbercom/tibber-express-utils.git"
59
+ "url": "https://github.com/tibber/tibber-express-utils.git"
64
60
  },
65
61
  "config": {
66
62
  "commitizen": {
package/CHANGELOG.md DELETED
@@ -1,40 +0,0 @@
1
- # [3.1.0](https://github.com/tibbercom/tibber-express-utils/compare/v3.0.0...v3.1.0) (2020-12-18)
2
-
3
-
4
- ### Bug Fixes
5
-
6
- * fix pre-release glob ([4cb3e05](https://github.com/tibbercom/tibber-express-utils/commit/4cb3e058511d3b3473ac7ec428283bd9f3ee50c3))
7
-
8
-
9
- ### Features
10
-
11
- * add a fake feature for testing pre-releases ([644a0c3](https://github.com/tibbercom/tibber-express-utils/commit/644a0c37e318a770d124f005a1442016893d7ff6))
12
-
13
- # [3.1.0-test-pre-release.1](https://github.com/tibbercom/tibber-express-utils/compare/v3.0.0...v3.1.0-test-pre-release.1) (2020-12-18)
14
-
15
-
16
- ### Bug Fixes
17
-
18
- * fix pre-release glob ([754648b](https://github.com/tibbercom/tibber-express-utils/commit/754648bbd3c5febe33264a91269c6ac4153c324a))
19
-
20
-
21
- ### Features
22
-
23
- * add a fake feature for testing pre-releases ([e8714d9](https://github.com/tibbercom/tibber-express-utils/commit/e8714d97bd5752d9cff0a7fe93515572b4774d31))
24
-
25
- # [3.0.0](https://github.com/tibbercom/tibber-express-utils/compare/v2.1.0...v3.0.0) (2020-12-17)
26
-
27
-
28
- ### Code Refactoring
29
-
30
- * jsonRouting(...) now accepts a single parameter object ([d74906c](https://github.com/tibbercom/tibber-express-utils/commit/d74906c52e3f21bbc4a888babfd70e3b0a7f0625))
31
-
32
-
33
- ### Features
34
-
35
- * json router accepts a logger which is used to log all exceptions during request handling. ([8028038](https://github.com/tibbercom/tibber-express-utils/commit/8028038d3e226ce749d31c776147c4537d3ae3c2))
36
-
37
-
38
- ### BREAKING CHANGES
39
-
40
- * jsonRouting prototype changed.