@innet/server 1.5.5 → 1.6.1

package/action/Action/Action.d.ts

@@ -40,4 +40,4 @@ export declare class Action<O extends ActionOptions = ActionOptions> {
     };
     get path(): string;
 }
-export declare function useAction<O extends ActionOptions>(): Action<O>;
+export declare function useAction<T extends Partial<ActionOptions>, O extends ActionOptions = ActionOptions & T>(): Action<O>;

package/package.json

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

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/router/router.es6.js

@@ -4,7 +4,7 @@ import { ACTION } from '../../action/Action/Action.es6.js';
 
 function getMatchReg(props) {
     const { ish, path } = props;
-    return `^${path ? `${path}${ish ? '(/[^?]*)?' : ''}` : '[^?]*'}(\\?.*)?$`;
+    return `^${path}${ish ? '(?<rest>/.*)?' : ''}$`;
 }
 const ROUTER = Symbol('Parent Router');
 function useRouter() {
@@ -17,25 +17,25 @@ function router({ props, children }, handler) {
     if (!props)
         return children;
     const action = handler[ACTION];
-    const { req } = action;
-    if (!req) {
+    if (!action) {
         throw Error('`router` should be used inside `server`');
     }
+    const { req, path } = action;
     if (props.method && props.method !== req.method) {
         return;
     }
     const parent = handler[ROUTER];
     const parentPrefix = (parent === null || parent === void 0 ? void 0 : parent.prefix) || '';
-    if (parentPrefix && !req.url.startsWith(parentPrefix)) {
+    if (parentPrefix && !path.startsWith(parentPrefix)) {
         return;
     }
-    const url = parentPrefix ? req.url.slice(parentPrefix.length) : req.url;
+    const url = parentPrefix ? path.slice(parentPrefix.length) : path;
     const newHandler = Object.create(handler);
     const current = newHandler[ROUTER] = Object.create(parent || null);
     if (props.prefix) {
         current.prefix = parentPrefix + props.prefix;
     }
-    if (props.path || props.search) {
+    if (props.path) {
         const urlReg = new RegExp(getMatchReg(props));
         if (urlReg.test(url)) {
             current.params = url.match(urlReg).groups;

package/plugins/router/router.js

@@ -12,7 +12,7 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
 function getMatchReg(props) {
     var ish = props.ish, path = props.path;
-    return "^".concat(path ? "".concat(path).concat(ish ? '(/[^?]*)?' : '') : '[^?]*', "(\\?.*)?$");
+    return "^".concat(path).concat(ish ? '(?<rest>/.*)?' : '', "$");
 }
 var ROUTER = Symbol('Parent Router');
 function useRouter() {
@@ -26,25 +26,25 @@ function router(_a, handler) {
     if (!props)
         return children;
     var action = handler[Action.ACTION];
-    var req = action.req;
-    if (!req) {
+    if (!action) {
         throw Error('`router` should be used inside `server`');
     }
+    var req = action.req, path = action.path;
     if (props.method && props.method !== req.method) {
         return;
     }
     var parent = handler[ROUTER];
     var parentPrefix = (parent === null || parent === void 0 ? void 0 : parent.prefix) || '';
-    if (parentPrefix && !req.url.startsWith(parentPrefix)) {
+    if (parentPrefix && !path.startsWith(parentPrefix)) {
         return;
     }
-    var url = parentPrefix ? req.url.slice(parentPrefix.length) : req.url;
+    var url = parentPrefix ? path.slice(parentPrefix.length) : path;
     var newHandler = Object.create(handler);
     var current = newHandler[ROUTER] = Object.create(parent || null);
     if (props.prefix) {
         current.prefix = parentPrefix + props.prefix;
     }
-    if (props.path || props.search) {
+    if (props.path) {
         var urlReg = new RegExp(getMatchReg(props));
         if (urlReg.test(url)) {
             current.params = url.match(urlReg).groups;