@innet/server 2.0.0-alpha.8 → 2.0.0-beta.1

package/plugins/main/endpoint/endpoint.es6.js

@@ -1,19 +1,19 @@
 import innet, { useNewHandler } from 'innet';
-import { useProps, useChildren } from '@innet/jsx';
+import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
 import { useTag } from '../../../hooks/useTag/useTag.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';
 import { getEndpoint } from '../../../utils/getEndpoint/getEndpoint.es6.js';
 import { endpointContext } from '../../../hooks/useEndpoint/useEndpoint.es6.js';
+import { serverPlugins } from '../../../hooks/useServerPlugins/useServerPlugins.es6.js';
 
 const endpoint = () => {
     const handler = useNewHandler();
     const tag = useTag();
-    const { docs, endpoints } = useApi();
     const props = useProps();
-    const { path, summary, description, deprecated, method, private: privateMode } = props;
-    const children = useChildren();
+    const { docs, endpoints, } = useApi();
+    const { children, deprecated, description, method, path, private: privateMode, summary, } = props;
     const { paths } = docs;
     if (!paths)
         throw Error('cannot find paths in docs');
@@ -42,12 +42,14 @@ const endpoint = () => {
         paths[path][method] = operation;
     }
     if (!endpoints[method]) {
-        endpoints[method] = { key: '' };
+        endpoints[method] = { key: '', plugins: new Set() };
     }
     // @ts-expect-error: it's always an object
     const endpoint = getEndpoint(path, endpoints[method]);
     // @ts-expect-error: it's always an object
-    endpointContext.set(handler, { operation, props, endpoint });
+    endpointContext.set(handler, { endpoint, operation, props });
+    // @ts-expect-error: it's always an object
+    serverPlugins.set(handler, endpoint.plugins);
     innet(children, handler);
 };
 

package/plugins/main/endpoint/endpoint.js

@@ -10,6 +10,7 @@ var useTag = require('../../../hooks/useTag/useTag.js');
 var useApi = require('../../../hooks/useApi/useApi.js');
 var getEndpoint = require('../../../utils/getEndpoint/getEndpoint.js');
 var useEndpoint = require('../../../hooks/useEndpoint/useEndpoint.js');
+var useServerPlugins = require('../../../hooks/useServerPlugins/useServerPlugins.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -18,10 +19,9 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 const endpoint = () => {
     const handler = innet.useNewHandler();
     const tag = useTag.useTag();
-    const { docs, endpoints } = useApi.useApi();
     const props = jsx.useProps();
-    const { path, summary, description, deprecated, method, private: privateMode } = props;
-    const children = jsx.useChildren();
+    const { docs, endpoints, } = useApi.useApi();
+    const { children, deprecated, description, method, path, private: privateMode, summary, } = props;
     const { paths } = docs;
     if (!paths)
         throw Error('cannot find paths in docs');
@@ -50,12 +50,14 @@ const endpoint = () => {
         paths[path][method] = operation;
     }
     if (!endpoints[method]) {
-        endpoints[method] = { key: '' };
+        endpoints[method] = { key: '', plugins: new Set() };
     }
     // @ts-expect-error: it's always an object
     const endpoint = getEndpoint.getEndpoint(path, endpoints[method]);
     // @ts-expect-error: it's always an object
-    useEndpoint.endpointContext.set(handler, { operation, props, endpoint });
+    useEndpoint.endpointContext.set(handler, { endpoint, operation, props });
+    // @ts-expect-error: it's always an object
+    useServerPlugins.serverPlugins.set(handler, endpoint.plugins);
     innet__default["default"](children, handler);
 };
 

package/plugins/main/host/host.d.ts

@@ -1,5 +1,10 @@
 import { type HandlerPlugin } from 'innet';
 export interface HostProps {
+    /**
+     * An optional string describing the host designated by the URL.
+     * [CommonMark syntax](https://spec.commonmark.org/) MAY be used for rich text representation.
+     * */
+    description?: string;
     /**
      * A URL to the target host.
      * This URL supports Server Variables and MAY be relative,
@@ -7,10 +12,5 @@ export interface HostProps {
      * Variable substitutions will be made when a variable is named in {brackets}.
      * */
     url: string;
-    /**
-     * An optional string describing the host designated by the URL.
-     * [CommonMark syntax](https://spec.commonmark.org/) MAY be used for rich text representation.
-     * */
-    description?: string;
 }
 export declare const host: HandlerPlugin;

package/plugins/main/index.d.ts

@@ -7,7 +7,7 @@ export * from './variable';
 export * from './tag';
 export * from './endpoint';
 export * from './response';
-export * from './request';
+export * from './return';
 export * from './param';
 export * from './body';
