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

package/plugins/request/error/error.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
@@ -9,68 +10,70 @@ var useResponse = require('../../../hooks/useResponse/useResponse.js');
 var JSONString = require('../../../utils/JSONString/JSONString.js');
 
 const errorStatuses = {
+    aTimeoutOccurred: 524,
+    authenticationTimeout: 419,
+    badGateway: 502,
     badRequest: 400,
-    unauthorized: 401,
-    paymentRequired: 402,
-    forbidden: 403,
-    notFound: 404,
-    methodNotAllowed: 405,
-    notAcceptable: 406,
-    proxyAuthenticationRequired: 407,
-    requestTimeout: 408,
+    bandwidthLimitExceeded: 509,
+    clientClosedRequest: 499,
     conflict: 409,
-    gone: 410,
-    lengthRequired: 411,
-    preconditionFailed: 412,
-    payloadTooLarge: 413,
-    URITooLong: 414,
-    unsupportedMediaType: 415,
-    rangeNotSatisfiable: 416,
+    connectionTimedOut: 522,
     expectationFailed: 417,
-    imATeapot: 418,
-    authenticationTimeout: 419,
-    misdirectedRequest: 421,
-    unprocessableEntity: 422,
-    locked: 423,
     failedDependency: 424,
-    tooEarly: 425,
-    upgradeRequired: 426,
-    preconditionRequired: 428,
-    tooManyRequests: 429,
-    requestHeaderFieldsTooLarge: 431,
-    retryWith: 449,
-    unavailableForLegalReasons: 451,
-    clientClosedRequest: 499,
-    internalServerError: 500,
-    notImplemented: 501,
-    badGateway: 502,
-    serviceUnavailable: 503,
+    forbidden: 403,
     gatewayTimeout: 504,
+    gone: 410,
     HTTPVersionNotSupported: 505,
-    variantAlsoNegotiates: 506,
+    imATeapot: 418,
     insufficientStorage: 507,
+    internalServerError: 500,
+    invalidSSLCertificate: 526,
+    lengthRequired: 411,
+    locked: 423,
     loopDetected: 508,
-    bandwidthLimitExceeded: 509,
-    notExtended: 510,
+    methodNotAllowed: 405,
+    misdirectedRequest: 421,
     networkAuthenticationRequired: 511,
-    unknownError: 520,
-    webServerIsDown: 521,
-    connectionTimedOut: 522,
+    notAcceptable: 406,
+    notExtended: 510,
+    notFound: 404,
+    notImplemented: 501,
     originIsUnreachable: 523,
-    aTimeoutOccurred: 524,
+    payloadTooLarge: 413,
+    paymentRequired: 402,
+    preconditionFailed: 412,
+    preconditionRequired: 428,
+    proxyAuthenticationRequired: 407,
+    rangeNotSatisfiable: 416,
+    requestHeaderFieldsTooLarge: 431,
+    requestTimeout: 408,
+    retryWith: 449,
+    serviceUnavailable: 503,
     SSLHandshakeFailed: 525,
-    invalidSSLCertificate: 526,
+    tooEarly: 425,
+    tooManyRequests: 429,
+    unauthorized: 401,
+    unavailableForLegalReasons: 451,
+    unknownError: 520,
+    unprocessableEntity: 422,
+    unsupportedMediaType: 415,
+    upgradeRequired: 426,
+    URITooLong: 414,
+    variantAlsoNegotiates: 506,
+    webServerIsDown: 521,
 };
 const error = () => {
-    const [children] = (jsx.useChildren()) || [];
-    const props = jsx.useProps();
+    const _a = jsx.useProps(), { children } = _a, props = tslib.__rest(_a, ["children"]);
     const res = useResponse.useResponse();
     if (!res) {
         throw Error('<error> MUST be in <request>');
     }
-    const { status = 520, code = 'undefined' } = props || {};
+    const { code = 'undefined', status = 520, } = props;
     res.statusCode = typeof status === 'string' ? errorStatuses[status] : status;
-    res.write(JSONString.JSONString({ error: code, data: children }));
+    const content = JSONString.JSONString({ data: children, error: code });
+    res.setHeader('Content-Type', 'application/json');
+    res.setHeader('Content-Length', content.length);
+    res.write(content);
     res.end();
 };
 

package/plugins/request/file/file.d.ts

@@ -1,4 +1,5 @@
 export interface FileProps {
+    children?: any;
     path: string;
 }
 export declare function file(): void;

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

@@ -1,5 +1,6 @@
+import { __rest } from 'tslib';
 import innet, { useHandler } from 'innet';
