@innet/server 2.0.0-alpha.9 → 2.0.0-beta.10

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

@@ -1,37 +1,53 @@
-import innet, { useNewHandler } from 'innet';
-import { useProps, useChildren, useContext } from '@innet/jsx';
+import { useNewHandler, innet } from 'innet';
+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 = {
+    ...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': {
+    };
+    if (schema) {
+        response.content = {
+            ...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 +57,4 @@ const response = () => {
     innet(children, handler);
 };
 
-export { response };
+export { response, statuses };

package/plugins/main/response/response.js

@@ -6,47 +6,60 @@ 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');
 var getOrAdd = require('../../../utils/getOrAdd/getOrAdd.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
-
+const statuses = {
+    ...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': {
+    };
+    if (schema) {
+        response.content = {
+            ...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', [{}, {}]);
     useRule.ruleContext.set(handler, rule => {
         rules.response = rule;
     });
-    innet__default["default"](children, handler);
+    innet.innet(children, handler);
 };
 
 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,13 @@
-/// <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;

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

@@ -1,24 +1,30 @@
-import innet, { useNewHandler, useApp } from 'innet';
+import { useNewHandler, innet } from 'innet';
+import { useProps } from '@innet/jsx';
 import fs from 'node:fs';
 import http from 'node:http';
 import http2 from 'node:https';
 import { onDestroy } from 'watch-state';
 import '../../../hooks/index.es6.js';
+import '../../../utils/index.es6.js';
 import { serverContext } from '../../../hooks/useServer/useServer.es6.js';
+import { serverPlugins } from '../../../hooks/useServerPlugins/useServerPlugins.es6.js';
+import { serverPortContext } from '../../../hooks/useServerPort/useServerPort.es6.js';
+import { serverHttpsContext } from '../../../hooks/useIsServerHttps/useIsServerHttps.es6.js';
+import { Action } from '../../../utils/action/Action.es6.js';
+import { actionContext } from '../../../hooks/useAction/useAction.es6.js';
+import { requestHandlerContext } from '../../../hooks/useRequestHandler/useRequestHandler.es6.js';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const isInvalidPath = require('is-invalid-path');
 const server = () => {
     var _a, _b, _c;
     const handler = useNewHandler();
-    const { props = {}, children } = useApp();
+    const props = useProps();
     const { env } = process;
-    let { ssl: { key = (_a = env.SSL_KEY) !== null && _a !== void 0 ? _a : 'localhost.key', cert = (_b = env.SSL_CRT) !== null && _b !== void 0 ? _b : 'localhost.crt', } = {}, } = props;
+    let { ssl: { cert = (_a = env.INNET_SSL_CRT) !== null && _a !== void 0 ? _a : 'localhost.crt', key = (_b = env.INNET_SSL_KEY) !== null && _b !== void 0 ? _b : 'localhost.key', } = {}, } = props;
     try {
-        if (!isInvalidPath(key)) {
+        if (!key.startsWith('-----BEGIN PRIVATE KEY-----')) {
             key = fs.readFileSync(key).toString();
         }
-        if (!isInvalidPath(cert)) {
+        if (!cert.startsWith('-----BEGIN CERTIFICATE-----')) {
             cert = fs.readFileSync(cert).toString();
         }
     }
@@ -27,23 +33,41 @@ const server = () => {
         cert = '';
     }
     const https = Boolean(key && cert);
-    const { port = Number((_c = env.PORT) !== null && _c !== void 0 ? _c : (https ? 442 : 80)), onStart, onError, onRequest, } = props;
-    const server = https ? http2.createServer({ key, cert }) : http.createServer();
-    handler[serverContext.key] = { server, port };
+    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 });
+    serverPlugins.set(handler, plugins);
+    serverPortContext.set(handler, port);
+    serverHttpsContext.set(handler, https);
     onDestroy(() => {
-        var _a;
-        (_a = props.onDestroy) === null || _a === void 0 ? void 0 : _a.call(props);
         server.close();
     });
     if (onError) {
         server.on('error', onError);
     }
-    if (onRequest) {
-        server.on('request', onRequest);
+    if (onClose) {
+        server.addListener('close', onClose);
     }
-    innet(children, handler);
+    server.on('request', (req, res) => {
+        onRequest === null || onRequest === void 0 ? void 0 : onRequest(req, res);
+        const action = new Action(req, res);
+        const requestHandler = Object.create(handler);
+        actionContext.set(requestHandler, action);
+        requestHandlerContext.set(requestHandler, requestHandler);
+        async function server() {
+            for (const plugin of plugins) {
+                const result = await plugin();
+                if (result !== undefined) {
+                    return result;
+                }
+            }
+        }
+        innet({ props, type: server }, requestHandler);
+    });
+    innet(props.children, handler);
     server.listen(port, () => {
-        onStart === null || onStart === void 0 ? void 0 : onStart({ port, https });
+        onStart === null || onStart === void 0 ? void 0 : onStart({ https, port });
     });
 };
 

package/plugins/main/server/server.js

@@ -3,33 +3,38 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var innet = require('innet');
+var jsx = require('@innet/jsx');
 var fs = require('node:fs');
 var http = require('node:http');
 var http2 = require('node:https');
 var watchState = require('watch-state');
 require('../../../hooks/index.js');
+require('../../../utils/index.js');
 var useServer = require('../../../hooks/useServer/useServer.js');
+var useServerPlugins = require('../../../hooks/useServerPlugins/useServerPlugins.js');
+var useServerPort = require('../../../hooks/useServerPort/useServerPort.js');
+var useIsServerHttps = require('../../../hooks/useIsServerHttps/useIsServerHttps.js');
+var Action = require('../../../utils/action/Action.js');
+var useAction = require('../../../hooks/useAction/useAction.js');
+var useRequestHandler = require('../../../hooks/useRequestHandler/useRequestHandler.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var http2__default = /*#__PURE__*/_interopDefaultLegacy(http2);
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const isInvalidPath = require('is-invalid-path');
 const server = () => {
     var _a, _b, _c;
     const handler = innet.useNewHandler();
-    const { props = {}, children } = innet.useApp();
+    const props = jsx.useProps();
     const { env } = process;
-    let { ssl: { key = (_a = env.SSL_KEY) !== null && _a !== void 0 ? _a : 'localhost.key', cert = (_b = env.SSL_CRT) !== null && _b !== void 0 ? _b : 'localhost.crt', } = {}, } = props;
+    let { ssl: { cert = (_a = env.INNET_SSL_CRT) !== null && _a !== void 0 ? _a : 'localhost.crt', key = (_b = env.INNET_SSL_KEY) !== null && _b !== void 0 ? _b : 'localhost.key', } = {}, } = props;
     try {
-        if (!isInvalidPath(key)) {
+        if (!key.startsWith('-----BEGIN PRIVATE KEY-----')) {
             key = fs__default["default"].readFileSync(key).toString();
         }
-        if (!isInvalidPath(cert)) {
+        if (!cert.startsWith('-----BEGIN CERTIFICATE-----')) {
             cert = fs__default["default"].readFileSync(cert).toString();
         }
     }
@@ -38,23 +43,41 @@ const server = () => {
         cert = '';
     }
     const https = Boolean(key && cert);
-    const { port = Number((_c = env.PORT) !== null && _c !== void 0 ? _c : (https ? 442 : 80)), onStart, onError, onRequest, } = props;
-    const server = https ? http2__default["default"].createServer({ key, cert }) : http__default["default"].createServer();
-    handler[useServer.serverContext.key] = { server, port };
+    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 });
+    useServerPlugins.serverPlugins.set(handler, plugins);
+    useServerPort.serverPortContext.set(handler, port);
+    useIsServerHttps.serverHttpsContext.set(handler, https);
     watchState.onDestroy(() => {
-        var _a;
-        (_a = props.onDestroy) === null || _a === void 0 ? void 0 : _a.call(props);
         server.close();
     });
     if (onError) {
         server.on('error', onError);
     }
-    if (onRequest) {
-        server.on('request', onRequest);
+    if (onClose) {
+        server.addListener('close', onClose);
     }
-    innet__default["default"](children, handler);
+    server.on('request', (req, res) => {
+        onRequest === null || onRequest === void 0 ? void 0 : onRequest(req, res);
+        const action = new Action.Action(req, res);
+        const requestHandler = Object.create(handler);
+        useAction.actionContext.set(requestHandler, action);
+        useRequestHandler.requestHandlerContext.set(requestHandler, requestHandler);
+        async function server() {
+            for (const plugin of plugins) {
+                const result = await plugin();
+                if (result !== undefined) {
+                    return result;
+                }
+            }
+        }
+        innet.innet({ props, type: server }, requestHandler);
+    });
+    innet.innet(props.children, handler);
     server.listen(port, () => {
-        onStart === null || onStart === void 0 ? void 0 : onStart({ port, https });
+        onStart === null || onStart === void 0 ? void 0 : onStart({ https, port });
     });
 };
 

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

@@ -1 +1 @@
-export { tag } from './tag.es6.js';
+export { TAG_GROUP_NAME, tag } from './tag.es6.js';

package/plugins/main/tag/index.js

@@ -6,4 +6,5 @@ var tag = require('./tag.js');
 
 
 
+exports.TAG_GROUP_NAME = tag.TAG_GROUP_NAME;
 exports.tag = tag.tag;

package/plugins/main/tag/tag.d.ts

@@ -1,11 +1,19 @@
 import { type HandlerPlugin } from 'innet';
-export interface TagProps {
-    /** The name of the tag. */
+export interface TagGroup {
     name: string;
+    tags: string[];
+}
+export declare const TAG_GROUP_NAME = "x-tagGroups";
+export interface TagProps {
+    children?: any;
     /**
      * A description for the tag.
      * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
      * */
     description?: string;
+    /** A name of the tag group. */
+    group?: string;
+    /** A name of the tag. */
+    name: string;
 }
 export declare const tag: HandlerPlugin;

package/plugins/main/tag/tag.es6.js

@@ -1,17 +1,20 @@
-import innet, { useNewHandler } from 'innet';
-import { useContext, useProps, useChildren } from '@innet/jsx';
+import { useNewHandler, innet } from 'innet';
+import { useContext, useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import { tagContext } from '../../../hooks/useTag/useTag.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';
 
+const TAG_GROUP_NAME = 'x-tagGroups';
 const tag = () => {
     if (useContext(tagContext)) {
         throw Error('You cannot use a <tag> inside another one');
     }
-    const { name, description } = useProps();
-    const children = useChildren();
+    const { children, description, group, name, } = useProps();
     const { docs } = useApi();
-    const tag = description ? { name, description } : { name };
+    const tag = { name };
+    if (description) {
+        tag.description = description;
+    }
     if (!docs.tags) {
         docs.tags = [tag];
     }
@@ -21,9 +24,25 @@ const tag = () => {
     else {
         throw Error(`You cannot use two tags with the same name (${name})`);
     }
+    if (group) {
+        if (docs[TAG_GROUP_NAME]) {
+            const groups = docs[TAG_GROUP_NAME];
+            const tagGroup = groups.find(({ name }) => name === group);
+            if (tagGroup) {
+                tagGroup.tags.push(name);
+            }
+            else {
+                groups.push({ name: group, tags: [name] });
+            }
+        }
+        else {
+            // @ts-expect-error Custom field
+            docs[TAG_GROUP_NAME] = [{ name: group, tags: [name] }];
+        }
+    }
     const handler = useNewHandler();
     handler[tagContext.key] = tag;
     innet(children, handler);
 };
 
-export { tag };
+export { TAG_GROUP_NAME, tag };

package/plugins/main/tag/tag.js

@@ -8,18 +8,17 @@ require('../../../hooks/index.js');
 var useTag = require('../../../hooks/useTag/useTag.js');
 var useApi = require('../../../hooks/useApi/useApi.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
-
+const TAG_GROUP_NAME = 'x-tagGroups';
 const tag = () => {
     if (jsx.useContext(useTag.tagContext)) {
         throw Error('You cannot use a <tag> inside another one');
     }
-    const { name, description } = jsx.useProps();
-    const children = jsx.useChildren();
+    const { children, description, group, name, } = jsx.useProps();
     const { docs } = useApi.useApi();
-    const tag = description ? { name, description } : { name };
+    const tag = { name };
+    if (description) {
+        tag.description = description;
+    }
     if (!docs.tags) {
         docs.tags = [tag];
     }
@@ -29,9 +28,26 @@ const tag = () => {
     else {
         throw Error(`You cannot use two tags with the same name (${name})`);
     }
+    if (group) {
+        if (docs[TAG_GROUP_NAME]) {
+            const groups = docs[TAG_GROUP_NAME];
+            const tagGroup = groups.find(({ name }) => name === group);
+            if (tagGroup) {
+                tagGroup.tags.push(name);
+            }
+            else {
+                groups.push({ name: group, tags: [name] });
+            }
+        }
+        else {
+            // @ts-expect-error Custom field
+            docs[TAG_GROUP_NAME] = [{ name: group, tags: [name] }];
+        }
+    }
     const handler = innet.useNewHandler();
     handler[useTag.tagContext.key] = tag;
-    innet__default["default"](children, handler);
+    innet.innet(children, handler);
 };
 
+exports.TAG_GROUP_NAME = TAG_GROUP_NAME;
 exports.tag = tag;

package/plugins/main/variable/variable.d.ts

@@ -1,5 +1,10 @@
 import { type HandlerPlugin } from 'innet';
 export interface VariableProps {
+    /**
+     * An optional description for the server variable.
+     * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
+     * */
+    description?: string;
     /**
      * A server url parameter
      * */
@@ -15,10 +20,5 @@ export interface VariableProps {
      * The array MUST NOT be empty.
      * */
     values?: [string, string, ...string[]];
-    /**
-     * An optional description for the server variable.
-     * [CommonMark syntax](https://spec.commonmark.org) MAY be used for rich text representation.
-     * */
-    description?: string;
 }
 export declare const variable: HandlerPlugin;

package/plugins/main/variable/variable.es6.js

@@ -1,16 +1,17 @@
-import { __rest } from 'tslib';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import { useHost } from '../../../hooks/useHost/useHost.es6.js';
 
 const variable = () => {
     const { server } = useHost();
-    const _a = useProps(), { key, values, value = values === null || values === void 0 ? void 0 : values[0] } = _a, rest = __rest(_a, ["key", "values", "value"]);
+    const { key, values, 
+    // predefine
+    value = values === null || values === void 0 ? void 0 : values[0], ...rest } = useProps();
     if (!server.variables) {
         server.variables = {};
     }
     // @ts-expect-error: FIXME
-    server.variables[key] = Object.assign(Object.assign({}, rest), { default: value, enum: values });
+    server.variables[key] = { ...rest, default: value, enum: values };
 };
 
 export { variable };

package/plugins/main/variable/variable.js

@@ -2,19 +2,20 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 var useHost = require('../../../hooks/useHost/useHost.js');
 
 const variable = () => {
     const { server } = useHost.useHost();
-    const _a = jsx.useProps(), { key, values, value = values === null || values === void 0 ? void 0 : values[0] } = _a, rest = tslib.__rest(_a, ["key", "values", "value"]);
+    const { key, values, 
+    // predefine
+    value = values === null || values === void 0 ? void 0 : values[0], ...rest } = jsx.useProps();
     if (!server.variables) {
         server.variables = {};
     }
     // @ts-expect-error: FIXME
-    server.variables[key] = Object.assign(Object.assign({}, rest), { default: value, enum: values });
+    server.variables[key] = { ...rest, default: value, enum: values };
 };
 
 exports.variable = variable;

package/plugins/request/cms/cms.d.ts

@@ -1,4 +1,5 @@
 export interface CmsProps {
+    children?: any;
     dir?: string;
     prefix?: string;
 }

package/plugins/request/cms/cms.es6.js

@@ -1,5 +1,5 @@
-import innet, { useHandler } from 'innet';
-import { useProps, useChildren } from '@innet/jsx';
+import { useHandler, innet } from 'innet';
+import { useProps } from '@innet/jsx';
 import path from 'node:path';
 import '../file/index.es6.js';
 import '../../../hooks/index.es6.js';
@@ -7,8 +7,7 @@ import { usePath } from '../../../hooks/usePath/usePath.es6.js';
 import { file } from '../file/file.es6.js';
 
 function cms() {
-    const { prefix = '/', dir = '.' } = useProps() || {};
-    const children = useChildren();
+    const { children, dir = process.env.INNET_CMS_DIR || '.', prefix = process.env.INNET_CMS_PREFIX || '/', } = useProps();
     const handler = useHandler();
     let url = usePath();
     if (url.startsWith(prefix)) {
@@ -18,7 +17,7 @@ function cms() {
         return innet(children, handler);
     }
     const filePath = path.join(dir, url);
-    innet({ type: file, props: { path: filePath }, children }, handler);
+    innet({ children, props: { path: filePath }, type: file }, handler);
 }
 
 export { cms };