@xxxaz/json-rpc-schema-typing 0.10.22 → 0.10.24
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/cjs/client/JsonRpcHttpClient.js +4 -1
- package/cjs/client/JsonRpcHttpClient.js.map +1 -1
- package/cjs/schemas/Complex.js +20 -2
- package/cjs/schemas/Complex.js.map +1 -1
- package/cjs/schemas/Structure.js.map +1 -1
- package/esm/client/JsonRpcHttpClient.js +4 -1
- package/esm/client/JsonRpcHttpClient.js.map +1 -1
- package/esm/schemas/Complex.js +19 -2
- package/esm/schemas/Complex.js.map +1 -1
- package/esm/schemas/Structure.js.map +1 -1
- package/package.json +1 -1
- package/src/client/JsonRpcHttpClient.ts +7 -1
- package/src/schemas/Complex.ts +34 -7
- package/src/schemas/Structure.ts +1 -4
- package/types/client/JsonRpcHttpClient.d.ts +2 -0
- package/types/schemas/Complex.d.ts +9 -1
- package/types/schemas/Structure.d.ts +1 -5
|
@@ -32,18 +32,21 @@ class JsonRpcHttpClient extends JsonRpcClient_js_1.JsonRpcClient {
|
|
|
32
32
|
headers,
|
|
33
33
|
};
|
|
34
34
|
};
|
|
35
|
+
this.#fetcher = options.fetcher ?? fetch;
|
|
35
36
|
}
|
|
36
37
|
postUrl;
|
|
37
38
|
batchUrl;
|
|
38
39
|
#requestConverter;
|
|
39
40
|
#responseConverter;
|
|
40
41
|
#initGenerator;
|
|
42
|
+
#fetcher;
|
|
41
43
|
async #post(url, request) {
|
|
42
44
|
if (this.#requestConverter)
|
|
43
45
|
request = this.#requestConverter(request);
|
|
44
46
|
const body = await (0, utility_js_1.readStreamAll)(request);
|
|
45
47
|
const init = await this.#initGenerator(body);
|
|
46
|
-
const
|
|
48
|
+
const requestObj = new Request(url, { ...init, body });
|
|
49
|
+
const response = await this.#fetcher(requestObj);
|
|
47
50
|
if (!response.ok) {
|
|
48
51
|
const message = `${response.status} ${response.statusText}`;
|
|
49
52
|
const headers = Object.fromEntries(response.headers.entries());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonRpcHttpClient.js","sourceRoot":"","sources":["../../src/client/JsonRpcHttpClient.ts"],"names":[],"mappings":";;;AAAA,4EAA8E;AAC9E,gEAAyD;AAEzD,yDAA+D;AAC/D,8CAA0D;
|
|
1
|
+
{"version":3,"file":"JsonRpcHttpClient.js","sourceRoot":"","sources":["../../src/client/JsonRpcHttpClient.ts"],"names":[],"mappings":"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"}
|
package/cjs/schemas/Complex.js
CHANGED
|
@@ -9,6 +9,7 @@ exports.$And = $And;
|
|
|
9
9
|
exports.$Or = $Or;
|
|
10
10
|
exports.$Xor = $Xor;
|
|
11
11
|
exports.$Omit = $Omit;
|
|
12
|
+
exports.$Override = $Override;
|
|
12
13
|
function $Enum(...elements) {
|
|
13
14
|
return {
|
|
14
15
|
enum: elements
|
|
@@ -73,8 +74,25 @@ function $Omit(schema, keys) {
|
|
|
73
74
|
const required = (schema.required ?? []).filter((k) => !keys.includes(k));
|
|
74
75
|
return {
|
|
75
76
|
type: 'object',
|
|
76
|
-
properties
|
|
77
|
-
required
|
|
77
|
+
properties,
|
|
78
|
+
required,
|
|
79
|
+
additionalProperties: schema.additionalProperties,
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
function $Override(schema, override) {
|
|
83
|
+
const properties = {
|
|
84
|
+
...schema.properties,
|
|
85
|
+
...override,
|
|
86
|
+
};
|
|
87
|
+
const uniq = Array.from(new Set([
|
|
88
|
+
...(schema.required ?? []),
|
|
89
|
+
...Object.keys(override),
|
|
90
|
+
]));
|
|
91
|
+
const required = uniq.filter((k) => !(k in override && $Optional.is(override[k])));
|
|
92
|
+
return {
|
|
93
|
+
type: 'object',
|
|
94
|
+
properties,
|
|
95
|
+
required,
|
|
78
96
|
additionalProperties: schema.additionalProperties,
|
|
79
97
|
};
|
|
80
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Complex.js","sourceRoot":"","sources":["../../src/schemas/Complex.ts"],"names":[],"mappings":";;AAGA,sBAIC;AAED,8BAIC;AAED,kCAIC;AAED,0BAKC;AAGD,8BAIC;AAmBD,oBAIC;AAED,kBAIC;AAED,oBAIC;AAED,sBAqBC;
|
|
1
|
+
{"version":3,"file":"Complex.js","sourceRoot":"","sources":["../../src/schemas/Complex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../src/schemas/Structure.ts"],"names":[],"mappings":";;AAGA,wBAKC;AAOD,wBAWC;
|
|
1
|
+
{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../src/schemas/Structure.ts"],"names":[],"mappings":";;AAGA,wBAKC;AAOD,wBAWC;AAED,0BAUC;AArCD,6CAAyC;AAEzC,SAAgB,MAAM,CAAuB,KAAQ;IACjD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK;KACC,CAAC;AACf,CAAC;AAOD,SAAgB,MAAM,CAAkC,GAAG,KAAQ;IAC/D,wCAAwC;IACxC,uHAAuH;IACvH,MAAM,cAAc,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,sBAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC9F,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,sBAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAa;QAC7D,QAAQ,EAAE,KAAK,CAAC,MAAM,GAAG,cAA8C;QACvE,QAAQ,EAAE,KAAK,CAAC,MAA0B;QAC1C,eAAe,EAAE,KAAK;KAChB,CAAC;AACf,CAAC;AAED,SAAgB,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,sBAAS,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"}
|
|
@@ -29,18 +29,21 @@ export class JsonRpcHttpClient extends JsonRpcClient {
|
|
|
29
29
|
headers,
|
|
30
30
|
};
|
|
31
31
|
};
|
|
32
|
+
this.#fetcher = options.fetcher ?? fetch;
|
|
32
33
|
}
|
|
33
34
|
postUrl;
|
|
34
35
|
batchUrl;
|
|
35
36
|
#requestConverter;
|
|
36
37
|
#responseConverter;
|
|
37
38
|
#initGenerator;
|
|
39
|
+
#fetcher;
|
|
38
40
|
async #post(url, request) {
|
|
39
41
|
if (this.#requestConverter)
|
|
40
42
|
request = this.#requestConverter(request);
|
|
41
43
|
const body = await readStreamAll(request);
|
|
42
44
|
const init = await this.#initGenerator(body);
|
|
43
|
-
const
|
|
45
|
+
const requestObj = new Request(url, { ...init, body });
|
|
46
|
+
const response = await this.#fetcher(requestObj);
|
|
44
47
|
if (!response.ok) {
|
|
45
48
|
const message = `${response.status} ${response.statusText}`;
|
|
46
49
|
const headers = Object.fromEntries(response.headers.entries());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonRpcHttpClient.js","sourceRoot":"","sources":["../../src/client/JsonRpcHttpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAc,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"JsonRpcHttpClient.js","sourceRoot":"","sources":["../../src/client/JsonRpcHttpClient.ts"],"names":[],"mappings":"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"}
|
package/esm/schemas/Complex.js
CHANGED
|
@@ -62,8 +62,25 @@ export function $Omit(schema, keys) {
|
|
|
62
62
|
const required = (schema.required ?? []).filter((k) => !keys.includes(k));
|
|
63
63
|
return {
|
|
64
64
|
type: 'object',
|
|
65
|
-
properties
|
|
66
|
-
required
|
|
65
|
+
properties,
|
|
66
|
+
required,
|
|
67
|
+
additionalProperties: schema.additionalProperties,
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
export function $Override(schema, override) {
|
|
71
|
+
const properties = {
|
|
72
|
+
...schema.properties,
|
|
73
|
+
...override,
|
|
74
|
+
};
|
|
75
|
+
const uniq = Array.from(new Set([
|
|
76
|
+
...(schema.required ?? []),
|
|
77
|
+
...Object.keys(override),
|
|
78
|
+
]));
|
|
79
|
+
const required = uniq.filter((k) => !(k in override && $Optional.is(override[k])));
|
|
80
|
+
return {
|
|
81
|
+
type: 'object',
|
|
82
|
+
properties,
|
|
83
|
+
required,
|
|
67
84
|
additionalProperties: schema.additionalProperties,
|
|
68
85
|
};
|
|
69
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Complex.js","sourceRoot":"","sources":["../../src/schemas/Complex.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,KAAK,CAA2C,GAAG,QAAW;IAC1E,OAAO;QACH,IAAI,EAAE,QAAQ;KACR,CAAC;AACf,CAAC;AAED,MAAM,UAAU,SAAS,CAAmB,GAAM;IAC9C,OAAO;QACH,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAgB;KAC/B,CAAC;AACf,CAAC;AAED,MAAM,UAAU,WAAW,CAAyC,GAAM;IACtE,OAAO;QACH,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAiB;KAClC,CAAC;AACf,CAAC;AAAA,CAAC;AAEF,MAAM,UAAU,OAAO,CAAyD,MAAW,EAAE,MAAU;IACnG,OAAO;QACH,GAAG,MAAM;QACT,GAAG,MAAM;KACH,CAAC;AACf,CAAC;AAGD,MAAM,UAAU,SAAS,CAAuB,IAAO;IACnD,OAAO;QACH,KAAK,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;KACd,CAAC;AACf,CAAC;AAED,SAAS,CAAC,EAAE,GAAG,CAAC,IAAa,EAAyB,EAAE;IACpD,MAAM,IAAI,GAAI,IAAY,EAAE,KAAK,IAAK,IAAY,EAAE,KAAK,IAAI,IAAI,CAAC;IAClE,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IACxB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC;AAChD,CAAC,CAAC;AAGF,SAAS,CAAC,MAAM,GAAG,CAAiC,IAAO,EAAgB,EAAE;IACzE,MAAM,YAAY,GAAG,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC;IACxD,IAAI,CAAC,YAAY;QAAE,OAAO,IAAoB,CAAC;IAC/C,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC;IACnD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC,CAAC,CAAiB,CAAC;IACtD,OAAO,IAAI,EAAE,KAAK;QACd,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAkB;QACjC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAkB,CAAC;AAC1C,CAAC,CAAC;AAEF,MAAM,UAAU,IAAI,CAA+B,GAAG,KAAc;IAChE,OAAO;QACH,KAAK;KACC,CAAC;AACf,CAAC;AAED,MAAM,UAAU,GAAG,CAA+B,GAAG,KAAc;IAC/D,OAAO;QACH,KAAK;KACC,CAAC;AACf,CAAC;AAED,MAAM,UAAU,IAAI,CAA+B,GAAG,KAAc;IAChE,OAAO;QACH,KAAK;KACC,CAAC;AACf,CAAC;AAED,MAAM,UAAU,KAAK,CAGnB,MAAS,EAAE,IAAkB;IAC3B,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CACjC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAC1C,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAQ,CAAC,CACtC,
|
|
1
|
+
{"version":3,"file":"Complex.js","sourceRoot":"","sources":["../../src/schemas/Complex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../src/schemas/Structure.ts"],"names":[],"mappings":"AACA,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;AAOD,MAAM,UAAU,MAAM,CAAkC,GAAG,KAAQ;IAC/D,wCAAwC;IACxC,uHAAuH;IACvH,MAAM,cAAc,GAAG,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;IAC9F,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAa;QAC7D,QAAQ,EAAE,KAAK,CAAC,MAAM,GAAG,cAA8C;QACvE,QAAQ,EAAE,KAAK,CAAC,MAA0B;QAC1C,eAAe,EAAE,KAAK;KAChB,CAAC;AACf,CAAC;
|
|
1
|
+
{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../src/schemas/Structure.ts"],"names":[],"mappings":"AACA,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;AAOD,MAAM,UAAU,MAAM,CAAkC,GAAG,KAAQ;IAC/D,wCAAwC;IACxC,uHAAuH;IACvH,MAAM,cAAc,GAAG,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;IAC9F,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAa;QAC7D,QAAQ,EAAE,KAAK,CAAC,MAAM,GAAG,cAA8C;QACvE,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/package.json
CHANGED
|
@@ -6,6 +6,8 @@ import { emptyStrem, readStreamAll } from "../utility.js";
|
|
|
6
6
|
|
|
7
7
|
type HeadersGenerator = (body: Blob) => Promise<HeadersInit>|HeadersInit;
|
|
8
8
|
|
|
9
|
+
type Fetcher = (req: Request) => Promise<Response>;
|
|
10
|
+
|
|
9
11
|
type JsonRpcHttpClientOptions<Sch extends JsonRpcSchema> = {
|
|
10
12
|
schema: Sch;
|
|
11
13
|
generateId?: GenereteId;
|
|
@@ -14,6 +16,7 @@ type JsonRpcHttpClientOptions<Sch extends JsonRpcSchema> = {
|
|
|
14
16
|
requestConverter?: (request: ReadableStream<string>) => ReadableStream<Uint8Array>;
|
|
15
17
|
responseConverter?: (response: ReadableStream<Uint8Array>, contentType: string|null) => ReadableStream<string>;
|
|
16
18
|
headers?: HeadersGenerator|HeadersInit;
|
|
19
|
+
fetcher?: Fetcher;
|
|
17
20
|
init?: Pick<RequestInit, 'credentials'|'keepalive'|'mode'|'priority'|'redirect'|'referrer'|'referrerPolicy'>;
|
|
18
21
|
};
|
|
19
22
|
|
|
@@ -46,6 +49,7 @@ export class JsonRpcHttpClient<Sch extends JsonRpcSchema> extends JsonRpcClient<
|
|
|
46
49
|
headers,
|
|
47
50
|
};
|
|
48
51
|
};
|
|
52
|
+
this.#fetcher = options.fetcher ?? fetch;
|
|
49
53
|
}
|
|
50
54
|
|
|
51
55
|
readonly postUrl: string|URL;
|
|
@@ -53,12 +57,14 @@ export class JsonRpcHttpClient<Sch extends JsonRpcSchema> extends JsonRpcClient<
|
|
|
53
57
|
readonly #requestConverter?: (request: ReadableStream<string>) => ReadableStream<any>;
|
|
54
58
|
readonly #responseConverter?: (response: ReadableStream<any>, contentType: string|null) => ReadableStream<string>;
|
|
55
59
|
readonly #initGenerator: (body: Blob) => Promise<RequestInit>;
|
|
60
|
+
readonly #fetcher: Fetcher;
|
|
56
61
|
|
|
57
62
|
async #post(url: string|URL, request: ReadableStream<string>) {
|
|
58
63
|
if (this.#requestConverter) request = this.#requestConverter(request);
|
|
59
64
|
const body = await readStreamAll(request);
|
|
60
65
|
const init = await this.#initGenerator(body);
|
|
61
|
-
const
|
|
66
|
+
const requestObj = new Request(url, { ...init, body });
|
|
67
|
+
const response = await this.#fetcher(requestObj);
|
|
62
68
|
if (!response.ok) {
|
|
63
69
|
const message = `${response.status} ${response.statusText}`;
|
|
64
70
|
const headers = Object.fromEntries(response.headers.entries());
|
package/src/schemas/Complex.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Primitive } from "@xxxaz/stream-api-json";
|
|
2
|
-
import { JSONSchema } from "../types.js";
|
|
2
|
+
import { JSONSchema, RequiredKeys } from "../types.js";
|
|
3
3
|
|
|
4
4
|
export function $Enum<T extends (null|boolean|number|string)[]>(...elements: T) {
|
|
5
5
|
return {
|
|
@@ -76,16 +76,43 @@ export function $Omit<
|
|
|
76
76
|
Object.entries(schema.properties ?? {}).filter(
|
|
77
77
|
([key]) => !keys.includes(key as K)
|
|
78
78
|
)
|
|
79
|
-
)
|
|
79
|
+
) as Omit<T['properties'], K>;
|
|
80
80
|
const required = (schema.required ?? []).filter(
|
|
81
81
|
(k) => !keys.includes(k as K)
|
|
82
|
-
)
|
|
82
|
+
) as T['required'] extends (infer R)[]
|
|
83
|
+
? [Exclude<R, K>]
|
|
84
|
+
: never;
|
|
83
85
|
return {
|
|
84
86
|
type: 'object',
|
|
85
|
-
properties
|
|
86
|
-
required
|
|
87
|
-
|
|
88
|
-
|
|
87
|
+
properties,
|
|
88
|
+
required,
|
|
89
|
+
additionalProperties:
|
|
90
|
+
schema.additionalProperties as T['additionalProperties'],
|
|
91
|
+
} as const;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
export function $Override<
|
|
95
|
+
T extends JSONSchema & { type: 'object' },
|
|
96
|
+
O extends Record<string, JSONSchema>,
|
|
97
|
+
>(schema: T, override: O) {
|
|
98
|
+
const properties = {
|
|
99
|
+
...schema.properties,
|
|
100
|
+
...override,
|
|
101
|
+
} as Omit<T['properties'], keyof O> & O;
|
|
102
|
+
|
|
103
|
+
const uniq = Array.from(new Set([
|
|
104
|
+
...(schema.required ?? []),
|
|
105
|
+
...Object.keys(override),
|
|
106
|
+
]));
|
|
107
|
+
const required = uniq.filter(
|
|
108
|
+
(k) => !(k in override && $Optional.is(override[k]))
|
|
109
|
+
) as T['required'] extends (infer R)[]
|
|
110
|
+
? [Exclude<R, keyof O> | RequiredKeys<O>]
|
|
111
|
+
: [RequiredKeys<O>];
|
|
112
|
+
return {
|
|
113
|
+
type: 'object',
|
|
114
|
+
properties,
|
|
115
|
+
required,
|
|
89
116
|
additionalProperties:
|
|
90
117
|
schema.additionalProperties as T['additionalProperties'],
|
|
91
118
|
} as const;
|
package/src/schemas/Structure.ts
CHANGED
|
@@ -26,10 +26,7 @@ export function $Tuple<T extends readonly JSONSchema[]>(...items: T) {
|
|
|
26
26
|
} as const;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
|
|
30
|
-
[key: string]: JSONSchema;
|
|
31
|
-
};
|
|
32
|
-
export function $Object<T extends ObjectDefine>(properties: T) {
|
|
29
|
+
export function $Object<T extends Record<string, JSONSchema>>(properties: T) {
|
|
33
30
|
const required = Object.entries(properties)
|
|
34
31
|
.filter(([key, value]) => !$Optional.is(value))
|
|
35
32
|
.map(([key]) => key) as [RequiredKeys<T>];
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { JsonRpcSchema } from "../router/JsonRpcRouter.js";
|
|
2
2
|
import { GenereteId, JsonRpcClient } from "./JsonRpcClient.js";
|
|
3
3
|
type HeadersGenerator = (body: Blob) => Promise<HeadersInit> | HeadersInit;
|
|
4
|
+
type Fetcher = (req: Request) => Promise<Response>;
|
|
4
5
|
type JsonRpcHttpClientOptions<Sch extends JsonRpcSchema> = {
|
|
5
6
|
schema: Sch;
|
|
6
7
|
generateId?: GenereteId;
|
|
@@ -9,6 +10,7 @@ type JsonRpcHttpClientOptions<Sch extends JsonRpcSchema> = {
|
|
|
9
10
|
requestConverter?: (request: ReadableStream<string>) => ReadableStream<Uint8Array>;
|
|
10
11
|
responseConverter?: (response: ReadableStream<Uint8Array>, contentType: string | null) => ReadableStream<string>;
|
|
11
12
|
headers?: HeadersGenerator | HeadersInit;
|
|
13
|
+
fetcher?: Fetcher;
|
|
12
14
|
init?: Pick<RequestInit, 'credentials' | 'keepalive' | 'mode' | 'priority' | 'redirect' | 'referrer' | 'referrerPolicy'>;
|
|
13
15
|
};
|
|
14
16
|
export declare class JsonRpcHttpClient<Sch extends JsonRpcSchema> extends JsonRpcClient<Sch> {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Primitive } from "@xxxaz/stream-api-json";
|
|
2
|
-
import { JSONSchema } from "../types.js";
|
|
2
|
+
import { JSONSchema, RequiredKeys } from "../types.js";
|
|
3
3
|
export declare function $Enum<T extends (null | boolean | number | string)[]>(...elements: T): {
|
|
4
4
|
readonly enum: T;
|
|
5
5
|
};
|
|
@@ -42,4 +42,12 @@ export declare function $Omit<T extends JSONSchema & {
|
|
|
42
42
|
readonly required: T["required"] extends (infer R)[] ? [Exclude<R, K>] : never;
|
|
43
43
|
readonly additionalProperties: T["additionalProperties"];
|
|
44
44
|
};
|
|
45
|
+
export declare function $Override<T extends JSONSchema & {
|
|
46
|
+
type: 'object';
|
|
47
|
+
}, O extends Record<string, JSONSchema>>(schema: T, override: O): {
|
|
48
|
+
readonly type: "object";
|
|
49
|
+
readonly properties: Omit<T["properties"], keyof O> & O;
|
|
50
|
+
readonly required: T["required"] extends (infer R)[] ? [Exclude<R, keyof O> | RequiredKeys<O>] : [RequiredKeys<O>];
|
|
51
|
+
readonly additionalProperties: T["additionalProperties"];
|
|
52
|
+
};
|
|
45
53
|
export {};
|
|
@@ -11,13 +11,9 @@ export declare function $Tuple<T extends readonly JSONSchema[]>(...items: T): {
|
|
|
11
11
|
readonly maxItems: Max<T["length"]>;
|
|
12
12
|
readonly additionalItems: false;
|
|
13
13
|
};
|
|
14
|
-
|
|
15
|
-
[key: string]: JSONSchema;
|
|
16
|
-
};
|
|
17
|
-
export declare function $Object<T extends ObjectDefine>(properties: T): {
|
|
14
|
+
export declare function $Object<T extends Record<string, JSONSchema>>(properties: T): {
|
|
18
15
|
readonly type: "object";
|
|
19
16
|
readonly additionalProperties: false;
|
|
20
17
|
readonly required: [RequiredKeys<T>];
|
|
21
18
|
readonly properties: T;
|
|
22
19
|
};
|
|
23
|
-
export {};
|