@innet/server 2.0.0-alpha.17 → 2.0.0-alpha.19

package/README.md

@@ -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
 
@@ -3380,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.
 
@@ -3403,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/handler/handler.d.ts

@@ -1,8 +1,9 @@
 import { context, type ContextProps, slot, type SlotProps, slots, type SlotsProps } from '@innet/jsx';
 import { arraySync, async } from '@innet/utils';
-import { type ApiProps, type ArrayProps, type BinaryProps, blacklist, type BlacklistProps, type BodyProps, type BooleanProps, cms, type CmsProps, type ContactProps, type CookieProps, type DateProps, type DevProps, type DtsProps, type EndpointProps, type ErrorProps, type FieldProps, file, type FileProps, type HeaderProps, type HostProps, type IntegerProps, type LicenseProps, type NullProps, type NumberProps, type ObjectProps, type ParamProps, preset, type PresetProps, type ProdProps, protection, type ProtectionProps, type ProxyProps, type RedirectProps, type RequestProps, type ResponseProps, type ServerProps, type StringProps, type SuccessProps, type SwaggerProps, type TagProps, type TupleProps, type UuidProps, type VariableProps, whitelist, type WhitelistProps } from '../plugins';
+import { type AnyProps, type ApiProps, type ArrayProps, type BinaryProps, blacklist, type BlacklistProps, type BodyProps, type BooleanProps, cms, type CmsProps, type ContactProps, type CookieProps, type DateProps, type DevProps, type DtsProps, type EndpointProps, type ErrorProps, type FieldProps, file, type FileProps, type HeaderProps, type HostProps, type IntegerProps, type LicenseProps, type NullProps, type NumberProps, type ObjectProps, type ParamProps, preset, type PresetProps, type ProdProps, protection, type ProtectionProps, type ProxyProps, type RedirectProps, type RequestProps, type ResponseProps, type ServerProps, type StringProps, type SuccessProps, type SwaggerProps, type TagProps, type TupleProps, type UuidProps, type VariableProps, whitelist, type WhitelistProps } from '../plugins';
 export declare const arrayPlugins: (typeof arraySync)[];
 export declare const JSXPlugins: {
+    any: import("innet").HandlerPlugin;
     api: import("innet").HandlerPlugin;
     array: import("innet").HandlerPlugin;
     binary: import("innet").HandlerPlugin;
@@ -54,6 +55,7 @@ export declare const handler: import("innet").Handler;
 declare global {
     namespace JSX {
         interface IntrinsicElements {
+            any: AnyProps;
             api: ApiProps;
             array: ArrayProps;
             binary: BinaryProps;

package/handler/handler.es6.js

@@ -2,6 +2,7 @@ import { createHandler } from 'innet';
 import { context, slot, slots, jsxPlugins, jsxComponent } from '@innet/jsx';
 import { arraySync, async, promise, array as array$1, nullish, object as object$1, fn } from '@innet/utils';
 import '../plugins/index.es6.js';
+import { any } from '../plugins/schema/any/any.es6.js';
 import { api } from '../plugins/main/api/api.es6.js';
 import { array } from '../plugins/schema/array/array.es6.js';
 import { binary } from '../plugins/schema/binary/binary.es6.js';
@@ -48,6 +49,7 @@ const arrayPlugins = [
     arraySync,
 ];
 const JSXPlugins = {
+    any,
     api,
     array,
     binary,

package/handler/handler.js

@@ -6,6 +6,7 @@ var innet = require('innet');
 var jsx = require('@innet/jsx');
 var utils = require('@innet/utils');
 require('../plugins/index.js');
+var any = require('../plugins/schema/any/any.js');
 var api = require('../plugins/main/api/api.js');
 var array = require('../plugins/schema/array/array.js');
 var binary = require('../plugins/schema/binary/binary.js');
@@ -52,6 +53,7 @@ const arrayPlugins = [
     utils.arraySync,
 ];
 const JSXPlugins = {
+    any: any.any,
     api: api.api,
     array: array.array,
     binary: binary.binary,

package/hooks/useSchemaType/useSchemaType.d.ts

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

package/hooks/useSchemaType/useSchemaType.es6.js

@@ -22,11 +22,10 @@ function useSchemaType(type, _a = {}) {
             return;
         }
         return (docs.components.schemas[ref] = Object.assign(Object.assign({}, options), { example,
-            examples,
-            type, enum: values }));
+            examples, type: type === 'any' ? undefined : type, enum: values }));
     }
     return useNewSchema(Object.assign(Object.assign({}, options), { example,
-        examples, enum: values, type: type }));
+        examples, enum: values, type: type === 'any' ? undefined : type }));
 }
 
 export { useSchemaType };

