@innet/server 1.5.2 → 1.5.4

package/README.md

@@ -795,14 +795,14 @@ async function Body () {
 }
 ```
 
-## getRouter
+## useRouter
 
 You can get router data in a component
 
 ```typescript jsx
 import { useRouter } from '@innet/server'
 
-async function Router () {
+function Router () {
   const { prefix, params } = useRouter()
 
   return <success>{{ prefix, params }}</success>

package/action/Action/Action.d.ts

@@ -17,9 +17,9 @@ export declare type Files = Record<string, File | File[]>;
 export declare type Request = IncomingMessage;
 export declare type Response = ServerResponse;
 export interface ActionOptions {
+    search: Search;
+    cookies: Cookies;
     body?: Body;
-    search?: Search;
-    cookies?: Cookies;
     files?: Files;
 }
 export declare type Resources = Exclude<keyof ActionOptions, undefined>;

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 { 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, 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: {
@@ -24,6 +24,7 @@ export declare const JSXPlugins: {
     context: typeof context;
     slot: typeof slot;
     slots: typeof slots;
+    access: typeof access;
 };
 export declare const fnPlugins: (typeof serverFn)[];
 export declare const objectPlugins: ((handler: any) => import("innet").PluginHandler)[];
@@ -48,6 +49,7 @@ declare global {
             context: ContextProps;
             slot: SlotProps;
             slots: SlotsProps;
+            access: AccessProps;
         }
     }
 }

package/handler/handler.es6.js

@@ -15,6 +15,7 @@ import { proxy } from '../plugins/proxy/proxy.es6.js';
 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 { server } from '../server/server.es6.js';
 
 const arrayPlugins = [
@@ -40,6 +41,7 @@ const JSXPlugins = {
     context,
     slot,
     slots,
+    access,
 };
 const fnPlugins = [
     serverFn,

package/handler/handler.js

@@ -19,6 +19,7 @@ var proxy = require('../plugins/proxy/proxy.js');
 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 server = require('../server/server.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -48,6 +49,7 @@ var JSXPlugins = {
     context: jsx.context,
     slot: jsx.slot,
     slots: jsx.slots,
+    access: access.access,
 };
 var fnPlugins = [
     serverFn.serverFn,

package/index.es6.js

@@ -11,6 +11,7 @@ export { proxy } from './plugins/proxy/proxy.es6.js';
 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 { 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

@@ -15,6 +15,7 @@ var proxy = require('./plugins/proxy/proxy.js');
 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 Action = require('./action/Action/Action.js');
 var parseSearch = require('./utils/parseSearch/parseSearch.js');
 var stringifySearch = require('./utils/stringifySearch/stringifySearch.js');
@@ -47,6 +48,8 @@ exports.redirectStatuses = redirect.redirectStatuses;
 exports.validation = validation.validation;
 exports.validationContext = validation.validationContext;
 exports.formatter = formatter.formatter;
+exports.access = access.access;
+exports.accessContext = access.accessContext;
 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.5.2",
+  "version": "1.5.4",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",

package/plugins/access/access.d.ts

@@ -0,0 +1,14 @@
+import { Handler } from 'innet';
+import { Context } from '@innet/jsx';
+export interface AccessProps {
+    role?: any;
+}
+export interface AccessJsxElement {
+    props: AccessProps;
+    children?: any;
+}
+export interface AccessContext {
+    handleRole?: (role: any, handler: Handler) => any;
+}
+export declare const accessContext: Context<AccessContext, AccessContext>;
+export declare function access({ props, children }: AccessJsxElement, handler: any): any;

package/plugins/access/access.es6.js

@@ -0,0 +1,23 @@
+import innet from 'innet';
+import { Context } from '@innet/jsx';
+import { ACTION } from '../../action/Action/Action.es6.js';
+
+const accessContext = new Context({});
+function access({ props, children }, handler) {
+    const action = handler[ACTION];
+    if (!action) {
+        throw Error('`access` should be inside `server`');
+    }
+    const { handleRole } = accessContext.get(handler);
+    const role = props === null || props === void 0 ? void 0 : props.role;
+    if (!handleRole) {
+        return innet(children, handler);
+    }
+    const error = handleRole(role, handler);
+    if (error) {
+        return innet(error, handler);
+    }
+    return innet(children, handler);
+}
+
+export { access, accessContext };

package/plugins/access/access.js

@@ -0,0 +1,33 @@
+'use strict';
+
+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 }; }
+
+var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
+
+var accessContext = new jsx.Context({});
+function access(_a, handler) {
+    var props = _a.props, children = _a.children;
+    var action = handler[Action.ACTION];
+    if (!action) {
+        throw Error('`access` should be inside `server`');
+    }
+    var handleRole = accessContext.get(handler).handleRole;
+    var role = props === null || props === void 0 ? void 0 : props.role;
+    if (!handleRole) {
+        return innet__default["default"](children, handler);
+    }
+    var error = handleRole(role, handler);
+    if (error) {
+        return innet__default["default"](error, handler);
+    }
+    return innet__default["default"](children, handler);
+}
+
+exports.access = access;
+exports.accessContext = accessContext;

package/plugins/access/index.d.ts

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

package/plugins/access/index.es6.js

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

package/plugins/access/index.js

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

package/plugins/formatter/formatter.es6.js

@@ -4,7 +4,7 @@ import { ACTION } from '../../action/Action/Action.es6.js';
 function formatter({ props, children }, handler) {
     const action = handler[ACTION];
     if (!action) {
-        throw Error('`validation` should be inside `server`');
+        throw Error('`formatter` should be inside `server`');
     }
     const { map, resource = 'body' } = props;
     const run = () => {

package/plugins/formatter/formatter.js

@@ -14,7 +14,7 @@ function formatter(_a, handler) {
     var props = _a.props, children = _a.children;
     var action = handler[Action.ACTION];
     if (!action) {
-        throw Error('`validation` should be inside `server`');
+        throw Error('`formatter` should be inside `server`');
     }
     var map = props.map, _b = props.resource, resource = _b === void 0 ? 'body' : _b;
     var run = function () {

package/plugins/index.d.ts

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

package/plugins/index.es6.js

@@ -9,3 +9,4 @@ export { proxy } from './proxy/proxy.es6.js';
 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';

package/plugins/index.js

@@ -13,6 +13,7 @@ var proxy = require('./proxy/proxy.js');
 var redirect = require('./redirect/redirect.js');
 var validation = require('./validation/validation.js');
 var formatter = require('./formatter/formatter.js');
+var access = require('./access/access.js');
 
 
 
@@ -34,3 +35,5 @@ exports.redirectStatuses = redirect.redirectStatuses;
 exports.validation = validation.validation;
 exports.validationContext = validation.validationContext;
 exports.formatter = formatter.formatter;
+exports.access = access.access;
+exports.accessContext = access.accessContext;

package/plugins/validation/validation.d.ts

@@ -10,7 +10,7 @@ export interface ValidationJsxElement<T> {
     children?: any;
 }
 export interface ValidationContext {
-    handleError: (e: ValidationResponse<any>) => any;
+    handleError?: (e: ValidationResponse<any>) => any;
 }
 export declare const validationContext: Context<ValidationContext, ValidationContext>;
 export declare function validation<T extends object, E extends object>({ props, children }: ValidationJsxElement<T>, handler: any): Promise<any>;

package/plugins/validation/validation.es6.js

@@ -3,9 +3,7 @@ import { validation as validation$1 } from '@cantinc/utils';
 import { Context } from '@innet/jsx';
 import { ACTION } from '../../action/Action/Action.es6.js';
 
-const validationContext = new Context({
-    handleError: () => { },
-});
+const validationContext = new Context({});
 function validation({ props, children }, handler) {
     const action = handler[ACTION];
     if (!action) {
@@ -18,7 +16,8 @@ function validation({ props, children }, handler) {
             throw Error(`cannot find ${resource} in action`);
         return validation$1(map, data).then(e => {
             if (e) {
-                return innet(validationContext.get(handler).handleError(e), handler);
+                const { handleError } = validationContext.get(handler);
+                return handleError ? innet(handleError(e), handler) : undefined;
             }
             return innet(children, handler);
         });

package/plugins/validation/validation.js

@@ -11,9 +11,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
-var validationContext = new jsx.Context({
-    handleError: function () { },
-});
+var validationContext = new jsx.Context({});
 function validation(_a, handler) {
     var props = _a.props, children = _a.children;
     var action = handler[Action.ACTION];
@@ -27,7 +25,8 @@ function validation(_a, handler) {
             throw Error("cannot find ".concat(resource, " in action"));
         return utils.validation(map, data).then(function (e) {
             if (e) {
-                return innet__default["default"](validationContext.get(handler).handleError(e), handler);
+                var handleError = validationContext.get(handler).handleError;
+                return handleError ? innet__default["default"](handleError(e), handler) : undefined;
             }
             return innet__default["default"](children, handler);
         });