-import { useProps, useChildren } from '@innet/jsx';
+import { useProps } from '@innet/jsx';
 import fs from 'node:fs';
 import mime from 'mime';
 import '../../../hooks/index.es6.js';
@@ -8,8 +9,7 @@ import { useThrow } from '../../../hooks/useThrow/useThrow.es6.js';
 
 function file() {
     const handler = useHandler();
-    const props = useProps();
-    const children = useChildren();
+    const _a = useProps(), { children } = _a, props = __rest(_a, ["children"]);
     const res = useResponse();
     if (!res) {
         useThrow('<{type}> MUST be in <request> or <fallback>');
@@ -28,11 +28,10 @@ function file() {
             }
             res.writeHead(200, headers);
             readStream.pipe(res);
+            return;
         }
     }
-    else {
-        innet(children, handler);
-    }
+    innet(children, handler);
 }
 
 export { file };

package/plugins/request/file/file.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var innet = require('innet');
 var jsx = require('@innet/jsx');
 var fs = require('node:fs');
@@ -18,8 +19,7 @@ var mime__default = /*#__PURE__*/_interopDefaultLegacy(mime);
 
 function file() {
     const handler = innet.useHandler();
-    const props = jsx.useProps();
-    const children = jsx.useChildren();
+    const _a = jsx.useProps(), { children } = _a, props = tslib.__rest(_a, ["children"]);
     const res = useResponse.useResponse();
     if (!res) {
         useThrow.useThrow('<{type}> MUST be in <request> or <fallback>');
@@ -38,11 +38,10 @@ function file() {
             }
             res.writeHead(200, headers);
             readStream.pipe(res);
+            return;
         }
     }
-    else {
-        innet__default["default"](children, handler);
-    }
+    innet__default["default"](children, handler);
 }
 
 exports.file = file;

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

@@ -8,7 +8,7 @@ const header = () => {
     if (!res) {
         useThrow('<{type}> MUST be in <request> or <fallback>');
     }
-    const { key, value } = useProps();
+    const { key, value, } = useProps();
     res.setHeader(key, value);
 };
 

package/plugins/request/header/header.js

@@ -12,7 +12,7 @@ const header = () => {
     if (!res) {
         useThrow.useThrow('<{type}> MUST be in <request> or <fallback>');
     }
-    const { key, value } = jsx.useProps();
+    const { key, value, } = jsx.useProps();
     res.setHeader(key, value);
 };
 

package/plugins/request/proxy/proxy.d.ts

@@ -1,6 +1,9 @@
+/// <reference types="node" />
 import { type HandlerPlugin } from 'innet';
+import { type IncomingMessage } from 'http';
 export interface ProxyProps {
-    to: string;
+    onProxyRes?: (res: IncomingMessage) => void;
     secure?: boolean;
+    to: string;
 }
 export declare const proxy: HandlerPlugin;

package/plugins/request/proxy/proxy.es6.js

