@innet/server 1.6.4 → 1.6.5

package/action/Action/Action.d.ts

@@ -28,6 +28,8 @@ export interface ActionParams {
 }
 export declare type Resources = Exclude<keyof ActionOptions, undefined>;
 export declare const URL_PARSER: RegExp;
+export declare const KEY_FIELD: RegExp;
+export declare const KEY_KEYS: RegExp;
 export declare class Action<O extends ActionOptions = ActionOptions> {
     readonly req: Request;
     readonly res: Response;
@@ -45,4 +47,3 @@ export declare class Action<O extends ActionOptions = ActionOptions> {
     };
     get path(): string;
 }
-export declare function useAction<T extends Partial<ActionOptions>, O extends ActionOptions = ActionOptions & T>(): Action<O>;

package/action/Action/Action.es6.js

@@ -1,6 +1,5 @@
 import { __decorate } from 'tslib';
 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';
@@ -8,6 +7,72 @@ import 'qs';
 
 const ACTION = Symbol('Action');
 const URL_PARSER = /^(?<path>[^?]+)(\?(?<search>.*))?/;
+const KEY_FIELD = /^(?<field>[^[]+)(?<rest>.*)$/;
+const KEY_KEYS = /^\[(?<key>[^\]]+)\](?<rest>.*)$/;
+function getKeys(keys) {
+    const match = keys.match(KEY_KEYS);
+    if (!match)
+        return [keys];
+    if (!match.groups.rest)
+        return [match.groups.key];
+    return [match.groups.key, ...getKeys(match.groups.rest)];
+}
+function parseKey(key) {
+    const fieldMatch = key.match(KEY_FIELD);
+    if (!(fieldMatch === null || fieldMatch === void 0 ? void 0 : fieldMatch.groups.field)) {
+        return {
+            field: key,
+            keys: [],
+        };
+    }
+    return {
+        field: fieldMatch.groups.field,
+        keys: (fieldMatch === null || fieldMatch === void 0 ? void 0 : fieldMatch.groups.rest) ? getKeys(fieldMatch.groups.rest) : [],
+    };
+}
+function addField(key, value, fields) {
+    if (!key.keys.length) {
+        if (!(key.field in fields)) {
+            fields[key.field] = value;
+            return;
+        }
+        const oldValue = fields[key.field];
+        if (Array.isArray(oldValue)) {
+            if (Array.isArray(value)) {
+                oldValue.push(...value);
+                return;
+            }
+            oldValue.push(value);
+            return;
+        }
+        if (Array.isArray(value)) {
+            fields[key.field] = [oldValue, ...value];
+            return;
+        }
+        fields[key.field] = [oldValue, value];
+        return;
+    }
+    const [field, ...keys] = key.keys;
+    const oldValue = fields[key.field];
+    if (Array.isArray(oldValue)) {
+        throw Error('invalid keys');
+    }
+    if (!oldValue) {
+        fields[key.field] = {};
+    }
+    else if (typeof oldValue !== 'object') {
+        throw Error('invalid keys');
+    }
+    addField({ field, keys }, value, fields[key.field]);
+}
+function formatFields(fields) {
+    const result = {};
+    for (const key in fields) {
+        const value = fields[key];
+        addField(parseKey(key), Array.isArray(value) && value.length === 1 ? value[0] : value, result);
+    }
+    return result;
+}
 class Action {
     constructor(req, res, params = {}) {
         this.req = req;
@@ -36,22 +101,11 @@ class Action {
             new multiparty.Form(this.params.multipartyForm).parse(this.req, (err, fields, files) => {
                 if (err) {
                     reject(err);
+                    return;
                 }
-                else {
-                    for (const key in fields) {
-                        if (fields[key].length === 1) {
-                            fields[key] = fields[key][0];
-                        }
-                    }
-                    for (const key in files) {
-                        if (files[key].length === 1) {
-                            files[key] = files[key][0];
-                        }
-                    }
-                    this.body = fields;
-                    this.files = files;
-                    resolve(fields);
-                }
+                this.body = formatFields(fields);
+                this.files = formatFields(files);
+                resolve(fields);
             });
         });
     }
@@ -77,9 +131,6 @@ __decorate([
 ], Action.prototype, "search", null);
 __decorate([
     once
-], Action.prototype, "parsedUrl", null);
-function useAction() {
-    return useHandler()[ACTION];
-}
+], Action.prototype, "parsedUrl", null);
 
