@innet/server 1.6.2 → 1.6.4

package/action/Action/Action.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { CookieSerializeOptions } from 'cookie';
 import { IncomingMessage, ServerResponse } from 'http';
+import { FormOptions } from 'multiparty';
 import { ParsedQs } from 'qs';
 export declare const ACTION: string;
 export declare type Body = Record<string, any>;
@@ -22,12 +23,16 @@ export interface ActionOptions {
     body?: Body;
     files?: Files;
 }
+export interface ActionParams {
+    multipartyForm?: FormOptions;
+}
 export declare type Resources = Exclude<keyof ActionOptions, undefined>;
 export declare const URL_PARSER: RegExp;
 export declare class Action<O extends ActionOptions = ActionOptions> {
     readonly req: Request;
     readonly res: Response;
-    constructor(req: Request, res: Response);
+    params: ActionParams;
+    constructor(req: Request, res: Response, params?: ActionParams);
     get cookies(): O['cookies'];
     setCookie(key: string, value?: string, opt?: CookieSerializeOptions): void;
     parseBody(): Promise<unknown>;

package/action/Action/Action.es6.js

@@ -9,9 +9,10 @@ import 'qs';
 const ACTION = Symbol('Action');
 const URL_PARSER = /^(?<path>[^?]+)(\?(?<search>.*))?/;
 class Action {
-    constructor(req, res) {
+    constructor(req, res, params = {}) {
         this.req = req;
         this.res = res;
+        this.params = params;
     }
     get cookies() {
         return cookie.parse(this.req.headers.cookie || '');
@@ -32,7 +33,7 @@ class Action {
     }
     parseBody() {
         return new Promise((resolve, reject) => {
-            new multiparty.Form().parse(this.req, (err, fields, files) => {
+            new multiparty.Form(this.params.multipartyForm).parse(this.req, (err, fields, files) => {
                 if (err) {
                     reject(err);
                 }

package/action/Action/Action.js

@@ -18,9 +18,11 @@ var multiparty__default = /*#__PURE__*/_interopDefaultLegacy(multiparty);
 var ACTION = Symbol('Action');
 var URL_PARSER = /^(?<path>[^?]+)(\?(?<search>.*))?/;
 var Action = /** @class */ (function () {
-    function Action(req, res) {
+    function Action(req, res, params) {
+        if (params === void 0) { params = {}; }
         this.req = req;
         this.res = res;
+        this.params = params;
     }
     Object.defineProperty(Action.prototype, "cookies", {
         get: function () {
@@ -46,7 +48,7 @@ var Action = /** @class */ (function () {
     Action.prototype.parseBody = function () {
         var _this = this;
         return new Promise(function (resolve, reject) {
-            new multiparty__default["default"].Form().parse(_this.req, function (err, fields, files) {
+            new multiparty__default["default"].Form(_this.params.multipartyForm).parse(_this.req, function (err, fields, files) {
                 if (err) {
                     reject(err);
                 }

package/handler/handler.d.ts

@@ -3,7 +3,7 @@ import { context, ContextProps, slot, SlotProps, slots, SlotsProps } from '@inne
 import { switchAsync, SwitchProps } from '@innet/switch';
 import { arrayAsync, async } from '@innet/utils';
 import { serverFn } from '../experimental/serverFn';
-import { access, AccessProps, cms, CmsProps, cookie, CookieProps, error, ErrorProps, file, FileProps, formatter, FormatterProps, header, HeaderProps, proxy, ProxyProps, redirect, RedirectProps, router, RouterProps, success, SuccessProps, validation, ValidationProps } from '../plugins';
+import { access, AccessProps, cms, CmsProps, cookie, CookieProps, error, ErrorProps, file, FileProps, formatter, FormatterProps, header, HeaderProps, parseBody, ParseBodyProps, proxy, ProxyProps, redirect, RedirectProps, router, RouterProps, success, SuccessProps, validation, ValidationProps } from '../plugins';
 import { server, ServerProps } from '../server';
 export declare const arrayPlugins: (typeof arrayAsync)[];
 export declare const JSXPlugins: {
@@ -25,6 +25,7 @@ export declare const JSXPlugins: {
     slot: typeof slot;
     slots: typeof slots;
     access: typeof access;
+    'parse-body': typeof parseBody;
 };
 export declare const fnPlugins: (typeof serverFn)[];
 export declare const objectPlugins: ((handler: any) => import("innet").PluginHandler)[];
@@ -50,6 +51,7 @@ declare global {
             slot: SlotProps;
             slots: SlotsProps;
             access: AccessProps;
+            'parse-body': ParseBodyProps;
         }
     }
 }

package/handler/handler.es6.js

@@ -16,6 +16,7 @@ import { redirect } from '../plugins/redirect/redirect.es6.js';
 import { validation } from '../plugins/validation/validation.es6.js';
 import { formatter } from '../plugins/formatter/formatter.es6.js';
 import { access } from '../plugins/access/access.es6.js';
+import { parseBody } from '../plugins/parseBody/parseBody.es6.js';
 import { server } from '../server/server.es6.js';
 
 const arrayPlugins = [
@@ -42,6 +43,7 @@ const JSXPlugins = {
     slot,
     slots,
     access,
+    'parse-body': parseBody,
 };
 const fnPlugins = [
     serverFn,

package/handler/handler.js

@@ -20,6 +20,7 @@ var redirect = require('../plugins/redirect/redirect.js');
 var validation = require('../plugins/validation/validation.js');
 var formatter = require('../plugins/formatter/formatter.js');
 var access = require('../plugins/access/access.js');
+var parseBody = require('../plugins/parseBody/parseBody.js');
 var server = require('../server/server.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -50,6 +51,7 @@ var JSXPlugins = {
     slot: jsx.slot,
     slots: jsx.slots,
     access: access.access,
+    'parse-body': parseBody.parseBody,
 };
 var fnPlugins = [
     serverFn.serverFn,

package/index.es6.js

@@ -12,6 +12,7 @@ export { redirect, redirectStatuses } from './plugins/redirect/redirect.es6.js';
 export { validation, validationContext } from './plugins/validation/validation.es6.js';
 export { formatter } from './plugins/formatter/formatter.es6.js';
 export { access, accessContext } from './plugins/access/access.es6.js';
+export { parseBody } from './plugins/parseBody/parseBody.es6.js';
 export { ACTION, Action, URL_PARSER, useAction } from './action/Action/Action.es6.js';
 export { parseSearch } from './utils/parseSearch/parseSearch.es6.js';
 export { stringifySearch } from './utils/stringifySearch/stringifySearch.es6.js';

package/index.js

@@ -16,6 +16,7 @@ var redirect = require('./plugins/redirect/redirect.js');
 var validation = require('./plugins/validation/validation.js');
 var formatter = require('./plugins/formatter/formatter.js');
 var access = require('./plugins/access/access.js');
+var parseBody = require('./plugins/parseBody/parseBody.js');
 var Action = require('./action/Action/Action.js');
 var parseSearch = require('./utils/parseSearch/parseSearch.js');
 var stringifySearch = require('./utils/stringifySearch/stringifySearch.js');
@@ -50,6 +51,7 @@ exports.validationContext = validation.validationContext;
 exports.formatter = formatter.formatter;
 exports.access = access.access;
 exports.accessContext = access.accessContext;
+exports.parseBody = parseBody.parseBody;
 exports.ACTION = Action.ACTION;
 exports.Action = Action.Action;
 exports.URL_PARSER = Action.URL_PARSER;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",
@@ -22,6 +22,7 @@
   },
   "homepage": "https://github.com/d8corp/innet-server",
   "dependencies": {
+    "@types/multiparty": "^0.0.33",
     "@cantinc/utils": "^1.2.7",
     "@innet/html": "^1.0.1",
     "@innet/jsx": "^1.1.0",

package/plugins/index.d.ts

@@ -10,3 +10,4 @@ export * from './redirect';
 export * from './validation';
 export * from './formatter';
 export * from './access';
+export * from './parseBody';

package/plugins/index.es6.js

@@ -10,3 +10,4 @@ export { redirect, redirectStatuses } from './redirect/redirect.es6.js';
 export { validation, validationContext } from './validation/validation.es6.js';
 export { formatter } from './formatter/formatter.es6.js';
 export { access, accessContext } from './access/access.es6.js';
+export { parseBody } from './parseBody/parseBody.es6.js';

package/plugins/index.js

@@ -14,6 +14,7 @@ var redirect = require('./redirect/redirect.js');
 var validation = require('./validation/validation.js');
 var formatter = require('./formatter/formatter.js');
 var access = require('./access/access.js');
+var parseBody = require('./parseBody/parseBody.js');
 
 
 
@@ -37,3 +38,4 @@ exports.validationContext = validation.validationContext;
 exports.formatter = formatter.formatter;
 exports.access = access.access;
 exports.accessContext = access.accessContext;
+exports.parseBody = parseBody.parseBody;

package/plugins/parseBody/index.d.ts

@@ -0,0 +1 @@
+export * from './parseBody';

package/plugins/parseBody/index.es6.js

@@ -0,0 +1 @@
+export { parseBody } from './parseBody.es6.js';

package/plugins/parseBody/index.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var parseBody = require('./parseBody.js');
+
+
+
+exports.parseBody = parseBody.parseBody;

package/plugins/parseBody/parseBody.d.ts

@@ -0,0 +1,7 @@
+export interface ParseBodyProps {
+}
+export interface ParseBodyJsxElement {
+    props: ParseBodyProps;
+    children?: any;
+}
+export declare function parseBody({ props, children }: ParseBodyJsxElement, handler: any): any;

package/plugins/parseBody/parseBody.es6.js

@@ -0,0 +1,8 @@
+import innet from 'innet';
+import { ACTION } from '../../action/Action/Action.es6.js';
+
+function parseBody({ props, children }, handler) {
+    return handler[ACTION].parseBody().then(() => innet(children, handler));
+}
+
+export { parseBody };

package/plugins/parseBody/parseBody.js

@@ -0,0 +1,17 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var innet = require('innet');
+var Action = require('../../action/Action/Action.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
+
+function parseBody(_a, handler) {
+    _a.props; var children = _a.children;
+    return handler[Action.ACTION].parseBody().then(function () { return innet__default["default"](children, handler); });
+}
+
+exports.parseBody = parseBody;

package/server/server.d.ts

@@ -1,10 +1,11 @@
 import { Handler } from 'innet';
-import { Action } from '../action';
+import { Action, ActionParams } from '../action';
 export interface SSL {
     cert: string;
     key: string;
 }
 export interface ServerProps {
+    actionParams?: ActionParams;
     port?: number;
     ssl?: SSL;
     unknownError?: string;

package/server/server.es6.js

@@ -10,7 +10,7 @@ import { CONTINUE } from '../constants.es6.js';
 const isInvalidPath = require('is-invalid-path');
 function server({ props = {}, children }, handler) {
     const { env } = process;
-    let { ssl: { key = env.SSL_KEY, cert = env.SSL_CRT } = {} } = props;
+    let { ssl: { key = env.SSL_KEY, cert = env.SSL_CRT } = {}, actionParams } = props;
     if (!isInvalidPath(key)) {
         key = fs.readFileSync(key).toString();
     }
@@ -27,7 +27,7 @@ function server({ props = {}, children }, handler) {
     });
     server.on('request', (req, res) => __awaiter(this, void 0, void 0, function* () {
         const childHandler = Object.create(handler);
-        childHandler[ACTION] = new Action(req, res);
+        childHandler[ACTION] = new Action(req, res, actionParams);
         if (onRequest) {
             yield onRequest(childHandler[ACTION]);
         }

package/server/server.js

@@ -23,7 +23,7 @@ function server(_a, handler) {
     var _this = this;
     var _b = _a.props, props = _b === void 0 ? {} : _b, children = _a.children;
     var env = process.env;
-    var _c = props.ssl, _d = _c === void 0 ? {} : _c, _e = _d.key, key = _e === void 0 ? env.SSL_KEY : _e, _f = _d.cert, cert = _f === void 0 ? env.SSL_CRT : _f;
+    var _c = props.ssl, _d = _c === void 0 ? {} : _c, _e = _d.key, key = _e === void 0 ? env.SSL_KEY : _e, _f = _d.cert, cert = _f === void 0 ? env.SSL_CRT : _f, actionParams = props.actionParams;
     if (!isInvalidPath(key)) {
         key = fs__default["default"].readFileSync(key).toString();
     }
@@ -44,7 +44,7 @@ function server(_a, handler) {
             switch (_a.label) {
                 case 0:
                     childHandler = Object.create(handler);
-                    childHandler[Action.ACTION] = new Action.Action(req, res);
+                    childHandler[Action.ACTION] = new Action.Action(req, res, actionParams);
                     if (!onRequest) return [3 /*break*/, 2];
                     return [4 /*yield*/, onRequest(childHandler[Action.ACTION])];
                 case 1: