npm - @innet/server - Versions diffs - 1.3.0 → 1.4.1 - Mend

@innet/server 1.3.0 → 1.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (62) hide show

package/README.md +39 -33
package/action/Action/Action.d.ts +11 -9
package/action/Action/Action.es6.js +9 -22
package/action/Action/Action.js +9 -32
package/action/Action/index.es6.js +1 -1
package/action/Action/index.js +1 -0
package/action/index.d.ts +0 -2
package/action/index.es6.js +1 -3
package/action/index.js +1 -4
package/experimental/serverFn/serverFn.es6.js +1 -1
package/experimental/serverFn/serverFn.js +1 -1
package/handler/handler.d.ts +3 -4
package/handler/handler.es6.js +6 -6
package/handler/handler.js +4 -4
package/handler/index.d.ts +0 -1
package/handler/index.es6.js +1 -1
package/handler/index.js +1 -1
package/index.d.ts +2 -1
package/index.es6.js +5 -5
package/index.js +8 -7
package/package.json +11 -9
package/plugins/cms/cms.d.ts +1 -2
package/plugins/cms/cms.es6.js +1 -1
package/plugins/cms/cms.js +1 -1
package/plugins/cookie/cookie.d.ts +1 -1
package/plugins/index.es6.js +1 -1
package/plugins/index.js +1 -2
package/plugins/redirect/redirect.d.ts +4 -4
package/plugins/router/index.es6.js +1 -1
package/plugins/router/index.js +1 -2
package/plugins/router/router.d.ts +1 -11
package/plugins/router/router.es6.js +4 -11
package/plugins/router/router.js +4 -16
package/server/server.es6.js +2 -2
package/server/server.js +3 -3
package/utils/index.d.ts +2 -0
package/utils/index.es6.js +2 -0
package/utils/index.js +11 -0
package/utils/parseSearch/index.d.ts +1 -0
package/utils/parseSearch/index.es6.js +1 -0
package/utils/parseSearch/index.js +9 -0
package/utils/parseSearch/parseSearch.d.ts +2 -0
package/utils/parseSearch/parseSearch.es6.js +7 -0
package/utils/parseSearch/parseSearch.js +16 -0
package/utils/stringifySearch/index.d.ts +1 -0
package/utils/stringifySearch/index.es6.js +1 -0
package/utils/stringifySearch/index.js +9 -0
package/utils/stringifySearch/stringifySearch.d.ts +2 -0
package/utils/stringifySearch/stringifySearch.es6.js +7 -0
package/utils/stringifySearch/stringifySearch.js +16 -0
package/action/getAction/getAction.d.ts +0 -3
package/action/getAction/getAction.es6.js +0 -7
package/action/getAction/getAction.js +0 -11
package/action/getAction/index.d.ts +0 -1
package/action/getAction/index.es6.js +0 -1
package/action/getAction/index.js +0 -9
package/action/withAction/index.d.ts +0 -1
package/action/withAction/index.es6.js +0 -1
package/action/withAction/index.js +0 -9
package/action/withAction/withAction.d.ts +0 -11
package/action/withAction/withAction.es6.js +0 -12
package/action/withAction/withAction.js +0 -20

package/README.md CHANGED Viewed

@@ -496,18 +496,24 @@ export default <Server cmsPrefix='/cms' />
 You can use it with any other functionality, for example with `html`.
 ```typescript jsx
-const Html = ({ title }, children) => (
-  <header name='content-type' value='text/html'>
-    <html>
+import { useChildren } from '@innet/jsx'
+function Html ({ title }) {
+  const children = useChildren()
+  return (
+    <header name='content-type' value='text/html'>
+      <html>
       <head>
         <title>{title}</title>
       </head>
       <body>
         {children}
       </body>
-    </html>
-  </header>
-)
+      </html>
+    </header>
+  )
+}
 export default (
   <server>
@@ -676,18 +682,17 @@ export default (
 )
 ```
-## getAction
+## useAction
 Action is an object which contains `request` and `response`.
 Also, it contains a couple of fields and methods.
 Action available in components.
 ```typescript jsx
-import { getAction } from '@innet/server'
+import { useAction } from '@innet/server'
-const Test = (props, child, handler) => {
-  const action = getAction(handler)
-  const { req, res } = action
+function Test () {
+  const { req, res } = useAction()
   console.log(req, res)
 }
@@ -697,10 +702,10 @@ const Test = (props, child, handler) => {
 You can get cookies as an object from an action.
 ```typescript jsx
