@innet/server 2.0.0-alpha.23 → 2.0.0-alpha.25

package/types.d.ts

@@ -15,52 +15,52 @@ export type ReferenceObject = API.ReferenceObject;
 export type ParameterObject = API.ParameterObject;
 export type RequestBodyObject = API.RequestBodyObject;
 export type ObjectType = ArraySchemaObjectType | NonArraySchemaObjectType;
-export type RefSchemaObject = SchemaObject | ReferenceObject;
+export type RefSchemaObject = ReferenceObject | SchemaObject;
 export interface IValidationErrorData extends Record<string, any> {
     error: RulesErrors;
 }
 export type ValidationErrorData = IValidationErrorData | undefined;
 export interface EndpointRules {
-    path?: Rule;
-    search?: Rule;
+    body?: Rule;
     cookie?: Rule;
     header?: Rule;
-    body?: Rule;
+    path?: Rule;
     response?: Rule;
+    search?: Rule;
 }
 export interface EndpointRulesMaps {
-    path?: Record<string, Rule>;
-    search?: Record<string, Rule>;
     cookie?: Record<string, Rule>;
     header?: Record<string, Rule>;
+    path?: Record<string, Rule>;
+    search?: Record<string, Rule>;
 }
 export interface Endpoint<I = unknown, O = unknown, E extends ApiErrorValue = ApiErrorValue, P extends InValidationErrorParam = InValidationErrorParam, D extends ValidationErrorData = ValidationErrorData> {
+    dynamic?: Endpoint<I, O, E, P, D>[];
     key: string;
     plugins: Set<ServerPlugin>;
     rules?: EndpointRules;
     rulesMaps?: EndpointRulesMaps;
     static?: Record<string, Endpoint<I, O, E, P, D>>;
-    dynamic?: Endpoint<I, O, E, P, D>[];
 }
 export type IntegerFormats = 'int32' | 'int64';