-export { ACTION, Action, URL_PARSER, useAction };
+export { ACTION, Action, KEY_FIELD, KEY_KEYS, URL_PARSER };

package/action/Action/Action.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 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');
@@ -17,6 +16,72 @@ var multiparty__default = /*#__PURE__*/_interopDefaultLegacy(multiparty);
 
 var ACTION = Symbol('Action');
 var URL_PARSER = /^(?<path>[^?]+)(\?(?<search>.*))?/;
+var KEY_FIELD = /^(?<field>[^[]+)(?<rest>.*)$/;
+var KEY_KEYS = /^\[(?<key>[^\]]+)\](?<rest>.*)$/;
+function getKeys(keys) {
+    var match = keys.match(KEY_KEYS);
+    if (!match)
+        return [keys];
+    if (!match.groups.rest)
+        return [match.groups.key];
+    return tslib.__spreadArray([match.groups.key], tslib.__read(getKeys(match.groups.rest)), false);
+}
+function parseKey(key) {
+    var fieldMatch = key.match(KEY_FIELD);
+    if (!(fieldMatch === null || fieldMatch === void 0 ? void 0 : fieldMatch.groups.field)) {
+        return {
+            field: key,
+            keys: [],
+        };
+    }
+    return {
+        field: fieldMatch.groups.field,
+        keys: (fieldMatch === null || fieldMatch === void 0 ? void 0 : fieldMatch.groups.rest) ? getKeys(fieldMatch.groups.rest) : [],
+    };
+}
+function addField(key, value, fields) {
+    if (!key.keys.length) {
+        if (!(key.field in fields)) {
+            fields[key.field] = value;
+            return;
+        }
+        var oldValue_1 = fields[key.field];
+        if (Array.isArray(oldValue_1)) {
+            if (Array.isArray(value)) {
+                oldValue_1.push.apply(oldValue_1, tslib.__spreadArray([], tslib.__read(value), false));
+                return;
+            }
+            oldValue_1.push(value);
+            return;
+        }
+        if (Array.isArray(value)) {
+            fields[key.field] = tslib.__spreadArray([oldValue_1], tslib.__read(value), false);
+            return;
+        }
+        fields[key.field] = [oldValue_1, value];
+        return;
+    }
+    var _a = tslib.__read(key.keys), field = _a[0], keys = _a.slice(1);
+    var oldValue = fields[key.field];
+    if (Array.isArray(oldValue)) {
+        throw Error('invalid keys');
+    }
+    if (!oldValue) {
+        fields[key.field] = {};
+    }
+    else if (typeof oldValue !== 'object') {
+        throw Error('invalid keys');
+    }
+    addField({ field: field, keys: keys }, value, fields[key.field]);
+}
+function formatFields(fields) {
+    var result = {};
+    for (var key in fields) {
+        var value = fields[key];
+        addField(parseKey(key), Array.isArray(value) && value.length === 1 ? value[0] : value, result);
+    }
+    return result;
+}
 var Action = /** @class */ (function () {
     function Action(req, res, params) {
         if (params === void 0) { params = {}; }
@@ -51,22 +116,11 @@ var Action = /** @class */ (function () {
             new multiparty__default["default"].Form(_this.params.multipartyForm).parse(_this.req, function (err, fields, files) {
                 if (err) {
                     reject(err);
+                    return;
                 }
-                else {
-                    for (var key in fields) {
-                        if (fields[key].length === 1) {
-                            fields[key] = fields[key][0];
-                        }
-                    }
-                    for (var key in files) {
-                        if (files[key].length === 1) {
-                            files[key] = files[key][0];
-                        }
-                    }
-                    _this.body = fields;
-                    _this.files = files;
-                    resolve(fields);
-                }
+                _this.body = formatFields(fields);
+                _this.files = formatFields(files);
+                resolve(fields);
             });
         });
     };
@@ -105,12 +159,10 @@ var Action = /** @class */ (function () {
         utils.once
     ], Action.prototype, "parsedUrl", null);
     return Action;
-}());
-function useAction() {
-    return jsx.useHandler()[ACTION];
-}
+}());
 
 exports.ACTION = ACTION;
 exports.Action = Action;
