@innet/server 2.0.0-beta.2 → 2.0.0-beta.21

package/handler/handler.d.ts

@@ -1,6 +1,6 @@
 import { type JSXElement } 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 ResponseProps, type ReturnProps, 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 UiProps, type UuidProps, type VariableProps, whitelist, type WhitelistProps } from '../plugins';
 export declare const arrayPlugins: (typeof arraySync)[];
 export declare const JSXPlugins: {
     any: import("innet").HandlerPlugin;
@@ -40,6 +40,7 @@ export declare const JSXPlugins: {
     swagger: import("innet").HandlerPlugin;
     tag: import("innet").HandlerPlugin;
     tuple: import("innet").HandlerPlugin;
+    ui: import("innet").HandlerPlugin;
     uuid: import("innet").HandlerPlugin;
     variable: import("innet").HandlerPlugin;
     whitelist: typeof whitelist;
@@ -50,7 +51,7 @@ export declare const promisePlugins: (typeof async)[];
 export declare const handler: import("innet").Handler;
 declare global {
     namespace JSX {
-        type Element = ArrayElement | FunctionElement | JSXElement | boolean | null | number | (string & {}) | undefined;
+        type Element = ({} & string) | ArrayElement | FunctionElement | JSXElement | boolean | null | number | undefined;
         interface ArrayElement extends Array<Element> {
         }
         type FunctionElement = () => Element;
@@ -92,9 +93,11 @@ declare global {
             server: ServerProps;
             string: StringProps;
             success: SuccessProps;
+            /** @deprecated Use <ui> */
             swagger: SwaggerProps;
             tag: TagProps;
             tuple: TupleProps;
+            ui: UiProps;
             uuid: UuidProps;
             variable: VariableProps;
             whitelist: WhitelistProps;

package/handler/handler.es6.js

@@ -39,6 +39,7 @@ import { success } from '../plugins/request/success/success.es6.js';
 import { swagger } from '../plugins/utils/swagger/swagger.es6.js';
 import { tag } from '../plugins/main/tag/tag.es6.js';
 import { tuple } from '../plugins/schema/tuple/tuple.es6.js';
+import { ui } from '../plugins/utils/ui/ui.es6.js';
 import { uuid } from '../plugins/schema/uuid/uuid.es6.js';
 import { variable } from '../plugins/main/variable/variable.es6.js';
 import { whitelist } from '../plugins/utils/whitelist/whitelist.es6.js';
@@ -85,6 +86,7 @@ const JSXPlugins = {
     swagger,
     tag,
     tuple,
+    ui,
     uuid,
     variable,
     whitelist,

package/handler/handler.js

@@ -43,6 +43,7 @@ var success = require('../plugins/request/success/success.js');
 var swagger = require('../plugins/utils/swagger/swagger.js');
 var tag = require('../plugins/main/tag/tag.js');
 var tuple = require('../plugins/schema/tuple/tuple.js');
+var ui = require('../plugins/utils/ui/ui.js');
 var uuid = require('../plugins/schema/uuid/uuid.js');
 var variable = require('../plugins/main/variable/variable.js');
 var whitelist = require('../plugins/utils/whitelist/whitelist.js');
@@ -89,6 +90,7 @@ const JSXPlugins = {
     swagger: swagger.swagger,
     tag: tag.tag,
     tuple: tuple.tuple,
+    ui: ui.ui,
     uuid: uuid.uuid,
     variable: variable.variable,
     whitelist: whitelist.whitelist,

package/hooks/index.d.ts

@@ -1,32 +1,34 @@
-export * from './useServer';
+export * from './useAction';
 export * from './useApi';
-export * from './useHost';
-export * from './useTag';
-export * from './useComponentName';
-export * from './useOneElementError';
-export * from './useSchemaContext';
-export * from './useSchemaType';
-export * from './useNewSchema';
-export * from './useRequest';
-export * from './useResponse';
-export * from './useParams';
+export * from './useBlock';
 export * from './useBody';
-export * from './useSearch';
-export * from './useParam';
+export * from './useBodyFile';
+export * from './useClientIp';
+export * from './useComponentName';
+export * from './useCookies';
+export * from './useData';
+export * from './useEffect';
 export * from './useEndpoint';
-export * from './useBlock';
 export * from './useHeaders';
-export * from './useCookies';
-export * from './useAction';
-export * from './useThrow';
-export * from './useRule';
+export * from './useHost';
+export * from './useIsServerHttps';
+export * from './useNewSchema';
 export * from './useObjectRule';
-export * from './useBodyFile';
+export * from './useObjectSchemaContext';
+export * from './useOneElementError';
+export * from './useParam';
+export * from './useParams';
 export * from './usePath';
+export * from './useRequest';
+export * from './useRequestHandler';
+export * from './useResponse';
+export * from './useRule';
+export * from './useSchemaContext';
+export * from './useSchemaType';
+export * from './useSearch';
+export * from './useServer';
 export * from './useServerPlugin';
-export * from './useClientIp';
 export * from './useServerPlugins';
-export * from './useObjectSchemaContext';
 export * from './useServerPort';
-export * from './useIsServerHttps';
-export * from './useRequestHandler';
+export * from './useTag';
+export * from './useThrow';

package/hooks/index.es6.js

@@ -1,32 +1,34 @@
-import './useServer/index.es6.js';
+import './useAction/index.es6.js';
 import './useApi/index.es6.js';
-import './useHost/index.es6.js';
-import './useTag/index.es6.js';
-import './useComponentName/index.es6.js';
-import './useOneElementError/index.es6.js';
-import './useSchemaContext/index.es6.js';
-import './useSchemaType/index.es6.js';
-import './useNewSchema/index.es6.js';
-import './useRequest/index.es6.js';
-import './useResponse/index.es6.js';
-import './useParams/index.es6.js';
+import './useBlock/index.es6.js';
 import './useBody/index.es6.js';
-import './useSearch/index.es6.js';
-import './useParam/index.es6.js';
+import './useBodyFile/index.es6.js';
+import './useClientIp/index.es6.js';
+import './useComponentName/index.es6.js';
+import './useCookies/index.es6.js';
+import './useData/index.es6.js';
+import './useEffect/index.es6.js';
 import './useEndpoint/index.es6.js';
-import './useBlock/index.es6.js';
 import './useHeaders/index.es6.js';
-import './useCookies/index.es6.js';
-import './useAction/index.es6.js';
-import './useThrow/index.es6.js';
-import './useRule/index.es6.js';
+import './useHost/index.es6.js';
+import './useIsServerHttps/index.es6.js';
+import './useNewSchema/index.es6.js';
 import './useObjectRule/index.es6.js';
-import './useBodyFile/index.es6.js';
+import './useObjectSchemaContext/index.es6.js';
+import './useOneElementError/index.es6.js';
+import './useParam/index.es6.js';
+import './useParams/index.es6.js';
 import './usePath/index.es6.js';
+import './useRequest/index.es6.js';
+import './useRequestHandler/index.es6.js';
+import './useResponse/index.es6.js';
+import './useRule/index.es6.js';
+import './useSchemaContext/index.es6.js';
+import './useSchemaType/index.es6.js';
+import './useSearch/index.es6.js';
+import './useServer/index.es6.js';
 import './useServerPlugin/index.es6.js';
-import './useClientIp/index.es6.js';
 import './useServerPlugins/index.es6.js';
-import './useObjectSchemaContext/index.es6.js';
 import './useServerPort/index.es6.js';
-import './useIsServerHttps/index.es6.js';
-import './useRequestHandler/index.es6.js';
+import './useTag/index.es6.js';
+import './useThrow/index.es6.js';

package/hooks/index.js

@@ -1,35 +1,37 @@
 'use strict';
 
-require('./useServer/index.js');
+require('./useAction/index.js');
 require('./useApi/index.js');
-require('./useHost/index.js');
-require('./useTag/index.js');
-require('./useComponentName/index.js');
-require('./useOneElementError/index.js');
-require('./useSchemaContext/index.js');
-require('./useSchemaType/index.js');
-require('./useNewSchema/index.js');
-require('./useRequest/index.js');
-require('./useResponse/index.js');
-require('./useParams/index.js');
+require('./useBlock/index.js');
 require('./useBody/index.js');
-require('./useSearch/index.js');
-require('./useParam/index.js');
+require('./useBodyFile/index.js');
+require('./useClientIp/index.js');
+require('./useComponentName/index.js');
+require('./useCookies/index.js');
+require('./useData/index.js');
+require('./useEffect/index.js');
 require('./useEndpoint/index.js');
-require('./useBlock/index.js');
 require('./useHeaders/index.js');
-require('./useCookies/index.js');
-require('./useAction/index.js');
-require('./useThrow/index.js');
-require('./useRule/index.js');
+require('./useHost/index.js');
+require('./useIsServerHttps/index.js');
+require('./useNewSchema/index.js');
 require('./useObjectRule/index.js');
-require('./useBodyFile/index.js');
+require('./useObjectSchemaContext/index.js');
+require('./useOneElementError/index.js');
+require('./useParam/index.js');
+require('./useParams/index.js');
 require('./usePath/index.js');
+require('./useRequest/index.js');
+require('./useRequestHandler/index.js');
+require('./useResponse/index.js');
+require('./useRule/index.js');
+require('./useSchemaContext/index.js');
+require('./useSchemaType/index.js');
+require('./useSearch/index.js');
+require('./useServer/index.js');
 require('./useServerPlugin/index.js');
-require('./useClientIp/index.js');
 require('./useServerPlugins/index.js');
-require('./useObjectSchemaContext/index.js');
 require('./useServerPort/index.js');
-require('./useIsServerHttps/index.js');
-require('./useRequestHandler/index.js');
+require('./useTag/index.js');
+require('./useThrow/index.js');
 

package/hooks/useAction/useAction.es6.js

@@ -6,7 +6,7 @@ const actionContext = new Context();
 function useAction() {
     const action = useContext(actionContext);
     if (!action) {
-        useThrow('<{type}> MUST be in <request>, <preset> or <fallback>');
+        useThrow('<{type}> MUST be in <return> or <preset>');
     }
     return action;
 }

package/hooks/useAction/useAction.js

@@ -10,7 +10,7 @@ const actionContext = new jsx.Context();
 function useAction() {
     const action = jsx.useContext(actionContext);
     if (!action) {
-        useThrow.useThrow('<{type}> MUST be in <request>, <preset> or <fallback>');
+        useThrow.useThrow('<{type}> MUST be in <return> or <preset>');
     }
     return action;
 }

package/hooks/useApi/useApi.d.ts

@@ -1,10 +1,12 @@
 import { Context } from '@innet/jsx';
+import { type ApiProps } from '../../plugins';
 import { type Document, type Endpoints } from '../../types';
 import { type Rule } from '../../utils';
 export interface ApiContext {
     docs: Document;
     endpoints: Endpoints;
     prefix: string;
+    props: ApiProps;
     refRules: Record<string, Rule>;
 }
 export declare const apiContext: Context<ApiContext, ApiContext | undefined>;

package/hooks/useData/index.d.ts

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

package/hooks/useData/index.es6.js

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

package/hooks/useData/index.js

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

package/hooks/useData/useData.d.ts

@@ -0,0 +1,6 @@
+import { type ApiEndpoints, type TEndpoint } from '../../types';
+type KeysWithField<F extends string> = {
+    [K in keyof ApiEndpoints]: F extends keyof ApiEndpoints[K] ? K : never;
+}[keyof ApiEndpoints];
+export declare function useData<F extends Exclude<keyof TEndpoint, 'response'>, K extends KeysWithField<F> = KeysWithField<F>>(from: F, path?: K): ApiEndpoints[K][F];
+export {};

package/hooks/useData/useData.es6.js

@@ -0,0 +1,29 @@
+import { useContext } from '@innet/jsx';
+import '../useAction/index.es6.js';
+import '../useEndpoint/index.es6.js';
+import '../useParams/index.es6.js';
+import '../useThrow/index.es6.js';
+import { useEndpoint } from '../useEndpoint/useEndpoint.es6.js';
+import { useThrow } from '../useThrow/useThrow.es6.js';
+import { useAction } from '../useAction/useAction.es6.js';
+import { paramsContext } from '../useParams/useParams.es6.js';
+
+function useData(from, path) {
+    if (path) {
+        const endpoint = useEndpoint();
+        const endpointKey = `${endpoint.props.method.toUpperCase()}:${endpoint.props.path}`;
+        if (endpointKey !== path) {
+            useThrow(`<{type}> MUST be in <endpoint> of ${path}`);
+        }
+    }
+    const action = useAction();
+    if (!action) {
+        useThrow('<{type}> MUST be in <return> or <preset>');
+    }
+    if (from === 'params') {
+        return useContext(paramsContext);
+    }
+    return action[from];
+}
+
+export { useData };

package/hooks/useData/useData.js

@@ -0,0 +1,33 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsx = require('@innet/jsx');
+require('../useAction/index.js');
+require('../useEndpoint/index.js');
+require('../useParams/index.js');
+require('../useThrow/index.js');
+var useEndpoint = require('../useEndpoint/useEndpoint.js');
+var useThrow = require('../useThrow/useThrow.js');
+var useAction = require('../useAction/useAction.js');
+var useParams = require('../useParams/useParams.js');
+
+function useData(from, path) {
+    if (path) {
+        const endpoint = useEndpoint.useEndpoint();
+        const endpointKey = `${endpoint.props.method.toUpperCase()}:${endpoint.props.path}`;
+        if (endpointKey !== path) {
+            useThrow.useThrow(`<{type}> MUST be in <endpoint> of ${path}`);
+        }
+    }
+    const action = useAction.useAction();
+    if (!action) {
+        useThrow.useThrow('<{type}> MUST be in <return> or <preset>');
+    }
+    if (from === 'params') {
+        return jsx.useContext(useParams.paramsContext);
+    }
+    return action[from];
+}
+
+exports.useData = useData;

package/hooks/useEffect/index.d.ts

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

package/hooks/useEffect/index.es6.js

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

package/hooks/useEffect/index.js

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

package/hooks/useEffect/useEffect.d.ts

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

package/hooks/useEffect/useEffect.es6.js

@@ -0,0 +1,8 @@
+import { innet } from 'innet';
+import { callHandler } from '@innet/utils';
+
+function useEffect(effect) {
+    innet(effect, callHandler, 1, true);
+}
+
+export { useEffect };

package/hooks/useEffect/useEffect.js

@@ -0,0 +1,12 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var innet = require('innet');
+var utils = require('@innet/utils');
+
+function useEffect(effect) {
+    innet.innet(effect, utils.callHandler, 1, true);
+}
+
+exports.useEffect = useEffect;

package/hooks/useSchemaType/useSchemaType.d.ts

@@ -1,5 +1,5 @@
-import { type ObjectType, type SchemaObject, type ValuesSchemaProps } from '../../types';
+import { type ObjectType, type SchemaObject, type SchemaProps } from '../../types';
 export type SchemaType = 'any' | ObjectType;
 type TypeMap<T extends SchemaType> = T extends 'integer' | 'number' ? number : T extends 'string' ? string : T extends 'object' ? object : T extends 'array' ? any[] : T extends 'boolean' ? boolean : T extends 'null' ? null : T extends 'any' ? any : unknown;
-export declare function useSchemaType<T extends SchemaType>(type: T, { example, examples, ref, values, ...options }?: ValuesSchemaProps<TypeMap<T>> | undefined): SchemaObject | undefined;
+export declare function useSchemaType<T extends SchemaType>(type: T, { example, examples, nullable, ref, value, values, ...options }?: SchemaProps<TypeMap<T>> | undefined): SchemaObject | undefined;
 export {};

package/hooks/useSchemaType/useSchemaType.es6.js

@@ -3,7 +3,7 @@ import '../useNewSchema/index.es6.js';
 import { useApi } from '../useApi/useApi.es6.js';
 import { useNewSchema } from '../useNewSchema/useNewSchema.es6.js';
 
-function useSchemaType(type, { example, examples, ref, values, ...options } = {}) {
+function useSchemaType(type, { example, examples, nullable, ref, value, values, ...options } = {}) {
     var _a;
     if (ref) {
         const { docs } = useApi();
@@ -21,18 +21,27 @@ function useSchemaType(type, { example, examples, ref, values, ...options } = {}
         }
         return (docs.components.schemas[ref] = {
             ...options,
+            const: value,
             enum: values,
             example,
             examples,
-            type: type === 'any' ? undefined : type,
+            type: type === 'any' ? undefined : nullable ? [type, 'null'] : type,
         });
     }
+    const arrayValues = values ? Array.isArray(values) ? values : Object.keys(values) : values;
+    const enumDescription = values && !Array.isArray(values)
+        ? {
+            [process.env.INNET_API_ENUM_DESCRIPTION_KEY || 'x-enumNames']: values,
+        }
+        : {};
     return useNewSchema({
         ...options,
-        enum: values,
+        ...enumDescription,
+        const: value,
+        enum: arrayValues,
         example,
         examples,
-        type: type === 'any' ? undefined : type,
+        type: type === 'any' ? undefined : nullable ? [type, 'null'] : type,
     });
 }
 

package/hooks/useSchemaType/useSchemaType.js

@@ -7,7 +7,7 @@ require('../useNewSchema/index.js');
 var useApi = require('../useApi/useApi.js');
 var useNewSchema = require('../useNewSchema/useNewSchema.js');
 
-function useSchemaType(type, { example, examples, ref, values, ...options } = {}) {
+function useSchemaType(type, { example, examples, nullable, ref, value, values, ...options } = {}) {
     var _a;
     if (ref) {
         const { docs } = useApi.useApi();
@@ -25,18 +25,27 @@ function useSchemaType(type, { example, examples, ref, values, ...options } = {}
         }
         return (docs.components.schemas[ref] = {
             ...options,
+            const: value,
             enum: values,
             example,
             examples,
-            type: type === 'any' ? undefined : type,
+            type: type === 'any' ? undefined : nullable ? [type, 'null'] : type,
         });
     }
+    const arrayValues = values ? Array.isArray(values) ? values : Object.keys(values) : values;
+    const enumDescription = values && !Array.isArray(values)
+        ? {
+            [process.env.INNET_API_ENUM_DESCRIPTION_KEY || 'x-enumNames']: values,
+        }
+        : {};
     return useNewSchema.useNewSchema({
         ...options,
-        enum: values,
+        ...enumDescription,
+        const: value,
+        enum: arrayValues,
         example,
         examples,
-        type: type === 'any' ? undefined : type,
+        type: type === 'any' ? undefined : nullable ? [type, 'null'] : type,
     });
 }
 

package/hooks/useSearch/useSearch.es6.js

@@ -6,7 +6,7 @@ import { useThrow } from '../useThrow/useThrow.es6.js';
 function useSearch() {
     const action = useAction();
     if (!action) {
-        useThrow('<{type}> MUST be in <request> or <fallback>');
+        useThrow('<{type}> MUST be in <return> or <preset>');
     }
     return action.search;
 }

package/hooks/useSearch/useSearch.js

@@ -10,7 +10,7 @@ var useThrow = require('../useThrow/useThrow.js');
 function useSearch() {
     const action = useAction.useAction();
     if (!action) {
-        useThrow.useThrow('<{type}> MUST be in <request> or <fallback>');
+        useThrow.useThrow('<{type}> MUST be in <return> or <preset>');
     }
     return action.search;
 }

package/hooks/useServer/useServer.d.ts

@@ -1,9 +1,11 @@
 import { Context } from '@innet/jsx';
 import { type Server as HttpServer } from 'http';
 import { type Server as HttpsServer } from 'https';
+import { type ServerProps } from '../../plugins';
 export type ServerPlugin = () => any;
 export interface ServerContext {
     port: number;
+    props: ServerProps;
     server: HttpServer | HttpsServer;
 }
 export declare const serverContext: Context<ServerContext, ServerContext | undefined>;

package/index.d.ts

@@ -1,6 +1,6 @@
 export { handler as default } from './handler';
-export * from './plugins';
 export * from './handler';
-export * from './utils';
 export * from './hooks';
+export * from './plugins';
 export * from './types';
+export * from './utils';