@innet/server 2.0.0-alpha.21 → 2.0.0-alpha.22

package/README.md

@@ -81,18 +81,18 @@ Here is a **Hello World** example:
 ```typescript jsx
 export default (
   <server>
-    <request>
+    <return>
       <success>
         Hello World!
       </success>
-    </request>
+    </return>
   </server>
 )
 ```
 
 *Use `npm start` to run this server.*
 
-Open http://localhost:80
+Open http://localhost
 You will see the `Hello Word!` string.
 
 ---
@@ -110,7 +110,7 @@ export default (
 
 *Use `npm start` to run this server.*
 
-Open http://localhost:80
+Open http://localhost
 You will see a base Open API JSON structure.
 
 ```json
@@ -130,7 +130,7 @@ You will see a base Open API JSON structure.
 
 [\<server>](#server)   
 [\<api>](#api)  
-[\<request>](#request)  
+[\<return>](#return)  
 [\<preset>](#preset)
 
 ---
@@ -376,41 +376,100 @@ export default (
 )
 ```
 
-### \<request>
+### \<return>
 
 [← back](#main)
 
 This element MUST be placed in [\<server>](#server) element.
-It defines run-time call handler for parent element.
+It defines a run-time call handler for parent element.
 
 *src/app.tsx*
 ```typescript jsx
 export default (
   <server>
-    <request>
+    <return>
       <error status={404} />
-    </request>
+    </return>
   </server>
 )
 ```
 *Any request returns 404*
 
-Place [\<request>](#request) in [\<api>](#api) to handle any unknown request in the [\<api>](#api).
+The code runs from top to bottom and from left to right.
+You cannot use two [\<return>](#return) elements one by one,
+the same as you cannot use two `return` one by one for a JS `function`.
+
+*src/app.tsx*
+```typescript jsx
+export default (
+  <server>
+    <return>
+      <error status={404} />
+    </return>
+    <return>
+      <success />
+    </return>
+  </server>
+)
+```
+
+like
+
+```javascript
+function server () {
+  return 'error'
+  return 'success'
+}
+```
+
+*The second [\<return>](#return) will newer run.*
+
+You can use [\<return>](#return) in some elements like you use `return` in `if` or `while`.
+
+*src/app.tsx*
+```typescript jsx
+export default (
+  <server>
+    <env is='dev'>
+      <return>
+        <error status={404} />
+      </return>
+    </env>
+    <return>
+      <success />
+    </return>
+  </server>
+)
+```
+
+like
+
+```javascript
+function server () {
+  if (process.env.NODE_ENV === 'dev') {
+    return 'error'
+  }
+
+  return 'success'
+}
+```
+
+Place [\<return>](#return) in [\<api>](#api) to handle any unknown request in the [\<api>](#api).
 
 *src/app.tsx*
 ```typescript jsx
 export default (
   <server>
     <api>
-      <request>
+      <return>
         <error status={404} />
-      </request>
+      </return>
     </api>
   </server>
 )
 ```
 
-Place [\<request>](#request) in [\<endpoint>](#endpoint) to handle the [\<endpoint>](#endpoint) request.
+Place [\<return>](#return) in [\<endpoint>](#endpoint) to handle the [\<endpoint>](#endpoint) request.
 
 *src/app.tsx*
 ```typescript jsx
@@ -418,23 +477,23 @@ export default (
   <server>
     <api>
       <endpoint method='get' path='/my-endpoint'>
-        <request>
+        <return>
           <success>
             My Endpoint
           </success>
-        </request>
+        </return>
       </endpoint>
     </api>
-    <request>
+    <return>
       <success>
         Any other request
       </success>
-    </request>
+    </return>
   </server>
 )
 ```
 
-You can place a component inside [\<request>](#request).
+You can place a component inside [\<return>](#return).
 The component will run when the request will be triggered.
 
 *src/app.tsx*
@@ -445,9 +504,9 @@ export default (
   <server>
     <api>
       <endpoint method='get' path='/partners'>
-        <request>
+        <return>
           <GetPartners />
-        </request>
+        </return>
       </endpoint>
     </api>
   </server>
@@ -469,6 +528,8 @@ export const GetPartners = () => (
 
 `<preset>` element MUST be placed in `<server>` element.  
 This element adds handling of each request.
+It works the same as [\<return>](#return), but do not interrupt the running.
+You can use it to add a `header` or `cookie` or some setup of a parent element.
 
 *src/app.tsx*
 ```typescript jsx
@@ -497,7 +558,18 @@ export default (
           value='no-cache, no-store, must-revalidate'
         />
       </preset>
+      ...Endpoints
+      <return>
+        <success>
+          Header contains `Cache-Control`
+        </success>
+      </return>
     </api>
+    <return>
+      <success>
+        Header do not contain `Cache-Control`
+      </success>
+    </return>
   </server>
 )
 ```
@@ -3116,9 +3188,9 @@ export default (
     <api>
       <endpoint method='post' path='/users'>
         <body>
-        <object
-          description='The object of a user'
-        />
+          <object
+            description='The object of a user'
+          />
         </body>
       </endpoint>
     </api>
@@ -3295,7 +3367,7 @@ export default (
 [← back](#run-time)
 
 Returns an error.
-This element MUST be placed in [\<request>](#request) or [\<response>](#response).
+This element MUST be placed in [\<return>](#return) or [\<response>](#response).
 
 *src/app.tsx*
 ```typescript jsx
@@ -3421,7 +3493,7 @@ There are some default errors:
 
 [← back](#run-time)
 
-MUST be placed in [\<request>](#request) or [\<response>](#response).
+MUST be placed in [\<return>](#return) or [\<response>](#response).
 
 You can easy proxy endpoints to another server/service.
 
@@ -3433,9 +3505,9 @@ export default (
       <endpoint
         path='/test'
         method='get'>
-        <request>
+        <return>
           <proxy to='https://...' />
-        </request>
+        </return>
       </endpoint>
     </api>
     <response>
@@ -3449,7 +3521,7 @@ export default (
 
 [← back](#run-time)
 
-MUST be placed in [\<request>](#request) or [\<response>](#response).
+MUST be placed in [\<return>](#return) or [\<response>](#response).
 
 You can redirect users to another resource. It adds `Cache-Control` header by default.
 
@@ -3461,14 +3533,14 @@ export default (
       <endpoint
         path='/test'
         method='get'>
-        <request>
+        <return>
           <redirect to='https://...' />
-        </request>
+        </return>
       </endpoint>
     </api>
-    <response>
+    <return>
       <redirect to='https://...' />
-    </response>
+    </return>
   </server>
 )
 ```
@@ -3486,12 +3558,12 @@ export default (
       <endpoint
         path='/test'
         method='get'>
-        <request>
+        <return>
           <redirect
             status='found'
             to='https://...'
           />
-        </request>
+        </return>
       </endpoint>
     </api>
     <response>
@@ -3508,7 +3580,7 @@ export default (
 
 [← back](#run-time)
 
-MUST be placed in [\<request>](#request) or [\<response>](#response).
+MUST be placed in [\<return>](#return) or [\<response>](#response).
 
 `<cms>` helps to return files from a folder by path. It checks files run-time on the server.
 
@@ -3604,7 +3676,7 @@ export default (
 
 [← back](#run-time)
 
-It returns a file. MUST be placed in [\<request>](#request) or [\<response>](#response).
+It returns a file. MUST be placed in [\<return>](#return) or [\<response>](#response).
 
 It adds `Content-Length` and `Content-Type` automatically.
 
@@ -3642,7 +3714,7 @@ export default (
 
 ### \<header>
 
-MUST be placed in [\<request>](#request) or [\<response>](#response).
+MUST be placed in [\<return>](#return) or [\<response>](#response).
 
 [← back](#run-time)
 
@@ -3665,7 +3737,7 @@ export default (
 
 ### \<cookie>
 
-MUST be placed in [\<request>](#request) or [\<response>](#response).
+MUST be placed in [\<return>](#return) or [\<response>](#response).
 
 [← back](#run-time)
 
@@ -3957,7 +4029,7 @@ Both
 
 [← back](#hooks)
 
-This hook MUST be used in a component placed in [\<request>](#request) or [\<response>](#response).
+This hook MUST be used in a component placed in [\<return>](#return) or [\<response>](#response).
 This hook returns current request instance.
 
 *src/Component.tsx*
@@ -3978,7 +4050,7 @@ export function Component () {
 
 [← back](#hooks)
 
-This hook MUST be used in a component placed in [\<request>](#request) or [\<response>](#response).
+This hook MUST be used in a component placed in [\<return>](#return) or [\<response>](#response).
 This hook returns current response instance.
 
 *src/Component.tsx*
@@ -3999,7 +4071,7 @@ export function Component () {
 
 [← back](#hooks)
 
-This hook MUST be used in a component placed in [\<request>](#request) or [\<response>](#response).
+This hook MUST be used in a component placed in [\<return>](#return) or [\<response>](#response).
 This hook returns current request headers object.
 
 *src/Component.tsx*
@@ -4018,7 +4090,7 @@ export function Component () {
 
 [← back](#hooks)
 
-This hook MUST be used in a component placed in [\<request>](#request) or [\<response>](#response).
+This hook MUST be used in a component placed in [\<return>](#return) or [\<response>](#response).
 This hook returns current request cookies object.
 
 *src/Component.tsx*
@@ -4037,7 +4109,7 @@ export function Component () {
 
 [← back](#hooks)
 
-This hook MUST be used in a component placed in [\<request>](#request) or [\<response>](#response).
+This hook MUST be used in a component placed in [\<return>](#return) or [\<response>](#response).
 This hook returns current request URL path as a `string`.
 
 *src/Component.tsx*
@@ -4056,7 +4128,7 @@ export function Component () {
 
 [← back](#hooks)
 
-This hook MUST be used in a component placed in [\<request>](#request) or [\<response>](#response).
+This hook MUST be used in a component placed in [\<return>](#return) or [\<response>](#response).
 This hook returns an object of URL params you set by [\<param>](#param).
 
 *src/Component.tsx*
@@ -4074,7 +4146,7 @@ export function Component () {
 
 [← back](#hooks)
 
-This hook MUST be used in a component placed in [\<request>](#request) or [\<response>](#response).
+This hook MUST be used in a component placed in [\<return>](#return) or [\<response>](#response).
 This hook returns an object of URL query params.
 
 *src/Component.tsx*
@@ -4092,7 +4164,7 @@ export function Component () {
 
 [← back](#hooks)
 
-This hook MUST be used in a component placed in [\<request>](#request) or [\<response>](#response).
+This hook MUST be used in a component placed in [\<return>](#return) or [\<response>](#response).
 This hook returns current request body.
 
 *src/Component.tsx*
@@ -4111,7 +4183,7 @@ export function Component () {
 [← back](#hooks)
 
 This hook returns request user IP.
-This hook MUST be used in a component placed in [\<request>](#request) or [\<response>](#response).
+This hook MUST be used in a component placed in [\<return>](#return) or [\<response>](#response).
 
 *src/Component.tsx*
 ```typescript jsx

package/handler/handler.d.ts

@@ -1,6 +1,6 @@
 import { context, type ContextProps, slot, type SlotProps, slots, type SlotsProps } from '@innet/jsx';
 import { arraySync, async } from '@innet/utils';
-import { type AnyProps, type ApiProps, type ArrayProps, type BinaryProps, blacklist, type BlacklistProps, type BodyProps, type BooleanProps, cms, type CmsProps, type ContactProps, type CookieProps, type DateProps, type DtsProps, type EndpointProps, type EnvProps, type ErrorProps, type FieldProps, file, type FileProps, type HeaderProps, type HostProps, type IntegerProps, type LicenseProps, type NullProps, type NumberProps, type ObjectProps, type ParamProps, preset, type PresetProps, protection, type ProtectionProps, type ProxyProps, type RedirectProps, type RequestProps, type ResponseProps, type ServerProps, type StringProps, type SuccessProps, type SwaggerProps, type TagProps, type TupleProps, type UuidProps, type VariableProps, whitelist, type WhitelistProps } from '../plugins';
+import { type AnyProps, type ApiProps, type ArrayProps, type BinaryProps, blacklist, type BlacklistProps, type BodyProps, type BooleanProps, cms, type CmsProps, type ContactProps, type CookieProps, type DateProps, type DtsProps, type EndpointProps, type EnvProps, type ErrorProps, type FieldProps, file, type FileProps, type HeaderProps, type HostProps, type IntegerProps, type LicenseProps, type NullProps, type NumberProps, type ObjectProps, type ParamProps, preset, type PresetProps, protection, type ProtectionProps, type ProxyProps, type RedirectProps, type ResponseProps, type ReturnProps, type ServerProps, type StringProps, type SuccessProps, type SwaggerProps, type TagProps, type TupleProps, type UuidProps, type VariableProps, whitelist, type WhitelistProps } from '../plugins';
 export declare const arrayPlugins: (typeof arraySync)[];
 export declare const JSXPlugins: {
     any: import("innet").HandlerPlugin;
@@ -33,8 +33,8 @@ export declare const JSXPlugins: {
     protection: typeof protection;
     proxy: import("innet").HandlerPlugin;
     redirect: import("innet").HandlerPlugin;
-    request: import("innet").HandlerPlugin;
     response: import("innet").HandlerPlugin;
+    return: import("innet").HandlerPlugin;
     slot: typeof slot;
     slots: typeof slots;
     server: import("innet").HandlerPlugin;
@@ -84,7 +84,7 @@ declare global {
             protection: ProtectionProps;
             proxy: ProxyProps;
             redirect: RedirectProps;
-            request: RequestProps;
+            return: ReturnProps;
             response: ResponseProps;
             slot: SlotProps;
             slots: SlotsProps;

package/handler/handler.es6.js

@@ -31,8 +31,8 @@ import { preset } from '../plugins/main/preset/preset.es6.js';
 import { protection } from '../plugins/utils/protection/protection.es6.js';
 import { proxy } from '../plugins/request/proxy/proxy.es6.js';
 import { redirect } from '../plugins/request/redirect/redirect.es6.js';
-import { request } from '../plugins/main/request/request.es6.js';
 import { response } from '../plugins/main/response/response.es6.js';
+import { returnPlugin } from '../plugins/main/return/return.es6.js';
 import { server } from '../plugins/main/server/server.es6.js';
 import { swagger } from '../plugins/utils/swagger/swagger.es6.js';
 import { string } from '../plugins/schema/string/string.es6.js';
@@ -78,8 +78,8 @@ const JSXPlugins = {
     protection,
     proxy,
     redirect,
-    request,
     response,
+    return: returnPlugin,
     slot,
     slots,
     server,

package/handler/handler.js

@@ -35,8 +35,8 @@ var preset = require('../plugins/main/preset/preset.js');
 var protection = require('../plugins/utils/protection/protection.js');
 var proxy = require('../plugins/request/proxy/proxy.js');
 var redirect = require('../plugins/request/redirect/redirect.js');
-var request = require('../plugins/main/request/request.js');
 var response = require('../plugins/main/response/response.js');
+var _return = require('../plugins/main/return/return.js');
 var server = require('../plugins/main/server/server.js');
 var swagger = require('../plugins/utils/swagger/swagger.js');
 var string = require('../plugins/schema/string/string.js');
@@ -82,8 +82,8 @@ const JSXPlugins = {
     protection: protection.protection,
     proxy: proxy.proxy,
     redirect: redirect.redirect,
-    request: request.request,
     response: response.response,
+    return: _return.returnPlugin,
     slot: jsx.slot,
     slots: jsx.slots,
     server: server.server,

package/index.es6.js

@@ -13,7 +13,7 @@ export { variable } from './plugins/main/variable/variable.es6.js';
 export { tag } from './plugins/main/tag/tag.es6.js';
 export { endpoint } from './plugins/main/endpoint/endpoint.es6.js';
 export { response, statuses } from './plugins/main/response/response.es6.js';
-export { request } from './plugins/main/request/request.es6.js';
+export { returnPlugin } from './plugins/main/return/return.es6.js';
 export { param } from './plugins/main/param/param.es6.js';
 export { body } from './plugins/main/body/body.es6.js';
 export { preset } from './plugins/main/preset/preset.es6.js';

package/index.js

@@ -17,7 +17,7 @@ var variable = require('./plugins/main/variable/variable.js');
 var tag = require('./plugins/main/tag/tag.js');
 var endpoint = require('./plugins/main/endpoint/endpoint.js');
 var response = require('./plugins/main/response/response.js');
-var request = require('./plugins/main/request/request.js');
+var _return = require('./plugins/main/return/return.js');
 var param = require('./plugins/main/param/param.js');
 var body = require('./plugins/main/body/body.js');
 var preset = require('./plugins/main/preset/preset.js');
@@ -137,7 +137,7 @@ exports.tag = tag.tag;
 exports.endpoint = endpoint.endpoint;
 exports.response = response.response;
 exports.statuses = response.statuses;
-exports.request = request.request;
+exports.returnPlugin = _return.returnPlugin;
 exports.param = param.param;
 exports.body = body.body;
 exports.preset = preset.preset;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "2.0.0-alpha.21",
+  "version": "2.0.0-alpha.22",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",

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 './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 './preset/index.es6.js';

package/plugins/main/index.js

@@ -9,7 +9,7 @@ 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('./preset/index.js');

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/{request/request.es6.js → return/return.es6.js}

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

package/plugins/main/{request/request.js → return/return.js}

@@ -6,9 +6,9 @@ var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
 
-const request = () => {
+const returnPlugin = () => {
     const children = jsx.useChildren();
     useServerPlugin.useServerPlugin(() => children);
 };
 
-exports.request = request;
+exports.returnPlugin = returnPlugin;

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

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

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

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

package/plugins/main/request/index.js

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

package/plugins/main/request/request.d.ts

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