+exports.KEY_FIELD = KEY_FIELD;
+exports.KEY_KEYS = KEY_KEYS;
 exports.URL_PARSER = URL_PARSER;
-exports.useAction = useAction;

package/action/Action/index.es6.js

@@ -1 +1 @@
-export { ACTION, Action, URL_PARSER, useAction } from './Action.es6.js';
+export { ACTION, Action, KEY_FIELD, KEY_KEYS, URL_PARSER } from './Action.es6.js';

package/action/Action/index.js

@@ -8,5 +8,6 @@ var Action = require('./Action.js');
 
 exports.ACTION = Action.ACTION;
 exports.Action = Action.Action;
+exports.KEY_FIELD = Action.KEY_FIELD;
+exports.KEY_KEYS = Action.KEY_KEYS;
 exports.URL_PARSER = Action.URL_PARSER;
-exports.useAction = Action.useAction;

package/action/index.es6.js

@@ -1 +1 @@
-export { ACTION, Action, URL_PARSER, useAction } from './Action/Action.es6.js';
+export { ACTION, Action, KEY_FIELD, KEY_KEYS, URL_PARSER } from './Action/Action.es6.js';

package/action/index.js

@@ -8,5 +8,6 @@ var Action = require('./Action/Action.js');
 
 exports.ACTION = Action.ACTION;
 exports.Action = Action.Action;
+exports.KEY_FIELD = Action.KEY_FIELD;
+exports.KEY_KEYS = Action.KEY_KEYS;
 exports.URL_PARSER = Action.URL_PARSER;
-exports.useAction = Action.useAction;

package/hooks/index.d.ts

@@ -0,0 +1,5 @@
+export * from './useAction';
+export * from './useBody';
+export * from './useCookies';
+export * from './useFiles';
+export * from './useSearch';

package/hooks/index.es6.js

@@ -0,0 +1,5 @@
+export { useAction } from './useAction/useAction.es6.js';
+export { useBody } from './useBody/useBody.es6.js';
+export { useCookies } from './useCookies/useCookies.es6.js';
+export { useFiles } from './useFiles/useFiles.es6.js';
+export { useSearch } from './useSearch/useSearch.es6.js';

package/hooks/index.js

@@ -0,0 +1,17 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var useAction = require('./useAction/useAction.js');
+var useBody = require('./useBody/useBody.js');
+var useCookies = require('./useCookies/useCookies.js');
+var useFiles = require('./useFiles/useFiles.js');
+var useSearch = require('./useSearch/useSearch.js');
+
+
+
+exports.useAction = useAction.useAction;
+exports.useBody = useBody.useBody;
+exports.useCookies = useCookies.useCookies;
+exports.useFiles = useFiles.useFiles;
+exports.useSearch = useSearch.useSearch;

package/hooks/useAction/index.d.ts

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

package/hooks/useAction/index.es6.js

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

package/hooks/useAction/index.js

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

package/hooks/useAction/useAction.d.ts

@@ -0,0 +1,2 @@
+import { Action, ActionOptions } from '../../action';
+export declare function useAction<T extends Partial<ActionOptions>, O extends ActionOptions = ActionOptions & T>(): Action<O>;

package/hooks/useAction/useAction.es6.js

@@ -0,0 +1,8 @@
+import { useHandler } from '@innet/jsx';
+import { ACTION } from '../../action/Action/Action.es6.js';
+
+function useAction() {
+    return useHandler()[ACTION];
+}
+
+export { useAction };

package/hooks/useAction/useAction.js

@@ -0,0 +1,12 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsx = require('@innet/jsx');
+var Action = require('../../action/Action/Action.js');
+
+function useAction() {
+    return jsx.useHandler()[Action.ACTION];
+}
+
+exports.useAction = useAction;

package/hooks/useBody/index.d.ts

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

package/hooks/useBody/index.es6.js

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

package/hooks/useBody/index.js

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

package/hooks/useBody/useBody.d.ts

@@ -0,0 +1 @@
+export declare function useBody<T>(): T;

package/hooks/useBody/useBody.es6.js

@@ -0,0 +1,7 @@
+import { useAction } from '../useAction/useAction.es6.js';
+
+function useBody() {
+    return useAction().body;
+}
+
+export { useBody };

package/hooks/useBody/useBody.js

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

package/hooks/useCookies/index.d.ts

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

