@innet/server 2.0.0-alpha.9 → 2.0.0-beta.10

package/utils/generateTypes/generateTypes.es6.js

@@ -1,49 +1,87 @@
 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`;
+    if (['boolean', 'null', 'number'].includes(schema.type)) {
+        return `${schema.type}${lastChar}`;
+    }
+    if (schema.oneOf) {
+        let result = '';
+        for (const item of schema.oneOf) {
+            if (result) {
+                result += ' | ';
+            }
+            result += generateSchemaTypes(item, spaces + 2, '');
+        }
+        return result + 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) {
+        return `any${lastChar}`;
     }
     if (schema.type !== 'object') {
         console.error('unknown type', schema);
-        return 'any\n';
+        return `any${lastChar}`;
     }
     let result = '{\n';
     const required = schema.required || [];
-    for (const key in schema.properties) {
-        const prop = schema.properties[key];
-        const splitter = required.includes(key) || hasDefault(prop)
-            ? ':'
-            : '?:';
-        result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+    const hasProps = Boolean(schema.properties && Object.keys(schema.properties).length);
+    const hasRestProps = Boolean(typeof schema.additionalProperties === 'object' &&
+        Object.keys(schema.additionalProperties).length);
+    if (hasProps) {
+        for (const key in schema.properties) {
+            const prop = schema.properties[key];
+            const splitter = required.includes(key) || hasDefault(prop)
+                ? ':'
+                : '?:';
+            if ('deprecated' in prop && prop.deprecated) {
+                result += `${space}/** @deprecated */\n`;
+            }
+            result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+        }
+    }
+    if (hasRestProps) {
+        const value = hasProps
+            ? 'any\n'
+            : generateSchemaTypes(schema.additionalProperties, spaces + 2);
+        result += `${space}[key: string]: ${value}`;
     }
-    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) {
@@ -62,16 +100,19 @@ function generateTypes(docs) {
             const parameters = endpoint.parameters;
             const requestBody = endpoint.requestBody;
             const responses = endpoint.responses;
+            if (endpoint.deprecated) {
+                result += '    /** @deprecated */\n';
+            }
             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) ? ':' : '?:';
+                    const splitter = param.in === 'path' || hasDefault(param.schema) || param.required ? ':' : '?:';
                     params[param.in] += `        ${param.name}${splitter} ${generateSchemaTypes(param.schema)}`;
                 }
                 if (params.path) {
@@ -90,8 +131,27 @@ 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}']: `;
+                    if (!response.content) {
+                        result += 'void';
+                    }
+                    else {
+                        for (const type in response.content) {
+                            if (multiple) {
+                                result += ' | ';
+                            }
+                            result += generateSchemaTypes(response.content[type].schema, 10, '');
+                            multiple = true;
+                        }
+                    }
+                    result += '\n';
+                }
+                result += '     }\n';
             }
             result += '    }\n';
         }

package/utils/generateTypes/generateTypes.js

