@innet/server 1.6.6 → 1.7.0

package/plugins/file/file.es6.js

@@ -1,10 +1,14 @@
 import innet from 'innet';
 import fs from 'fs';
 import mime from 'mime';
-import { ACTION } from '../../action/Action/Action.es6.js';
+import { actionContext } from '../../hooks/useAction/useAction.es6.js';
+import '../../hooks/useServer/useServer.es6.js';
 
 function file({ props, children = null }, handler) {
-    const { res } = handler[ACTION];
+    const action = actionContext.get(handler);
+    if (!action) {
+        throw Error('Use <file> inside <action>');
+    }
     const { path } = props;
     if (fs.existsSync(path)) {
         const stat = fs.statSync(path);
@@ -12,11 +16,11 @@ function file({ props, children = null }, handler) {
             const readStream = fs.createReadStream(path);
             const result = innet(children, handler);
             const run = () => {
-                res.writeHead(200, {
+                action.res.writeHead(200, {
                     'Content-Type': mime.getType(path),
                     'Content-Length': stat.size,
                 });
-                readStream.pipe(res);
+                readStream.pipe(action.res);
             };
             if (result instanceof Promise) {
                 result.then(run);

package/plugins/file/file.js

@@ -5,7 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var innet = require('innet');
 var fs = require('fs');
 var mime = require('mime');
-var Action = require('../../action/Action/Action.js');
+var useAction = require('../../hooks/useAction/useAction.js');
+require('../../hooks/useServer/useServer.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -15,7 +16,10 @@ var mime__default = /*#__PURE__*/_interopDefaultLegacy(mime);
 
 function file(_a, handler) {
     var props = _a.props, _b = _a.children, children = _b === void 0 ? null : _b;
-    var res = handler[Action.ACTION].res;
+    var action = useAction.actionContext.get(handler);
+    if (!action) {
+        throw Error('Use <file> inside <action>');
+    }
     var path = props.path;
     if (fs__default["default"].existsSync(path)) {
         var stat_1 = fs__default["default"].statSync(path);
@@ -23,11 +27,11 @@ function file(_a, handler) {
             var readStream_1 = fs__default["default"].createReadStream(path);
             var result_1 = innet__default["default"](children, handler);
             var run = function () {
-                res.writeHead(200, {
+                action.res.writeHead(200, {
                     'Content-Type': mime__default["default"].getType(path),
                     'Content-Length': stat_1.size,
                 });
-                readStream_1.pipe(res);
+                readStream_1.pipe(action.res);
             };
             if (result_1 instanceof Promise) {
                 result_1.then(run);

package/plugins/formatter/formatter.d.ts

@@ -1,4 +1,4 @@
-import { Resources } from '../../action';
+import { Resources } from '../../utils';
 export interface Formatter<V> {
     (value?: any): V;
 }

package/plugins/formatter/formatter.es6.js

@@ -1,10 +1,11 @@
 import innet from 'innet';
-import { ACTION } from '../../action/Action/Action.es6.js';
+import { actionContext } from '../../hooks/useAction/useAction.es6.js';
+import '../../hooks/useServer/useServer.es6.js';
 
 function formatter({ props, children }, handler) {
-    const action = handler[ACTION];
+    const action = actionContext.get(handler);
     if (!action) {
-        throw Error('`formatter` should be inside `server`');
+        throw Error('Use <formatter> inside <action>');
     }
     const { map, resource = 'body' } = props;
     const run = () => {

package/plugins/formatter/formatter.js

@@ -4,7 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var innet = require('innet');
-var Action = require('../../action/Action/Action.js');
+var useAction = require('../../hooks/useAction/useAction.js');
+require('../../hooks/useServer/useServer.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -12,9 +13,9 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
 function formatter(_a, handler) {
     var props = _a.props, children = _a.children;
-    var action = handler[Action.ACTION];
+    var action = useAction.actionContext.get(handler);
     if (!action) {
-        throw Error('`formatter` should be inside `server`');
+        throw Error('Use <formatter> inside <action>');
     }
     var map = props.map, _b = props.resource, resource = _b === void 0 ? 'body' : _b;
     var run = function () {

package/plugins/header/header.es6.js

@@ -1,9 +1,13 @@
 import innet from 'innet';
-import { ACTION } from '../../action/Action/Action.es6.js';
+import { actionContext } from '../../hooks/useAction/useAction.es6.js';
+import '../../hooks/useServer/useServer.es6.js';
 
 function header({ props: { name, value }, children }, handler) {
-    const { res } = handler[ACTION];
-    res.setHeader(name, value);
+    const action = actionContext.get(handler);
+    if (!action) {
+        throw Error('Use <header> inside <action>');
+    }
+    action.res.setHeader(name, value);
     return innet(children, handler);
 }
 

package/plugins/header/header.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var innet = require('innet');
-var Action = require('../../action/Action/Action.js');
+var useAction = require('../../hooks/useAction/useAction.js');
+require('../../hooks/useServer/useServer.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -11,8 +12,11 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
 function header(_a, handler) {
     var _b = _a.props, name = _b.name, value = _b.value, children = _a.children;
-    var res = handler[Action.ACTION].res;
-    res.setHeader(name, value);
+    var action = useAction.actionContext.get(handler);
+    if (!action) {
+        throw Error('Use <header> inside <action>');
+    }
+    action.res.setHeader(name, value);
     return innet__default["default"](children, handler);
 }
 

package/plugins/index.d.ts

@@ -11,3 +11,5 @@ export * from './validation';
 export * from './formatter';
 export * from './access';
 export * from './parseBody';
+export * from './server';
+export * from './action';

package/plugins/index.es6.js

@@ -11,3 +11,5 @@ export { validation, validationContext } from './validation/validation.es6.js';
 export { formatter } from './formatter/formatter.es6.js';
 export { access, accessContext } from './access/access.es6.js';
 export { parseBody } from './parseBody/parseBody.es6.js';
+export { server } from './server/server.es6.js';
+export { action } from './action/action.es6.js';

package/plugins/index.js

@@ -15,6 +15,8 @@ var validation = require('./validation/validation.js');
 var formatter = require('./formatter/formatter.js');
 var access = require('./access/access.js');
 var parseBody = require('./parseBody/parseBody.js');
+var server = require('./server/server.js');
+var action = require('./action/action.js');
 
 
 
@@ -39,3 +41,5 @@ exports.formatter = formatter.formatter;
 exports.access = access.access;
 exports.accessContext = access.accessContext;
 exports.parseBody = parseBody.parseBody;
+exports.server = server.server;
+exports.action = action.action;

package/plugins/parseBody/parseBody.d.ts

@@ -4,4 +4,4 @@ export interface ParseBodyJsxElement {
     props: ParseBodyProps;
     children?: any;
 }
-export declare function parseBody({ props, children }: ParseBodyJsxElement, handler: any): any;
+export declare function parseBody({ props, children }: ParseBodyJsxElement, handler: any): Promise<any>;

package/plugins/parseBody/parseBody.es6.js

@@ -1,8 +1,9 @@
 import innet from 'innet';
-import { ACTION } from '../../action/Action/Action.es6.js';
+import { actionContext } from '../../hooks/useAction/useAction.es6.js';
+import '../../hooks/useServer/useServer.es6.js';
 
 function parseBody({ props, children }, handler) {
-    return handler[ACTION].parseBody().then(() => innet(children, handler));
+    return actionContext.get(handler).parseBody().then(() => innet(children, handler));
 }
 
 export { parseBody };

package/plugins/parseBody/parseBody.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var innet = require('innet');
-var Action = require('../../action/Action/Action.js');
+var useAction = require('../../hooks/useAction/useAction.js');
+require('../../hooks/useServer/useServer.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -11,7 +12,7 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
 function parseBody(_a, handler) {
     _a.props; var children = _a.children;
-    return handler[Action.ACTION].parseBody().then(function () { return innet__default["default"](children, handler); });
+    return useAction.actionContext.get(handler).parseBody().then(function () { return innet__default["default"](children, handler); });
 }
 
 exports.parseBody = parseBody;

package/plugins/proxy/proxy.es6.js

@@ -1,10 +1,15 @@
 import httpProxy from 'http-proxy';
-import { ACTION } from '../../action/Action/Action.es6.js';
 import { CONTINUE } from '../../constants.es6.js';
+import { actionContext } from '../../hooks/useAction/useAction.es6.js';
+import '../../hooks/useServer/useServer.es6.js';
 
 const proxyServer = httpProxy.createProxyServer({});
 function proxy({ props: { to, secure = false } }, handler) {
-    const { req, res } = handler[ACTION];
+    const action = actionContext.get(handler);
+    if (!action) {
+        throw Error('Use <proxy> inside <action>');
+    }
+    const { req, res } = action;
     delete req.headers.host;
     proxyServer.web(req, res, { target: to, secure });
     return CONTINUE;

package/plugins/proxy/proxy.js

@@ -3,8 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var httpProxy = require('http-proxy');
-var Action = require('../../action/Action/Action.js');
 var constants = require('../../constants.js');
+var useAction = require('../../hooks/useAction/useAction.js');
+require('../../hooks/useServer/useServer.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -13,7 +14,11 @@ var httpProxy__default = /*#__PURE__*/_interopDefaultLegacy(httpProxy);
 var proxyServer = httpProxy__default["default"].createProxyServer({});
 function proxy(_a, handler) {
     var _b = _a.props, to = _b.to, _c = _b.secure, secure = _c === void 0 ? false : _c;
-    var _d = handler[Action.ACTION], req = _d.req, res = _d.res;
+    var action = useAction.actionContext.get(handler);
+    if (!action) {
+        throw Error('Use <proxy> inside <action>');
+    }
+    var req = action.req, res = action.res;
     delete req.headers.host;
     proxyServer.web(req, res, { target: to, secure: secure });
     return constants.CONTINUE;

package/plugins/redirect/redirect.es6.js

@@ -1,4 +1,5 @@
-import { ACTION } from '../../action/Action/Action.es6.js';
+import { actionContext } from '../../hooks/useAction/useAction.es6.js';
+import '../../hooks/useServer/useServer.es6.js';
 
 const redirectStatuses = {
     multipleChoices: 300,
@@ -19,9 +20,12 @@ function customEncode(url) {
     return encodeURI(url.replaceAll('%20', ' '));
 }
 function redirect({ props, children }, handler) {
-    const { res } = handler[ACTION];
+    const action = actionContext.get(handler);
+    if (!action) {
+        throw Error('Use <redirect> inside <action>');
+    }
     const { to, status = 301, encode } = props;
-    res.writeHead(getStatus(status), {
+    action.res.writeHead(getStatus(status), {
         location: encode ? customEncode(to) : to,
     });
     return null;

package/plugins/redirect/redirect.js

@@ -2,7 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var Action = require('../../action/Action/Action.js');
+var useAction = require('../../hooks/useAction/useAction.js');
+require('../../hooks/useServer/useServer.js');
 
 var redirectStatuses = {
     multipleChoices: 300,
@@ -24,9 +25,12 @@ function customEncode(url) {
 }
 function redirect(_a, handler) {
     var props = _a.props; _a.children;
-    var res = handler[Action.ACTION].res;
+    var action = useAction.actionContext.get(handler);
+    if (!action) {
+        throw Error('Use <redirect> inside <action>');
+    }
     var to = props.to, _b = props.status, status = _b === void 0 ? 301 : _b, encode = props.encode;
-    res.writeHead(getStatus(status), {
+    action.res.writeHead(getStatus(status), {
         location: encode ? customEncode(to) : to,
     });
     return null;

package/plugins/router/router.d.ts

@@ -1,4 +1,4 @@
-import { Action } from '../../action';
+import { type Action } from 'src/utils';
 export declare type Methods = 'GET' | 'HEAD' | 'POST' | 'DELETE' | 'PUT' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'PATCH';
 export interface RouterProps {
     method?: Methods;

package/plugins/router/router.es6.js

@@ -1,6 +1,7 @@
 import innet from 'innet';
 import { useHandler } from '@innet/jsx';
-import { ACTION } from '../../action/Action/Action.es6.js';
+import { actionContext } from '../../hooks/useAction/useAction.es6.js';
+import '../../hooks/useServer/useServer.es6.js';
 
 function getMatchReg(props) {
     const { ish, path } = props;
@@ -16,9 +17,9 @@ function router({ props, children }, handler) {
         return;
     if (!props)
         return children;
-    const action = handler[ACTION];
+    const action = actionContext.get(handler);
     if (!action) {
-        throw Error('`router` should be used inside `server`');
+        throw Error('Use <router> inside <action>');
     }
     const { req, path } = action;
     if (props.method && props.method !== req.method) {

package/plugins/router/router.js

@@ -4,7 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var innet = require('innet');
 var jsx = require('@innet/jsx');
-var Action = require('../../action/Action/Action.js');
+var useAction = require('../../hooks/useAction/useAction.js');
+require('../../hooks/useServer/useServer.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -25,9 +26,9 @@ function router(_a, handler) {
         return;
     if (!props)
         return children;
-    var action = handler[Action.ACTION];
+    var action = useAction.actionContext.get(handler);
     if (!action) {
-        throw Error('`router` should be used inside `server`');
+        throw Error('Use <router> inside <action>');
     }
     var req = action.req, path = action.path;
     if (props.method && props.method !== req.method) {

package/plugins/server/server.d.ts

@@ -0,0 +1,22 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { Handler } from 'innet';
+import http from 'http';
+import http2 from 'https';
+import { Request, Response } from '../../utils';
+export interface SSL {
+    cert: string;
+    key: string;
+}
+export interface ServerProps {
+    port?: number;
+    ssl?: SSL;
+    onStart?: (url: string) => any;
+    onRequest?: (req: Request, res: Response) => any;
+    onError?: (e: Error) => any;
+    onDestroy?: () => any;
+}
+export declare function server({ props, children }: {
+    props?: ServerProps;
+    children: any;
+}, handler: Handler): http2.Server<typeof http.IncomingMessage, typeof http.ServerResponse> | http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;

package/plugins/server/server.es6.js

@@ -0,0 +1,43 @@
+import innet from 'innet';
+import fs from 'fs';
+import http from 'http';
+import http2 from 'https';
+import { onDestroy } from 'watch-state';
+import '../../hooks/useAction/useAction.es6.js';
+import { serverContext } from '../../hooks/useServer/useServer.es6.js';
+
+const isInvalidPath = require('is-invalid-path');
+function server({ props = {}, children }, handler) {
+    const { env } = process;
+    let { ssl: { key = env.SSL_KEY, cert = env.SSL_CRT } = {} } = props;
+    const childHandler = Object.create(handler);
+    if (!isInvalidPath(key)) {
+        key = fs.readFileSync(key).toString();
+    }
+    if (!isInvalidPath(cert)) {
+        cert = fs.readFileSync(cert).toString();
+    }
+    const https = Boolean(key && cert);
+    const { port = env.PORT || (https ? 442 : 80), onStart, onError, onRequest } = props;
+    const server = https ? http2.createServer({ key, cert }) : http.createServer();
+    childHandler[serverContext.key] = server;
+    onDestroy(() => {
+        var _a;
+        (_a = props.onDestroy) === null || _a === void 0 ? void 0 : _a.call(props);
+        server.close();
+    });
+    if (onError) {
+        server.on('error', onError);
+    }
+    if (onRequest) {
+        server.on('request', onRequest);
+    }
+    innet(children, childHandler);
+    server.listen(port, () => {
+        const url = `http${https ? 's' : ''}://localhost:${port}`;
+        onStart === null || onStart === void 0 ? void 0 : onStart(url);
+    });
+    return server;
+}
+
+export { server };

package/plugins/server/server.js

@@ -0,0 +1,55 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var innet = require('innet');
+var fs = require('fs');
+var http = require('http');
+var http2 = require('https');
+var watchState = require('watch-state');
+require('../../hooks/useAction/useAction.js');
+var useServer = require('../../hooks/useServer/useServer.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
+var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
+var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
+var http2__default = /*#__PURE__*/_interopDefaultLegacy(http2);
+
+var isInvalidPath = require('is-invalid-path');
+function server(_a, handler) {
+    var _b = _a.props, props = _b === void 0 ? {} : _b, children = _a.children;
+    var env = process.env;
+    var _c = props.ssl, _d = _c === void 0 ? {} : _c, _e = _d.key, key = _e === void 0 ? env.SSL_KEY : _e, _f = _d.cert, cert = _f === void 0 ? env.SSL_CRT : _f;
+    var childHandler = Object.create(handler);
+    if (!isInvalidPath(key)) {
+        key = fs__default["default"].readFileSync(key).toString();
+    }
+    if (!isInvalidPath(cert)) {
+        cert = fs__default["default"].readFileSync(cert).toString();
+    }
+    var https = Boolean(key && cert);
+    var _g = props.port, port = _g === void 0 ? env.PORT || (https ? 442 : 80) : _g, onStart = props.onStart, onError = props.onError, onRequest = props.onRequest;
+    var server = https ? http2__default["default"].createServer({ key: key, cert: cert }) : http__default["default"].createServer();
+    childHandler[useServer.serverContext.key] = server;
+    watchState.onDestroy(function () {
+        var _a;
+        (_a = props.onDestroy) === null || _a === void 0 ? void 0 : _a.call(props);
+        server.close();
+    });
+    if (onError) {
+        server.on('error', onError);
+    }
+    if (onRequest) {
+        server.on('request', onRequest);
+    }
+    innet__default["default"](children, childHandler);
+    server.listen(port, function () {
+        var url = "http".concat(https ? 's' : '', "://localhost:").concat(port);
+        onStart === null || onStart === void 0 ? void 0 : onStart(url);
+    });
+    return server;
+}
+
+exports.server = server;

package/plugins/success/success.es6.js

@@ -1,5 +1,6 @@
 import innet from 'innet';
-import { ACTION } from '../../action/Action/Action.es6.js';
+import { actionContext } from '../../hooks/useAction/useAction.es6.js';
+import '../../hooks/useServer/useServer.es6.js';
 
 const successStatuses = {
     ok: 200,
@@ -13,9 +14,12 @@ const successStatuses = {
     alreadyReported: 208,
 };
 function success({ props, children }, handler) {
-    const { res } = handler[ACTION];
+    const action = actionContext.get(handler);
+    if (!action) {
+        throw Error('Use <success> inside <action>');
+    }
     const status = props === null || props === void 0 ? void 0 : props.status;
-    res.statusCode = status
+    action.res.statusCode = status
         ? successStatuses[status] || status
         : children
             ? 200

package/plugins/success/success.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var innet = require('innet');
-var Action = require('../../action/Action/Action.js');
+var useAction = require('../../hooks/useAction/useAction.js');
+require('../../hooks/useServer/useServer.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -22,9 +23,12 @@ var successStatuses = {
 };
 function success(_a, handler) {
     var props = _a.props, children = _a.children;
-    var res = handler[Action.ACTION].res;
+    var action = useAction.actionContext.get(handler);
+    if (!action) {
+        throw Error('Use <success> inside <action>');
+    }
     var status = props === null || props === void 0 ? void 0 : props.status;
-    res.statusCode = status
+    action.res.statusCode = status
         ? successStatuses[status] || status
         : children
             ? 200

package/plugins/validation/validation.d.ts

@@ -1,6 +1,6 @@
 import { ValidationMap, ValidationResponse } from '@cantinc/utils';
 import { Context } from '@innet/jsx';
-import { Resources } from '../../action';
+import { Resources } from '../../utils';
 export interface ValidationProps<T> {
     map: ValidationMap<T>;
     resource?: Resources;

package/plugins/validation/validation.es6.js

@@ -1,13 +1,14 @@
 import innet from 'innet';
 import { validation as validation$1 } from '@cantinc/utils';
 import { Context } from '@innet/jsx';
-import { ACTION } from '../../action/Action/Action.es6.js';
+import { actionContext } from '../../hooks/useAction/useAction.es6.js';
+import '../../hooks/useServer/useServer.es6.js';
 
 const validationContext = new Context({});
 function validation({ props, children }, handler) {
-    const action = handler[ACTION];
+    const action = actionContext.get(handler);
     if (!action) {
-        throw Error('`validation` should be inside `server`');
+        throw Error('Use <validation> inside <action>');
     }
     const { map, resource = 'body' } = props;
     const run = () => {

package/plugins/validation/validation.js

@@ -5,7 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var innet = require('innet');
 var utils = require('@cantinc/utils');
 var jsx = require('@innet/jsx');
-var Action = require('../../action/Action/Action.js');
+var useAction = require('../../hooks/useAction/useAction.js');
+require('../../hooks/useServer/useServer.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -14,9 +15,9 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 var validationContext = new jsx.Context({});
 function validation(_a, handler) {
     var props = _a.props, children = _a.children;
-    var action = handler[Action.ACTION];
+    var action = useAction.actionContext.get(handler);
     if (!action) {
-        throw Error('`validation` should be inside `server`');
+        throw Error('Use <validation> inside <action>');
     }
     var map = props.map, _b = props.resource, resource = _b === void 0 ? 'body' : _b;
     var run = function () {

package/{action → utils/action}/Action/Action.d.ts

@@ -3,7 +3,6 @@ import { CookieSerializeOptions } from 'cookie';
 import { IncomingMessage, ServerResponse } from 'http';
 import { FormOptions } from 'multiparty';
 import { ParsedQs } from 'qs';
-export declare const ACTION: string;
 export declare type Body = Record<string, any>;
 export declare type Search = ParsedQs;
 export declare type Cookies = Record<string, string | string[]>;

package/{action → utils/action}/Action/Action.es6.js

@@ -2,10 +2,8 @@ import { __decorate } from 'tslib';
 import { once } from '@cantinc/utils';
 import cookie from 'cookie';
 import multiparty from 'multiparty';
-import { parseSearch } from '../../utils/parseSearch/parseSearch.es6.js';
-import 'qs';
+import { parseSearch } from '../../parseSearch/parseSearch.es6.js';
 
-const ACTION = Symbol('Action');
 const URL_PARSER = /^(?<path>[^?]+)(\?(?<search>.*))?/;
 const KEY_FIELD = /^(?<field>[^[]+)(?<rest>.*)$/;
 const KEY_KEYS = /^\[(?<key>[^\]]+)\](?<rest>.*)$/;
@@ -133,4 +131,4 @@ __decorate([
     once
 ], Action.prototype, "parsedUrl", null);
 
-export { ACTION, Action, KEY_FIELD, KEY_KEYS, URL_PARSER };
+export { Action, KEY_FIELD, KEY_KEYS, URL_PARSER };