@innet/server 1.4.4 → 1.5.0

package/handler/handler.d.ts

@@ -1,8 +1,9 @@
 import html from '@innet/html';
+import { context, ContextProps, slot, SlotProps, slots, SlotsProps } from '@innet/jsx';
 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, header, HeaderProps, proxy, ProxyProps, redirect, RedirectProps, router, RouterProps, success, SuccessProps } from '../plugins';
+import { cms, CmsProps, cookie, CookieProps, error, ErrorProps, file, FileProps, 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: {
@@ -18,6 +19,10 @@ export declare const JSXPlugins: {
     file: typeof file;
     proxy: typeof proxy;
     redirect: typeof redirect;
+    validation: typeof validation;
+    context: typeof context;
+    slot: typeof slot;
+    slots: typeof slots;
 };
 export declare const fnPlugins: (typeof serverFn)[];
 export declare const objectPlugins: ((handler: any) => import("innet").PluginHandler)[];
@@ -37,6 +42,10 @@ declare global {
             file: FileProps;
             switch: SwitchProps;
             proxy: ProxyProps;
+            validation: ValidationProps<any>;
+            context: ContextProps;
+            slot: SlotProps;
+            slots: SlotsProps;
         }
     }
 }

package/handler/handler.es6.js

@@ -1,6 +1,6 @@
 import { createHandler } from 'innet';
 import html from '@innet/html';
-import { jsxPlugins, jsxComponent } from '@innet/jsx';
+import { jsxPlugins, jsxComponent, context, slot, slots } from '@innet/jsx';
 import { switchAsync } from '@innet/switch';
 import { promise, array, object, fn, arrayAsync, arrayClear, arraySingleLess, async } from '@innet/utils';
 import { serverFn } from '../experimental/serverFn/serverFn.es6.js';