-export * from './fallback';
+export * from './preset';

package/plugins/main/index.es6.js

@@ -7,7 +7,7 @@ import './variable/index.es6.js';
 import './tag/index.es6.js';
 import './endpoint/index.es6.js';
 import './response/index.es6.js';
-import './request/index.es6.js';
+import './return/index.es6.js';
 import './param/index.es6.js';
 import './body/index.es6.js';
-import './fallback/index.es6.js';
+import './preset/index.es6.js';

package/plugins/main/index.js

@@ -9,8 +9,8 @@ require('./variable/index.js');
 require('./tag/index.js');
 require('./endpoint/index.js');
 require('./response/index.js');
-require('./request/index.js');
+require('./return/index.js');
 require('./param/index.js');
 require('./body/index.js');
-require('./fallback/index.js');
+require('./preset/index.js');
 

package/plugins/main/license/license.d.ts

@@ -1,16 +1,16 @@
 import { type HandlerPlugin } from 'innet';
 export interface LicenseProps {
-    /**
-     * The license name used for the API.
-     * @example: Apache 2.0
-     * */
-    name: string;
     /**
      * An [SPDX](https://spdx.org/spdx-specification-21-web-version#h.jxpfx0ykyb60) license expression for the API.
      * The `identifier` field is mutually exclusive of the `url` field.
      * @example: Apache-2.0
      * */
     identifier?: string;
+    /**
+     * The license name used for the API.
+     * @example: Apache 2.0
+     * */
+    name: string;
     /**
      * A URL to the license used for the API.
      * This MUST be in the form of a URL.

package/plugins/main/param/param.d.ts

@@ -1,6 +1,18 @@
 import { type HandlerPlugin } from 'innet';
 import { type InParam } from '../../../types';
 export interface ParamProps {
+    children?: any;
+    /**
+     * Specifies that a parameter is deprecated and SHOULD be transitioned out of usage.
+     * Default value is `false`.
+     * */
+    deprecated?: boolean;
+    /**
+     * A brief description of the parameter.
+     * This could contain examples of use.
+     * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
+     * */
+    description?: string;
     /**
      * The location of the parameter.
      * Possible values are "query", "header", "path" or "cookie".
@@ -14,22 +26,11 @@ export interface ParamProps {
      * - For all other cases, the `name` corresponds to the parameter name used by the `in` property.
      * */
     name: string;
-    /**
-     * A brief description of the parameter.
-     * This could contain examples of use.
-     * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
-     * */
-    description?: string;
     /**
      * Determines whether this parameter is mandatory.
      * If the parameter location is "path", this property is `true` and its value MUST be `true`.
      * Otherwise, the property MAY be included and its default value is `false`.
      * */
     required?: boolean;
-    /**
-     * Specifies that a parameter is deprecated and SHOULD be transitioned out of usage.
-     * Default value is `false`.
-     * */
-    deprecated?: boolean;
 }
 export declare const param: HandlerPlugin;

package/plugins/main/param/param.es6.js

@@ -1,5 +1,6 @@
+import { __rest } from 'tslib';
 import innet, { useNewHandler } from 'innet';
-import { useChildren, useProps } from '@innet/jsx';
+import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
 import '../../../utils/rules/index.es6.js';
