@ominity/api-typescript 1.1.1 → 1.1.2
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/dist/commonjs/lib/config.d.ts +3 -3
- package/dist/commonjs/lib/config.js +1 -1
- package/dist/commonjs/lib/matchers.d.ts.map +1 -1
- package/dist/commonjs/lib/matchers.js +22 -2
- package/dist/commonjs/lib/matchers.js.map +1 -1
- package/dist/esm/lib/config.d.ts +3 -3
- package/dist/esm/lib/config.js +1 -1
- package/dist/esm/lib/matchers.d.ts.map +1 -1
- package/dist/esm/lib/matchers.js +23 -3
- package/dist/esm/lib/matchers.js.map +1 -1
- package/jsr.json +1 -1
- package/package.json +1 -1
- package/src/lib/config.ts +1 -1
- package/src/lib/matchers.ts +37 -3
|
@@ -42,12 +42,12 @@ export type SDKOptions = {
|
|
|
42
42
|
debugLogger?: Logger;
|
|
43
43
|
};
|
|
44
44
|
export declare function serverURLFromOptions(options: SDKOptions): URL | null;
|
|
45
|
-
export declare const SDK_VERSION = "1.1.
|
|
45
|
+
export declare const SDK_VERSION = "1.1.2";
|
|
46
46
|
export declare const SDK_METADATA: {
|
|
47
47
|
readonly language: "typescript";
|
|
48
48
|
readonly openapiDocVersion: "manual";
|
|
49
|
-
readonly sdkVersion: "1.1.
|
|
49
|
+
readonly sdkVersion: "1.1.2";
|
|
50
50
|
readonly genVersion: "manual";
|
|
51
|
-
readonly userAgent: "ominity-sdk/typescript 1.1.
|
|
51
|
+
readonly userAgent: "ominity-sdk/typescript 1.1.2";
|
|
52
52
|
};
|
|
53
53
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -23,7 +23,7 @@ function applyApiVersion(url, apiVersion) {
|
|
|
23
23
|
url.pathname = `${currentPath}${versionSuffix}`;
|
|
24
24
|
return url;
|
|
25
25
|
}
|
|
26
|
-
exports.SDK_VERSION = "1.1.
|
|
26
|
+
exports.SDK_VERSION = "1.1.2";
|
|
27
27
|
exports.SDK_METADATA = {
|
|
28
28
|
language: "typescript",
|
|
29
29
|
openapiDocVersion: "manual",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matchers.d.ts","sourceRoot":"","sources":["../../../src/lib/matchers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAW,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"matchers.d.ts","sourceRoot":"","sources":["../../../src/lib/matchers.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,20 +77,40 @@ function nil(codes, schema, options) {
|
|
|
77
77
|
function fail(codes) {
|
|
78
78
|
return { enc: "fail", codes };
|
|
79
79
|
}
|
|
80
|
+
function isJsonLikeResponse(response) {
|
|
81
|
+
const contentType = response.headers.get("content-type")?.split(";")[0]?.trim().toLowerCase()
|
|
82
|
+
|| "application/octet-stream";
|
|
83
|
+
const [type = "", subtype = ""] = contentType.split("/", 2);
|
|
84
|
+
if (type !== "application" || subtype.length === 0) {
|
|
85
|
+
return false;
|
|
86
|
+
}
|
|
87
|
+
return subtype === "json" || subtype.endsWith("+json");
|
|
88
|
+
}
|
|
80
89
|
function match(...matchers) {
|
|
81
90
|
return async function matchFunc(response, request, options) {
|
|
82
91
|
let raw;
|
|
83
92
|
let matcher;
|
|
84
93
|
for (const match of matchers) {
|
|
85
94
|
const { codes } = match;
|
|
95
|
+
const hasExplicitContentType = "ctype" in match && typeof match.ctype === "string";
|
|
86
96
|
const ctpattern = "ctype" in match
|
|
87
97
|
? match.ctype
|
|
88
98
|
: DEFAULT_CONTENT_TYPES[match.enc];
|
|
89
|
-
if (
|
|
99
|
+
if (!(0, http_js_1.matchStatusCode)(response, codes)) {
|
|
100
|
+
continue;
|
|
101
|
+
}
|
|
102
|
+
if (!ctpattern) {
|
|
103
|
+
matcher = match;
|
|
104
|
+
break;
|
|
105
|
+
}
|
|
106
|
+
if ((0, http_js_1.matchContentType)(response, ctpattern)) {
|
|
90
107
|
matcher = match;
|
|
91
108
|
break;
|
|
92
109
|
}
|
|
93
|
-
|
|
110
|
+
// The API often returns HAL+JSON (`application/*+json`) for JSON payloads.
|
|
111
|
+
// Keep explicit content-type matchers strict, but allow default JSON
|
|
112
|
+
// matchers to accept any JSON-compatible media type.
|
|
113
|
+
if (!hasExplicitContentType && match.enc === "json" && isJsonLikeResponse(response)) {
|
|
94
114
|
matcher = match;
|
|
95
115
|
break;
|
|
96
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matchers.js","sourceRoot":"","sources":["../../../src/lib/matchers.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"matchers.js","sourceRoot":"","sources":["../../../src/lib/matchers.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/lib/config.d.ts
CHANGED
|
@@ -42,12 +42,12 @@ export type SDKOptions = {
|
|
|
42
42
|
debugLogger?: Logger;
|
|
43
43
|
};
|
|
44
44
|
export declare function serverURLFromOptions(options: SDKOptions): URL | null;
|
|
45
|
-
export declare const SDK_VERSION = "1.1.
|
|
45
|
+
export declare const SDK_VERSION = "1.1.2";
|
|
46
46
|
export declare const SDK_METADATA: {
|
|
47
47
|
readonly language: "typescript";
|
|
48
48
|
readonly openapiDocVersion: "manual";
|
|
49
|
-
readonly sdkVersion: "1.1.
|
|
49
|
+
readonly sdkVersion: "1.1.2";
|
|
50
50
|
readonly genVersion: "manual";
|
|
51
|
-
readonly userAgent: "ominity-sdk/typescript 1.1.
|
|
51
|
+
readonly userAgent: "ominity-sdk/typescript 1.1.2";
|
|
52
52
|
};
|
|
53
53
|
//# sourceMappingURL=config.d.ts.map
|
package/dist/esm/lib/config.js
CHANGED
|
@@ -19,7 +19,7 @@ function applyApiVersion(url, apiVersion) {
|
|
|
19
19
|
url.pathname = `${currentPath}${versionSuffix}`;
|
|
20
20
|
return url;
|
|
21
21
|
}
|
|
22
|
-
export const SDK_VERSION = "1.1.
|
|
22
|
+
export const SDK_VERSION = "1.1.2";
|
|
23
23
|
export const SDK_METADATA = {
|
|
24
24
|
language: "typescript",
|
|
25
25
|
openapiDocVersion: "manual",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matchers.d.ts","sourceRoot":"","sources":["../../../src/lib/matchers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAW,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"matchers.d.ts","sourceRoot":"","sources":["../../../src/lib/matchers.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/lib/matchers.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { OminityDefaultError } from "../models/errors/ominity-default-error.js";
|
|
2
2
|
import { ResponseValidationError } from "../models/errors/response-validation-error.js";
|
|
3
3
|
import { ERR, OK } from "../types/fp.js";
|
|
4
|
-
import {
|
|
4
|
+
import { matchContentType, matchStatusCode, } from "./http.js";
|
|
5
5
|
import { isPlainObject } from "./is-plain-object.js";
|
|
6
6
|
const DEFAULT_CONTENT_TYPES = {
|
|
7
7
|
jsonl: "application/jsonl",
|
|
@@ -58,20 +58,40 @@ export function nil(codes, schema, options) {
|
|
|
58
58
|
export function fail(codes) {
|
|
59
59
|
return { enc: "fail", codes };
|
|
60
60
|
}
|
|
61
|
+
function isJsonLikeResponse(response) {
|
|
62
|
+
const contentType = response.headers.get("content-type")?.split(";")[0]?.trim().toLowerCase()
|
|
63
|
+
|| "application/octet-stream";
|
|
64
|
+
const [type = "", subtype = ""] = contentType.split("/", 2);
|
|
65
|
+
if (type !== "application" || subtype.length === 0) {
|
|
66
|
+
return false;
|
|
67
|
+
}
|
|
68
|
+
return subtype === "json" || subtype.endsWith("+json");
|
|
69
|
+
}
|
|
61
70
|
export function match(...matchers) {
|
|
62
71
|
return async function matchFunc(response, request, options) {
|
|
63
72
|
let raw;
|
|
64
73
|
let matcher;
|
|
65
74
|
for (const match of matchers) {
|
|
66
75
|
const { codes } = match;
|
|
76
|
+
const hasExplicitContentType = "ctype" in match && typeof match.ctype === "string";
|
|
67
77
|
const ctpattern = "ctype" in match
|
|
68
78
|
? match.ctype
|
|
69
79
|
: DEFAULT_CONTENT_TYPES[match.enc];
|
|
70
|
-
if (
|
|
80
|
+
if (!matchStatusCode(response, codes)) {
|
|
81
|
+
continue;
|
|
82
|
+
}
|
|
83
|
+
if (!ctpattern) {
|
|
84
|
+
matcher = match;
|
|
85
|
+
break;
|
|
86
|
+
}
|
|
87
|
+
if (matchContentType(response, ctpattern)) {
|
|
71
88
|
matcher = match;
|
|
72
89
|
break;
|
|
73
90
|
}
|
|
74
|
-
|
|
91
|
+
// The API often returns HAL+JSON (`application/*+json`) for JSON payloads.
|
|
92
|
+
// Keep explicit content-type matchers strict, but allow default JSON
|
|
93
|
+
// matchers to accept any JSON-compatible media type.
|
|
94
|
+
if (!hasExplicitContentType && match.enc === "json" && isJsonLikeResponse(response)) {
|
|
75
95
|
matcher = match;
|
|
76
96
|
break;
|
|
77
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matchers.js","sourceRoot":"","sources":["../../../src/lib/matchers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,GAAG,EAAE,EAAE,EAAU,MAAM,gBAAgB,CAAC;AACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"matchers.js","sourceRoot":"","sources":["../../../src/lib/matchers.ts"],"names":[],"mappings":"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"}
|
package/jsr.json
CHANGED
package/package.json
CHANGED
package/src/lib/config.ts
CHANGED
package/src/lib/matchers.ts
CHANGED
|
@@ -2,7 +2,11 @@
|
|
|
2
2
|
import { OminityDefaultError } from "../models/errors/ominity-default-error.js";
|
|
3
3
|
import { ResponseValidationError } from "../models/errors/response-validation-error.js";
|
|
4
4
|
import { ERR, OK, Result } from "../types/fp.js";
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
matchContentType,
|
|
7
|
+
matchStatusCode,
|
|
8
|
+
StatusCodePredicate,
|
|
9
|
+
} from "./http.js";
|
|
6
10
|
import { isPlainObject } from "./is-plain-object.js";
|
|
7
11
|
|
|
8
12
|
export type Encoding =
|
|
@@ -176,6 +180,19 @@ export type MatchFunc<T, E> = (
|
|
|
176
180
|
options?: { resultKey?: string; extraFields?: Record<string, unknown> },
|
|
177
181
|
) => Promise<[result: Result<T, E>, raw: unknown]>;
|
|
178
182
|
|
|
183
|
+
function isJsonLikeResponse(response: Response): boolean {
|
|
184
|
+
const contentType =
|
|
185
|
+
response.headers.get("content-type")?.split(";")[0]?.trim().toLowerCase()
|
|
186
|
+
|| "application/octet-stream";
|
|
187
|
+
const [type = "", subtype = ""] = contentType.split("/", 2);
|
|
188
|
+
|
|
189
|
+
if (type !== "application" || subtype.length === 0) {
|
|
190
|
+
return false;
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
return subtype === "json" || subtype.endsWith("+json");
|
|
194
|
+
}
|
|
195
|
+
|
|
179
196
|
export function match<T, E>(
|
|
180
197
|
...matchers: Array<Matcher<T, E>>
|
|
181
198
|
): MatchFunc<T, E | OminityDefaultError | ResponseValidationError> {
|
|
@@ -193,13 +210,30 @@ export function match<T, E>(
|
|
|
193
210
|
let matcher: Matcher<T, E> | undefined;
|
|
194
211
|
for (const match of matchers) {
|
|
195
212
|
const { codes } = match;
|
|
213
|
+
const hasExplicitContentType =
|
|
214
|
+
"ctype" in match && typeof match.ctype === "string";
|
|
196
215
|
const ctpattern = "ctype" in match
|
|
197
216
|
? match.ctype
|
|
198
217
|
: DEFAULT_CONTENT_TYPES[match.enc];
|
|
199
|
-
|
|
218
|
+
|
|
219
|
+
if (!matchStatusCode(response, codes)) {
|
|
220
|
+
continue;
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
if (!ctpattern) {
|
|
200
224
|
matcher = match;
|
|
201
225
|
break;
|
|
202
|
-
}
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
if (matchContentType(response, ctpattern)) {
|
|
229
|
+
matcher = match;
|
|
230
|
+
break;
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
// The API often returns HAL+JSON (`application/*+json`) for JSON payloads.
|
|
234
|
+
// Keep explicit content-type matchers strict, but allow default JSON
|
|
235
|
+
// matchers to accept any JSON-compatible media type.
|
|
236
|
+
if (!hasExplicitContentType && match.enc === "json" && isJsonLikeResponse(response)) {
|
|
203
237
|
matcher = match;
|
|
204
238
|
break;
|
|
205
239
|
}
|