@innet/server 1.1.1 → 1.1.2

package/README.md

@@ -696,19 +696,19 @@ export default (
 )
 ```
 
-## ACTION
+## getAction
 Action is an object which contains `request` and `response`.
 Also, it contains a couple of fields and methods.
 
 Action available in templates and components.
 
 ```typescript jsx
-import { ACTION } from '@innet/server'
+import { getAction } from '@innet/server'
 
 const Test = (props, child, handler) => {
-  const action = handler[ACTION]
+  const action = getAction(handler)
   const { req, res } = action
-  
+
   console.log(req, res)
 }
 ```
@@ -717,10 +717,10 @@ const Test = (props, child, handler) => {
 You can get cookies as an object from an action.
 
 ```typescript jsx
-import { ACTION } from '@innet/server'
+import { getAction } from '@innet/server'
 
 const Cookies = (props, child, handler) => {
-  const { cookies } = handler[ACTION]
+  const { cookies } = getAction(handler)
 
   return <success>{cookies}</success>
 }
@@ -730,12 +730,11 @@ const Cookies = (props, child, handler) => {
 You can set cookie with action.
 
 ```typescript jsx
-import { ACTION } from '@innet/server'
+import { getAction } from '@innet/server'
 
 const Login = (props, child, handler) => {
-  const action = handler[ACTION]
-
-  action.setCookie('user', 'token')
+  getAction(handler)
+    .setCookie('user', 'token')
 }
 ```
 
@@ -743,10 +742,10 @@ const Login = (props, child, handler) => {
 You can get current path with action.
 
 ```typescript jsx
-import { ACTION } from '@innet/server'
+import { getAction } from '@innet/server'
 
 const Path = (props, child, handler) => {
-  const { path } = handler[ACTION]
+  const { path } = getAction(handler)
 
   return path
 }
@@ -756,10 +755,10 @@ const Path = (props, child, handler) => {
 You can get current search as an object.
 
 ```typescript jsx
-import { ACTION } from '@innet/server'
+import { getAction } from '@innet/server'
 
 const Search = (props, child, handler) => {
-  const { search } = handler[ACTION]
+  const { search } = getAction(handler)
 
   return <success>{search}</success>
 }
@@ -769,10 +768,10 @@ const Search = (props, child, handler) => {
 You can parse body, and get values.
 
 ```typescript jsx
-import { ACTION } from '@innet/server'
+import { getAction } from '@innet/server'
 
 const Body = async (props, child, handler) => {
-  const action = handler[ACTION]
+  const action = getAction(handler)
   
   await action.parseBody()
 
@@ -784,10 +783,10 @@ const Body = async (props, child, handler) => {
 You can get files from a user.
 
 ```typescript jsx
-import { ACTION } from '@innet/server'
+import { getAction } from '@innet/server'
 
 const Body = async (props, child, handler) => {
-  const action = handler[ACTION]
+  const action = getAction(handler)
   
   await action.parseBody()
 
@@ -795,15 +794,15 @@ const Body = async (props, child, handler) => {
 }
 ```
 
-## ROUTER
+## getRouter
 
 You can get router data in a template or component
 
 ```typescript jsx
-import { ROUTER } from '@innet/server'
+import { getRouter } from '@innet/server'
 
 const Router = async (props, child, handler) => {
-  const { prefix, params } = handler[ROUTER]
+  const { prefix, params } = getRouter(handler)
 
   return <success>{{ prefix, params }}</success>
 }

package/action/getAction/getAction.d.ts

@@ -0,0 +1,3 @@
+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

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

package/action/getAction/getAction.js

@@ -0,0 +1,11 @@
+'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

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

package/action/getAction/index.es6.js

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

package/action/getAction/index.js

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

package/action/index.d.ts

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

package/action/index.es6.js

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

package/action/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var Action = require('./Action/Action.js');
 var withAction = require('./withAction/withAction.js');
+var getAction = require('./getAction/getAction.js');
 
 
 
@@ -11,3 +12,4 @@ exports.ACTION = Action.ACTION;
 exports.Action = Action.Action;
 exports.URL_PARSER = Action.URL_PARSER;
 exports.withAction = withAction.withAction;
+exports.getAction = getAction.getAction;

package/index.es6.js

@@ -2,7 +2,7 @@ export { JSXPlugins, arrayPlugins, default, objectPlugins } from './handler/hand
 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, router, withRouter } from './plugins/router/router.es6.js';
+export { ROUTER, getMatchReg, getRouter, router, withRouter } 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';
@@ -11,3 +11,4 @@ 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';

package/index.js

@@ -15,6 +15,7 @@ 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');
 
 
 
@@ -27,6 +28,7 @@ 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.success = success.success;
@@ -42,3 +44,4 @@ exports.ACTION = Action.ACTION;
 exports.Action = Action.Action;
 exports.URL_PARSER = Action.URL_PARSER;
 exports.withAction = withAction.withAction;
+exports.getAction = getAction.getAction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",

package/plugins/index.es6.js

@@ -1,6 +1,6 @@
 export { cookie } from './cookie/cookie.es6.js';
 export { header } from './header/header.es6.js';
-export { ROUTER, getMatchReg, router, withRouter } from './router/router.es6.js';
+export { ROUTER, getMatchReg, getRouter, router, withRouter } 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

@@ -18,6 +18,7 @@ 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.success = success.success;

package/plugins/router/index.es6.js

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

package/plugins/router/index.js

@@ -8,5 +8,6 @@ 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;

package/plugins/router/router.d.ts

@@ -22,6 +22,7 @@ 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 router({ props, children }: {
     props: any;

package/plugins/router/router.es6.js

@@ -6,6 +6,9 @@ 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) {
@@ -51,4 +54,4 @@ function router({ props, children }, handler) {
     return innet(children.length > 1 ? children : children[0], newHandler);
 }
 
-export { ROUTER, getMatchReg, router, withRouter };
+export { ROUTER, getMatchReg, getRouter, router, withRouter };

package/plugins/router/router.js

@@ -14,6 +14,9 @@ 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() {
@@ -66,5 +69,6 @@ function router(_a, handler) {
 
 exports.ROUTER = ROUTER;
 exports.getMatchReg = getMatchReg;
+exports.getRouter = getRouter;
 exports.router = router;
 exports.withRouter = withRouter;