npm - @innet/server - Versions diffs - 2.0.0-alpha.16 → 2.0.0-alpha.18 - Mend

@innet/server 2.0.0-alpha.16 → 2.0.0-alpha.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (40) hide show

package/README.md +18 -15
package/hooks/index.d.ts +1 -0
package/hooks/index.es6.js +1 -0
package/hooks/index.js +1 -0
package/hooks/useObjectSchemaContext/index.d.ts +1 -0
package/hooks/useObjectSchemaContext/index.es6.js +1 -0
package/hooks/useObjectSchemaContext/index.js +10 -0
package/hooks/useObjectSchemaContext/useObjectSchemaContext.d.ts +3 -0
package/hooks/useObjectSchemaContext/useObjectSchemaContext.es6.js +14 -0
package/hooks/useObjectSchemaContext/useObjectSchemaContext.js +19 -0
package/index.es6.js +1 -0
package/index.js +3 -0
package/package.json +1 -1
package/plugins/main/api/api.es6.js +7 -8
package/plugins/main/api/api.js +7 -8
package/plugins/main/server/server.es6.js +2 -2
package/plugins/main/server/server.js +2 -2
package/plugins/main/tag/tag.es6.js +4 -1
package/plugins/main/tag/tag.js +4 -1
package/plugins/request/cms/cms.es6.js +1 -1
package/plugins/request/cms/cms.js +1 -1
package/plugins/schema/field/field.es6.js +3 -5
package/plugins/schema/field/field.js +2 -4
package/plugins/schema/object/object.es6.js +11 -4
package/plugins/schema/object/object.js +11 -4
package/plugins/utils/blacklist/blacklist.es6.js +1 -1
package/plugins/utils/blacklist/blacklist.js +1 -1
package/plugins/utils/dts/dts.es6.js +1 -1
package/plugins/utils/dts/dts.js +1 -1
package/plugins/utils/protection/protection.es6.js +1 -1
package/plugins/utils/protection/protection.js +1 -1
package/plugins/utils/swagger/swagger.es6.js +1 -1
package/plugins/utils/swagger/swagger.js +1 -1
package/plugins/utils/whitelist/whitelist.es6.js +1 -1
package/plugins/utils/whitelist/whitelist.js +1 -1
package/utils/generateTypes/generateTypes.es6.js +27 -6
package/utils/generateTypes/generateTypes.js +27 -6
package/utils/rules/objectOf/objectOf.d.ts +1 -1
package/utils/rules/objectOf/objectOf.es6.js +11 -1
package/utils/rules/objectOf/objectOf.js +11 -1

package/README.md CHANGED Viewed

