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

package/utils/generateTypes/generateTypes.js

@@ -5,34 +5,34 @@ 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`;
+        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 || [];
@@ -43,11 +43,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) {
@@ -94,8 +105,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';
         }

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/hooks/useRequestPlugin/index.d.ts

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

package/hooks/useRequestPlugin/index.es6.js

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

package/hooks/useRequestPlugin/index.js

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

package/hooks/useRequestPlugin/useRequestPlugin.d.ts

@@ -1,2 +0,0 @@
-import { type RequestPlugin } from '../../types';
-export declare function useRequestPlugin(listener: RequestPlugin): void;

package/hooks/useRequestPlugin/useRequestPlugin.es6.js

@@ -1,13 +0,0 @@
-import { onDestroy } from 'watch-state';
-import '../useApi/index.es6.js';
-import { useApi } from '../useApi/useApi.es6.js';
-
-function useRequestPlugin(listener) {
-    const { requestPlugins } = useApi();
-    requestPlugins.add(listener);
-    onDestroy(() => {
-        requestPlugins.delete(listener);
-    });
-}
-
-export { useRequestPlugin };

package/hooks/useRequestPlugin/useRequestPlugin.js

@@ -1,17 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var watchState = require('watch-state');
-require('../useApi/index.js');
-var useApi = require('../useApi/useApi.js');
-
-function useRequestPlugin(listener) {
-    const { requestPlugins } = useApi.useApi();
-    requestPlugins.add(listener);
-    watchState.onDestroy(() => {
-        requestPlugins.delete(listener);
-    });
-}
-
-exports.useRequestPlugin = useRequestPlugin;

package/plugins/main/fallback/fallback.d.ts

@@ -1,4 +0,0 @@
-import { type HandlerPlugin } from 'innet';
-export interface FallbackProps {
-}
-export declare const fallback: HandlerPlugin;

package/plugins/main/fallback/fallback.es6.js

@@ -1,19 +0,0 @@
-import { useHandler } from 'innet';
-import { useChildren } from '@innet/jsx';
-import '../../../hooks/index.es6.js';
-import { useApi } from '../../../hooks/useApi/useApi.es6.js';
-
-const fallback = () => {
-    const api = useApi();
-    if (!api) {
-        throw Error('Use <fallback> inside <api>');
-    }
-    if (api.fallback) {
-        throw Error('<fallback> MUST be used once on an <api>');
-    }
-    const children = useChildren();
-    const handler = useHandler();
-    api.fallback = { children, handler };
-};
-
-export { fallback };

package/plugins/main/fallback/fallback.js

@@ -1,23 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var innet = require('innet');
-var jsx = require('@innet/jsx');
-require('../../../hooks/index.js');
-var useApi = require('../../../hooks/useApi/useApi.js');
-
-const fallback = () => {
-    const api = useApi.useApi();
-    if (!api) {
-        throw Error('Use <fallback> inside <api>');
-    }
-    if (api.fallback) {
-        throw Error('<fallback> MUST be used once on an <api>');
-    }
-    const children = jsx.useChildren();
-    const handler = innet.useHandler();
-    api.fallback = { children, handler };
-};
-
-exports.fallback = fallback;

package/plugins/main/fallback/index.d.ts

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

package/plugins/main/fallback/index.es6.js

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