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

package/package.json

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

package/plugins/schema/array/array.es6.js

@@ -13,6 +13,7 @@ import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 import { arrayOf } from '../../../utils/rules/arrayOf/arrayOf.es6.js';
 import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
+import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
 import { useEffect } from '../../../hooks/useEffect/useEffect.es6.js';
 
 const array = () => {
@@ -52,13 +53,14 @@ const array = () => {
             }
             else {
                 oneOfRulesMap = [rule];
-                setRule(rootRule(oneOf(oneOfRulesMap)));
+                const mainRule = rootRule(oneOf(oneOfRulesMap));
+                setRule(props.nullable ? oneOf([nullable, mainRule]) : mainRule);
             }
         });
         innet(children, handler);
         useEffect(() => {
-            if (!oneOfRulesMap && setRule) {
-                setRule(rootRule(e => e));
+            if (!oneOfRulesMap) {
+                setRule(props.nullable ? oneOf([nullable, rootRule(e => e)]) : rootRule(e => e));
             }
         });
         return;

package/plugins/schema/array/array.js

@@ -17,6 +17,7 @@ var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 var arrayOf = require('../../../utils/rules/arrayOf/arrayOf.js');
 var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
+var nullable = require('../../../utils/rules/nullable/nullable.js');
 var useEffect = require('../../../hooks/useEffect/useEffect.js');
 
 const array = () => {
@@ -56,13 +57,14 @@ const array = () => {
             }
             else {
                 oneOfRulesMap = [rule];
-                setRule(rootRule(oneOf.oneOf(oneOfRulesMap)));
+                const mainRule = rootRule(oneOf.oneOf(oneOfRulesMap));
+                setRule(props.nullable ? oneOf.oneOf([nullable.nullable, mainRule]) : mainRule);
             }
         });
         innet.innet(children, handler);
         useEffect.useEffect(() => {
-            if (!oneOfRulesMap && setRule) {
-                setRule(rootRule(e => e));
+            if (!oneOfRulesMap) {
+                setRule(props.nullable ? oneOf.oneOf([nullable.nullable, rootRule(e => e)]) : rootRule(e => e));
             }
         });
         return;

package/plugins/schema/binary/binary.d.ts

@@ -1,13 +1,8 @@
 import { type HandlerPlugin } from 'innet';
-export interface BinaryProps {
+import type { SchemaProps } from '../../../types';
+export type BinaryProps = SchemaProps<string> & {
     accept?: string;
-    deprecated: boolean;
-    description?: string;
     max?: number;
     min?: number;
-    readOnly: boolean;
-    ref?: string;
-    title?: string;
-    writeOnly: boolean;
-}
+};
 export declare const binary: HandlerPlugin;

package/plugins/schema/binary/binary.es6.js

@@ -10,8 +10,10 @@ import { minBin } from '../../../utils/rules/minBin/minBin.es6.js';
 import { maxBin } from '../../../utils/rules/maxBin/maxBin.es6.js';
 import { binaryAccept } from '../../../utils/rules/binaryAccept/binaryAccept.es6.js';
 import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
-import { useRule } from '../../../hooks/useRule/useRule.es6.js';
+import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
+import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
+import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 
 const binary = () => {
     useBlock('path');
@@ -37,7 +39,8 @@ const binary = () => {
         rules.push(binaryAccept(props.accept));
     }
     const parentRule = useParentRule();
-    useRule(parentRule(pipe(...rules)));
+    const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
+    useRule(parentRule(rule));
 };
 
 export { binary };

package/plugins/schema/binary/binary.js

@@ -14,8 +14,10 @@ var minBin = require('../../../utils/rules/minBin/minBin.js');
 var maxBin = require('../../../utils/rules/maxBin/maxBin.js');
 var binaryAccept = require('../../../utils/rules/binaryAccept/binaryAccept.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
-var useRule = require('../../../hooks/useRule/useRule.js');
+var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
+var nullable = require('../../../utils/rules/nullable/nullable.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
+var useRule = require('../../../hooks/useRule/useRule.js');
 
 const binary = () => {
     useBlock.useBlock('path');
@@ -41,7 +43,8 @@ const binary = () => {
         rules.push(binaryAccept.binaryAccept(props.accept));
     }
     const parentRule = useParentRule.useParentRule();
-    useRule.useRule(parentRule(pipe.pipe(...rules)));
+    const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
+    useRule.useRule(parentRule(rule));
 };
 
 exports.binary = binary;

package/plugins/schema/boolean/boolean.es6.js

@@ -6,9 +6,11 @@ import { useBlock } from '../../../hooks/useBlock/useBlock.es6.js';
 import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
 import { bodyContext } from '../../../hooks/useBodyContext/useBodyContext.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
+import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
+import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
+import { pipe } from '../../../utils/rules/pipe/pipe.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 boolean = () => {
     useBlock('path');
@@ -23,12 +25,13 @@ const boolean = () => {
         rules.push(defaultTo(props.default));
     }
     rules.push(val => val === 'true' || (val === 'false' ? false : Boolean(val)));
-    if ((props === null || props === void 0 ? void 0 : props.default) === undefined) {
+    const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
+    if (props.default === undefined) {
         const parentRule = useParentRule();
-        useRule(parentRule(pipe(...rules)));
+        useRule(parentRule(rule));
     }
     else {
-        useRule(pipe(...rules));
+        useRule(rule);
     }
 };
 

package/plugins/schema/boolean/boolean.js

@@ -10,9 +10,11 @@ var useBlock = require('../../../hooks/useBlock/useBlock.js');
 var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
 var useBodyContext = require('../../../hooks/useBodyContext/useBodyContext.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
+var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
+var nullable = require('../../../utils/rules/nullable/nullable.js');
+var pipe = require('../../../utils/rules/pipe/pipe.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
-var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const boolean = () => {
     useBlock.useBlock('path');
@@ -27,12 +29,13 @@ const boolean = () => {
         rules.push(defaultTo.defaultTo(props.default));
     }
     rules.push(val => val === 'true' || (val === 'false' ? false : Boolean(val)));
-    if ((props === null || props === void 0 ? void 0 : props.default) === undefined) {
+    const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
+    if (props.default === undefined) {
         const parentRule = useParentRule.useParentRule();
-        useRule.useRule(parentRule(pipe.pipe(...rules)));
+        useRule.useRule(parentRule(rule));
     }
     else {
-        useRule.useRule(pipe.pipe(...rules));
+        useRule.useRule(rule);
     }
 };
 

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

@@ -11,9 +11,11 @@ import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { dateTo } from '../../../utils/rules/dateTo/dateTo.es6.js';
 import { minDate } from '../../../utils/rules/minDate/minDate.es6.js';
 import { maxDate } from '../../../utils/rules/maxDate/maxDate.es6.js';
+import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
+import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
+import { pipe } from '../../../utils/rules/pipe/pipe.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 date = () => {
     const { default: defaultValue, example, examples, max, min, value, values: values$1, ...props } = useProps() || {};
@@ -63,12 +65,13 @@ const date = () => {
     }
     if (!hasRules)
         return;
+    const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
     if (defaultValue === undefined) {
         const parentRule = useParentRule();
-        useRule(parentRule(pipe(...rules)));
+        useRule(parentRule(rule));
     }
     else {
-        useRule(pipe(...rules));
+        useRule(rule);
     }
 };
 

package/plugins/schema/date/date.js

@@ -15,9 +15,11 @@ var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var dateTo = require('../../../utils/rules/dateTo/dateTo.js');
 var minDate = require('../../../utils/rules/minDate/minDate.js');
 var maxDate = require('../../../utils/rules/maxDate/maxDate.js');
+var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
+var nullable = require('../../../utils/rules/nullable/nullable.js');
+var pipe = require('../../../utils/rules/pipe/pipe.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
-var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const date = () => {
     const { default: defaultValue, example, examples, max, min, value, values: values$1, ...props } = jsx.useProps() || {};
@@ -67,12 +69,13 @@ const date = () => {
     }
     if (!hasRules)
         return;
+    const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
     if (defaultValue === undefined) {
         const parentRule = useParentRule.useParentRule();
-        useRule.useRule(parentRule(pipe.pipe(...rules)));
+        useRule.useRule(parentRule(rule));
     }
     else {
-        useRule.useRule(pipe.pipe(...rules));
+        useRule.useRule(rule);
     }
 };
 

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

@@ -8,9 +8,11 @@ import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { int } from '../../../utils/rules/int/int.es6.js';
 import { min } from '../../../utils/rules/min/min.es6.js';
 import { max } from '../../../utils/rules/max/max.es6.js';
+import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
+import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
+import { pipe } from '../../../utils/rules/pipe/pipe.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';
 
 const integer = () => {
     const { default: defaultValue, example, examples, exclusiveMaximum, exclusiveMinimum, format = 'int32', max: max$1, min: min$1, multipleOf, values: values$1, ...props } = useProps() || {};
@@ -60,11 +62,12 @@ const integer = () => {
     if (max$1 !== undefined) {
         rules.push(max(max$1));
     }
+    const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
     if (defaultValue === undefined) {
-        useRule(optional(pipe(...rules)));
+        useRule(optional(rule));
     }
     else {
-        useRule(pipe(...rules));
+        useRule(rule);
     }
 };
 

package/plugins/schema/integer/integer.js

@@ -12,9 +12,11 @@ var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var int = require('../../../utils/rules/int/int.js');
 var min = require('../../../utils/rules/min/min.js');
 var max = require('../../../utils/rules/max/max.js');
+var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
+var nullable = require('../../../utils/rules/nullable/nullable.js');
+var pipe = require('../../../utils/rules/pipe/pipe.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
 var optional = require('../../../utils/rules/optional/optional.js');
-var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const integer = () => {
     const { default: defaultValue, example, examples, exclusiveMaximum, exclusiveMinimum, format = 'int32', max: max$1, min: min$1, multipleOf, values: values$1, ...props } = jsx.useProps() || {};
@@ -64,11 +66,12 @@ const integer = () => {
     if (max$1 !== undefined) {
         rules.push(max.max(max$1));
     }
+    const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
     if (defaultValue === undefined) {
-        useRule.useRule(optional.optional(pipe.pipe(...rules)));
+        useRule.useRule(optional.optional(rule));
     }
     else {
-        useRule.useRule(pipe.pipe(...rules));
+        useRule.useRule(rule);
     }
 };
 

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

@@ -9,9 +9,11 @@ import { num } from '../../../utils/rules/num/num.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 { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
+import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
+import { pipe } from '../../../utils/rules/pipe/pipe.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 number = () => {
     const { exclusiveMaximum, exclusiveMinimum, format, max: max$1, min: min$1, multipleOf, ...props } = useProps() || {};
@@ -54,12 +56,13 @@ const number = () => {
     if (max$1 !== undefined) {
         rules.push(max(max$1));
     }
+    const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
     if (props.default === undefined) {
         const rootRule = useParentRule();
-        useRule(rootRule(pipe(...rules)));
+        useRule(rootRule(rule));
     }
     else {
-        useRule(pipe(...rules));
+        useRule(rule);
     }
 };
 

package/plugins/schema/number/number.js

@@ -13,9 +13,11 @@ var num = require('../../../utils/rules/num/num.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 oneOf = require('../../../utils/rules/oneOf/oneOf.js');
+var nullable = require('../../../utils/rules/nullable/nullable.js');
+var pipe = require('../../../utils/rules/pipe/pipe.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
-var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const number = () => {
     const { exclusiveMaximum, exclusiveMinimum, format, max: max$1, min: min$1, multipleOf, ...props } = jsx.useProps() || {};
@@ -58,12 +60,13 @@ const number = () => {
     if (max$1 !== undefined) {
         rules.push(max.max(max$1));
     }
+    const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
     if (props.default === undefined) {
         const rootRule = useParentRule.useParentRule();
-        useRule.useRule(rootRule(pipe.pipe(...rules)));
+        useRule.useRule(rootRule(rule));
     }
     else {
-        useRule.useRule(pipe.pipe(...rules));
+        useRule.useRule(rule);
     }
 };
 

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

@@ -14,6 +14,8 @@ import { useEffect } from '../../../hooks/useEffect/useEffect.es6.js';
 import { getSafeSchema } from '../../../utils/getSafeSchema/getSafeSchema.es6.js';
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { objectOf } from '../../../utils/rules/objectOf/objectOf.es6.js';
+import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
+import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 import { useRule, ruleContext } from '../../../hooks/useRule/useRule.es6.js';
 import { objectRuleContext } from '../../../hooks/useObjectRule/useObjectRule.es6.js';
@@ -52,7 +54,7 @@ const object = () => {
                 const parentRule = useParentRule();
                 rules.push(parentRule(objectOf(rulesMap, restRule)));
             }
-            const rule = pipe(...rules);
+            const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
             if (props.ref) {
                 refRules[props.ref] = rule;
             }

package/plugins/schema/object/object.js

@@ -18,6 +18,8 @@ var useEffect = require('../../../hooks/useEffect/useEffect.js');
 var getSafeSchema = require('../../../utils/getSafeSchema/getSafeSchema.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var objectOf = require('../../../utils/rules/objectOf/objectOf.js');
+var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
+var nullable = require('../../../utils/rules/nullable/nullable.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
 var useObjectRule = require('../../../hooks/useObjectRule/useObjectRule.js');
@@ -56,7 +58,7 @@ const object = () => {
                 const parentRule = useParentRule.useParentRule();
                 rules.push(parentRule(objectOf.objectOf(rulesMap, restRule)));
             }
-            const rule = pipe.pipe(...rules);
+            const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
             if (props.ref) {
                 refRules[props.ref] = rule;
             }

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

@@ -10,6 +10,8 @@ import { values, getArrayValues } from '../../../utils/rules/values/values.es6.j
 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';
+import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
+import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
 import { useRule } from '../../../hooks/useRule/useRule.es6.js';
 import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
@@ -49,7 +51,7 @@ const string = () => {
         }
         if (!hasRules)
             return;
-        const rule = pipe(...rules);
+        const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
         if (props.ref) {
             refRules[props.ref] = rule;
         }

package/plugins/schema/string/string.js

@@ -14,6 +14,8 @@ var values = require('../../../utils/rules/values/values.js');
 var minLength = require('../../../utils/rules/minLength/minLength.js');
 var maxLength = require('../../../utils/rules/maxLength/maxLength.js');
 var pattern = require('../../../utils/rules/pattern/pattern.js');
+var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
+var nullable = require('../../../utils/rules/nullable/nullable.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
@@ -53,7 +55,7 @@ const string = () => {
         }
         if (!hasRules)
             return;
-        const rule = pipe.pipe(...rules);
+        const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
         if (props.ref) {
             refRules[props.ref] = rule;
         }

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

@@ -10,8 +10,10 @@ import { schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.
 import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
 import { tupleOf } from '../../../utils/rules/tupleOf/tupleOf.es6.js';
 import { useParentRule, parentRuleContext } from '../../../hooks/useParentRule/useParentRule.es6.js';
-import { useRule, ruleContext } from '../../../hooks/useRule/useRule.es6.js';
+import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
+import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
 import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
+import { useRule, ruleContext } from '../../../hooks/useRule/useRule.es6.js';
 import { required } from '../../../utils/rules/required/required.es6.js';
 import { useEffect } from '../../../hooks/useEffect/useEffect.es6.js';
 
@@ -32,15 +34,14 @@ const tuple = () => {
             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));
+            const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
+            useRule(rule);
             parentRuleContext.set(handler, rule => required(rule));
             ruleContext.set(handler, rule => {
                 rulesMap.push(rule);

package/plugins/schema/tuple/tuple.js

@@ -14,8 +14,10 @@ var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var tupleOf = require('../../../utils/rules/tupleOf/tupleOf.js');
 var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
-var useRule = require('../../../hooks/useRule/useRule.js');
+var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
+var nullable = require('../../../utils/rules/nullable/nullable.js');
 var pipe = require('../../../utils/rules/pipe/pipe.js');
+var useRule = require('../../../hooks/useRule/useRule.js');
 var required = require('../../../utils/rules/required/required.js');
 var useEffect = require('../../../hooks/useEffect/useEffect.js');
 
@@ -36,15 +38,14 @@ const tuple = () => {
             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));
+            const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
+            useRule.useRule(rule);
             useParentRule.parentRuleContext.set(handler, rule => required.required(rule));
             useRule.ruleContext.set(handler, rule => {
                 rulesMap.push(rule);

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

@@ -7,9 +7,11 @@ 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, getArrayValues } from '../../../utils/rules/values/values.es6.js';
+import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
+import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
+import { pipe } from '../../../utils/rules/pipe/pipe.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';
 
 const uuid = () => {
     const { default: defaultValue, ...props } = useProps();
@@ -38,11 +40,12 @@ const uuid = () => {
     if (props.values) {
         rules.push(values(getArrayValues(props.values)));
     }
+    const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
     if (defaultValue === undefined) {
-        useRule(optional(pipe(...rules)));
+        useRule(optional(rule));
     }
     else {
-        useRule(pipe(...rules));
+        useRule(rule);
     }
 };
 

package/plugins/schema/uuid/uuid.js

@@ -11,9 +11,11 @@ var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
 var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
 var uuidTo = require('../../../utils/rules/uuidTo/uuidTo.js');
 var values = require('../../../utils/rules/values/values.js');
+var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
+var nullable = require('../../../utils/rules/nullable/nullable.js');
+var pipe = require('../../../utils/rules/pipe/pipe.js');
 var useRule = require('../../../hooks/useRule/useRule.js');
 var optional = require('../../../utils/rules/optional/optional.js');
-var pipe = require('../../../utils/rules/pipe/pipe.js');
 
 const uuid = () => {
     const { default: defaultValue, ...props } = jsx.useProps();
@@ -42,11 +44,12 @@ const uuid = () => {
     if (props.values) {
         rules.push(values.values(values.getArrayValues(props.values)));
     }
+    const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
     if (defaultValue === undefined) {
-        useRule.useRule(optional.optional(pipe.pipe(...rules)));
+        useRule.useRule(optional.optional(rule));
     }
     else {
-        useRule.useRule(pipe.pipe(...rules));
+        useRule.useRule(rule);
     }
 };
 

package/utils/generateTypes/generateTypes.es6.js

@@ -13,7 +13,7 @@ function hasDefault(target) {
 function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
     const space = [...new Array(spaces)].map(() => ' ').join('');
     if ('$ref' in schema) {
-        return `Schemas.${schema.$ref.slice(21)}${lastChar}`;
+        return `Schemas['${schema.$ref.slice(21)}']${lastChar}`;
     }
     const types = Array.isArray(schema.type) ? schema.type : [schema.type];
     let scope = '';

package/utils/generateTypes/generateTypes.js

@@ -17,7 +17,7 @@ function hasDefault(target) {
 function generateSchemaTypes(schema, spaces = 2, lastChar = '\n') {
     const space = [...new Array(spaces)].map(() => ' ').join('');
     if ('$ref' in schema) {
-        return `Schemas.${schema.$ref.slice(21)}${lastChar}`;
+        return `Schemas['${schema.$ref.slice(21)}']${lastChar}`;
     }
     const types = Array.isArray(schema.type) ? schema.type : [schema.type];
     let scope = '';