package/hooks/useSchemaType/useSchemaType.js

@@ -26,11 +26,10 @@ function useSchemaType(type, _a = {}) {
             return;
         }
         return (docs.components.schemas[ref] = Object.assign(Object.assign({}, options), { example,
-            examples,
-            type, enum: values }));
+            examples, type: type === 'any' ? undefined : type, enum: values }));
     }
     return useNewSchema.useNewSchema(Object.assign(Object.assign({}, options), { example,
-        examples, enum: values, type: type }));
+        examples, enum: values, type: type === 'any' ? undefined : type }));
 }
 
 exports.useSchemaType = useSchemaType;

package/index.es6.js

@@ -29,6 +29,7 @@ export { date } from './plugins/schema/date/date.es6.js';
 export { tuple } from './plugins/schema/tuple/tuple.es6.js';
 export { uuid } from './plugins/schema/uuid/uuid.es6.js';
 export { binary } from './plugins/schema/binary/binary.es6.js';
+export { any } from './plugins/schema/any/any.es6.js';
 export { success, successStatuses } from './plugins/request/success/success.es6.js';
 export { error, errorStatuses } from './plugins/request/error/error.es6.js';
 export { proxy } from './plugins/request/proxy/proxy.es6.js';
@@ -77,7 +78,6 @@ export { minLength } from './utils/rules/minLength/minLength.es6.js';
 export { max } from './utils/rules/max/max.es6.js';
 export { min } from './utils/rules/min/min.es6.js';
 export { defaultTo } from './utils/rules/defaultTo/defaultTo.es6.js';
-export { any } from './utils/rules/any/any.es6.js';
 export { bin } from './utils/rules/bin/bin.es6.js';
 export { minBin } from './utils/rules/minBin/minBin.es6.js';
 export { maxBin } from './utils/rules/maxBin/maxBin.es6.js';

package/index.js

@@ -33,6 +33,7 @@ var date = require('./plugins/schema/date/date.js');
 var tuple = require('./plugins/schema/tuple/tuple.js');
 var uuid = require('./plugins/schema/uuid/uuid.js');
 var binary = require('./plugins/schema/binary/binary.js');
+var any = require('./plugins/schema/any/any.js');
 var success = require('./plugins/request/success/success.js');
 var error = require('./plugins/request/error/error.js');
 var proxy = require('./plugins/request/proxy/proxy.js');
@@ -81,7 +82,6 @@ var minLength = require('./utils/rules/minLength/minLength.js');
 var max = require('./utils/rules/max/max.js');
 var min = require('./utils/rules/min/min.js');
 var defaultTo = require('./utils/rules/defaultTo/defaultTo.js');
-var any = require('./utils/rules/any/any.js');
 var bin = require('./utils/rules/bin/bin.js');
 var minBin = require('./utils/rules/minBin/minBin.js');
 var maxBin = require('./utils/rules/maxBin/maxBin.js');
@@ -154,6 +154,7 @@ exports.date = date.date;
 exports.tuple = tuple.tuple;
 exports.uuid = uuid.uuid;
 exports.binary = binary.binary;
+exports.any = any.any;
 exports.success = success.success;
 exports.successStatuses = success.successStatuses;
 exports.error = error.error;
@@ -208,7 +209,6 @@ exports.minLength = minLength.minLength;
 exports.max = max.max;
 exports.min = min.min;
 exports.defaultTo = defaultTo.defaultTo;
-exports.any = any.any;
 exports.bin = bin.bin;
 exports.minBin = minBin.minBin;
 exports.maxBin = maxBin.maxBin;

package/package.json

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

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

@@ -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

@@ -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/request/cms/cms.es6.js

@@ -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

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

@@ -0,0 +1,5 @@
+import { type HandlerPlugin } from 'innet';
+import { type BaseSchemaProps } from '../../../types';
+export interface AnyProps extends BaseSchemaProps<boolean> {
+}
+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/index.d.ts

@@ -10,3 +10,4 @@ export * from './date';
 export * from './tuple';
 export * from './uuid';
 export * from './binary';