@@ -5,49 +5,87 @@ Object.defineProperty(exports, '__esModule', { value: true });
 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`;
+    if (['boolean', 'null', 'number'].includes(schema.type)) {
+        return `${schema.type}${lastChar}`;
+    }
+    if (schema.oneOf) {
+        let result = '';
+        for (const item of schema.oneOf) {
+            if (result) {
+                result += ' | ';
+            }
+            result += generateSchemaTypes(item, spaces + 2, '');
+        }
+        return result + 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) {
+        return `any${lastChar}`;
     }
     if (schema.type !== 'object') {
         console.error('unknown type', schema);
-        return 'any\n';
+        return `any${lastChar}`;
     }
     let result = '{\n';
     const required = schema.required || [];
-    for (const key in schema.properties) {
-        const prop = schema.properties[key];
-        const splitter = required.includes(key) || hasDefault(prop)
-            ? ':'
-            : '?:';
-        result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+    const hasProps = Boolean(schema.properties && Object.keys(schema.properties).length);
+    const hasRestProps = Boolean(typeof schema.additionalProperties === 'object' &&
+        Object.keys(schema.additionalProperties).length);
+    if (hasProps) {
+        for (const key in schema.properties) {
+            const prop = schema.properties[key];
+            const splitter = required.includes(key) || hasDefault(prop)
+                ? ':'
+                : '?:';
+            if ('deprecated' in prop && prop.deprecated) {
+                result += `${space}/** @deprecated */\n`;
+            }
+            result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+        }
+    }
+    if (hasRestProps) {
+        const value = hasProps
+            ? 'any\n'
+            : generateSchemaTypes(schema.additionalProperties, spaces + 2);
+        result += `${space}[key: string]: ${value}`;
     }
-    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) {
@@ -66,16 +104,19 @@ function generateTypes(docs) {
             const parameters = endpoint.parameters;
             const requestBody = endpoint.requestBody;
             const responses = endpoint.responses;
+            if (endpoint.deprecated) {
+                result += '    /** @deprecated */\n';
+            }
             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) ? ':' : '?:';
+                    const splitter = param.in === 'path' || hasDefault(param.schema) || param.required ? ':' : '?:';
                     params[param.in] += `        ${param.name}${splitter} ${generateSchemaTypes(param.schema)}`;
                 }
                 if (params.path) {
@@ -94,8 +135,27 @@ 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}']: `;
+                    if (!response.content) {
+                        result += 'void';
+                    }
+                    else {
+                        for (const type in response.content) {
+                            if (multiple) {
+                                result += ' | ';
+                            }
+                            result += generateSchemaTypes(response.content[type].schema, 10, '');
+                            multiple = true;
+                        }
+                    }
+                    result += '\n';
+                }
+                result += '     }\n';
             }
             result += '    }\n';
         }

package/utils/getEndpoint/getEndpoint.es6.js

