@innet/server 1.4.0 → 1.4.2

package/action/Action/Action.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 import { CookieSerializeOptions } from 'cookie';
 import { IncomingMessage, ServerResponse } from 'http';
+import { ParsedQs } from 'qs';
 export declare const ACTION: string;
-export declare type Resources = 'search' | 'body' | 'cookies' | 'files';
 export declare type Body = Record<string, any>;
-export declare type Search = Record<string, any>;
+export declare type Search = ParsedQs;
 export declare type Cookies = Record<string, string | string[]>;
 export interface File {
     fieldName: string;
@@ -22,6 +22,7 @@ export interface ActionOptions {
     cookies?: Cookies;
     files?: Files;
 }
+export declare type Resources = Exclude<keyof ActionOptions, undefined>;
 export declare const URL_PARSER: RegExp;
 export declare class Action<O extends ActionOptions = ActionOptions> {
     readonly req: Request;

package/action/Action/Action.es6.js

@@ -3,6 +3,8 @@ import { once } from '@cantinc/utils';
 import { useHandler } from '@innet/jsx';
 import cookie from 'cookie';
 import multiparty from 'multiparty';
+import { parseSearch } from '../../utils/parseSearch/parseSearch.es6.js';
+import 'qs';
 
 const ACTION = Symbol('Action');
 const URL_PARSER = /^(?<path>[^?]+)(\?(?<search>.*))?/;
@@ -53,26 +55,7 @@ class Action {
         });
     }
     get search() {
-        const result = Object.create(null);
-        const search = this.parsedUrl.search || '';
-        for (const option of search.split('&')) {
-            const [key, ...value] = option.split('=');
-            if (key) {
-                const normValue = value.join('=');
-                if (key in result) {
-                    if (Array.isArray(result[key])) {
-                        result[key].push(normValue);
-                    }
-                    else {
-                        result[key] = [result[key], normValue];
-                    }
-                }
-                else {
-                    result[key] = normValue;
-                }
-            }
-        }
-        return result;
+        return parseSearch(this.parsedUrl.search);
     }
     get parsedUrl() {
         const match = this.req.url.match(URL_PARSER);

package/action/Action/Action.js

@@ -7,6 +7,8 @@ var utils = require('@cantinc/utils');
 var jsx = require('@innet/jsx');
 var cookie = require('cookie');
 var multiparty = require('multiparty');
+var parseSearch = require('../../utils/parseSearch/parseSearch.js');
+require('qs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -68,37 +70,7 @@ var Action = /** @class */ (function () {
     };
     Object.defineProperty(Action.prototype, "search", {
         get: function () {
-            var e_1, _a;
-            var result = Object.create(null);
-            var search = this.parsedUrl.search || '';
-            try {
-                for (var _b = tslib.__values(search.split('&')), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var option = _c.value;
-                    var _d = tslib.__read(option.split('=')), key = _d[0], value = _d.slice(1);
-                    if (key) {
-                        var normValue = value.join('=');
-                        if (key in result) {
-                            if (Array.isArray(result[key])) {
-                                result[key].push(normValue);
-                            }
-                            else {
-                                result[key] = [result[key], normValue];
-                            }
-                        }
-                        else {
-                            result[key] = normValue;
-                        }
-                    }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-            return result;
+            return parseSearch.parseSearch(this.parsedUrl.search);
         },
         enumerable: false,
         configurable: true

package/index.d.ts

@@ -3,3 +3,4 @@ export * from './server';
 export * from './plugins';
 export * from './handler';
 export * from './action';
+export * from './utils';

package/index.es6.js

@@ -10,3 +10,5 @@ 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 { 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

@@ -14,6 +14,8 @@ var file = require('./plugins/file/file.js');
 var proxy = require('./plugins/proxy/proxy.js');
 var redirect = require('./plugins/redirect/redirect.js');
 var Action = require('./action/Action/Action.js');
+var parseSearch = require('./utils/parseSearch/parseSearch.js');
+var stringifySearch = require('./utils/stringifySearch/stringifySearch.js');
 
 
 
@@ -44,3 +46,5 @@ exports.ACTION = Action.ACTION;
 exports.Action = Action.Action;
 exports.URL_PARSER = Action.URL_PARSER;
 exports.useAction = Action.useAction;
+exports.parseSearch = parseSearch.parseSearch;
+exports.stringifySearch = stringifySearch.stringifySearch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",
@@ -28,12 +28,14 @@
     "@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",
     "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"
   }

package/plugins/redirect/redirect.d.ts

@@ -10,6 +10,7 @@ export declare const redirectStatuses: {
 };
 export interface RedirectProps {
     to: string;
+    decode?: boolean;
     status?: number | keyof typeof redirectStatuses;
 }
 export declare function redirect({ props, children }: {

package/plugins/redirect/redirect.es6.js

@@ -17,9 +17,9 @@ function getStatus(status) {
 }
 function redirect({ props, children }, handler) {
     const { res } = handler[ACTION];
-    const { to, status = 301 } = props;
+    const { to, status = 301, decode } = props;
     res.writeHead(getStatus(status), {
-        location: to,
+        location: decode ? decodeURI(to) : to,
     });
     return null;
 }

package/plugins/redirect/redirect.js

@@ -22,9 +22,9 @@ function getStatus(status) {
 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;
+    var to = props.to, _b = props.status, status = _b === void 0 ? 301 : _b, decode = props.decode;
     res.writeHead(getStatus(status), {
-        location: to,
+        location: decode ? decodeURI(to) : to,
     });
     return null;
 }

package/utils/index.d.ts

@@ -0,0 +1,2 @@
+export * from './parseSearch';
+export * from './stringifySearch';

package/utils/index.es6.js

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

package/utils/index.js

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

package/utils/parseSearch/index.d.ts

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

package/utils/parseSearch/index.es6.js

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

package/utils/parseSearch/index.js

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

package/utils/parseSearch/parseSearch.d.ts

@@ -0,0 +1,2 @@
+import { IParseOptions, ParsedQs } from 'qs';
+export declare function parseSearch<V extends ParsedQs>(search?: string, options?: IParseOptions): V;

package/utils/parseSearch/parseSearch.es6.js

@@ -0,0 +1,7 @@
+import qs from 'qs';
+
+function parseSearch(search, options) {
+    return qs.parse(search, Object.assign({ ignoreQueryPrefix: true }, options));
+}
+
+export { parseSearch };

package/utils/parseSearch/parseSearch.js

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var qs = require('qs');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var qs__default = /*#__PURE__*/_interopDefaultLegacy(qs);
+
+function parseSearch(search, options) {
+    return qs__default["default"].parse(search, tslib.__assign({ ignoreQueryPrefix: true }, options));
+}
+
+exports.parseSearch = parseSearch;

package/utils/stringifySearch/index.d.ts

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

package/utils/stringifySearch/index.es6.js

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

package/utils/stringifySearch/index.js

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

package/utils/stringifySearch/stringifySearch.d.ts

@@ -0,0 +1,2 @@
+import { IStringifyOptions, ParsedQs } from 'qs';
+export declare function stringifySearch(search: ParsedQs, options?: IStringifyOptions): string;

package/utils/stringifySearch/stringifySearch.es6.js

@@ -0,0 +1,7 @@
+import qs from 'qs';
+
+function stringifySearch(search, options) {
+    return qs.stringify(search, Object.assign({ encode: false }, options));
+}
+
+export { stringifySearch };

package/utils/stringifySearch/stringifySearch.js

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var qs = require('qs');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var qs__default = /*#__PURE__*/_interopDefaultLegacy(qs);
+
+function stringifySearch(search, options) {
+    return qs__default["default"].stringify(search, tslib.__assign({ encode: false }, options));
+}
+
+exports.stringifySearch = stringifySearch;