@innet/server 2.0.0-beta.26 → 2.0.0-beta.27

package/plugins/schema/tuple/tuple.es6.js

@@ -1,9 +1,10 @@
 import { useNewHandler, innet } from 'innet';
-import { useProps } from '@innet/jsx';
+import { useProps, useContext } from '@innet/jsx';
 import '../../../hooks/index.es6.js';
 import '../../../hooks/useParentRule/index.es6.js';
 import '../../../utils/index.es6.js';
 import { useBlock } from '../../../hooks/useBlock/useBlock.es6.js';
+import { bodyContext } from '../../../hooks/useBodyContext/useBodyContext.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
 import { schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
@@ -18,35 +19,39 @@ const tuple = () => {
     useBlock('path');
     const handler = useNewHandler();
     const { children, ...props } = useProps();
+    const isBody = Boolean(useContext(bodyContext));
+    const hasRules = !isBody || !props.readOnly;
     const schema = useSchemaType('array', props);
     if (schema) {
         const schemas = [];
         handler[schemaContext.key] = schemas;
         // @ts-expect-error: FIXME
         schema.prefixItems = schemas;
-        const rulesMap = [];
-        const rules = [];
-        if (props.default !== undefined) {
-            rules.push(defaultTo(props.default));
-        }
-        if (props.default !== undefined) {
-            rules.push(tupleOf(rulesMap));
-        }
-        else {
-            const parentRule = useParentRule();
-            rules.push(parentRule(tupleOf(rulesMap)));
+        if (hasRules) {
+            const rulesMap = [];
+            const rules = [];
+            if (props.default !== undefined) {
+                rules.push(defaultTo(props.default));
+            }
+            if (props.default !== undefined) {
+                rules.push(tupleOf(rulesMap));
+            }
+            else {
+                const parentRule = useParentRule();
+                rules.push(parentRule(tupleOf(rulesMap)));
+            }
+            useRule(pipe(...rules));
+            parentRuleContext.set(handler, rule => required(rule));
+            ruleContext.set(handler, rule => {
+                rulesMap.push(rule);
+            });
+            useEffect(() => {
+                if (!rulesMap.length) {
+                    throw Error('<tuple> MUST have content');
+                }
+            });
         }
-        useRule(pipe(...rules));
-        parentRuleContext.set(handler, rule => required(rule));
-        ruleContext.set(handler, rule => {
-            rulesMap.push(rule);
-        });
         innet(children, handler);
-        useEffect(() => {
-            if (!rulesMap.length) {
-                throw Error('<tuple> MUST have content');
-            }
-        });
     }
 };
 

package/plugins/schema/tuple/tuple.js

@@ -8,6 +8,7 @@ require('../../../hooks/index.js');
 require('../../../hooks/useParentRule/index.js');
 require('../../../utils/index.js');
 var useBlock = require('../../../hooks/useBlock/useBlock.js');
+var useBodyContext = require('../../../hooks/useBodyContext/useBodyContext.js');
 var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
 var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
@@ -22,35 +23,39 @@ const tuple = () => {
     useBlock.useBlock('path');
     const handler = innet.useNewHandler();
     const { children, ...props } = jsx.useProps();
+    const isBody = Boolean(jsx.useContext(useBodyContext.bodyContext));
+    const hasRules = !isBody || !props.readOnly;
     const schema = useSchemaType.useSchemaType('array', props);
     if (schema) {
         const schemas = [];
         handler[useSchemaContext.schemaContext.key] = schemas;
         // @ts-expect-error: FIXME
         schema.prefixItems = schemas;
-        const rulesMap = [];
-        const rules = [];
-        if (props.default !== undefined) {
-            rules.push(defaultTo.defaultTo(props.default));
-        }
-        if (props.default !== undefined) {
-            rules.push(tupleOf.tupleOf(rulesMap));
-        }
-        else {
-            const parentRule = useParentRule.useParentRule();
-            rules.push(parentRule(tupleOf.tupleOf(rulesMap)));
+        if (hasRules) {
+            const rulesMap = [];
+            const rules = [];
+            if (props.default !== undefined) {
+                rules.push(defaultTo.defaultTo(props.default));
+            }
+            if (props.default !== undefined) {
+                rules.push(tupleOf.tupleOf(rulesMap));
+            }
+            else {
+                const parentRule = useParentRule.useParentRule();
+                rules.push(parentRule(tupleOf.tupleOf(rulesMap)));
+            }
+            useRule.useRule(pipe.pipe(...rules));
+            useParentRule.parentRuleContext.set(handler, rule => required.required(rule));
+            useRule.ruleContext.set(handler, rule => {
+                rulesMap.push(rule);
+            });
+            useEffect.useEffect(() => {
+                if (!rulesMap.length) {
+                    throw Error('<tuple> MUST have content');
+                }
+            });
         }
-        useRule.useRule(pipe.pipe(...rules));
-        useParentRule.parentRuleContext.set(handler, rule => required.required(rule));
-        useRule.ruleContext.set(handler, rule => {
-            rulesMap.push(rule);
-        });
         innet.innet(children, handler);
-        useEffect.useEffect(() => {
-            if (!rulesMap.length) {
-                throw Error('<tuple> MUST have content');
-            }
-        });
     }
 };
 

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

@@ -1,7 +1,8 @@
-import { useProps } from '@innet/jsx';
+import { useProps, useContext } from '@innet/jsx';
 import { v4 } from 'uuid';
 import '../../../hooks/index.es6.js';
 import '../../../utils/index.es6.js';
+import { bodyContext } from '../../../hooks/useBodyContext/useBodyContext.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';
@@ -12,6 +13,8 @@ import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 
 const uuid = () => {
     const { default: defaultValue, ...props } = useProps();
+    const isBody = Boolean(useContext(bodyContext));
+    const hasRules = !isBody || !props.readOnly;
     const params = {
         ...props,
     };
@@ -25,6 +28,8 @@ const uuid = () => {
         // @ts-expect-error: FIXME
         schema['x-default'] = defaultValue;
     }
+    if (!hasRules)
+        return;
     const rules = [];
     if (defaultValue !== undefined) {
         rules.push(defaultTo(defaultValue === 'new' ? v4 : defaultValue));

package/plugins/schema/uuid/uuid.js

@@ -6,6 +6,7 @@ var jsx = require('@innet/jsx');
 var uuid$1 = require('uuid');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
+var useBodyContext = require('../../../hooks/useBodyContext/useBodyContext.js');
 var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var uuidTo = require('../../../utils/rules/uuidTo/uuidTo.js');
@@ -16,6 +17,8 @@ var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const uuid = () => {
     const { default: defaultValue, ...props } = jsx.useProps();
+    const isBody = Boolean(jsx.useContext(useBodyContext.bodyContext));
+    const hasRules = !isBody || !props.readOnly;
     const params = {
         ...props,
     };
@@ -29,6 +32,8 @@ const uuid = () => {
         // @ts-expect-error: FIXME
         schema['x-default'] = defaultValue;
     }
+    if (!hasRules)
+        return;
     const rules = [];
     if (defaultValue !== undefined) {
         rules.push(defaultTo.defaultTo(defaultValue === 'new' ? uuid$1.v4 : defaultValue));

package/types/appTypes.d.ts

@@ -1,4 +1,4 @@
-import type { OpenAPIV3_1 as API } from 'openapi-types';
+import type { OpenAPIV3_1 as API, OpenAPIV3_1 } from 'openapi-types';
 import type { ApiErrorValue } from '../constants';
 import { type ServerPlugin } from '../hooks';
 import { type ResponseStatus } from '../plugins';
@@ -58,6 +58,8 @@ export interface ServerStartParams {
     https: boolean;
     port: number;
 }
+export type ApiErrorSchema = Record<ApiErrorValue, OpenAPIV3_1.ReferenceObject | OpenAPIV3_1.SchemaObject>;
+export type ApiErrorSchemaRefs = Record<ApiErrorValue, string>;
 export type SchemaValues<T> = (T extends (number | string) ? Record<T, string> : never) | T[];
 export interface BaseSchemaProps<T, D = T> {
     default?: D;

package/utils/rules/constants.d.ts

@@ -1 +1,5 @@
+import type { OpenAPIV3_1 } from 'openapi-types';
+import { type RulesErrors } from './types';
+export declare const inValidationValues: ["body", "query", "cookie", "header", "path"];
 export declare const rulesErrors: readonly ["oneOf", "number", "date", "uuid", "integer", "minimum", "boolean", "minDate", "maxDate", "maximum", "minLength", "maxLength", "values", "object", "array", "tuple", "required", "null", "pattern", "string", "binary", "binaryAccept", "minBin", "maxBin"];
+export declare const rulesErrorSchemas: Record<RulesErrors, OpenAPIV3_1.ReferenceObject | OpenAPIV3_1.SchemaObject>;