@@ -6,7 +6,7 @@ import { useResponse } from '../../../hooks/useResponse/useResponse.es6.js';
 import { useThrow } from '../../../hooks/useThrow/useThrow.es6.js';
 
 const proxy = () => {
-    const { to, secure } = useProps();
+    const { onProxyRes, secure = false, to, } = useProps();
     const req = useRequest();
     const res = useResponse();
     if (!req || !res) {
@@ -14,7 +14,10 @@ const proxy = () => {
     }
     const proxyServer = httpProxy.createProxyServer({});
     delete req.headers.host;
-    proxyServer.web(req, res, { target: to, secure });
+    if (onProxyRes) {
+        proxyServer.on('proxyRes', onProxyRes);
+    }
+    proxyServer.web(req, res, { secure, target: to });
 };
 
 export { proxy };

package/plugins/request/proxy/proxy.js

@@ -14,7 +14,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var httpProxy__default = /*#__PURE__*/_interopDefaultLegacy(httpProxy);
 
 const proxy = () => {
-    const { to, secure } = jsx.useProps();
+    const { onProxyRes, secure = false, to, } = jsx.useProps();
     const req = useRequest.useRequest();
     const res = useResponse.useResponse();
     if (!req || !res) {
@@ -22,7 +22,10 @@ const proxy = () => {
     }
     const proxyServer = httpProxy__default["default"].createProxyServer({});
     delete req.headers.host;
-    proxyServer.web(req, res, { target: to, secure });
+    if (onProxyRes) {
+        proxyServer.on('proxyRes', onProxyRes);
+    }
+    proxyServer.web(req, res, { secure, target: to });
 };
 
 exports.proxy = proxy;

package/plugins/request/redirect/redirect.d.ts

@@ -1,17 +1,18 @@
 import { type HandlerPlugin } from 'innet';
 export declare const redirectStatuses: {
-    multipleChoices: number;
-    movedPermanently: number;
     found: number;
-    seeOther: number;
+    movedPermanently: number;
+    multipleChoices: number;
     notModified: number;
-    useProxy: number;
-    temporaryRedirect: number;
     permanentRedirect: number;
+    seeOther: number;
+    temporaryRedirect: number;
+    useProxy: number;
 };
+export type RedirectStatuses = keyof typeof redirectStatuses;
 export interface RedirectProps {
-    to: string;
     encode?: boolean;
-    status?: number | keyof typeof redirectStatuses;
+    status?: RedirectStatuses | number;
+    to: string;
 }
 export declare const redirect: HandlerPlugin;

package/plugins/request/redirect/redirect.es6.js

@@ -4,14 +4,14 @@ import { useResponse } from '../../../hooks/useResponse/useResponse.es6.js';
 import { useHeaders } from '../../../hooks/useHeaders/useHeaders.es6.js';
 
 const redirectStatuses = {
-    multipleChoices: 300,
-    movedPermanently: 301,
     found: 302,
-    seeOther: 303,
+    movedPermanently: 301,
+    multipleChoices: 300,
     notModified: 304,
-    useProxy: 305,
-    temporaryRedirect: 307,
     permanentRedirect: 308,
+    seeOther: 303,
+    temporaryRedirect: 307,
+    useProxy: 305,
 };
 function getStatus(status) {
     if (typeof status === 'number')
@@ -30,10 +30,10 @@ const redirect = () => {
     }
     const headers = useHeaders();
     const props = useProps();
-    const { to, status = 301, encode } = props;
+    const { encode, status = 301, to, } = props;
     res.writeHead(getStatus(status), {
-        location: encode ? customEncode(to) : to,
         'Cache-Control': (_a = headers['Cache-Control']) !== null && _a !== void 0 ? _a : 'no-cache, no-store, must-revalidate',
+        location: encode ? customEncode(to) : to,
     });
     res.end();
 };

package/plugins/request/redirect/redirect.js

@@ -8,14 +8,14 @@ var useResponse = require('../../../hooks/useResponse/useResponse.js');
 var useHeaders = require('../../../hooks/useHeaders/useHeaders.js');
 
 const redirectStatuses = {
-    multipleChoices: 300,
-    movedPermanently: 301,
     found: 302,
-    seeOther: 303,
+    movedPermanently: 301,
+    multipleChoices: 300,
     notModified: 304,
-    useProxy: 305,
-    temporaryRedirect: 307,
     permanentRedirect: 308,
+    seeOther: 303,
+    temporaryRedirect: 307,
+    useProxy: 305,
 };
 function getStatus(status) {
     if (typeof status === 'number')
@@ -34,10 +34,10 @@ const redirect = () => {
     }
     const headers = useHeaders.useHeaders();
     const props = jsx.useProps();
-    const { to, status = 301, encode } = props;
+    const { encode, status = 301, to, } = props;
     res.writeHead(getStatus(status), {
-        location: encode ? customEncode(to) : to,
         'Cache-Control': (_a = headers['Cache-Control']) !== null && _a !== void 0 ? _a : 'no-cache, no-store, must-revalidate',
+        location: encode ? customEncode(to) : to,
     });
     res.end();
 };

package/plugins/request/success/success.d.ts

@@ -1,17 +1,19 @@
 import { type HandlerPlugin } from 'innet';
 export declare const successStatuses: {
-    readonly ok: 200;
-    readonly created: 201;
     readonly accepted: 202;
-    readonly outside: 203;
+    readonly alreadyReported: 208;
+    readonly created: 201;
+    readonly multiStatus: 207;
     readonly noContent: 204;
-    readonly resetContent: 205;
+    readonly ok: 200;
+    readonly outside: 203;
     readonly partialContent: 206;
-    readonly multiStatus: 207;
-    readonly alreadyReported: 208;
+    readonly resetContent: 205;
 };
 export type SuccessStatuses = keyof typeof successStatuses;
 export interface SuccessProps {
+    children?: any;
     status?: SuccessStatuses | number;
+    type?: string;
 }
 export declare const success: HandlerPlugin;

package/plugins/request/success/success.es6.js

@@ -1,31 +1,41 @@
-import { useChildren, useProps } from '@innet/jsx';
+import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
 import { useResponse } from '../../../hooks/useResponse/useResponse.es6.js';
 import { JSONString } from '../../../utils/JSONString/JSONString.es6.js';
 
 const successStatuses = {
-    ok: 200,
-    created: 201,
     accepted: 202,
-    outside: 203,
+    alreadyReported: 208,
+    created: 201,
+    multiStatus: 207,
     noContent: 204,
-    resetContent: 205,
+    ok: 200,
+    outside: 203,
     partialContent: 206,
-    multiStatus: 207,
-    alreadyReported: 208,
+    resetContent: 205,
 };
 const success = () => {
-    const children = useChildren();
-    const props = useProps();
+    const { children, status, type, } = useProps();
     const res = useResponse();
-    const status = props === null || props === void 0 ? void 0 : props.status;
     if (!res) {
         throw Error('<success> MUST be in <request>');
     }
     res.statusCode = typeof status === 'string' ? successStatuses[status] : status !== null && status !== void 0 ? status : ((children) ? 200 : 204);
     if (children) {
-        res.write(JSONString(children[0]));
+        const child = children;
+        const contentType = type || (['bigint', 'boolean', 'number', 'string'].includes(typeof child)
+            ? 'text/plain'
+            : 'application/json');
+        const content = contentType === 'application/json' ? JSONString(child) : String(child);
+        res.setHeader('Content-Type', contentType);
+        res.setHeader('Content-Length', content.length);
+        if (contentType === 'application/json') {
+            res.write(JSONString(child));
+        }
+        else {
+            res.write(String(child));
+        }
     }
     res.end();
 };

package/plugins/request/success/success.js

@@ -9,27 +9,37 @@ var useResponse = require('../../../hooks/useResponse/useResponse.js');
 var JSONString = require('../../../utils/JSONString/JSONString.js');
 
 const successStatuses = {
-    ok: 200,
-    created: 201,
     accepted: 202,
-    outside: 203,
+    alreadyReported: 208,
+    created: 201,
+    multiStatus: 207,
     noContent: 204,
-    resetContent: 205,
+    ok: 200,
+    outside: 203,
     partialContent: 206,
-    multiStatus: 207,
-    alreadyReported: 208,
+    resetContent: 205,
 };
 const success = () => {
-    const children = jsx.useChildren();
-    const props = jsx.useProps();
+    const { children, status, type, } = jsx.useProps();
     const res = useResponse.useResponse();
-    const status = props === null || props === void 0 ? void 0 : props.status;
     if (!res) {
         throw Error('<success> MUST be in <request>');
     }
     res.statusCode = typeof status === 'string' ? successStatuses[status] : status !== null && status !== void 0 ? status : ((children) ? 200 : 204);
     if (children) {
-        res.write(JSONString.JSONString(children[0]));
+        const child = children;
+        const contentType = type || (['bigint', 'boolean', 'number', 'string'].includes(typeof child)
+            ? 'text/plain'
+            : 'application/json');
+        const content = contentType === 'application/json' ? JSONString.JSONString(child) : String(child);
+        res.setHeader('Content-Type', contentType);
+        res.setHeader('Content-Length', content.length);
+        if (contentType === 'application/json') {
+            res.write(JSONString.JSONString(child));
+        }
+        else {
+            res.write(String(child));
+        }
     }
     res.end();
 };

package/plugins/schema/any/any.d.ts

@@ -0,0 +1,5 @@
+import { type HandlerPlugin } from 'innet';
+import { type BaseSchemaProps } from '../../../types';
+export interface AnyProps extends BaseSchemaProps<any> {
+}
+export declare const any: HandlerPlugin;

package/plugins/schema/any/any.es6.js

@@ -0,0 +1,27 @@
+import { useProps } from '@innet/jsx';
+import '../../../hooks/index.es6.js';
+import '../../../hooks/useParentRule/index.es6.js';
+import '../../../utils/index.es6.js';
+import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
+import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
+import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
+import { useRule } from '../../../hooks/useRule/useRule.es6.js';
+import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
+
+const any = () => {
+    const props = useProps();
+    useSchemaType('any', props);
+    const rules = [];
+    if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
+        rules.push(defaultTo(props.default));
+    }
+    if ((props === null || props === void 0 ? void 0 : props.default) === undefined) {
+        const parentRule = useParentRule();
+        useRule(parentRule(pipe(...rules)));
+    }
+    else {
+        useRule(pipe(...rules));
+    }
+};
+
+export { any };

package/plugins/schema/any/any.js

@@ -0,0 +1,31 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsx = require('@innet/jsx');
+require('../../../hooks/index.js');
+require('../../../hooks/useParentRule/index.js');
+require('../../../utils/index.js');
+var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
+var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
+var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
+var useRule = require('../../../hooks/useRule/useRule.js');
+var pipe = require('../../../utils/rules/pipe/pipe.js');
+
+const any = () => {
+    const props = jsx.useProps();
+    useSchemaType.useSchemaType('any', props);
+    const rules = [];
+    if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
+        rules.push(defaultTo.defaultTo(props.default));
+    }
+    if ((props === null || props === void 0 ? void 0 : props.default) === undefined) {
+        const parentRule = useParentRule.useParentRule();
+        useRule.useRule(parentRule(pipe.pipe(...rules)));
+    }
+    else {
+        useRule.useRule(pipe.pipe(...rules));
+    }
+};
+
+exports.any = any;

