@fern-api/fdr-sdk 0.139.3-b692c26d1 → 0.139.3-e28429302
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/api-definition/snippets/SnippetHttpRequest.d.ts.map +1 -1
- package/dist/api-definition/snippets/SnippetHttpRequest.js +3 -1
- package/dist/api-definition/snippets/get-har-request.js +1 -1
- package/dist/api-definition/url.d.ts.map +1 -1
- package/dist/api-definition/url.js +13 -4
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SnippetHttpRequest.d.ts","sourceRoot":"","sources":["../../../src/api-definition/snippets/SnippetHttpRequest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SnippetHttpRequest.d.ts","sourceRoot":"","sources":["../../../src/api-definition/snippets/SnippetHttpRequest.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,KAAK,MAAM,MAAM,WAAW,CAAC;AAEzC,UAAU,0BAA0B;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,kCAAkC;IAC1C,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,+BAA+B,CAAC,CAAC;CACxD;AAED,MAAM,WAAW,uCAAuC;IACtD,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAED,MAAM,WAAW,wCAAwC;IACvD,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,IAAI,CAAC,uCAAuC,EAAE,MAAM,CAAC,EAAE,CAAC;CAChE;AAED,MAAM,MAAM,+BAA+B,GACvC,0BAA0B,GAC1B,kCAAkC,GAClC,uCAAuC,GACvC,wCAAwC,CAAC;AAE7C,UAAU,2BAA2B;IACnC,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,sBAAsB,GAC9B,0BAA0B,GAC1B,0BAA0B,GAC1B,2BAA2B,CAAC;AAEhC,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE;QACV,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,IAAI,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAGD,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,CAAC,kBAAkB,EACnC,OAAO,EAAE,MAAM,CAAC,mBAAmB,EACnC,IAAI,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,GAClC,kBAAkB,CAmHpB"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { compact } from "es-toolkit/array";
|
|
2
2
|
import { noop } from "ts-essentials";
|
|
3
3
|
import urljoin from "url-join";
|
|
4
|
+
import { sanitizeUrl } from "@fern-api/ui-core-utils";
|
|
4
5
|
import visitDiscriminatedUnion from "@fern-api/ui-core-utils/visitDiscriminatedUnion";
|
|
5
6
|
// TODO: validate that global headers are also included in the example by CLI or FDR
|
|
6
7
|
export function toSnippetHttpRequest(endpoint, example, auth) {
|
|
7
8
|
const environmentUrl = (endpoint.environments?.find((env) => env.id === endpoint.defaultEnvironment) ?? endpoint.environments?.[0])?.baseUrl;
|
|
8
|
-
const
|
|
9
|
+
const sanitizedEnvironment = sanitizeUrl(environmentUrl);
|
|
10
|
+
const url = urljoin(compact([sanitizedEnvironment, example.path]));
|
|
9
11
|
const headers = { ...example.headers };
|
|
10
12
|
let basicAuth;
|
|
11
13
|
if (endpoint.auth && endpoint.auth.length > 0 && auth) {
|
|
@@ -42,7 +42,7 @@ export function getHarRequest(endpoint, example, auths, requestBody) {
|
|
|
42
42
|
// Keep arrays and primitive values
|
|
43
43
|
if (Array.isArray(valueObj) ||
|
|
44
44
|
typeof valueObj !== "object" ||
|
|
45
|
-
valueObj
|
|
45
|
+
valueObj == null) {
|
|
46
46
|
return true;
|
|
47
47
|
}
|
|
48
48
|
// For objects, only filter out empty objects without a value property
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../src/api-definition/url.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../src/api-definition/url.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAkD7D,UAAU,sBAAsB;IAC9B,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AACD,wBAAgB,eAAe,CAAC,EAC9B,OAAY,EACZ,IAAI,EACJ,cAAc,EACd,eAAe,GAChB,EAAE,sBAAsB,GAAG,MAAM,CAejC;AAED,UAAU,uBAAuB;IAC/B,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AACD,wBAAgB,gBAAgB,CAAC,EAC/B,QAAQ,EACR,cAAc,EACd,eAAe,EACf,OAAO,GACR,EAAE,uBAAuB,GAAG,MAAM,CAkBlC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import qs from "qs";
|
|
2
|
-
import { unknownToString } from "@fern-api/ui-core-utils";
|
|
2
|
+
import { sanitizeUrl, unknownToString } from "@fern-api/ui-core-utils";
|
|
3
3
|
function buildQueryParams(queryParameters) {
|
|
4
4
|
if (queryParameters == null) {
|
|
5
5
|
return "";
|
|
@@ -36,14 +36,23 @@ function buildPath(path = [], pathParameters) {
|
|
|
36
36
|
.join("");
|
|
37
37
|
}
|
|
38
38
|
export function buildRequestUrl({ baseUrl = "", path, pathParameters, queryParameters, }) {
|
|
39
|
-
|
|
39
|
+
const sanitizedBaseUrl = sanitizeUrl(baseUrl) || "";
|
|
40
|
+
if (sanitizedBaseUrl.endsWith("/")) {
|
|
41
|
+
return (sanitizedBaseUrl.slice(0, -1) +
|
|
42
|
+
buildPath(path, pathParameters) +
|
|
43
|
+
buildQueryParams(queryParameters));
|
|
44
|
+
}
|
|
45
|
+
return (sanitizedBaseUrl +
|
|
40
46
|
buildPath(path, pathParameters) +
|
|
41
47
|
buildQueryParams(queryParameters));
|
|
42
48
|
}
|
|
43
49
|
export function buildEndpointUrl({ endpoint, pathParameters, queryParameters, baseUrl, }) {
|
|
50
|
+
const environmentBaseUrl = baseUrl ??
|
|
51
|
+
(endpoint?.environments?.find((env) => env.id === endpoint.defaultEnvironment) ?? endpoint?.environments?.[0])?.baseUrl;
|
|
52
|
+
// sanitize the base URL - if invalid, it will be null
|
|
53
|
+
const sanitizedBaseUrl = sanitizeUrl(environmentBaseUrl);
|
|
44
54
|
return buildRequestUrl({
|
|
45
|
-
baseUrl:
|
|
46
|
-
(endpoint?.environments?.find((env) => env.id === endpoint.defaultEnvironment) ?? endpoint?.environments?.[0])?.baseUrl,
|
|
55
|
+
baseUrl: sanitizedBaseUrl || "",
|
|
47
56
|
path: endpoint?.path,
|
|
48
57
|
pathParameters,
|
|
49
58
|
queryParameters,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fern-api/fdr-sdk",
|
|
3
|
-
"version": "0.139.3-
|
|
3
|
+
"version": "0.139.3-e28429302",
|
|
4
4
|
"sideEffects": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"test:update": "vitest --run --passWithNoTests --globals -u"
|
|
50
50
|
},
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@fern-api/ui-core-utils": "0.139.3-
|
|
52
|
+
"@fern-api/ui-core-utils": "0.139.3-e28429302*",
|
|
53
53
|
"@ungap/structured-clone": "^1.2.0",
|
|
54
54
|
"dayjs": "^1.11.11",
|
|
55
55
|
"es-toolkit": "^1.32.0",
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"@babel/core": "^7.26.9",
|
|
69
69
|
"@babel/preset-env": "^7.26.0",
|
|
70
70
|
"@babel/preset-typescript": "^7.26.0",
|
|
71
|
-
"@fern-platform/configs": "0.139.3-
|
|
71
|
+
"@fern-platform/configs": "0.139.3-e28429302*",
|
|
72
72
|
"@types/node-fetch": "2.6.9",
|
|
73
73
|
"@types/qs": "6.9.14",
|
|
74
74
|
"@types/tinycolor2": "^1.4.6",
|