@xxxaz/json-rpc-schema-typing 0.10.30 → 0.11.0
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/README.md +93 -4
- package/cjs/JsonRpcException.js +4 -5
- package/cjs/JsonRpcException.js.map +1 -1
- package/cjs/JsonRpcMethod.js +22 -8
- package/cjs/JsonRpcMethod.js.map +1 -1
- package/cjs/JsonRpcValidator.js +12 -4
- package/cjs/JsonRpcValidator.js.map +1 -1
- package/cjs/JsonSchemaValidator.js +12 -5
- package/cjs/JsonSchemaValidator.js.map +1 -1
- package/cjs/WebSocketWrapper.js +8 -3
- package/cjs/WebSocketWrapper.js.map +1 -1
- package/cjs/client/JsonRpcClient.js +77 -14
- package/cjs/client/JsonRpcClient.js.map +1 -1
- package/cjs/client/JsonRpcHttp2Client.js +8 -6
- package/cjs/client/JsonRpcHttp2Client.js.map +1 -1
- package/cjs/client/JsonRpcHttpClient.js +5 -5
- package/cjs/client/JsonRpcHttpClient.js.map +1 -1
- package/cjs/client/JsonRpcMessagePortClient.js +4 -5
- package/cjs/client/JsonRpcMessagePortClient.js.map +1 -1
- package/cjs/client/JsonRpcWebSocketClient.js +5 -6
- package/cjs/client/JsonRpcWebSocketClient.js.map +1 -1
- package/cjs/client/index.js +1 -1
- package/cjs/client/index.js.map +1 -1
- package/cjs/index.js +3 -3
- package/cjs/index.js.map +1 -1
- package/cjs/router/FileSystemRouter.js +3 -3
- package/cjs/router/FileSystemRouter.js.map +1 -1
- package/cjs/router/JsonRpcRouter.js.map +1 -1
- package/cjs/router/OpenRpc.js +141 -0
- package/cjs/router/OpenRpc.js.map +1 -0
- package/cjs/router/StaticRouter.js +41 -8
- package/cjs/router/StaticRouter.js.map +1 -1
- package/cjs/router/hashObject.js +7 -4
- package/cjs/router/hashObject.js.map +1 -1
- package/cjs/router/index.js +1 -0
- package/cjs/router/index.js.map +1 -1
- package/cjs/schemas/Complex.js +10 -13
- package/cjs/schemas/Complex.js.map +1 -1
- package/cjs/schemas/Primitive.js.map +1 -1
- package/cjs/schemas/Structure.js +5 -4
- package/cjs/schemas/Structure.js.map +1 -1
- package/cjs/schemas/index.js +1 -1
- package/cjs/schemas/index.js.map +1 -1
- package/cjs/server/JsonRpcHttpReceiver.js +11 -6
- package/cjs/server/JsonRpcHttpReceiver.js.map +1 -1
- package/cjs/server/JsonRpcMessagePortReceiver.js +3 -4
- package/cjs/server/JsonRpcMessagePortReceiver.js.map +1 -1
- package/cjs/server/JsonRpcServer.js +12 -6
- package/cjs/server/JsonRpcServer.js.map +1 -1
- package/cjs/server/JsonRpcWebSocketReceiver.js +3 -4
- package/cjs/server/JsonRpcWebSocketReceiver.js.map +1 -1
- package/cjs/server/index.js +1 -1
- package/cjs/server/index.js.map +1 -1
- package/cjs/utility.js +8 -14
- package/cjs/utility.js.map +1 -1
- package/esm/JsonRpcException.js +4 -5
- package/esm/JsonRpcException.js.map +1 -1
- package/esm/JsonRpcMethod.js +22 -8
- package/esm/JsonRpcMethod.js.map +1 -1
- package/esm/JsonRpcValidator.js +12 -4
- package/esm/JsonRpcValidator.js.map +1 -1
- package/esm/JsonSchemaValidator.js +13 -6
- package/esm/JsonSchemaValidator.js.map +1 -1
- package/esm/WebSocketWrapper.js +8 -3
- package/esm/WebSocketWrapper.js.map +1 -1
- package/esm/client/JsonRpcClient.js +78 -15
- package/esm/client/JsonRpcClient.js.map +1 -1
- package/esm/client/JsonRpcHttp2Client.js +10 -8
- package/esm/client/JsonRpcHttp2Client.js.map +1 -1
- package/esm/client/JsonRpcHttpClient.js +8 -8
- package/esm/client/JsonRpcHttpClient.js.map +1 -1
- package/esm/client/JsonRpcMessagePortClient.js +6 -7
- package/esm/client/JsonRpcMessagePortClient.js.map +1 -1
- package/esm/client/JsonRpcWebSocketClient.js +8 -9
- package/esm/client/JsonRpcWebSocketClient.js.map +1 -1
- package/esm/client/index.js +1 -1
- package/esm/client/index.js.map +1 -1
- package/esm/index.js +3 -3
- package/esm/index.js.map +1 -1
- package/esm/router/FileSystemRouter.js +5 -5
- package/esm/router/FileSystemRouter.js.map +1 -1
- package/esm/router/JsonRpcRouter.js +1 -1
- package/esm/router/JsonRpcRouter.js.map +1 -1
- package/esm/router/OpenRpc.js +138 -0
- package/esm/router/OpenRpc.js.map +1 -0
- package/esm/router/StaticRouter.js +42 -9
- package/esm/router/StaticRouter.js.map +1 -1
- package/esm/router/hashObject.js +7 -4
- package/esm/router/hashObject.js.map +1 -1
- package/esm/router/index.js +1 -0
- package/esm/router/index.js.map +1 -1
- package/esm/schemas/Complex.js +10 -13
- package/esm/schemas/Complex.js.map +1 -1
- package/esm/schemas/Primitive.js.map +1 -1
- package/esm/schemas/Structure.js +6 -5
- package/esm/schemas/Structure.js.map +1 -1
- package/esm/schemas/index.js +1 -1
- package/esm/schemas/index.js.map +1 -1
- package/esm/server/JsonRpcHttpReceiver.js +13 -8
- package/esm/server/JsonRpcHttpReceiver.js.map +1 -1
- package/esm/server/JsonRpcMessagePortReceiver.js +3 -4
- package/esm/server/JsonRpcMessagePortReceiver.js.map +1 -1
- package/esm/server/JsonRpcServer.js +15 -9
- package/esm/server/JsonRpcServer.js.map +1 -1
- package/esm/server/JsonRpcWebSocketReceiver.js +4 -5
- package/esm/server/JsonRpcWebSocketReceiver.js.map +1 -1
- package/esm/server/index.js +1 -1
- package/esm/server/index.js.map +1 -1
- package/esm/utility.js +8 -14
- package/esm/utility.js.map +1 -1
- package/package.json +4 -1
- package/src/JsonRpcException.ts +29 -26
- package/src/JsonRpcMethod.ts +173 -33
- package/src/JsonRpcValidator.ts +28 -15
- package/src/JsonSchemaValidator.ts +54 -25
- package/src/WebSocketWrapper.ts +36 -19
- package/src/client/JsonRpcClient.ts +188 -58
- package/src/client/JsonRpcHttp2Client.ts +55 -34
- package/src/client/JsonRpcHttpClient.ts +56 -30
- package/src/client/JsonRpcMessagePortClient.ts +36 -27
- package/src/client/JsonRpcWebSocketClient.ts +38 -21
- package/src/client/index.ts +1 -1
- package/src/index.ts +4 -7
- package/src/router/FileSystemRouter.ts +37 -21
- package/src/router/JsonRpcRouter.ts +50 -24
- package/src/router/OpenRpc.ts +262 -0
- package/src/router/StaticRouter.ts +115 -16
- package/src/router/hashObject.ts +11 -6
- package/src/router/index.ts +1 -0
- package/src/schemas/Complex.ts +33 -28
- package/src/schemas/Primitive.ts +0 -1
- package/src/schemas/Structure.ts +18 -9
- package/src/schemas/index.ts +1 -1
- package/src/server/JsonRpcHttpReceiver.ts +60 -28
- package/src/server/JsonRpcMessagePortReceiver.ts +27 -16
- package/src/server/JsonRpcServer.ts +59 -29
- package/src/server/JsonRpcWebSocketReceiver.ts +32 -25
- package/src/server/index.ts +1 -1
- package/src/types.ts +72 -43
- package/src/utility.ts +13 -19
- package/types/JsonRpcException.d.ts +2 -2
- package/types/JsonRpcMethod.d.ts +70 -3
- package/types/JsonRpcValidator.d.ts +3 -3
- package/types/JsonSchemaValidator.d.ts +2 -2
- package/types/WebSocketWrapper.d.ts +2 -2
- package/types/client/JsonRpcClient.d.ts +20 -9
- package/types/client/JsonRpcHttp2Client.d.ts +8 -6
- package/types/client/JsonRpcHttpClient.d.ts +7 -5
- package/types/client/JsonRpcMessagePortClient.d.ts +3 -3
- package/types/client/JsonRpcWebSocketClient.d.ts +4 -4
- package/types/client/index.d.ts +1 -1
- package/types/index.d.ts +3 -3
- package/types/router/FileSystemRouter.d.ts +3 -3
- package/types/router/JsonRpcRouter.d.ts +2 -2
- package/types/router/OpenRpc.d.ts +101 -0
- package/types/router/StaticRouter.d.ts +40 -4
- package/types/router/hashObject.d.ts +1 -1
- package/types/router/index.d.ts +1 -0
- package/types/schemas/Complex.d.ts +4 -4
- package/types/schemas/Structure.d.ts +5 -2
- package/types/schemas/index.d.ts +1 -1
- package/types/server/JsonRpcHttpReceiver.d.ts +2 -2
- package/types/server/JsonRpcMessagePortReceiver.d.ts +2 -2
- package/types/server/JsonRpcServer.d.ts +2 -2
- package/types/server/JsonRpcWebSocketReceiver.d.ts +1 -1
- package/types/server/index.d.ts +1 -1
- package/types/types.d.ts +12 -6
- package/types/utility.d.ts +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonRpcWebSocketClient.js","sourceRoot":"","sources":["../../src/client/JsonRpcWebSocketClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"JsonRpcWebSocketClient.js","sourceRoot":"","sources":["../../src/client/JsonRpcWebSocketClient.ts"],"names":[],"mappings":"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"}
|
package/esm/client/index.js
CHANGED
package/esm/client/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC"}
|
package/esm/index.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
export * from './client/index.js';
|
|
1
2
|
export * from './JsonRpcException.js';
|
|
2
3
|
export * from './JsonRpcMethod.js';
|
|
3
4
|
export * from './JsonSchemaValidator.js';
|
|
4
|
-
export * from './types.js';
|
|
5
|
-
export * from './client/index.js';
|
|
6
|
-
export * from './schemas/index.js';
|
|
7
5
|
export * from './router/index.js';
|
|
6
|
+
export * from './schemas/index.js';
|
|
8
7
|
export * from './server/index.js';
|
|
8
|
+
export * from './types.js';
|
|
9
9
|
//# sourceMappingURL=index.js.map
|
package/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { lstatSync, readdirSync
|
|
2
|
-
import { JsonRpcRouter } from
|
|
1
|
+
import { existsSync, lstatSync, readdirSync } from 'fs';
|
|
2
|
+
import { JsonRpcRouter } from './JsonRpcRouter.js';
|
|
3
3
|
function parsePathFilter(filter) {
|
|
4
4
|
if (!filter)
|
|
5
5
|
return () => true;
|
|
@@ -35,7 +35,7 @@ export class FileSystemRouter extends JsonRpcRouter {
|
|
|
35
35
|
const path = `${this.rootDir}/${methodPath}`;
|
|
36
36
|
if (existsSync(path)) {
|
|
37
37
|
if (lstatSync(path).isDirectory()) {
|
|
38
|
-
return this.#cache[methodPath] = new FileSystemRouter(path, this.#options);
|
|
38
|
+
return (this.#cache[methodPath] = new FileSystemRouter(path, this.#options));
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
const filePath = existsSync(`${path}.js`)
|
|
@@ -44,12 +44,12 @@ export class FileSystemRouter extends JsonRpcRouter {
|
|
|
44
44
|
? `${path}.ts`
|
|
45
45
|
: null;
|
|
46
46
|
if (!filePath || !this.#pathFilter(filePath)) {
|
|
47
|
-
return this.#cache[methodPath] = null;
|
|
47
|
+
return (this.#cache[methodPath] = null);
|
|
48
48
|
}
|
|
49
49
|
try {
|
|
50
50
|
const module = await import(filePath);
|
|
51
51
|
if (FileSystemRouter.#isDefinition(module.default)) {
|
|
52
|
-
return this.#cache[methodPath] = module.default;
|
|
52
|
+
return (this.#cache[methodPath] = module.default);
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
55
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileSystemRouter.js","sourceRoot":"","sources":["../../src/router/FileSystemRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"FileSystemRouter.js","sourceRoot":"","sources":["../../src/router/FileSystemRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonRpcRouter.js","sourceRoot":"","sources":["../../src/router/JsonRpcRouter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"JsonRpcRouter.js","sourceRoot":"","sources":["../../src/router/JsonRpcRouter.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAS7C,MAAM,OAAgB,aAAa;IAiB/B,KAAK,CAAC,MAAM;QACR,MAAM,OAAO,GAAG,EAGb,CAAC;QACJ,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAC3C,IAAI,CAAC,KAAK;gBAAE,SAAS;YACrB,IAAI,KAAK,YAAY,aAAa,EAAE,CAAC;gBACjC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;gBACpC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACjC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;gBAChC,CAAC;gBACD,SAAS;YACb,CAAC;YACD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,MAAM,CAAC,WAAW,CAAC,OAAO,CAAkB,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,gBAAgB;QAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;QACtC,OAAO;YACH,kBAAkB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY;YACpD,uBAAuB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY;SAC1D,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;CACJ"}
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
import { JsonRpcRouter } from './JsonRpcRouter.js';
|
|
2
|
+
/**
|
|
3
|
+
* router を全解決し、各メソッド定義の $params/$return/$meta から OpenRPC Document を生成する。
|
|
4
|
+
* - method.name はメソッドパス (`call.list` 等) から自動導出
|
|
5
|
+
* - paramStructure は $params の型 (object → by-name / array → by-position) から自動導出
|
|
6
|
+
* - result は name 必須のため、$meta.result.name 未指定時は `<メソッド名>Result` を合成
|
|
7
|
+
*/
|
|
8
|
+
export async function emitOpenRpcDocument(router, options) {
|
|
9
|
+
const globalTags = new Set((options.tags ?? []).map(({ name }) => name));
|
|
10
|
+
const methods = [];
|
|
11
|
+
await collectMethods(router, [], globalTags, methods);
|
|
12
|
+
const document = {
|
|
13
|
+
openrpc: options.openrpc ?? '1.3.2',
|
|
14
|
+
info: options.info,
|
|
15
|
+
methods,
|
|
16
|
+
};
|
|
17
|
+
if (options.servers?.length)
|
|
18
|
+
document.servers = [...options.servers];
|
|
19
|
+
if (options.tags?.length) {
|
|
20
|
+
document.components = {
|
|
21
|
+
tags: Object.fromEntries(options.tags.map((tag) => [tag.name, tag])),
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
if (options.externalDocs)
|
|
25
|
+
document.externalDocs = options.externalDocs;
|
|
26
|
+
return document;
|
|
27
|
+
}
|
|
28
|
+
async function collectMethods(router, path, globalTags, methods) {
|
|
29
|
+
for await (const key of router.enumerate()) {
|
|
30
|
+
const child = await router.resolveChild(key);
|
|
31
|
+
if (!child)
|
|
32
|
+
continue;
|
|
33
|
+
const childPath = [...path, key];
|
|
34
|
+
if (child instanceof JsonRpcRouter) {
|
|
35
|
+
await collectMethods(child, childPath, globalTags, methods);
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
methods.push(buildMethod(child, childPath, globalTags));
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
function buildMethod(definition, path, globalTags) {
|
|
42
|
+
const meta = definition.$meta ?? {};
|
|
43
|
+
const methodName = path[path.length - 1];
|
|
44
|
+
const { paramStructure, params } = buildParams(definition);
|
|
45
|
+
const method = {
|
|
46
|
+
name: path.join('.'),
|
|
47
|
+
params,
|
|
48
|
+
result: {
|
|
49
|
+
name: meta.result?.name ?? `${methodName}Result`,
|
|
50
|
+
...(meta.result?.summary != null
|
|
51
|
+
? { summary: meta.result.summary }
|
|
52
|
+
: {}),
|
|
53
|
+
...(meta.result?.description != null
|
|
54
|
+
? { description: meta.result.description }
|
|
55
|
+
: {}),
|
|
56
|
+
schema: (definition.$return ?? {}),
|
|
57
|
+
},
|
|
58
|
+
};
|
|
59
|
+
if (paramStructure)
|
|
60
|
+
method.paramStructure = paramStructure;
|
|
61
|
+
if (meta.summary != null)
|
|
62
|
+
method.summary = meta.summary;
|
|
63
|
+
if (meta.description != null)
|
|
64
|
+
method.description = meta.description;
|
|
65
|
+
if (meta.tags?.length) {
|
|
66
|
+
method.tags = meta.tags.map((name) => globalTags.has(name)
|
|
67
|
+
? { $ref: `#/components/tags/${name}` }
|
|
68
|
+
: { name });
|
|
69
|
+
}
|
|
70
|
+
if (meta.errors?.length)
|
|
71
|
+
method.errors = [...meta.errors];
|
|
72
|
+
if (meta.examples?.length) {
|
|
73
|
+
method.examples = meta.examples.map((example) => {
|
|
74
|
+
const pairing = {
|
|
75
|
+
name: example.name,
|
|
76
|
+
params: Array.isArray(example.params)
|
|
77
|
+
? example.params.map((value, index) => ({
|
|
78
|
+
name: params[index]?.name ?? `param${index}`,
|
|
79
|
+
value,
|
|
80
|
+
}))
|
|
81
|
+
: Object.entries(example.params).map(([name, value]) => ({
|
|
82
|
+
name,
|
|
83
|
+
value,
|
|
84
|
+
})),
|
|
85
|
+
};
|
|
86
|
+
if (example.summary != null)
|
|
87
|
+
pairing.summary = example.summary;
|
|
88
|
+
if (example.description != null)
|
|
89
|
+
pairing.description = example.description;
|
|
90
|
+
if (example.result !== undefined)
|
|
91
|
+
pairing.result = {
|
|
92
|
+
name: method.result.name,
|
|
93
|
+
value: example.result,
|
|
94
|
+
};
|
|
95
|
+
return pairing;
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
if (meta.deprecated != null)
|
|
99
|
+
method.deprecated = meta.deprecated;
|
|
100
|
+
if (meta.externalDocs)
|
|
101
|
+
method.externalDocs = meta.externalDocs;
|
|
102
|
+
return method;
|
|
103
|
+
}
|
|
104
|
+
function buildParams(definition) {
|
|
105
|
+
const { $params, $meta } = definition;
|
|
106
|
+
const paramsMeta = $meta?.params ?? {};
|
|
107
|
+
if ($params?.type === 'object') {
|
|
108
|
+
const required = $params.required ?? [];
|
|
109
|
+
const params = Object.entries($params.properties ?? {}).map(([name, schema]) => contentDescriptor(name, schema, required.includes(name), paramsMeta[name]));
|
|
110
|
+
return { paramStructure: 'by-name', params };
|
|
111
|
+
}
|
|
112
|
+
if ($params?.type === 'array') {
|
|
113
|
+
// $Tuple は名前を持たないため、$meta.params のキー記述順を位置に対応させる (無ければ param{N} を合成)
|
|
114
|
+
const names = Object.keys(paramsMeta);
|
|
115
|
+
const items = ($params.items ?? []);
|
|
116
|
+
const minItems = $params.minItems ?? items.length;
|
|
117
|
+
const params = items.map((schema, index) => {
|
|
118
|
+
const name = names[index] ?? `param${index}`;
|
|
119
|
+
return contentDescriptor(name, schema, index < minItems, paramsMeta[name]);
|
|
120
|
+
});
|
|
121
|
+
return { paramStructure: 'by-position', params };
|
|
122
|
+
}
|
|
123
|
+
return { params: [] };
|
|
124
|
+
}
|
|
125
|
+
function contentDescriptor(name, schema, required, meta) {
|
|
126
|
+
const descriptor = { name, schema };
|
|
127
|
+
const isRequired = meta?.required ?? required;
|
|
128
|
+
if (isRequired)
|
|
129
|
+
descriptor.required = true;
|
|
130
|
+
if (meta?.summary != null)
|
|
131
|
+
descriptor.summary = meta.summary;
|
|
132
|
+
if (meta?.description != null)
|
|
133
|
+
descriptor.description = meta.description;
|
|
134
|
+
if (meta?.deprecated != null)
|
|
135
|
+
descriptor.deprecated = meta.deprecated;
|
|
136
|
+
return descriptor;
|
|
137
|
+
}
|
|
138
|
+
//# sourceMappingURL=OpenRpc.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OpenRpc.js","sourceRoot":"","sources":["../../src/router/OpenRpc.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { JsonRpcMethodDefinition } from
|
|
2
|
-
import { JsonRpcRouter } from
|
|
1
|
+
import { JsonRpcMethodDefinition, } from '../JsonRpcMethod.js';
|
|
2
|
+
import { JsonRpcRouter } from './JsonRpcRouter.js';
|
|
3
3
|
export class StaticRouter extends JsonRpcRouter {
|
|
4
4
|
routeMap;
|
|
5
5
|
constructor(routeMap) {
|
|
@@ -7,15 +7,27 @@ export class StaticRouter extends JsonRpcRouter {
|
|
|
7
7
|
this.routeMap = routeMap;
|
|
8
8
|
}
|
|
9
9
|
#cache = {};
|
|
10
|
+
/**
|
|
11
|
+
* 1 セグメントを解決する。lazy thunk (`() => import()`) の呼び出しと ES module の
|
|
12
|
+
* `default` unwrap は「その関数内でのみ有効な一時的な扱い」で、`isDefinition` による
|
|
13
|
+
* ランタイム型ガードで検証したうえで、**戻り値の型を検証済みの型に固定**する
|
|
14
|
+
* (`unknown`/緩い型を呼び出し側へ漏らさない)。
|
|
15
|
+
*/
|
|
10
16
|
async resolveChild(methodPath) {
|
|
11
17
|
if (methodPath in this.#cache)
|
|
12
18
|
return this.#cache[methodPath];
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
if (
|
|
17
|
-
return this.#cache[methodPath] =
|
|
18
|
-
|
|
19
|
+
const entry = this.routeMap[methodPath];
|
|
20
|
+
const loaded = typeof entry === 'function' ? await entry() : await entry;
|
|
21
|
+
const resolved = unwrapModule(loaded);
|
|
22
|
+
if (!resolved)
|
|
23
|
+
return (this.#cache[methodPath] = null);
|
|
24
|
+
if (JsonRpcMethodDefinition.isDefinition(resolved)) {
|
|
25
|
+
// isDefinition が true の枝で resolved は JsonRpcMethodDefinition に narrow 済み。
|
|
26
|
+
return (this.#cache[methodPath] = resolved);
|
|
27
|
+
}
|
|
28
|
+
// def でないことを isDefinition で検証済み → RouteMap<Ctx> として子ルータへ。
|
|
29
|
+
// (generic Ctx 越しでは負の narrowing が効かないため局所キャスト。戻り値型は上で固定済み)
|
|
30
|
+
return (this.#cache[methodPath] = new StaticRouter(resolved));
|
|
19
31
|
}
|
|
20
32
|
async resolve(methodPath) {
|
|
21
33
|
if (!methodPath || methodPath.length === 0)
|
|
@@ -30,10 +42,11 @@ export class StaticRouter extends JsonRpcRouter {
|
|
|
30
42
|
console.warn(`Route not found: ${head}`);
|
|
31
43
|
return null;
|
|
32
44
|
}
|
|
33
|
-
if (child
|
|
45
|
+
if (JsonRpcMethodDefinition.isDefinition(child)) {
|
|
34
46
|
console.warn(`Method appear middle in route : ${head}`);
|
|
35
47
|
return null;
|
|
36
48
|
}
|
|
49
|
+
// def でも null でもないことを検証済み → StaticRouter として再帰 (generic narrowing の局所キャスト)
|
|
37
50
|
return child.resolve(tail);
|
|
38
51
|
}
|
|
39
52
|
async *enumerate() {
|
|
@@ -42,4 +55,24 @@ export class StaticRouter extends JsonRpcRouter {
|
|
|
42
55
|
}
|
|
43
56
|
}
|
|
44
57
|
}
|
|
58
|
+
/**
|
|
59
|
+
* lazy thunk の解決結果から ES module wrapper を剥がす。
|
|
60
|
+
* 「default を持つ module namespace なら default を採用」という一時的なランタイム判定を
|
|
61
|
+
* この関数内に閉じ込め、戻り値は `StaticRoute<Ctx>|undefined` に固定する。
|
|
62
|
+
*/
|
|
63
|
+
function unwrapModule(loaded) {
|
|
64
|
+
if (loaded &&
|
|
65
|
+
typeof loaded === 'object' &&
|
|
66
|
+
!JsonRpcMethodDefinition.isDefinition(loaded) &&
|
|
67
|
+
'default' in loaded) {
|
|
68
|
+
// module namespace ({ default }) と runtime 判定できた場合のみ default を採用する局所キャスト
|
|
69
|
+
return loaded.default;
|
|
70
|
+
}
|
|
71
|
+
return loaded;
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* lazy thunk エントリ (`() => import()`) を含む RouteMap を受ける StaticRouter の公開 alias。
|
|
75
|
+
* (StaticRouter 自体が lazy thunk を解決できるため、意味を明示するための別名)
|
|
76
|
+
*/
|
|
77
|
+
export const LazyRouter = StaticRouter;
|
|
45
78
|
//# sourceMappingURL=StaticRouter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticRouter.js","sourceRoot":"","sources":["../../src/router/StaticRouter.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"StaticRouter.js","sourceRoot":"","sources":["../../src/router/StaticRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,uBAAuB,GAE1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAiB,MAAM,oBAAoB,CAAC;AAqDlE,MAAM,OAAO,YAAkB,SAAQ,aAAkB;IACxB;IAA7B,YAA6B,QAAuB;QAChD,KAAK,EAAE,CAAC;QADiB,aAAQ,GAAR,QAAQ,CAAe;IAEpD,CAAC;IAED,MAAM,GAAG,EAAqB,CAAC;IAE/B;;;;;OAKG;IACH,KAAK,CAAC,YAAY,CACd,UAAkB;QAIlB,IAAI,UAAU,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACxC,MAAM,MAAM,GACR,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC;QAC9D,MAAM,QAAQ,GAAG,YAAY,CAAM,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ;YAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,CAAC;QACvD,IAAI,uBAAuB,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjD,0EAA0E;YAC1E,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC;QAChD,CAAC;QACD,0DAA0D;QAC1D,2DAA2D;QAC3D,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,YAAY,CAC9C,QAAyB,CAC5B,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,OAAO,CACT,UAA6B;QAI7B,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACxD,IAAI,OAAO,UAAU,KAAK,QAAQ;YAAE,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvE,MAAM,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,UAAU,CAAC;QAEnC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACpC,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;YACzC,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,uBAAuB,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9C,OAAO,CAAC,IAAI,CAAC,mCAAmC,IAAI,EAAE,CAAC,CAAC;YACxD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,2EAA2E;QAC3E,OAAQ,KAA2B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,CAAC,SAAS;QACZ,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC9B,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;CACJ;AAED;;;;GAIG;AACH,SAAS,YAAY,CACjB,MAAoE;IAEpE,IACI,MAAM;QACN,OAAO,MAAM,KAAK,QAAQ;QAC1B,CAAC,uBAAuB,CAAC,YAAY,CAAC,MAAM,CAAC;QAC7C,SAAS,IAAI,MAAM,EACrB,CAAC;QACC,yEAAyE;QACzE,OAAQ,MAAwC,CAAC,OAAO,CAAC;IAC7D,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,YAAY,CAAC"}
|
package/esm/router/hashObject.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
export async function hashObject(src) {
|
|
2
2
|
const json = orderGuaranteeJson(src);
|
|
3
3
|
const srcBuffer = await new Blob([json]).arrayBuffer();
|
|
4
|
-
const hashBuffer = await crypto.subtle.digest(
|
|
5
|
-
return [...new Uint8Array(hashBuffer)]
|
|
4
|
+
const hashBuffer = await crypto.subtle.digest('SHA-256', srcBuffer);
|
|
5
|
+
return [...new Uint8Array(hashBuffer)]
|
|
6
|
+
.map((b) => b.toString(16).padStart(2, '0'))
|
|
7
|
+
.join('');
|
|
6
8
|
}
|
|
7
9
|
function orderGuaranteeJson(src) {
|
|
8
10
|
if (src === undefined)
|
|
@@ -14,16 +16,17 @@ function orderGuaranteeJson(src) {
|
|
|
14
16
|
case 'number':
|
|
15
17
|
case 'boolean':
|
|
16
18
|
return JSON.stringify(src);
|
|
17
|
-
case 'object':
|
|
19
|
+
case 'object': {
|
|
18
20
|
if (Array.isArray(src)) {
|
|
19
21
|
const stringfied = src.map(orderGuaranteeJson);
|
|
20
22
|
return `[${stringfied.join(',')}]`;
|
|
21
23
|
}
|
|
22
24
|
const stringfied = Object.entries(src)
|
|
23
25
|
.filter(([k, v]) => v !== undefined)
|
|
24
|
-
.sort(([k1], [k2]) => k1 < k2 ? -1 : 1)
|
|
26
|
+
.sort(([k1], [k2]) => (k1 < k2 ? -1 : 1))
|
|
25
27
|
.map(([k, v]) => JSON.stringify(k) + ':' + orderGuaranteeJson(v));
|
|
26
28
|
return `{${stringfied.join(',')}}`;
|
|
29
|
+
}
|
|
27
30
|
default:
|
|
28
31
|
throw new TypeError('Unexpected type');
|
|
29
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hashObject.js","sourceRoot":"","sources":["../../src/router/hashObject.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAqB;IAClD,MAAM,IAAI,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,MAAM,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACvD,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACpE,OAAO,CAAC,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"hashObject.js","sourceRoot":"","sources":["../../src/router/hashObject.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAqB;IAClD,MAAM,IAAI,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,MAAM,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACvD,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACpE,OAAO,CAAC,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;SACjC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;SAC3C,IAAI,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAqB;IAC7C,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IACrC,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IAChC,QAAQ,OAAO,GAAG,EAAE,CAAC;QACjB,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACV,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC/B,KAAK,QAAQ,CAAC,CAAC,CAAC;YACZ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,MAAM,UAAU,GAAG,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBAC/C,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YACvC,CAAC;YACD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;iBACjC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC;iBACnC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBACxC,GAAG,CACA,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAC9D,CAAC;YACN,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QACvC,CAAC;QACD;YACI,MAAM,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC/C,CAAC;AACL,CAAC"}
|
package/esm/router/index.js
CHANGED
package/esm/router/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC"}
|
package/esm/schemas/Complex.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
|
+
// const 型パラメータでリテラル型を保持する (routes 経由の静的型導出で enum が widening しないように)
|
|
1
2
|
export function $Enum(...elements) {
|
|
2
3
|
return {
|
|
3
|
-
enum: elements
|
|
4
|
+
enum: elements,
|
|
4
5
|
};
|
|
5
6
|
}
|
|
6
7
|
export function $EnumKeys(obj) {
|
|
7
8
|
return {
|
|
8
|
-
enum: Object.keys(obj)
|
|
9
|
+
enum: Object.keys(obj),
|
|
9
10
|
};
|
|
10
11
|
}
|
|
11
12
|
export function $EnumValues(obj) {
|
|
@@ -13,7 +14,6 @@ export function $EnumValues(obj) {
|
|
|
13
14
|
enum: Object.values(obj),
|
|
14
15
|
};
|
|
15
16
|
}
|
|
16
|
-
;
|
|
17
17
|
export function $Expand(source, expand) {
|
|
18
18
|
return {
|
|
19
19
|
...source,
|
|
@@ -22,20 +22,20 @@ export function $Expand(source, expand) {
|
|
|
22
22
|
}
|
|
23
23
|
export function $Optional(item) {
|
|
24
24
|
return {
|
|
25
|
-
oneOf: [item, false]
|
|
25
|
+
oneOf: [item, false],
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
28
|
$Optional.is = (item) => {
|
|
29
29
|
const lits = item?.oneOf ?? item?.anyOf ?? null;
|
|
30
30
|
if (!lits)
|
|
31
31
|
return false;
|
|
32
|
-
return
|
|
32
|
+
return lits.some((i) => i === false);
|
|
33
33
|
};
|
|
34
34
|
$Optional.unwrap = (item) => {
|
|
35
35
|
const optionalList = item?.oneOf ?? item?.anyOf ?? null;
|
|
36
36
|
if (!optionalList)
|
|
37
37
|
return item;
|
|
38
|
-
const list = optionalList.filter(i => i !== false);
|
|
38
|
+
const list = optionalList.filter((i) => i !== false);
|
|
39
39
|
if (list.length === 1)
|
|
40
40
|
return list[0];
|
|
41
41
|
return item?.oneOf
|
|
@@ -44,17 +44,17 @@ $Optional.unwrap = (item) => {
|
|
|
44
44
|
};
|
|
45
45
|
export function $And(...allOf) {
|
|
46
46
|
return {
|
|
47
|
-
allOf
|
|
47
|
+
allOf,
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
50
|
export function $Or(...anyOf) {
|
|
51
51
|
return {
|
|
52
|
-
anyOf
|
|
52
|
+
anyOf,
|
|
53
53
|
};
|
|
54
54
|
}
|
|
55
55
|
export function $Xor(...oneOf) {
|
|
56
56
|
return {
|
|
57
|
-
oneOf
|
|
57
|
+
oneOf,
|
|
58
58
|
};
|
|
59
59
|
}
|
|
60
60
|
export function $Omit(schema, keys) {
|
|
@@ -72,10 +72,7 @@ export function $Override(schema, override) {
|
|
|
72
72
|
...schema.properties,
|
|
73
73
|
...override,
|
|
74
74
|
};
|
|
75
|
-
const uniq = Array.from(new Set([
|
|
76
|
-
...(schema.required ?? []),
|
|
77
|
-
...Object.keys(override),
|
|
78
|
-
]));
|
|
75
|
+
const uniq = Array.from(new Set([...(schema.required ?? []), ...Object.keys(override)]));
|
|
79
76
|
const required = uniq.filter((k) => !(k in override && $Optional.is(override[k])));
|
|
80
77
|
return {
|
|
81
78
|
type: 'object',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Complex.js","sourceRoot":"","sources":["../../src/schemas/Complex.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,KAAK,
|
|
1
|
+
{"version":3,"file":"Complex.js","sourceRoot":"","sources":["../../src/schemas/Complex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Primitive.js","sourceRoot":"","sources":["../../src/schemas/Primitive.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Primitive.js","sourceRoot":"","sources":["../../src/schemas/Primitive.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,KAAK,GAAG;IACjB,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,IAAI;CACR,CAAC;AAEX,MAAM,CAAC,MAAM,QAAQ,GAAG;IACpB,IAAI,EAAE,SAAS;CACT,CAAC;AAEX,MAAM,CAAC,MAAM,OAAO,GAAG;IACnB,IAAI,EAAE,QAAQ;CACR,CAAC;AAEX,MAAM,CAAC,MAAM,QAAQ,GAAG;IACpB,IAAI,EAAE,SAAS;CACT,CAAC;AAEX,MAAM,CAAC,MAAM,OAAO,GAAG;IACnB,IAAI,EAAE,QAAQ;CACR,CAAC"}
|
package/esm/schemas/Structure.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { $Optional } from
|
|
1
|
+
import { $Optional } from './Complex.js';
|
|
2
2
|
export function $Array(items) {
|
|
3
3
|
return {
|
|
4
4
|
type: 'array',
|
|
5
|
-
items
|
|
5
|
+
items,
|
|
6
6
|
};
|
|
7
7
|
}
|
|
8
8
|
export function $Tuple(...items) {
|
|
@@ -11,8 +11,9 @@ export function $Tuple(...items) {
|
|
|
11
11
|
const optionalNumber = [...items].reverse().findIndex((i) => $Optional.is(i)) + 1;
|
|
12
12
|
return {
|
|
13
13
|
type: 'array',
|
|
14
|
-
items: items.map(item => $Optional.unwrap(item)),
|
|
15
|
-
minItems: items.length -
|
|
14
|
+
items: items.map((item) => $Optional.unwrap(item)),
|
|
15
|
+
minItems: (items.length -
|
|
16
|
+
optionalNumber),
|
|
16
17
|
maxItems: items.length,
|
|
17
18
|
additionalItems: false,
|
|
18
19
|
};
|
|
@@ -25,7 +26,7 @@ export function $Object(properties) {
|
|
|
25
26
|
type: 'object',
|
|
26
27
|
additionalProperties: false,
|
|
27
28
|
required,
|
|
28
|
-
properties: properties
|
|
29
|
+
properties: properties,
|
|
29
30
|
};
|
|
30
31
|
}
|
|
31
32
|
//# sourceMappingURL=Structure.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../src/schemas/Structure.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../src/schemas/Structure.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,UAAU,MAAM,CAAuB,KAAQ;IACjD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK;KACC,CAAC;AACf,CAAC;AASD,MAAM,UAAU,MAAM,CAAkC,GAAG,KAAQ;IAC/D,wCAAwC;IACxC,uHAAuH;IACvH,MAAM,cAAc,GAChB,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC3E,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAa;QAC/D,QAAQ,EAAE,CAAC,KAAK,CAAC,MAAM;YACnB,cAAc,CAAiC;QACnD,QAAQ,EAAE,KAAK,CAAC,MAA0B;QAC1C,eAAe,EAAE,KAAK;KAChB,CAAC;AACf,CAAC;AAED,MAAM,UAAU,OAAO,CAAuC,UAAa;IACvE,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;SACtC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;SAC9C,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAsB,CAAC;IAC9C,OAAO;QACH,IAAI,EAAE,QAAQ;QACd,oBAAoB,EAAE,KAAK;QAC3B,QAAQ;QACR,UAAU,EAAE,UAAe;KACrB,CAAC;AACf,CAAC"}
|
package/esm/schemas/index.js
CHANGED
package/esm/schemas/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schemas/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schemas/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC"}
|