@spinajs/http 2.0.25 → 2.0.44

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

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

package/lib/route-args/FromDi.js

@@ -12,12 +12,12 @@ 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 {
+let FromDi = class FromDi extends di_1.AsyncService {
     constructor(c) {
         super();
         this.Container = c;
     }
-    async resolveAsync() { }
+    async resolve() { }
     get SupportedType() {
         return interfaces_1.ParameterType.FromDi;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"FromDi.js","sourceRoot":"","sources":["../../src/route-args/FromDi.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,8CAAoF;AACpF,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,IAAa;QAC9E,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"}
+{"version":3,"file":"FromDi.js","sourceRoot":"","sources":["../../src/route-args/FromDi.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,8CAAoF;AACpF,oCAAsF;AAItF,IAAa,MAAM,GAAnB,MAAa,MAAO,SAAQ,iBAAY;IAGtC,YAAY,CAAa;QACvB,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,OAAO,KAAmB,CAAC;IAEjC,IAAW,aAAa;QACtB,OAAO,0BAAa,CAAC,MAAM,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,QAAoB,EAAE,KAAsB,EAAE,IAAa;QAC9E,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"}

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

@@ -3,6 +3,7 @@ import { IRouteParameter, ParameterType, IRouteCall, Request } from '../interfac
 import * as express from 'express';
 import { Fields, Files } from 'formidable';
 import { Configuration } from '@spinajs/configuration';
+import { fs } from '@spinajs/fs';
 interface FormData {
     Fields: Fields;
     Files: Files;
@@ -10,7 +11,12 @@ interface FormData {
 export declare type FormOptionsCallback = (conf: Configuration) => Promise<FormOptions>;
 export interface FormOptions {
     encoding?: string;
-    uploadDir?: string | FormOptionsCallback;
+    /**
+     * Wchitch service is handling incoming file storage
+     * fs file provider, defaults to default provider set in configuration
+     * can be local, remote, aws s3, ftp, etc
+     */
+    fileProvider?: string;
     keepExtensions?: boolean;
     maxFileSize?: number;
     maxFieldsSize?: number;
@@ -21,6 +27,7 @@ export interface FormOptions {
 }
 export declare abstract class FromFormBase extends RouteArgs {
     Data: FormData;
+    protected FileService: fs;
     protected parseForm(callData: IRouteCall, param: IRouteParameter, req: Request): Promise<void>;
     protected parse(req: express.Request, options: FormOptions): Promise<void>;
     private _parse;

package/lib/route-args/FromForm.js

@@ -1,33 +1,10 @@
 "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);
 };
@@ -36,11 +13,10 @@ exports.FromForm = exports.FromFormField = exports.CsvFileRouteArgs = exports.Js
 const RouteArgs_1 = require("./RouteArgs");
 const interfaces_1 = require("../interfaces");
 const formidable_1 = require("formidable");
-const configuration_1 = require("@spinajs/configuration");
-const lodash_1 = require("lodash");
 const di_1 = require("@spinajs/di");
-const fs = __importStar(require("fs"));
 const csv_1 = require("csv");
+const path_1 = require("path");
+const fs_1 = require("fs");
 class FromFormBase extends RouteArgs_1.RouteArgs {
     async parseForm(callData, param, req) {
         if (callData && callData.Payload && callData.Payload.Form) {
@@ -51,11 +27,9 @@ class FromFormBase extends RouteArgs_1.RouteArgs {
         }
     }
     async parse(req, options) {
+        this.FileService = await di_1.DI.resolve('__file_provider__', [options === null || options === void 0 ? void 0 : options.fileProvider]);
         if (!this.Data) {
             let opts = options || { multiples: true };
-            if (options && (0, lodash_1.isFunction)(options.uploadDir)) {
-                opts = await options.uploadDir(di_1.DI.get(configuration_1.Configuration));
-            }
             this.Data = await this._parse(req, opts);
         }
     }
@@ -82,44 +56,66 @@ let FromFile = class FromFile extends FromFormBase {
         this.Data = data;
     }
     async extract(callData, param, req) {
+        const self = this;
         if (!this.Data) {
             await this.parseForm(callData, param, req);
         }
         // map from formidable to our object
         // of type IUploadedFile
         const formFiles = this.Data.Files[param.Name];
+        const data = {
+            CallData: Object.assign(Object.assign({}, callData), { Payload: {
+                    Form: this.Data,
+                } }),
+        };
         if (Array.isArray(formFiles)) {
-            return {
-                CallData: Object.assign(Object.assign({}, callData), { Payload: {
-                        Form: this.Data,
-                    } }),
-                Args: formFiles.map((f) => {
-                    return {
-                        Size: f.size,
-                        Path: f.filepath,
-                        Name: f.originalFilename,
-                        Type: f.mimetype,
-                        LastModifiedDate: f.mtime,
-                        Hash: f.hash,
-                    };
-                }),
-            };
+            for (const f of formFiles) {
+                await copy(f.filepath);
+                return Object.assign(data, {
+                    Args: formFiles.map(mf),
+                });
+            }
         }
         else {
+            await copy(formFiles.filepath);
+            return Object.assign(data, {
+                Args: mf(formFiles),
+            });
+        }
+        function mf(f) {
             return {
-                CallData: Object.assign(Object.assign({}, callData), { Payload: {
-                        Form: this.Data,
-                    } }),
-                Args: {
-                    Size: formFiles.size,
-                    Path: formFiles.filepath,
-                    Name: formFiles.originalFilename,
-                    Type: formFiles.mimetype,
-                    LastModifiedDate: formFiles.mtime,
-                    Hash: formFiles.hash,
+                Size: f.size,
+                BaseName: (0, path_1.basename)(f.filepath),
+                Provider: {
+                    Name: self.FileService.Name,
+                    Service: self.FileService.constructor.name,
                 },
+                Name: f.originalFilename,
+                Type: f.mimetype,
+                LastModifiedDate: f.mtime,
+                Hash: f.hash,
             };
         }
+        async function copy(file) {
+            const stream = await self.FileService.writeStream((0, path_1.basename)(file));
+            return new Promise((resolve, reject) => {
+                (0, fs_1.createReadStream)(file)
+                    .pipe(stream)
+                    .on('finish', () => {
+                    (0, fs_1.unlink)(file, (err) => {
+                        if (err) {
+                            reject(err);
+                        }
+                        else {
+                            resolve();
+                        }
+                    });
+                })
+                    .on('error', (err) => {
+                    reject(err);
+                });
+            });
+        }
     }
 };
 FromFile = __decorate([
@@ -141,9 +137,9 @@ let JsonFileRouteArgs = class JsonFileRouteArgs extends FromFile {
             await this.parseForm(callData, param, req);
         }
         const sourceFile = this.Data.Files[param.Name].filepath;
-        const content = await fs.promises.readFile(sourceFile, { encoding: (_a = param.Options.Encoding) !== null && _a !== void 0 ? _a : 'utf-8', flag: 'r' });
+        const content = await fs_1.promises.readFile(sourceFile, { encoding: (_a = param.Options.Encoding) !== null && _a !== void 0 ? _a : 'utf-8', flag: 'r' });
         if (param.Options.DeleteFile) {
-            fs.promises.unlink(sourceFile);
+            await fs_1.promises.unlink(sourceFile);
         }
         return {
             CallData: Object.assign(Object.assign({}, callData), { Payload: {
@@ -172,7 +168,7 @@ let CsvFileRouteArgs = class CsvFileRouteArgs extends FromFile {
         }
         const sourceFile = this.Data.Files[param.Name].filepath;
         if (param.Options.DeleteFile) {
-            fs.promises.unlink(sourceFile);
+            await fs_1.promises.unlink(sourceFile);
         }
         const data = await this.parseCvs(sourceFile);
         return {
@@ -185,7 +181,7 @@ let CsvFileRouteArgs = class CsvFileRouteArgs extends FromFile {
     async parseCvs(path) {
         const data = [];
         return new Promise((res, rej) => {
-            fs.createReadStream(path)
+            (0, fs_1.createReadStream)(path)
                 .pipe((0, csv_1.parse)())
                 .on('error', (err) => rej(err))
                 .on('data', (row) => data.push(row))

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

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

package/lib/server.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { AsyncModule, IContainer } from '@spinajs/di';
+import { AsyncService, IContainer } from '@spinajs/di';
 import { Configuration } from '@spinajs/configuration';
 import { Log } from '@spinajs/log';
 import { Server } from 'http';
@@ -7,7 +7,8 @@ import { RequestHandler } from 'express';
 import { ServerMiddleware } from './interfaces';
 import Express = require('express');
 import './transformers';
-export declare class HttpServer extends AsyncModule {
+import '@spinajs/templates-pug';
+export declare class HttpServer extends AsyncService {
     protected Configuration: Configuration;
     protected Container: IContainer;
     protected Middlewares: ServerMiddleware[];
@@ -24,7 +25,7 @@ export declare class HttpServer extends AsyncModule {
      */
     protected Log: Log;
     constructor();
-    resolveAsync(): Promise<void>;
+    resolve(): Promise<void>;
     /**
      * Starts http server & express
      */

package/lib/server.js

@@ -43,11 +43,13 @@ const response_methods_1 = require("./response-methods");
 const Express = require("express");
 const validation_1 = require("@spinajs/validation");
 require("./transformers");
-let HttpServer = class HttpServer extends di_1.AsyncModule {
+require("@spinajs/templates-pug");
+const templates_1 = require("@spinajs/templates");
+let HttpServer = class HttpServer extends di_1.AsyncService {
     constructor() {
         super();
     }
-    async resolveAsync() {
+    async resolve() {
         this.Express = Express();
         /**
          * Register default middlewares from cfg
@@ -214,6 +216,7 @@ __decorate([
 ], HttpServer.prototype, "Log", void 0);
 HttpServer = __decorate([
     (0, di_1.Injectable)(),
+    (0, di_1.Inject)(templates_1.Templates),
     __metadata("design:paramtypes", [])
 ], HttpServer);
 exports.HttpServer = HttpServer;

package/lib/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAAkG;AAClG,0DAAuD;AACvD,sCAA2C;AAG3C,6CAAgG;AAChG,uCAAyB;AACzB,oDAAkP;AAClP,yDAAqJ;AACrJ,mCAAoC;AACpC,oDAAuD;AACvD,0BAAwB;AACxB,kCAAgC;AAChC,kDAA+C;AAI/C,IAAa,UAAU,GAAvB,MAAa,UAAW,SAAQ,iBAAY;IA0B1C;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,IAAI,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;QAEzB;;WAEG;QACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAQ,kBAAkB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAClE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,6BAA6B;QAC7B,IAAI,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,IAAS,EAAE,IAA0B,EAAE,EAAE;YAC3D,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC;YACjB,IAAI,EAAE,CAAC;QACT,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAChD,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,oCAAoC;QACpC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7B,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YACrB,IAAI,CAAC;gBAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH;;WAEG;QACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAiC,aAAa,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACtF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;gBAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC;gBACxD,OAAO;aACR;YAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;YAC9E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACI,KAAK;QACV,8BAA8B;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACvD,OAAO,IAAI,OAAO,CAAO,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACpC,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,EAAE,CAAC;YAEpB,uCAAuC;YACvC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACvC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;gBACpB,IAAI,CAAC;oBAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;gBAC3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAC;gBACrD,GAAG,EAAE,CAAC;YACR,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE;gBAC1B,IAAI,GAAG,CAAC,KAAK,KAAK,YAAY,EAAE;oBAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,IAAI,gBAAgB,CAAC,CAAC;iBACpD;gBAED,GAAG,CAAC,GAAG,CAAC,CAAC;YACX,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,IAAI;QACT,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;SACpB;IACH,CAAC;IAED;;;;OAIG;IACI,GAAG,CAAC,UAA0B;QACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IAED;;OAEG;IACO,cAAc;QACtB,MAAM,OAAO,GAAG,CAAC,GAAoB,EAAE,GAAqB,EAAE,IAA0B,EAAE,EAAE;YAC1F,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACxB,IAAI,CAAC,IAAI,6BAAgB,CAAC,sBAAsB,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;gBAClF,OAAO;aACR;YAED,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,QAA0B,EAAE,EAAE;gBACxE,IAAI,QAAQ,EAAE;oBACZ,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;iBACpB;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE;YACrC,KAAK,EAAE,gBAAgB;YACvB,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED;;OAEG;IACO,YAAY;QACpB,MAAM,OAAO,GAAG,CAAC,GAAQ,EAAE,GAAoB,EAAE,GAAqB,EAAE,IAA0B,EAAE,EAAE;YACpG,IAAI,CAAC,GAAG,EAAE;gBACR,OAAO,IAAI,EAAE,CAAC;aACf;YAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,GAAG,YAAY,GAAG,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;YAE1E,MAAM,KAAK,mCACN,GAAG,KACN,OAAO,EAAE,GAAG,CAAC,OAAO,EACpB,KAAK,EAAE,EAAE,GACV,CAAC;YAEF,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE;gBAC1C,KAAK,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC;aAC5E;YAED,IAAI,QAAQ,GAAG,IAAI,CAAC;YAEpB,QAAQ,GAAG,CAAC,WAAW,EAAE;gBACvB,KAAK,iCAAoB;oBACvB,QAAQ,GAAG,IAAI,+BAAY,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;oBACvC,MAAM;gBACR,KAAK,sBAAS;oBACZ,QAAQ,GAAG,IAAI,4BAAiB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;oBAC5C,MAAM;gBACR,KAAK,+BAAkB;oBACrB,QAAQ,GAAG,IAAI,2BAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;oBACnC,MAAM;gBACR,KAAK,4BAAe,CAAC;gBACrB,KAAK,uBAAU,CAAC;gBAChB,KAAK,6BAAgB,CAAC;gBACtB,KAAK,iCAAoB,CAAC;gBAC1B,KAAK,yCAA4B;oBAC/B,QAAQ,GAAG,IAAI,6BAAkB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;oBAC7C,MAAM;gBACR,KAAK,6BAAgB;oBACnB,QAAQ,GAAG,IAAI,2BAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;oBACnC,MAAM;gBACR,KAAK,kCAAqB,CAAC;gBAC3B,KAAK,mBAAM,CAAC;gBACZ,KAAK,iCAAoB,CAAC;gBAC1B;oBACE,QAAQ,GAAG,IAAI,8BAAW,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;oBACtC,MAAM;aACT;YAED,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,QAAkC,EAAE,EAAE;gBACrE,IAAI,QAAQ,EAAE;oBACZ,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;iBACpB;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE;YACrC,KAAK,EAAE,aAAa;YACpB,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AA3MC;IADC,IAAA,eAAU,EAAC,6BAAa,CAAC;8BACD,6BAAa;iDAAC;AAGvC;IADC,IAAA,eAAU,EAAC,cAAS,CAAC;;6CACU;AAGhC;IADC,IAAA,eAAU,EAAC,6BAAgB,CAAC;;+CACa;AAgB1C;IADC,IAAA,YAAM,EAAC,MAAM,CAAC;8BACA,SAAG;uCAAC;AAxBR,UAAU;IAFtB,IAAA,eAAU,GAAE;IACZ,IAAA,WAAM,EAAC,qBAAS,CAAC;;GACL,UAAU,CA6MtB;AA7MY,gCAAU"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spinajs/http",
-  "version": "2.0.25",
+  "version": "2.0.44",
   "description": "framework HTTP module base on express.js",
   "main": "lib/index.js",
   "private": false,
@@ -38,25 +38,29 @@
   },
   "homepage": "https://github.com/spinajs/main#readme",
   "devDependencies": {
+    "@spinajs/templates-pug": "^2.0.38",
     "@types/compression": "^1.7.0",
     "@types/cookie-parser": "^1.4.2",
     "@types/cookie-signature": "^1.0.3",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.6",
     "@types/formidable": "^2.0.1",
-    "@types/luxon": "^2.3.1",
+    "@types/luxon": "^3.2.0",
     "@types/node": "^16.11.11",
     "@types/pug": "^2.0.4",
     "@types/uuid": "^8.3.3"
   },
   "dependencies": {
-    "@spinajs/configuration": "^2.0.19",
-    "@spinajs/di": "^2.0.19",
-    "@spinajs/exceptions": "^2.0.12",
-    "@spinajs/internal-logger": "^2.0.19",
-    "@spinajs/log": "^2.0.19",
-    "@spinajs/reflection": "^2.0.19",
-    "@spinajs/validation": "^2.0.19",
+    "@spinajs/configuration": "^2.0.44",
+    "@spinajs/di": "^2.0.44",
+    "@spinajs/exceptions": "^2.0.39",
+    "@spinajs/fs": "^2.0.44",
+    "@spinajs/internal-logger": "^2.0.44",
+    "@spinajs/log": "^2.0.44",
+    "@spinajs/reflection": "^2.0.44",
+    "@spinajs/templates": "^2.0.44",
+    "@spinajs/templates-pug": "^2.0.44",
+    "@spinajs/validation": "^2.0.44",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.5",
     "cookie-signature": "^1.1.0",
@@ -67,12 +71,11 @@
     "glob": "^7.1.4",
     "helmet": "^3.23.0",
     "lodash": "^4.17.14",
-    "luxon": "^2.3.0",
+    "luxon": "^3.2.1",
     "mime": "^2.4.6",
     "pug": "^3.0.0",
     "randomstring": "^1.1.5",
-    "tempfile": "3.0.0",
     "uuid": "^8.3.2"
   },
-  "gitHead": "4e46bba172831e46273436e196489b06a181e403"
+  "gitHead": "1857a6e3626e0fed22ffb0b44b48d587c79898db"
 }