@spinajs/http 1.0.13 → 1.2.107

package/lib/responses.d.ts

@@ -4,7 +4,7 @@ export declare type ResponseFunction = (req: express.Request, res: express.Respo
 export declare abstract class Response {
     protected responseData: any;
     constructor(responseData: any);
-    abstract execute(req: express.Request, res: express.Response, next?: express.NextFunction): Promise<ResponseFunction>;
+    abstract execute(req: express.Request, res: express.Response, next?: express.NextFunction): Promise<ResponseFunction | void>;
 }
 /**
  * Sends data & sets proper header as json

package/lib/responses.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -111,22 +115,31 @@ const __translateH = (text) => {
  * @param status - optional status code
  */
 function pugResponse(file, model, status) {
-    const cfg = di_1.DI.resolve(configuration_1.Configuration);
+    const cfg = di_1.DI.get(configuration_1.Configuration);
     return (req, res) => {
+        if (!req.accepts('html')) {
+            httpResponse({
+                error: {
+                    message: 'invalid request content type',
+                    code: 400,
+                },
+            }, interfaces_1.HTTP_STATUS_CODE.BAD_REQUEST, 'responses/serverError.pug')(req, res);
+            return;
+        }
         res.set('Content-Type', 'text/html');
         try {
             try {
                 _render(file, model, status);
             }
             catch (err) {
-                const log = di_1.DI.get(log_1.LogModule).getLogger();
+                const log = di_1.DI.resolve(log_1.Log, ['http']);
                 log.warn(`Cannot render pug file ${file}, error: ${err.message}:${err.stack}`, err);
                 // try to render server error response
                 _render('responses/serverError.pug', { error: err }, interfaces_1.HTTP_STATUS_CODE.INTERNAL_ERROR);
             }
         }
         catch (err) {
-            const log = di_1.DI.resolve(log_1.LogModule).getLogger();
+            const log = di_1.DI.resolve(log_1.Log, ['http']);
             // final fallback rendering error fails, we render embedded html error page
             const ticketNo = randomstring.generate(7);
             log.warn(`Cannot render pug file error: ${err.message}, ticket: ${ticketNo}`, err);
@@ -149,8 +162,8 @@ function pugResponse(file, model, status) {
         function getView(viewFile) {
             const views = cfg
                 .get('system.dirs.views')
-                .map(p => path_1.normalize(path_1.join(p, viewFile)))
-                .filter(f => fs.existsSync(f));
+                .map((p) => (0, path_1.normalize)((0, path_1.join)(p, viewFile)))
+                .filter((f) => fs.existsSync(f));
             if (_.isEmpty(views)) {
                 throw new exceptions_1.IOFail(`View file ${viewFile} not exists.`);
             }
@@ -170,21 +183,25 @@ exports.pugResponse = pugResponse;
  *                  to `Accept` header
  */
 function httpResponse(model, code, template) {
-    const cfg = di_1.DI.resolve(configuration_1.Configuration);
+    const cfg = di_1.DI.get(configuration_1.Configuration);
     const acceptedHeaders = cfg.get('http.AcceptHeaders');
-    const transformers = di_1.DI.resolve(Array.ofType(interfaces_1.DataTransformer));
     return (req, res) => {
         if (req.accepts('html') && (acceptedHeaders & interfaces_1.HttpAcceptHeaders.HTML) === interfaces_1.HttpAcceptHeaders.HTML) {
             pugResponse(`${template}.pug`, model, code)(req, res);
         }
         else if (req.accepts('json') && (acceptedHeaders & interfaces_1.HttpAcceptHeaders.JSON) === interfaces_1.HttpAcceptHeaders.JSON) {
             if (req.headers['x-data-transform']) {
-                const transformer = transformers.find(x => x.Type === req.headers['x-data-transform']);
+                const transformer = di_1.DI.resolve(req.headers['x-data-transform']);
                 if (transformer) {
                     jsonResponse(transformer.transform(model, req), code)(req, res);
                 }
                 else {
-                    jsonResponse(transformer.transform(model, req), code)(req, res);
+                    jsonResponse({
+                        error: {
+                            message: "invalid data transformer, remove header 'x-data-transform' to return raw data or set proper data transformer",
+                            code: 400,
+                        },
+                    }, interfaces_1.HTTP_STATUS_CODE.BAD_REQUEST)(req, res);
                 }
             }
             else {

package/lib/responses.js.map

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

package/lib/route-args/ArgAsRequest.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="qs" />
+import { RouteArgs } from './RouteArgs';
+import { IRouteParameter, ParameterType, IRouteCall } from '../interfaces';
+import * as express from 'express';
+export declare class ArgAsRequest extends RouteArgs {
+    get SupportedType(): ParameterType;
+    extract(callData: IRouteCall, _param: IRouteParameter, req: express.Request): Promise<{
+        CallData: IRouteCall;
+        Args: express.Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+    }>;
+}

package/lib/{transformers/PureFormatter.js → route-args/ArgAsRequest.js}

@@ -6,19 +6,20 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PureDataTransformer = void 0;
+exports.ArgAsRequest = void 0;
+const RouteArgs_1 = require("./RouteArgs");
 const interfaces_1 = require("../interfaces");
 const di_1 = require("@spinajs/di");
-/**
- * Default transformer that does nothing. Output data is exacly same as input.
- */
-let PureDataTransformer = class PureDataTransformer extends interfaces_1.DataTransformer {
-    transform(data) {
-        return data;
+let ArgAsRequest = class ArgAsRequest extends RouteArgs_1.RouteArgs {
+    get SupportedType() {
+        return interfaces_1.ParameterType.Req;
+    }
+    async extract(callData, _param, req) {
+        return { CallData: callData, Args: req };
     }
 };
-PureDataTransformer = __decorate([
-    di_1.Singleton()
-], PureDataTransformer);
-exports.PureDataTransformer = PureDataTransformer;
-//# sourceMappingURL=PureFormatter.js.map
+ArgAsRequest = __decorate([
+    (0, di_1.Injectable)()
+], ArgAsRequest);
+exports.ArgAsRequest = ArgAsRequest;
+//# sourceMappingURL=ArgAsRequest.js.map

package/lib/route-args/ArgAsRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ArgAsRequest.js","sourceRoot":"","sources":["../../src/route-args/ArgAsRequest.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,8CAA2E;AAE3E,oCAAyC;AAGzC,IAAa,YAAY,GAAzB,MAAa,YAAa,SAAQ,qBAAS;IACzC,IAAW,aAAa;QACtB,OAAO,0BAAa,CAAC,GAAG,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,QAAoB,EAAE,MAAuB,EAAE,GAAoB;QACtF,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC3C,CAAC;CACF,CAAA;AARY,YAAY;IADxB,IAAA,eAAU,GAAE;GACA,YAAY,CAQxB;AARY,oCAAY"}

package/lib/route-args/ArgAsResponse.d.ts

@@ -0,0 +1,10 @@
+import { RouteArgs } from './RouteArgs';
+import { IRouteParameter, ParameterType, IRouteCall } from '../interfaces';
+import * as express from 'express';
+export declare class ArgAsResponse extends RouteArgs {
+    get SupportedType(): ParameterType;
+    extract(callData: IRouteCall, _param: IRouteParameter, _req: express.Request, res: express.Response): Promise<{
+        CallData: IRouteCall;
+        Args: express.Response<any, Record<string, any>>;
+    }>;
+}

package/lib/{dto/limit-dto.js → route-args/ArgAsResponse.js}

@@ -6,22 +6,20 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LimitDto = exports.LimitDtoSchema = void 0;
-const decorators_1 = require("../decorators");
-exports.LimitDtoSchema = {
-    $schema: 'http://json-schema.org/draft-07/schema#',
-    title: 'Limit DTO',
-    type: 'object',
-    properties: [{ Page: { type: 'number', minimum: 0 } }, { PerPage: { type: 'number', minimum: 1 } }],
-    required: ['PerPage', 'Page'],
+exports.ArgAsResponse = void 0;
+const RouteArgs_1 = require("./RouteArgs");
+const interfaces_1 = require("../interfaces");
+const di_1 = require("@spinajs/di");
+let ArgAsResponse = class ArgAsResponse extends RouteArgs_1.RouteArgs {
+    get SupportedType() {
+        return interfaces_1.ParameterType.Res;
+    }
+    async extract(callData, _param, _req, res) {
+        return { CallData: callData, Args: res };
+    }
 };
-/**
- * Limit dto for queries
- */
-let LimitDto = class LimitDto {
-};
-LimitDto = __decorate([
-    decorators_1.Schema(exports.LimitDtoSchema)
-], LimitDto);
-exports.LimitDto = LimitDto;
-//# sourceMappingURL=limit-dto.js.map
+ArgAsResponse = __decorate([
+    (0, di_1.Injectable)()
+], ArgAsResponse);
+exports.ArgAsResponse = ArgAsResponse;
+//# sourceMappingURL=ArgAsResponse.js.map

package/lib/route-args/ArgAsResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ArgAsResponse.js","sourceRoot":"","sources":["../../src/route-args/ArgAsResponse.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,8CAA2E;AAE3E,oCAAyC;AAGzC,IAAa,aAAa,GAA1B,MAAa,aAAc,SAAQ,qBAAS;IAC1C,IAAW,aAAa;QACtB,OAAO,0BAAa,CAAC,GAAG,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,QAAoB,EAAE,MAAuB,EAAE,IAAqB,EAAE,GAAqB;QAC9G,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC3C,CAAC;CACF,CAAA;AARY,aAAa;IADzB,IAAA,eAAU,GAAE;GACA,aAAa,CAQzB;AARY,sCAAa"}

package/lib/route-args/ArgHydrator.d.ts

@@ -0,0 +1,3 @@
+export declare abstract class ArgHydrator {
+    abstract hydrate(input: any): Promise<any>;
+}

package/lib/route-args/ArgHydrator.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArgHydrator = void 0;
+class ArgHydrator {
+}
+exports.ArgHydrator = ArgHydrator;
+//# sourceMappingURL=ArgHydrator.js.map

package/lib/route-args/ArgHydrator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ArgHydrator.js","sourceRoot":"","sources":["../../src/route-args/ArgHydrator.ts"],"names":[],"mappings":";;;AAAA,MAAsB,WAAW;CAEhC;AAFD,kCAEC"}

package/lib/route-args/FromBody.d.ts

@@ -0,0 +1,10 @@
+import { RouteArgs } from './RouteArgs';
+import { IRouteParameter, ParameterType, IRouteCall, IRoute } from '../interfaces';
+import * as express from 'express';
+export declare class FromBody extends RouteArgs {
+    get SupportedType(): ParameterType;
+    extract(callData: IRouteCall, param: IRouteParameter, req: express.Request, _res: express.Response, route: IRoute): Promise<{
+        CallData: IRouteCall;
+        Args: any;
+    }>;
+}

package/lib/route-args/FromBody.js

@@ -0,0 +1,44 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FromBody = void 0;
+const RouteArgs_1 = require("./RouteArgs");
+const interfaces_1 = require("../interfaces");
+const di_1 = require("@spinajs/di");
+let FromBody = class FromBody extends RouteArgs_1.RouteArgs {
+    get SupportedType() {
+        return interfaces_1.ParameterType.FromBody;
+    }
+    async extract(callData, param, req, _res, route) {
+        const arg = req.body[param.Name] ? req.body[param.Name] : route.Parameters.size === 1 ? req.body : null;
+        let result = null;
+        const [hydrated, hValue] = await this.tryHydrateObject(arg, param);
+        if (hydrated) {
+            result = hValue;
+        }
+        else {
+            switch (param.RuntimeType.name) {
+                case 'String':
+                case 'Number':
+                case 'Boolean':
+                case 'Object':
+                    result = arg;
+                    break;
+                default:
+                    result = param.RuntimeType.name === 'Array' ? arg : new param.RuntimeType(arg);
+                    break;
+            }
+        }
+        return { CallData: callData, Args: result };
+    }
+};
+FromBody = __decorate([
+    (0, di_1.Injectable)()
+], FromBody);
+exports.FromBody = FromBody;
+//# sourceMappingURL=FromBody.js.map

package/lib/route-args/FromBody.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FromBody.js","sourceRoot":"","sources":["../../src/route-args/FromBody.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,8CAAmF;AAEnF,oCAAyC;AAGzC,IAAa,QAAQ,GAArB,MAAa,QAAS,SAAQ,qBAAS;IACrC,IAAW,aAAa;QACtB,OAAO,0BAAa,CAAC,QAAQ,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,QAAoB,EAAE,KAAsB,EAAE,GAAoB,EAAE,IAAsB,EAAE,KAAa;QAC5H,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACxG,IAAI,MAAM,GAAG,IAAI,CAAC;QAElB,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACnE,IAAI,QAAQ,EAAE;YACZ,MAAM,GAAG,MAAM,CAAC;SACjB;aAAM;YACL,QAAQ,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE;gBAC9B,KAAK,QAAQ,CAAC;gBACd,KAAK,QAAQ,CAAC;gBACd,KAAK,SAAS,CAAC;gBACf,KAAK,QAAQ;oBACX,MAAM,GAAG,GAAG,CAAC;oBACb,MAAM;gBACR;oBACE,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;oBAC/E,MAAM;aACT;SACF;QAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC9C,CAAC;CACF,CAAA;AA5BY,QAAQ;IADpB,IAAA,eAAU,GAAE;GACA,QAAQ,CA4BpB;AA5BY,4BAAQ"}

package/lib/route-args/FromCoockie.d.ts

@@ -0,0 +1,13 @@
+import { RouteArgs } from './RouteArgs';
+import { IRouteParameter, ParameterType, IRouteCall } from '../interfaces';
+import * as express from 'express';
+import { Configuration } from '@spinajs/configuration';
+export declare class FromCoockie extends RouteArgs {
+    protected _coockieSecret: string;
+    constructor(cfg: Configuration);
+    get SupportedType(): ParameterType;
+    extract(callData: IRouteCall, param: IRouteParameter, req: express.Request): Promise<{
+        CallData: IRouteCall;
+        Args: string | false;
+    }>;
+}

package/lib/route-args/FromCoockie.js

@@ -0,0 +1,71 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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 __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FromCoockie = void 0;
+const RouteArgs_1 = require("./RouteArgs");
+const interfaces_1 = require("../interfaces");
+const di_1 = require("@spinajs/di");
+const configuration_1 = require("@spinajs/configuration");
+const cs = __importStar(require("cookie-signature"));
+let FromCoockie = class FromCoockie extends RouteArgs_1.RouteArgs {
+    constructor(cfg) {
+        super();
+        this._coockieSecret = cfg.get('http.coockie.secret');
+    }
+    get SupportedType() {
+        return interfaces_1.ParameterType.FromCookie;
+    }
+    async extract(callData, param, req) {
+        const arg = req.cookies[param.Name];
+        if (arg !== null) {
+            let result = cs.unsign(arg, this._coockieSecret);
+            if (result === false) {
+                return { CallData: callData, Args: null };
+            }
+            const [hydrated, hValue] = await this.tryHydrateObject(arg, param);
+            if (hydrated) {
+                result = hValue;
+            }
+            return { CallData: callData, Args: result };
+        }
+        return { CallData: callData, Args: null };
+    }
+};
+FromCoockie = __decorate([
+    (0, di_1.Inject)(configuration_1.Configuration),
+    (0, di_1.Injectable)(RouteArgs_1.RouteArgs),
+    __metadata("design:paramtypes", [configuration_1.Configuration])
+], FromCoockie);
+exports.FromCoockie = FromCoockie;
+//# sourceMappingURL=FromCoockie.js.map

package/lib/route-args/FromCoockie.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FromCoockie.js","sourceRoot":"","sources":["../../src/route-args/FromCoockie.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAwC;AACxC,8CAA2E;AAE3E,oCAAiD;AACjD,0DAAuD;AACvD,qDAAuC;AAIvC,IAAa,WAAW,GAAxB,MAAa,WAAY,SAAQ,qBAAS;IAGxC,YAAY,GAAkB;QAC5B,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC,GAAG,CAAS,qBAAqB,CAAC,CAAC;IAC/D,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,0BAAa,CAAC,UAAU,CAAC;IAClC,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,QAAoB,EAAE,KAAsB,EAAE,GAAoB;QACrF,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,IAAI,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAEjD,IAAI,MAAM,KAAK,KAAK,EAAE;gBACpB,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aAC3C;YAED,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACnE,IAAI,QAAQ,EAAE;gBACZ,MAAM,GAAG,MAAM,CAAC;aACjB;YAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;SAC7C;QAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC5C,CAAC;CACF,CAAA;AAjCY,WAAW;IAFvB,IAAA,WAAM,EAAC,6BAAa,CAAC;IACrB,IAAA,eAAU,EAAC,qBAAS,CAAC;qCAIH,6BAAa;GAHnB,WAAW,CAiCvB;AAjCY,kCAAW"}

package/lib/route-args/FromCookie.d.ts

@@ -0,0 +1,13 @@
+import { RouteArgs } from './RouteArgs';
+import { IRouteParameter, ParameterType, IRouteCall } from '../interfaces';
+import * as express from 'express';
+import { Configuration } from '@spinajs/configuration';
+export declare class FromCookie extends RouteArgs {
+    protected _coockieSecret: string;
+    constructor(cfg: Configuration);
+    get SupportedType(): ParameterType;
+    extract(callData: IRouteCall, param: IRouteParameter, req: express.Request): Promise<{
+        CallData: IRouteCall;
+        Args: any;
+    }>;
+}

package/lib/route-args/FromCookie.js

@@ -0,0 +1,74 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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 __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FromCookie = void 0;
+const RouteArgs_1 = require("./RouteArgs");
+const interfaces_1 = require("../interfaces");
+const di_1 = require("@spinajs/di");
+const configuration_1 = require("@spinajs/configuration");
+const cs = __importStar(require("cookie-signature"));
+let FromCookie = class FromCookie extends RouteArgs_1.RouteArgs {
+    constructor(cfg) {
+        super();
+        this._coockieSecret = cfg.get('http.coockie.secret');
+    }
+    get SupportedType() {
+        return interfaces_1.ParameterType.FromCookie;
+    }
+    async extract(callData, param, req) {
+        var _a;
+        const arg = req.cookies[param.Name];
+        if (arg !== null) {
+            let result = null;
+            if ((_a = param.Options) === null || _a === void 0 ? void 0 : _a.secure) {
+                result = cs.unsign(arg, this._coockieSecret);
+                if (result === false) {
+                    return { CallData: callData, Args: null };
+                }
+            }
+            else {
+                result = arg;
+            }
+            return { CallData: callData, Args: await this.tryHydrateParam(result, param) };
+        }
+        return { CallData: callData, Args: null };
+    }
+};
+FromCookie = __decorate([
+    (0, di_1.Inject)(configuration_1.Configuration),
+    (0, di_1.Injectable)(),
+    __metadata("design:paramtypes", [configuration_1.Configuration])
+], FromCookie);
+exports.FromCookie = FromCookie;
+//# sourceMappingURL=FromCookie.js.map

package/lib/route-args/FromCookie.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FromCookie.js","sourceRoot":"","sources":["../../src/route-args/FromCookie.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAwC;AACxC,8CAA2E;AAE3E,oCAAiD;AACjD,0DAAuD;AACvD,qDAAuC;AAIvC,IAAa,UAAU,GAAvB,MAAa,UAAW,SAAQ,qBAAS;IAGvC,YAAY,GAAkB;QAC5B,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC,GAAG,CAAS,qBAAqB,CAAC,CAAC;IAC/D,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,0BAAa,CAAC,UAAU,CAAC;IAClC,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,QAAoB,EAAE,KAAsB,EAAE,GAAoB;;QACrF,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,IAAI,MAAM,GAAG,IAAI,CAAC;YAClB,IAAI,MAAA,KAAK,CAAC,OAAO,0CAAE,MAAM,EAAE;gBACzB,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;gBAC7C,IAAI,MAAM,KAAK,KAAK,EAAE;oBACpB,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;iBAC3C;aACF;iBAAM;gBACL,MAAM,GAAG,GAAG,CAAC;aACd;YAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;SAChF;QAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC5C,CAAC;CACF,CAAA;AAhCY,UAAU;IAFtB,IAAA,WAAM,EAAC,6BAAa,CAAC;IACrB,IAAA,eAAU,GAAE;qCAIM,6BAAa;GAHnB,UAAU,CAgCtB;AAhCY,gCAAU"}

package/lib/route-args/FromDi.d.ts

@@ -0,0 +1,14 @@
+import { IRouteArgs } from './RouteArgs';
+import { IRouteParameter, ParameterType, IRouteCall } from '../interfaces';
+import * as express from 'express';
+import { AsyncModule, IContainer } from '@spinajs/di';
+export declare class FromDi extends AsyncModule implements IRouteArgs {
+    protected Container: IContainer;
+    constructor(c: IContainer);
+    resolveAsync(): Promise<void>;
+    get SupportedType(): ParameterType;
+    extract(callData: IRouteCall, param: IRouteParameter, _req: express.Request): Promise<{
+        CallData: IRouteCall;
+        Args: unknown;
+    }>;
+}

package/lib/route-args/FromDi.js

@@ -0,0 +1,35 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FromDi = void 0;
+const interfaces_1 = require("../interfaces");
+const di_1 = require("@spinajs/di");
+let FromDi = class FromDi extends di_1.AsyncModule {
+    constructor(c) {
+        super();
+        this.Container = c;
+    }
+    async resolveAsync() { }
+    get SupportedType() {
+        return interfaces_1.ParameterType.FromDi;
+    }
+    async extract(callData, param, _req) {
+        const srv = await this.Container.resolve(param.RuntimeType, param.Options);
+        return { CallData: callData, Args: srv };
+    }
+};
+FromDi = __decorate([
+    (0, di_1.Injectable)(),
+    (0, di_1.Inject)(di_1.Container),
+    __metadata("design:paramtypes", [Object])
+], FromDi);
+exports.FromDi = FromDi;
+//# sourceMappingURL=FromDi.js.map

package/lib/route-args/FromDi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FromDi.js","sourceRoot":"","sources":["../../src/route-args/FromDi.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,8CAA2E;AAE3E,oCAAqF;AAIrF,IAAa,MAAM,GAAnB,MAAa,MAAO,SAAQ,gBAAW;IAGrC,YAAY,CAAa;QACvB,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,YAAY,KAAmB,CAAC;IAEtC,IAAW,aAAa;QACtB,OAAO,0BAAa,CAAC,MAAM,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,QAAoB,EAAE,KAAsB,EAAE,IAAqB;QACtF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC3C,CAAC;CACF,CAAA;AAnBY,MAAM;IAFlB,IAAA,eAAU,GAAE;IACZ,IAAA,WAAM,EAAC,cAAS,CAAC;;GACL,MAAM,CAmBlB;AAnBY,wBAAM"}