@@ -160,8 +160,8 @@ export default (
 ```
 - By default, it uses port `80` for `http` and port `442` for `https`.
-- You can use `PORT` environment variable to set it up on CI level.
-- [innetjs](https://www.npmjs.com/package/innetjs) allows you to use `PORT` in `.env` file of local environment.
+- You can use `INNET_PORT` environment variable to set it up on CI level.
+- [innetjs](https://www.npmjs.com/package/innetjs) allows you to use `INNET_PORT` in `.env` file of local environment.
 #### ssl
@@ -179,8 +179,8 @@ export default (
 )
 ```
-- You can use `SSL_KEY` and `SSL_CRT` environment variables to set it up on CI level.
-- [innetjs](https://www.npmjs.com/package/innetjs) allows you to use `SSL_KEY` and `SSL_CRT` in `.env` file.
+- You can use `INNET_SSL_KEY` and `INNET_SSL_CRT` environment variables to set it up on CI level.
+- [innetjs](https://www.npmjs.com/package/innetjs) allows you to use `INNET_SSL_KEY` and `INNET_SSL_CRT` in `.env` file.
 - You can add `localhost.key` and `localhost.crt` files in your project folder.
 #### onStart
@@ -247,8 +247,8 @@ export default (
 [← back](#main)
-`<api>` element MUST be placed in `<server>` element.
 This element defines a REST API on the server.
+This element MUST be placed in [\<server>](#server) element.
 #### title
@@ -329,7 +329,7 @@ export default (
 )
 ```
-*default: 0.0.0*
+*default: `INNET_API_VERSION` || `'0.0.0'`*
 #### prefix
@@ -685,7 +685,7 @@ export default (
 #### ip
-`ip` prop sets black IPs. By default, it equals `BLACKLIST_IP` node environment variable.
+`ip` prop sets black IPs. By default, it equals `INNET_BLACKLIST_IP` node environment variable.
 You can split IPs by `,` char.
@@ -726,7 +726,7 @@ export default (
 #### ip
-`ip` prop sets white IPs. By default, it equals `WHITELIST_IP` node environment variable.
+`ip` prop sets white IPs. By default, it equals `INNET_WHITELIST_IP` node environment variable.
 You can split IPs by `,` char.
@@ -800,7 +800,7 @@ export default (
 This prop sets how much time protection is qualified.
 By default, the prop equals a year.
-You can use `PROTECTION_MAX_AGE` env to set default `maxAge`.
+You can use `INNET_PROTECTION_MAX_AGE` env to set default `maxAge`.
 *src/app.tsx*
 ```typescript jsx
@@ -824,7 +824,7 @@ export default (
 This prop sets a list of IP addresses (split by `,`) to ignore the protection.
-You can use `PROTECTED_IP` env to set default `excludeIp`.
+You can use `INNET_PROTECTED_IP` env to set default `excludeIp`.
 *src/app.tsx*
 ```typescript jsx
@@ -849,7 +849,7 @@ export default (
 This prop sets a cookie field name used to store protection of a user.
 By default, it equals `protection`.
-You can use `PROTECTION_COOKIE_KEY` env to set default `cookieKey`.
+You can use `INNET_PROTECTION_COOKIE_KEY` env to set default `cookieKey`.
 *src/app.tsx*
 ```typescript jsx
@@ -874,7 +874,7 @@ export default (
 This prop sets a search query field name used to check protection.
 By default, it equals `protection`.
-You can use `PROTECTION_SEARCH_KEY` env to set default `searchKey`.
+You can use `INNET_PROTECTION_SEARCH_KEY` env to set default `searchKey`.
 *src/app.tsx*
 ```typescript jsx
@@ -2908,7 +2908,9 @@ export default (
     <api>
       <endpoint method='post' path='/users'>
         <body>
-          <object />
+          <object>
+            <string />
+          </object>
         </body>
       </endpoint>
     </api>
@@ -2987,7 +2989,7 @@ The element MUST be placed inside [\<object>](#object).
 It defines a `field` of an `object` value for a parent element.
 `@innet/server` formats and validate the value automatically (real-time).
-`key` is REQUIRED prop of `<field>`, it defines a field name of the `<object>`.
+`key` is REQUIRED prop of `<field>`, it defines a field name of the [\<object>](#object).
 *src/app.tsx*
 ```typescript jsx
@@ -3378,7 +3380,7 @@ export default (
 #### dir
-By default, it looks at project folder.
+By default, it equals `INNET_CMS_DIR` node env variable or the project folder.
 If you try the previous example on [http://localhost/package.json](http://localhost/package.json)
 you get the project `package.json` file.
@@ -3401,6 +3403,7 @@ you get the index file in `src` folder.
 #### prefix
 `<cms>` matches full `path`, you should take it into account if you add `prefix` on `<api>`.
+By default, it equals `INNET_CMS_PREFIX` node env variable or `/`.
 *src/app.tsx*
 ```typescript jsx

package/hooks/index.d.ts CHANGED Viewed

@@ -26,3 +26,4 @@ export * from './usePath';
 export * from './useServerPlugin';
 export * from './useClientIp';
 export * from './useServerPlugins';
+export * from './useObjectSchemaContext';

package/hooks/index.es6.js CHANGED Viewed

@@ -26,3 +26,4 @@ import './usePath/index.es6.js';
 import './useServerPlugin/index.es6.js';
 import './useClientIp/index.es6.js';
 import './useServerPlugins/index.es6.js';
+import './useObjectSchemaContext/index.es6.js';

package/hooks/index.js CHANGED Viewed

@@ -28,4 +28,5 @@ require('./usePath/index.js');
 require('./useServerPlugin/index.js');
 require('./useClientIp/index.js');
 require('./useServerPlugins/index.js');
+require('./useObjectSchemaContext/index.js');

package/hooks/useObjectSchemaContext/index.d.ts ADDED Viewed

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

package/hooks/useObjectSchemaContext/index.es6.js ADDED Viewed

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

package/hooks/useObjectSchemaContext/index.js ADDED Viewed

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

package/hooks/useObjectSchemaContext/useObjectSchemaContext.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import { Context } from '@innet/jsx';
+export declare const objectSchemaContext: Context<import("openapi-types").OpenAPIV3_1.SchemaObject, import("openapi-types").OpenAPIV3_1.SchemaObject | undefined>;
+export declare function useObjectSchemaContext(): import("openapi-types").OpenAPIV3_1.SchemaObject;

package/hooks/useObjectSchemaContext/useObjectSchemaContext.es6.js ADDED Viewed

@@ -0,0 +1,14 @@
+import { Context, useContext } from '@innet/jsx';
+import '../useThrow/index.es6.js';
+import { useThrow } from '../useThrow/useThrow.es6.js';
+const objectSchemaContext = new Context();
+function useObjectSchemaContext() {
+    const schema = useContext(objectSchemaContext);
+    if (!schema) {
+        useThrow('Use <{type}> in <object>');
+    }
+    return schema;
+}
+export { objectSchemaContext, useObjectSchemaContext };

package/hooks/useObjectSchemaContext/useObjectSchemaContext.js ADDED Viewed

@@ -0,0 +1,19 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+var jsx = require('@innet/jsx');
+require('../useThrow/index.js');
+var useThrow = require('../useThrow/useThrow.js');
+const objectSchemaContext = new jsx.Context();
+function useObjectSchemaContext() {
+    const schema = jsx.useContext(objectSchemaContext);
+    if (!schema) {
+        useThrow.useThrow('Use <{type}> in <object>');
+    }
+    return schema;
+}
+exports.objectSchemaContext = objectSchemaContext;
+exports.useObjectSchemaContext = useObjectSchemaContext;

package/index.es6.js CHANGED Viewed

@@ -113,3 +113,4 @@ export { usePath } from './hooks/usePath/usePath.es6.js';
 export { useServerPlugin } from './hooks/useServerPlugin/useServerPlugin.es6.js';
 export { useClientIp } from './hooks/useClientIp/useClientIp.es6.js';
 export { serverPlugins, useServerPlugins } from './hooks/useServerPlugins/useServerPlugins.es6.js';
+export { objectSchemaContext, useObjectSchemaContext } from './hooks/useObjectSchemaContext/useObjectSchemaContext.es6.js';

package/index.js CHANGED Viewed

@@ -117,6 +117,7 @@ var usePath = require('./hooks/usePath/usePath.js');
 var useServerPlugin = require('./hooks/useServerPlugin/useServerPlugin.js');
 var useClientIp = require('./hooks/useClientIp/useClientIp.js');
 var useServerPlugins = require('./hooks/useServerPlugins/useServerPlugins.js');
+var useObjectSchemaContext = require('./hooks/useObjectSchemaContext/useObjectSchemaContext.js');
@@ -258,3 +259,5 @@ exports.useServerPlugin = useServerPlugin.useServerPlugin;
 exports.useClientIp = useClientIp.useClientIp;
 exports.serverPlugins = useServerPlugins.serverPlugins;
 exports.useServerPlugins = useServerPlugins.useServerPlugins;
+exports.objectSchemaContext = useObjectSchemaContext.objectSchemaContext;
+exports.useObjectSchemaContext = useObjectSchemaContext.useObjectSchemaContext;

package/package.json CHANGED Viewed

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

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

@@ -12,11 +12,10 @@ import { RulesError } from '../../../utils/rules/helpers.es6.js';
 import { paramsContext } from '../../../hooks/useParams/useParams.es6.js';
 const api = () => {
-    var _a;
     const handler = useNewHandler();
     const { props = {}, children } = useApp();
-    const { prefix = '', title = '', include, exclude } = props, rest = __rest(props, ["prefix", "title", "include", "exclude"]);
-    const info = Object.assign(Object.assign({}, rest), { version: (_a = rest.version) !== null && _a !== void 0 ? _a : '0.0.0', title });
+    const { prefix = '', title = '', include, exclude, version = process.env.INNET_API_VERSION || '0.0.0' } = props, rest = __rest(props, ["prefix", "title", "include", "exclude", "version"]);
+    const info = Object.assign(Object.assign({}, rest), { version, title });
     const endpoints = {};
     const docs = {
         openapi: '3.1.0',
@@ -39,7 +38,7 @@ const api = () => {
     serverPlugins.set(handler, plugins);
     apiContext.set(handler, context);
     useServerPlugin(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const action = useAction();
         if (!condition(action))
             return;
@@ -53,7 +52,7 @@ const api = () => {
             res.end();
             return null;
         }
-        const method = ((_c = (_b = req.method) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : 'get');
+        const method = ((_b = (_a = req.method) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : 'get');
         const rawSplitPath = url.slice(prefix.length).split('/').slice(1);
         const splitPath = rawSplitPath.at(-1) ? rawSplitPath : rawSplitPath.slice(0, -1);
         const endpoint = endpoints[method];
@@ -138,8 +137,8 @@ const api = () => {
                         return true;
                     });
                 }
-                if ((_e = (_d = currentEndpoint.static) === null || _d === void 0 ? void 0 : _d[key]) === null || _e === void 0 ? void 0 : _e.plugins) {
-                    if (!(yield run((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key], params)))
+                if ((_d = (_c = currentEndpoint.static) === null || _c === void 0 ? void 0 : _c[key]) === null || _d === void 0 ? void 0 : _d.plugins) {
+                    if (!(yield run((_e = currentEndpoint.static) === null || _e === void 0 ? void 0 : _e[key], params)))
                         continue;
                     return null;
                 }
@@ -154,7 +153,7 @@ const api = () => {
                 }
                 break;
             }
-            if ((_g = currentEndpoint.static) === null || _g === void 0 ? void 0 : _g[key]) {
+            if ((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key]) {
                 endpointQueue.push([deep + 1, currentEndpoint.static[key], params]);
             }
             if (currentEndpoint.dynamic) {

package/plugins/main/api/api.js CHANGED Viewed

@@ -20,11 +20,10 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 const api = () => {
-    var _a;
     const handler = innet.useNewHandler();
     const { props = {}, children } = innet.useApp();
-    const { prefix = '', title = '', include, exclude } = props, rest = tslib.__rest(props, ["prefix", "title", "include", "exclude"]);
-    const info = Object.assign(Object.assign({}, rest), { version: (_a = rest.version) !== null && _a !== void 0 ? _a : '0.0.0', title });
+    const { prefix = '', title = '', include, exclude, version = process.env.INNET_API_VERSION || '0.0.0' } = props, rest = tslib.__rest(props, ["prefix", "title", "include", "exclude", "version"]);
+    const info = Object.assign(Object.assign({}, rest), { version, title });
     const endpoints = {};
     const docs = {
         openapi: '3.1.0',
@@ -47,7 +46,7 @@ const api = () => {
     useServerPlugins.serverPlugins.set(handler, plugins);
     useApi.apiContext.set(handler, context);
     useServerPlugin.useServerPlugin(() => tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const action = useAction.useAction();
         if (!condition(action))
             return;
@@ -61,7 +60,7 @@ const api = () => {
             res.end();
             return null;
         }
-        const method = ((_c = (_b = req.method) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : 'get');
+        const method = ((_b = (_a = req.method) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : 'get');
         const rawSplitPath = url.slice(prefix.length).split('/').slice(1);
         const splitPath = rawSplitPath.at(-1) ? rawSplitPath : rawSplitPath.slice(0, -1);
         const endpoint = endpoints[method];
@@ -146,8 +145,8 @@ const api = () => {
                         return true;
                     });
                 }
-                if ((_e = (_d = currentEndpoint.static) === null || _d === void 0 ? void 0 : _d[key]) === null || _e === void 0 ? void 0 : _e.plugins) {
-                    if (!(yield run((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key], params)))
+                if ((_d = (_c = currentEndpoint.static) === null || _c === void 0 ? void 0 : _c[key]) === null || _d === void 0 ? void 0 : _d.plugins) {
+                    if (!(yield run((_e = currentEndpoint.static) === null || _e === void 0 ? void 0 : _e[key], params)))
                         continue;
                     return null;
                 }
@@ -162,7 +161,7 @@ const api = () => {
                 }
                 break;
             }
-            if ((_g = currentEndpoint.static) === null || _g === void 0 ? void 0 : _g[key]) {
+            if ((_f = currentEndpoint.static) === null || _f === void 0 ? void 0 : _f[key]) {
                 endpointQueue.push([deep + 1, currentEndpoint.static[key], params]);
             }
             if (currentEndpoint.dynamic) {

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

@@ -18,7 +18,7 @@ const server = () => {
     const handler = useNewHandler();
     const { props = {}, children } = useApp();
     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: { key = (_a = env.INNET_SSL_KEY) !== null && _a !== void 0 ? _a : 'localhost.key', cert = (_b = env.INNET_SSL_CRT) !== null && _b !== void 0 ? _b : 'localhost.crt', } = {}, } = props;
     try {
         if (!isInvalidPath(key)) {
             key = fs.readFileSync(key).toString();
@@ -32,7 +32,7 @@ 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, onClose, } = props;
+    const { port = Number((_c = env.INNET_PORT) !== null && _c !== void 0 ? _c : (https ? 442 : 80)), onStart, onError, onRequest, onClose, } = props;
     const plugins = new Set();
     const server = https ? http2.createServer({ key, cert }) : http.createServer();
     serverContext.set(handler, { server, port });

package/plugins/main/server/server.js CHANGED Viewed

@@ -29,7 +29,7 @@ const server = () => {
     const handler = innet.useNewHandler();
     const { props = {}, children } = innet.useApp();
     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: { key = (_a = env.INNET_SSL_KEY) !== null && _a !== void 0 ? _a : 'localhost.key', cert = (_b = env.INNET_SSL_CRT) !== null && _b !== void 0 ? _b : 'localhost.crt', } = {}, } = props;
     try {
         if (!isInvalidPath(key)) {
             key = fs__default["default"].readFileSync(key).toString();
@@ -43,7 +43,7 @@ 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, onClose, } = props;
+    const { port = Number((_c = env.INNET_PORT) !== null && _c !== void 0 ? _c : (https ? 442 : 80)), onStart, onError, onRequest, onClose, } = props;
     const plugins = new Set();
     const server = https ? http2__default["default"].createServer({ key, cert }) : http__default["default"].createServer();
     useServer.serverContext.set(handler, { server, port });

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

@@ -11,7 +11,10 @@ const tag = () => {
     const { name, description } = useProps();
     const children = useChildren();
     const { docs } = useApi();
-    const tag = description ? { name, description } : { name };
+    const tag = { name };
+    if (description) {
+        tag.description = description;
+    }
     if (!docs.tags) {
         docs.tags = [tag];
     }

package/plugins/main/tag/tag.js CHANGED Viewed

@@ -19,7 +19,10 @@ const tag = () => {
     const { name, description } = jsx.useProps();
     const children = jsx.useChildren();
     const { docs } = useApi.useApi();
-    const tag = description ? { name, description } : { name };
+    const tag = { name };
+    if (description) {
+        tag.description = description;
+    }
     if (!docs.tags) {
         docs.tags = [tag];
     }

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

@@ -7,7 +7,7 @@ import { usePath } from '../../../hooks/usePath/usePath.es6.js';
 import { file } from '../file/file.es6.js';
 function cms() {
-    const { prefix = '/', dir = '.' } = useProps() || {};
+    const { prefix = process.env.INNET_CMS_PREFIX || '/', dir = process.env.INNET_CMS_DIR || '.', } = useProps() || {};
     const children = useChildren();
     const handler = useHandler();
     let url = usePath();

package/plugins/request/cms/cms.js CHANGED Viewed

@@ -16,7 +16,7 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 function cms() {
-    const { prefix = '/', dir = '.' } = jsx.useProps() || {};
+    const { prefix = process.env.INNET_CMS_PREFIX || '/', dir = process.env.INNET_CMS_DIR || '.', } = jsx.useProps() || {};
     const children = jsx.useChildren();
     const handler = innet.useHandler();
     let url = usePath.usePath();

package/plugins/schema/field/field.es6.js CHANGED Viewed

@@ -2,7 +2,8 @@ import innet, { useNewHandler } from 'innet';
 import { useProps, useChildren } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
-import { useSchemaContext, schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.es6.js';
+import { useObjectSchemaContext } from '../../../hooks/useObjectSchemaContext/useObjectSchemaContext.es6.js';
+import { schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.es6.js';
 import { useObjectRule, objectRuleContext } from '../../../hooks/useObjectRule/useObjectRule.es6.js';
 import { ruleContext } from '../../../hooks/useRule/useRule.es6.js';
 import { required } from '../../../utils/rules/required/required.es6.js';
@@ -10,11 +11,8 @@ import { required } from '../../../utils/rules/required/required.es6.js';
 const field = () => {
     const handler = useNewHandler();
     const { key, optional } = useProps();
-    const schema = useSchemaContext();
+    const schema = useObjectSchemaContext();
     const children = useChildren();
-    if (Array.isArray(schema) || (schema === null || schema === void 0 ? void 0 : schema.type) !== 'object') {
-        throw Error('Use <field> inside <object>');
-    }
     if (!schema.properties) {
         schema.properties = {};
     }

package/plugins/schema/field/field.js CHANGED Viewed

@@ -6,6 +6,7 @@ var innet = require('innet');
 var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
+var useObjectSchemaContext = require('../../../hooks/useObjectSchemaContext/useObjectSchemaContext.js');
 var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext.js');
 var useObjectRule = require('../../../hooks/useObjectRule/useObjectRule.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
@@ -18,11 +19,8 @@ var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
 const field = () => {
     const handler = innet.useNewHandler();
     const { key, optional } = jsx.useProps();
-    const schema = useSchemaContext.useSchemaContext();
+    const schema = useObjectSchemaContext.useObjectSchemaContext();
     const children = jsx.useChildren();
-    if (Array.isArray(schema) || (schema === null || schema === void 0 ? void 0 : schema.type) !== 'object') {
-        throw Error('Use <field> inside <object>');
-    }
     if (!schema.properties) {
         schema.properties = {};
     }

package/plugins/schema/object/object.es6.js CHANGED Viewed

@@ -6,6 +6,7 @@ import '../../../utils/index.es6.js';
 import { useBlock } from '../../../hooks/useBlock/useBlock.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
+import { objectSchemaContext } from '../../../hooks/useObjectSchemaContext/useObjectSchemaContext.es6.js';
 import { schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.es6.js';
 import { parentRuleContext, useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
@@ -22,19 +23,23 @@ const object = () => {
     const schema = useSchemaType('object', props);
     const handler = useNewHandler();
     if (schema) {
-        schemaContext.set(handler, schema);
+        schema.additionalProperties = {};
+        objectSchemaContext.set(handler, schema);
+        schemaContext.set(handler, schema.additionalProperties);
         parentRuleContext.reset(handler);
         const rules = [];
         const rulesMap = {};
         if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
             rules.push(defaultTo(props.default));
         }
+        let childRule = v => v;
+        const restRule = (value, data) => childRule(value, data);
         if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
-            rules.push(objectOf(rulesMap));
+            rules.push(objectOf(rulesMap, restRule));
         }
         else {
             const parentRule = useParentRule();
-            rules.push(parentRule(objectOf(rulesMap)));
+            rules.push(parentRule(objectOf(rulesMap, restRule)));
         }
         const rule = pipe(...rules);
         if (props.ref) {
@@ -42,7 +47,9 @@ const object = () => {
         }
         useRule(rule);
         objectRuleContext.set(handler, rulesMap);
-        ruleContext.set(handler, null);
+        ruleContext.set(handler, rule => {
+            childRule = rule;
+        });
         parentRuleContext.reset(handler);
         innet(children, handler);
     }

package/plugins/schema/object/object.js CHANGED Viewed

@@ -10,6 +10,7 @@ require('../../../utils/index.js');
 var useBlock = require('../../../hooks/useBlock/useBlock.js');
 var useApi = require('../../../hooks/useApi/useApi.js');
 var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
+var useObjectSchemaContext = require('../../../hooks/useObjectSchemaContext/useObjectSchemaContext.js');
 var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
@@ -30,19 +31,23 @@ const object = () => {
     const schema = useSchemaType.useSchemaType('object', props);
     const handler = innet.useNewHandler();
     if (schema) {
-        useSchemaContext.schemaContext.set(handler, schema);
+        schema.additionalProperties = {};
+        useObjectSchemaContext.objectSchemaContext.set(handler, schema);
+        useSchemaContext.schemaContext.set(handler, schema.additionalProperties);
         useParentRule.parentRuleContext.reset(handler);
         const rules = [];
         const rulesMap = {};
         if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
             rules.push(defaultTo.defaultTo(props.default));
         }
+        let childRule = v => v;
+        const restRule = (value, data) => childRule(value, data);
         if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
-            rules.push(objectOf.objectOf(rulesMap));
+            rules.push(objectOf.objectOf(rulesMap, restRule));
         }
         else {
             const parentRule = useParentRule.useParentRule();
-            rules.push(parentRule(objectOf.objectOf(rulesMap)));
+            rules.push(parentRule(objectOf.objectOf(rulesMap, restRule)));
         }
         const rule = pipe.pipe(...rules);
         if (props.ref) {
@@ -50,7 +55,9 @@ const object = () => {
         }
         useRule.useRule(rule);
         useObjectRule.objectRuleContext.set(handler, rulesMap);
-        useRule.ruleContext.set(handler, null);
+        useRule.ruleContext.set(handler, rule => {
+            childRule = rule;
+        });
         useParentRule.parentRuleContext.reset(handler);
         innet__default["default"](children, handler);
     }

package/plugins/utils/blacklist/blacklist.es6.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.
 import { useAction } from '../../../hooks/useAction/useAction.es6.js';
 function blacklist() {
-    const { ip = process.env.BLACKLIST_IP, } = useProps() || {};
+    const { ip = process.env.INNET_BLACKLIST_IP, } = useProps() || {};
     const children = useChildren();
     const ips = typeof ip === 'string' ? ip.split(',') : ip;
     useServerPlugin(() => {

package/plugins/utils/blacklist/blacklist.js CHANGED Viewed

@@ -8,7 +8,7 @@ var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js
 var useAction = require('../../../hooks/useAction/useAction.js');
 function blacklist() {
-    const { ip = process.env.BLACKLIST_IP, } = jsx.useProps() || {};
+    const { ip = process.env.INNET_BLACKLIST_IP, } = jsx.useProps() || {};
     const children = jsx.useChildren();
     const ips = typeof ip === 'string' ? ip.split(',') : ip;
     useServerPlugin.useServerPlugin(() => {

package/plugins/utils/dts/dts.es6.js CHANGED Viewed

@@ -6,7 +6,7 @@ import { useApi } from '../../../hooks/useApi/useApi.es6.js';
 import { generateTypes } from '../../../utils/generateTypes/generateTypes.es6.js';
 const dts = () => {
-    const { path = 'src/api.d.ts', namespace } = useProps() || {};
+    const { path = process.env.INNET_DTS_PATH || 'src/apiTypes.d.ts', namespace = process.env.INNET_DTS_NAMESPACE, } = useProps() || {};
     const { docs } = useApi();
     promises.writeFile(path, generateTypes(docs, namespace)).catch(e => {
         console.error(e);

package/plugins/utils/dts/dts.js CHANGED Viewed

@@ -10,7 +10,7 @@ var useApi = require('../../../hooks/useApi/useApi.js');
 var generateTypes = require('../../../utils/generateTypes/generateTypes.js');
 const dts = () => {
-    const { path = 'src/api.d.ts', namespace } = jsx.useProps() || {};
+    const { path = process.env.INNET_DTS_PATH || 'src/apiTypes.d.ts', namespace = process.env.INNET_DTS_NAMESPACE, } = jsx.useProps() || {};
     const { docs } = useApi.useApi();
     fs.promises.writeFile(path, generateTypes.generateTypes(docs, namespace)).catch(e => {
         console.error(e);

package/plugins/utils/protection/protection.es6.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.
 import { useAction } from '../../../hooks/useAction/useAction.es6.js';
 function protection() {
-    const { maxAge = Number(process.env.PROTECTION_MAX_AGE) || 365 * 24 * 60 * 60, value = process.env.PROTECTION, excludeIp = process.env.PROTECTED_IP, cookieKey = process.env.PROTECTION_COOKIE_KEY || 'protection', searchKey = process.env.PROTECTION_SEARCH_KEY || 'protection', } = useProps() || {};
+    const { maxAge = Number(process.env.INNET_PROTECTION_MAX_AGE) || 365 * 24 * 60 * 60, value = process.env.INNET_PROTECTION, excludeIp = process.env.INNET_PROTECTED_IP, cookieKey = process.env.INNET_PROTECTION_COOKIE_KEY || 'protection', searchKey = process.env.INNET_PROTECTION_SEARCH_KEY || 'protection', } = useProps() || {};
     const children = useChildren();
     if (!value)
         return;

package/plugins/utils/protection/protection.js CHANGED Viewed

@@ -8,7 +8,7 @@ var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js
 var useAction = require('../../../hooks/useAction/useAction.js');
 function protection() {
-    const { maxAge = Number(process.env.PROTECTION_MAX_AGE) || 365 * 24 * 60 * 60, value = process.env.PROTECTION, excludeIp = process.env.PROTECTED_IP, cookieKey = process.env.PROTECTION_COOKIE_KEY || 'protection', searchKey = process.env.PROTECTION_SEARCH_KEY || 'protection', } = jsx.useProps() || {};
+    const { maxAge = Number(process.env.INNET_PROTECTION_MAX_AGE) || 365 * 24 * 60 * 60, value = process.env.INNET_PROTECTION, excludeIp = process.env.INNET_PROTECTED_IP, cookieKey = process.env.INNET_PROTECTION_COOKIE_KEY || 'protection', searchKey = process.env.INNET_PROTECTION_SEARCH_KEY || 'protection', } = jsx.useProps() || {};
     const children = jsx.useChildren();
     if (!value)
         return;

package/plugins/utils/swagger/swagger.es6.js CHANGED Viewed

@@ -6,7 +6,7 @@ import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.
 import { useAction } from '../../../hooks/useAction/useAction.es6.js';
 const swagger = () => {
-    const { path = '/swagger-ui' } = useProps() || {};
+    const { path = process.env.INNET_SWAGGER_PATH || '/swagger-ui', } = useProps() || {};
     const { docs, prefix } = useApi();
     let swaggerResponse;
     useServerPlugin(() => {

package/plugins/utils/swagger/swagger.js CHANGED Viewed

@@ -10,7 +10,7 @@ var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js
 var useAction = require('../../../hooks/useAction/useAction.js');
 const swagger = () => {
-    const { path = '/swagger-ui' } = jsx.useProps() || {};
+    const { path = process.env.INNET_SWAGGER_PATH || '/swagger-ui', } = jsx.useProps() || {};
     const { docs, prefix } = useApi.useApi();
     let swaggerResponse;
     useServerPlugin.useServerPlugin(() => {

package/plugins/utils/whitelist/whitelist.es6.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { useServerPlugin } from '../../../hooks/useServerPlugin/useServerPlugin.
 import { useAction } from '../../../hooks/useAction/useAction.es6.js';
 function whitelist() {
-    const { ip = process.env.WHITELIST_IP, } = useProps() || {};
+    const { ip = process.env.INNET_WHITELIST_IP, } = useProps() || {};
     const children = useChildren();
     const ips = typeof ip === 'string' ? ip.split(',') : ip;
     if (!ips)

package/plugins/utils/whitelist/whitelist.js CHANGED Viewed

@@ -8,7 +8,7 @@ var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js
 var useAction = require('../../../hooks/useAction/useAction.js');
 function whitelist() {
-    const { ip = process.env.WHITELIST_IP, } = jsx.useProps() || {};
+    const { ip = process.env.INNET_WHITELIST_IP, } = jsx.useProps() || {};
     const children = jsx.useChildren();
     const ips = typeof ip === 'string' ? ip.split(',') : ip;
     if (!ips)

package/utils/generateTypes/generateTypes.es6.js CHANGED Viewed

@@ -21,6 +21,16 @@ function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
     if (['boolean', 'number', 'null'].includes(schema.type)) {
         return `${schema.type}${lastChar}`;
     }
+    if (schema.oneOf) {
+        let result = '';
+        for (const item of schema.oneOf) {
+            if (result) {
+                result += ' | ';
+            }
+            result += generateSchemaTypes(item, spaces + 2, '');
+        }
+        return result + lastChar;
+    }
     if (schema.type === 'array') {
         if (!schema.items)
             return `any[]${lastChar}`;
@@ -32,12 +42,23 @@ function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
     }
     let result = '{\n';
     const required = schema.required || [];
-    for (const key in schema.properties) {
-        const prop = schema.properties[key];
-        const splitter = required.includes(key) || hasDefault(prop)
-            ? ':'
-            : '?:';
-        result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+    const hasProps = Boolean(schema.properties && Object.keys(schema.properties).length);
+    const hasRestProps = Boolean(typeof schema.additionalProperties === 'object' &&
+        Object.keys(schema.additionalProperties).length);
+    if (hasProps) {
+        for (const key in schema.properties) {
+            const prop = schema.properties[key];
+            const splitter = required.includes(key) || hasDefault(prop)
+                ? ':'
+                : '?:';
+            result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+        }
+    }
+    if (hasRestProps) {
+        const value = hasProps
+            ? 'any\n'
+            : generateSchemaTypes(schema.additionalProperties, spaces + 2);
+        result += `${space}[key: string]: ${value}`;
     }
     return `${result}${space.slice(0, -2)}}${lastChar}`;
 }

package/utils/generateTypes/generateTypes.js CHANGED Viewed

@@ -25,6 +25,16 @@ function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
     if (['boolean', 'number', 'null'].includes(schema.type)) {
         return `${schema.type}${lastChar}`;
     }
+    if (schema.oneOf) {
+        let result = '';
+        for (const item of schema.oneOf) {
+            if (result) {
+                result += ' | ';
+            }
+            result += generateSchemaTypes(item, spaces + 2, '');
+        }
+        return result + lastChar;
+    }
     if (schema.type === 'array') {
         if (!schema.items)
             return `any[]${lastChar}`;
@@ -36,12 +46,23 @@ function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
     }
     let result = '{\n';
     const required = schema.required || [];
-    for (const key in schema.properties) {
-        const prop = schema.properties[key];
-        const splitter = required.includes(key) || hasDefault(prop)
-            ? ':'
-            : '?:';
-        result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+    const hasProps = Boolean(schema.properties && Object.keys(schema.properties).length);
+    const hasRestProps = Boolean(typeof schema.additionalProperties === 'object' &&
+        Object.keys(schema.additionalProperties).length);
+    if (hasProps) {
+        for (const key in schema.properties) {
+            const prop = schema.properties[key];
+            const splitter = required.includes(key) || hasDefault(prop)
+                ? ':'
+                : '?:';
+            result += `${space}${key}${splitter} ${generateSchemaTypes(prop, spaces + 2)}`;
+        }
+    }
+    if (hasRestProps) {
+        const value = hasProps
+            ? 'any\n'
+            : generateSchemaTypes(schema.additionalProperties, spaces + 2);
+        result += `${space}[key: string]: ${value}`;
     }
     return `${result}${space.slice(0, -2)}}${lastChar}`;
 }

package/utils/rules/objectOf/objectOf.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
 import { type Rule } from '../types';
 export type ObjectOf = Record<string, Rule>;
-export declare function objectOf(map: ObjectOf): (value: any, data?: Record<string, any>) => any;
+export declare function objectOf(map: ObjectOf, rest?: Rule): (value: any, data?: Record<string, any>) => any;

package/utils/rules/objectOf/objectOf.es6.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { RulesError, addKey } from '../helpers.es6.js';
-function objectOf(map) {
+function objectOf(map, rest) {
     return (value, data) => {
         if (value === null || typeof value !== 'object') {
             throw new RulesError('object', Object.assign({ value }, data));
@@ -12,6 +12,16 @@ function objectOf(map) {
                 result[key] = val;
             }
         }
+        if (rest) {
+            for (const key in value) {
+                if (key in map)
+                    continue;
+                const val = rest(value[key], Object.assign(Object.assign({}, data), { key: addKey(key, data) }));
+                if (val !== undefined) {
+                    result[key] = val;
+                }
+            }
+        }
         return result;
     };
 }

package/utils/rules/objectOf/objectOf.js CHANGED Viewed

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var helpers = require('../helpers.js');
-function objectOf(map) {
+function objectOf(map, rest) {
     return (value, data) => {
         if (value === null || typeof value !== 'object') {
             throw new helpers.RulesError('object', Object.assign({ value }, data));
@@ -16,6 +16,16 @@ function objectOf(map) {
                 result[key] = val;
             }
         }
+        if (rest) {
+            for (const key in value) {
+                if (key in map)
+                    continue;
+                const val = rest(value[key], Object.assign(Object.assign({}, data), { key: helpers.addKey(key, data) }));
+                if (val !== undefined) {
+                    result[key] = val;
+                }
+            }
+        }
         return result;
     };
 }