@innet/server 2.0.0-beta.26 → 2.0.0-beta.28
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.
- package/constants.d.ts +3 -0
- package/constants.es6.js +28 -1
- package/constants.js +29 -0
- package/hooks/index.d.ts +1 -1
- package/hooks/index.es6.js +1 -1
- package/hooks/index.js +1 -1
- package/hooks/useBodyContext/index.d.ts +1 -0
- package/hooks/useBodyContext/index.es6.js +1 -0
- package/hooks/useBodyContext/index.js +10 -0
- package/hooks/useBodyContext/useBodyContext.d.ts +6 -0
- package/hooks/{useBodyFile/useBodyFile.es6.js → useBodyContext/useBodyContext.es6.js} +6 -6
- package/hooks/{useBodyFile/useBodyFile.js → useBodyContext/useBodyContext.js} +7 -7
- package/index.es6.js +2 -2
- package/index.js +5 -3
- package/package.json +1 -1
- package/plugins/main/api/api.d.ts +7 -0
- package/plugins/main/api/api.es6.js +2 -4
- package/plugins/main/api/api.js +2 -4
- package/plugins/main/body/body.es6.js +6 -4
- package/plugins/main/body/body.js +6 -4
- package/plugins/main/endpoint/endpoint.d.ts +2 -0
- package/plugins/main/endpoint/endpoint.es6.js +78 -2
- package/plugins/main/endpoint/endpoint.js +78 -2
- package/plugins/schema/any/any.es6.js +6 -1
- package/plugins/schema/any/any.js +5 -0
- package/plugins/schema/array/array.es6.js +9 -4
- package/plugins/schema/array/array.js +9 -4
- package/plugins/schema/binary/binary.d.ts +3 -8
- package/plugins/schema/binary/binary.es6.js +12 -5
- package/plugins/schema/binary/binary.js +11 -4
- package/plugins/schema/boolean/boolean.es6.js +13 -5
- package/plugins/schema/boolean/boolean.js +12 -4
- package/plugins/schema/date/date.es6.js +12 -4
- package/plugins/schema/date/date.js +11 -3
- package/plugins/schema/integer/integer.es6.js +12 -4
- package/plugins/schema/integer/integer.js +11 -3
- package/plugins/schema/null/null.es6.js +8 -2
- package/plugins/schema/null/null.js +7 -1
- package/plugins/schema/number/number.es6.js +12 -4
- package/plugins/schema/number/number.js +11 -3
- package/plugins/schema/object/object.es6.js +36 -29
- package/plugins/schema/object/object.js +35 -28
- package/plugins/schema/string/string.es6.js +10 -3
- package/plugins/schema/string/string.js +9 -2
- package/plugins/schema/tuple/tuple.es6.js +29 -23
- package/plugins/schema/tuple/tuple.js +28 -22
- package/plugins/schema/uuid/uuid.es6.js +12 -4
- package/plugins/schema/uuid/uuid.js +11 -3
- package/types/appTypes.d.ts +3 -1
- package/utils/rules/constants.d.ts +4 -0
- package/utils/rules/constants.es6.js +547 -1
- package/utils/rules/constants.js +548 -0
- package/utils/rules/index.es6.js +1 -1
- package/utils/rules/index.js +2 -0
- package/hooks/useBodyFile/index.d.ts +0 -1
- package/hooks/useBodyFile/index.es6.js +0 -1
- package/hooks/useBodyFile/index.js +0 -10
- package/hooks/useBodyFile/useBodyFile.d.ts +0 -3
|
@@ -6,12 +6,14 @@ import '../../../utils/index.es6.js';
|
|
|
6
6
|
import { useBlock } from '../../../hooks/useBlock/useBlock.es6.js';
|
|
7
7
|
import { ruleContext } from '../../../hooks/useRule/useRule.es6.js';
|
|
8
8
|
import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
|
|
9
|
+
import { bodyContext } from '../../../hooks/useBodyContext/useBodyContext.es6.js';
|
|
9
10
|
import { schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.es6.js';
|
|
10
11
|
import { useParentRule, parentRuleContext } from '../../../hooks/useParentRule/useParentRule.es6.js';
|
|
11
12
|
import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
|
|
12
13
|
import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
|
|
13
14
|
import { arrayOf } from '../../../utils/rules/arrayOf/arrayOf.es6.js';
|
|
14
15
|
import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
|
|
16
|
+
import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
|
|
15
17
|
import { useEffect } from '../../../hooks/useEffect/useEffect.es6.js';
|
|
16
18
|
|
|
17
19
|
const array = () => {
|
|
@@ -20,6 +22,8 @@ const array = () => {
|
|
|
20
22
|
const handler = useNewHandler();
|
|
21
23
|
const { children, maxItems, minItems, uniqueItems, ...props } = useProps();
|
|
22
24
|
const schema = useSchemaType('array', props);
|
|
25
|
+
const isBody = Boolean(useContext(bodyContext));
|
|
26
|
+
const hasRules = !isBody || !props.readOnly;
|
|
23
27
|
const fieldSchema = {};
|
|
24
28
|
handler[schemaContext.key] = fieldSchema;
|
|
25
29
|
schema.items = fieldSchema;
|
|
@@ -32,7 +36,7 @@ const array = () => {
|
|
|
32
36
|
if (uniqueItems) {
|
|
33
37
|
schema.uniqueItems = uniqueItems;
|
|
34
38
|
}
|
|
35
|
-
if (setRule) {
|
|
39
|
+
if (setRule && hasRules) {
|
|
36
40
|
let oneOfRulesMap;
|
|
37
41
|
const rules = [];
|
|
38
42
|
const parentRule = useParentRule();
|
|
@@ -49,13 +53,14 @@ const array = () => {
|
|
|
49
53
|
}
|
|
50
54
|
else {
|
|
51
55
|
oneOfRulesMap = [rule];
|
|
52
|
-
|
|
56
|
+
const mainRule = rootRule(oneOf(oneOfRulesMap));
|
|
57
|
+
setRule(props.nullable ? oneOf([nullable, mainRule]) : mainRule);
|
|
53
58
|
}
|
|
54
59
|
});
|
|
55
60
|
innet(children, handler);
|
|
56
61
|
useEffect(() => {
|
|
57
|
-
if (!oneOfRulesMap
|
|
58
|
-
setRule(rootRule(e => e));
|
|
62
|
+
if (!oneOfRulesMap) {
|
|
63
|
+
setRule(props.nullable ? oneOf([nullable, rootRule(e => e)]) : rootRule(e => e));
|
|
59
64
|
}
|
|
60
65
|
});
|
|
61
66
|
return;
|
|
@@ -10,12 +10,14 @@ require('../../../utils/index.js');
|
|
|
10
10
|
var useBlock = require('../../../hooks/useBlock/useBlock.js');
|
|
11
11
|
var useRule = require('../../../hooks/useRule/useRule.js');
|
|
12
12
|
var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
|
|
13
|
+
var useBodyContext = require('../../../hooks/useBodyContext/useBodyContext.js');
|
|
13
14
|
var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext.js');
|
|
14
15
|
var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
|
|
15
16
|
var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
|
|
16
17
|
var pipe = require('../../../utils/rules/pipe/pipe.js');
|
|
17
18
|
var arrayOf = require('../../../utils/rules/arrayOf/arrayOf.js');
|
|
18
19
|
var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
|
|
20
|
+
var nullable = require('../../../utils/rules/nullable/nullable.js');
|
|
19
21
|
var useEffect = require('../../../hooks/useEffect/useEffect.js');
|
|
20
22
|
|
|
21
23
|
const array = () => {
|
|
@@ -24,6 +26,8 @@ const array = () => {
|
|
|
24
26
|
const handler = innet.useNewHandler();
|
|
25
27
|
const { children, maxItems, minItems, uniqueItems, ...props } = jsx.useProps();
|
|
26
28
|
const schema = useSchemaType.useSchemaType('array', props);
|
|
29
|
+
const isBody = Boolean(jsx.useContext(useBodyContext.bodyContext));
|
|
30
|
+
const hasRules = !isBody || !props.readOnly;
|
|
27
31
|
const fieldSchema = {};
|
|
28
32
|
handler[useSchemaContext.schemaContext.key] = fieldSchema;
|
|
29
33
|
schema.items = fieldSchema;
|
|
@@ -36,7 +40,7 @@ const array = () => {
|
|
|
36
40
|
if (uniqueItems) {
|
|
37
41
|
schema.uniqueItems = uniqueItems;
|
|
38
42
|
}
|
|
39
|
-
if (setRule) {
|
|
43
|
+
if (setRule && hasRules) {
|
|
40
44
|
let oneOfRulesMap;
|
|
41
45
|
const rules = [];
|
|
42
46
|
const parentRule = useParentRule.useParentRule();
|
|
@@ -53,13 +57,14 @@ const array = () => {
|
|
|
53
57
|
}
|
|
54
58
|
else {
|
|
55
59
|
oneOfRulesMap = [rule];
|
|
56
|
-
|
|
60
|
+
const mainRule = rootRule(oneOf.oneOf(oneOfRulesMap));
|
|
61
|
+
setRule(props.nullable ? oneOf.oneOf([nullable.nullable, mainRule]) : mainRule);
|
|
57
62
|
}
|
|
58
63
|
});
|
|
59
64
|
innet.innet(children, handler);
|
|
60
65
|
useEffect.useEffect(() => {
|
|
61
|
-
if (!oneOfRulesMap
|
|
62
|
-
setRule(rootRule(e => e));
|
|
66
|
+
if (!oneOfRulesMap) {
|
|
67
|
+
setRule(props.nullable ? oneOf.oneOf([nullable.nullable, rootRule(e => e)]) : rootRule(e => e));
|
|
63
68
|
}
|
|
64
69
|
});
|
|
65
70
|
return;
|
|
@@ -1,13 +1,8 @@
|
|
|
1
1
|
import { type HandlerPlugin } from 'innet';
|
|
2
|
-
|
|
2
|
+
import type { SchemaProps } from '../../../types';
|
|
3
|
+
export type BinaryProps = SchemaProps<string> & {
|
|
3
4
|
accept?: string;
|
|
4
|
-
deprecated: boolean;
|
|
5
|
-
description?: string;
|
|
6
5
|
max?: number;
|
|
7
6
|
min?: number;
|
|
8
|
-
|
|
9
|
-
ref?: string;
|
|
10
|
-
title?: string;
|
|
11
|
-
writeOnly: boolean;
|
|
12
|
-
}
|
|
7
|
+
};
|
|
13
8
|
export declare const binary: HandlerPlugin;
|
|
@@ -1,26 +1,32 @@
|
|
|
1
|
-
import { useProps } from '@innet/jsx';
|
|
1
|
+
import { useProps, useContext } from '@innet/jsx';
|
|
2
2
|
import '../../../hooks/index.es6.js';
|
|
3
3
|
import '../../../hooks/useParentRule/index.es6.js';
|
|
4
4
|
import '../../../utils/index.es6.js';
|
|
5
5
|
import { useBlock } from '../../../hooks/useBlock/useBlock.es6.js';
|
|
6
|
-
import {
|
|
6
|
+
import { useBodyContext, bodyContext } from '../../../hooks/useBodyContext/useBodyContext.es6.js';
|
|
7
7
|
import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
|
|
8
8
|
import { bin } from '../../../utils/rules/bin/bin.es6.js';
|
|
9
9
|
import { minBin } from '../../../utils/rules/minBin/minBin.es6.js';
|
|
10
10
|
import { maxBin } from '../../../utils/rules/maxBin/maxBin.es6.js';
|
|
11
11
|
import { binaryAccept } from '../../../utils/rules/binaryAccept/binaryAccept.es6.js';
|
|
12
12
|
import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
|
|
13
|
-
import {
|
|
13
|
+
import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
|
|
14
|
+
import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
|
|
14
15
|
import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
|
|
16
|
+
import { useRule } from '../../../hooks/useRule/useRule.es6.js';
|
|
15
17
|
|
|
16
18
|
const binary = () => {
|
|
17
19
|
useBlock('path');
|
|
18
|
-
|
|
20
|
+
useBodyContext().useFile();
|
|
19
21
|
const props = useProps();
|
|
20
22
|
const schema = useSchemaType('string', props);
|
|
23
|
+
const isBody = Boolean(useContext(bodyContext));
|
|
24
|
+
const hasRules = !isBody || !props.readOnly;
|
|
21
25
|
if (schema) {
|
|
22
26
|
schema.format = 'binary';
|
|
23
27
|
}
|
|
28
|
+
if (!hasRules)
|
|
29
|
+
return;
|
|
24
30
|
const rules = [];
|
|
25
31
|
rules.push(bin);
|
|
26
32
|
if (props === null || props === void 0 ? void 0 : props.min) {
|
|
@@ -33,7 +39,8 @@ const binary = () => {
|
|
|
33
39
|
rules.push(binaryAccept(props.accept));
|
|
34
40
|
}
|
|
35
41
|
const parentRule = useParentRule();
|
|
36
|
-
|
|
42
|
+
const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
|
|
43
|
+
useRule(parentRule(rule));
|
|
37
44
|
};
|
|
38
45
|
|
|
39
46
|
export { binary };
|
|
@@ -7,24 +7,30 @@ require('../../../hooks/index.js');
|
|
|
7
7
|
require('../../../hooks/useParentRule/index.js');
|
|
8
8
|
require('../../../utils/index.js');
|
|
9
9
|
var useBlock = require('../../../hooks/useBlock/useBlock.js');
|
|
10
|
-
var
|
|
10
|
+
var useBodyContext = require('../../../hooks/useBodyContext/useBodyContext.js');
|
|
11
11
|
var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
|
|
12
12
|
var bin = require('../../../utils/rules/bin/bin.js');
|
|
13
13
|
var minBin = require('../../../utils/rules/minBin/minBin.js');
|
|
14
14
|
var maxBin = require('../../../utils/rules/maxBin/maxBin.js');
|
|
15
15
|
var binaryAccept = require('../../../utils/rules/binaryAccept/binaryAccept.js');
|
|
16
16
|
var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
|
|
17
|
-
var
|
|
17
|
+
var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
|
|
18
|
+
var nullable = require('../../../utils/rules/nullable/nullable.js');
|
|
18
19
|
var pipe = require('../../../utils/rules/pipe/pipe.js');
|
|
20
|
+
var useRule = require('../../../hooks/useRule/useRule.js');
|
|
19
21
|
|
|
20
22
|
const binary = () => {
|
|
21
23
|
useBlock.useBlock('path');
|
|
22
|
-
|
|
24
|
+
useBodyContext.useBodyContext().useFile();
|
|
23
25
|
const props = jsx.useProps();
|
|
24
26
|
const schema = useSchemaType.useSchemaType('string', props);
|
|
27
|
+
const isBody = Boolean(jsx.useContext(useBodyContext.bodyContext));
|
|
28
|
+
const hasRules = !isBody || !props.readOnly;
|
|
25
29
|
if (schema) {
|
|
26
30
|
schema.format = 'binary';
|
|
27
31
|
}
|
|
32
|
+
if (!hasRules)
|
|
33
|
+
return;
|
|
28
34
|
const rules = [];
|
|
29
35
|
rules.push(bin.bin);
|
|
30
36
|
if (props === null || props === void 0 ? void 0 : props.min) {
|
|
@@ -37,7 +43,8 @@ const binary = () => {
|
|
|
37
43
|
rules.push(binaryAccept.binaryAccept(props.accept));
|
|
38
44
|
}
|
|
39
45
|
const parentRule = useParentRule.useParentRule();
|
|
40
|
-
|
|
46
|
+
const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
|
|
47
|
+
useRule.useRule(parentRule(rule));
|
|
41
48
|
};
|
|
42
49
|
|
|
43
50
|
exports.binary = binary;
|
|
@@ -1,29 +1,37 @@
|
|
|
1
|
-
import { useProps } from '@innet/jsx';
|
|
1
|
+
import { useProps, useContext } from '@innet/jsx';
|
|
2
2
|
import '../../../hooks/index.es6.js';
|
|
3
3
|
import '../../../hooks/useParentRule/index.es6.js';
|
|
4
4
|
import '../../../utils/index.es6.js';
|
|
5
5
|
import { useBlock } from '../../../hooks/useBlock/useBlock.es6.js';
|
|
6
6
|
import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
|
|
7
|
+
import { bodyContext } from '../../../hooks/useBodyContext/useBodyContext.es6.js';
|
|
7
8
|
import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
|
|
9
|
+
import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
|
|
10
|
+
import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
|
|
11
|
+
import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
|
|
8
12
|
import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
|
|
9
13
|
import { useRule } from '../../../hooks/useRule/useRule.es6.js';
|
|
10
|
-
import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
|
|
11
14
|
|
|
12
15
|
const boolean = () => {
|
|
13
16
|
useBlock('path');
|
|
14
17
|
const props = useProps();
|
|
15
18
|
useSchemaType('boolean', props);
|
|
19
|
+
const isBody = Boolean(useContext(bodyContext));
|
|
20
|
+
const hasRules = !isBody || !props.readOnly;
|
|
21
|
+
if (!hasRules)
|
|
22
|
+
return;
|
|
16
23
|
const rules = [];
|
|
17
24
|
if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
|
|
18
25
|
rules.push(defaultTo(props.default));
|
|
19
26
|
}
|
|
20
27
|
rules.push(val => val === 'true' || (val === 'false' ? false : Boolean(val)));
|
|
21
|
-
|
|
28
|
+
const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
|
|
29
|
+
if (props.default === undefined) {
|
|
22
30
|
const parentRule = useParentRule();
|
|
23
|
-
useRule(parentRule(
|
|
31
|
+
useRule(parentRule(rule));
|
|
24
32
|
}
|
|
25
33
|
else {
|
|
26
|
-
useRule(
|
|
34
|
+
useRule(rule);
|
|
27
35
|
}
|
|
28
36
|
};
|
|
29
37
|
|
|
@@ -8,26 +8,34 @@ require('../../../hooks/useParentRule/index.js');
|
|
|
8
8
|
require('../../../utils/index.js');
|
|
9
9
|
var useBlock = require('../../../hooks/useBlock/useBlock.js');
|
|
10
10
|
var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
|
|
11
|
+
var useBodyContext = require('../../../hooks/useBodyContext/useBodyContext.js');
|
|
11
12
|
var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
|
|
13
|
+
var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
|
|
14
|
+
var nullable = require('../../../utils/rules/nullable/nullable.js');
|
|
15
|
+
var pipe = require('../../../utils/rules/pipe/pipe.js');
|
|
12
16
|
var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
|
|
13
17
|
var useRule = require('../../../hooks/useRule/useRule.js');
|
|
14
|
-
var pipe = require('../../../utils/rules/pipe/pipe.js');
|
|
15
18
|
|
|
16
19
|
const boolean = () => {
|
|
17
20
|
useBlock.useBlock('path');
|
|
18
21
|
const props = jsx.useProps();
|
|
19
22
|
useSchemaType.useSchemaType('boolean', props);
|
|
23
|
+
const isBody = Boolean(jsx.useContext(useBodyContext.bodyContext));
|
|
24
|
+
const hasRules = !isBody || !props.readOnly;
|
|
25
|
+
if (!hasRules)
|
|
26
|
+
return;
|
|
20
27
|
const rules = [];
|
|
21
28
|
if ((props === null || props === void 0 ? void 0 : props.default) !== undefined) {
|
|
22
29
|
rules.push(defaultTo.defaultTo(props.default));
|
|
23
30
|
}
|
|
24
31
|
rules.push(val => val === 'true' || (val === 'false' ? false : Boolean(val)));
|
|
25
|
-
|
|
32
|
+
const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
|
|
33
|
+
if (props.default === undefined) {
|
|
26
34
|
const parentRule = useParentRule.useParentRule();
|
|
27
|
-
useRule.useRule(parentRule(
|
|
35
|
+
useRule.useRule(parentRule(rule));
|
|
28
36
|
}
|
|
29
37
|
else {
|
|
30
|
-
useRule.useRule(
|
|
38
|
+
useRule.useRule(rule);
|
|
31
39
|
}
|
|
32
40
|
};
|
|
33
41
|
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { useProps } from '@innet/jsx';
|
|
1
|
+
import { useProps, useContext } from '@innet/jsx';
|
|
2
2
|
import '../../../hooks/index.es6.js';
|
|
3
3
|
import '../../../hooks/useParentRule/index.es6.js';
|
|
4
4
|
import '../../../utils/index.es6.js';
|
|
5
5
|
import '../../../utils/dateFormat/index.es6.js';
|
|
6
|
+
import { bodyContext } from '../../../hooks/useBodyContext/useBodyContext.es6.js';
|
|
6
7
|
import { dateFormat } from '../../../utils/dateFormat/dateFormat.es6.js';
|
|
7
8
|
import { getArrayValues, values } from '../../../utils/rules/values/values.es6.js';
|
|
8
9
|
import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
|
|
@@ -10,12 +11,16 @@ import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
|
|
|
10
11
|
import { dateTo } from '../../../utils/rules/dateTo/dateTo.es6.js';
|
|
11
12
|
import { minDate } from '../../../utils/rules/minDate/minDate.es6.js';
|
|
12
13
|
import { maxDate } from '../../../utils/rules/maxDate/maxDate.es6.js';
|
|
14
|
+
import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
|
|
15
|
+
import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
|
|
16
|
+
import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
|
|
13
17
|
import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
|
|
14
18
|
import { useRule } from '../../../hooks/useRule/useRule.es6.js';
|
|
15
|
-
import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
|
|
16
19
|
|
|
17
20
|
const date = () => {
|
|
18
21
|
const { default: defaultValue, example, examples, max, min, value, values: values$1, ...props } = useProps() || {};
|
|
22
|
+
const isBody = Boolean(useContext(bodyContext));
|
|
23
|
+
const hasRules = !isBody || !props.readOnly;
|
|
19
24
|
const normMin = dateFormat(min);
|
|
20
25
|
const normMax = dateFormat(max);
|
|
21
26
|
const normDefault = dateFormat(defaultValue);
|
|
@@ -58,12 +63,15 @@ const date = () => {
|
|
|
58
63
|
// @ts-expect-error: FIXME
|
|
59
64
|
schema['x-default'] = 'now';
|
|
60
65
|
}
|
|
66
|
+
if (!hasRules)
|
|
67
|
+
return;
|
|
68
|
+
const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
|
|
61
69
|
if (defaultValue === undefined) {
|
|
62
70
|
const parentRule = useParentRule();
|
|
63
|
-
useRule(parentRule(
|
|
71
|
+
useRule(parentRule(rule));
|
|
64
72
|
}
|
|
65
73
|
else {
|
|
66
|
-
useRule(
|
|
74
|
+
useRule(rule);
|
|
67
75
|
}
|
|
68
76
|
};
|
|
69
77
|
|
|
@@ -7,6 +7,7 @@ require('../../../hooks/index.js');
|
|
|
7
7
|
require('../../../hooks/useParentRule/index.js');
|
|
8
8
|
require('../../../utils/index.js');
|
|
9
9
|
require('../../../utils/dateFormat/index.js');
|
|
10
|
+
var useBodyContext = require('../../../hooks/useBodyContext/useBodyContext.js');
|
|
10
11
|
var dateFormat = require('../../../utils/dateFormat/dateFormat.js');
|
|
11
12
|
var values = require('../../../utils/rules/values/values.js');
|
|
12
13
|
var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
|
|
@@ -14,12 +15,16 @@ var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
|
|
|
14
15
|
var dateTo = require('../../../utils/rules/dateTo/dateTo.js');
|
|
15
16
|
var minDate = require('../../../utils/rules/minDate/minDate.js');
|
|
16
17
|
var maxDate = require('../../../utils/rules/maxDate/maxDate.js');
|
|
18
|
+
var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
|
|
19
|
+
var nullable = require('../../../utils/rules/nullable/nullable.js');
|
|
20
|
+
var pipe = require('../../../utils/rules/pipe/pipe.js');
|
|
17
21
|
var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
|
|
18
22
|
var useRule = require('../../../hooks/useRule/useRule.js');
|
|
19
|
-
var pipe = require('../../../utils/rules/pipe/pipe.js');
|
|
20
23
|
|
|
21
24
|
const date = () => {
|
|
22
25
|
const { default: defaultValue, example, examples, max, min, value, values: values$1, ...props } = jsx.useProps() || {};
|
|
26
|
+
const isBody = Boolean(jsx.useContext(useBodyContext.bodyContext));
|
|
27
|
+
const hasRules = !isBody || !props.readOnly;
|
|
23
28
|
const normMin = dateFormat.dateFormat(min);
|
|
24
29
|
const normMax = dateFormat.dateFormat(max);
|
|
25
30
|
const normDefault = dateFormat.dateFormat(defaultValue);
|
|
@@ -62,12 +67,15 @@ const date = () => {
|
|
|
62
67
|
// @ts-expect-error: FIXME
|
|
63
68
|
schema['x-default'] = 'now';
|
|
64
69
|
}
|
|
70
|
+
if (!hasRules)
|
|
71
|
+
return;
|
|
72
|
+
const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
|
|
65
73
|
if (defaultValue === undefined) {
|
|
66
74
|
const parentRule = useParentRule.useParentRule();
|
|
67
|
-
useRule.useRule(parentRule(
|
|
75
|
+
useRule.useRule(parentRule(rule));
|
|
68
76
|
}
|
|
69
77
|
else {
|
|
70
|
-
useRule.useRule(
|
|
78
|
+
useRule.useRule(rule);
|
|
71
79
|
}
|
|
72
80
|
};
|
|
73
81
|
|
|
@@ -1,18 +1,23 @@
|
|
|
1
|
-
import { useProps } from '@innet/jsx';
|
|
1
|
+
import { useProps, useContext } from '@innet/jsx';
|
|
2
2
|
import '../../../hooks/index.es6.js';
|
|
3
3
|
import '../../../utils/index.es6.js';
|
|
4
|
+
import { bodyContext } from '../../../hooks/useBodyContext/useBodyContext.es6.js';
|
|
4
5
|
import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
|
|
5
6
|
import { getArrayValues, values } from '../../../utils/rules/values/values.es6.js';
|
|
6
7
|
import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
|
|
7
8
|
import { int } from '../../../utils/rules/int/int.es6.js';
|
|
8
9
|
import { min } from '../../../utils/rules/min/min.es6.js';
|
|
9
10
|
import { max } from '../../../utils/rules/max/max.es6.js';
|
|
11
|
+
import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
|
|
12
|
+
import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
|
|
13
|
+
import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
|
|
10
14
|
import { useRule } from '../../../hooks/useRule/useRule.es6.js';
|
|
11
15
|
import { optional } from '../../../utils/rules/optional/optional.es6.js';
|
|
12
|
-
import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
|
|
13
16
|
|
|
14
17
|
const integer = () => {
|
|
15
18
|
const { default: defaultValue, example, examples, exclusiveMaximum, exclusiveMinimum, format = 'int32', max: max$1, min: min$1, multipleOf, values: values$1, ...props } = useProps() || {};
|
|
19
|
+
const isBody = Boolean(useContext(bodyContext));
|
|
20
|
+
const hasRules = !isBody || !props.readOnly;
|
|
16
21
|
const schema = useSchemaType('integer', {
|
|
17
22
|
...props,
|
|
18
23
|
default: defaultValue !== undefined ? Number(defaultValue) : undefined,
|
|
@@ -41,6 +46,8 @@ const integer = () => {
|
|
|
41
46
|
schema.multipleOf = Number(multipleOf);
|
|
42
47
|
}
|
|
43
48
|
}
|
|
49
|
+
if (!hasRules)
|
|
50
|
+
return;
|
|
44
51
|
const rules = [];
|
|
45
52
|
if (defaultValue !== undefined) {
|
|
46
53
|
rules.push(defaultTo(defaultValue));
|
|
@@ -55,11 +62,12 @@ const integer = () => {
|
|
|
55
62
|
if (max$1 !== undefined) {
|
|
56
63
|
rules.push(max(max$1));
|
|
57
64
|
}
|
|
65
|
+
const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
|
|
58
66
|
if (defaultValue === undefined) {
|
|
59
|
-
useRule(optional(
|
|
67
|
+
useRule(optional(rule));
|
|
60
68
|
}
|
|
61
69
|
else {
|
|
62
|
-
useRule(
|
|
70
|
+
useRule(rule);
|
|
63
71
|
}
|
|
64
72
|
};
|
|
65
73
|
|
|
@@ -5,18 +5,23 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
5
5
|
var jsx = require('@innet/jsx');
|
|
6
6
|
require('../../../hooks/index.js');
|
|
7
7
|
require('../../../utils/index.js');
|
|
8
|
+
var useBodyContext = require('../../../hooks/useBodyContext/useBodyContext.js');
|
|
8
9
|
var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
|
|
9
10
|
var values = require('../../../utils/rules/values/values.js');
|
|
10
11
|
var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
|
|
11
12
|
var int = require('../../../utils/rules/int/int.js');
|
|
12
13
|
var min = require('../../../utils/rules/min/min.js');
|
|
13
14
|
var max = require('../../../utils/rules/max/max.js');
|
|
15
|
+
var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
|
|
16
|
+
var nullable = require('../../../utils/rules/nullable/nullable.js');
|
|
17
|
+
var pipe = require('../../../utils/rules/pipe/pipe.js');
|
|
14
18
|
var useRule = require('../../../hooks/useRule/useRule.js');
|
|
15
19
|
var optional = require('../../../utils/rules/optional/optional.js');
|
|
16
|
-
var pipe = require('../../../utils/rules/pipe/pipe.js');
|
|
17
20
|
|
|
18
21
|
const integer = () => {
|
|
19
22
|
const { default: defaultValue, example, examples, exclusiveMaximum, exclusiveMinimum, format = 'int32', max: max$1, min: min$1, multipleOf, values: values$1, ...props } = jsx.useProps() || {};
|
|
23
|
+
const isBody = Boolean(jsx.useContext(useBodyContext.bodyContext));
|
|
24
|
+
const hasRules = !isBody || !props.readOnly;
|
|
20
25
|
const schema = useSchemaType.useSchemaType('integer', {
|
|
21
26
|
...props,
|
|
22
27
|
default: defaultValue !== undefined ? Number(defaultValue) : undefined,
|
|
@@ -45,6 +50,8 @@ const integer = () => {
|
|
|
45
50
|
schema.multipleOf = Number(multipleOf);
|
|
46
51
|
}
|
|
47
52
|
}
|
|
53
|
+
if (!hasRules)
|
|
54
|
+
return;
|
|
48
55
|
const rules = [];
|
|
49
56
|
if (defaultValue !== undefined) {
|
|
50
57
|
rules.push(defaultTo.defaultTo(defaultValue));
|
|
@@ -59,11 +66,12 @@ const integer = () => {
|
|
|
59
66
|
if (max$1 !== undefined) {
|
|
60
67
|
rules.push(max.max(max$1));
|
|
61
68
|
}
|
|
69
|
+
const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
|
|
62
70
|
if (defaultValue === undefined) {
|
|
63
|
-
useRule.useRule(optional.optional(
|
|
71
|
+
useRule.useRule(optional.optional(rule));
|
|
64
72
|
}
|
|
65
73
|
else {
|
|
66
|
-
useRule.useRule(
|
|
74
|
+
useRule.useRule(rule);
|
|
67
75
|
}
|
|
68
76
|
};
|
|
69
77
|
|
|
@@ -1,14 +1,20 @@
|
|
|
1
|
-
import { useProps } from '@innet/jsx';
|
|
1
|
+
import { useProps, useContext } from '@innet/jsx';
|
|
2
2
|
import '../../../hooks/index.es6.js';
|
|
3
3
|
import '../../../utils/index.es6.js';
|
|
4
4
|
import { useBlock } from '../../../hooks/useBlock/useBlock.es6.js';
|
|
5
5
|
import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
|
|
6
|
+
import { bodyContext } from '../../../hooks/useBodyContext/useBodyContext.es6.js';
|
|
6
7
|
import { useRule } from '../../../hooks/useRule/useRule.es6.js';
|
|
7
8
|
import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
|
|
8
9
|
|
|
9
10
|
const nullPlugin = () => {
|
|
10
11
|
useBlock('path', 'query', 'cookie', 'header');
|
|
11
|
-
|
|
12
|
+
const props = useProps();
|
|
13
|
+
useSchemaType('null', props);
|
|
14
|
+
const isBody = Boolean(useContext(bodyContext));
|
|
15
|
+
const hasRules = !isBody || !props.readOnly;
|
|
16
|
+
if (!hasRules)
|
|
17
|
+
return;
|
|
12
18
|
useRule(nullable);
|
|
13
19
|
};
|
|
14
20
|
|
|
@@ -7,12 +7,18 @@ require('../../../hooks/index.js');
|
|
|
7
7
|
require('../../../utils/index.js');
|
|
8
8
|
var useBlock = require('../../../hooks/useBlock/useBlock.js');
|
|
9
9
|
var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
|
|
10
|
+
var useBodyContext = require('../../../hooks/useBodyContext/useBodyContext.js');
|
|
10
11
|
var useRule = require('../../../hooks/useRule/useRule.js');
|
|
11
12
|
var nullable = require('../../../utils/rules/nullable/nullable.js');
|
|
12
13
|
|
|
13
14
|
const nullPlugin = () => {
|
|
14
15
|
useBlock.useBlock('path', 'query', 'cookie', 'header');
|
|
15
|
-
|
|
16
|
+
const props = jsx.useProps();
|
|
17
|
+
useSchemaType.useSchemaType('null', props);
|
|
18
|
+
const isBody = Boolean(jsx.useContext(useBodyContext.bodyContext));
|
|
19
|
+
const hasRules = !isBody || !props.readOnly;
|
|
20
|
+
if (!hasRules)
|
|
21
|
+
return;
|
|
16
22
|
useRule.useRule(nullable.nullable);
|
|
17
23
|
};
|
|
18
24
|
|
|
@@ -1,19 +1,24 @@
|
|
|
1
|
-
import { useProps } from '@innet/jsx';
|
|
1
|
+
import { useProps, useContext } from '@innet/jsx';
|
|
2
2
|
import '../../../hooks/index.es6.js';
|
|
3
3
|
import '../../../hooks/useParentRule/index.es6.js';
|
|
4
4
|
import '../../../utils/index.es6.js';
|
|
5
|
+
import { bodyContext } from '../../../hooks/useBodyContext/useBodyContext.es6.js';
|
|
5
6
|
import { useSchemaType } from '../../../hooks/useSchemaType/useSchemaType.es6.js';
|
|
6
7
|
import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
|
|
7
8
|
import { num } from '../../../utils/rules/num/num.es6.js';
|
|
8
9
|
import { values, getArrayValues } from '../../../utils/rules/values/values.es6.js';
|
|
9
10
|
import { min } from '../../../utils/rules/min/min.es6.js';
|
|
10
11
|
import { max } from '../../../utils/rules/max/max.es6.js';
|
|
12
|
+
import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
|
|
13
|
+
import { nullable } from '../../../utils/rules/nullable/nullable.es6.js';
|
|
14
|
+
import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
|
|
11
15
|
import { useParentRule } from '../../../hooks/useParentRule/useParentRule.es6.js';
|
|
12
16
|
import { useRule } from '../../../hooks/useRule/useRule.es6.js';
|
|
13
|
-
import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
|
|
14
17
|
|
|
15
18
|
const number = () => {
|
|
16
19
|
const { exclusiveMaximum, exclusiveMinimum, format, max: max$1, min: min$1, multipleOf, ...props } = useProps() || {};
|
|
20
|
+
const isBody = Boolean(useContext(bodyContext));
|
|
21
|
+
const hasRules = !isBody || !props.readOnly;
|
|
17
22
|
const schema = useSchemaType('number', props);
|
|
18
23
|
if (schema) {
|
|
19
24
|
if (format !== undefined) {
|
|
@@ -35,6 +40,8 @@ const number = () => {
|
|
|
35
40
|
schema.multipleOf = Number(multipleOf);
|
|
36
41
|
}
|
|
37
42
|
}
|
|
43
|
+
if (!hasRules)
|
|
44
|
+
return;
|
|
38
45
|
const rules = [];
|
|
39
46
|
if (props.default !== undefined) {
|
|
40
47
|
rules.push(defaultTo(props.default));
|
|
@@ -49,12 +56,13 @@ const number = () => {
|
|
|
49
56
|
if (max$1 !== undefined) {
|
|
50
57
|
rules.push(max(max$1));
|
|
51
58
|
}
|
|
59
|
+
const rule = props.nullable ? oneOf([nullable, pipe(...rules)]) : pipe(...rules);
|
|
52
60
|
if (props.default === undefined) {
|
|
53
61
|
const rootRule = useParentRule();
|
|
54
|
-
useRule(rootRule(
|
|
62
|
+
useRule(rootRule(rule));
|
|
55
63
|
}
|
|
56
64
|
else {
|
|
57
|
-
useRule(
|
|
65
|
+
useRule(rule);
|
|
58
66
|
}
|
|
59
67
|
};
|
|
60
68
|
|
|
@@ -6,18 +6,23 @@ var jsx = require('@innet/jsx');
|
|
|
6
6
|
require('../../../hooks/index.js');
|
|
7
7
|
require('../../../hooks/useParentRule/index.js');
|
|
8
8
|
require('../../../utils/index.js');
|
|
9
|
+
var useBodyContext = require('../../../hooks/useBodyContext/useBodyContext.js');
|
|
9
10
|
var useSchemaType = require('../../../hooks/useSchemaType/useSchemaType.js');
|
|
10
11
|
var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
|
|
11
12
|
var num = require('../../../utils/rules/num/num.js');
|
|
12
13
|
var values = require('../../../utils/rules/values/values.js');
|
|
13
14
|
var min = require('../../../utils/rules/min/min.js');
|
|
14
15
|
var max = require('../../../utils/rules/max/max.js');
|
|
16
|
+
var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
|
|
17
|
+
var nullable = require('../../../utils/rules/nullable/nullable.js');
|
|
18
|
+
var pipe = require('../../../utils/rules/pipe/pipe.js');
|
|
15
19
|
var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
|
|
16
20
|
var useRule = require('../../../hooks/useRule/useRule.js');
|
|
17
|
-
var pipe = require('../../../utils/rules/pipe/pipe.js');
|
|
18
21
|
|
|
19
22
|
const number = () => {
|
|
20
23
|
const { exclusiveMaximum, exclusiveMinimum, format, max: max$1, min: min$1, multipleOf, ...props } = jsx.useProps() || {};
|
|
24
|
+
const isBody = Boolean(jsx.useContext(useBodyContext.bodyContext));
|
|
25
|
+
const hasRules = !isBody || !props.readOnly;
|
|
21
26
|
const schema = useSchemaType.useSchemaType('number', props);
|
|
22
27
|
if (schema) {
|
|
23
28
|
if (format !== undefined) {
|
|
@@ -39,6 +44,8 @@ const number = () => {
|
|
|
39
44
|
schema.multipleOf = Number(multipleOf);
|
|
40
45
|
}
|
|
41
46
|
}
|
|
47
|
+
if (!hasRules)
|
|
48
|
+
return;
|
|
42
49
|
const rules = [];
|
|
43
50
|
if (props.default !== undefined) {
|
|
44
51
|
rules.push(defaultTo.defaultTo(props.default));
|
|
@@ -53,12 +60,13 @@ const number = () => {
|
|
|
53
60
|
if (max$1 !== undefined) {
|
|
54
61
|
rules.push(max.max(max$1));
|
|
55
62
|
}
|
|
63
|
+
const rule = props.nullable ? oneOf.oneOf([nullable.nullable, pipe.pipe(...rules)]) : pipe.pipe(...rules);
|
|
56
64
|
if (props.default === undefined) {
|
|
57
65
|
const rootRule = useParentRule.useParentRule();
|
|
58
|
-
useRule.useRule(rootRule(
|
|
66
|
+
useRule.useRule(rootRule(rule));
|
|
59
67
|
}
|
|
60
68
|
else {
|
|
61
|
-
useRule.useRule(
|
|
69
|
+
useRule.useRule(rule);
|
|
62
70
|
}
|
|
63
71
|
};
|
|
64
72
|
|