@innet/server 2.0.0-beta.1 → 2.0.0-beta.2

package/plugins/schema/array/array.es6.js

@@ -1,4 +1,3 @@
-import { __rest } from 'tslib';
 import innet, { useNewHandler } from 'innet';
 import { useContext, useProps } from '@innet/jsx';
 import { callHandler } from '@innet/utils';
@@ -19,7 +18,7 @@ const array = () => {
     useBlock('path');
     const setRule = useContext(ruleContext);
     const handler = useNewHandler();
-    const _a = useProps(), { children } = _a, props = __rest(_a, ["children"]);
+    const { children, ...props } = useProps();
     const schema = useSchemaType('array', props);
     const fieldSchema = {};
     handler[schemaContext.key] = fieldSchema;

package/plugins/schema/array/array.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var innet = require('innet');
 var jsx = require('@innet/jsx');
 var utils = require('@innet/utils');
@@ -27,7 +26,7 @@ const array = () => {
     useBlock.useBlock('path');
     const setRule = jsx.useContext(useRule.ruleContext);
     const handler = innet.useNewHandler();
-    const _a = jsx.useProps(), { children } = _a, props = tslib.__rest(_a, ["children"]);
+    const { children, ...props } = jsx.useProps();
     const schema = useSchemaType.useSchemaType('array', props);
     const fieldSchema = {};
     handler[useSchemaContext.schemaContext.key] = fieldSchema;

package/plugins/schema/date/date.es6.js

@@ -1,4 +1,3 @@
-import { __rest } from 'tslib';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../hooks/useParentRule/index.es6.js';
@@ -16,7 +15,7 @@ import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 
 const date = () => {
-    const _a = useProps() || {}, { default: defaultValue, example, examples, max, min, values: values$1 } = _a, props = __rest(_a, ["default", "example", "examples", "max", "min", "values"]);
+    const { default: defaultValue, example, examples, max, min, values: values$1, ...props } = useProps() || {};
     const normMin = dateFormat(min);
     const normMax = dateFormat(max);
     const normDefault = dateFormat(defaultValue);
@@ -25,9 +24,14 @@ const date = () => {
     // @ts-expect-error: FIXME
     const stringValues = normValues === null || normValues === void 0 ? void 0 : normValues.map(value => value.toISOString());
     const normExamples = examples === null || examples === void 0 ? void 0 : examples.map(dateFormat);
-    const schema = useSchemaType('string', Object.assign(Object.assign({}, props), { default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString(), example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(), 
+    const schema = useSchemaType('string', {
+        ...props,
+        default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString(),
+        example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(),
         // @ts-expect-error: FIXME
-        examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()), values: stringValues }));
+        examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()),
+        values: stringValues,
+    });
     const rules = [];
     if (defaultValue !== undefined) {
         rules.push(defaultTo(defaultValue === 'now' ? () => new Date(Date.now()) : normDefault));

package/plugins/schema/date/date.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../hooks/useParentRule/index.js');
@@ -20,7 +19,7 @@ var useRule = require('../../../hooks/useRule/useRule.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const date = () => {
-    const _a = jsx.useProps() || {}, { default: defaultValue, example, examples, max, min, values: values$1 } = _a, props = tslib.__rest(_a, ["default", "example", "examples", "max", "min", "values"]);
+    const { default: defaultValue, example, examples, max, min, values: values$1, ...props } = jsx.useProps() || {};
     const normMin = dateFormat.dateFormat(min);
     const normMax = dateFormat.dateFormat(max);
     const normDefault = dateFormat.dateFormat(defaultValue);
@@ -29,9 +28,14 @@ const date = () => {
     // @ts-expect-error: FIXME
     const stringValues = normValues === null || normValues === void 0 ? void 0 : normValues.map(value => value.toISOString());
     const normExamples = examples === null || examples === void 0 ? void 0 : examples.map(dateFormat.dateFormat);
-    const schema = useSchemaType.useSchemaType('string', Object.assign(Object.assign({}, props), { default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString(), example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(), 
+    const schema = useSchemaType.useSchemaType('string', {
+        ...props,
+        default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString(),
+        example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(),
         // @ts-expect-error: FIXME
-        examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()), values: stringValues }));
+        examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()),
+        values: stringValues,
+    });
     const rules = [];
     if (defaultValue !== undefined) {
         rules.push(defaultTo.defaultTo(defaultValue === 'now' ? () => new Date(Date.now()) : normDefault));

package/plugins/schema/integer/integer.es6.js

@@ -1,4 +1,3 @@
-import { __rest } from 'tslib';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
@@ -13,8 +12,14 @@ import { optional } from '../../../utils/rules/optional/optional.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 
 const integer = () => {
-    const _a = useProps() || {}, { default: defaultValue, example, examples, format = 'int32', max: max$1, min: min$1, values: values$1 } = _a, props = __rest(_a, ["default", "example", "examples", "format", "max", "min", "values"]);
-    const schema = useSchemaType('integer', Object.assign(Object.assign({}, props), { default: defaultValue !== undefined ? Number(defaultValue) : undefined, example: example !== undefined ? Number(example) : undefined, examples: examples === null || examples === void 0 ? void 0 : examples.map(Number), values: values$1 === null || values$1 === void 0 ? void 0 : values$1.map(Number) }));
+    const { default: defaultValue, example, examples, format = 'int32', max: max$1, min: min$1, values: values$1, ...props } = useProps() || {};
+    const schema = useSchemaType('integer', {
+        ...props,
+        default: defaultValue !== undefined ? Number(defaultValue) : undefined,
+        example: example !== undefined ? Number(example) : undefined,
+        examples: examples === null || examples === void 0 ? void 0 : examples.map(Number),
+        values: values$1 === null || values$1 === void 0 ? void 0 : values$1.map(Number),
+    });
     // @ts-expect-error: FIXME
     schema.format = format;
     // @ts-expect-error: FIXME

package/plugins/schema/integer/integer.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
@@ -17,8 +16,14 @@ var optional = require('../../../utils/rules/optional/optional.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const integer = () => {
-    const _a = jsx.useProps() || {}, { default: defaultValue, example, examples, format = 'int32', max: max$1, min: min$1, values: values$1 } = _a, props = tslib.__rest(_a, ["default", "example", "examples", "format", "max", "min", "values"]);
-    const schema = useSchemaType.useSchemaType('integer', Object.assign(Object.assign({}, props), { default: defaultValue !== undefined ? Number(defaultValue) : undefined, example: example !== undefined ? Number(example) : undefined, examples: examples === null || examples === void 0 ? void 0 : examples.map(Number), values: values$1 === null || values$1 === void 0 ? void 0 : values$1.map(Number) }));
+    const { default: defaultValue, example, examples, format = 'int32', max: max$1, min: min$1, values: values$1, ...props } = jsx.useProps() || {};
+    const schema = useSchemaType.useSchemaType('integer', {
+        ...props,
+        default: defaultValue !== undefined ? Number(defaultValue) : undefined,
+        example: example !== undefined ? Number(example) : undefined,
+        examples: examples === null || examples === void 0 ? void 0 : examples.map(Number),
+        values: values$1 === null || values$1 === void 0 ? void 0 : values$1.map(Number),
+    });
     // @ts-expect-error: FIXME
     schema.format = format;
     // @ts-expect-error: FIXME

package/plugins/schema/number/number.es6.js

@@ -1,4 +1,3 @@
-import { __rest } from 'tslib';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../hooks/useParentRule/index.es6.js';
@@ -14,7 +13,7 @@ import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 
 const number = () => {
-    const _a = useProps() || {}, { max: max$1, min: min$1 } = _a, props = __rest(_a, ["max", "min"]);
+    const { max: max$1, min: min$1, ...props } = useProps() || {};
     const schema = useSchemaType('number', props);
     // @ts-expect-error: FIXME
     schema.minimum = min$1;

package/plugins/schema/number/number.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../hooks/useParentRule/index.js');
@@ -18,7 +17,7 @@ var useRule = require('../../../hooks/useRule/useRule.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const number = () => {
-    const _a = jsx.useProps() || {}, { max: max$1, min: min$1 } = _a, props = tslib.__rest(_a, ["max", "min"]);
+    const { max: max$1, min: min$1, ...props } = jsx.useProps() || {};
     const schema = useSchemaType.useSchemaType('number', props);
     // @ts-expect-error: FIXME
     schema.minimum = min$1;

package/plugins/schema/object/object.es6.js

@@ -1,4 +1,3 @@
-import { __rest } from 'tslib';
 import innet, { useNewHandler } from 'innet';
 import { useProps } from '@innet/jsx';
 import { callHandler } from '@innet/utils';
@@ -19,7 +18,7 @@ import { objectRuleContext } from '../../../hooks/useObjectRule/useObjectRule.es
 
 const object = () => {
     useBlock('path');
-    const _a = useProps(), { children } = _a, props = __rest(_a, ["children"]);
+    const { children, ...props } = useProps();
     const { refRules } = useApi();
     const schema = useSchemaType('object', props);
     const handler = useNewHandler();

package/plugins/schema/object/object.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var innet = require('innet');
 var jsx = require('@innet/jsx');
 var utils = require('@innet/utils');
@@ -27,7 +26,7 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
 const object = () => {
     useBlock.useBlock('path');
-    const _a = jsx.useProps(), { children } = _a, props = tslib.__rest(_a, ["children"]);
+    const { children, ...props } = jsx.useProps();
     const { refRules } = useApi.useApi();
     const schema = useSchemaType.useSchemaType('object', props);
     const handler = innet.useNewHandler();

package/plugins/schema/string/string.es6.js

@@ -1,4 +1,3 @@
-import { __rest } from 'tslib';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../hooks/useParentRule/index.es6.js';
@@ -15,7 +14,7 @@ import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
 
 const string = () => {
-    const _a = useProps() || {}, { max, min, pattern: pattern$1, patternId } = _a, props = __rest(_a, ["max", "min", "pattern", "patternId"]);
+    const { max, min, pattern: pattern$1, patternId, ...props } = useProps() || {};
     const { refRules } = useApi();
     const schema = useSchemaType('string', props);
     if (schema) {

package/plugins/schema/string/string.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../hooks/useParentRule/index.js');
@@ -19,7 +18,7 @@ var useRule = require('../../../hooks/useRule/useRule.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
 
 const string = () => {
-    const _a = jsx.useProps() || {}, { max, min, pattern: pattern$1, patternId } = _a, props = tslib.__rest(_a, ["max", "min", "pattern", "patternId"]);
+    const { max, min, pattern: pattern$1, patternId, ...props } = jsx.useProps() || {};
     const { refRules } = useApi.useApi();
     const schema = useSchemaType.useSchemaType('string', props);
     if (schema) {

package/plugins/schema/tuple/tuple.es6.js

@@ -1,4 +1,3 @@
-import { __rest } from 'tslib';
 import innet, { useNewHandler } from 'innet';
 import { useProps } from '@innet/jsx';
 import { callHandler } from '@innet/utils';
@@ -18,7 +17,7 @@ import { required } from '../../../utils/rules/required/required.es6.js';
 const tuple = () => {
     useBlock('path');
     const handler = useNewHandler();
-    const _a = useProps(), { children } = _a, props = __rest(_a, ["children"]);
+    const { children, ...props } = useProps();
     const schema = useSchemaType('array', props);
     if (schema) {
         const schemas = [];

package/plugins/schema/tuple/tuple.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var innet = require('innet');
 var jsx = require('@innet/jsx');
 var utils = require('@innet/utils');
@@ -26,7 +25,7 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 const tuple = () => {
     useBlock.useBlock('path');
     const handler = innet.useNewHandler();
-    const _a = jsx.useProps(), { children } = _a, props = tslib.__rest(_a, ["children"]);
+    const { children, ...props } = jsx.useProps();
     const schema = useSchemaType.useSchemaType('array', props);
     if (schema) {
         const schemas = [];

package/plugins/schema/uuid/uuid.es6.js

@@ -1,4 +1,3 @@
-import { __rest } from 'tslib';
 import { useProps } from '@innet/jsx';
 import { v4 } from 'uuid';
 import '../../../hooks/index.es6.js';
@@ -12,8 +11,11 @@ import { optional } from '../../../utils/rules/optional/optional.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 
 const uuid = () => {
-    const _a = useProps(), { default: defaultValue } = _a, props = __rest(_a, ["default"]);
-    const schema = useSchemaType('string', Object.assign(Object.assign({}, props), { default: defaultValue === 'new' ? undefined : defaultValue }));
+    const { default: defaultValue, ...props } = useProps();
+    const schema = useSchemaType('string', {
+        ...props,
+        default: defaultValue === 'new' ? undefined : defaultValue,
+    });
     // @ts-expect-error: FIXME
     schema.format = 'uuid';
     if (defaultValue === 'new') {

package/plugins/schema/uuid/uuid.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var jsx = require('@innet/jsx');
 var uuid$1 = require('uuid');
 require('../../../hooks/index.js');
@@ -16,8 +15,11 @@ var optional = require('../../../utils/rules/optional/optional.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const uuid = () => {
-    const _a = jsx.useProps(), { default: defaultValue } = _a, props = tslib.__rest(_a, ["default"]);
-    const schema = useSchemaType.useSchemaType('string', Object.assign(Object.assign({}, props), { default: defaultValue === 'new' ? undefined : defaultValue }));
+    const { default: defaultValue, ...props } = jsx.useProps();
+    const schema = useSchemaType.useSchemaType('string', {
+        ...props,
+        default: defaultValue === 'new' ? undefined : defaultValue,
+    });
     // @ts-expect-error: FIXME
     schema.format = 'uuid';
     if (defaultValue === 'new') {

package/utils/action/Action.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" />
-import { type CookieSerializeOptions } from 'cookie';
+import { type Cookies, type SerializeOptions } from 'cookie';
 import { type IncomingHttpHeaders, type IncomingMessage, type ServerResponse } from 'http';
 import { type ParsedQs } from 'qs';
 import { type BodyType } from '../../types';
@@ -15,14 +14,14 @@ export declare class Action {
     body?: object;
     constructor(req: IncomingMessage, res: ServerResponse);
     parseBody(): Promise<void>;
-    setCookie(name: string, value?: string, options?: CookieSerializeOptions): void;
+    setCookie(name: string, value?: string, options?: SerializeOptions): void;
     get bodyType(): BodyType | undefined;
     get clientIp(): string | null;
-    get cookies(): Record<string, string>;
+    get cookies(): Cookies;
     set cookies(value: Record<string, string>);
     get headers(): IncomingHttpHeaders;
     set headers(value: IncomingHttpHeaders);
-    get originCookies(): Record<string, string>;
+    get originCookies(): Cookies;
     get originHeaders(): IncomingHttpHeaders;
     get originSearch(): ParsedQs;
     get parsedUrl(): ParsedUrl;

package/utils/action/Action.es6.js

@@ -1,4 +1,4 @@
-import { __runInitializers, __awaiter, __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate } from 'tslib';
+import { __runInitializers, __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate } from 'tslib';
 import cookieLib from 'cookie';
 import { getClientIp } from 'request-ip';
 import '../decorators/index.es6.js';
@@ -29,21 +29,19 @@ let Action = (() => {
                 _Action_headers.set(this, {});
                 _Action_search.set(this, void 0);
             }
-            parseBody() {
-                return __awaiter(this, void 0, void 0, function* () {
-                    if (!this.bodyType) {
-                        return;
-                    }
-                    if (this.bodyType === 'multipart/form-data') {
-                        this.body = yield parseFormBody(this.req);
-                    }
-                    if (this.bodyType === 'application/x-www-form-urlencoded') {
-                        this.body = parseSearch(yield parseBody(this.req));
-                    }
-                    if (this.bodyType === 'application/json') {
-                        this.body = JSON.parse(yield parseBody(this.req));
-                    }
-                });
+            async parseBody() {
+                if (!this.bodyType) {
+                    return;
+                }
+                if (this.bodyType === 'multipart/form-data') {
+                    this.body = await parseFormBody(this.req);
+                }
+                if (this.bodyType === 'application/x-www-form-urlencoded') {
+                    this.body = parseSearch(await parseBody(this.req));
+                }
+                if (this.bodyType === 'application/json') {
+                    this.body = JSON.parse(await parseBody(this.req));
+                }
             }
             setCookie(name, value, options) {
                 let cookies = this.res.getHeader('Set-Cookie');

package/utils/action/Action.js

@@ -37,21 +37,19 @@ let Action = (() => {
                 _Action_headers.set(this, {});
                 _Action_search.set(this, void 0);
             }
-            parseBody() {
-                return tslib.__awaiter(this, void 0, void 0, function* () {
-                    if (!this.bodyType) {
-                        return;
-                    }
-                    if (this.bodyType === 'multipart/form-data') {
-                        this.body = yield parseFormBody.parseFormBody(this.req);
-                    }
-                    if (this.bodyType === 'application/x-www-form-urlencoded') {
-                        this.body = parseSearch.parseSearch(yield parseBody.parseBody(this.req));
-                    }
-                    if (this.bodyType === 'application/json') {
-                        this.body = JSON.parse(yield parseBody.parseBody(this.req));
-                    }
-                });
+            async parseBody() {
+                if (!this.bodyType) {
+                    return;
+                }
+                if (this.bodyType === 'multipart/form-data') {
+                    this.body = await parseFormBody.parseFormBody(this.req);
+                }
+                if (this.bodyType === 'application/x-www-form-urlencoded') {
+                    this.body = parseSearch.parseSearch(await parseBody.parseBody(this.req));
+                }
+                if (this.bodyType === 'application/json') {
+                    this.body = JSON.parse(await parseBody.parseBody(this.req));
+                }
             }
             setCookie(name, value, options) {
                 let cookies = this.res.getHeader('Set-Cookie');

package/utils/parseBody/parseBody.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" />
 import type http from 'http';
 export declare function parseBody(req: http.IncomingMessage): Promise<string>;

package/utils/parseBody/parseBody.es6.js

@@ -1,21 +1,18 @@
-import { __awaiter } from 'tslib';
 import { StringDecoder } from 'node:string_decoder';
 
-function parseBody(req) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield new Promise((resolve, reject) => {
-            const decoder = new StringDecoder('utf-8');
-            let buffer = '';
-            req.on('data', chunk => {
-                buffer += decoder.write(chunk);
-            });
-            req.on('end', () => {
-                buffer += decoder.end();
-                resolve(buffer);
-            });
-            req.on('error', err => {
-                reject(err);
-            });
+async function parseBody(req) {
+    return await new Promise((resolve, reject) => {
+        const decoder = new StringDecoder('utf-8');
+        let buffer = '';
+        req.on('data', chunk => {
+            buffer += decoder.write(chunk);
+        });
+        req.on('end', () => {
+            buffer += decoder.end();
+            resolve(buffer);
+        });
+        req.on('error', err => {
+            reject(err);
         });
     });
 }

package/utils/parseBody/parseBody.js

@@ -2,24 +2,21 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var node_string_decoder = require('node:string_decoder');
 
-function parseBody(req) {
-    return tslib.__awaiter(this, void 0, void 0, function* () {
-        return yield new Promise((resolve, reject) => {
-            const decoder = new node_string_decoder.StringDecoder('utf-8');
-            let buffer = '';
-            req.on('data', chunk => {
-                buffer += decoder.write(chunk);
-            });
-            req.on('end', () => {
-                buffer += decoder.end();
-                resolve(buffer);
-            });
-            req.on('error', err => {
-                reject(err);
-            });
+async function parseBody(req) {
+    return await new Promise((resolve, reject) => {
+        const decoder = new node_string_decoder.StringDecoder('utf-8');
+        let buffer = '';
+        req.on('data', chunk => {
+            buffer += decoder.write(chunk);
+        });
+        req.on('end', () => {
+            buffer += decoder.end();
+            resolve(buffer);
+        });
+        req.on('error', err => {
+            reject(err);
         });
     });
 }

package/utils/parseFormBody/parseFormBody.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" />
 import type http from 'http';
 export declare function parseFormBody(req: http.IncomingMessage): Promise<object>;

package/utils/parseFormBody/parseFormBody.es6.js

@@ -1,54 +1,54 @@
-import { __awaiter, __rest } from 'tslib';
 import { Form } from 'multiparty';
 import '../FileData/index.es6.js';
 import '../parseSearch/index.es6.js';
 import { Bin } from '../FileData/Bin.es6.js';
 import { parseSearch } from '../parseSearch/parseSearch.es6.js';
 
-function parseFormBody(req) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield new Promise((resolve, reject) => {
-            const form = new Form();
-            form.parse(req, (error, fields, files) => {
-                if (error) {
-                    reject(error);
-                    return;
-                }
-                let query = '';
-                const queryFiles = [];
-                for (const key in fields) {
-                    for (const value of fields[key]) {
-                        if (query) {
-                            query += '&';
-                        }
-                        query += `${key}=${value.replaceAll('=', '%26')}`;
+async function parseFormBody(req) {
+    return await new Promise((resolve, reject) => {
+        const form = new Form();
+        form.parse(req, (error, fields, files) => {
+            if (error) {
+                reject(error);
+                return;
+            }
+            let query = '';
+            const queryFiles = [];
+            for (const key in fields) {
+                for (const value of fields[key]) {
+                    if (query) {
+                        query += '&';
                     }
+                    query += `${key}=${value.replaceAll('=', '%26')}`;
                 }
-                for (const key in files) {
-                    const values = files[key];
-                    for (const value of values) {
-                        if (query) {
-                            query += '&';
-                        }
-                        query += `${key}==${queryFiles.length}`;
-                        const { headers } = value, options = __rest(value, ["headers"]);
-                        options.type = headers['content-type'];
-                        options.disposition = headers['content-disposition'];
-                        queryFiles.push(new Bin(options));
+            }
+            for (const key in files) {
+                const values = files[key];
+                for (const value of values) {
+                    if (query) {
+                        query += '&';
                     }
+                    query += `${key}==${queryFiles.length}`;
+                    const { headers, ...options } = value;
+                    const binOptions = {
+                        ...options,
+                        disposition: headers['content-disposition'],
+                        type: headers['content-type'],
+                    };
+                    queryFiles.push(new Bin(binOptions));
                 }
-                resolve(parseSearch(query, {
-                    decoder(value, decoder, charset, type) {
-                        if (type === 'key') {
-                            return decoder(value, decoder, charset);
-                        }
-                        if (value.startsWith('=')) {
-                            return queryFiles[Number(value.slice(1))];
-                        }
-                        return value.replaceAll('%26', '=');
-                    },
-                }));
-            });
+            }
+            resolve(parseSearch(query, {
+                decoder(value, decoder, charset, type) {
+                    if (type === 'key') {
+                        return decoder(value, decoder, charset);
+                    }
+                    if (value.startsWith('=')) {
+                        return queryFiles[Number(value.slice(1))];
+                    }
+                    return value.replaceAll('%26', '=');
+                },
+            }));
         });
     });
 }