npm - @pristine-ts/networking - Versions diffs - 0.0.192 → 0.0.196 - Mend

@pristine-ts/networking 0.0.192 → 0.0.196

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.

Files changed (39) hide show

package/dist/lib/cjs/interceptors/default-content-type-response-header.interceptor.js ADDED Viewed

@@ -0,0 +1,75 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultContentTypeResponseHeaderInterceptor = void 0;
+const common_1 = require("@pristine-ts/common");
+const networking_module_keyname_1 = require("../networking.module.keyname");
+const tsyringe_1 = require("tsyringe");
+/**
+ * The Default ContentType Response Header Interceptor intercepts the response of the router and adds the default content-type header to the response.
+ * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
+ */
+let DefaultContentTypeResponseHeaderInterceptor = class DefaultContentTypeResponseHeaderInterceptor {
+    /**
+     * The Default ContentType Response Header Interceptor intercepts the response of the router and adds the default content-type header to the response.
+     * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
+     * @param defaultContentTypeResponseHeader The default Content-Type response header to set on responses that do not already have Content-Types.
+     * @param isActive Whether or not this interceptor is active.
+     * @param logHandler The log handler to output logs.
+     */
+    constructor(defaultContentTypeResponseHeader, isActive, logHandler) {
+        this.defaultContentTypeResponseHeader = defaultContentTypeResponseHeader;
+        this.isActive = isActive;
+        this.logHandler = logHandler;
+    }
+    /**
+     * Intercepts the response from the router and adds the Content-Type header to it if it's not already there, with the default provided.
+     * @param response The response to intercept.
+     * @param request The request that triggered this response.
+     * @param methodNode The methode node.
+     */
+    interceptResponse(response, request, methodNode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isActive === false) {
+                return response;
+            }
+            if (response.hasHeader("content-type")) {
+                return response;
+            }
+            response.setHeader("content-type", this.defaultContentTypeResponseHeader);
+            this.logHandler.debug("Set the default content type response header.", { response });
+            return response;
+        });
+    }
+};
+DefaultContentTypeResponseHeaderInterceptor = __decorate([
+    common_1.tag(common_1.ServiceDefinitionTagEnum.RequestInterceptor),
+    common_1.moduleScoped(networking_module_keyname_1.NetworkingModuleKeyname),
+    tsyringe_1.injectable(),
+    __param(0, tsyringe_1.inject(`%${networking_module_keyname_1.NetworkingModuleKeyname}.defaultContentTypeResponseHeader%`)),
+    __param(1, tsyringe_1.inject(`%${networking_module_keyname_1.NetworkingModuleKeyname}.defaultContentTypeResponseHeader.isActive%`)),
+    __param(2, tsyringe_1.inject("LogHandlerInterface")),
+    __metadata("design:paramtypes", [String, Boolean, Object])
+], DefaultContentTypeResponseHeaderInterceptor);
+exports.DefaultContentTypeResponseHeaderInterceptor = DefaultContentTypeResponseHeaderInterceptor;
+//# sourceMappingURL=default-content-type-response-header.interceptor.js.map

package/dist/lib/cjs/interceptors/default-content-type-response-header.interceptor.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"default-content-type-response-header.interceptor.js","sourceRoot":"","sources":["../../../../src/interceptors/default-content-type-response-header.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAmG;AACnG,4EAAqE;AAGrE,uCAA4C;AAG5C;;;GAGG;AAIH,IAAa,2CAA2C,GAAxD,MAAa,2CAA2C;IAEpD;;;;;;OAMG;IACH,YAAsG,gCAAwC,EAC/B,QAAiB,EACpE,UAA+B;QAFW,qCAAgC,GAAhC,gCAAgC,CAAQ;QAC/B,aAAQ,GAAR,QAAQ,CAAS;QACpE,eAAU,GAAV,UAAU,CAAqB;IAAE,CAAC;IAE9F;;;;;OAKG;IACG,iBAAiB,CAAC,QAAkB,EAAE,OAAgB,EAAE,UAA6B;;YACvF,IAAG,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE;gBACxB,OAAO,QAAQ,CAAC;aACnB;YAED,IAAG,QAAQ,CAAC,SAAS,CAAC,cAAc,CAAC,EAAC;gBAClC,OAAO,QAAQ,CAAC;aACnB;YAED,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,gCAAgC,CAAC,CAAC;YAC1E,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,+CAA+C,EAAE,EAAC,QAAQ,EAAC,CAAC,CAAA;YAElF,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;CACJ,CAAA;AAjCY,2CAA2C;IAHvD,YAAG,CAAC,iCAAwB,CAAC,kBAAkB,CAAC;IAChD,qBAAY,CAAC,mDAAuB,CAAC;IACrC,qBAAU,EAAE;IAUI,WAAA,iBAAM,CAAC,IAAI,mDAAuB,oCAAoC,CAAC,CAAA;IACvE,WAAA,iBAAM,CAAC,IAAI,mDAAuB,6CAA6C,CAAC,CAAA;IAChF,WAAA,iBAAM,CAAC,qBAAqB,CAAC,CAAA;;GAXjC,2CAA2C,CAiCvD;AAjCY,kGAA2C"}

package/dist/lib/cjs/interceptors/interceptors.js CHANGED Viewed

@@ -10,6 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./default-content-type-response-header.interceptor"), exports);
 __exportStar(require("./request-body-converter.interceptor"), exports);
 __exportStar(require("./response-headers.interceptor"), exports);
 //# sourceMappingURL=interceptors.js.map