package/hooks/useCookies/index.es6.js

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

package/hooks/useCookies/index.js

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

package/hooks/useCookies/useCookies.d.ts

@@ -0,0 +1,2 @@
+import { Cookies } from '../../action';
+export declare function useCookies<T extends Cookies>(): T;

package/hooks/useCookies/useCookies.es6.js

@@ -0,0 +1,7 @@
+import { useAction } from '../useAction/useAction.es6.js';
+
+function useCookies() {
+    return useAction().cookies;
+}
+
+export { useCookies };

package/hooks/useCookies/useCookies.js

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

package/hooks/useFiles/index.d.ts

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

package/hooks/useFiles/index.es6.js

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

package/hooks/useFiles/index.js

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

package/hooks/useFiles/useFiles.d.ts

@@ -0,0 +1 @@
+export declare function useFiles<T>(): T;

package/hooks/useFiles/useFiles.es6.js

@@ -0,0 +1,7 @@
+import { useAction } from '../useAction/useAction.es6.js';
+
+function useFiles() {
+    return useAction().files;
+}
+
+export { useFiles };

package/hooks/useFiles/useFiles.js

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

package/hooks/useSearch/index.d.ts

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

package/hooks/useSearch/index.es6.js

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

package/hooks/useSearch/index.js

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

package/hooks/useSearch/useSearch.d.ts

@@ -0,0 +1 @@
+export declare function useSearch<D>(): D;

package/hooks/useSearch/useSearch.es6.js

@@ -0,0 +1,7 @@
+import { useAction } from '../useAction/useAction.es6.js';
+
+function useSearch() {
+    return useAction().search;
+}
+
+export { useSearch };

package/hooks/useSearch/useSearch.js

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

package/index.d.ts

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

package/index.es6.js

@@ -13,6 +13,11 @@ export { validation, validationContext } from './plugins/validation/validation.e
 export { formatter } from './plugins/formatter/formatter.es6.js';
 export { access, accessContext } from './plugins/access/access.es6.js';
 export { parseBody } from './plugins/parseBody/parseBody.es6.js';
-export { ACTION, Action, URL_PARSER, useAction } from './action/Action/Action.es6.js';
+export { ACTION, Action, KEY_FIELD, KEY_KEYS, URL_PARSER } from './action/Action/Action.es6.js';
 export { parseSearch } from './utils/parseSearch/parseSearch.es6.js';
 export { stringifySearch } from './utils/stringifySearch/stringifySearch.es6.js';
+export { useAction } from './hooks/useAction/useAction.es6.js';
+export { useBody } from './hooks/useBody/useBody.es6.js';
+export { useCookies } from './hooks/useCookies/useCookies.es6.js';
+export { useFiles } from './hooks/useFiles/useFiles.es6.js';
+export { useSearch } from './hooks/useSearch/useSearch.es6.js';

package/index.js

@@ -20,6 +20,11 @@ var parseBody = require('./plugins/parseBody/parseBody.js');
 var Action = require('./action/Action/Action.js');
 var parseSearch = require('./utils/parseSearch/parseSearch.js');
 var stringifySearch = require('./utils/stringifySearch/stringifySearch.js');
+var useAction = require('./hooks/useAction/useAction.js');
+var useBody = require('./hooks/useBody/useBody.js');
+var useCookies = require('./hooks/useCookies/useCookies.js');
+var useFiles = require('./hooks/useFiles/useFiles.js');
+var useSearch = require('./hooks/useSearch/useSearch.js');
 
 
 
@@ -54,7 +59,13 @@ exports.accessContext = access.accessContext;
 exports.parseBody = parseBody.parseBody;
 exports.ACTION = Action.ACTION;
 exports.Action = Action.Action;
+exports.KEY_FIELD = Action.KEY_FIELD;
+exports.KEY_KEYS = Action.KEY_KEYS;
 exports.URL_PARSER = Action.URL_PARSER;
-exports.useAction = Action.useAction;
 exports.parseSearch = parseSearch.parseSearch;
 exports.stringifySearch = stringifySearch.stringifySearch;
+exports.useAction = useAction.useAction;
+exports.useBody = useBody.useBody;
+exports.useCookies = useCookies.useCookies;
+exports.useFiles = useFiles.useFiles;
+exports.useSearch = useSearch.useSearch;

package/package.json

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