@innet/server 2.0.0-beta.3 → 2.0.0-beta.4
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/hooks/index.d.ts +1 -0
- package/hooks/index.es6.js +1 -0
- package/hooks/index.js +1 -0
- package/hooks/useEffect/index.d.ts +1 -0
- package/hooks/useEffect/index.es6.js +1 -0
- package/hooks/useEffect/index.js +9 -0
- package/hooks/useEffect/useEffect.d.ts +2 -0
- package/hooks/useEffect/useEffect.es6.js +8 -0
- package/hooks/useEffect/useEffect.js +12 -0
- package/index.es6.js +1 -0
- package/index.js +2 -0
- package/package.json +8 -6
- package/plugins/handler/serverFn/serverFn.es6.js +1 -1
- package/plugins/handler/serverFn/serverFn.js +1 -5
- package/plugins/main/api/api.es6.js +1 -1
- package/plugins/main/api/api.js +3 -7
- package/plugins/main/body/body.es6.js +4 -4
- package/plugins/main/body/body.js +4 -8
- package/plugins/main/endpoint/endpoint.es6.js +4 -4
- package/plugins/main/endpoint/endpoint.js +4 -8
- package/plugins/main/host/host.es6.js +1 -1
- package/plugins/main/host/host.js +1 -5
- package/plugins/main/param/param.es6.js +1 -1
- package/plugins/main/param/param.js +1 -5
- package/plugins/main/preset/preset.es6.js +1 -1
- package/plugins/main/preset/preset.js +1 -5
- package/plugins/main/response/response.es6.js +1 -1
- package/plugins/main/response/response.js +1 -5
- package/plugins/main/server/server.es6.js +1 -1
- package/plugins/main/server/server.js +2 -3
- package/plugins/main/tag/tag.es6.js +1 -1
- package/plugins/main/tag/tag.js +1 -5
- package/plugins/request/cms/cms.es6.js +1 -1
- package/plugins/request/cms/cms.js +2 -3
- package/plugins/request/file/file.es6.js +1 -1
- package/plugins/request/file/file.js +1 -2
- package/plugins/schema/array/array.es6.js +4 -4
- package/plugins/schema/array/array.js +5 -9
- package/plugins/schema/field/field.es6.js +1 -1
- package/plugins/schema/field/field.js +1 -5
- package/plugins/schema/object/object.es6.js +4 -4
- package/plugins/schema/object/object.js +4 -8
- package/plugins/schema/tuple/tuple.es6.js +4 -4
- package/plugins/schema/tuple/tuple.js +4 -8
- package/plugins/utils/dts/dts.es6.js +5 -2
- package/plugins/utils/dts/dts.js +5 -2
- package/plugins/utils/env/env.es6.js +1 -1
- package/plugins/utils/env/env.js +1 -5
- package/types.d.ts +1 -0
package/hooks/index.d.ts
CHANGED
package/hooks/index.es6.js
CHANGED
package/hooks/index.js
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './useEffect';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { useEffect } from './useEffect.es6.js';
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
|
+
|
|
5
|
+
var innet = require('innet');
|
|
6
|
+
var utils = require('@innet/utils');
|
|
7
|
+
|
|
8
|
+
function useEffect(effect) {
|
|
9
|
+
innet.innet(effect, utils.callHandler, 1, true);
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
exports.useEffect = useEffect;
|
package/index.es6.js
CHANGED
|
@@ -116,3 +116,4 @@ export { objectSchemaContext, useObjectSchemaContext } from './hooks/useObjectSc
|
|
|
116
116
|
export { serverPortContext, useServerPort } from './hooks/useServerPort/useServerPort.es6.js';
|
|
117
117
|
export { serverHttpsContext, useIsServerHttps } from './hooks/useIsServerHttps/useIsServerHttps.es6.js';
|
|
118
118
|
export { requestHandlerContext, useRequestHandler } from './hooks/useRequestHandler/useRequestHandler.es6.js';
|
|
119
|
+
export { useEffect } from './hooks/useEffect/useEffect.es6.js';
|
package/index.js
CHANGED
|
@@ -120,6 +120,7 @@ var useObjectSchemaContext = require('./hooks/useObjectSchemaContext/useObjectSc
|
|
|
120
120
|
var useServerPort = require('./hooks/useServerPort/useServerPort.js');
|
|
121
121
|
var useIsServerHttps = require('./hooks/useIsServerHttps/useIsServerHttps.js');
|
|
122
122
|
var useRequestHandler = require('./hooks/useRequestHandler/useRequestHandler.js');
|
|
123
|
+
var useEffect = require('./hooks/useEffect/useEffect.js');
|
|
123
124
|
|
|
124
125
|
|
|
125
126
|
|
|
@@ -268,3 +269,4 @@ exports.serverHttpsContext = useIsServerHttps.serverHttpsContext;
|
|
|
268
269
|
exports.useIsServerHttps = useIsServerHttps.useIsServerHttps;
|
|
269
270
|
exports.requestHandlerContext = useRequestHandler.requestHandlerContext;
|
|
270
271
|
exports.useRequestHandler = useRequestHandler.useRequestHandler;
|
|
272
|
+
exports.useEffect = useEffect.useEffect;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@innet/server",
|
|
3
|
-
"version": "2.0.0-beta.
|
|
3
|
+
"version": "2.0.0-beta.4",
|
|
4
4
|
"description": "Create server-side application with innet",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"module": "index.es6.js",
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"types": "index.d.ts",
|
|
9
9
|
"scripts": {
|
|
10
10
|
"build": "innetjs release -e",
|
|
11
|
-
"start": "innetjs start -n -i example/index",
|
|
11
|
+
"start": "innetjs start -n -e -i example/index",
|
|
12
12
|
"test": "jest",
|
|
13
13
|
"api": "jest",
|
|
14
14
|
"lint": "eslint src --ext .ts,.tsx",
|
|
@@ -35,15 +35,16 @@
|
|
|
35
35
|
},
|
|
36
36
|
"homepage": "https://github.com/d8corp/innet-server",
|
|
37
37
|
"dependencies": {
|
|
38
|
+
"@babel/code-frame": "^7.29.0",
|
|
38
39
|
"@cantinc/utils": "^1.4.4",
|
|
39
|
-
"@innet/jsx": "2.
|
|
40
|
-
"@innet/utils": "2.
|
|
40
|
+
"@innet/jsx": "^2.1.2",
|
|
41
|
+
"@innet/utils": "^2.1.0",
|
|
41
42
|
"@types/cookie": "^1.0.0",
|
|
42
43
|
"@types/multiparty": "^4.2.1",
|
|
43
44
|
"@types/qs": "^6.15.0",
|
|
44
45
|
"cookie": "^1.1.1",
|
|
45
46
|
"http-proxy": "^1.18.1",
|
|
46
|
-
"innet": "2.
|
|
47
|
+
"innet": "^2.1.0",
|
|
47
48
|
"mime": "^4.1.0",
|
|
48
49
|
"multiparty": "^4.2.3",
|
|
49
50
|
"openapi-types": "^12.1.3",
|
|
@@ -52,6 +53,7 @@
|
|
|
52
53
|
"string_decoder": "^1.3.0",
|
|
53
54
|
"tslib": "^2.8.1",
|
|
54
55
|
"uuid": "^13.0.0",
|
|
55
|
-
"watch-state": "^3.6.2"
|
|
56
|
+
"watch-state": "^3.6.2",
|
|
57
|
+
"youch": "^4.1.0"
|
|
56
58
|
}
|
|
57
59
|
}
|
|
@@ -5,16 +5,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
5
5
|
var innet = require('innet');
|
|
6
6
|
var watchState = require('watch-state');
|
|
7
7
|
|
|
8
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
9
|
-
|
|
10
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
11
|
-
|
|
12
8
|
const serverFn = () => {
|
|
13
9
|
return () => {
|
|
14
10
|
const handler = innet.useHandler();
|
|
15
11
|
const fn = innet.useApp();
|
|
16
12
|
new watchState.Watch((update) => {
|
|
17
|
-
|
|
13
|
+
innet.innet(fn(update), handler);
|
|
18
14
|
});
|
|
19
15
|
};
|
|
20
16
|
};
|
package/plugins/main/api/api.js
CHANGED
|
@@ -15,10 +15,6 @@ var JSONString = require('../../../utils/JSONString/JSONString.js');
|
|
|
15
15
|
var helpers = require('../../../utils/rules/helpers.js');
|
|
16
16
|
var useParams = require('../../../hooks/useParams/useParams.js');
|
|
17
17
|
|
|
18
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
19
|
-
|
|
20
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
21
|
-
|
|
22
18
|
const api = () => {
|
|
23
19
|
const handler = innet.useNewHandler();
|
|
24
20
|
const props = jsx.useProps();
|
|
@@ -141,7 +137,7 @@ const api = () => {
|
|
|
141
137
|
const result = await plugin();
|
|
142
138
|
if (result === undefined)
|
|
143
139
|
continue;
|
|
144
|
-
|
|
140
|
+
innet.innet(result, actionHandler);
|
|
145
141
|
return true;
|
|
146
142
|
}
|
|
147
143
|
return true;
|
|
@@ -177,11 +173,11 @@ const api = () => {
|
|
|
177
173
|
continue;
|
|
178
174
|
const newHandler = Object.create(handler);
|
|
179
175
|
useAction.actionContext.set(newHandler, action);
|
|
180
|
-
|
|
176
|
+
innet.innet(result, newHandler);
|
|
181
177
|
return null;
|
|
182
178
|
}
|
|
183
179
|
});
|
|
184
|
-
|
|
180
|
+
innet.innet(children, handler);
|
|
185
181
|
};
|
|
186
182
|
|
|
187
183
|
exports.api = api;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { useNewHandler, innet } from 'innet';
|
|
2
2
|
import { useContext, useChildren } from '@innet/jsx';
|
|
3
|
-
import { callHandler } from '@innet/utils';
|
|
4
3
|
import { allBodyTypes } from '../../../constants.es6.js';
|
|
5
4
|
import '../../../hooks/index.es6.js';
|
|
6
5
|
import '../../../utils/index.es6.js';
|
|
@@ -9,6 +8,7 @@ import { schemaContext } from '../../../hooks/useSchemaContext/useSchemaContext.
|
|
|
9
8
|
import { getOrAdd } from '../../../utils/getOrAdd/getOrAdd.es6.js';
|
|
10
9
|
import { bodyFileContext } from '../../../hooks/useBodyFile/useBodyFile.es6.js';
|
|
11
10
|
import { ruleContext } from '../../../hooks/useRule/useRule.es6.js';
|
|
11
|
+
import { useEffect } from '../../../hooks/useEffect/useEffect.es6.js';
|
|
12
12
|
|
|
13
13
|
const body = () => {
|
|
14
14
|
const endpoint = useContext(endpointContext);
|
|
@@ -40,7 +40,7 @@ const body = () => {
|
|
|
40
40
|
rules.body = rule;
|
|
41
41
|
});
|
|
42
42
|
innet(children, handler);
|
|
43
|
-
|
|
43
|
+
useEffect(() => {
|
|
44
44
|
if (fileUsed) {
|
|
45
45
|
requestBody.content['multipart/form-data'] = { schema };
|
|
46
46
|
}
|
|
@@ -49,7 +49,7 @@ const body = () => {
|
|
|
49
49
|
requestBody.content[type] = { schema };
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
|
-
}
|
|
52
|
+
});
|
|
53
53
|
};
|
|
54
54
|
|
|
55
55
|
export { body };
|
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
4
4
|
|
|
5
5
|
var innet = require('innet');
|
|
6
6
|
var jsx = require('@innet/jsx');
|
|
7
|
-
var utils = require('@innet/utils');
|
|
8
7
|
var constants = require('../../../constants.js');
|
|
9
8
|
require('../../../hooks/index.js');
|
|
10
9
|
require('../../../utils/index.js');
|
|
@@ -13,10 +12,7 @@ var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext
|
|
|
13
12
|
var getOrAdd = require('../../../utils/getOrAdd/getOrAdd.js');
|
|
14
13
|
var useBodyFile = require('../../../hooks/useBodyFile/useBodyFile.js');
|
|
15
14
|
var useRule = require('../../../hooks/useRule/useRule.js');
|
|
16
|
-
|
|
17
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
18
|
-
|
|
19
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
15
|
+
var useEffect = require('../../../hooks/useEffect/useEffect.js');
|
|
20
16
|
|
|
21
17
|
const body = () => {
|
|
22
18
|
const endpoint = jsx.useContext(useEndpoint.endpointContext);
|
|
@@ -47,8 +43,8 @@ const body = () => {
|
|
|
47
43
|
useRule.ruleContext.set(handler, rule => {
|
|
48
44
|
rules.body = rule;
|
|
49
45
|
});
|
|
50
|
-
|
|
51
|
-
|
|
46
|
+
innet.innet(children, handler);
|
|
47
|
+
useEffect.useEffect(() => {
|
|
52
48
|
if (fileUsed) {
|
|
53
49
|
requestBody.content['multipart/form-data'] = { schema };
|
|
54
50
|
}
|
|
@@ -57,7 +53,7 @@ const body = () => {
|
|
|
57
53
|
requestBody.content[type] = { schema };
|
|
58
54
|
}
|
|
59
55
|
}
|
|
60
|
-
}
|
|
56
|
+
});
|
|
61
57
|
};
|
|
62
58
|
|
|
63
59
|
exports.body = body;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { useNewHandler, innet } from 'innet';
|
|
2
2
|
import { useProps } from '@innet/jsx';
|
|
3
3
|
import '../../../hooks/index.es6.js';
|
|
4
4
|
import '../../../utils/index.es6.js';
|
|
@@ -24,12 +24,12 @@ const endpoint = () => {
|
|
|
24
24
|
throw Error(`You cannot use the same endpoints ${method}:${path}`);
|
|
25
25
|
}
|
|
26
26
|
const operation = {};
|
|
27
|
-
if (summary) {
|
|
28
|
-
operation.summary = summary;
|
|
29
|
-
}
|
|
30
27
|
if (operationId) {
|
|
31
28
|
operation.operationId = operationId;
|
|
32
29
|
}
|
|
30
|
+
if (summary) {
|
|
31
|
+
operation.summary = summary;
|
|
32
|
+
}
|
|
33
33
|
if (description) {
|
|
34
34
|
operation.description = description;
|
|
35
35
|
}
|
|
@@ -12,10 +12,6 @@ var getEndpoint = require('../../../utils/getEndpoint/getEndpoint.js');
|
|
|
12
12
|
var useEndpoint = require('../../../hooks/useEndpoint/useEndpoint.js');
|
|
13
13
|
var useServerPlugins = require('../../../hooks/useServerPlugins/useServerPlugins.js');
|
|
14
14
|
|
|
15
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
16
|
-
|
|
17
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
18
|
-
|
|
19
15
|
const endpoint = () => {
|
|
20
16
|
const handler = innet.useNewHandler();
|
|
21
17
|
const tag = useTag.useTag();
|
|
@@ -32,12 +28,12 @@ const endpoint = () => {
|
|
|
32
28
|
throw Error(`You cannot use the same endpoints ${method}:${path}`);
|
|
33
29
|
}
|
|
34
30
|
const operation = {};
|
|
35
|
-
if (summary) {
|
|
36
|
-
operation.summary = summary;
|
|
37
|
-
}
|
|
38
31
|
if (operationId) {
|
|
39
32
|
operation.operationId = operationId;
|
|
40
33
|
}
|
|
34
|
+
if (summary) {
|
|
35
|
+
operation.summary = summary;
|
|
36
|
+
}
|
|
41
37
|
if (description) {
|
|
42
38
|
operation.description = description;
|
|
43
39
|
}
|
|
@@ -58,7 +54,7 @@ const endpoint = () => {
|
|
|
58
54
|
useEndpoint.endpointContext.set(handler, { endpoint, operation, props });
|
|
59
55
|
// @ts-expect-error: it's always an object
|
|
60
56
|
useServerPlugins.serverPlugins.set(handler, endpoint.plugins);
|
|
61
|
-
|
|
57
|
+
innet.innet(children, handler);
|
|
62
58
|
};
|
|
63
59
|
|
|
64
60
|
exports.endpoint = endpoint;
|
|
@@ -9,10 +9,6 @@ var useApi = require('../../../hooks/useApi/useApi.js');
|
|
|
9
9
|
var useEndpoint = require('../../../hooks/useEndpoint/useEndpoint.js');
|
|
10
10
|
var useHost = require('../../../hooks/useHost/useHost.js');
|
|
11
11
|
|
|
12
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
13
|
-
|
|
14
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
15
|
-
|
|
16
12
|
const host = () => {
|
|
17
13
|
const handler = innet.useNewHandler();
|
|
18
14
|
const { docs } = useApi.useApi();
|
|
@@ -30,7 +26,7 @@ const host = () => {
|
|
|
30
26
|
// @ts-expect-error: FIXME
|
|
31
27
|
servers.push(server);
|
|
32
28
|
handler[useHost.hostContext.key] = { server };
|
|
33
|
-
|
|
29
|
+
innet.innet(children, handler);
|
|
34
30
|
};
|
|
35
31
|
|
|
36
32
|
exports.host = host;
|
|
@@ -16,10 +16,6 @@ var useRule = require('../../../hooks/useRule/useRule.js');
|
|
|
16
16
|
var required = require('../../../utils/rules/required/required.js');
|
|
17
17
|
var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
|
|
18
18
|
|
|
19
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
20
|
-
|
|
21
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
22
|
-
|
|
23
19
|
const inMap = {
|
|
24
20
|
cookie: 'cookie',
|
|
25
21
|
header: 'header',
|
|
@@ -64,7 +60,7 @@ const param = () => {
|
|
|
64
60
|
rulesMap[key] = override(rule);
|
|
65
61
|
}
|
|
66
62
|
});
|
|
67
|
-
|
|
63
|
+
innet.innet(children, handler);
|
|
68
64
|
};
|
|
69
65
|
|
|
70
66
|
exports.param = param;
|
|
@@ -7,14 +7,10 @@ var jsx = require('@innet/jsx');
|
|
|
7
7
|
require('../../../hooks/index.js');
|
|
8
8
|
var useServerPlugin = require('../../../hooks/useServerPlugin/useServerPlugin.js');
|
|
9
9
|
|
|
10
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
11
|
-
|
|
12
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
13
|
-
|
|
14
10
|
function preset() {
|
|
15
11
|
const children = jsx.useChildren();
|
|
16
12
|
useServerPlugin.useServerPlugin(() => {
|
|
17
|
-
|
|
13
|
+
innet.innet(children, innet.useHandler());
|
|
18
14
|
});
|
|
19
15
|
}
|
|
20
16
|
|
|
@@ -16,10 +16,6 @@ var useSchemaContext = require('../../../hooks/useSchemaContext/useSchemaContext
|
|
|
16
16
|
var getOrAdd = require('../../../utils/getOrAdd/getOrAdd.js');
|
|
17
17
|
var useRule = require('../../../hooks/useRule/useRule.js');
|
|
18
18
|
|
|
19
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
20
|
-
|
|
21
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
22
|
-
|
|
23
19
|
const statuses = {
|
|
24
20
|
...error.errorStatuses,
|
|
25
21
|
...redirect.redirectStatuses,
|
|
@@ -62,7 +58,7 @@ const response = () => {
|
|
|
62
58
|
useRule.ruleContext.set(handler, rule => {
|
|
63
59
|
rules.response = rule;
|
|
64
60
|
});
|
|
65
|
-
|
|
61
|
+
innet.innet(children, handler);
|
|
66
62
|
};
|
|
67
63
|
|
|
68
64
|
exports.response = response;
|
|
@@ -20,7 +20,6 @@ var useRequestHandler = require('../../../hooks/useRequestHandler/useRequestHand
|
|
|
20
20
|
|
|
21
21
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
22
22
|
|
|
23
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
24
23
|
var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
|
|
25
24
|
var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
|
|
26
25
|
var http2__default = /*#__PURE__*/_interopDefaultLegacy(http2);
|
|
@@ -74,9 +73,9 @@ const server = () => {
|
|
|
74
73
|
}
|
|
75
74
|
}
|
|
76
75
|
}
|
|
77
|
-
|
|
76
|
+
innet.innet({ props, type: server }, requestHandler);
|
|
78
77
|
});
|
|
79
|
-
|
|
78
|
+
innet.innet(props.children, handler);
|
|
80
79
|
server.listen(port, () => {
|
|
81
80
|
onStart === null || onStart === void 0 ? void 0 : onStart({ https, port });
|
|
82
81
|
});
|
package/plugins/main/tag/tag.js
CHANGED
|
@@ -8,10 +8,6 @@ require('../../../hooks/index.js');
|
|
|
8
8
|
var useTag = require('../../../hooks/useTag/useTag.js');
|
|
9
9
|
var useApi = require('../../../hooks/useApi/useApi.js');
|
|
10
10
|
|
|
11
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
12
|
-
|
|
13
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
14
|
-
|
|
15
11
|
const tag = () => {
|
|
16
12
|
if (jsx.useContext(useTag.tagContext)) {
|
|
17
13
|
throw Error('You cannot use a <tag> inside another one');
|
|
@@ -33,7 +29,7 @@ const tag = () => {
|
|
|
33
29
|
}
|
|
34
30
|
const handler = innet.useNewHandler();
|
|
35
31
|
handler[useTag.tagContext.key] = tag;
|
|
36
|
-
|
|
32
|
+
innet.innet(children, handler);
|
|
37
33
|
};
|
|
38
34
|
|
|
39
35
|
exports.tag = tag;
|
|
@@ -12,7 +12,6 @@ var file = require('../file/file.js');
|
|
|
12
12
|
|
|
13
13
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
14
14
|
|
|
15
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
16
15
|
var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
|
|
17
16
|
|
|
18
17
|
function cms() {
|
|
@@ -23,10 +22,10 @@ function cms() {
|
|
|
23
22
|
url = url.slice(prefix.length);
|
|
24
23
|
}
|
|
25
24
|
else {
|
|
26
|
-
return
|
|
25
|
+
return innet.innet(children, handler);
|
|
27
26
|
}
|
|
28
27
|
const filePath = path__default["default"].join(dir, url);
|
|
29
|
-
|
|
28
|
+
innet.innet({ children, props: { path: filePath }, type: file.file }, handler);
|
|
30
29
|
}
|
|
31
30
|
|
|
32
31
|
exports.cms = cms;
|
|
@@ -12,7 +12,6 @@ var useThrow = require('../../../hooks/useThrow/useThrow.js');
|
|
|
12
12
|
|
|
13
13
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
14
14
|
|
|
15
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
16
15
|
var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
|
|
17
16
|
var mime__default = /*#__PURE__*/_interopDefaultLegacy(mime);
|
|
18
17
|
|
|
@@ -40,7 +39,7 @@ function file() {
|
|
|
40
39
|
return;
|
|
41
40
|
}
|
|
42
41
|
}
|
|
43
|
-
|
|
42
|
+
innet.innet(children, handler);
|
|
44
43
|
}
|
|
45
44
|
|
|
46
45
|
exports.file = file;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { useNewHandler, innet } from 'innet';
|
|
2
2
|
import { useContext, useProps } from '@innet/jsx';
|
|
3
|
-
import { callHandler } from '@innet/utils';
|
|
4
3
|
import '../../../hooks/index.es6.js';
|
|
5
4
|
import '../../../hooks/useParentRule/index.es6.js';
|
|
6
5
|
import '../../../utils/index.es6.js';
|
|
@@ -13,6 +12,7 @@ import { defaultTo } from '../../../utils/rules/defaultTo/defaultTo.es6.js';
|
|
|
13
12
|
import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
|
|
14
13
|
import { arrayOf } from '../../../utils/rules/arrayOf/arrayOf.es6.js';
|
|
15
14
|
import { oneOf } from '../../../utils/rules/oneOf/oneOf.es6.js';
|
|
15
|
+
import { useEffect } from '../../../hooks/useEffect/useEffect.es6.js';
|
|
16
16
|
|
|
17
17
|
const array = () => {
|
|
18
18
|
useBlock('path');
|
|
@@ -44,11 +44,11 @@ const array = () => {
|
|
|
44
44
|
}
|
|
45
45
|
});
|
|
46
46
|
innet(children, handler);
|
|
47
|
-
|
|
47
|
+
useEffect(() => {
|
|
48
48
|
if (!oneOfRulesMap && setRule) {
|
|
49
49
|
setRule(rootRule(e => e));
|
|
50
50
|
}
|
|
51
|
-
}
|
|
51
|
+
});
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
54
|
innet(children, handler);
|
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
4
4
|
|
|
5
5
|
var innet = require('innet');
|
|
6
6
|
var jsx = require('@innet/jsx');
|
|
7
|
-
var utils = require('@innet/utils');
|
|
8
7
|
require('../../../hooks/index.js');
|
|
9
8
|
require('../../../hooks/useParentRule/index.js');
|
|
10
9
|
require('../../../utils/index.js');
|
|
@@ -17,10 +16,7 @@ var defaultTo = require('../../../utils/rules/defaultTo/defaultTo.js');
|
|
|
17
16
|
var pipe = require('../../../utils/rules/pipe/pipe.js');
|
|
18
17
|
var arrayOf = require('../../../utils/rules/arrayOf/arrayOf.js');
|
|
19
18
|
var oneOf = require('../../../utils/rules/oneOf/oneOf.js');
|
|
20
|
-
|
|
21
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
22
|
-
|
|
23
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
19
|
+
var useEffect = require('../../../hooks/useEffect/useEffect.js');
|
|
24
20
|
|
|
25
21
|
const array = () => {
|
|
26
22
|
useBlock.useBlock('path');
|
|
@@ -51,15 +47,15 @@ const array = () => {
|
|
|
51
47
|
setRule(rootRule(oneOf.oneOf(oneOfRulesMap)));
|
|
52
48
|
}
|
|
53
49
|
});
|
|
54
|
-
|
|
55
|
-
|
|
50
|
+
innet.innet(children, handler);
|
|
51
|
+
useEffect.useEffect(() => {
|
|
56
52
|
if (!oneOfRulesMap && setRule) {
|
|
57
53
|
setRule(rootRule(e => e));
|
|
58
54
|
}
|
|
59
|
-
}
|
|
55
|
+
});
|
|
60
56
|
return;
|
|
61
57
|
}
|
|
62
|
-
|
|
58
|
+
innet.innet(children, handler);
|
|
63
59
|
};
|
|
64
60
|
|
|
65
61
|
exports.array = array;
|
|
@@ -12,10 +12,6 @@ var useObjectRule = require('../../../hooks/useObjectRule/useObjectRule.js');
|
|
|
12
12
|
var useRule = require('../../../hooks/useRule/useRule.js');
|
|
13
13
|
var required = require('../../../utils/rules/required/required.js');
|
|
14
14
|
|
|
15
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
16
|
-
|
|
17
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
18
|
-
|
|
19
15
|
const field = () => {
|
|
20
16
|
const handler = innet.useNewHandler();
|
|
21
17
|
const { children, deprecated, key, optional, } = jsx.useProps();
|
|
@@ -48,7 +44,7 @@ const field = () => {
|
|
|
48
44
|
}
|
|
49
45
|
});
|
|
50
46
|
useObjectRule.objectRuleContext.set(handler, null);
|
|
51
|
-
|
|
47
|
+
innet.innet(children, handler);
|
|
52
48
|
};
|
|
53
49
|
|
|
54
50
|
exports.field = field;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { useNewHandler, innet } from 'innet';
|
|
2
2
|
import { useProps } from '@innet/jsx';
|
|
3
|
-
import { callHandler } from '@innet/utils';
|
|
4
3
|
import '../../../hooks/index.es6.js';
|
|
5
4
|
import '../../../hooks/useParentRule/index.es6.js';
|
|
6
5
|
import '../../../utils/index.es6.js';
|
|
@@ -15,6 +14,7 @@ import { objectOf } from '../../../utils/rules/objectOf/objectOf.es6.js';
|
|
|
15
14
|
import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
|
|
16
15
|
import { useRule, ruleContext } from '../../../hooks/useRule/useRule.es6.js';
|
|
17
16
|
import { objectRuleContext } from '../../../hooks/useObjectRule/useObjectRule.es6.js';
|
|
17
|
+
import { useEffect } from '../../../hooks/useEffect/useEffect.es6.js';
|
|
18
18
|
|
|
19
19
|
const object = () => {
|
|
20
20
|
useBlock('path');
|
|
@@ -52,11 +52,11 @@ const object = () => {
|
|
|
52
52
|
});
|
|
53
53
|
parentRuleContext.reset(handler);
|
|
54
54
|
innet(children, handler);
|
|
55
|
-
|
|
55
|
+
useEffect(() => {
|
|
56
56
|
if (!Object.keys(schema.additionalProperties).length) {
|
|
57
57
|
delete schema.additionalProperties;
|
|
58
58
|
}
|
|
59
|
-
}
|
|
59
|
+
});
|
|
60
60
|
}
|
|
61
61
|
else if (props.ref) {
|
|
62
62
|
useRule(refRules[props.ref]);
|
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
4
4
|
|
|
5
5
|
var innet = require('innet');
|
|
6
6
|
var jsx = require('@innet/jsx');
|
|
7
|
-
var utils = require('@innet/utils');
|
|
8
7
|
require('../../../hooks/index.js');
|
|
9
8
|
require('../../../hooks/useParentRule/index.js');
|
|
10
9
|
require('../../../utils/index.js');
|
|
@@ -19,10 +18,7 @@ var objectOf = require('../../../utils/rules/objectOf/objectOf.js');
|
|
|
19
18
|
var pipe = require('../../../utils/rules/pipe/pipe.js');
|
|
20
19
|
var useRule = require('../../../hooks/useRule/useRule.js');
|
|
21
20
|
var useObjectRule = require('../../../hooks/useObjectRule/useObjectRule.js');
|
|
22
|
-
|
|
23
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
24
|
-
|
|
25
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
21
|
+
var useEffect = require('../../../hooks/useEffect/useEffect.js');
|
|
26
22
|
|
|
27
23
|
const object = () => {
|
|
28
24
|
useBlock.useBlock('path');
|
|
@@ -59,12 +55,12 @@ const object = () => {
|
|
|
59
55
|
childRule = rule;
|
|
60
56
|
});
|
|
61
57
|
useParentRule.parentRuleContext.reset(handler);
|
|
62
|
-
|
|
63
|
-
|
|
58
|
+
innet.innet(children, handler);
|
|
59
|
+
useEffect.useEffect(() => {
|
|
64
60
|
if (!Object.keys(schema.additionalProperties).length) {
|
|
65
61
|
delete schema.additionalProperties;
|
|
66
62
|
}
|
|
67
|
-
}
|
|
63
|
+
});
|
|
68
64
|
}
|
|
69
65
|
else if (props.ref) {
|
|
70
66
|
useRule.useRule(refRules[props.ref]);
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { useNewHandler, innet } from 'innet';
|
|
2
2
|
import { useProps } from '@innet/jsx';
|
|
3
|
-
import { callHandler } from '@innet/utils';
|
|
4
3
|
import '../../../hooks/index.es6.js';
|
|
5
4
|
import '../../../hooks/useParentRule/index.es6.js';
|
|
6
5
|
import '../../../utils/index.es6.js';
|
|
@@ -13,6 +12,7 @@ import { useParentRule, parentRuleContext } from '../../../hooks/useParentRule/u
|
|
|
13
12
|
import { useRule, ruleContext } from '../../../hooks/useRule/useRule.es6.js';
|
|
14
13
|
import { pipe } from '../../../utils/rules/pipe/pipe.es6.js';
|
|
15
14
|
import { required } from '../../../utils/rules/required/required.es6.js';
|
|
15
|
+
import { useEffect } from '../../../hooks/useEffect/useEffect.es6.js';
|
|
16
16
|
|
|
17
17
|
const tuple = () => {
|
|
18
18
|
useBlock('path');
|
|
@@ -42,11 +42,11 @@ const tuple = () => {
|
|
|
42
42
|
rulesMap.push(rule);
|
|
43
43
|
});
|
|
44
44
|
innet(children, handler);
|
|
45
|
-
|
|
45
|
+
useEffect(() => {
|
|
46
46
|
if (!rulesMap.length) {
|
|
47
47
|
throw Error('<tuple> MUST have content');
|
|
48
48
|
}
|
|
49
|
-
}
|
|
49
|
+
});
|
|
50
50
|
}
|
|
51
51
|
};
|
|
52
52
|
|
|
@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
4
4
|
|
|
5
5
|
var innet = require('innet');
|
|
6
6
|
var jsx = require('@innet/jsx');
|
|
7
|
-
var utils = require('@innet/utils');
|
|
8
7
|
require('../../../hooks/index.js');
|
|
9
8
|
require('../../../hooks/useParentRule/index.js');
|
|
10
9
|
require('../../../utils/index.js');
|
|
@@ -17,10 +16,7 @@ var useParentRule = require('../../../hooks/useParentRule/useParentRule.js');
|
|
|
17
16
|
var useRule = require('../../../hooks/useRule/useRule.js');
|
|
18
17
|
var pipe = require('../../../utils/rules/pipe/pipe.js');
|
|
19
18
|
var required = require('../../../utils/rules/required/required.js');
|
|
20
|
-
|
|
21
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
22
|
-
|
|
23
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
19
|
+
var useEffect = require('../../../hooks/useEffect/useEffect.js');
|
|
24
20
|
|
|
25
21
|
const tuple = () => {
|
|
26
22
|
useBlock.useBlock('path');
|
|
@@ -49,12 +45,12 @@ const tuple = () => {
|
|
|
49
45
|
useRule.ruleContext.set(handler, rule => {
|
|
50
46
|
rulesMap.push(rule);
|
|
51
47
|
});
|
|
52
|
-
|
|
53
|
-
|
|
48
|
+
innet.innet(children, handler);
|
|
49
|
+
useEffect.useEffect(() => {
|
|
54
50
|
if (!rulesMap.length) {
|
|
55
51
|
throw Error('<tuple> MUST have content');
|
|
56
52
|
}
|
|
57
|
-
}
|
|
53
|
+
});
|
|
58
54
|
}
|
|
59
55
|
};
|
|
60
56
|
|
|
@@ -3,13 +3,16 @@ import { promises } from 'node:fs';
|
|
|
3
3
|
import '../../../hooks/index.es6.js';
|
|
4
4
|
import '../../../utils/index.es6.js';
|
|
5
5
|
import { useApi } from '../../../hooks/useApi/useApi.es6.js';
|
|
6
|
+
import { useEffect } from '../../../hooks/useEffect/useEffect.es6.js';
|
|
6
7
|
import { generateTypes } from '../../../utils/generateTypes/generateTypes.es6.js';
|
|
7
8
|
|
|
8
9
|
const dts = () => {
|
|
9
10
|
const { namespace = process.env.INNET_DTS_NAMESPACE, path = process.env.INNET_DTS_PATH || 'src/apiTypes.d.ts', } = useProps() || {};
|
|
10
11
|
const { docs } = useApi();
|
|
11
|
-
|
|
12
|
-
|
|
12
|
+
useEffect(() => {
|
|
13
|
+
promises.writeFile(path, generateTypes(docs, namespace)).catch(e => {
|
|
14
|
+
console.error(e);
|
|
15
|
+
});
|
|
13
16
|
});
|
|
14
17
|
};
|
|
15
18
|
|
package/plugins/utils/dts/dts.js
CHANGED
|
@@ -7,13 +7,16 @@ var fs = require('node:fs');
|
|
|
7
7
|
require('../../../hooks/index.js');
|
|
8
8
|
require('../../../utils/index.js');
|
|
9
9
|
var useApi = require('../../../hooks/useApi/useApi.js');
|
|
10
|
+
var useEffect = require('../../../hooks/useEffect/useEffect.js');
|
|
10
11
|
var generateTypes = require('../../../utils/generateTypes/generateTypes.js');
|
|
11
12
|
|
|
12
13
|
const dts = () => {
|
|
13
14
|
const { namespace = process.env.INNET_DTS_NAMESPACE, path = process.env.INNET_DTS_PATH || 'src/apiTypes.d.ts', } = jsx.useProps() || {};
|
|
14
15
|
const { docs } = useApi.useApi();
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
useEffect.useEffect(() => {
|
|
17
|
+
fs.promises.writeFile(path, generateTypes.generateTypes(docs, namespace)).catch(e => {
|
|
18
|
+
console.error(e);
|
|
19
|
+
});
|
|
17
20
|
});
|
|
18
21
|
};
|
|
19
22
|
|
package/plugins/utils/env/env.js
CHANGED
|
@@ -5,14 +5,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
5
5
|
var innet = require('innet');
|
|
6
6
|
var jsx = require('@innet/jsx');
|
|
7
7
|
|
|
8
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
9
|
-
|
|
10
|
-
var innet__default = /*#__PURE__*/_interopDefaultLegacy(innet);
|
|
11
|
-
|
|
12
8
|
const env = () => {
|
|
13
9
|
const { children, is, of = 'NODE_ENV', } = jsx.useProps();
|
|
14
10
|
if (Array.isArray(is) ? is.includes(process.env[of]) : process.env[of] === is) {
|
|
15
|
-
|
|
11
|
+
innet.innet(children, innet.useHandler());
|
|
16
12
|
}
|
|
17
13
|
};
|
|
18
14
|
|
package/types.d.ts
CHANGED
|
@@ -16,6 +16,7 @@ export type ParameterObject = API.ParameterObject;
|
|
|
16
16
|
export type RequestBodyObject = API.RequestBodyObject;
|
|
17
17
|
export type ObjectType = ArraySchemaObjectType | NonArraySchemaObjectType;
|
|
18
18
|
export type RefSchemaObject = ReferenceObject | SchemaObject;
|
|
19
|
+
export type Effect = () => void;
|
|
19
20
|
export interface IValidationErrorData extends Record<string, any> {
|
|
20
21
|
error: RulesErrors;
|
|
21
22
|
}
|