@@ -8,7 +8,7 @@ function getEndpoint(path, parentEndpoint) {
                 parentEndpoint.static = {};
             }
             if (!parentEndpoint.static[key]) {
-                parentEndpoint.static[key] = { key };
+                parentEndpoint.static[key] = { key, plugins: new Set() };
             }
             parentEndpoint = parentEndpoint.static[key];
             if (deep + 1 === splitPath.length) {
@@ -19,7 +19,7 @@ function getEndpoint(path, parentEndpoint) {
         if (!parentEndpoint.dynamic) {
             parentEndpoint.dynamic = [];
         }
-        const newEndpoint = { key };
+        const newEndpoint = { key, plugins: new Set() };
         parentEndpoint.dynamic.push(newEndpoint);
         parentEndpoint = newEndpoint;
         if (deep + 1 === splitPath.length) {

package/utils/getEndpoint/getEndpoint.js

@@ -12,7 +12,7 @@ function getEndpoint(path, parentEndpoint) {
                 parentEndpoint.static = {};
             }
             if (!parentEndpoint.static[key]) {
-                parentEndpoint.static[key] = { key };
+                parentEndpoint.static[key] = { key, plugins: new Set() };
             }
             parentEndpoint = parentEndpoint.static[key];
             if (deep + 1 === splitPath.length) {
@@ -23,7 +23,7 @@ function getEndpoint(path, parentEndpoint) {
         if (!parentEndpoint.dynamic) {
             parentEndpoint.dynamic = [];
         }
-        const newEndpoint = { key };
+        const newEndpoint = { key, plugins: new Set() };
         parentEndpoint.dynamic.push(newEndpoint);
         parentEndpoint = newEndpoint;
         if (deep + 1 === splitPath.length) {

package/utils/getOrAdd/getOrAdd.d.ts

@@ -1 +1 @@
-export declare function getOrAdd<R = any>(target: object, path: string | number, defaultValues: any[]): R;
+export declare function getOrAdd<R = any>(target: object, path: number | string, defaultValues: any[]): R;

package/utils/getSafeSchema/getSafeSchema.d.ts

@@ -0,0 +1,2 @@
+import { type SchemaObject } from '../../types';
+export declare function getSafeSchema(schema: SchemaObject): SchemaObject;

package/utils/getSafeSchema/getSafeSchema.es6.js

@@ -0,0 +1,5 @@
+function getSafeSchema(schema) {
+    return 'oneOf' in schema ? schema.oneOf[0] : schema;
+}
+
+export { getSafeSchema };

package/utils/getSafeSchema/getSafeSchema.js

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+function getSafeSchema(schema) {
+    return 'oneOf' in schema ? schema.oneOf[0] : schema;
+}
+
+exports.getSafeSchema = getSafeSchema;

package/utils/getSafeSchema/index.d.ts

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

package/utils/getSafeSchema/index.es6.js

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

package/utils/getSafeSchema/index.js

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

package/utils/httpOnStart/httpOnStart.d.ts

@@ -1,2 +1,2 @@
 import { type ServerStartParams } from '../../types';
-export declare function httpOnStart({ port, https }: ServerStartParams): void;
+export declare function httpOnStart({ https, port, }: ServerStartParams): void;

package/utils/httpOnStart/httpOnStart.es6.js

@@ -1,4 +1,4 @@
-function httpOnStart({ port, https }) {
+function httpOnStart({ https, port, }) {
     console.log(`http${https ? 's' : ''}://localhost:${port}`);
 }
 

package/utils/httpOnStart/httpOnStart.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-function httpOnStart({ port, https }) {
+function httpOnStart({ https, port, }) {
     console.log(`http${https ? 's' : ''}://localhost:${port}`);
 }
 

package/utils/index.d.ts

@@ -1,13 +1,14 @@
-export * from './parseSearch';
-export * from './stringifySearch';
-export * from './httpOnStart';
+export * from './FileData';
+export * from './JSONString';
+export * from './action';
+export * from './decorators';
+export * from './generateTypes';
 export * from './getEndpoint';
 export * from './getOrAdd';
-export * from './decorators';
-export * from './action';
+export * from './getSafeSchema';
+export * from './httpOnStart';
 export * from './parseBody';
 export * from './parseFormBody';
+export * from './parseSearch';
 export * from './rules';
-export * from './JSONString';
-export * from './FileData';
-export * from './generateTypes';
+export * from './stringifySearch';

package/utils/index.es6.js

@@ -1,13 +1,14 @@
-import './parseSearch/index.es6.js';
-import './stringifySearch/index.es6.js';
-import './httpOnStart/index.es6.js';
+import './FileData/index.es6.js';
+import './JSONString/index.es6.js';
+import './action/index.es6.js';
+import './decorators/index.es6.js';
+import './generateTypes/index.es6.js';
 import './getEndpoint/index.es6.js';
 import './getOrAdd/index.es6.js';
-import './decorators/index.es6.js';
-import './action/index.es6.js';
+import './getSafeSchema/index.es6.js';
+import './httpOnStart/index.es6.js';
 import './parseBody/index.es6.js';
 import './parseFormBody/index.es6.js';
+import './parseSearch/index.es6.js';
 import './rules/index.es6.js';
-import './JSONString/index.es6.js';
-import './FileData/index.es6.js';
-import './generateTypes/index.es6.js';
+import './stringifySearch/index.es6.js';

package/utils/index.js

@@ -1,16 +1,17 @@
 'use strict';
 
-require('./parseSearch/index.js');
-require('./stringifySearch/index.js');
-require('./httpOnStart/index.js');
+require('./FileData/index.js');
+require('./JSONString/index.js');
+require('./action/index.js');
+require('./decorators/index.js');
+require('./generateTypes/index.js');
 require('./getEndpoint/index.js');
 require('./getOrAdd/index.js');
-require('./decorators/index.js');
-require('./action/index.js');
+require('./getSafeSchema/index.js');
+require('./httpOnStart/index.js');
 require('./parseBody/index.js');
 require('./parseFormBody/index.js');
+require('./parseSearch/index.js');
 require('./rules/index.js');
-require('./JSONString/index.js');
-require('./FileData/index.js');
-require('./generateTypes/index.js');
+require('./stringifySearch/index.js');
 

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>;