-export type EndpointsMethods = 'get' | 'post' | 'put' | 'patch' | 'delete' | 'options' | 'head' | 'trace';
-export type InParam = 'query' | 'header' | 'path' | 'cookie';
-export type InValidationErrorParam = InParam | 'body';
-export type BodyType = 'application/x-www-form-urlencoded' | 'application/json' | 'multipart/form-data';
+export type EndpointsMethods = 'delete' | 'get' | 'head' | 'options' | 'patch' | 'post' | 'put' | 'trace';
+export type InParam = 'cookie' | 'header' | 'path' | 'query';
+export type InValidationErrorParam = 'body' | InParam;
+export type BodyType = 'application/json' | 'application/x-www-form-urlencoded' | 'multipart/form-data';
 export type Endpoints<I = unknown, O = unknown, E extends ApiErrorValue = ApiErrorValue, P extends InValidationErrorParam = InValidationErrorParam, D extends ValidationErrorData = ValidationErrorData> = Partial<Record<EndpointsMethods, Endpoint<I, O, E, P, D>>>;
 export interface SSL {
     cert: string;
     key: string;
 }
 export interface ServerStartParams {
-    port: number;
     https: boolean;
+    port: number;
 }
 export interface BaseSchemaProps<T> {
     default?: T;
+    description?: string;
     example?: T;
     examples?: T[];
-    description?: string;
     ref?: string;
 }
 export interface ValuesSchemaProps<T> extends BaseSchemaProps<T> {

package/utils/FileData/Bin.d.ts

@@ -1,4 +1,5 @@
 export interface BinOptions {
+    disposition: string;
     /**
      * A field name of FormData request
      */
@@ -11,37 +12,36 @@ export interface BinOptions {
      * Full path to the file on server, you MUST use it only on server side for the safe
      */
     path: string;
-    /**
-     * MIME-type of the file
-     */
-    type: string;
-    disposition: string;
     /**
      * The file size
      */
     size: number;
-}
-export declare class Bin implements BinOptions {
     /**
-     * A file name, without extension
+     * MIME-type of the file
      */
-    filename: string;
+    type: string;
+}
+export declare class Bin implements BinOptions {
+    disposition: string;
     /**
      * The extension of the origin file from originalFilename
      */
     extension?: string;
-    type: string;
-    disposition: string;
     fieldName: string;
+    /**
+     * A file name, without extension
+     */
+    filename: string;
     originalFilename: string;
     path: string;
     size: number;
+    type: string;
     constructor(options: BinOptions);
     toJSON(): {
         $: string;
-        originalFilename: string;
-        type: string;
         disposition: string;
+        originalFilename: string;
         size: number;
+        type: string;
     };
 }

package/utils/FileData/Bin.es6.js

@@ -8,10 +8,10 @@ class Bin {
     toJSON() {
         return {
             $: 'binary',
-            originalFilename: this.originalFilename,
-            type: this.type,
             disposition: this.disposition,
+            originalFilename: this.originalFilename,
             size: this.size,
+            type: this.type,
         };
     }
 }

package/utils/FileData/Bin.js

@@ -12,10 +12,10 @@ class Bin {
     toJSON() {
         return {
             $: 'binary',
-            originalFilename: this.originalFilename,
-            type: this.type,
             disposition: this.disposition,
+            originalFilename: this.originalFilename,
             size: this.size,
+            type: this.type,
         };
     }
 }

package/utils/action/Action.d.ts

@@ -12,21 +12,21 @@ export declare class Action {
     #private;
     readonly req: IncomingMessage;
     readonly res: ServerResponse;
+    body?: object;
     constructor(req: IncomingMessage, res: ServerResponse);
+    parseBody(): Promise<void>;
+    setCookie(name: string, value?: string, options?: CookieSerializeOptions): void;
+    get bodyType(): BodyType | undefined;
+    get clientIp(): string | null;
+    get cookies(): Record<string, string>;
+    set cookies(value: Record<string, string>);
+    get headers(): IncomingHttpHeaders;
+    set headers(value: IncomingHttpHeaders);
+    get originCookies(): Record<string, string>;
+    get originHeaders(): IncomingHttpHeaders;
+    get originSearch(): ParsedQs;
     get parsedUrl(): ParsedUrl;
     get path(): string;
-    get originSearch(): ParsedQs;
     get search(): ParsedQs;
     set search(value: ParsedQs);
-    get originHeaders(): IncomingHttpHeaders;
-    get headers(): IncomingHttpHeaders;
-    set headers(value: IncomingHttpHeaders);
-    get originCookies(): Record<string, string>;
-    get cookies(): Record<string, string>;
-    set cookies(value: Record<string, string>);
-    get bodyType(): BodyType | undefined;
-    body?: object;
-    parseBody(): Promise<void>;
-    setCookie(name: string, value?: string, options?: CookieSerializeOptions): void;
-    get clientIp(): string | null;
 }

package/utils/action/Action.es6.js

@@ -1,4 +1,4 @@
-import { __runInitializers, __classPrivateFieldGet, __classPrivateFieldSet, __awaiter, __esDecorate } from 'tslib';
+import { __runInitializers, __awaiter, __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate } from 'tslib';
 import cookieLib from 'cookie';
 import { getClientIp } from 'request-ip';
 import '../decorators/index.es6.js';
@@ -6,89 +6,28 @@ import '../parseBody/index.es6.js';
 import '../parseFormBody/index.es6.js';
 import '../parseSearch/index.es6.js';
 import { allBodyTypes } from '../../constants.es6.js';
-import { parseSearch } from '../parseSearch/parseSearch.es6.js';
 import { parseFormBody } from '../parseFormBody/parseFormBody.es6.js';
+import { parseSearch } from '../parseSearch/parseSearch.es6.js';
 import { parseBody } from '../parseBody/parseBody.es6.js';
 import { once } from '../decorators/once/once.es6.js';
 
 const URL_PARSER = /^(?<path>[^?]+)(\?(?<search>.*))?/;
 let Action = (() => {
-    var _a, _Action_search, _Action_headers, _Action_cookie;
+    var _a, _Action_cookie, _Action_headers, _Action_search;
     let _instanceExtraInitializers = [];
-    let _get_parsedUrl_decorators;
-    let _get_originSearch_decorators;
-    let _get_originCookies_decorators;
-    let _get_bodyType_decorators;
     let _parseBody_decorators;
+    let _get_bodyType_decorators;
     let _get_clientIp_decorators;
+    let _get_originCookies_decorators;
+    let _get_originSearch_decorators;
+    let _get_parsedUrl_decorators;
     return _a = class Action {
             constructor(req, res) {
                 this.req = (__runInitializers(this, _instanceExtraInitializers), req);
                 this.res = res;
-                _Action_search.set(this, void 0);
-                _Action_headers.set(this, {});
                 _Action_cookie.set(this, {});
-            }
-            get parsedUrl() {
-                var _b;
-                const match = (_b = this.req.url) === null || _b === void 0 ? void 0 : _b.match(URL_PARSER);
-                if (!match)
-                    throw Error('cannot parse url');
-                const result = match.groups;
-                result.path = result.path
-                    .replaceAll(/\/\.\.\//g, '/')
-                    .replaceAll(/\/+/g, '/');
-                return result;
-            }
-            get path() {
-                return this.parsedUrl.path;
-            }
-            get originSearch() {
-                return parseSearch(this.parsedUrl.search);
-            }
-            get search() {
-                if (__classPrivateFieldGet(this, _Action_search, "f"))
-                    return __classPrivateFieldGet(this, _Action_search, "f");
-                __classPrivateFieldSet(this, _Action_search, this.originSearch, "f");
-                return __classPrivateFieldGet(this, _Action_search, "f");
-            }
-            set search(value) {
-                __classPrivateFieldSet(this, _Action_search, value, "f");
-            }
-            get originHeaders() {
-                return this.req.headers;
-            }
-            get headers() {
-                if (__classPrivateFieldGet(this, _Action_headers, "f"))
-                    return __classPrivateFieldGet(this, _Action_headers, "f");
-                __classPrivateFieldSet(this, _Action_headers, this.originHeaders, "f");
-                return __classPrivateFieldGet(this, _Action_headers, "f");
-            }
-            set headers(value) {
-                __classPrivateFieldSet(this, _Action_headers, value, "f");
-            }
-            get originCookies() {
-                var _b;
-                return cookieLib.parse((_b = this.req.headers.cookie) !== null && _b !== void 0 ? _b : '');
-            }
-            get cookies() {
-                if (__classPrivateFieldGet(this, _Action_cookie, "f"))
-                    return __classPrivateFieldGet(this, _Action_cookie, "f");
-                __classPrivateFieldSet(this, _Action_cookie, this.originCookies, "f");
-                return __classPrivateFieldGet(this, _Action_cookie, "f");
-            }
-            set cookies(value) {
-                __classPrivateFieldSet(this, _Action_cookie, value, "f");
-            }
-            get bodyType() {
-                const headerType = this.req.headers['content-type'];
-                if (!headerType)
-                    return;
-                for (const bodyType of allBodyTypes) {
-                    if (headerType.startsWith(bodyType)) {
-                        return bodyType;
-                    }
-                }
+                _Action_headers.set(this, {});
+                _Action_search.set(this, void 0);
             }
             parseBody() {
                 return __awaiter(this, void 0, void 0, function* () {
@@ -120,27 +59,88 @@ let Action = (() => {
                 }
                 this.res.setHeader('Set-Cookie', cookies);
             }
+            get bodyType() {
+                const headerType = this.req.headers['content-type'];
+                if (!headerType)
+                    return;
+                for (const bodyType of allBodyTypes) {
+                    if (headerType.startsWith(bodyType)) {
+                        return bodyType;
+                    }
+                }
+            }
             get clientIp() {
                 return getClientIp(this.req);
             }
+            get cookies() {
+                if (__classPrivateFieldGet(this, _Action_cookie, "f"))
+                    return __classPrivateFieldGet(this, _Action_cookie, "f");
+                __classPrivateFieldSet(this, _Action_cookie, this.originCookies, "f");
+                return __classPrivateFieldGet(this, _Action_cookie, "f");
+            }
+            set cookies(value) {
+                __classPrivateFieldSet(this, _Action_cookie, value, "f");
+            }
+            get headers() {
+                if (__classPrivateFieldGet(this, _Action_headers, "f"))
+                    return __classPrivateFieldGet(this, _Action_headers, "f");
+                __classPrivateFieldSet(this, _Action_headers, this.originHeaders, "f");
+                return __classPrivateFieldGet(this, _Action_headers, "f");
+            }
+            set headers(value) {
+                __classPrivateFieldSet(this, _Action_headers, value, "f");
+            }
+            get originCookies() {
+                var _b;
+                return cookieLib.parse((_b = this.req.headers.cookie) !== null && _b !== void 0 ? _b : '');
+            }
+            get originHeaders() {
+                return this.req.headers;
+            }
+            get originSearch() {
+                return parseSearch(this.parsedUrl.search);
+            }
+            get parsedUrl() {
+                var _b;
+                const match = (_b = this.req.url) === null || _b === void 0 ? void 0 : _b.match(URL_PARSER);
+                if (!match)
+                    throw Error('cannot parse url');
+                const result = match.groups;
+                result.path = result.path
+                    .replaceAll(/\/\.\.\//g, '/')
+                    .replaceAll(/\/+/g, '/');
+                return result;
+            }
+            get path() {
+                return this.parsedUrl.path;
+            }
+            get search() {
+                if (__classPrivateFieldGet(this, _Action_search, "f"))
+                    return __classPrivateFieldGet(this, _Action_search, "f");
+                __classPrivateFieldSet(this, _Action_search, this.originSearch, "f");
+                return __classPrivateFieldGet(this, _Action_search, "f");
+            }
+            set search(value) {
+                __classPrivateFieldSet(this, _Action_search, value, "f");
+            }
         },
-        _Action_search = new WeakMap(),
-        _Action_headers = new WeakMap(),
         _Action_cookie = new WeakMap(),
+        _Action_headers = new WeakMap(),
+        _Action_search = new WeakMap(),
         (() => {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-            _get_parsedUrl_decorators = [once];
-            _get_originSearch_decorators = [once];
-            _get_originCookies_decorators = [once];
-            _get_bodyType_decorators = [once];
             _parseBody_decorators = [once];
+            _get_bodyType_decorators = [once];
             _get_clientIp_decorators = [once];
-            __esDecorate(_a, null, _get_parsedUrl_decorators, { kind: "getter", name: "parsedUrl", static: false, private: false, access: { has: obj => "parsedUrl" in obj, get: obj => obj.parsedUrl }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _get_originSearch_decorators, { kind: "getter", name: "originSearch", static: false, private: false, access: { has: obj => "originSearch" in obj, get: obj => obj.originSearch }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _get_originCookies_decorators, { kind: "getter", name: "originCookies", static: false, private: false, access: { has: obj => "originCookies" in obj, get: obj => obj.originCookies }, metadata: _metadata }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _get_bodyType_decorators, { kind: "getter", name: "bodyType", static: false, private: false, access: { has: obj => "bodyType" in obj, get: obj => obj.bodyType }, metadata: _metadata }, null, _instanceExtraInitializers);
+            _get_originCookies_decorators = [once];
+            _get_originSearch_decorators = [once];
+            _get_parsedUrl_decorators = [once];
             __esDecorate(_a, null, _parseBody_decorators, { kind: "method", name: "parseBody", static: false, private: false, access: { has: obj => "parseBody" in obj, get: obj => obj.parseBody }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _get_bodyType_decorators, { kind: "getter", name: "bodyType", static: false, private: false, access: { has: obj => "bodyType" in obj, get: obj => obj.bodyType }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(_a, null, _get_clientIp_decorators, { kind: "getter", name: "clientIp", static: false, private: false, access: { has: obj => "clientIp" in obj, get: obj => obj.clientIp }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _get_originCookies_decorators, { kind: "getter", name: "originCookies", static: false, private: false, access: { has: obj => "originCookies" in obj, get: obj => obj.originCookies }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _get_originSearch_decorators, { kind: "getter", name: "originSearch", static: false, private: false, access: { has: obj => "originSearch" in obj, get: obj => obj.originSearch }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(_a, null, _get_parsedUrl_decorators, { kind: "getter", name: "parsedUrl", static: false, private: false, access: { has: obj => "parsedUrl" in obj, get: obj => obj.parsedUrl }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         })(),
         _a;

package/utils/action/Action.js

@@ -10,8 +10,8 @@ require('../parseBody/index.js');
 require('../parseFormBody/index.js');
 require('../parseSearch/index.js');
 var constants = require('../../constants.js');
-var parseSearch = require('../parseSearch/parseSearch.js');
 var parseFormBody = require('../parseFormBody/parseFormBody.js');
+var parseSearch = require('../parseSearch/parseSearch.js');
 var parseBody = require('../parseBody/parseBody.js');
 var once = require('../decorators/once/once.js');
 
@@ -21,82 +21,21 @@ var cookieLib__default = /*#__PURE__*/_interopDefaultLegacy(cookieLib);
 
 const URL_PARSER = /^(?<path>[^?]+)(\?(?<search>.*))?/;
 let Action = (() => {
-    var _a, _Action_search, _Action_headers, _Action_cookie;
+    var _a, _Action_cookie, _Action_headers, _Action_search;
     let _instanceExtraInitializers = [];
-    let _get_parsedUrl_decorators;
-    let _get_originSearch_decorators;
-    let _get_originCookies_decorators;
-    let _get_bodyType_decorators;
     let _parseBody_decorators;
+    let _get_bodyType_decorators;
     let _get_clientIp_decorators;
+    let _get_originCookies_decorators;
+    let _get_originSearch_decorators;
+    let _get_parsedUrl_decorators;
     return _a = class Action {
             constructor(req, res) {
                 this.req = (tslib.__runInitializers(this, _instanceExtraInitializers), req);
                 this.res = res;
-                _Action_search.set(this, void 0);
-                _Action_headers.set(this, {});
                 _Action_cookie.set(this, {});
-            }
-            get parsedUrl() {
-                var _b;
-                const match = (_b = this.req.url) === null || _b === void 0 ? void 0 : _b.match(URL_PARSER);
-                if (!match)
-                    throw Error('cannot parse url');
-                const result = match.groups;
-                result.path = result.path
-                    .replaceAll(/\/\.\.\//g, '/')
-                    .replaceAll(/\/+/g, '/');
-                return result;
-            }
-            get path() {
-                return this.parsedUrl.path;
-            }
-            get originSearch() {
-                return parseSearch.parseSearch(this.parsedUrl.search);
-            }
-            get search() {
-                if (tslib.__classPrivateFieldGet(this, _Action_search, "f"))
-                    return tslib.__classPrivateFieldGet(this, _Action_search, "f");
-                tslib.__classPrivateFieldSet(this, _Action_search, this.originSearch, "f");
-                return tslib.__classPrivateFieldGet(this, _Action_search, "f");
-            }
-            set search(value) {
-                tslib.__classPrivateFieldSet(this, _Action_search, value, "f");
-            }
-            get originHeaders() {
-                return this.req.headers;
-            }
-            get headers() {
-                if (tslib.__classPrivateFieldGet(this, _Action_headers, "f"))
-                    return tslib.__classPrivateFieldGet(this, _Action_headers, "f");
-                tslib.__classPrivateFieldSet(this, _Action_headers, this.originHeaders, "f");
-                return tslib.__classPrivateFieldGet(this, _Action_headers, "f");
-            }
-            set headers(value) {
-                tslib.__classPrivateFieldSet(this, _Action_headers, value, "f");
-            }
-            get originCookies() {
-                var _b;
-                return cookieLib__default["default"].parse((_b = this.req.headers.cookie) !== null && _b !== void 0 ? _b : '');
-            }
-            get cookies() {
-                if (tslib.__classPrivateFieldGet(this, _Action_cookie, "f"))
-                    return tslib.__classPrivateFieldGet(this, _Action_cookie, "f");
-                tslib.__classPrivateFieldSet(this, _Action_cookie, this.originCookies, "f");
-                return tslib.__classPrivateFieldGet(this, _Action_cookie, "f");
-            }
-            set cookies(value) {
-                tslib.__classPrivateFieldSet(this, _Action_cookie, value, "f");
-            }
-            get bodyType() {
-                const headerType = this.req.headers['content-type'];
-                if (!headerType)
-                    return;
-                for (const bodyType of constants.allBodyTypes) {
-                    if (headerType.startsWith(bodyType)) {
-                        return bodyType;
-                    }
-                }
+                _Action_headers.set(this, {});
+                _Action_search.set(this, void 0);
             }
             parseBody() {
                 return tslib.__awaiter(this, void 0, void 0, function* () {
@@ -128,27 +67,88 @@ let Action = (() => {
                 }
                 this.res.setHeader('Set-Cookie', cookies);
             }
+            get bodyType() {
+                const headerType = this.req.headers['content-type'];
+                if (!headerType)
+                    return;
+                for (const bodyType of constants.allBodyTypes) {
+                    if (headerType.startsWith(bodyType)) {
+                        return bodyType;
+                    }
+                }
+            }
             get clientIp() {
                 return requestIp.getClientIp(this.req);
             }
+            get cookies() {
+                if (tslib.__classPrivateFieldGet(this, _Action_cookie, "f"))
+                    return tslib.__classPrivateFieldGet(this, _Action_cookie, "f");
+                tslib.__classPrivateFieldSet(this, _Action_cookie, this.originCookies, "f");
+                return tslib.__classPrivateFieldGet(this, _Action_cookie, "f");
+            }
+            set cookies(value) {
+                tslib.__classPrivateFieldSet(this, _Action_cookie, value, "f");
+            }
+            get headers() {
+                if (tslib.__classPrivateFieldGet(this, _Action_headers, "f"))
+                    return tslib.__classPrivateFieldGet(this, _Action_headers, "f");
+                tslib.__classPrivateFieldSet(this, _Action_headers, this.originHeaders, "f");
+                return tslib.__classPrivateFieldGet(this, _Action_headers, "f");
+            }
+            set headers(value) {
+                tslib.__classPrivateFieldSet(this, _Action_headers, value, "f");
+            }
+            get originCookies() {
+                var _b;
+                return cookieLib__default["default"].parse((_b = this.req.headers.cookie) !== null && _b !== void 0 ? _b : '');
+            }
+            get originHeaders() {
+                return this.req.headers;
+            }
+            get originSearch() {
+                return parseSearch.parseSearch(this.parsedUrl.search);
+            }
+            get parsedUrl() {
+                var _b;
+                const match = (_b = this.req.url) === null || _b === void 0 ? void 0 : _b.match(URL_PARSER);
+                if (!match)
+                    throw Error('cannot parse url');
+                const result = match.groups;
+                result.path = result.path
+                    .replaceAll(/\/\.\.\//g, '/')
+                    .replaceAll(/\/+/g, '/');
+                return result;
+            }
+            get path() {
+                return this.parsedUrl.path;
+            }
+            get search() {
+                if (tslib.__classPrivateFieldGet(this, _Action_search, "f"))
+                    return tslib.__classPrivateFieldGet(this, _Action_search, "f");
+                tslib.__classPrivateFieldSet(this, _Action_search, this.originSearch, "f");
+                return tslib.__classPrivateFieldGet(this, _Action_search, "f");
+            }
+            set search(value) {
+                tslib.__classPrivateFieldSet(this, _Action_search, value, "f");
+            }
         },
-        _Action_search = new WeakMap(),
-        _Action_headers = new WeakMap(),
         _Action_cookie = new WeakMap(),
+        _Action_headers = new WeakMap(),
+        _Action_search = new WeakMap(),
         (() => {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-            _get_parsedUrl_decorators = [once.once];
-            _get_originSearch_decorators = [once.once];
-            _get_originCookies_decorators = [once.once];
-            _get_bodyType_decorators = [once.once];
             _parseBody_decorators = [once.once];
+            _get_bodyType_decorators = [once.once];
             _get_clientIp_decorators = [once.once];
-            tslib.__esDecorate(_a, null, _get_parsedUrl_decorators, { kind: "getter", name: "parsedUrl", static: false, private: false, access: { has: obj => "parsedUrl" in obj, get: obj => obj.parsedUrl }, metadata: _metadata }, null, _instanceExtraInitializers);
-            tslib.__esDecorate(_a, null, _get_originSearch_decorators, { kind: "getter", name: "originSearch", static: false, private: false, access: { has: obj => "originSearch" in obj, get: obj => obj.originSearch }, metadata: _metadata }, null, _instanceExtraInitializers);
-            tslib.__esDecorate(_a, null, _get_originCookies_decorators, { kind: "getter", name: "originCookies", static: false, private: false, access: { has: obj => "originCookies" in obj, get: obj => obj.originCookies }, metadata: _metadata }, null, _instanceExtraInitializers);
-            tslib.__esDecorate(_a, null, _get_bodyType_decorators, { kind: "getter", name: "bodyType", static: false, private: false, access: { has: obj => "bodyType" in obj, get: obj => obj.bodyType }, metadata: _metadata }, null, _instanceExtraInitializers);
+            _get_originCookies_decorators = [once.once];
+            _get_originSearch_decorators = [once.once];
+            _get_parsedUrl_decorators = [once.once];
             tslib.__esDecorate(_a, null, _parseBody_decorators, { kind: "method", name: "parseBody", static: false, private: false, access: { has: obj => "parseBody" in obj, get: obj => obj.parseBody }, metadata: _metadata }, null, _instanceExtraInitializers);
+            tslib.__esDecorate(_a, null, _get_bodyType_decorators, { kind: "getter", name: "bodyType", static: false, private: false, access: { has: obj => "bodyType" in obj, get: obj => obj.bodyType }, metadata: _metadata }, null, _instanceExtraInitializers);
             tslib.__esDecorate(_a, null, _get_clientIp_decorators, { kind: "getter", name: "clientIp", static: false, private: false, access: { has: obj => "clientIp" in obj, get: obj => obj.clientIp }, metadata: _metadata }, null, _instanceExtraInitializers);
+            tslib.__esDecorate(_a, null, _get_originCookies_decorators, { kind: "getter", name: "originCookies", static: false, private: false, access: { has: obj => "originCookies" in obj, get: obj => obj.originCookies }, metadata: _metadata }, null, _instanceExtraInitializers);
+            tslib.__esDecorate(_a, null, _get_originSearch_decorators, { kind: "getter", name: "originSearch", static: false, private: false, access: { has: obj => "originSearch" in obj, get: obj => obj.originSearch }, metadata: _metadata }, null, _instanceExtraInitializers);
+            tslib.__esDecorate(_a, null, _get_parsedUrl_decorators, { kind: "getter", name: "parsedUrl", static: false, private: false, access: { has: obj => "parsedUrl" in obj, get: obj => obj.parsedUrl }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         })(),
         _a;

package/utils/dateFormat/dateFormat.d.ts

@@ -1,2 +1,2 @@
-export type DateFormat = 'now' | string | number | Date;
+export type DateFormat = 'now' | Date | number | string;
 export declare function dateFormat(date?: DateFormat): Date | undefined;

package/utils/dateFormat/dateFormat.es6.js

@@ -3,7 +3,7 @@ function dateFormat(date) {
         return;
     if (date === 'now')
         return new Date();
-    if (['string', 'number'].includes(typeof date))
+    if (['number', 'string'].includes(typeof date))
         return new Date(date);
     return date;
 }

package/utils/dateFormat/dateFormat.js

@@ -7,7 +7,7 @@ function dateFormat(date) {
         return;
     if (date === 'now')
         return new Date();
-    if (['string', 'number'].includes(typeof date))
+    if (['number', 'string'].includes(typeof date))
         return new Date(date);
     return date;
 }

package/utils/generateTypes/generateTypes.es6.js

@@ -18,7 +18,7 @@ function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
         }
         return `string${lastChar}`;
     }
-    if (['boolean', 'number', 'null'].includes(schema.type)) {
+    if (['boolean', 'null', 'number'].includes(schema.type)) {
         return `${schema.type}${lastChar}`;
     }
     if (schema.oneOf) {
@@ -100,10 +100,10 @@ function generateTypes(docs, namespace = 'Api') {
             result += `    ['${method.toUpperCase()}:${path}']: {\n`;
             if (parameters) {
                 const params = {
-                    query: '',
+                    cookie: '',
                     header: '',
                     path: '',
-                    cookie: '',
+                    query: '',
                 };
                 for (const param of parameters) {
                     const splitter = param.in === 'path' || hasDefault(param.schema) ? ':' : '?:';

package/utils/generateTypes/generateTypes.js

@@ -22,7 +22,7 @@ function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
         }
         return `string${lastChar}`;
     }
-    if (['boolean', 'number', 'null'].includes(schema.type)) {
+    if (['boolean', 'null', 'number'].includes(schema.type)) {
         return `${schema.type}${lastChar}`;
     }
     if (schema.oneOf) {
@@ -104,10 +104,10 @@ function generateTypes(docs, namespace = 'Api') {
             result += `    ['${method.toUpperCase()}:${path}']: {\n`;
             if (parameters) {
                 const params = {
-                    query: '',
+                    cookie: '',
                     header: '',
                     path: '',
-                    cookie: '',
+                    query: '',
                 };
                 for (const param of parameters) {
                     const splitter = param.in === 'path' || hasDefault(param.schema) ? ':' : '?:';