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

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/useSchemaType/useSchemaType.d.ts

@@ -1,5 +1,5 @@
 import { type ObjectType, type SchemaObject, type ValuesSchemaProps } 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 }?: ValuesSchemaProps<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,27 +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)
         ? {
-            'x-enum-descriptions': values,
-            'x-enumDescriptions': values,
-            'x-enumNames': values,
+            [process.env.INNET_API_ENUM_DESCRIPTION_KEY || 'x-enumNames']: values,
         }
         : {};
     return useNewSchema({
         ...options,
         ...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,27 +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)
         ? {
-            'x-enum-descriptions': values,
-            'x-enumDescriptions': values,
-            'x-enumNames': values,
+            [process.env.INNET_API_ENUM_DESCRIPTION_KEY || 'x-enumNames']: values,
         }
         : {};
     return useNewSchema.useNewSchema({
         ...options,
         ...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/package.json

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

package/plugins/main/api/api.es6.js

@@ -23,7 +23,7 @@ const api = () => {
         paths: {},
     };
     const plugins = new Set();
-    const context = { docs, endpoints, prefix, refRules: {} };
+    const context = { docs, endpoints, prefix, props, refRules: {} };
     const condition = (action) => {
         const path = action.parsedUrl.path;
         const url = path.endsWith('/') ? path.slice(0, -1) : path;

package/plugins/main/api/api.js

@@ -27,7 +27,7 @@ const api = () => {
         paths: {},
     };
     const plugins = new Set();
-    const context = { docs, endpoints, prefix, refRules: {} };
+    const context = { docs, endpoints, prefix, props, refRules: {} };
     const condition = (action) => {
         const path = action.parsedUrl.path;
         const url = path.endsWith('/') ? path.slice(0, -1) : path;

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

@@ -3,6 +3,10 @@ import { type IncomingMessage, type ServerResponse } from 'http';
 import { type ServerStartParams, type SSL } from '../../../types';
 export interface ServerProps {
     children?: any;
+    formatError?: (target: {
+        data: any;
+        error: string;
+    }) => string;
     onClose?: () => any;
     onError?: (e: Error) => any;
     onRequest?: (req: IncomingMessage, res: ServerResponse) => any;

package/plugins/main/server/server.es6.js

@@ -36,7 +36,7 @@ const server = () => {
     const { onClose, onError, onRequest, onStart, port = Number((_c = env.INNET_PORT) !== null && _c !== void 0 ? _c : (https ? 443 : 80)), } = props;
     const plugins = new Set();
     const server = https ? http2.createServer({ cert, key }) : http.createServer();
-    serverContext.set(handler, { port, server });
+    serverContext.set(handler, { port, props, server });
     serverPlugins.set(handler, plugins);
     serverPortContext.set(handler, port);
     serverHttpsContext.set(handler, https);

package/plugins/main/server/server.js

@@ -46,7 +46,7 @@ const server = () => {
     const { onClose, onError, onRequest, onStart, port = Number((_c = env.INNET_PORT) !== null && _c !== void 0 ? _c : (https ? 443 : 80)), } = props;
     const plugins = new Set();
     const server = https ? http2__default["default"].createServer({ cert, key }) : http__default["default"].createServer();
-    useServer.serverContext.set(handler, { port, server });
+    useServer.serverContext.set(handler, { port, props, server });
     useServerPlugins.serverPlugins.set(handler, plugins);
     useServerPort.serverPortContext.set(handler, port);
     useIsServerHttps.serverHttpsContext.set(handler, https);

package/plugins/request/error/error.es6.js

@@ -1,6 +1,7 @@
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
+import { useServer } from '../../../hooks/useServer/useServer.es6.js';
 import { useResponse } from '../../../hooks/useResponse/useResponse.es6.js';
 import { JSONString } from '../../../utils/JSONString/JSONString.es6.js';
 
@@ -58,14 +59,17 @@ const errorStatuses = {
     webServerIsDown: 521,
 };
 const error = () => {
-    const { children, ...props } = useProps();
+    var _a;
+    const server = useServer();
     const res = useResponse();
     if (!res) {
-        throw Error('<error> MUST be in <request>');
+        throw Error('<error> MUST be in <return>');
     }
+    const { children, ...props } = useProps();
     const { code = 'undefined', status = 520, } = props;
     res.statusCode = typeof status === 'string' ? errorStatuses[status] : status;
-    const content = JSONString({ data: children, error: code });
+    const format = (_a = server.props.formatError) !== null && _a !== void 0 ? _a : JSONString;
+    const content = format({ data: children, error: code });
     res.setHeader('Content-Type', 'application/json');
     res.setHeader('Content-Length', content.length);
     res.write(content);

package/plugins/request/error/error.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
+var useServer = require('../../../hooks/useServer/useServer.js');
 var useResponse = require('../../../hooks/useResponse/useResponse.js');
 var JSONString = require('../../../utils/JSONString/JSONString.js');
 
@@ -62,14 +63,17 @@ const errorStatuses = {
     webServerIsDown: 521,
 };
 const error = () => {
-    const { children, ...props } = jsx.useProps();
+    var _a;
+    const server = useServer.useServer();
     const res = useResponse.useResponse();
     if (!res) {
-        throw Error('<error> MUST be in <request>');
+        throw Error('<error> MUST be in <return>');
     }
+    const { children, ...props } = jsx.useProps();
     const { code = 'undefined', status = 520, } = props;
     res.statusCode = typeof status === 'string' ? errorStatuses[status] : status;
-    const content = JSONString.JSONString({ data: children, error: code });
+    const format = (_a = server.props.formatError) !== null && _a !== void 0 ? _a : JSONString.JSONString;
+    const content = format({ data: children, error: code });
     res.setHeader('Content-Type', 'application/json');
     res.setHeader('Content-Length', content.length);
     res.write(content);

package/plugins/request/file/file.es6.js

@@ -11,7 +11,7 @@ function file() {
     const { children, ...props } = useProps();
     const res = useResponse();
     if (!res) {
-        useThrow('<{type}> MUST be in <request> or <fallback>');
+        useThrow('<{type}> MUST be in <return> or <preset>');
     }
     const { path } = props;
     if (fs.existsSync(path)) {

package/plugins/request/file/file.js

@@ -20,7 +20,7 @@ function file() {
     const { children, ...props } = jsx.useProps();
     const res = useResponse.useResponse();
     if (!res) {
-        useThrow.useThrow('<{type}> MUST be in <request> or <fallback>');
+        useThrow.useThrow('<{type}> MUST be in <return> or <preset>');
     }
     const { path } = props;
     if (fs__default["default"].existsSync(path)) {

package/plugins/request/header/header.es6.js

@@ -6,7 +6,7 @@ import { useThrow } from '../../../hooks/useThrow/useThrow.es6.js';
 const header = () => {
     const res = useResponse();
     if (!res) {
-        useThrow('<{type}> MUST be in <request> or <fallback>');
+        useThrow('<{type}> MUST be in <return> or <preset>');
     }
     const { key, value, } = useProps();
     res.setHeader(key, value);

package/plugins/request/header/header.js

@@ -10,7 +10,7 @@ var useThrow = require('../../../hooks/useThrow/useThrow.js');
 const header = () => {
     const res = useResponse.useResponse();
     if (!res) {
-        useThrow.useThrow('<{type}> MUST be in <request> or <fallback>');
+        useThrow.useThrow('<{type}> MUST be in <return> or <preset>');
     }
     const { key, value, } = jsx.useProps();
     res.setHeader(key, value);

package/plugins/schema/date/date.d.ts

@@ -1,7 +1,7 @@
 import { type HandlerPlugin } from 'innet';
 import { type ValuesSchemaProps } from '../../../types';
 import { type DateFormat } from '../../../utils';
-export interface DateProps extends Omit<ValuesSchemaProps<DateFormat>, 'const'> {
+export interface DateProps extends Omit<ValuesSchemaProps<DateFormat>, 'value'> {
     const?: string;
     max?: DateFormat;
     min?: DateFormat;

package/plugins/schema/integer/integer.es6.js

@@ -15,10 +15,10 @@ const integer = () => {
     const { default: defaultValue, example, examples, exclusiveMaximum, exclusiveMinimum, format = 'int32', max: max$1, min: min$1, multipleOf, values: values$1, ...props } = useProps() || {};
     const schema = useSchemaType('integer', {
         ...props,
-        const: props.const !== undefined ? Number(props.const) : undefined,
         default: defaultValue !== undefined ? Number(defaultValue) : undefined,
         example: example !== undefined ? Number(example) : undefined,
         examples: examples === null || examples === void 0 ? void 0 : examples.map(Number),
+        value: props.value !== undefined ? Number(props.value) : undefined,
         values: values$1 && getArrayValues(values$1, Number),
     });
     if (schema) {

package/plugins/schema/integer/integer.js

@@ -19,10 +19,10 @@ const integer = () => {
     const { default: defaultValue, example, examples, exclusiveMaximum, exclusiveMinimum, format = 'int32', max: max$1, min: min$1, multipleOf, values: values$1, ...props } = jsx.useProps() || {};
     const schema = useSchemaType.useSchemaType('integer', {
         ...props,
-        const: props.const !== undefined ? Number(props.const) : undefined,
         default: defaultValue !== undefined ? Number(defaultValue) : undefined,
         example: example !== undefined ? Number(example) : undefined,
         examples: examples === null || examples === void 0 ? void 0 : examples.map(Number),
+        value: props.value !== undefined ? Number(props.value) : undefined,
         values: values$1 && values.getArrayValues(values$1, Number),
     });
     if (schema) {

package/types.d.ts

@@ -63,6 +63,7 @@ export interface BaseSchemaProps<T> {
     description?: string;
     example?: T;
     examples?: T[];
+    nullable?: boolean;
     readOnly?: boolean;
     ref?: string;
     title?: string;
@@ -70,6 +71,6 @@ export interface BaseSchemaProps<T> {
 }
 export type SchemaValues<T> = (T extends (number | string) ? Record<T, string> : never) | T[];
 export interface ValuesSchemaProps<T> extends BaseSchemaProps<T> {
-    const?: T;
+    value?: T;
     values?: SchemaValues<T>;
 }

package/utils/generateTypes/generateTypes.es6.js

@@ -1,3 +1,12 @@
+function getElement(docs, target) {
+    var _a, _b, _c;
+    if (!target)
+        return target;
+    if ('$ref' in target) {
+        return (_c = (_b = (_a = docs.components) === null || _a === void 0 ? void 0 : _a.schemas) === null || _b === void 0 ? void 0 : _b[String(target.$ref).replace('#/components/schemas/', '')]) !== null && _c !== void 0 ? _c : target;
+    }
+    return target;
+}
 function hasDefault(target) {
     return Boolean(target && ('default' in target || 'x-default' in target));
 }
@@ -112,7 +121,7 @@ function generateTypes(docs, namespace = 'Api') {
                     query: '',
                 };
                 for (const param of parameters) {
-                    const splitter = param.in === 'path' || hasDefault(param.schema) || param.required ? ':' : '?:';
+                    const splitter = param.in === 'path' || hasDefault(getElement(docs, param.schema)) || param.required ? ':' : '?:';
                     params[param.in] += `        ${param.name}${splitter} ${generateSchemaTypes(param.schema)}`;
                 }
                 if (params.path) {

package/utils/generateTypes/generateTypes.js

@@ -2,6 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+function getElement(docs, target) {
+    var _a, _b, _c;
+    if (!target)
+        return target;
+    if ('$ref' in target) {
+        return (_c = (_b = (_a = docs.components) === null || _a === void 0 ? void 0 : _a.schemas) === null || _b === void 0 ? void 0 : _b[String(target.$ref).replace('#/components/schemas/', '')]) !== null && _c !== void 0 ? _c : target;
+    }
+    return target;
+}
 function hasDefault(target) {
     return Boolean(target && ('default' in target || 'x-default' in target));
 }
@@ -116,7 +125,7 @@ function generateTypes(docs, namespace = 'Api') {
                     query: '',
                 };
                 for (const param of parameters) {
-                    const splitter = param.in === 'path' || hasDefault(param.schema) || param.required ? ':' : '?:';
+                    const splitter = param.in === 'path' || hasDefault(getElement(docs, param.schema)) || param.required ? ':' : '?:';
                     params[param.in] += `        ${param.name}${splitter} ${generateSchemaTypes(param.schema)}`;
                 }
                 if (params.path) {