package/dist/lib/cjs/interceptors/interceptors.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"interceptors.js","sourceRoot":"","sources":["../../../../src/interceptors/interceptors.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAAqD;AACrD,iEAA+C"}
1	+ {"version":3,"file":"interceptors.js","sourceRoot":"","sources":["../../../../src/interceptors/interceptors.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qFAAmE;AACnE,uEAAqD;AACrD,iEAA+C"}

package/dist/lib/cjs/interceptors/request-body-converter.interceptor.js CHANGED Viewed

@@ -26,11 +26,25 @@ const tsyringe_1 = require("tsyringe");
 const common_1 = require("@pristine-ts/common");
 const networking_module_keyname_1 = require("../networking.module.keyname");
 const invalid_body_http_error_1 = require("../errors/invalid-body.http-error");
+/**
+ * The Request Body Converter Interceptor intercepts the request and parses the body based on the Content-tTpe header.
+ * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
+ */
 let RequestBodyConverterInterceptor = class RequestBodyConverterInterceptor {
+    /**
+     * The Request Body Converter Interceptor intercepts the request and parses the body based on the Content-Type header.
+     * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
+     * @param isActive Whether or not this interceptor is active.
+     * @param logHandler The log handler to output logs.
+     */
     constructor(isActive, logHandler) {
         this.isActive = isActive;
         this.logHandler = logHandler;
     }
+    /**
+     * Intercepts the request and parses the body based on it's Content-Type header.
+     * @param request The request to intercept.
+     */
     interceptRequest(request) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isActive === false) {
@@ -78,7 +92,7 @@ RequestBodyConverterInterceptor = __decorate([
     common_1.tag(common_1.ServiceDefinitionTagEnum.RequestInterceptor),
     common_1.moduleScoped(networking_module_keyname_1.NetworkingModuleKeyname),
     tsyringe_1.injectable(),
-    __param(0, tsyringe_1.inject("%" + networking_module_keyname_1.NetworkingModuleKeyname + ".request_body_converter.is_active%")),
+    __param(0, tsyringe_1.inject("%" + networking_module_keyname_1.NetworkingModuleKeyname + ".requestBodyConverter.isActive%")),
     __param(1, tsyringe_1.inject("LogHandlerInterface")),
     __metadata("design:paramtypes", [Boolean, Object])
 ], RequestBodyConverterInterceptor);

package/dist/lib/cjs/interceptors/request-body-converter.interceptor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"request-body-converter.interceptor.js","sourceRoot":"","sources":["../../../../src/interceptors/request-body-converter.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA4C;AAE5C,gDAAyF;AACzF,4EAAqE;AAErE,+EAAuE;~~AAKvE~~,IAAa,+BAA+B,GAA5C,MAAa,+BAA+B;~~IACxC~~,~~YAA2G~~,QAAiB,~~EAChE~~,UAA+B;~~QADgB~~,aAAQ,GAAR,QAAQ,CAAS;~~QAChE~~,eAAU,GAAV,UAAU,CAAqB;IAC3F,CAAC;~~IAEK~~,gBAAgB,CAAC,OAAgB;;YACnC,IAAG,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE;gBACxB,OAAO,OAAO,CAAC;aAClB;YAED,IAAG,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,KAAK,EAAE;gBAC5C,OAAO,OAAO,CAAC;aAClB;YAED,MAAM,WAAW,GAAW,OAAO,CAAC,SAAS,CAAC,cAAc,CAAW,CAAC;YAExE,QAAQ,WAAW,CAAC,WAAW,EAAE,EAAE;gBAC/B,KAAK,kBAAkB;oBAGnB,QAAQ,OAAO,OAAO,CAAC,IAAI,EAAE;wBACzB,KAAK,WAAW;4BACZ,OAAO,OAAO,CAAC;wBACnB,KAAK,QAAQ;4BACT,IAAG,OAAO,CAAC,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE;gCAClC,MAAM,YAAY,GAAG,kHAAkH,CAAC;gCACxI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gCAEpC,MAAM,IAAI,8CAAoB,CAAC,YAAY,CAAC,CAAC;6BAChD;4BACD,OAAO,OAAO,CAAC;wBAEnB,KAAK,QAAQ;4BACT,IAAI;gCACA,IAAG,OAAO,CAAC,IAAI,EAAE;oCACb,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;iCAC3C;6BACJ;4BACD,OAAO,CAAC,EAAE;gCACN,MAAM,YAAY,GAAG,kIAAkI,CAAC;gCACxJ,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gCAEpC,MAAM,IAAI,8CAAoB,CAAC,YAAY,CAAC,CAAC;6BAChD;4BACD,MAAM;wBAEV;4BACI,MAAM,YAAY,GAAG,iGAAiG,CAAC;4BACvH,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;4BAEpC,MAAM,IAAI,8CAAoB,CAAC,YAAY,CAAC,CAAC;qBACpD;aAGR;YAED,OAAO,OAAO,CAAC;QACnB,CAAC;KAAA;CAEJ,CAAA;~~AA3DY~~,+BAA+B;IAH3C,YAAG,CAAC,iCAAwB,CAAC,kBAAkB,CAAC;IAChD,qBAAY,CAAC,mDAAuB,CAAC;IACrC,qBAAU,EAAE;~~IAEI~~,WAAA,iBAAM,CAAC,GAAG,GAAG,mDAAuB,GAAG,~~oCAAoC~~,CAAC,CAAA;~~IAC5E~~,WAAA,iBAAM,CAAC,qBAAqB,CAAC,CAAA;;~~GAFjC~~,+BAA+B,~~CA2D3C~~;~~AA3DY~~,0EAA+B"}
1	+ {"version":3,"file":"request-body-converter.interceptor.js","sourceRoot":"","sources":["../../../../src/interceptors/request-body-converter.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA4C;AAE5C,gDAAyF;AACzF,4EAAqE;AAErE,+EAAuE;AAEvE;;;GAGG;AAIH,IAAa,+BAA+B,GAA5C,MAAa,+BAA+B;IAExC;;;;;OAKG;IACH,YAAwG,QAAiB,EAC7D,UAA+B;QADa,aAAQ,GAAR,QAAQ,CAAS;QAC7D,eAAU,GAAV,UAAU,CAAqB;IAC3F,CAAC;IAED;;;OAGG;IACG,gBAAgB,CAAC,OAAgB;;YACnC,IAAG,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE;gBACxB,OAAO,OAAO,CAAC;aAClB;YAED,IAAG,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,KAAK,EAAE;gBAC5C,OAAO,OAAO,CAAC;aAClB;YAED,MAAM,WAAW,GAAW,OAAO,CAAC,SAAS,CAAC,cAAc,CAAW,CAAC;YAExE,QAAQ,WAAW,CAAC,WAAW,EAAE,EAAE;gBAC/B,KAAK,kBAAkB;oBAGnB,QAAQ,OAAO,OAAO,CAAC,IAAI,EAAE;wBACzB,KAAK,WAAW;4BACZ,OAAO,OAAO,CAAC;wBACnB,KAAK,QAAQ;4BACT,IAAG,OAAO,CAAC,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE;gCAClC,MAAM,YAAY,GAAG,kHAAkH,CAAC;gCACxI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gCAEpC,MAAM,IAAI,8CAAoB,CAAC,YAAY,CAAC,CAAC;6BAChD;4BACD,OAAO,OAAO,CAAC;wBAEnB,KAAK,QAAQ;4BACT,IAAI;gCACA,IAAG,OAAO,CAAC,IAAI,EAAE;oCACb,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;iCAC3C;6BACJ;4BACD,OAAO,CAAC,EAAE;gCACN,MAAM,YAAY,GAAG,kIAAkI,CAAC;gCACxJ,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gCAEpC,MAAM,IAAI,8CAAoB,CAAC,YAAY,CAAC,CAAC;6BAChD;4BACD,MAAM;wBAEV;4BACI,MAAM,YAAY,GAAG,iGAAiG,CAAC;4BACvH,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;4BAEpC,MAAM,IAAI,8CAAoB,CAAC,YAAY,CAAC,CAAC;qBACpD;aAGR;YAED,OAAO,OAAO,CAAC;QACnB,CAAC;KAAA;CAEJ,CAAA;AAtEY,+BAA+B;IAH3C,YAAG,CAAC,iCAAwB,CAAC,kBAAkB,CAAC;IAChD,qBAAY,CAAC,mDAAuB,CAAC;IACrC,qBAAU,EAAE;IASI,WAAA,iBAAM,CAAC,GAAG,GAAG,mDAAuB,GAAG,iCAAiC,CAAC,CAAA;IACzE,WAAA,iBAAM,CAAC,qBAAqB,CAAC,CAAA;;GATjC,+BAA+B,CAsE3C;AAtEY,0EAA+B"}

package/dist/lib/cjs/interceptors/response-headers.interceptor.js CHANGED Viewed

@@ -24,6 +24,12 @@ const tsyringe_1 = require("tsyringe");
  * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
  */
 let ResponseHeadersInterceptor = class ResponseHeadersInterceptor {
+    /**
+     * Intercepts the response from the router and adds the headers specified by the response header decorator.
+     * @param response The response to intercept.
+     * @param request The request that triggered this response.
+     * @param methodNode The methode node.
+     */
     interceptResponse(response, request, methodNode) {
         return __awaiter(this, void 0, void 0, function* () {
             if (methodNode && methodNode.route.context && methodNode.route.context.hasOwnProperty("responseHeaders")) {

package/dist/lib/cjs/interceptors/response-headers.interceptor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"response-headers.interceptor.js","sourceRoot":"","sources":["../../../../src/interceptors/response-headers.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,gDAAmG;AACnG,4EAAqE;AAGrE,uCAAoC;AACpC;;;GAGG;AAIH,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;~~IAC7B~~,iBAAiB,CAAC,QAAkB,EAAE,OAAgB,EAAE,UAA6B;;YACvF,IAAG,UAAU,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAC;gBACpG,QAAQ,CAAC,UAAU,iCAAK,QAAQ,CAAC,OAAO,GAAK,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;aAC3F;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;CACJ,CAAA;~~AARY~~,0BAA0B;IAHtC,YAAG,CAAC,iCAAwB,CAAC,kBAAkB,CAAC;IAChD,qBAAY,CAAC,mDAAuB,CAAC;IACrC,qBAAU,EAAE;GACA,0BAA0B,~~CAQtC~~;~~AARY~~,gEAA0B"}
1	+ {"version":3,"file":"response-headers.interceptor.js","sourceRoot":"","sources":["../../../../src/interceptors/response-headers.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,gDAAmG;AACnG,4EAAqE;AAGrE,uCAAoC;AACpC;;;GAGG;AAIH,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IAEnC;;;;;OAKG;IACG,iBAAiB,CAAC,QAAkB,EAAE,OAAgB,EAAE,UAA6B;;YACvF,IAAG,UAAU,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAC;gBACpG,QAAQ,CAAC,UAAU,iCAAK,QAAQ,CAAC,OAAO,GAAK,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;aAC3F;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;CACJ,CAAA;AAfY,0BAA0B;IAHtC,YAAG,CAAC,iCAAwB,CAAC,kBAAkB,CAAC;IAChD,qBAAY,CAAC,mDAAuB,CAAC;IACrC,qBAAU,EAAE;GACA,0BAA0B,CAetC;AAfY,gEAA0B"}

package/dist/lib/cjs/networking.module.js CHANGED Viewed

@@ -33,13 +33,38 @@ exports.NetworkingModule = {
         telemetry_1.TelemetryModule,
     ],
     configurationDefinitions: [
+        /**
+         * Whether or not the request body converter interceptor is active.
+         */
         {
-            parameterName: networking_module_keyname_1.NetworkingModuleKeyname + ".request_body_converter.is_active",
+            parameterName: networking_module_keyname_1.NetworkingModuleKeyname + ".requestBodyConverter.isActive",
             isRequired: false,
             defaultValue: true,
             defaultResolvers: [
                 new configuration_1.BooleanResolver(new configuration_1.EnvironmentVariableResolver("PRISTINE_NETWORKING_REQUEST_BODY_CONVERTER_IS_ACTIVE")),
             ],
+        },
+        /**
+         * Whether or not the default content type response header interceptor is active.
+         */
+        {
+            parameterName: networking_module_keyname_1.NetworkingModuleKeyname + ".defaultContentTypeResponseHeader.isActive",
+            isRequired: false,
+            defaultValue: true,
+            defaultResolvers: [
+                new configuration_1.BooleanResolver(new configuration_1.EnvironmentVariableResolver("PRISTINE_NETWORKING_DEFAULT_CONTENT_TYPE_RESPONSE_HEADER_IS_ACTIVE")),
+            ],
+        },
+        /**
+         * The default Content-Type response header to set on responses that do not already have Content-Types.
+         */
+        {
+            parameterName: networking_module_keyname_1.NetworkingModuleKeyname + ".defaultContentTypeResponseHeader",
+            isRequired: false,
+            defaultValue: "application/json",
+            defaultResolvers: [
+                new configuration_1.EnvironmentVariableResolver("PRISTINE_NETWORKING_DEFAULT_CONTENT_TYPE_RESPONSE_HEADER"),
+            ],
         }
     ],
 };

package/dist/lib/cjs/networking.module.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"networking.module.js","sourceRoot":"","sources":["../../../src/networking.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,2EAAoE;AACpE,oDAAqD;AACrD,sDAAuD;AACvD,8DAAwF;AAExF,0DAAwC;AACxC,kDAAgC;AAChC,sDAAoC;AACpC,8DAA4C;AAC5C,0DAAwC;AACxC,oDAAkC;AAClC,kDAAgC;AAChC,gDAA8B;AAC9B,wDAAsC;AACtC,gDAA8B;AAE9B,2CAAyB;AAEZ,QAAA,gBAAgB,GAAoB;IAC7C,OAAO,EAAE,mDAAuB;IAChC,aAAa,EAAE;QACX,yBAAc;QACd,2BAAe;KAClB;IACD,wBAAwB,EAAE;QACtB;YACI,aAAa,EAAE,mDAAuB,GAAG,~~mCAAmC~~;~~YAC5E~~,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;YAClB,gBAAgB,EAAE;gBACd,IAAI,+BAAe,CAAC,IAAI,2CAA2B,CAAC,sDAAsD,CAAC,CAAC;aAC/G;SACJ;KACJ;CACJ,CAAA"}
1	+ {"version":3,"file":"networking.module.js","sourceRoot":"","sources":["../../../src/networking.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,2EAAoE;AACpE,oDAAqD;AACrD,sDAAuD;AACvD,8DAAwF;AAExF,0DAAwC;AACxC,kDAAgC;AAChC,sDAAoC;AACpC,8DAA4C;AAC5C,0DAAwC;AACxC,oDAAkC;AAClC,kDAAgC;AAChC,gDAA8B;AAC9B,wDAAsC;AACtC,gDAA8B;AAE9B,2CAAyB;AAEZ,QAAA,gBAAgB,GAAoB;IAC7C,OAAO,EAAE,mDAAuB;IAChC,aAAa,EAAE;QACX,yBAAc;QACd,2BAAe;KAClB;IACD,wBAAwB,EAAE;QACtB;;WAEG;QACH;YACI,aAAa,EAAE,mDAAuB,GAAG,gCAAgC;YACzE,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;YAClB,gBAAgB,EAAE;gBACd,IAAI,+BAAe,CAAC,IAAI,2CAA2B,CAAC,sDAAsD,CAAC,CAAC;aAC/G;SACJ;QAED;;WAEG;QACH;YACI,aAAa,EAAE,mDAAuB,GAAG,4CAA4C;YACrF,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;YAClB,gBAAgB,EAAE;gBACd,IAAI,+BAAe,CAAC,IAAI,2CAA2B,CAAC,oEAAoE,CAAC,CAAC;aAC7H;SACJ;QAED;;WAEG;QACH;YACI,aAAa,EAAE,mDAAuB,GAAG,mCAAmC;YAC5E,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,kBAAkB;YAChC,gBAAgB,EAAE;gBACd,IAAI,2CAA2B,CAAC,0DAA0D,CAAC;aAC9F;SACJ;KACJ;CACJ,CAAA"}

package/dist/lib/cjs/nodes/path-router.node.js CHANGED Viewed

@@ -5,6 +5,7 @@ const router_node_1 = require("./router.node");
 const method_router_node_1 = require("./method-router.node");
 const path_router_instantiation_error_1 = require("../errors/path-router-instantiation.error");
 const path_router_adding_error_1 = require("../errors/path-router-adding.error");
+const url_util_1 = require("../utils/url.util");
 /**
  * This class represents a Path Node in the Router Node. It can never be a leaf node and will always have children.
  */
@@ -45,8 +46,20 @@ class PathRouterNode extends router_node_1.RouterNode {
             this.children.push(new method_router_node_1.MethodRouterNode(this, method, route, levelFromRoot + 1));
             return;
         }
-        // Loop over our children that are of PathRouterNode and check if the next path matches
-        const matchedChild = this.children.filter(child => child instanceof PathRouterNode).find((child) => child.matches(splitPaths[1]));
+        let matchedChild;
+        if (url_util_1.UrlUtil.isPathACatchAll(splitPaths[1])) {
+            // If this is a catch all we can only match with a catch all.
+            matchedChild = this.children.filter(child => child instanceof PathRouterNode).find((child) => child.isCatchAll());
+        }
+        else if (url_util_1.UrlUtil.isPathARouteParameter(splitPaths[1])) {
+            // If this is a catch all we can only match with a catch all.
+            matchedChild = this.children.filter(child => child instanceof PathRouterNode).find((child) => child.isRouteParameter());
+        }
+        else {
+            // Loop over our children that are of PathRouterNode and check if the next path matches,
+            // but if it's not a catch all we can't match with a catch all.
+            matchedChild = this.children.filter(child => child instanceof PathRouterNode).find((child) => child.matches(splitPaths[1]) && child.isCatchAll() === false && child.isRouteParameter() === false);
+        }
         // If there's a matched child, call the add method on it and return.
         if (matchedChild !== undefined) {
             // Remove the first part of the path as it is used by the current node.
@@ -127,21 +140,13 @@ class PathRouterNode extends router_node_1.RouterNode {
      * This method return whether or not this pathRouterNode's path is a catch-all path: "/*"
      */
     isCatchAll() {
-        return this.path.startsWith("/*");
+        return url_util_1.UrlUtil.isPathACatchAll(this.path);
     }
     /**
      * This method returns whether or not this pathRouterNode represents a route parameter, e.g.: /{id} or /:id
      */
     isRouteParameter() {
-        // If the current path is a path parameter, meaning has services/{id-of-service}
-        if (this.path.startsWith("/{") && this.path.endsWith("}")) {
-            return true;
-        }
-        // We also support path parameter written as services/:id-of-service
-        if (this.path.startsWith("/:")) {
-            return true;
-        }
-        return false;
+        return url_util_1.UrlUtil.isPathARouteParameter(this.path);
     }
     /**
      * This method returns whether the current path matches a path. We have to check if this node is a RouteParameter

package/dist/lib/cjs/nodes/path-router.node.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"path-router.node.js","sourceRoot":"","sources":["../../../../src/nodes/path-router.node.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAEzC,6DAAsD;AAEtD,+FAAuF;AACvF,iFAAyE;~~AAEzE~~;;GAEG;AACH,MAAa,cAAe,SAAQ,wBAAU;IAC1C;;;OAGG;IACH,YAAmC,IAAY,EAAE,MAAuB;QACpE,KAAK,EAAE,CAAC;QADuB,SAAI,GAAJ,IAAI,CAAQ;QAG3C,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;YAChC,MAAM,IAAI,8DAA4B,CAAC,4CAA4C,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SACtG;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED;;;;;;OAMG;IACH,GAAG,CAAC,UAAoB,EAAE,MAA2B,EAAE,KAAY,EAAE,aAAqB;QACtF,wEAAwE;QACxE,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE;YAChE,OAAO;SACV;QAED,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAEnC,6HAA6H;QAC7H,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,4FAA4F;YAC5F,MAAM,4BAA4B,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,YAAY,qCAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,KAAiB,EAAE,EAAE,CAAE,KAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;YAE9K,IAAI,4BAA4B,KAAK,SAAS,EAAE;gBAC5C,MAAM,IAAI,gDAAqB,CAAC,4DAA4D,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;aAClI;YAED,0EAA0E;YAC1E,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,qCAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC;YACjF,OAAO;SACV;QAED,~~uFAAuF~~;~~QACvF~~,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,YAAY,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,KAAiB,EAAE,EAAE,CAAE,KAAwB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;~~QAElK~~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~~IAAI~~,CAAC,~~IAAI~~,CAAC,~~UAAU~~,CAAC,IAAI,CAAC,CAAC;~~IACtC~~,CAAC;IAED;;OAEG;IACH,gBAAgB;QACZ,~~gFAAgF;QAChF,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACvD,~~OAAO,~~IAAI~~,CAAC~~;SACf;QAED~~,~~oEAAoE;QACpE~~,~~IAAI,IAAI,~~CAAC,IAAI,CAAC,~~UAAU,CAAC,~~IAAI,CAAC,~~EAAE~~;~~YAC5B~~,~~OAAO,IAAI,~~CAAC;~~SACf;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;~~IAED;;;;;OAKG;IACH,OAAO,CAAC,IAAY;QAChB,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE;YACnB,OAAO,IAAI,CAAC;SACf;QAED,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE;YACzB,OAAO,IAAI,CAAC;SACf;QAED,OAAO,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC;IAC9B,CAAC;CACJ;~~AAtLD~~,~~wCAsLC~~"}
1	+ {"version":3,"file":"path-router.node.js","sourceRoot":"","sources":["../../../../src/nodes/path-router.node.ts"],"names":[],"mappings":"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"}

package/dist/lib/cjs/router.js CHANGED Viewed

@@ -30,6 +30,7 @@ const url_util_1 = require("./utils/url.util");
 const not_found_http_error_1 = require("./errors/not-found.http-error");
 const path_router_node_1 = require("./nodes/path-router.node");
 const route_1 = require("./models/route");
+const method_router_node_1 = require("./nodes/method-router.node");
 const forbidden_http_error_1 = require("./errors/forbidden.http-error");
 const controller_method_parameter_decorator_resolver_1 = require("./resolvers/controller-method-parameter-decorator.resolver");
 const url_parse_1 = __importDefault(require("url-parse"));
@@ -61,6 +62,37 @@ let Router = class Router {
         // This property is used to track whether the router has been already been properly instantiated or not.
         this.setupCompleted = false;
     }
+    /**
+     * This method returns the whole route tree as a string.
+     */
+    getRouteTree() {
+        let message = "";
+        message = this.getRouteTreeLevel(this.root, message, 1);
+        return message;
+    }
+    /**
+     * This method takes the existing message and appends the following levels to it.
+     * It calls itself recursively.
+     * @param node The node to print the following levels.
+     * @param message The existing message on which to append.
+     * @param level The level at which we are at.
+     */
+    getRouteTreeLevel(node, message, level) {
+        for (const child of node.children) {
+            // @ts-ignore
+            for (let i = 0; i < level; i++) {
+                message += "\t";
+            }
+            if (child instanceof path_router_node_1.PathRouterNode) {
+                message += "--" + child.path + "\n";
+            }
+            if (child instanceof method_router_node_1.MethodRouterNode) {
+                message += "--" + child.method + "\n";
+            }
+            message = this.getRouteTreeLevel(child, message, level + 1);
+        }
+        return message;
+    }
     /**
      * This method registers a Route into the Route Tree maintained by the router.
      *
@@ -124,6 +156,7 @@ let Router = class Router {
             }
         });
         this.setupCompleted = true;
+        this.loghandler.debug("Route tree: \n" + this.getRouteTree());
     }
     /**
      * This method receives a Request object, identifies the "path" its trying to hit, navigates the internally

package/dist/lib/cjs/router.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/router.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/router.ts"],"names":[],"mappings":"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"}

package/dist/lib/cjs/utils/url.util.js CHANGED Viewed

@@ -39,6 +39,28 @@ class UrlUtil {
         }
         return paths;
     }
+    /**
+     *
+     * @param path Must start with a '/'.
+     */
+    static isPathARouteParameter(path) {
+        // If the current path is a path parameter, meaning has services/{id-of-service}
+        if (path.startsWith("/{") && path.endsWith("}")) {
+            return true;
+        }
+        // We also support path parameter written as services/:id-of-service
+        if (path.startsWith("/:")) {
+            return true;
+        }
+        return false;
+    }
+    /**
+     *
+     * @param path Must start with a '/'.
+     */
+    static isPathACatchAll(path) {
+        return path.startsWith("/*");
+    }
 }
 exports.UrlUtil = UrlUtil;
 //# sourceMappingURL=url.util.js.map

package/dist/lib/cjs/utils/url.util.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"url.util.js","sourceRoot":"","sources":["../../../../src/utils/url.util.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,OAAO;IAChB;;;;;;;;;OASG;IACI,MAAM,CAAC,SAAS,CAAC,IAAY;QAChC,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,IAAI,KAAK,GAAa,EAAE,CAAC;QAEzB,gHAAgH;QAChH,4FAA4F;QAC5F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAClC,IAAG,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;gBAChB,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;gBACzB,MAAM,GAAG,EAAE,CAAC;aACf;iBACI;gBACD,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAA;aACpB;SACJ;QAED,uEAAuE;QACvE,IAAG,MAAM,KAAK,EAAE,EAAE;YACd,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;SAC5B;QAED,kFAAkF;QAClF,IAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;YAChC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SAC5C;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;~~AAxCD~~,~~0BAwCC~~"}
1	+ {"version":3,"file":"url.util.js","sourceRoot":"","sources":["../../../../src/utils/url.util.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,OAAO;IAChB;;;;;;;;;OASG;IACI,MAAM,CAAC,SAAS,CAAC,IAAY;QAChC,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,IAAI,KAAK,GAAa,EAAE,CAAC;QAEzB,gHAAgH;QAChH,4FAA4F;QAC5F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAClC,IAAG,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;gBAChB,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;gBACzB,MAAM,GAAG,EAAE,CAAC;aACf;iBACI;gBACD,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAA;aACpB;SACJ;QAED,uEAAuE;QACvE,IAAG,MAAM,KAAK,EAAE,EAAE;YACd,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;SAC5B;QAED,kFAAkF;QAClF,IAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;YAChC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SAC5C;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,qBAAqB,CAAC,IAAY;QAC5C,gFAAgF;QAChF,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC7C,OAAO,IAAI,CAAC;SACf;QAED,oEAAoE;QACpE,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO,IAAI,CAAC;SACf;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,eAAe,CAAC,IAAY;QACtC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;CACJ;AAlED,0BAkEC"}

package/dist/lib/esm/interceptors/default-content-type-response-header.interceptor.js ADDED Viewed

@@ -0,0 +1,72 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { moduleScoped, ServiceDefinitionTagEnum, tag } from "@pristine-ts/common";
+import { NetworkingModuleKeyname } from "../networking.module.keyname";
+import { injectable, inject } from "tsyringe";
+/**
+ * The Default ContentType Response Header Interceptor intercepts the response of the router and adds the default content-type header to the response.
+ * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
+ */
+let DefaultContentTypeResponseHeaderInterceptor = class DefaultContentTypeResponseHeaderInterceptor {
+    /**
+     * The Default ContentType Response Header Interceptor intercepts the response of the router and adds the default content-type header to the response.
+     * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
+     * @param defaultContentTypeResponseHeader The default Content-Type response header to set on responses that do not already have Content-Types.
+     * @param isActive Whether or not this interceptor is active.
+     * @param logHandler The log handler to output logs.
+     */
+    constructor(defaultContentTypeResponseHeader, isActive, logHandler) {
+        this.defaultContentTypeResponseHeader = defaultContentTypeResponseHeader;
+        this.isActive = isActive;
+        this.logHandler = logHandler;
+    }
+    /**
+     * Intercepts the response from the router and adds the Content-Type header to it if it's not already there, with the default provided.
+     * @param response The response to intercept.
+     * @param request The request that triggered this response.
+     * @param methodNode The methode node.
+     */
+    interceptResponse(response, request, methodNode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isActive === false) {
+                return response;
+            }
+            if (response.hasHeader("content-type")) {
+                return response;
+            }
+            response.setHeader("content-type", this.defaultContentTypeResponseHeader);
+            this.logHandler.debug("Set the default content type response header.", { response });
+            return response;
+        });
+    }
+};
+DefaultContentTypeResponseHeaderInterceptor = __decorate([
+    tag(ServiceDefinitionTagEnum.RequestInterceptor),
+    moduleScoped(NetworkingModuleKeyname),
+    injectable(),
+    __param(0, inject(`%${NetworkingModuleKeyname}.defaultContentTypeResponseHeader%`)),
+    __param(1, inject(`%${NetworkingModuleKeyname}.defaultContentTypeResponseHeader.isActive%`)),
+    __param(2, inject("LogHandlerInterface")),
+    __metadata("design:paramtypes", [String, Boolean, Object])
+], DefaultContentTypeResponseHeaderInterceptor);
+export { DefaultContentTypeResponseHeaderInterceptor };
+//# sourceMappingURL=default-content-type-response-header.interceptor.js.map

package/dist/lib/esm/interceptors/default-content-type-response-header.interceptor.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"default-content-type-response-header.interceptor.js","sourceRoot":"","sources":["../../../../src/interceptors/default-content-type-response-header.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAC,YAAY,EAAqB,wBAAwB,EAAE,GAAG,EAAC,MAAM,qBAAqB,CAAC;AACnG,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAGrE,OAAO,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,UAAU,CAAC;AAG5C;;;GAGG;AAIH,IAAa,2CAA2C,GAAxD,MAAa,2CAA2C;IAEpD;;;;;;OAMG;IACH,YAAsG,gCAAwC,EAC/B,QAAiB,EACpE,UAA+B;QAFW,qCAAgC,GAAhC,gCAAgC,CAAQ;QAC/B,aAAQ,GAAR,QAAQ,CAAS;QACpE,eAAU,GAAV,UAAU,CAAqB;IAAE,CAAC;IAE9F;;;;;OAKG;IACG,iBAAiB,CAAC,QAAkB,EAAE,OAAgB,EAAE,UAA6B;;YACvF,IAAG,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE;gBACxB,OAAO,QAAQ,CAAC;aACnB;YAED,IAAG,QAAQ,CAAC,SAAS,CAAC,cAAc,CAAC,EAAC;gBAClC,OAAO,QAAQ,CAAC;aACnB;YAED,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,gCAAgC,CAAC,CAAC;YAC1E,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,+CAA+C,EAAE,EAAC,QAAQ,EAAC,CAAC,CAAA;YAElF,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;CACJ,CAAA;AAjCY,2CAA2C;IAHvD,GAAG,CAAC,wBAAwB,CAAC,kBAAkB,CAAC;IAChD,YAAY,CAAC,uBAAuB,CAAC;IACrC,UAAU,EAAE;IAUI,WAAA,MAAM,CAAC,IAAI,uBAAuB,oCAAoC,CAAC,CAAA;IACvE,WAAA,MAAM,CAAC,IAAI,uBAAuB,6CAA6C,CAAC,CAAA;IAChF,WAAA,MAAM,CAAC,qBAAqB,CAAC,CAAA;;GAXjC,2CAA2C,CAiCvD;SAjCY,2CAA2C"}

package/dist/lib/esm/interceptors/interceptors.js CHANGED Viewed

@@ -1,3 +1,4 @@
+export * from "./default-content-type-response-header.interceptor";
 export * from "./request-body-converter.interceptor";
 export * from "./response-headers.interceptor";
 //# sourceMappingURL=interceptors.js.map

package/dist/lib/esm/interceptors/interceptors.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"interceptors.js","sourceRoot":"","sources":["../../../../src/interceptors/interceptors.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC"}
1	+ {"version":3,"file":"interceptors.js","sourceRoot":"","sources":["../../../../src/interceptors/interceptors.ts"],"names":[],"mappings":"AAAA,cAAc,oDAAoD,CAAC;AACnE,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC"}

package/dist/lib/esm/interceptors/request-body-converter.interceptor.js CHANGED Viewed

@@ -23,11 +23,25 @@ import { injectable, inject } from "tsyringe";
 import { moduleScoped, ServiceDefinitionTagEnum, tag } from "@pristine-ts/common";
 import { NetworkingModuleKeyname } from "../networking.module.keyname";
 import { InvalidBodyHttpError } from "../errors/invalid-body.http-error";
+/**
+ * The Request Body Converter Interceptor intercepts the request and parses the body based on the Content-tTpe header.
+ * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
+ */
 let RequestBodyConverterInterceptor = class RequestBodyConverterInterceptor {
+    /**
+     * The Request Body Converter Interceptor intercepts the request and parses the body based on the Content-Type header.
+     * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
+     * @param isActive Whether or not this interceptor is active.
+     * @param logHandler The log handler to output logs.
+     */
     constructor(isActive, logHandler) {
         this.isActive = isActive;
         this.logHandler = logHandler;
     }
+    /**
+     * Intercepts the request and parses the body based on it's Content-Type header.
+     * @param request The request to intercept.
+     */
     interceptRequest(request) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isActive === false) {
@@ -75,7 +89,7 @@ RequestBodyConverterInterceptor = __decorate([
     tag(ServiceDefinitionTagEnum.RequestInterceptor),
     moduleScoped(NetworkingModuleKeyname),
     injectable(),
-    __param(0, inject("%" + NetworkingModuleKeyname + ".request_body_converter.is_active%")),
+    __param(0, inject("%" + NetworkingModuleKeyname + ".requestBodyConverter.isActive%")),
     __param(1, inject("LogHandlerInterface")),
     __metadata("design:paramtypes", [Boolean, Object])
 ], RequestBodyConverterInterceptor);

package/dist/lib/esm/interceptors/request-body-converter.interceptor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"request-body-converter.interceptor.js","sourceRoot":"","sources":["../../../../src/interceptors/request-body-converter.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAC,YAAY,EAAW,wBAAwB,EAAE,GAAG,EAAC,MAAM,qBAAqB,CAAC;AACzF,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAErE,OAAO,EAAC,oBAAoB,EAAC,MAAM,mCAAmC,CAAC;~~AAKvE~~,IAAa,+BAA+B,GAA5C,MAAa,+BAA+B;~~IACxC~~,~~YAA2G~~,QAAiB,~~EAChE~~,UAA+B;~~QADgB~~,aAAQ,GAAR,QAAQ,CAAS;~~QAChE~~,eAAU,GAAV,UAAU,CAAqB;IAC3F,CAAC;~~IAEK~~,gBAAgB,CAAC,OAAgB;;YACnC,IAAG,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE;gBACxB,OAAO,OAAO,CAAC;aAClB;YAED,IAAG,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,KAAK,EAAE;gBAC5C,OAAO,OAAO,CAAC;aAClB;YAED,MAAM,WAAW,GAAW,OAAO,CAAC,SAAS,CAAC,cAAc,CAAW,CAAC;YAExE,QAAQ,WAAW,CAAC,WAAW,EAAE,EAAE;gBAC/B,KAAK,kBAAkB;oBAGnB,QAAQ,OAAO,OAAO,CAAC,IAAI,EAAE;wBACzB,KAAK,WAAW;4BACZ,OAAO,OAAO,CAAC;wBACnB,KAAK,QAAQ;4BACT,IAAG,OAAO,CAAC,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE;gCAClC,MAAM,YAAY,GAAG,kHAAkH,CAAC;gCACxI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gCAEpC,MAAM,IAAI,oBAAoB,CAAC,YAAY,CAAC,CAAC;6BAChD;4BACD,OAAO,OAAO,CAAC;wBAEnB,KAAK,QAAQ;4BACT,IAAI;gCACA,IAAG,OAAO,CAAC,IAAI,EAAE;oCACb,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;iCAC3C;6BACJ;4BACD,OAAO,CAAC,EAAE;gCACN,MAAM,YAAY,GAAG,kIAAkI,CAAC;gCACxJ,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gCAEpC,MAAM,IAAI,oBAAoB,CAAC,YAAY,CAAC,CAAC;6BAChD;4BACD,MAAM;wBAEV;4BACI,MAAM,YAAY,GAAG,iGAAiG,CAAC;4BACvH,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;4BAEpC,MAAM,IAAI,oBAAoB,CAAC,YAAY,CAAC,CAAC;qBACpD;aAGR;YAED,OAAO,OAAO,CAAC;QACnB,CAAC;KAAA;CAEJ,CAAA;~~AA3DY~~,+BAA+B;IAH3C,GAAG,CAAC,wBAAwB,CAAC,kBAAkB,CAAC;IAChD,YAAY,CAAC,uBAAuB,CAAC;IACrC,UAAU,EAAE;~~IAEI~~,WAAA,MAAM,CAAC,GAAG,GAAG,uBAAuB,GAAG,~~oCAAoC~~,CAAC,CAAA;~~IAC5E~~,WAAA,MAAM,CAAC,qBAAqB,CAAC,CAAA;;~~GAFjC~~,+BAA+B,~~CA2D3C~~;~~SA3DY~~,+BAA+B"}
1	+ {"version":3,"file":"request-body-converter.interceptor.js","sourceRoot":"","sources":["../../../../src/interceptors/request-body-converter.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAC,YAAY,EAAW,wBAAwB,EAAE,GAAG,EAAC,MAAM,qBAAqB,CAAC;AACzF,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAErE,OAAO,EAAC,oBAAoB,EAAC,MAAM,mCAAmC,CAAC;AAEvE;;;GAGG;AAIH,IAAa,+BAA+B,GAA5C,MAAa,+BAA+B;IAExC;;;;;OAKG;IACH,YAAwG,QAAiB,EAC7D,UAA+B;QADa,aAAQ,GAAR,QAAQ,CAAS;QAC7D,eAAU,GAAV,UAAU,CAAqB;IAC3F,CAAC;IAED;;;OAGG;IACG,gBAAgB,CAAC,OAAgB;;YACnC,IAAG,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE;gBACxB,OAAO,OAAO,CAAC;aAClB;YAED,IAAG,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,KAAK,EAAE;gBAC5C,OAAO,OAAO,CAAC;aAClB;YAED,MAAM,WAAW,GAAW,OAAO,CAAC,SAAS,CAAC,cAAc,CAAW,CAAC;YAExE,QAAQ,WAAW,CAAC,WAAW,EAAE,EAAE;gBAC/B,KAAK,kBAAkB;oBAGnB,QAAQ,OAAO,OAAO,CAAC,IAAI,EAAE;wBACzB,KAAK,WAAW;4BACZ,OAAO,OAAO,CAAC;wBACnB,KAAK,QAAQ;4BACT,IAAG,OAAO,CAAC,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE;gCAClC,MAAM,YAAY,GAAG,kHAAkH,CAAC;gCACxI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gCAEpC,MAAM,IAAI,oBAAoB,CAAC,YAAY,CAAC,CAAC;6BAChD;4BACD,OAAO,OAAO,CAAC;wBAEnB,KAAK,QAAQ;4BACT,IAAI;gCACA,IAAG,OAAO,CAAC,IAAI,EAAE;oCACb,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;iCAC3C;6BACJ;4BACD,OAAO,CAAC,EAAE;gCACN,MAAM,YAAY,GAAG,kIAAkI,CAAC;gCACxJ,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gCAEpC,MAAM,IAAI,oBAAoB,CAAC,YAAY,CAAC,CAAC;6BAChD;4BACD,MAAM;wBAEV;4BACI,MAAM,YAAY,GAAG,iGAAiG,CAAC;4BACvH,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;4BAEpC,MAAM,IAAI,oBAAoB,CAAC,YAAY,CAAC,CAAC;qBACpD;aAGR;YAED,OAAO,OAAO,CAAC;QACnB,CAAC;KAAA;CAEJ,CAAA;AAtEY,+BAA+B;IAH3C,GAAG,CAAC,wBAAwB,CAAC,kBAAkB,CAAC;IAChD,YAAY,CAAC,uBAAuB,CAAC;IACrC,UAAU,EAAE;IASI,WAAA,MAAM,CAAC,GAAG,GAAG,uBAAuB,GAAG,iCAAiC,CAAC,CAAA;IACzE,WAAA,MAAM,CAAC,qBAAqB,CAAC,CAAA;;GATjC,+BAA+B,CAsE3C;SAtEY,+BAA+B"}

package/dist/lib/esm/interceptors/response-headers.interceptor.js CHANGED Viewed

@@ -21,6 +21,12 @@ import { injectable } from "tsyringe";
  * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
  */
 let ResponseHeadersInterceptor = class ResponseHeadersInterceptor {
+    /**
+     * Intercepts the response from the router and adds the headers specified by the response header decorator.
+     * @param response The response to intercept.
+     * @param request The request that triggered this response.
+     * @param methodNode The methode node.
+     */
     interceptResponse(response, request, methodNode) {
         return __awaiter(this, void 0, void 0, function* () {
             if (methodNode && methodNode.route.context && methodNode.route.context.hasOwnProperty("responseHeaders")) {

package/dist/lib/esm/interceptors/response-headers.interceptor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"response-headers.interceptor.js","sourceRoot":"","sources":["../../../../src/interceptors/response-headers.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAC,YAAY,EAAqB,wBAAwB,EAAE,GAAG,EAAC,MAAM,qBAAqB,CAAC;AACnG,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAGrE,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AACpC;;;GAGG;AAIH,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;~~IAC7B~~,iBAAiB,CAAC,QAAkB,EAAE,OAAgB,EAAE,UAA6B;;YACvF,IAAG,UAAU,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAC;gBACpG,QAAQ,CAAC,UAAU,iCAAK,QAAQ,CAAC,OAAO,GAAK,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;aAC3F;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;CACJ,CAAA;~~AARY~~,0BAA0B;IAHtC,GAAG,CAAC,wBAAwB,CAAC,kBAAkB,CAAC;IAChD,YAAY,CAAC,uBAAuB,CAAC;IACrC,UAAU,EAAE;GACA,0BAA0B,~~CAQtC~~;~~SARY~~,0BAA0B"}
1	+ {"version":3,"file":"response-headers.interceptor.js","sourceRoot":"","sources":["../../../../src/interceptors/response-headers.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAC,YAAY,EAAqB,wBAAwB,EAAE,GAAG,EAAC,MAAM,qBAAqB,CAAC;AACnG,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAGrE,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AACpC;;;GAGG;AAIH,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IAEnC;;;;;OAKG;IACG,iBAAiB,CAAC,QAAkB,EAAE,OAAgB,EAAE,UAA6B;;YACvF,IAAG,UAAU,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAC;gBACpG,QAAQ,CAAC,UAAU,iCAAK,QAAQ,CAAC,OAAO,GAAK,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;aAC3F;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;CACJ,CAAA;AAfY,0BAA0B;IAHtC,GAAG,CAAC,wBAAwB,CAAC,kBAAkB,CAAC;IAChD,YAAY,CAAC,uBAAuB,CAAC;IACrC,UAAU,EAAE;GACA,0BAA0B,CAetC;SAfY,0BAA0B"}

package/dist/lib/esm/networking.module.js CHANGED Viewed

@@ -20,13 +20,38 @@ export const NetworkingModule = {
         TelemetryModule,
     ],
     configurationDefinitions: [
+        /**
+         * Whether or not the request body converter interceptor is active.
+         */
         {
-            parameterName: NetworkingModuleKeyname + ".request_body_converter.is_active",
+            parameterName: NetworkingModuleKeyname + ".requestBodyConverter.isActive",
             isRequired: false,
             defaultValue: true,
             defaultResolvers: [
                 new BooleanResolver(new EnvironmentVariableResolver("PRISTINE_NETWORKING_REQUEST_BODY_CONVERTER_IS_ACTIVE")),
             ],
+        },
+        /**
+         * Whether or not the default content type response header interceptor is active.
+         */
+        {
+            parameterName: NetworkingModuleKeyname + ".defaultContentTypeResponseHeader.isActive",
+            isRequired: false,
+            defaultValue: true,
+            defaultResolvers: [
+                new BooleanResolver(new EnvironmentVariableResolver("PRISTINE_NETWORKING_DEFAULT_CONTENT_TYPE_RESPONSE_HEADER_IS_ACTIVE")),
+            ],
+        },
+        /**
+         * The default Content-Type response header to set on responses that do not already have Content-Types.
+         */
+        {
+            parameterName: NetworkingModuleKeyname + ".defaultContentTypeResponseHeader",
+            isRequired: false,
+            defaultValue: "application/json",
+            defaultResolvers: [
+                new EnvironmentVariableResolver("PRISTINE_NETWORKING_DEFAULT_CONTENT_TYPE_RESPONSE_HEADER"),
+            ],
         }
     ],
 };

package/dist/lib/esm/networking.module.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"networking.module.js","sourceRoot":"","sources":["../../../src/networking.module.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,uBAAuB,EAAC,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAC,eAAe,EAAC,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAC,eAAe,EAAE,2BAA2B,EAAC,MAAM,4BAA4B,CAAC;AAExF,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAE9B,cAAc,UAAU,CAAC;AAEzB,MAAM,CAAC,MAAM,gBAAgB,GAAoB;IAC7C,OAAO,EAAE,uBAAuB;IAChC,aAAa,EAAE;QACX,cAAc;QACd,eAAe;KAClB;IACD,wBAAwB,EAAE;QACtB;YACI,aAAa,EAAE,uBAAuB,GAAG,~~mCAAmC~~;~~YAC5E~~,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;YAClB,gBAAgB,EAAE;gBACd,IAAI,eAAe,CAAC,IAAI,2BAA2B,CAAC,sDAAsD,CAAC,CAAC;aAC/G;SACJ;KACJ;CACJ,CAAA"}
1	+ {"version":3,"file":"networking.module.js","sourceRoot":"","sources":["../../../src/networking.module.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,uBAAuB,EAAC,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAC,eAAe,EAAC,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAC,eAAe,EAAE,2BAA2B,EAAC,MAAM,4BAA4B,CAAC;AAExF,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAE9B,cAAc,UAAU,CAAC;AAEzB,MAAM,CAAC,MAAM,gBAAgB,GAAoB;IAC7C,OAAO,EAAE,uBAAuB;IAChC,aAAa,EAAE;QACX,cAAc;QACd,eAAe;KAClB;IACD,wBAAwB,EAAE;QACtB;;WAEG;QACH;YACI,aAAa,EAAE,uBAAuB,GAAG,gCAAgC;YACzE,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;YAClB,gBAAgB,EAAE;gBACd,IAAI,eAAe,CAAC,IAAI,2BAA2B,CAAC,sDAAsD,CAAC,CAAC;aAC/G;SACJ;QAED;;WAEG;QACH;YACI,aAAa,EAAE,uBAAuB,GAAG,4CAA4C;YACrF,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;YAClB,gBAAgB,EAAE;gBACd,IAAI,eAAe,CAAC,IAAI,2BAA2B,CAAC,oEAAoE,CAAC,CAAC;aAC7H;SACJ;QAED;;WAEG;QACH;YACI,aAAa,EAAE,uBAAuB,GAAG,mCAAmC;YAC5E,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,kBAAkB;YAChC,gBAAgB,EAAE;gBACd,IAAI,2BAA2B,CAAC,0DAA0D,CAAC;aAC9F;SACJ;KACJ;CACJ,CAAA"}

package/dist/lib/esm/nodes/path-router.node.js CHANGED Viewed

@@ -2,6 +2,7 @@ import { RouterNode } from "./router.node";
 import { MethodRouterNode } from "./method-router.node";
 import { PathRouterInstantiationError } from "../errors/path-router-instantiation.error";
 import { PathRouterAddingError } from "../errors/path-router-adding.error";
+import { UrlUtil } from "../utils/url.util";
 /**
  * This class represents a Path Node in the Router Node. It can never be a leaf node and will always have children.
  */
@@ -42,8 +43,20 @@ export class PathRouterNode extends RouterNode {
             this.children.push(new MethodRouterNode(this, method, route, levelFromRoot + 1));
             return;
         }
-        // Loop over our children that are of PathRouterNode and check if the next path matches
-        const matchedChild = this.children.filter(child => child instanceof PathRouterNode).find((child) => child.matches(splitPaths[1]));
+        let matchedChild;
+        if (UrlUtil.isPathACatchAll(splitPaths[1])) {
+            // If this is a catch all we can only match with a catch all.
+            matchedChild = this.children.filter(child => child instanceof PathRouterNode).find((child) => child.isCatchAll());
+        }
+        else if (UrlUtil.isPathARouteParameter(splitPaths[1])) {
+            // If this is a catch all we can only match with a catch all.
+            matchedChild = this.children.filter(child => child instanceof PathRouterNode).find((child) => child.isRouteParameter());
+        }
+        else {
+            // Loop over our children that are of PathRouterNode and check if the next path matches,
+            // but if it's not a catch all we can't match with a catch all.
+            matchedChild = this.children.filter(child => child instanceof PathRouterNode).find((child) => child.matches(splitPaths[1]) && child.isCatchAll() === false && child.isRouteParameter() === false);
+        }
         // If there's a matched child, call the add method on it and return.
         if (matchedChild !== undefined) {
             // Remove the first part of the path as it is used by the current node.
@@ -124,21 +137,13 @@ export class PathRouterNode extends RouterNode {
      * This method return whether or not this pathRouterNode's path is a catch-all path: "/*"
      */
     isCatchAll() {
-        return this.path.startsWith("/*");
+        return UrlUtil.isPathACatchAll(this.path);
     }
     /**
      * This method returns whether or not this pathRouterNode represents a route parameter, e.g.: /{id} or /:id
      */
     isRouteParameter() {
-        // If the current path is a path parameter, meaning has services/{id-of-service}
-        if (this.path.startsWith("/{") && this.path.endsWith("}")) {
-            return true;
-        }
-        // We also support path parameter written as services/:id-of-service
-        if (this.path.startsWith("/:")) {
-            return true;
-        }
-        return false;
+        return UrlUtil.isPathARouteParameter(this.path);
     }
     /**
      * This method returns whether the current path matches a path. We have to check if this node is a RouteParameter

package/dist/lib/esm/nodes/path-router.node.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"path-router.node.js","sourceRoot":"","sources":["../../../../src/nodes/path-router.node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAC,4BAA4B,EAAC,MAAM,2CAA2C,CAAC;AACvF,OAAO,EAAC,qBAAqB,EAAC,MAAM,oCAAoC,CAAC;~~AAEzE~~;;GAEG;AACH,MAAM,OAAO,cAAe,SAAQ,UAAU;IAC1C;;;OAGG;IACH,YAAmC,IAAY,EAAE,MAAuB;QACpE,KAAK,EAAE,CAAC;QADuB,SAAI,GAAJ,IAAI,CAAQ;QAG3C,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;YAChC,MAAM,IAAI,4BAA4B,CAAC,4CAA4C,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SACtG;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED;;;;;;OAMG;IACH,GAAG,CAAC,UAAoB,EAAE,MAA2B,EAAE,KAAY,EAAE,aAAqB;QACtF,wEAAwE;QACxE,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE;YAChE,OAAO;SACV;QAED,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAEnC,6HAA6H;QAC7H,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,4FAA4F;YAC5F,MAAM,4BAA4B,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,YAAY,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,KAAiB,EAAE,EAAE,CAAE,KAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;YAE9K,IAAI,4BAA4B,KAAK,SAAS,EAAE;gBAC5C,MAAM,IAAI,qBAAqB,CAAC,4DAA4D,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;aAClI;YAED,0EAA0E;YAC1E,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC;YACjF,OAAO;SACV;QAED,~~uFAAuF~~;~~QACvF~~,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,YAAY,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,KAAiB,EAAE,EAAE,CAAE,KAAwB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;~~QAElK~~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~~IAAI~~,CAAC,~~IAAI~~,CAAC,~~UAAU~~,CAAC,IAAI,CAAC,CAAC;~~IACtC~~,CAAC;IAED;;OAEG;IACH,gBAAgB;QACZ,~~gFAAgF;QAChF~~,~~IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACvD,~~OAAO,~~IAAI,~~CAAC~~;SACf;QAED~~,~~oEAAoE;QACpE~~,~~IAAI,IAAI,~~CAAC,IAAI,CAAC,~~UAAU,CAAC,~~IAAI,CAAC,~~EAAE~~;~~YAC5B~~,~~OAAO,IAAI,~~CAAC;~~SACf;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;~~IAED;;;;;OAKG;IACH,OAAO,CAAC,IAAY;QAChB,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE;YACnB,OAAO,IAAI,CAAC;SACf;QAED,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE;YACzB,OAAO,IAAI,CAAC;SACf;QAED,OAAO,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC;IAC9B,CAAC;CACJ"}
1	+ {"version":3,"file":"path-router.node.js","sourceRoot":"","sources":["../../../../src/nodes/path-router.node.ts"],"names":[],"mappings":"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"}

package/dist/lib/esm/router.js CHANGED Viewed

@@ -24,6 +24,7 @@ import { UrlUtil } from "./utils/url.util";
 import { NotFoundHttpError } from "./errors/not-found.http-error";
 import { PathRouterNode } from "./nodes/path-router.node";
 import { Route } from "./models/route";
+import { MethodRouterNode } from "./nodes/method-router.node";
 import { ForbiddenHttpError } from "./errors/forbidden.http-error";
 import { ControllerMethodParameterDecoratorResolver } from "./resolvers/controller-method-parameter-decorator.resolver";
 import Url from 'url-parse';
@@ -55,6 +56,37 @@ let Router = class Router {
         // This property is used to track whether the router has been already been properly instantiated or not.
         this.setupCompleted = false;
     }
+    /**
+     * This method returns the whole route tree as a string.
+     */
+    getRouteTree() {
+        let message = "";
+        message = this.getRouteTreeLevel(this.root, message, 1);
+        return message;
+    }
+    /**
+     * This method takes the existing message and appends the following levels to it.
+     * It calls itself recursively.
+     * @param node The node to print the following levels.
+     * @param message The existing message on which to append.
+     * @param level The level at which we are at.
+     */
+    getRouteTreeLevel(node, message, level) {
+        for (const child of node.children) {
+            // @ts-ignore
+            for (let i = 0; i < level; i++) {
+                message += "\t";
+            }
+            if (child instanceof PathRouterNode) {
+                message += "--" + child.path + "\n";
+            }
+            if (child instanceof MethodRouterNode) {
+                message += "--" + child.method + "\n";
+            }
+            message = this.getRouteTreeLevel(child, message, level + 1);
+        }
+        return message;
+    }
     /**
      * This method registers a Route into the Route Tree maintained by the router.
      *
@@ -118,6 +150,7 @@ let Router = class Router {
             }
         });
         this.setupCompleted = true;
+        this.loghandler.debug("Route tree: \n" + this.getRouteTree());
     }
     /**
      * This method receives a Request object, identifies the "path" its trying to hit, navigates the internally

package/dist/lib/esm/router.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/router.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/router.ts"],"names":[],"mappings":"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"}

package/dist/lib/esm/utils/url.util.js CHANGED Viewed

@@ -36,5 +36,27 @@ export class UrlUtil {
         }
         return paths;
     }
+    /**
+     *
+     * @param path Must start with a '/'.
+     */
+    static isPathARouteParameter(path) {
+        // If the current path is a path parameter, meaning has services/{id-of-service}
+        if (path.startsWith("/{") && path.endsWith("}")) {
+            return true;
+        }
+        // We also support path parameter written as services/:id-of-service
+        if (path.startsWith("/:")) {
+            return true;
+        }
+        return false;
+    }
+    /**
+     *
+     * @param path Must start with a '/'.
+     */
+    static isPathACatchAll(path) {
+        return path.startsWith("/*");
+    }
 }
 //# sourceMappingURL=url.util.js.map

package/dist/lib/esm/utils/url.util.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"url.util.js","sourceRoot":"","sources":["../../../../src/utils/url.util.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,OAAO,OAAO;IAChB;;;;;;;;;OASG;IACI,MAAM,CAAC,SAAS,CAAC,IAAY;QAChC,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,IAAI,KAAK,GAAa,EAAE,CAAC;QAEzB,gHAAgH;QAChH,4FAA4F;QAC5F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAClC,IAAG,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;gBAChB,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;gBACzB,MAAM,GAAG,EAAE,CAAC;aACf;iBACI;gBACD,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAA;aACpB;SACJ;QAED,uEAAuE;QACvE,IAAG,MAAM,KAAK,EAAE,EAAE;YACd,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;SAC5B;QAED,kFAAkF;QAClF,IAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;YAChC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SAC5C;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ"}
1	+ {"version":3,"file":"url.util.js","sourceRoot":"","sources":["../../../../src/utils/url.util.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,OAAO,OAAO;IAChB;;;;;;;;;OASG;IACI,MAAM,CAAC,SAAS,CAAC,IAAY;QAChC,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,IAAI,KAAK,GAAa,EAAE,CAAC;QAEzB,gHAAgH;QAChH,4FAA4F;QAC5F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAClC,IAAG,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;gBAChB,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;gBACzB,MAAM,GAAG,EAAE,CAAC;aACf;iBACI;gBACD,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAA;aACpB;SACJ;QAED,uEAAuE;QACvE,IAAG,MAAM,KAAK,EAAE,EAAE;YACd,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC;SAC5B;QAED,kFAAkF;QAClF,IAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;YAChC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SAC5C;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,qBAAqB,CAAC,IAAY;QAC5C,gFAAgF;QAChF,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC7C,OAAO,IAAI,CAAC;SACf;QAED,oEAAoE;QACpE,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO,IAAI,CAAC;SACf;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,eAAe,CAAC,IAAY;QACtC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;CACJ"}

package/dist/types/interceptors/default-content-type-response-header.interceptor.d.ts ADDED Viewed

@@ -0,0 +1,28 @@
+import { Request, Response } from "@pristine-ts/common";
+import { MethodRouterNode } from "../nodes/method-router.node";
+import { RequestInterceptorInterface } from "../interfaces/request-interceptor.interface";
+import { LogHandlerInterface } from "@pristine-ts/logging";
+/**
+ * The Default ContentType Response Header Interceptor intercepts the response of the router and adds the default content-type header to the response.
+ * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
+ */
+export declare class DefaultContentTypeResponseHeaderInterceptor implements RequestInterceptorInterface {
+    private readonly defaultContentTypeResponseHeader;
+    private readonly isActive;
+    private readonly logHandler;
+    /**
+     * The Default ContentType Response Header Interceptor intercepts the response of the router and adds the default content-type header to the response.
+     * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
+     * @param defaultContentTypeResponseHeader The default Content-Type response header to set on responses that do not already have Content-Types.
+     * @param isActive Whether or not this interceptor is active.
+     * @param logHandler The log handler to output logs.
+     */
+    constructor(defaultContentTypeResponseHeader: string, isActive: boolean, logHandler: LogHandlerInterface);
+    /**
+     * Intercepts the response from the router and adds the Content-Type header to it if it's not already there, with the default provided.
+     * @param response The response to intercept.
+     * @param request The request that triggered this response.
+     * @param methodNode The methode node.
+     */
+    interceptResponse(response: Response, request: Request, methodNode?: MethodRouterNode): Promise<Response>;
+}

package/dist/types/interceptors/interceptors.d.ts CHANGED Viewed

@@ -1,2 +1,3 @@
+export * from "./default-content-type-response-header.interceptor";
 export * from "./request-body-converter.interceptor";
 export * from "./response-headers.interceptor";

package/dist/types/interceptors/request-body-converter.interceptor.d.ts CHANGED Viewed

@@ -1,9 +1,23 @@
 import { LogHandlerInterface } from "@pristine-ts/logging";
 import { Request } from "@pristine-ts/common";
 import { RequestInterceptorInterface } from "../interfaces/request-interceptor.interface";
+/**
+ * The Request Body Converter Interceptor intercepts the request and parses the body based on the Content-tTpe header.
+ * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
+ */
 export declare class RequestBodyConverterInterceptor implements RequestInterceptorInterface {
     private readonly isActive;
     private readonly logHandler;
+    /**
+     * The Request Body Converter Interceptor intercepts the request and parses the body based on the Content-Type header.
+     * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
+     * @param isActive Whether or not this interceptor is active.
+     * @param logHandler The log handler to output logs.
+     */
     constructor(isActive: boolean, logHandler: LogHandlerInterface);
+    /**
+     * Intercepts the request and parses the body based on it's Content-Type header.
+     * @param request The request to intercept.
+     */
     interceptRequest(request: Request): Promise<Request>;
 }

package/dist/types/interceptors/response-headers.interceptor.d.ts CHANGED Viewed

@@ -6,5 +6,11 @@ import { RequestInterceptorInterface } from "../interfaces/request-interceptor.i
  * It is tagged as a RequestInterceptor so it can be automatically injected with the all the other RequestInterceptor.
  */
 export declare class ResponseHeadersInterceptor implements RequestInterceptorInterface {
+    /**
+     * Intercepts the response from the router and adds the headers specified by the response header decorator.
+     * @param response The response to intercept.
+     * @param request The request that triggered this response.
+     * @param methodNode The methode node.
+     */
     interceptResponse(response: Response, request: Request, methodNode?: MethodRouterNode): Promise<Response>;
 }

package/dist/types/router.d.ts CHANGED Viewed

@@ -25,6 +25,18 @@ export declare class Router implements RouterInterface {
      * @param authenticationManager The authentication manager to validate authentication.
      */
     constructor(loghandler: LogHandlerInterface, controllerMethodParameterDecoratorResolver: ControllerMethodParameterDecoratorResolver, authorizerManager: AuthorizerManagerInterface, authenticationManager: AuthenticationManagerInterface);
+    /**
+     * This method returns the whole route tree as a string.
+     */
+    getRouteTree(): string;
+    /**
+     * This method takes the existing message and appends the following levels to it.
+     * It calls itself recursively.
+     * @param node The node to print the following levels.
+     * @param message The existing message on which to append.
+     * @param level The level at which we are at.
+     */
+    private getRouteTreeLevel;
     /**
      * This method registers a Route into the Route Tree maintained by the router.
      *

package/dist/types/utils/url.util.d.ts CHANGED Viewed

@@ -13,4 +13,14 @@ export declare class UrlUtil {
      * @param path
      */
     static splitPath(path: string): string[];
+    /**
+     *
+     * @param path Must start with a '/'.
+     */
+    static isPathARouteParameter(path: string): boolean;
+    /**
+     *
+     * @param path Must start with a '/'.
+     */
+    static isPathACatchAll(path: string): boolean;
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@pristine-ts/networking",
-  "version": "0.0.192",
+  "version": "0.0.196",
   "description": "",
   "module": "dist/lib/esm/networking.module.js",
   "main": "dist/lib/cjs/networking.module.js",
@@ -20,10 +20,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@pristine-ts/common": "^0.0.192",
-    "@pristine-ts/core": "^0.0.192",
-    "@pristine-ts/security": "^0.0.192",
-    "@pristine-ts/telemetry": "^0.0.192",
+    "@pristine-ts/common": "^0.0.196",
+    "@pristine-ts/core": "^0.0.196",
+    "@pristine-ts/security": "^0.0.196",
+    "@pristine-ts/telemetry": "^0.0.196",
     "lodash": "^4.17.21",
     "url-parse": "^1.4.7"
   },
@@ -61,5 +61,5 @@
       "src/*.{js,ts}"
     ]
   },
-  "gitHead": "3f78bc1ae1441441fb9b57fd98b9fd6667a4d28a"
+  "gitHead": "6d237f26b93ece85cad41fe82283987df96bf915"
 }