package/plugins/schema/array/array.d.ts

@@ -1,5 +1,6 @@
 import { type HandlerPlugin } from 'innet';
 import { type BaseSchemaProps } from '../../../types';
 export interface ArrayProps extends BaseSchemaProps<any[]> {
+    children?: any;
 }
 export declare const array: HandlerPlugin;

package/plugins/schema/array/array.es6.js

@@ -1,5 +1,6 @@
+import { __rest } from 'tslib';
 import innet, { useNewHandler } from 'innet';
-import { useContext, useProps, useChildren } from '@innet/jsx';
+import { useContext, useProps } from '@innet/jsx';
 import { callHandler } from '@innet/utils';
 import '../../../hooks/index.es6.js';
 import '../../../hooks/useParentRule/index.es6.js';
@@ -18,9 +19,8 @@ const array = () => {
     useBlock('path');
     const setRule = useContext(ruleContext);
     const handler = useNewHandler();
-    const props = useProps();
+    const _a = useProps(), { children } = _a, props = __rest(_a, ["children"]);
     const schema = useSchemaType('array', props);
-    const children = useChildren();
     const fieldSchema = {};
     handler[schemaContext.key] = fieldSchema;
     schema.items = fieldSchema;

package/plugins/schema/array/array.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var innet = require('innet');
 var jsx = require('@innet/jsx');
 var utils = require('@innet/utils');
@@ -26,9 +27,8 @@ const array = () => {
     useBlock.useBlock('path');
     const setRule = jsx.useContext(useRule.ruleContext);
     const handler = innet.useNewHandler();
-    const props = jsx.useProps();
+    const _a = jsx.useProps(), { children } = _a, props = tslib.__rest(_a, ["children"]);
     const schema = useSchemaType.useSchemaType('array', props);
-    const children = jsx.useChildren();
     const fieldSchema = {};
     handler[useSchemaContext.schemaContext.key] = fieldSchema;
     schema.items = fieldSchema;

package/plugins/schema/binary/binary.d.ts

@@ -1,9 +1,9 @@
 import { type HandlerPlugin } from 'innet';
 export interface BinaryProps {
-    ref?: string;
-    description?: string;
     accept?: string;
-    min?: number;
+    description?: string;
     max?: number;
+    min?: number;
+    ref?: string;
 }
 export declare const binary: HandlerPlugin;

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

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

package/plugins/schema/date/date.es6.js

@@ -16,7 +16,7 @@ import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 
 const date = () => {
-    const _a = useProps() || {}, { min, max, default: defaultValue, example, examples, values: values$1 } = _a, props = __rest(_a, ["min", "max", "default", "example", "examples", "values"]);
+    const _a = useProps() || {}, { default: defaultValue, example, examples, max, min, values: values$1 } = _a, props = __rest(_a, ["default", "example", "examples", "max", "min", "values"]);
     const normMin = dateFormat(min);
     const normMax = dateFormat(max);
     const normDefault = dateFormat(defaultValue);
@@ -25,9 +25,9 @@ const date = () => {
     // @ts-expect-error: FIXME
     const stringValues = normValues === null || normValues === void 0 ? void 0 : normValues.map(value => value.toISOString());
     const normExamples = examples === null || examples === void 0 ? void 0 : examples.map(dateFormat);
-    const schema = useSchemaType('string', Object.assign(Object.assign({}, props), { values: stringValues, example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(), 
+    const schema = useSchemaType('string', Object.assign(Object.assign({}, props), { default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString(), example: normExample === null || normExample === void 0 ? void 0 : normExample.toISOString(), 
         // @ts-expect-error: FIXME
-        examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()), default: defaultValue === 'now' ? undefined : normDefault === null || normDefault === void 0 ? void 0 : normDefault.toISOString() }));
+        examples: normExamples === null || normExamples === void 0 ? void 0 : normExamples.map(example => example.toISOString()), values: stringValues }));
     const rules = [];
     if (defaultValue !== undefined) {
         rules.push(defaultTo(defaultValue === 'now' ? () => new Date(Date.now()) : normDefault));