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

package/hooks/useSchemaType/useSchemaType.es6.js

@@ -27,9 +27,18 @@ function useSchemaType(type, { example, examples, ref, values, ...options } = {}
             type: type === 'any' ? undefined : type,
         });
     }
+    const arrayValues = values ? Array.isArray(values) ? values : Object.keys(values) : values;
+    const enumDescription = values && !Array.isArray(values)
+        ? {
+            'x-enum-descriptions': values,
+            'x-enumDescriptions': values,
+            'x-enumNames': values,
+        }
+        : {};
     return useNewSchema({
         ...options,
-        enum: values,
+        ...enumDescription,
+        enum: arrayValues,
         example,
         examples,
         type: type === 'any' ? undefined : type,

package/hooks/useSchemaType/useSchemaType.js

@@ -31,9 +31,18 @@ function useSchemaType(type, { example, examples, ref, values, ...options } = {}
             type: type === 'any' ? undefined : type,
         });
     }
+    const arrayValues = values ? Array.isArray(values) ? values : Object.keys(values) : values;
+    const enumDescription = values && !Array.isArray(values)
+        ? {
+            'x-enum-descriptions': values,
+            'x-enumDescriptions': values,
+            'x-enumNames': values,
+        }
+        : {};
     return useNewSchema.useNewSchema({
         ...options,
-        enum: values,
+        ...enumDescription,
+        enum: arrayValues,
         example,
         examples,
         type: type === 'any' ? undefined : type,

package/index.es6.js

@@ -117,5 +117,5 @@ export { pipe } from './utils/rules/pipe/pipe.es6.js';
 export { required } from './utils/rules/required/required.es6.js';
 export { tupleOf } from './utils/rules/tupleOf/tupleOf.es6.js';
 export { uuidTo } from './utils/rules/uuidTo/uuidTo.es6.js';
-export { values } from './utils/rules/values/values.es6.js';
+export { getArrayValues, values } from './utils/rules/values/values.es6.js';
 export { stringifySearch } from './utils/stringifySearch/stringifySearch.es6.js';

package/index.js

@@ -274,5 +274,6 @@ exports.pipe = pipe.pipe;
 exports.required = required.required;
 exports.tupleOf = tupleOf.tupleOf;
 exports.uuidTo = uuidTo.uuidTo;
+exports.getArrayValues = values.getArrayValues;
 exports.values = values.values;
 exports.stringifySearch = stringifySearch.stringifySearch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@innet/server",
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.12",
   "description": "Create server-side application with innet",
   "main": "index.js",
   "module": "index.es6.js",
@@ -44,7 +44,7 @@
     "@types/qs": "^6.15.0",
     "cookie": "^1.1.1",
     "http-proxy": "^1.18.1",
-    "innet": "^2.1.0",
+    "innet": "^2.1.1",
     "mime": "^4.1.0",
     "multiparty": "^4.2.3",
     "openapi-types": "^12.1.3",

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

@@ -1,4 +1,4 @@
-import { useNewHandler, innet } from 'innet';
+import { useNewHandler, useApp, innet, net } from 'innet';
 import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
@@ -39,6 +39,7 @@ const api = () => {
     apiContext.set(handler, context);
     useServerPlugin(async () => {
         var _a, _b, _c, _d, _e, _f;
+        const app = useApp();
         const action = useAction();
         if (!condition(action))
             return;
@@ -164,11 +165,11 @@ const api = () => {
             }
         }
         for (const plugin of plugins) {
-            const result = await plugin();
-            if (result === undefined)
-                continue;
             const newHandler = Object.create(handler);
             actionContext.set(newHandler, action);
+            const result = await net(plugin, app, newHandler);
+            if (result === undefined)
+                continue;
             innet(result, newHandler);
             return null;
         }

package/plugins/main/api/api.js

@@ -43,6 +43,7 @@ const api = () => {
     useApi.apiContext.set(handler, context);
     useServerPlugin.useServerPlugin(async () => {
         var _a, _b, _c, _d, _e, _f;
+        const app = innet.useApp();
         const action = useAction.useAction();
         if (!condition(action))
             return;
@@ -168,11 +169,11 @@ const api = () => {
             }
         }
         for (const plugin of plugins) {
-            const result = await plugin();
-            if (result === undefined)
-                continue;
             const newHandler = Object.create(handler);
             useAction.actionContext.set(newHandler, action);
+            const result = await innet.net(plugin, app, newHandler);
+            if (result === undefined)
+                continue;
             innet.innet(result, newHandler);
             return null;
         }

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

@@ -1,4 +1,4 @@
-import { useNewHandler, innet } from 'innet';
+import { useNewHandler, useApp, useHandler, net, innet } from 'innet';
 import { useProps } from '@innet/jsx';
 import fs from 'node:fs';
 import http from 'node:http';
@@ -56,8 +56,10 @@ const server = () => {
         actionContext.set(requestHandler, action);
         requestHandlerContext.set(requestHandler, requestHandler);
         async function server() {
+            const app = useApp();
+            const handler = useHandler();
             for (const plugin of plugins) {
-                const result = await plugin();
+                const result = await net(plugin, app, handler);
                 if (result !== undefined) {
                     return result;
                 }

package/plugins/main/server/server.js

@@ -66,8 +66,10 @@ const server = () => {
         useAction.actionContext.set(requestHandler, action);
         useRequestHandler.requestHandlerContext.set(requestHandler, requestHandler);
         async function server() {
+            const app = innet.useApp();
+            const handler = innet.useHandler();
             for (const plugin of plugins) {
-                const result = await plugin();
+                const result = await innet.net(plugin, app, handler);
                 if (result !== undefined) {
                     return result;
                 }

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

@@ -4,10 +4,10 @@ import '../../../hooks/useParentRule/index.es6.js';
 import '../../../utils/index.es6.js';
 import '../../../utils/dateFormat/index.es6.js';
 import { dateFormat } from '../../../utils/dateFormat/dateFormat.es6.js';
+import { getArrayValues, values } from '../../../utils/rules/values/values.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { dateTo } from '../../../utils/rules/dateTo/dateTo.es6.js';
-import { values } from '../../../utils/rules/values/values.es6.js';
 import { minDate } from '../../../utils/rules/minDate/minDate.es6.js';
 import { maxDate } from '../../../utils/rules/maxDate/maxDate.es6.js';
 import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
@@ -20,7 +20,7 @@ const date = () => {
     const normMax = dateFormat(max);
     const normDefault = dateFormat(defaultValue);
     const normExample = dateFormat(example);
-    const normValues = values$1 === null || values$1 === void 0 ? void 0 : values$1.map(dateFormat);
+    const normValues = values$1 && getArrayValues(values$1, dateFormat);
     // @ts-expect-error: FIXME
     const stringValues = normValues === null || normValues === void 0 ? void 0 : normValues.map(value => value.toISOString());
     const normExamples = examples === null || examples === void 0 ? void 0 : examples.map(dateFormat);

package/plugins/schema/date/date.js

@@ -8,10 +8,10 @@ require('../../../hooks/useParentRule/index.js');
 require('../../../utils/index.js');
 require('../../../utils/dateFormat/index.js');
 var dateFormat = require('../../../utils/dateFormat/dateFormat.js');
+var values = require('../../../utils/rules/values/values.js');
 var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var dateTo = require('../../../utils/rules/dateTo/dateTo.js');
-var values = require('../../../utils/rules/values/values.js');
 var minDate = require('../../../utils/rules/minDate/minDate.js');
 var maxDate = require('../../../utils/rules/maxDate/maxDate.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
@@ -24,7 +24,7 @@ const date = () => {
     const normMax = dateFormat.dateFormat(max);
     const normDefault = dateFormat.dateFormat(defaultValue);
     const normExample = dateFormat.dateFormat(example);
-    const normValues = values$1 === null || values$1 === void 0 ? void 0 : values$1.map(dateFormat.dateFormat);
+    const normValues = values$1 && values.getArrayValues(values$1, dateFormat.dateFormat);
     // @ts-expect-error: FIXME
     const stringValues = normValues === null || normValues === void 0 ? void 0 : normValues.map(value => value.toISOString());
     const normExamples = examples === null || examples === void 0 ? void 0 : examples.map(dateFormat.dateFormat);

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

@@ -2,9 +2,9 @@ import { useProps } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
+import { getArrayValues, values } from '../../../utils/rules/values/values.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { int } from '../../../utils/rules/int/int.es6.js';
-import { values } from '../../../utils/rules/values/values.es6.js';
 import { min } from '../../../utils/rules/min/min.es6.js';
 import { max } from '../../../utils/rules/max/max.es6.js';
 import { useRule } from '../../../hooks/useRule/useRule.es6.js';
@@ -19,7 +19,7 @@ const integer = () => {
         default: defaultValue !== undefined ? Number(defaultValue) : undefined,
         example: example !== undefined ? Number(example) : undefined,
         examples: examples === null || examples === void 0 ? void 0 : examples.map(Number),
-        values: values$1 === null || values$1 === void 0 ? void 0 : values$1.map(Number),
+        values: values$1 && getArrayValues(values$1, Number),
     });
     if (schema) {
         if (format) {
@@ -47,7 +47,7 @@ const integer = () => {
     }
     rules.push(int(format));
     if (values$1) {
-        rules.push(values(values$1.map(value => int(format)(value))));
+        rules.push(values(getArrayValues(values$1, int(format))));
     }
     if (min$1 !== undefined) {
         rules.push(min(min$1));

package/plugins/schema/integer/integer.js

@@ -6,9 +6,9 @@ var jsx = require('@innet/jsx');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
 var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
+var values = require('../../../utils/rules/values/values.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var int = require('../../../utils/rules/int/int.js');
-var values = require('../../../utils/rules/values/values.js');
 var min = require('../../../utils/rules/min/min.js');
 var max = require('../../../utils/rules/max/max.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
@@ -23,7 +23,7 @@ const integer = () => {
         default: defaultValue !== undefined ? Number(defaultValue) : undefined,
         example: example !== undefined ? Number(example) : undefined,
         examples: examples === null || examples === void 0 ? void 0 : examples.map(Number),
-        values: values$1 === null || values$1 === void 0 ? void 0 : values$1.map(Number),
+        values: values$1 && values.getArrayValues(values$1, Number),
     });
     if (schema) {
         if (format) {
@@ -51,7 +51,7 @@ const integer = () => {
     }
     rules.push(int.int(format));
     if (values$1) {
-        rules.push(values.values(values$1.map(value => int.int(format)(value))));
+        rules.push(values.values(values.getArrayValues(values$1, int.int(format))));
     }
     if (min$1 !== undefined) {
         rules.push(min.min(min$1));

package/plugins/schema/number/number.es6.js

@@ -5,7 +5,7 @@ import '../../../utils/index.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { num } from '../../../utils/rules/num/num.es6.js';
-import { values } from '../../../utils/rules/values/values.es6.js';
+import { values, getArrayValues } from '../../../utils/rules/values/values.es6.js';
 import { min } from '../../../utils/rules/min/min.es6.js';
 import { max } from '../../../utils/rules/max/max.es6.js';
 import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
@@ -41,7 +41,7 @@ const number = () => {
     }
     rules.push(num);
     if (props.values) {
-        rules.push(values(props.values));
+        rules.push(values(getArrayValues(props.values, Number)));
     }
     if (min$1 !== undefined) {
         rules.push(min(min$1));

package/plugins/schema/number/number.js

@@ -45,7 +45,7 @@ const number = () => {
     }
     rules.push(num.num);
     if (props.values) {
-        rules.push(values.values(props.values));
+        rules.push(values.values(values.getArrayValues(props.values, Number)));
     }
     if (min$1 !== undefined) {
         rules.push(min.min(min$1));

package/plugins/schema/string/string.es6.js

@@ -5,7 +5,7 @@ import '../../../utils/index.es6.js';
 import { useApi } from '../../../hooks/useApi/useApi.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
-import { values } from '../../../utils/rules/values/values.es6.js';
+import { values, getArrayValues } from '../../../utils/rules/values/values.es6.js';
 import { minLength } from '../../../utils/rules/minLength/minLength.es6.js';
 import { maxLength } from '../../../utils/rules/maxLength/maxLength.es6.js';
 import { pattern } from '../../../utils/rules/pattern/pattern.es6.js';
@@ -27,7 +27,7 @@ const string = () => {
         }
         rules.push(String);
         if (props.values) {
-            rules.push(values(props.values));
+            rules.push(values(getArrayValues(props.values)));
         }
         if (format !== undefined) {
             schema.format = format;

package/plugins/schema/string/string.js

@@ -31,7 +31,7 @@ const string = () => {
         }
         rules.push(String);
         if (props.values) {
-            rules.push(values.values(props.values));
+            rules.push(values.values(values.getArrayValues(props.values)));
         }
         if (format !== undefined) {
             schema.format = format;

package/plugins/schema/uuid/uuid.es6.js

@@ -5,7 +5,7 @@ import '../../../utils/index.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { uuidTo } from '../../../utils/rules/uuidTo/uuidTo.es6.js';
-import { values } from '../../../utils/rules/values/values.es6.js';
+import { values, getArrayValues } from '../../../utils/rules/values/values.es6.js';
 import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { optional } from '../../../utils/rules/optional/optional.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
@@ -28,7 +28,7 @@ const uuid = () => {
     }
     rules.push(uuidTo);
     if (props.values) {
-        rules.push(values(props.values));
+        rules.push(values(getArrayValues(props.values)));
     }
     if (defaultValue === undefined) {
         useRule(optional(pipe(...rules)));

package/plugins/schema/uuid/uuid.js

@@ -32,7 +32,7 @@ const uuid = () => {
     }
     rules.push(uuidTo.uuidTo);
     if (props.values) {
-        rules.push(values.values(props.values));
+        rules.push(values.values(values.getArrayValues(props.values)));
     }
     if (defaultValue === undefined) {
         useRule.useRule(optional.optional(pipe.pipe(...rules)));

package/types.d.ts

@@ -68,7 +68,8 @@ export interface BaseSchemaProps<T> {
     title?: string;
     writeOnly?: boolean;
 }
+export type SchemaValues<T> = (T extends (number | string) ? Record<T, string> : never) | T[];
 export interface ValuesSchemaProps<T> extends BaseSchemaProps<T> {
     const?: T;
-    values?: T[];
+    values?: SchemaValues<T>;
 }

package/utils/rules/values/index.es6.js

@@ -1 +1 @@
-export { values } from './values.es6.js';
+export { getArrayValues, values } from './values.es6.js';

package/utils/rules/values/index.js

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

package/utils/rules/values/values.d.ts

@@ -1 +1,3 @@
-export declare function values(values: any[]): (value: any, data?: object) => any;
+import { type SchemaValues } from '../../../types';
+export declare function getArrayValues<T, F extends (value: T | string) => any = () => T>(values: SchemaValues<T>, format?: F): ReturnType<F>[];
+export declare function values<T>(values: T[]): (value: any, data?: object) => any;

package/utils/rules/values/values.es6.js

@@ -1,5 +1,8 @@
 import { RulesError } from '../helpers.es6.js';
 
+function getArrayValues(values, format = (value => value)) {
+    return Array.isArray(values) ? values.map(format) : Object.keys(values).map(format);
+}
 function values(values) {
     return (value, data) => {
         if (!values.includes(value)) {
@@ -13,4 +16,4 @@ function values(values) {
     };
 }
 
-export { values };
+export { getArrayValues, values };

package/utils/rules/values/values.js

@@ -4,6 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var helpers = require('../helpers.js');
 
+function getArrayValues(values, format = (value => value)) {
+    return Array.isArray(values) ? values.map(format) : Object.keys(values).map(format);
+}
 function values(values) {
     return (value, data) => {
         if (!values.includes(value)) {
@@ -17,4 +20,5 @@ function values(values) {
     };
 }
 
+exports.getArrayValues = getArrayValues;
 exports.values = values;