-import { getAction } from '@innet/server'
+import { useAction } from '@innet/server'
-const Cookies = (props, child, handler) => {
-  const { cookies } = getAction(handler)
+function Cookies () {
+  const { cookies } = useAction()
   return <success>{cookies}</success>
 }
@@ -710,11 +715,12 @@ const Cookies = (props, child, handler) => {
 You can set cookie with action.
 ```typescript jsx
-import { getAction } from '@innet/server'
+import { useAction } from '@innet/server'
+function Login () {
+  const action = useAction()
-const Login = (props, child, handler) => {
-  getAction(handler)
-    .setCookie('user', 'token')
+  action.setCookie('user', 'token')
 }
 ```
@@ -722,10 +728,10 @@ const Login = (props, child, handler) => {
 You can get current path with action.
 ```typescript jsx
-import { getAction } from '@innet/server'
+import { useAction } from '@innet/server'
-const Path = (props, child, handler) => {
-  const { path } = getAction(handler)
+function Path () {
+  const { path } = useAction()
   return path
 }
@@ -735,10 +741,10 @@ const Path = (props, child, handler) => {
 You can get current search as an object.
 ```typescript jsx
-import { getAction } from '@innet/server'
+import { useAction } from '@innet/server'
-const Search = (props, child, handler) => {
-  const { search } = getAction(handler)
+function Search () {
+  const { search } = useAction()
   return <success>{search}</success>
 }
@@ -748,10 +754,10 @@ const Search = (props, child, handler) => {
 You can parse body, and get values.
 ```typescript jsx
-import { getAction } from '@innet/server'
+import { useAction } from '@innet/server'
-const Body = async (props, child, handler) => {
-  const action = getAction(handler)
+async function Body () {
+  const action = useAction()
   await action.parseBody()
@@ -763,10 +769,10 @@ const Body = async (props, child, handler) => {
 You can get files from a user.
 ```typescript jsx
-import { getAction } from '@innet/server'
+import { useAction } from '@innet/server'
-const Body = async (props, child, handler) => {
-  const action = getAction(handler)
+async function Body () {
+  const action = useAction()
   await action.parseBody()
@@ -779,10 +785,10 @@ const Body = async (props, child, handler) => {
 You can get router data in a component
 ```typescript jsx
-import { getRouter } from '@innet/server'
+import { useRouter } from '@innet/server'
-const Router = async (props, child, handler) => {
-  const { prefix, params } = getRouter(handler)
+async function Router () {
+  const { prefix, params } = useRouter()
   return <success>{{ prefix, params }}</success>
 }

package/action/Action/Action.d.ts CHANGED Viewed

@@ -1,11 +1,18 @@
 /// <reference types="node" />
 import { CookieSerializeOptions } from 'cookie';
 import { IncomingMessage, ServerResponse } from 'http';
+import { ParsedQs } from 'qs';
 export declare const ACTION: string;
-export declare type Resources = 'search' | 'body' | 'cookies' | 'files';
 export declare type Body = Record<string, any>;
-export declare type Search = Record<string, any>;
+export declare type Search = ParsedQs;
 export declare type Cookies = Record<string, string | string[]>;
+export interface File {
+    fieldName: string;
+    headers: Record<string, string>;
+    originalFilename: string;
+    path: string;
+    size: number;
+}
 export declare type Files = Record<string, File | File[]>;
 export declare type Request = IncomingMessage;
 export declare type Response = ServerResponse;
@@ -15,13 +22,7 @@ export interface ActionOptions {
     cookies?: Cookies;
     files?: Files;
 }
-export interface File {
-    fieldName: string;
-    headers: Record<string, string>;
-    originalFilename: string;
-    path: string;
-    size: number;
-}
+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;
@@ -39,3 +40,4 @@ export declare class Action<O extends ActionOptions = ActionOptions> {
     };
     get path(): string;
 }
+export declare function useAction<O extends ActionOptions>(): Action<O>;

package/action/Action/Action.es6.js CHANGED Viewed

@@ -1,7 +1,10 @@
 import { __decorate } from 'tslib';
 import { once } from '@cantinc/utils';
+import { useHandler } from '@innet/jsx';
 import cookie from 'cookie';
 import multiparty from 'multiparty';
+import { parseSearch } from '../../utils/parseSearch/parseSearch.es6.js';
+import 'qs';
 const ACTION = Symbol('Action');
 const URL_PARSER = /^(?<path>[^?]+)(\?(?<search>.*))?/;
@@ -52,26 +55,7 @@ class Action {
         });
     }
     get search() {
-        const result = Object.create(null);
-        const search = this.parsedUrl.search || '';
-        for (const option of search.split('&')) {
-            const [key, ...value] = option.split('=');
-            if (key) {
-                const normValue = value.join('=');
-                if (key in result) {
-                    if (Array.isArray(result[key])) {
-                        result[key].push(normValue);
-                    }
-                    else {
-                        result[key] = [result[key], normValue];
-                    }
-                }
-                else {
-                    result[key] = normValue;
-                }
-            }
-        }
-        return result;
+        return parseSearch(this.parsedUrl.search);
     }
     get parsedUrl() {
         const match = this.req.url.match(URL_PARSER);
@@ -92,6 +76,9 @@ __decorate([
 ], Action.prototype, "search", null);
 __decorate([
     once
-], Action.prototype, "parsedUrl", null);
+], Action.prototype, "parsedUrl", null);
+function useAction() {
+    return useHandler()[ACTION];
+}
-export { ACTION, Action, URL_PARSER };
+export { ACTION, Action, URL_PARSER, useAction };

package/action/Action/Action.js CHANGED Viewed

@@ -4,8 +4,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var utils = require('@cantinc/utils');
+var jsx = require('@innet/jsx');
 var cookie = require('cookie');
 var multiparty = require('multiparty');
+var parseSearch = require('../../utils/parseSearch/parseSearch.js');
+require('qs');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -67,37 +70,7 @@ var Action = /** @class */ (function () {
     };
     Object.defineProperty(Action.prototype, "search", {
         get: function () {
-            var e_1, _a;
-            var result = Object.create(null);
-            var search = this.parsedUrl.search || '';
-            try {
-                for (var _b = tslib.__values(search.split('&')), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var option = _c.value;
-                    var _d = tslib.__read(option.split('=')), key = _d[0], value = _d.slice(1);
-                    if (key) {
-                        var normValue = value.join('=');
-                        if (key in result) {
-                            if (Array.isArray(result[key])) {
-                                result[key].push(normValue);
-                            }
-                            else {
-                                result[key] = [result[key], normValue];
-                            }
-                        }
-                        else {
-                            result[key] = normValue;
-                        }
-                    }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-            return result;
+            return parseSearch.parseSearch(this.parsedUrl.search);
         },
         enumerable: false,
         configurable: true
@@ -130,8 +103,12 @@ var Action = /** @class */ (function () {
         utils.once
     ], Action.prototype, "parsedUrl", null);
     return Action;
-}());
+}());
+function useAction() {
+    return jsx.useHandler()[ACTION];
+}
 exports.ACTION = ACTION;
 exports.Action = Action;
 exports.URL_PARSER = URL_PARSER;
+exports.useAction = useAction;

package/action/Action/index.es6.js CHANGED Viewed

	@@ -1 +1 @@
1	- export { ACTION, Action, URL_PARSER } from './Action.es6.js';
1	+ export { ACTION, Action, URL_PARSER, useAction } from './Action.es6.js';

package/action/Action/index.js CHANGED Viewed

@@ -9,3 +9,4 @@ var Action = require('./Action.js');
 exports.ACTION = Action.ACTION;
 exports.Action = Action.Action;
 exports.URL_PARSER = Action.URL_PARSER;
+exports.useAction = Action.useAction;

package/action/index.d.ts CHANGED Viewed

@@ -1,3 +1 @@
 export * from './Action';
-export * from './withAction';
-export * from './getAction';

package/action/index.es6.js CHANGED Viewed

@@ -1,3 +1 @@
-export { ACTION, Action, URL_PARSER } from './Action/Action.es6.js';
-export { withAction } from './withAction/withAction.es6.js';
-export { getAction } from './getAction/getAction.es6.js';
+export { ACTION, Action, URL_PARSER, useAction } from './Action/Action.es6.js';

package/action/index.js CHANGED Viewed

@@ -3,13 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 var Action = require('./Action/Action.js');
-var withAction = require('./withAction/withAction.js');
-var getAction = require('./getAction/getAction.js');
 exports.ACTION = Action.ACTION;
 exports.Action = Action.Action;
 exports.URL_PARSER = Action.URL_PARSER;
-exports.withAction = withAction.withAction;
-exports.getAction = getAction.getAction;
+exports.useAction = Action.useAction;

package/experimental/serverFn/serverFn.es6.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { Watch } from 'watch-state';
 function serverFn() {
     return (fn, next, handler) => {
         let result;
-        new Watch(update => result = innet(fn(update), handler));
+        new Watch(update => (result = innet(fn(update), handler)));
         return result;
     };
 }

package/experimental/serverFn/serverFn.js CHANGED Viewed

@@ -12,7 +12,7 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 function serverFn() {
     return function (fn, next, handler) {
         var result;
-        new watchState.Watch(function (update) { return result = innet__default["default"](fn(update), handler); });
+        new watchState.Watch(function (update) { return (result = innet__default["default"](fn(update), handler)); });
         return result;
     };
 }

package/handler/handler.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
 import html from '@innet/html';
 import { switchAsync, SwitchProps } from '@innet/switch';
 import { arrayAsync, async } from '@innet/utils';
-import { cms, CmsProps, cookie, CookieProps, error, ErrorProps, file, FileProps, header, HeaderProps, proxy, ProxyProps, router, RouterProps, success, SuccessProps, redirect, RedirectProps } from '../plugins';
-import { server, ServerProps } from '../server';
 import { serverFn } from '../experimental/serverFn';
+import { cms, CmsProps, cookie, CookieProps, error, ErrorProps, file, FileProps, header, HeaderProps, proxy, ProxyProps, redirect, RedirectProps, router, RouterProps, success, SuccessProps } from '../plugins';
+import { server, ServerProps } from '../server';
 export declare const arrayPlugins: (typeof arrayAsync)[];
 export declare const JSXPlugins: {
     server: typeof server;
@@ -22,8 +22,7 @@ export declare const JSXPlugins: {
 export declare const fnPlugins: (typeof serverFn)[];
 export declare const objectPlugins: ((handler: any) => import("innet").PluginHandler)[];
 export declare const promisePlugins: (typeof async)[];
-declare const _default: import("innet").Handler;
-export default _default;
+export declare const handler: import("innet").Handler;
 declare global {
     namespace JSX {
         interface IntrinsicElements {

package/handler/handler.es6.js CHANGED Viewed

@@ -1,8 +1,9 @@
+import { createHandler } from 'innet';
 import html from '@innet/html';
-import { jsxPlugins, jsxTemplate } from '@innet/jsx';
+import { jsxPlugins, jsxComponent } from '@innet/jsx';
 import { switchAsync } from '@innet/switch';
 import { promise, array, object, fn, arrayAsync, arrayClear, arraySingleLess, async } from '@innet/utils';
-import { createHandler } from 'innet';
+import { serverFn } from '../experimental/serverFn/serverFn.es6.js';
 import { cookie } from '../plugins/cookie/cookie.es6.js';
 import { header } from '../plugins/header/header.es6.js';
 import { router } from '../plugins/router/router.es6.js';
@@ -13,7 +14,6 @@ import { file } from '../plugins/file/file.es6.js';
 import { proxy } from '../plugins/proxy/proxy.es6.js';
 import { redirect } from '../plugins/redirect/redirect.es6.js';
 import { server } from '../server/server.es6.js';
-import { serverFn } from '../experimental/serverFn/serverFn.es6.js';
 const arrayPlugins = [
     arrayAsync,
@@ -39,16 +39,16 @@ const fnPlugins = [
 ];
 const objectPlugins = [
     jsxPlugins(JSXPlugins),
-    jsxTemplate,
+    jsxComponent,
 ];
 const promisePlugins = [
     async,
 ];
-var handler = createHandler([
+const handler = createHandler([
     promise(promisePlugins),
     array(arrayPlugins),
     object(objectPlugins),
     fn(fnPlugins),
 ]);
-export { JSXPlugins, arrayPlugins, handler as default, fnPlugins, objectPlugins, promisePlugins };
+export { JSXPlugins, arrayPlugins, fnPlugins, handler, objectPlugins, promisePlugins };

package/handler/handler.js CHANGED Viewed

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
+var innet = require('innet');
 var html = require('@innet/html');
 var jsx = require('@innet/jsx');
 var _switch = require('@innet/switch');
 var utils = require('@innet/utils');
-var innet = require('innet');
+var serverFn = require('../experimental/serverFn/serverFn.js');
 var cookie = require('../plugins/cookie/cookie.js');
 var header = require('../plugins/header/header.js');
 var router = require('../plugins/router/router.js');
@@ -17,7 +18,6 @@ var file = require('../plugins/file/file.js');
 var proxy = require('../plugins/proxy/proxy.js');
 var redirect = require('../plugins/redirect/redirect.js');
 var server = require('../server/server.js');
-var serverFn = require('../experimental/serverFn/serverFn.js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -47,7 +47,7 @@ var fnPlugins = [
 ];
 var objectPlugins = [
     jsx.jsxPlugins(JSXPlugins),
-    jsx.jsxTemplate,
+    jsx.jsxComponent,
 ];
 var promisePlugins = [
     utils.async,
@@ -61,7 +61,7 @@ var handler = innet.createHandler([
 exports.JSXPlugins = JSXPlugins;
 exports.arrayPlugins = arrayPlugins;
-exports["default"] = handler;
 exports.fnPlugins = fnPlugins;
+exports.handler = handler;
 exports.objectPlugins = objectPlugins;
 exports.promisePlugins = promisePlugins;

package/handler/index.d.ts CHANGED Viewed

	@@ -1,2 +1 @@
1	- export { default } from './handler';
2 1	export * from './handler';

package/handler/index.es6.js CHANGED Viewed

	@@ -1 +1 @@
1	- export { JSXPlugins, arrayPlugins, ~~default~~, ~~fnPlugins~~, objectPlugins, promisePlugins } from './handler.es6.js';
1	+ export { JSXPlugins, arrayPlugins, fnPlugins, handler, objectPlugins, promisePlugins } from './handler.es6.js';

package/handler/index.js CHANGED Viewed

@@ -8,7 +8,7 @@ var handler = require('./handler.js');
 exports.JSXPlugins = handler.JSXPlugins;
 exports.arrayPlugins = handler.arrayPlugins;
-exports["default"] = handler["default"];
 exports.fnPlugins = handler.fnPlugins;
+exports.handler = handler.handler;
 exports.objectPlugins = handler.objectPlugins;
 exports.promisePlugins = handler.promisePlugins;

package/index.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
-export { default } from './handler';
+export { handler as default } from './handler';
 export * from './server';
 export * from './plugins';
 export * from './handler';
 export * from './action';
+export * from './utils';

package/index.es6.js CHANGED Viewed

@@ -1,14 +1,14 @@
-export { JSXPlugins, arrayPlugins, default, fnPlugins, objectPlugins, promisePlugins } from './handler/handler.es6.js';
+export { JSXPlugins, arrayPlugins, handler as default, fnPlugins, handler, objectPlugins, promisePlugins } from './handler/handler.es6.js';
 export { server } from './server/server.es6.js';
 export { cookie } from './plugins/cookie/cookie.es6.js';
 export { header } from './plugins/header/header.es6.js';
-export { ROUTER, getMatchReg, getRouter, router, withRouter } from './plugins/router/router.es6.js';
+export { ROUTER, getMatchReg, router, useRouter } from './plugins/router/router.es6.js';
 export { success, successStatuses } from './plugins/success/success.es6.js';
 export { error, errorStatuses } from './plugins/error/error.es6.js';
 export { cms } from './plugins/cms/cms.es6.js';
 export { file } from './plugins/file/file.es6.js';
 export { proxy } from './plugins/proxy/proxy.es6.js';
 export { redirect, redirectStatuses } from './plugins/redirect/redirect.es6.js';
-export { ACTION, Action, URL_PARSER } from './action/Action/Action.es6.js';
-export { withAction } from './action/withAction/withAction.es6.js';
-export { getAction } from './action/getAction/getAction.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 CHANGED Viewed

@@ -14,15 +14,16 @@ var file = require('./plugins/file/file.js');
 var proxy = require('./plugins/proxy/proxy.js');
 var redirect = require('./plugins/redirect/redirect.js');
 var Action = require('./action/Action/Action.js');
-var withAction = require('./action/withAction/withAction.js');
-var getAction = require('./action/getAction/getAction.js');
+var parseSearch = require('./utils/parseSearch/parseSearch.js');
+var stringifySearch = require('./utils/stringifySearch/stringifySearch.js');
 exports.JSXPlugins = handler.JSXPlugins;
 exports.arrayPlugins = handler.arrayPlugins;
-exports["default"] = handler["default"];
+exports["default"] = handler.handler;
 exports.fnPlugins = handler.fnPlugins;
+exports.handler = handler.handler;
 exports.objectPlugins = handler.objectPlugins;
 exports.promisePlugins = handler.promisePlugins;
 exports.server = server.server;
@@ -30,9 +31,8 @@ exports.cookie = cookie.cookie;
 exports.header = header.header;
 exports.ROUTER = router.ROUTER;
 exports.getMatchReg = router.getMatchReg;
-exports.getRouter = router.getRouter;
 exports.router = router.router;
-exports.withRouter = router.withRouter;
+exports.useRouter = router.useRouter;
 exports.success = success.success;
 exports.successStatuses = success.successStatuses;
 exports.error = error.error;
@@ -45,5 +45,6 @@ exports.redirectStatuses = redirect.redirectStatuses;
 exports.ACTION = Action.ACTION;
 exports.Action = Action.Action;
 exports.URL_PARSER = Action.URL_PARSER;
-exports.withAction = withAction.withAction;
-exports.getAction = getAction.getAction;
+exports.useAction = Action.useAction;
+exports.parseSearch = parseSearch.parseSearch;
+exports.stringifySearch = stringifySearch.stringifySearch;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",
@@ -22,19 +22,21 @@
   },
   "homepage": "https://github.com/d8corp/innet-server",
   "dependencies": {
-    "@cantinc/utils": "^1.0.0",
-    "@innet/html": "^1.0.0",
-    "@innet/jsx": "^0.1.1",
+    "@cantinc/utils": "^1.0.1",
+    "@innet/html": "^1.0.1",
+    "@innet/jsx": "^1.0.4",
     "@innet/switch": "^1.0.0",
-    "@innet/utils": "^1.1.0",
-    "@types/cookie": "^0.4.1",
-    "cookie": "^0.4.2",
+    "@innet/utils": "^1.1.1",
+    "@types/cookie": "^0.5.1",
+    "@types/qs": "^6.9.7",
+    "cookie": "^0.5.0",
     "http-proxy": "^1.18.1",
     "innet": "^1.0.0",
     "is-invalid-path": "^1.0.2",
     "mime": "^3.0.0",
     "multiparty": "^4.2.3",
-    "tslib": "^2.3.1",
-    "watch-state": "^3.4.3"
+    "qs": "^6.11.0",
+    "tslib": "^2.4.0",
+    "watch-state": "^3.4.4"
   }
 }

package/plugins/cms/cms.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
-import { Props } from '@innet/jsx';
-export interface CmsProps extends Props {
+export interface CmsProps {
     dir?: string;
     prefix?: string;
 }

package/plugins/cms/cms.es6.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import path from 'path';
-import { ACTION } from '../../action/Action/Action.es6.js';
 import { file } from '../file/file.es6.js';
+import { ACTION } from '../../action/Action/Action.es6.js';
 function cms({ props }, handler) {
     const action = handler[ACTION];

package/plugins/cms/cms.js CHANGED Viewed

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 var path = require('path');
-var Action = require('../../action/Action/Action.js');
 var file = require('../file/file.js');
+var Action = require('../../action/Action/Action.js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/plugins/cookie/cookie.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import { CookieSerializeOptions } from 'cookie';
 import { Handler } from 'innet';
+import { CookieSerializeOptions } from 'cookie';
 export interface CookieProps extends CookieSerializeOptions {
     key: string;
     value?: string;

package/plugins/index.es6.js CHANGED Viewed

@@ -1,6 +1,6 @@
 export { cookie } from './cookie/cookie.es6.js';
 export { header } from './header/header.es6.js';
-export { ROUTER, getMatchReg, getRouter, router, withRouter } from './router/router.es6.js';
+export { ROUTER, getMatchReg, router, useRouter } from './router/router.es6.js';
 export { success, successStatuses } from './success/success.es6.js';
 export { error, errorStatuses } from './error/error.es6.js';
 export { cms } from './cms/cms.es6.js';

package/plugins/index.js CHANGED Viewed

@@ -18,9 +18,8 @@ exports.cookie = cookie.cookie;
 exports.header = header.header;
 exports.ROUTER = router.ROUTER;
 exports.getMatchReg = router.getMatchReg;
-exports.getRouter = router.getRouter;
 exports.router = router.router;
-exports.withRouter = router.withRouter;
+exports.useRouter = router.useRouter;
 exports.success = success.success;
 exports.successStatuses = success.successStatuses;
 exports.error = error.error;

package/plugins/redirect/redirect.d.ts CHANGED Viewed

@@ -1,7 +1,3 @@
-export interface RedirectProps {
-    to: string;
-    status?: number | keyof typeof redirectStatuses;
-}
 export declare const redirectStatuses: {
     multipleChoices: number;
     movedPermanently: number;
@@ -12,6 +8,10 @@ export declare const redirectStatuses: {
     temporaryRedirect: number;
     permanentRedirect: number;
 };
+export interface RedirectProps {
+    to: string;
+    status?: number | keyof typeof redirectStatuses;
+}
 export declare function redirect({ props, children }: {
     props: any;
     children: any;

package/plugins/router/index.es6.js CHANGED Viewed

	@@ -1 +1 @@
1	- export { ROUTER, getMatchReg, ~~getRouter,~~ router, ~~withRouter~~ } from './router.es6.js';
1	+ export { ROUTER, getMatchReg, router, useRouter } from './router.es6.js';

package/plugins/router/index.js CHANGED Viewed

@@ -8,6 +8,5 @@ var router = require('./router.js');
 exports.ROUTER = router.ROUTER;
 exports.getMatchReg = router.getMatchReg;
-exports.getRouter = router.getRouter;
 exports.router = router.router;
-exports.withRouter = router.withRouter;
+exports.useRouter = router.useRouter;

package/plugins/router/router.d.ts CHANGED Viewed

@@ -1,5 +1,3 @@
-import { Children, Component, Props } from '@innet/jsx';
-import { Handler } from 'innet';
 import { Action } from '../../action';
 export declare type Methods = 'GET' | 'HEAD' | 'POST' | 'DELETE' | 'PUT' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'PATCH';
 export interface RouterProps {
@@ -15,15 +13,7 @@ export interface Router {
     params?: Record<string, string>;
 }
 export declare const ROUTER: string;
-export interface RouterComponent extends Component {
-    router: Router;
-}
-export interface RouterComponentConstructor {
-    new (props?: Props, children?: Children, handler?: Handler): RouterComponent;
-    [key: string]: any;
-}
-export declare function getRouter(handler: Handler): Router;
-export declare function withRouter<T extends RouterComponentConstructor>(target: T): T;
+export declare function useRouter(): Router;
 export declare function router({ props, children }: {
     props: any;
     children: any;

package/plugins/router/router.es6.js CHANGED Viewed

@@ -1,4 +1,5 @@
 import innet from 'innet';
+import { useHandler } from '@innet/jsx';
 import { ACTION } from '../../action/Action/Action.es6.js';
 function getMatchReg(props) {
@@ -6,16 +7,8 @@ function getMatchReg(props) {
     return `^${path ? `${path}${ish ? '(/[^?]*)?' : ''}` : '[^?]*'}(\\?.*)?$`;
 }
 const ROUTER = Symbol('Parent Router');
-function getRouter(handler) {
-    return handler[ROUTER];
-}
-function withRouter(target) {
-    const originInit = target.prototype.init;
-    target.prototype.init = function init(...args) {
-        this.router = args[2][ROUTER];
-        return originInit.apply(this, args);
-    };
-    return target;
+function useRouter() {
+    return useHandler()[ROUTER];
 }
 function router({ props, children }, handler) {
     var _a;
@@ -54,4 +47,4 @@ function router({ props, children }, handler) {
     return innet(children.length > 1 ? children : children[0], newHandler);
 }
-export { ROUTER, getMatchReg, getRouter, router, withRouter };
+export { ROUTER, getMatchReg, router, useRouter };

package/plugins/router/router.js CHANGED Viewed

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 var innet = require('innet');
+var jsx = require('@innet/jsx');
 var Action = require('../../action/Action/Action.js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -14,20 +15,8 @@ function getMatchReg(props) {
     return "^".concat(path ? "".concat(path).concat(ish ? '(/[^?]*)?' : '') : '[^?]*', "(\\?.*)?$");
 }
 var ROUTER = Symbol('Parent Router');
-function getRouter(handler) {
-    return handler[ROUTER];
-}
-function withRouter(target) {
-    var originInit = target.prototype.init;
-    target.prototype.init = function init() {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        this.router = args[2][ROUTER];
-        return originInit.apply(this, args);
-    };
-    return target;
+function useRouter() {
+    return jsx.useHandler()[ROUTER];
 }
 function router(_a, handler) {
     var _b;
@@ -69,6 +58,5 @@ function router(_a, handler) {
 exports.ROUTER = ROUTER;
 exports.getMatchReg = getMatchReg;
-exports.getRouter = getRouter;
 exports.router = router;
-exports.withRouter = withRouter;
+exports.useRouter = useRouter;

package/server/server.es6.js CHANGED Viewed

@@ -1,8 +1,8 @@
 import { __awaiter } from 'tslib';
+import innet from 'innet';
 import fs from 'fs';
 import http from 'http';
 import http2 from 'https';
-import innet from 'innet';
 import { onDestroy } from 'watch-state';
 import { ACTION, Action } from '../action/Action/Action.es6.js';
 import { CONTINUE } from '../constants.es6.js';
@@ -17,7 +17,7 @@ function server({ props = {}, children }, handler) {
     if (!isInvalidPath(cert)) {
         cert = fs.readFileSync(cert).toString();
     }
-    const https = (key && cert);
+    const https = Boolean(key && cert);
     const { port = env.PORT || (https ? 442 : 80), unknownError = '', onStart, onError, onRequest } = props;
     const server = https ? http2.createServer({ key, cert }) : http.createServer();
     onDestroy(() => {

package/server/server.js CHANGED Viewed

@@ -3,20 +3,20 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
+var innet = require('innet');
 var fs = require('fs');
 var http = require('http');
 var http2 = require('https');
-var innet = require('innet');
 var watchState = require('watch-state');
 var Action = require('../action/Action/Action.js');
 var constants = require('../constants.js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var http2__default = /*#__PURE__*/_interopDefaultLegacy(http2);
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 var isInvalidPath = require('is-invalid-path');
 function server(_a, handler) {
@@ -30,7 +30,7 @@ function server(_a, handler) {
     if (!isInvalidPath(cert)) {
         cert = fs__default["default"].readFileSync(cert).toString();
     }
-    var https = (key && cert);
+    var https = Boolean(key && cert);
     var _g = props.port, port = _g === void 0 ? env.PORT || (https ? 442 : 80) : _g, _h = props.unknownError, unknownError = _h === void 0 ? '' : _h, onStart = props.onStart, onError = props.onError, onRequest = props.onRequest;
     var server = https ? http2__default["default"].createServer({ key: key, cert: cert }) : http__default["default"].createServer();
     watchState.onDestroy(function () {

package/utils/index.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export * from './parseSearch';
2	+ export * from './stringifySearch';

package/utils/index.es6.js ADDED Viewed

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

package/utils/index.js ADDED Viewed

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

package/utils/parseSearch/index.d.ts ADDED Viewed

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

package/utils/parseSearch/index.es6.js ADDED Viewed

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

package/utils/parseSearch/index.js ADDED Viewed

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

package/utils/parseSearch/parseSearch.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ import { IParseOptions, ParsedQs } from 'qs';
2	+ export declare function parseSearch<V extends ParsedQs>(search?: string, options?: IParseOptions): V;

package/utils/parseSearch/parseSearch.es6.js ADDED Viewed

@@ -0,0 +1,7 @@
+import qs from 'qs';
+function parseSearch(search, options) {
+    return qs.parse(search, Object.assign({ ignoreQueryPrefix: true }, options));
+}
+export { parseSearch };

package/utils/parseSearch/parseSearch.js ADDED Viewed

@@ -0,0 +1,16 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var tslib = require('tslib');
+var qs = require('qs');
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+var qs__default = /*#__PURE__*/_interopDefaultLegacy(qs);
+function parseSearch(search, options) {
+    return qs__default["default"].parse(search, tslib.__assign({ ignoreQueryPrefix: true }, options));
+}
+exports.parseSearch = parseSearch;

package/utils/stringifySearch/index.d.ts ADDED Viewed

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

package/utils/stringifySearch/index.es6.js ADDED Viewed

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

package/utils/stringifySearch/index.js ADDED Viewed

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

package/utils/stringifySearch/stringifySearch.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ import { IStringifyOptions, ParsedQs } from 'qs';
2	+ export declare function stringifySearch(search: ParsedQs, options?: IStringifyOptions): string;

package/utils/stringifySearch/stringifySearch.es6.js ADDED Viewed

@@ -0,0 +1,7 @@
+import qs from 'qs';
+function stringifySearch(search, options) {
+    return qs.stringify(search, Object.assign({ encode: false }, options));
+}
+export { stringifySearch };

package/utils/stringifySearch/stringifySearch.js ADDED Viewed

@@ -0,0 +1,16 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var tslib = require('tslib');
+var qs = require('qs');
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+var qs__default = /*#__PURE__*/_interopDefaultLegacy(qs);
+function stringifySearch(search, options) {
+    return qs__default["default"].stringify(search, tslib.__assign({ encode: false }, options));
+}
+exports.stringifySearch = stringifySearch;

package/action/getAction/getAction.d.ts DELETED Viewed

@@ -1,3 +0,0 @@
-import { Handler } from 'innet';
-import { Action, ActionOptions } from '../Action';
-export declare function getAction<O extends ActionOptions>(handler: Handler): Action<O>;

package/action/getAction/getAction.es6.js DELETED Viewed

@@ -1,7 +0,0 @@
-import { ACTION } from '../Action/Action.es6.js';
-function getAction(handler) {
-    return handler[ACTION];
-}
-export { getAction };

package/action/getAction/getAction.js DELETED Viewed

@@ -1,11 +0,0 @@
-'use strict';
-Object.defineProperty(exports, '__esModule', { value: true });
-var Action = require('../Action/Action.js');
-function getAction(handler) {
-    return handler[Action.ACTION];
-}
-exports.getAction = getAction;

package/action/getAction/index.d.ts DELETED Viewed

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

package/action/getAction/index.es6.js DELETED Viewed

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

package/action/getAction/index.js DELETED Viewed

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

package/action/withAction/index.d.ts DELETED Viewed

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

package/action/withAction/index.es6.js DELETED Viewed

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

package/action/withAction/index.js DELETED Viewed

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

package/action/withAction/withAction.d.ts DELETED Viewed

@@ -1,11 +0,0 @@
-import { Children, Component, Props } from '@innet/jsx';
-import { Handler } from 'innet';
-import { Action, Body } from '../Action';
-export interface ActionComponent<B extends Body> extends Component {
-    action: Action<B>;
-}
-export interface RequestComponentConstructor<B extends Body> {
-    new (props?: Props, children?: Children, handler?: Handler): ActionComponent<B>;
-    [key: string]: any;
-}
-export declare function withAction<B extends Body, T extends RequestComponentConstructor<B>>(target: T): T;

package/action/withAction/withAction.es6.js DELETED Viewed

@@ -1,12 +0,0 @@
-import { ACTION } from '../Action/Action.es6.js';
-function withAction(target) {
-    const originInit = target.prototype.init;
-    target.prototype.init = function init(...args) {
-        this.action = args[2][ACTION];
-        return originInit.apply(this, args);
-    };
-    return target;
-}
-export { withAction };

package/action/withAction/withAction.js DELETED Viewed

@@ -1,20 +0,0 @@
-'use strict';
-Object.defineProperty(exports, '__esModule', { value: true });
-var Action = require('../Action/Action.js');
-function withAction(target) {
-    var originInit = target.prototype.init;
-    target.prototype.init = function init() {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        this.action = args[2][Action.ACTION];
-        return originInit.apply(this, args);
-    };
-    return target;
-}
-exports.withAction = withAction;