@innet/server 2.0.0-alpha.12 → 2.0.0-alpha.14

package/plugins/main/server/server.js

@@ -2,13 +2,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var innet = require('innet');
 var fs = require('node:fs');
 var http = require('node:http');
 var http2 = require('node:https');
 var watchState = require('watch-state');
 require('../../../hooks/index.js');
+require('../../../utils/index.js');
 var useServer = require('../../../hooks/useServer/useServer.js');
+var useServerPlugins = require('../../../hooks/useServerPlugins/useServerPlugins.js');
+var Action = require('../../../utils/action/Action.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -38,20 +43,37 @@ const server = () => {
         cert = '';
     }
     const https = Boolean(key && cert);
-    const { port = Number((_c = env.PORT) !== null && _c !== void 0 ? _c : (https ? 442 : 80)), onStart, onError, onRequest, } = props;
+    const { port = Number((_c = env.PORT) !== null && _c !== void 0 ? _c : (https ? 442 : 80)), onStart, onError, onRequest, onClose, } = props;
+    const plugins = new Set();
     const server = https ? http2__default["default"].createServer({ key, cert }) : http__default["default"].createServer();
-    handler[useServer.serverContext.key] = { server, port };
+    useServer.serverContext.set(handler, { server, port });
+    useServerPlugins.serverPlugins.set(handler, plugins);
     watchState.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);
+    if (onClose) {
+        server.addListener('close', onClose);
     }
