bruce-models 1.7.7 → 1.7.8
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.
|
@@ -12,12 +12,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.AbstractApi = void 0;
|
|
13
13
|
const cache_1 = require("../common/cache");
|
|
14
14
|
const api_1 = require("./api");
|
|
15
|
+
// TODO: Currently checks for CSV vs json specifically,
|
|
16
|
+
// Need to see if our api is generally good at setting content-type headers.
|
|
17
|
+
// Make it less specific to CSV.
|
|
15
18
|
function parseResult(data) {
|
|
16
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
17
20
|
if (data.status == 200) {
|
|
21
|
+
let type = data.headers.get("Content-Type");
|
|
22
|
+
if (type) {
|
|
23
|
+
type = type.trim().toLowerCase();
|
|
24
|
+
}
|
|
18
25
|
let encoding = "";
|
|
19
|
-
const
|
|
20
|
-
const charset = type ? type.split(";").find((x) => x.trim().toLowerCase().startsWith("charset=")) : "";
|
|
26
|
+
const charset = type ? type.split(";").find((x) => x.startsWith("charset=")) : "";
|
|
21
27
|
if (charset && charset.includes("=")) {
|
|
22
28
|
encoding = charset.split("=")[1];
|
|
23
29
|
encoding = encoding.toLowerCase();
|
|
@@ -31,11 +37,18 @@ function parseResult(data) {
|
|
|
31
37
|
if (!text || !text.trim()) {
|
|
32
38
|
return null;
|
|
33
39
|
}
|
|
40
|
+
if (type && type.includes("text/csv")) {
|
|
41
|
+
return text;
|
|
42
|
+
}
|
|
34
43
|
return JSON.parse(text);
|
|
35
44
|
}
|
|
36
45
|
else {
|
|
37
46
|
const buffer = yield data.arrayBuffer();
|
|
38
|
-
|
|
47
|
+
const text = new TextDecoder(encoding).decode(buffer);
|
|
48
|
+
if (type && type.includes("text/csv")) {
|
|
49
|
+
return text;
|
|
50
|
+
}
|
|
51
|
+
return JSON.parse(text);
|
|
39
52
|
}
|
|
40
53
|
}
|
|
41
54
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-api.js","sourceRoot":"","sources":["../../../src/api/abstract-api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA+C;AAC/C,+BAA4B;AAE5B,SAAe,WAAW,CAAC,IAAc;;QACrC,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,EAAE;YACpB,IAAI,
|
|
1
|
+
{"version":3,"file":"abstract-api.js","sourceRoot":"","sources":["../../../src/api/abstract-api.ts"],"names":[],"mappings":"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"}
|