+export * from './any';

package/plugins/schema/index.es6.js

@@ -10,3 +10,4 @@ import './date/index.es6.js';
 import './tuple/index.es6.js';
 import './uuid/index.es6.js';
 import './binary/index.es6.js';
+import './any/index.es6.js';

package/plugins/schema/index.js

@@ -12,4 +12,5 @@ require('./date/index.js');
 require('./tuple/index.js');
 require('./uuid/index.js');
 require('./binary/index.js');
+require('./any/index.js');
 

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

@@ -1,5 +1,6 @@
 import innet, { useNewHandler } from 'innet';
 import { useChildren, useProps } from '@innet/jsx';
+import { callHandler } from '@innet/utils';
 import '../../../hooks/index.es6.js';
 import '../../../hooks/useParentRule/index.es6.js';
 import '../../../utils/index.es6.js';
@@ -52,6 +53,11 @@ const object = () => {
         });
         parentRuleContext.reset(handler);
         innet(children, handler);
+        innet(() => {
+            if (!Object.keys(schema.additionalProperties).length) {
+                delete schema.additionalProperties;
+            }
+        }, callHandler);
     }
     else if (props.ref) {
         useRule(refRules[props.ref]);

package/plugins/schema/object/object.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var innet = require('innet');
 var jsx = require('@innet/jsx');
+var utils = require('@innet/utils');
 require('../../../hooks/index.js');
 require('../../../hooks/useParentRule/index.js');
 require('../../../utils/index.js');
@@ -60,6 +61,11 @@ const object = () => {
         });
         useParentRule.parentRuleContext.reset(handler);
         innet__default["default"](children, handler);
+        innet__default["default"](() => {
+            if (!Object.keys(schema.additionalProperties).length) {
+                delete schema.additionalProperties;
+            }
+        }, utils.callHandler);
     }
     else if (props.ref) {
         useRule.useRule(refRules[props.ref]);

package/utils/generateTypes/generateTypes.es6.js

@@ -21,26 +21,47 @@ 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}`;
         return `Array<${generateSchemaTypes(schema.items, spaces + 2, '')}>${lastChar}`;
     }
+    if (!schema.type) {
+        return `any${lastChar}`;
+    }
     if (schema.type !== 'object') {
         console.error('unknown type', schema);
         return `any${lastChar}`;
     }
     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 (typeof schema.additionalProperties === 'object' && Object.keys(schema.additionalProperties).length) {
-        result += `${space}[key: string]: any\n`;
+    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

@@ -25,26 +25,47 @@ 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}`;
         return `Array<${generateSchemaTypes(schema.items, spaces + 2, '')}>${lastChar}`;
     }
+    if (!schema.type) {
+        return `any${lastChar}`;
+    }
     if (schema.type !== 'object') {
         console.error('unknown type', schema);
         return `any${lastChar}`;
     }
     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 (typeof schema.additionalProperties === 'object' && Object.keys(schema.additionalProperties).length) {
-        result += `${space}[key: string]: any\n`;
+    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/index.d.ts

@@ -22,7 +22,6 @@ export * from './minLength';
 export * from './max';
 export * from './min';
 export * from './defaultTo';
-export * from './any';
 export * from './bin';
 export * from './minBin';
 export * from './maxBin';

package/utils/rules/index.es6.js

@@ -22,7 +22,6 @@ import './minLength/index.es6.js';
 import './max/index.es6.js';
 import './min/index.es6.js';
 import './defaultTo/index.es6.js';
-import './any/index.es6.js';
 import './bin/index.es6.js';
 import './minBin/index.es6.js';
 import './maxBin/index.es6.js';

package/utils/rules/index.js

@@ -26,7 +26,6 @@ require('./minLength/index.js');
 require('./max/index.js');
 require('./min/index.js');
 require('./defaultTo/index.js');
-require('./any/index.js');
 require('./bin/index.js');
 require('./minBin/index.js');
 require('./maxBin/index.js');

package/utils/rules/any/any.d.ts

@@ -1 +0,0 @@
-export declare function any(value: any): any;

package/utils/rules/any/any.es6.js

@@ -1,5 +0,0 @@
-function any(value) {
-    return value;
-}
-
-export { any };

package/utils/rules/any/any.js

@@ -1,9 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-function any(value) {
-    return value;
-}
-
-exports.any = any;