@@ -13,19 +14,18 @@ import { required } from '../../../utils/rules/required/required.es6.js';
 import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
 
 const inMap = {
-    query: 'search',
-    path: 'path',
     cookie: 'cookie',
     header: 'header',
+    path: 'path',
+    query: 'search',
 };
 const param = () => {
     var _a;
-    const { operation, endpoint } = useEndpoint();
+    const { endpoint, operation, } = useEndpoint();
     if (!operation.parameters) {
         operation.parameters = [];
     }
-    const children = useChildren();
-    const props = useProps();
+    const _b = useProps(), { children } = _b, props = __rest(_b, ["children"]);
     const params = Object.assign({}, props);
     if (props.in === 'path') {
         params.required = (_a = params.required) !== null && _a !== void 0 ? _a : true;

package/plugins/main/param/param.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var innet = require('innet');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
@@ -21,19 +22,18 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
 const inMap = {
-    query: 'search',
-    path: 'path',
     cookie: 'cookie',
     header: 'header',
+    path: 'path',
+    query: 'search',
 };
 const param = () => {
     var _a;
-    const { operation, endpoint } = useEndpoint.useEndpoint();
+    const { endpoint, operation, } = useEndpoint.useEndpoint();
     if (!operation.parameters) {
         operation.parameters = [];
     }
-    const children = jsx.useChildren();
-    const props = jsx.useProps();
+    const _b = jsx.useProps(), { children } = _b, props = tslib.__rest(_b, ["children"]);
     const params = Object.assign({}, props);
     if (props.in === 'path') {
         params.required = (_a = params.required) !== null && _a !== void 0 ? _a : true;

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

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

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

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

package/plugins/{utils/prod → main/preset}/index.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var prod = require('./prod.js');
+var preset = require('./preset.js');
 
 
 
-exports.prod = prod.prod;
+exports.preset = preset.preset;

package/plugins/main/preset/preset.d.ts

@@ -0,0 +1,3 @@
+export interface PresetProps {
+}
+export declare function preset(): void;

package/plugins/main/preset/preset.es6.js

@@ -0,0 +1,13 @@
+import innet, { useHandler } from 'innet';
+import { useChildren } from '@innet/jsx';
+import '../../../hooks/index.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+
+function preset() {
+    const children = useChildren();
+    useServerPlugin(() => {
+        innet(children, useHandler());
+    });
+}
+
+export { preset };

package/plugins/{utils/dev/dev.js → main/preset/preset.js}

@@ -4,15 +4,18 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var innet = require('innet');
 var jsx = require('@innet/jsx');
+require('../../../hooks/index.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
-const dev = () => {
-    if (process.env.NODE_ENV === 'development') {
-        innet__default["default"](jsx.useChildren(), innet.useHandler());
-    }
-};
+function preset() {
+    const children = jsx.useChildren();
+    useServerPlugin.useServerPlugin(() => {
+        innet__default["default"](children, innet.useHandler());
+    });
+}
 
-exports.dev = dev;
+exports.preset = preset;

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

@@ -1 +1 @@
-export { response } from './response.es6.js';
+export { response, statuses } from './response.es6.js';

package/plugins/main/response/index.js

@@ -7,3 +7,4 @@ var response = require('./response.js');
 
 
 exports.response = response.response;
+exports.statuses = response.statuses;

package/plugins/main/response/response.d.ts

@@ -1,5 +1,8 @@
 import { type HandlerPlugin } from 'innet';
+import { type ErrorStatuses, type RedirectStatuses, type SuccessStatuses } from '../../request';
+export type StatusKey = ErrorStatuses | RedirectStatuses | SuccessStatuses;
 export interface ResponseProps {
+    children?: any;
     /**
      * A description of the response.
      * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
@@ -11,6 +14,8 @@ export interface ResponseProps {
      * For example, 2XX represents all response codes between [200-299].
      * Only the following range definitions are allowed: 1XX, 2XX, 3XX, 4XX, and 5XX.
      * */
-    status?: number | 'default';
+    status?: 'default' | `${1 | 2 | 3 | 4 | 5}XX` | StatusKey | number;
+    type?: string;
 }
+export declare const statuses: Record<StatusKey, number>;
 export declare const response: HandlerPlugin;

package/plugins/main/response/response.es6.js

@@ -1,37 +1,46 @@
 import innet, { useNewHandler } from 'innet';
-import { useProps, useChildren, useContext } from '@innet/jsx';
+import { useProps, useContext } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
+import '../../request/index.es6.js';
+import { errorStatuses } from '../../request/error/error.es6.js';
+import { redirectStatuses } from '../../request/redirect/redirect.es6.js';
+import { successStatuses } from '../../request/success/success.es6.js';
 import { useEndpoint, endpointContext } from '../../../hooks/useEndpoint/useEndpoint.es6.js';
 import { useThrow } from '../../../hooks/useThrow/useThrow.es6.js';
 import { schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.es6.js';
 import { getOrAdd } from '../../../utils/getOrAdd/getOrAdd.es6.js';
 import { ruleContext } from '../../../hooks/useRule/useRule.es6.js';
 
+const statuses = Object.assign(Object.assign(Object.assign({}, errorStatuses), redirectStatuses), successStatuses);
 const response = () => {
-    const { description = '', status = 'default' } = useProps() || {};
-    const { operation, props: { path } } = useEndpoint();
-    const children = useChildren();
+    var _a;
+    let { children, description = '', status = 'default', type = 'application/json', } = useProps() || {};
+    const { operation, props: { path }, } = useEndpoint();
     const handler = useNewHandler();
     const endpoint = useContext(endpointContext);
+    if (status in statuses) {
+        status = statuses[status];
+    }
     if (!endpoint) {
         useThrow('<{type}> MUST be placed in <endpoint> element');
     }
     if (!operation.responses) {
         operation.responses = {};
     }
-    if (operation.responses[status]) {
-        throw Error(`status ${status} for '${path}' already used`);
+    const defaultResponse = operation.responses[status];
+    if ((_a = defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content) === null || _a === void 0 ? void 0 : _a[type]) {
+        throw Error(`status ${status} and type ${type} for '${path}' already used`);
     }
-    const schema = {};
+    const schema = status === 204 || !children ? undefined : {};
     const response = {
         description,
-        content: {
-            'application/json': {
-                schema,
-            },
-        },
     };
+    if (schema) {
+        response.content = Object.assign(Object.assign({}, defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content), { [type]: {
+                schema,
+            } });
+    }
     operation.responses[status] = response;
     schemaContext.set(handler, schema);
     const rules = getOrAdd(endpoint, 'endpoint.rules', [{}, {}]);
@@ -41,4 +50,4 @@ const response = () => {
     innet(children, handler);
 };
 
-export { response };
+export { response, statuses };

package/plugins/main/response/response.js

@@ -6,6 +6,10 @@ var innet = require('innet');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
+require('../../request/index.js');
+var error = require('../../request/error/error.js');
+var redirect = require('../../request/redirect/redirect.js');
+var success = require('../../request/success/success.js');
 var useEndpoint = require('../../../hooks/useEndpoint/useEndpoint.js');
 var useThrow = require('../../../hooks/useThrow/useThrow.js');
 var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext.js');
@@ -16,30 +20,35 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 
+const statuses = Object.assign(Object.assign(Object.assign({}, error.errorStatuses), redirect.redirectStatuses), success.successStatuses);
 const response = () => {
-    const { description = '', status = 'default' } = jsx.useProps() || {};
-    const { operation, props: { path } } = useEndpoint.useEndpoint();
-    const children = jsx.useChildren();
+    var _a;
+    let { children, description = '', status = 'default', type = 'application/json', } = jsx.useProps() || {};
+    const { operation, props: { path }, } = useEndpoint.useEndpoint();
     const handler = innet.useNewHandler();
     const endpoint = jsx.useContext(useEndpoint.endpointContext);
+    if (status in statuses) {
+        status = statuses[status];
+    }
     if (!endpoint) {
         useThrow.useThrow('<{type}> MUST be placed in <endpoint> element');
     }
     if (!operation.responses) {
         operation.responses = {};
     }
-    if (operation.responses[status]) {
-        throw Error(`status ${status} for '${path}' already used`);
+    const defaultResponse = operation.responses[status];
+    if ((_a = defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content) === null || _a === void 0 ? void 0 : _a[type]) {
+        throw Error(`status ${status} and type ${type} for '${path}' already used`);
     }
-    const schema = {};
+    const schema = status === 204 || !children ? undefined : {};
     const response = {
         description,
-        content: {
-            'application/json': {
-                schema,
-            },
-        },
     };
+    if (schema) {
+        response.content = Object.assign(Object.assign({}, defaultResponse === null || defaultResponse === void 0 ? void 0 : defaultResponse.content), { [type]: {
+                schema,
+            } });
+    }
     operation.responses[status] = response;
     useSchemaContext.schemaContext.set(handler, schema);
     const rules = getOrAdd.getOrAdd(endpoint, 'endpoint.rules', [{}, {}]);
@@ -50,3 +59,4 @@ const response = () => {
 };
 
 exports.response = response;
+exports.statuses = statuses;

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

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

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

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

package/plugins/main/return/index.js

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

package/plugins/main/return/return.d.ts

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

package/plugins/main/return/return.es6.js

@@ -0,0 +1,10 @@
+import { useChildren } from '@innet/jsx';
+import '../../../hooks/index.es6.js';
+import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.es6.js';
+
+const returnPlugin = () => {
+    const children = useChildren();
+    useServerPlugin(() => children);
+};
+
+export { returnPlugin };

package/plugins/main/return/return.js

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsx = require('@innet/jsx');
+require('../../../hooks/index.js');
+var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
+
+const returnPlugin = () => {
+    const children = jsx.useChildren();
+    useServerPlugin.useServerPlugin(() => children);
+};
+
+exports.returnPlugin = returnPlugin;

package/plugins/main/server/server.d.ts

@@ -1,13 +1,14 @@
 /// <reference types="node" />
 import { type HandlerPlugin } from 'innet';
-import { type ServerResponse } from 'http';
+import { type IncomingMessage, type ServerResponse } from 'http';
 import { type ServerStartParams, type SSL } from '../../../types';
 export interface ServerProps {
+    children?: any;
+    onClose?: () => any;
+    onError?: (e: Error) => any;
+    onRequest?: (req: IncomingMessage, res: ServerResponse) => any;
+    onStart?: (params: ServerStartParams) => any;
     port?: number;
     ssl?: SSL;
-    onStart?: (params: ServerStartParams) => any;
-    onRequest?: (req: Request, res: ServerResponse) => any;
-    onError?: (e: Error) => any;
-    onDestroy?: () => any;
 }
 export declare const server: HandlerPlugin;