+    server.on('request', (req, res) => {
+        onRequest === null || onRequest === void 0 ? void 0 : onRequest(req, res);
+        const action = new Action.Action(req, res);
+        const requestHandler = Object.create(handler);
+        useAction.actionContext.set(requestHandler, action);
+        function server() {
+            return tslib.__awaiter(this, void 0, void 0, function* () {
+                for (const plugin of plugins) {
+                    const result = yield plugin();
+                    if (result !== undefined) {
+                        return result;
+                    }
+                }
+            });
+        }
+        innet__default["default"]({ type: server, props }, requestHandler);
+    });
     innet__default["default"](children, handler);
     server.listen(port, () => {
         onStart === null || onStart === void 0 ? void 0 : onStart({ port, https });

package/plugins/request/success/success.d.ts

@@ -13,6 +13,6 @@ export declare const successStatuses: {
 export type SuccessStatuses = keyof typeof successStatuses;
 export interface SuccessProps {
     status?: SuccessStatuses | number;
-    contentType?: string;
+    type?: string;
 }
 export declare const success: HandlerPlugin;

package/plugins/request/success/success.es6.js

@@ -17,7 +17,7 @@ const successStatuses = {
 };
 const success = () => {
     const children = useChildren();
-    const { status, contentType } = useProps() || {};
+    const { status, type } = useProps() || {};
     const res = useResponse();
     if (!res) {
         throw Error('<success> MUST be in <request>');
@@ -25,11 +25,11 @@ const success = () => {
     res.statusCode = typeof status === 'string' ? successStatuses[status] : status !== null && status !== void 0 ? status : ((children) ? 200 : 204);
     if (children === null || children === void 0 ? void 0 : children[0]) {
         const child = children[0];
-        const type = contentType || (['string', 'number', 'boolean', 'bigint'].includes(typeof child)
+        const contentType = type || (['string', 'number', 'boolean', 'bigint'].includes(typeof child)
             ? 'text/plain'
             : 'application/json');
-        res.setHeader('Content-Type', type);
-        if (type === 'application/json') {
+        res.setHeader('Content-Type', contentType);
+        if (contentType === 'application/json') {
             res.write(JSONString(child));
         }
         else {

package/plugins/request/success/success.js

@@ -21,7 +21,7 @@ const successStatuses = {
 };
 const success = () => {
     const children = jsx.useChildren();
-    const { status, contentType } = jsx.useProps() || {};
+    const { status, type } = jsx.useProps() || {};
     const res = useResponse.useResponse();
     if (!res) {
         throw Error('<success> MUST be in <request>');
@@ -29,11 +29,11 @@ const success = () => {
     res.statusCode = typeof status === 'string' ? successStatuses[status] : status !== null && status !== void 0 ? status : ((children) ? 200 : 204);
     if (children === null || children === void 0 ? void 0 : children[0]) {
         const child = children[0];
-        const type = contentType || (['string', 'number', 'boolean', 'bigint'].includes(typeof child)
+        const contentType = type || (['string', 'number', 'boolean', 'bigint'].includes(typeof child)
             ? 'text/plain'
             : 'application/json');
-        res.setHeader('Content-Type', type);
-        if (type === 'application/json') {
+        res.setHeader('Content-Type', contentType);
+        if (contentType === 'application/json') {
             res.write(JSONString.JSONString(child));
         }
         else {

package/plugins/utils/blacklist/blacklist.es6.js

@@ -1,13 +1,14 @@
 import { useProps, useChildren } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
-import { useRequestPlugin } from '../../../hooks/useRequestPlugin/useRequestPlugin.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+import { useAction } from '../../../hooks/useAction/useAction.es6.js';
 
 function blacklist() {
     const { ip = process.env.BLACKLIST_IP, } = useProps() || {};
     const children = useChildren();
     const ips = typeof ip === 'string' ? ip.split(',') : ip;
-    useRequestPlugin(action => {
-        console.log(action.clientIp);
+    useServerPlugin(() => {
+        const action = useAction();
         if (!action.clientIp || (ips === null || ips === void 0 ? void 0 : ips.includes(action.clientIp))) {
             return children;
         }

package/plugins/utils/blacklist/blacklist.js

@@ -4,14 +4,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
-var useRequestPlugin = require('../../../hooks/useRequestPlugin/useRequestPlugin.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
 
 function blacklist() {
     const { ip = process.env.BLACKLIST_IP, } = jsx.useProps() || {};
     const children = jsx.useChildren();
     const ips = typeof ip === 'string' ? ip.split(',') : ip;
-    useRequestPlugin.useRequestPlugin(action => {
-        console.log(action.clientIp);
+    useServerPlugin.useServerPlugin(() => {
+        const action = useAction.useAction();
         if (!action.clientIp || (ips === null || ips === void 0 ? void 0 : ips.includes(action.clientIp))) {
             return children;
         }

package/plugins/utils/dts/dts.d.ts

@@ -1,5 +1,6 @@
 import { type HandlerPlugin } from 'innet';
 export interface DtsProps {
-    path: string;
+    path?: string;
+    namespace?: string;
 }
 export declare const dts: HandlerPlugin;

package/plugins/utils/dts/dts.es6.js

@@ -6,9 +6,9 @@ import { useApi } from '../../../hooks/useApi/useApi.es6.js';
 import { generateTypes } from '../../../utils/generateTypes/generateTypes.es6.js';
 
 const dts = () => {
-    const { path } = useProps();
+    const { path = 'src/api.d.ts', namespace } = useProps() || {};
     const { docs } = useApi();
-    promises.writeFile(path, generateTypes(docs)).catch(e => {
+    promises.writeFile(path, generateTypes(docs, namespace)).catch(e => {
         console.error(e);
     });
 };

package/plugins/utils/dts/dts.js

@@ -10,9 +10,9 @@ var useApi = require('../../../hooks/useApi/useApi.js');
 var generateTypes = require('../../../utils/generateTypes/generateTypes.js');
 
 const dts = () => {
-    const { path } = jsx.useProps();
+    const { path = 'src/api.d.ts', namespace } = jsx.useProps() || {};
     const { docs } = useApi.useApi();
-    fs.promises.writeFile(path, generateTypes.generateTypes(docs)).catch(e => {
+    fs.promises.writeFile(path, generateTypes.generateTypes(docs, namespace)).catch(e => {
         console.error(e);
     });
 };

package/plugins/utils/protection/protection.es6.js

@@ -1,6 +1,7 @@
 import { useProps, useChildren } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
-import { useRequestPlugin } from '../../../hooks/useRequestPlugin/useRequestPlugin.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+import { useAction } from '../../../hooks/useAction/useAction.es6.js';
 
 function protection() {
     const { maxAge = Number(process.env.PROTECTION_MAX_AGE) || 365 * 24 * 60 * 60, value = process.env.PROTECTION, excludeIp = process.env.PROTECTED_IP, cookieKey = process.env.PROTECTION_COOKIE_KEY || 'protection', searchKey = process.env.PROTECTION_SEARCH_KEY || 'protection', } = useProps() || {};
@@ -8,7 +9,8 @@ function protection() {
     if (!value)
         return;
     const excludeIps = Array.isArray(excludeIp) ? excludeIp : excludeIp === null || excludeIp === void 0 ? void 0 : excludeIp.split(',');
-    useRequestPlugin(action => {
+    useServerPlugin(() => {
+        const action = useAction();
         if (!action.clientIp)
             return children;
         if (excludeIps === null || excludeIps === void 0 ? void 0 : excludeIps.includes(action.clientIp))

package/plugins/utils/protection/protection.js

@@ -4,7 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
-var useRequestPlugin = require('../../../hooks/useRequestPlugin/useRequestPlugin.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
 
 function protection() {
     const { maxAge = Number(process.env.PROTECTION_MAX_AGE) || 365 * 24 * 60 * 60, value = process.env.PROTECTION, excludeIp = process.env.PROTECTED_IP, cookieKey = process.env.PROTECTION_COOKIE_KEY || 'protection', searchKey = process.env.PROTECTION_SEARCH_KEY || 'protection', } = jsx.useProps() || {};
@@ -12,7 +13,8 @@ function protection() {
     if (!value)
         return;
     const excludeIps = Array.isArray(excludeIp) ? excludeIp : excludeIp === null || excludeIp === void 0 ? void 0 : excludeIp.split(',');
-    useRequestPlugin.useRequestPlugin(action => {
+    useServerPlugin.useServerPlugin(() => {
+        const action = useAction.useAction();
         if (!action.clientIp)
             return children;
         if (excludeIps === null || excludeIps === void 0 ? void 0 : excludeIps.includes(action.clientIp))

package/plugins/utils/swagger/swagger.es6.js

@@ -2,14 +2,16 @@ import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import html from './swagger.html.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';
-import { useRequestPlugin } from '../../../hooks/useRequestPlugin/useRequestPlugin.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+import { useAction } from '../../../hooks/useAction/useAction.es6.js';
 
 const swagger = () => {
     const { path = '/swagger-ui' } = useProps() || {};
     const { docs, prefix } = useApi();
     let swaggerResponse;
-    useRequestPlugin(action => {
-        if (action.req.url === prefix + path) {
+    useServerPlugin(() => {
+        const action = useAction();
+        if (action.path === prefix + path) {
             if (!swaggerResponse) {
                 swaggerResponse = html.replace('spec: {},', `spec: ${JSON.stringify(docs)},`);
             }

package/plugins/utils/swagger/swagger.js

@@ -6,14 +6,16 @@ var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 var swagger$1 = require('./swagger.html.js');
 var useApi = require('../../../hooks/useApi/useApi.js');
-var useRequestPlugin = require('../../../hooks/useRequestPlugin/useRequestPlugin.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
 
 const swagger = () => {
     const { path = '/swagger-ui' } = jsx.useProps() || {};
     const { docs, prefix } = useApi.useApi();
     let swaggerResponse;
-    useRequestPlugin.useRequestPlugin(action => {
-        if (action.req.url === prefix + path) {
+    useServerPlugin.useServerPlugin(() => {
+        const action = useAction.useAction();
+        if (action.path === prefix + path) {
             if (!swaggerResponse) {
                 swaggerResponse = swagger$1["default"].replace('spec: {},', `spec: ${JSON.stringify(docs)},`);
             }

package/plugins/utils/whitelist/whitelist.es6.js

@@ -1,6 +1,7 @@
 import { useProps, useChildren } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
-import { useRequestPlugin } from '../../../hooks/useRequestPlugin/useRequestPlugin.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+import { useAction } from '../../../hooks/useAction/useAction.es6.js';
 
 function whitelist() {
     const { ip = process.env.WHITELIST_IP, } = useProps() || {};
@@ -8,7 +9,8 @@ function whitelist() {
     const ips = typeof ip === 'string' ? ip.split(',') : ip;
     if (!ips)
         return;
-    useRequestPlugin(action => {
+    useServerPlugin(() => {
+        const action = useAction();
         if (!action.clientIp || !ips.includes(action.clientIp)) {
             return children;
         }

package/plugins/utils/whitelist/whitelist.js

@@ -4,7 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
-var useRequestPlugin = require('../../../hooks/useRequestPlugin/useRequestPlugin.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
 
 function whitelist() {
     const { ip = process.env.WHITELIST_IP, } = jsx.useProps() || {};
@@ -12,7 +13,8 @@ function whitelist() {
     const ips = typeof ip === 'string' ? ip.split(',') : ip;
     if (!ips)
         return;
-    useRequestPlugin.useRequestPlugin(action => {
+    useServerPlugin.useServerPlugin(() => {
+        const action = useAction.useAction();
         if (!action.clientIp || !ips.includes(action.clientIp)) {
             return children;
         }

package/types.d.ts

@@ -1,7 +1,6 @@
-import type { Handler } from 'innet';
 import type { OpenAPIV3_1 as API } from 'openapi-types';
 import type { ApiErrorValue } from './constants';
-import { type Action } from './utils';
+import { type ServerPlugin } from './hooks';
 import { type Rule, type RulesErrors } from './utils/rules';
 export type TagObject = API.TagObject;
 export type Document = API.Document;
@@ -37,10 +36,9 @@ export interface EndpointRulesMaps {
 }
 export interface Endpoint<I = unknown, O = unknown, E extends ApiErrorValue = ApiErrorValue, P extends InValidationErrorParam = InValidationErrorParam, D extends ValidationErrorData = ValidationErrorData> {
     key: string;
-    content?: any;
+    plugins: Set<ServerPlugin>;
     rules?: EndpointRules;
     rulesMaps?: EndpointRulesMaps;
-    handler?: Handler;
     static?: Record<string, Endpoint<I, O, E, P, D>>;
     dynamic?: Endpoint<I, O, E, P, D>[];
 }
@@ -68,8 +66,3 @@ export interface BaseSchemaProps<T> {
 export interface ValuesSchemaProps<T> extends BaseSchemaProps<T> {
     values?: T[];
 }
-export interface Fallback {
-    children: any;
-    handler: Handler;
-}
-export type RequestPlugin = (action: Action) => any;

package/utils/action/Action.es6.js

@@ -30,8 +30,8 @@ let Action = (() => {
                 _Action_cookie.set(this, {});
             }
             get parsedUrl() {
-                var _a;
-                const match = (_a = this.req.url) === null || _a === void 0 ? void 0 : _a.match(URL_PARSER);
+                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;
@@ -68,8 +68,8 @@ let Action = (() => {
                 __classPrivateFieldSet(this, _Action_headers, value, "f");
             }
             get originCookies() {
-                var _a;
-                return cookieLib.parse((_a = this.req.headers.cookie) !== null && _a !== void 0 ? _a : '');
+                var _b;
+                return cookieLib.parse((_b = this.req.headers.cookie) !== null && _b !== void 0 ? _b : '');
             }
             get cookies() {
                 if (__classPrivateFieldGet(this, _Action_cookie, "f"))
@@ -128,18 +128,20 @@ let Action = (() => {
         _Action_headers = new WeakMap(),
         _Action_cookie = 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_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 } }, 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 } }, 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 } }, 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 } }, null, _instanceExtraInitializers);
-            __esDecorate(_a, null, _parseBody_decorators, { kind: "method", name: "parseBody", static: false, private: false, access: { has: obj => "parseBody" in obj, get: obj => obj.parseBody } }, 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 } }, 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);
+            __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);
+            __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_clientIp_decorators, { kind: "getter", name: "clientIp", static: false, private: false, access: { has: obj => "clientIp" in obj, get: obj => obj.clientIp }, 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

@@ -38,8 +38,8 @@ let Action = (() => {
                 _Action_cookie.set(this, {});
             }
             get parsedUrl() {
-                var _a;
-                const match = (_a = this.req.url) === null || _a === void 0 ? void 0 : _a.match(URL_PARSER);
+                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;
@@ -76,8 +76,8 @@ let Action = (() => {
                 tslib.__classPrivateFieldSet(this, _Action_headers, value, "f");
             }
             get originCookies() {
-                var _a;
-                return cookieLib__default["default"].parse((_a = this.req.headers.cookie) !== null && _a !== void 0 ? _a : '');
+                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"))
@@ -136,18 +136,20 @@ let Action = (() => {
         _Action_headers = new WeakMap(),
         _Action_cookie = 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_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 } }, 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 } }, 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 } }, 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 } }, null, _instanceExtraInitializers);
-            tslib.__esDecorate(_a, null, _parseBody_decorators, { kind: "method", name: "parseBody", static: false, private: false, access: { has: obj => "parseBody" in obj, get: obj => obj.parseBody } }, 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 } }, 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);
+            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);
+            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_clientIp_decorators, { kind: "getter", name: "clientIp", static: false, private: false, access: { has: obj => "clientIp" in obj, get: obj => obj.clientIp }, metadata: _metadata }, null, _instanceExtraInitializers);
+            if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         })(),
         _a;
 })();

package/utils/generateTypes/generateTypes.d.ts

@@ -1,3 +1,3 @@
 import { type Document, type SchemaObject } from '../../types';
-export declare function generateSchemaTypes(schema: SchemaObject, spaces?: number): string;
-export declare function generateTypes(docs: Document): string;
+export declare function generateSchemaTypes(schema: SchemaObject, spaces?: number, lastChar?: string): string;
+export declare function generateTypes(docs: Document, namespace?: string): string;

package/utils/generateTypes/generateTypes.es6.js

@@ -1,34 +1,34 @@
 function hasDefault(target) {
     return Boolean(target && ('default' in target || 'x-default' in target));
 }
-function generateSchemaTypes(schema, spaces = 2) {
+function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
     const space = [...new Array(spaces)].map(() => ' ').join('');
     if ('$ref' in schema) {
-        return `Schemas.${schema.$ref.slice(21)}\n`;
+        return `Schemas.${schema.$ref.slice(21)}${lastChar}`;
     }
     if (schema.type === 'integer') {
-        return `${schema.format === 'int64' ? 'bigint' : 'number'}\n`;
+        return `${schema.format === 'int64' ? 'bigint' : 'number'}${lastChar}`;
     }
     if (schema.type === 'string') {
         if (schema.format === 'date-time') {
-            return 'Date\n';
+            return `Date${lastChar}`;
         }
         if (schema.format === 'binary') {
-            return 'Bin\n';
+            return `Bin${lastChar}`;
         }
-        return 'string\n';
+        return `string${lastChar}`;
     }
     if (['boolean', 'number', 'null'].includes(schema.type)) {
-        return `${schema.type}\n`;
+        return `${schema.type}${lastChar}`;
     }
     if (schema.type === 'array') {
         if (!schema.items)
-            return 'any[]\n';
-        return `(${generateSchemaTypes(schema.items, spaces + 2).slice(0, -1)})[]\n`;
+            return `any[]${lastChar}`;
+        return `Array<${generateSchemaTypes(schema.items, spaces + 2, '')}>${lastChar}`;
     }
     if (schema.type !== 'object') {
         console.error('unknown type', schema);
-        return 'any\n';
+        return `any${lastChar}`;
     }
     let result = '{\n';
     const required = schema.required || [];
@@ -39,11 +39,22 @@ function generateSchemaTypes(schema, spaces = 2) {
             : '?:';
         result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
     }
-    return `${result}${space.slice(0, -2)}}\n`;
+    return `${result}${space.slice(0, -2)}}${lastChar}`;
 }
-function generateTypes(docs) {
+function generateTypes(docs, namespace = 'Api') {
     var _a;
-    let result = 'declare namespace Api {\n  export interface Bin {\n    filename: string\n    fieldName: string\n    originalFilename: string\n    path: string\n    type: string\n    disposition: string\n    size: number\n    extension?: string\n  }\n';
+    let result = `declare namespace ${namespace} {
+  export interface Bin {
+    filename: string
+    fieldName: string
+    originalFilename: string
+    path: string
+    type: string
+    disposition: string
+    size: number
+    extension?: string
+  }
+`;
     const schemas = (_a = docs.components) === null || _a === void 0 ? void 0 : _a.schemas;
     const paths = docs.paths;
     if (schemas) {
@@ -90,8 +101,22 @@ function generateTypes(docs) {
             if (requestBody) {
                 result += `      Body: ${generateSchemaTypes(requestBody.content['multipart/form-data'].schema, 8)}`;
             }
-            if (responses === null || responses === void 0 ? void 0 : responses.default) {
-                result += `      Response: ${generateSchemaTypes(responses.default.content['application/json'].schema, 8)}`;
+            if (responses) {
+                result += '      Response: {\n';
+                for (const key in responses) {
+                    let multiple = false;
+                    const response = responses[key];
+                    result += `        ['${key}']: `;
+                    for (const type in response.content) {
+                        if (multiple) {
+                            result += ' | ';
+                        }
+                        result += generateSchemaTypes(response.content[type].schema, 10, '');
+                        multiple = true;
+                    }
+                    result += '\n';
+                }
+                result += '     }\n';
             }
             result += '    }\n';
         }