@@ -13,6 +13,7 @@ import { cms } from '../plugins/cms/cms.es6.js';
 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 { validation } from '../plugins/validation/validation.es6.js';
 import { server } from '../server/server.es6.js';
 
 const arrayPlugins = [
@@ -33,6 +34,10 @@ const JSXPlugins = {
     file,
     proxy,
     redirect,
+    validation,
+    context,
+    slot,
+    slots,
 };
 const fnPlugins = [
     serverFn,

package/handler/handler.js

@@ -17,6 +17,7 @@ var cms = require('../plugins/cms/cms.js');
 var file = require('../plugins/file/file.js');
 var proxy = require('../plugins/proxy/proxy.js');
 var redirect = require('../plugins/redirect/redirect.js');
+var validation = require('../plugins/validation/validation.js');
 var server = require('../server/server.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -41,6 +42,10 @@ var JSXPlugins = {
     file: file.file,
     proxy: proxy.proxy,
     redirect: redirect.redirect,
+    validation: validation.validation,
+    context: jsx.context,
+    slot: jsx.slot,
+    slots: jsx.slots,
 };
 var fnPlugins = [
     serverFn.serverFn,

package/index.es6.js

@@ -9,6 +9,7 @@ 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 { validation } from './plugins/validation/validation.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

@@ -13,6 +13,7 @@ var cms = require('./plugins/cms/cms.js');
 var file = require('./plugins/file/file.js');
 var proxy = require('./plugins/proxy/proxy.js');
 var redirect = require('./plugins/redirect/redirect.js');
+var validation = require('./plugins/validation/validation.js');
 var Action = require('./action/Action/Action.js');
 var parseSearch = require('./utils/parseSearch/parseSearch.js');
 var stringifySearch = require('./utils/stringifySearch/stringifySearch.js');
@@ -42,6 +43,7 @@ exports.file = file.file;
 exports.proxy = proxy.proxy;
 exports.redirect = redirect.redirect;
 exports.redirectStatuses = redirect.redirectStatuses;
+exports.validation = validation.validation;
 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.4.4",
+  "version": "1.5.0",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",
@@ -22,21 +22,21 @@
   },
   "homepage": "https://github.com/d8corp/innet-server",
   "dependencies": {
-    "@cantinc/utils": "^1.0.1",
+    "@cantinc/utils": "^1.2.4",
     "@innet/html": "^1.0.1",
-    "@innet/jsx": "^1.0.4",
+    "@innet/jsx": "^1.1.0",
     "@innet/switch": "^1.0.0",
     "@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",
+    "innet": "^1.0.1",
     "is-invalid-path": "^1.0.2",
     "mime": "^3.0.0",
     "multiparty": "^4.2.3",
     "qs": "^6.11.0",
     "tslib": "^2.4.0",
-    "watch-state": "^3.4.4"
+    "watch-state": "^3.4.5"
   }
 }

package/plugins/index.d.ts

@@ -7,3 +7,4 @@ export * from './cms';
 export * from './file';
 export * from './proxy';
 export * from './redirect';
+export * from './validation';

package/plugins/index.es6.js

@@ -7,3 +7,4 @@ export { cms } from './cms/cms.es6.js';
 export { file } from './file/file.es6.js';
 export { proxy } from './proxy/proxy.es6.js';
 export { redirect, redirectStatuses } from './redirect/redirect.es6.js';
+export { validation } from './validation/validation.es6.js';

package/plugins/index.js

@@ -11,6 +11,7 @@ var cms = require('./cms/cms.js');
 var file = require('./file/file.js');
 var proxy = require('./proxy/proxy.js');
 var redirect = require('./redirect/redirect.js');
+var validation = require('./validation/validation.js');
 
 
 
@@ -29,3 +30,4 @@ exports.file = file.file;
 exports.proxy = proxy.proxy;
 exports.redirect = redirect.redirect;
 exports.redirectStatuses = redirect.redirectStatuses;
+exports.validation = validation.validation;

package/plugins/validation/index.d.ts

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

package/plugins/validation/index.es6.js

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

package/plugins/validation/index.js

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

package/plugins/validation/validation.d.ts

@@ -0,0 +1,14 @@
+import { ValidationMap, ValidationResponse } from '@cantinc/utils';
+import { Resources } from '../../action';
+export interface ValidationProps<T> {
+    map: ValidationMap<T>;
+    resource?: Resources;
+}
+export interface ValidationJsxElement<T> {
+    props: ValidationProps<T>;
+    children?: any;
+}
+export interface ValidationContext {
+    handleError: (e: ValidationResponse<any>) => any;
+}
+export declare function validation<T extends object, E extends object>({ props, children }: ValidationJsxElement<T>, handler: any): Promise<any>;

package/plugins/validation/validation.es6.js

@@ -0,0 +1,31 @@
+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: () => { },
+});
+function validation({ props, children }, handler) {
+    const action = handler[ACTION];
+    if (!action) {
+        throw Error('`validation` should be inside `server`');
+    }
+    const { map, resource } = props;
+    const run = () => {
+        const data = action[resource];
+        if (!data)
+            throw Error(`cannot find ${resource} in action`);
+        return validation$1(map, data).then(e => {
+            if (e) {
+                return validationContext.get(handler).handleError(e);
+            }
+            return children;
+        });
+    };
+    if (resource === 'body' || resource === 'files') {
+        return action.parseBody().then(run);
+    }
+    return run();
+}
+
+export { validation };

package/plugins/validation/validation.js

@@ -0,0 +1,36 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var utils = require('@cantinc/utils');
+var jsx = require('@innet/jsx');
+var Action = require('../../action/Action/Action.js');
+
+var validationContext = new jsx.Context({
+    handleError: function () { },
+});
+function validation(_a, handler) {
+    var props = _a.props, children = _a.children;
+    var action = handler[Action.ACTION];
+    if (!action) {
+        throw Error('`validation` should be inside `server`');
+    }
+    var map = props.map, resource = props.resource;
+    var run = function () {
+        var data = action[resource];
+        if (!data)
+            throw Error("cannot find ".concat(resource, " in action"));
+        return utils.validation(map, data).then(function (e) {
+            if (e) {
+                return validationContext.get(handler).handleError(e);
+            }
+            return children;
+        });
+    };
+    if (resource === 'body' || resource === 'files') {
+        return action.parseBody().then(run);
+    }
+    return run();
+}
+
+exports.validation = validation;