@innet/server 1.6.0 → 1.6.2

package/package.json

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

package/plugins/redirect/redirect.es6.js

@@ -15,11 +15,14 @@ function getStatus(status) {
         return status;
     return redirectStatuses[status] || 301;
 }
+function customEncode(url) {
+    return encodeURI(url.replaceAll('%20', ' '));
+}
 function redirect({ props, children }, handler) {
     const { res } = handler[ACTION];
     const { to, status = 301, encode } = props;
     res.writeHead(getStatus(status), {
-        location: encode ? encodeURI(to) : to,
+        location: encode ? customEncode(to) : to,
     });
     return null;
 }

package/plugins/redirect/redirect.js

@@ -19,12 +19,15 @@ function getStatus(status) {
         return status;
     return redirectStatuses[status] || 301;
 }
+function customEncode(url) {
+    return encodeURI(url.replaceAll('%20', ' '));
+}
 function redirect(_a, handler) {
     var props = _a.props; _a.children;
     var res = handler[Action.ACTION].res;
     var to = props.to, _b = props.status, status = _b === void 0 ? 301 : _b, encode = props.encode;
     res.writeHead(getStatus(status), {
-        location: encode ? encodeURI(to) : to,
+        location: encode ? customEncode(to) : to,
     });
     return null;
 }

package/plugins/validation/validation.d.ts

@@ -13,4 +13,4 @@ export interface ValidationContext {
     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>;
+export declare function validation<T extends object, E extends object>({ props, children }: ValidationJsxElement<T>, handler: any): any;

package/plugins/validation/validation.es6.js

@@ -14,13 +14,12 @@ function validation({ props, children }, handler) {
         const data = action[resource];
         if (!data)
             throw Error(`cannot find ${resource} in action`);
-        return validation$1(map, data).then(e => {
-            if (e) {
-                const { handleError } = validationContext.get(handler);
-                return handleError ? innet(handleError(e), handler) : undefined;
-            }
-            return innet(children, handler);
-        });
+        const result = validation$1(map, data);
+        if (result) {
+            const { handleError } = validationContext.get(handler);
+            return handleError ? innet(handleError(result), handler) : undefined;
+        }
+        return innet(children, handler);
     };
     if (resource === 'body' || resource === 'files') {
         return action.parseBody().then(run);

package/plugins/validation/validation.js

@@ -23,13 +23,12 @@ function validation(_a, handler) {
         var data = action[resource];
         if (!data)
             throw Error("cannot find ".concat(resource, " in action"));
-        return utils.validation(map, data).then(function (e) {
-            if (e) {
-                var handleError = validationContext.get(handler).handleError;
-                return handleError ? innet__default["default"](handleError(e), handler) : undefined;
-            }
-            return innet__default["default"](children, handler);
-        });
+        var result = utils.validation(map, data);
+        if (result) {
+            var handleError = validationContext.get(handler).handleError;
+            return handleError ? innet__default["default"](handleError(result), handler) : undefined;
+        }
+        return innet__default["default"](children, handler);
     };
     if (resource === 'body' || resource === 'files') {
         return action.parseBody().then(run);