@mapcreator/api 5.0.0-alpha.102 → 5.0.0-alpha.104
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/api/apiCommon.js +14 -3
- package/cjs/api/apiCommon.js.map +1 -1
- package/cjs/api/choropleth.js +15 -3
- package/cjs/api/choropleth.js.map +1 -1
- package/cjs/api/highlight.js +1 -1
- package/cjs/api/highlight.js.map +1 -1
- package/cjs/api/insetMap.js +2 -2
- package/cjs/api/insetMap.js.map +1 -1
- package/cjs/api/job.js +4 -4
- package/cjs/api/job.js.map +1 -1
- package/cjs/api/jobRevision.d.ts +1 -1
- package/cjs/api/jobRevision.d.ts.map +1 -1
- package/cjs/api/jobRevision.js +16 -9
- package/cjs/api/jobRevision.js.map +1 -1
- package/cjs/api/organisation.d.ts +1 -1
- package/cjs/api/organisation.d.ts.map +1 -1
- package/cjs/api/organisation.js +4 -4
- package/cjs/api/organisation.js.map +1 -1
- package/cjs/api/resources.js +8 -6
- package/cjs/api/resources.js.map +1 -1
- package/cjs/api/user.js +2 -2
- package/cjs/api/user.js.map +1 -1
- package/cjs/oauth.js +2 -3
- package/cjs/oauth.js.map +1 -1
- package/cjs/utils.d.ts +9 -2
- package/cjs/utils.d.ts.map +1 -1
- package/cjs/utils.js +71 -13
- package/cjs/utils.js.map +1 -1
- package/esm/api/apiCommon.js +14 -3
- package/esm/api/apiCommon.js.map +1 -1
- package/esm/api/choropleth.js +15 -3
- package/esm/api/choropleth.js.map +1 -1
- package/esm/api/highlight.js +1 -1
- package/esm/api/highlight.js.map +1 -1
- package/esm/api/insetMap.js +2 -2
- package/esm/api/insetMap.js.map +1 -1
- package/esm/api/job.js +4 -4
- package/esm/api/job.js.map +1 -1
- package/esm/api/jobRevision.d.ts +1 -1
- package/esm/api/jobRevision.d.ts.map +1 -1
- package/esm/api/jobRevision.js +16 -9
- package/esm/api/jobRevision.js.map +1 -1
- package/esm/api/organisation.d.ts +1 -1
- package/esm/api/organisation.d.ts.map +1 -1
- package/esm/api/organisation.js +4 -4
- package/esm/api/organisation.js.map +1 -1
- package/esm/api/resources.js +8 -6
- package/esm/api/resources.js.map +1 -1
- package/esm/api/user.js +2 -2
- package/esm/api/user.js.map +1 -1
- package/esm/oauth.js +2 -3
- package/esm/oauth.js.map +1 -1
- package/esm/utils.d.ts +9 -2
- package/esm/utils.d.ts.map +1 -1
- package/esm/utils.js +69 -12
- package/esm/utils.js.map +1 -1
- package/package.json +1 -1
- package/src/api/jobRevision.ts +5 -2
- package/src/api/organisation.ts +1 -2
- package/src/utils.ts +70 -5
package/cjs/api/apiCommon.js
CHANGED
|
@@ -8,10 +8,21 @@ async function listJobs(pathname, title, page, searchOptions) {
|
|
|
8
8
|
sort: '-updated',
|
|
9
9
|
only_downloaded: false,
|
|
10
10
|
};
|
|
11
|
-
const search =
|
|
12
|
-
const query = (0, utils_js_1.getSearchParams)(
|
|
11
|
+
const search = { ...defaultSearchOptions, ...searchOptions };
|
|
12
|
+
const query = (0, utils_js_1.getSearchParams)({
|
|
13
|
+
only_with_revisions: true,
|
|
14
|
+
search: {
|
|
15
|
+
job_type_id: ['9', '6'],
|
|
16
|
+
converted_job_id: '=:',
|
|
17
|
+
...(title.length > 0 && { title: `~:${title}` }),
|
|
18
|
+
},
|
|
19
|
+
...search,
|
|
20
|
+
});
|
|
13
21
|
const path = `${pathname}?${query}`;
|
|
14
|
-
const headers =
|
|
22
|
+
const headers = {
|
|
23
|
+
...utils_js_1.defaultListHeader,
|
|
24
|
+
'X-Page': `${page}`,
|
|
25
|
+
};
|
|
15
26
|
const options = {
|
|
16
27
|
revivers: job_js_1.jobRevivers,
|
|
17
28
|
withMeta: true,
|
package/cjs/api/apiCommon.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiCommon.js","sourceRoot":"","sources":["../../src/api/apiCommon.ts"],"names":[],"mappings":";;AAgBA,4BAsDC;AAtED,qCAAkE;AAClE,0CAQqB;AAOd,KAAK,UAAU,QAAQ,CAC5B,QAAgB,EAChB,KAAa,EACb,IAAY,EACZ,aAAuC;IAEvC,MAAM,oBAAoB,GAAG;QAC3B,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,KAAK;KACvB,CAAC;IAEF,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"apiCommon.js","sourceRoot":"","sources":["../../src/api/apiCommon.ts"],"names":[],"mappings":";;AAgBA,4BAsDC;AAtED,qCAAkE;AAClE,0CAQqB;AAOd,KAAK,UAAU,QAAQ,CAC5B,QAAgB,EAChB,KAAa,EACb,IAAY,EACZ,aAAuC;IAEvC,MAAM,oBAAoB,GAAG;QAC3B,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,KAAK;KACvB,CAAC;IAEF,MAAM,MAAM,GAAG,EAAE,GAAG,oBAAoB,EAAE,GAAG,aAAa,EAAE,CAAC;IAE7D,MAAM,KAAK,GAAG,IAAA,0BAAe,EAAC;QAC5B,mBAAmB,EAAE,IAAI;QACzB,MAAM,EAAE;YACN,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;YACvB,gBAAgB,EAAE,IAAI;YACtB,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,KAAK,EAAE,EAAE,CAAC;SACjD;QACD,GAAG,MAAM;KACV,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IAEpC,MAAM,OAAO,GAAG;QACd,GAAG,4BAAiB;QACpB,QAAQ,EAAE,GAAG,IAAI,EAAE;KACpB,CAAC;IACF,MAAM,OAAO,GAAG;QACd,QAAQ,EAAE,oBAAyC;QACnD,QAAQ,EAAE,IAAI;KACf,CAAC;IAMF,MAAM,MAAM,GAAG,CAAC,MAAM,IAAA,kBAAO,EAAmB,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CACjF,CAAC,KAAY,EAAE,EAAE;QACf,IAAI,KAAK,YAAY,kBAAO,EAAE,CAAC;YAC7B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,KAAkC,CAAC;YAErE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QACnC,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC,CACF,CAA8B,CAAC;IAEhC,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;KAC1D,CAAC;AACJ,CAAC"}
|
package/cjs/api/choropleth.js
CHANGED
|
@@ -9,18 +9,30 @@ const utils_js_1 = require("../utils.js");
|
|
|
9
9
|
exports.boundingBoxRevivers = {
|
|
10
10
|
boundingBox: (data) => JSON.parse(data.bounding_box),
|
|
11
11
|
};
|
|
12
|
-
exports.singleOrGroupedAreaRevivers =
|
|
12
|
+
exports.singleOrGroupedAreaRevivers = {
|
|
13
|
+
...exports.boundingBoxRevivers,
|
|
14
|
+
properties: (data) => (data.properties != null ? JSON.parse(data.properties) : null),
|
|
15
|
+
};
|
|
13
16
|
/**
|
|
14
17
|
* TODO When SAGA search on click is implemented, remove mode and make searchBounds required
|
|
15
18
|
*/
|
|
16
19
|
async function searchSingleOrGroupedAreas(language, search, mode = 'both') {
|
|
17
20
|
const pathname = '/v1/choropleth/polygons/search';
|
|
18
|
-
const query = (0, utils_js_1.getSearchParams)(
|
|
21
|
+
const query = (0, utils_js_1.getSearchParams)({
|
|
22
|
+
language,
|
|
23
|
+
...search.searchBounds,
|
|
24
|
+
...(search.query && { query: search.query }),
|
|
25
|
+
...(search.searchPoint && { point: search.searchPoint }),
|
|
26
|
+
mode,
|
|
27
|
+
});
|
|
19
28
|
const path = `${pathname}?${query}`;
|
|
20
29
|
const options = { revivers: exports.singleOrGroupedAreaRevivers };
|
|
21
30
|
return (0, utils_js_1.request)(path, null, null, options);
|
|
22
31
|
}
|
|
23
|
-
exports.groupedAreaChildRevivers =
|
|
32
|
+
exports.groupedAreaChildRevivers = {
|
|
33
|
+
...exports.boundingBoxRevivers,
|
|
34
|
+
properties: (data) => JSON.parse(data.properties),
|
|
35
|
+
};
|
|
24
36
|
async function groupedAreaChildren(groupId, language) {
|
|
25
37
|
const pathname = `/v1/choropleth/groups/${groupId}/children-optimized`;
|
|
26
38
|
const query = (0, utils_js_1.getSearchParams)({ language });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"choropleth.js","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":";;;AAqFA,gEAyBC;AA+BD,kDAWC;AA0BD,sDAaC;AAsBD,4CAcC;AAnOD,0CAAoH;AAKvG,QAAA,mBAAmB,GAG5B;IACF,WAAW,EAAE,CAAC,IAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAY;CAC1F,CAAC;AAkEW,QAAA,2BAA2B,
|
|
1
|
+
{"version":3,"file":"choropleth.js","sourceRoot":"","sources":["../../src/api/choropleth.ts"],"names":[],"mappings":";;;AAqFA,gEAyBC;AA+BD,kDAWC;AA0BD,sDAaC;AAsBD,4CAcC;AAnOD,0CAAoH;AAKvG,QAAA,mBAAmB,GAG5B;IACF,WAAW,EAAE,CAAC,IAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAY;CAC1F,CAAC;AAkEW,QAAA,2BAA2B,GAA0D;IAChG,GAAG,2BAAmB;IACtB,UAAU,EAAE,CAAC,IAAgC,EAAE,EAAE,CAC/C,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAA2B,CAAC,CAAC,CAAC,IAAI,CAAC;CAC3F,CAAC;AAEF;;GAEG;AACI,KAAK,UAAU,0BAA0B,CAC9C,QAAgB,EAChB,MAIE,EACF,OAAqC,MAAM;IAE3C,MAAM,QAAQ,GAAG,gCAAgC,CAAC;IAClD,MAAM,KAAK,GAAG,IAAA,0BAAe,EAAC;QAC5B,QAAQ;QACR,GAAG,MAAM,CAAC,YAAY;QACtB,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QAC5C,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;QACxD,IAAI;KACL,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,mCAA2B,EAAE,CAAC;IAM1D,OAAO,IAAA,kBAAO,EAAmD,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AAC9F,CAAC;AA0BY,QAAA,wBAAwB,GAAoD;IACvF,GAAG,2BAAmB;IACtB,UAAU,EAAE,CAAC,IAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAA2B;CACrG,CAAC;AAEK,KAAK,UAAU,mBAAmB,CAAC,OAAe,EAAE,QAAgB;IACzE,MAAM,QAAQ,GAAG,yBAAyB,OAAO,qBAAqB,CAAC;IACvE,MAAM,KAAK,GAAG,IAAA,0BAAe,EAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,gCAAwB,EAAE,CAAC;IAMvD,OAAO,IAAA,kBAAO,EAA6C,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AACxF,CAAC;AA0BM,KAAK,UAAU,qBAAqB,CACzC,MAAgC,EAChC,QAAgB,EAChB,QAAgB;IAEhB,MAAM,IAAI,GAAG,8BAA8B,CAAC;IAC5C,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,2BAAmB,EAAE,CAAC;IAMlD,OAAO,IAAA,kBAAO,EAAqC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AACrH,CAAC;AAsBM,KAAK,UAAU,gBAAgB,CACpC,OAAe,EACf,QAAgB,EAChB,IAAc,EACd,QAAgB;IAEhB,MAAM,IAAI,GAAG,4BAA4B,CAAC;IAC1C,MAAM,IAAI,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAM7D,OAAO,IAAA,kBAAO,EAAqC,IAAI,EAAE,IAAI,CAAC,CAAC;AACjE,CAAC"}
|
package/cjs/api/highlight.js
CHANGED
|
@@ -8,7 +8,7 @@ async function listVectorHighlights(name) {
|
|
|
8
8
|
const query = (0, utils_js_1.getSearchParams)({ search: { name } });
|
|
9
9
|
const path = `${pathname}?${query}`;
|
|
10
10
|
// Only request first 50 results
|
|
11
|
-
const headers =
|
|
11
|
+
const headers = { ...utils_js_1.defaultListHeader };
|
|
12
12
|
const options = { withMeta: true };
|
|
13
13
|
return (0, utils_js_1.request)(path, null, headers, options)
|
|
14
14
|
.catch((error) => {
|
package/cjs/api/highlight.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"highlight.js","sourceRoot":"","sources":["../../src/api/highlight.ts"],"names":[],"mappings":";;AA2DA,oDAqBC;AAED,gDAIC;AApFD,0CASqB;AAgDd,KAAK,UAAU,oBAAoB,CAAC,IAAY;IACrD,MAAM,QAAQ,GAAG,uBAAuB,CAAC;IACzC,MAAM,KAAK,GAAG,IAAA,0BAAe,EAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IAEpC,gCAAgC;IAChC,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"highlight.js","sourceRoot":"","sources":["../../src/api/highlight.ts"],"names":[],"mappings":";;AA2DA,oDAqBC;AAED,gDAIC;AApFD,0CASqB;AAgDd,KAAK,UAAU,oBAAoB,CAAC,IAAY;IACrD,MAAM,QAAQ,GAAG,uBAAuB,CAAC;IACzC,MAAM,KAAK,GAAG,IAAA,0BAAe,EAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IAEpC,gCAAgC;IAChC,MAAM,OAAO,GAAG,EAAE,GAAG,4BAAiB,EAAE,CAAC;IACzC,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAMnC,OAAO,IAAA,kBAAO,EAAkD,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC;SAC1F,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE;QACtB,IAAI,KAAK,YAAY,kBAAO,EAAE,CAAC;YAC7B,OAAQ,KAAkE,CAAC,IAAI,CAAC;QAClF,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC,CAAC,CAAC;AACP,CAAC;AAEM,KAAK,UAAU,kBAAkB,CAAC,WAAmB;IAC1D,MAAM,IAAI,GAAG,yBAAyB,WAAW,EAAE,CAAC;IAEpD,OAAO,IAAA,kBAAO,EAAsC,IAAI,CAAC,CAAC;AAC5D,CAAC"}
|
package/cjs/api/insetMap.js
CHANGED
|
@@ -16,8 +16,8 @@ async function getInsetMap(insetMapId) {
|
|
|
16
16
|
async function getInsetMapTopoJson(insetMapId) {
|
|
17
17
|
const href = `${oauth_js_1.apiHost}/v1/inset-maps/${insetMapId}/json`;
|
|
18
18
|
const headers = (0, oauth_js_1.getAuthorizationHeaders)('GET');
|
|
19
|
-
const response = await fetch(href,
|
|
20
|
-
.catch((error) => {
|
|
19
|
+
const response = await fetch(href, { headers, ...!oauth_js_1.token && { credentials: 'include' } })
|
|
20
|
+
.catch((error) => { throw new utils_js_1.NetworkError(error?.message ?? error); });
|
|
21
21
|
if (response.ok) {
|
|
22
22
|
return response.json().catch(() => {
|
|
23
23
|
throw new utils_js_1.APIError({
|
package/cjs/api/insetMap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insetMap.js","sourceRoot":"","sources":["../../src/api/insetMap.ts"],"names":[],"mappings":";;AA+CA,sCAQC;AAED,kCAIC;AAED,kDA+BC;AA9FD,0CAAoF;AACpF,0CASqB;AAqCd,KAAK,UAAU,aAAa,CAAC,QAAkB;IACpD,MAAM,IAAI,GAAG,6BAA6B,CAAC;IAM3C,OAAO,IAAA,kBAAO,EAA6B,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;AACjE,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,UAAkB;IAClD,MAAM,IAAI,GAAG,kBAAkB,UAAU,EAAE,CAAC;IAE5C,OAAO,IAAA,kBAAO,EAAwB,IAAI,CAAC,CAAC;AAC9C,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAAW,UAAkB;IACpE,MAAM,IAAI,GAAG,GAAG,kBAAO,kBAAkB,UAAU,OAAO,CAAC;IAC3D,MAAM,OAAO,GAAG,IAAA,kCAAuB,EAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"insetMap.js","sourceRoot":"","sources":["../../src/api/insetMap.ts"],"names":[],"mappings":";;AA+CA,sCAQC;AAED,kCAIC;AAED,kDA+BC;AA9FD,0CAAoF;AACpF,0CASqB;AAqCd,KAAK,UAAU,aAAa,CAAC,QAAkB;IACpD,MAAM,IAAI,GAAG,6BAA6B,CAAC;IAM3C,OAAO,IAAA,kBAAO,EAA6B,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;AACjE,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,UAAkB;IAClD,MAAM,IAAI,GAAG,kBAAkB,UAAU,EAAE,CAAC;IAE5C,OAAO,IAAA,kBAAO,EAAwB,IAAI,CAAC,CAAC;AAC9C,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAAW,UAAkB;IACpE,MAAM,IAAI,GAAG,GAAG,kBAAO,kBAAkB,UAAU,OAAO,CAAC;IAC3D,MAAM,OAAO,GAAG,IAAA,kCAAuB,EAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,gBAAK,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC;SACrF,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE,GAAG,MAAM,IAAI,uBAAY,CAAC,KAAK,EAAE,OAAO,IAAI,KAAK,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;IAEhF,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;QAChB,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,IAAI,mBAAQ,CAAC;gBACjB,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,yBAAyB,EAAE;aACnE,CAAC,CAAC;QACL,CAAC,CAAsB,CAAC;IAC1B,CAAC;SAAM,CAAC;QACN,wCAAwC;QACxC,QAAQ,QAAQ,CAAC,MAAM,EAAE,CAAC;YACxB,KAAK,GAAG;gBACN,MAAM,IAAA,uBAAY,GAAE,CAAC;gBACrB,MAAM,CAAC,QAAQ;YACjB,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,MAAM,IAAI,mBAAQ,CAAC;oBACjB,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,QAAQ,CAAC,UAAU,EAAE;iBAC/D,CAAC,CAAC;QACP,CAAC;QAED,MAAM,IAAI,oBAAS,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;AACH,CAAC"}
|
package/cjs/api/job.js
CHANGED
|
@@ -17,14 +17,14 @@ exports.jobRevivers = {
|
|
|
17
17
|
description: undefined,
|
|
18
18
|
share_token: undefined,
|
|
19
19
|
autosave_preview_path: undefined,
|
|
20
|
-
jobFolderName: (data) =>
|
|
20
|
+
jobFolderName: (data) => data.job_folder_name ?? null,
|
|
21
21
|
createdAt: (data) => data.created_at,
|
|
22
|
-
previewPath: (data) =>
|
|
23
|
-
convertedJobId: (data) =>
|
|
22
|
+
previewPath: (data) => data.autosave_preview_path ?? undefined,
|
|
23
|
+
convertedJobId: (data) => data.converted_job_id ?? null,
|
|
24
24
|
};
|
|
25
25
|
async function createJob(title, oldJobId) {
|
|
26
26
|
const path = `/v1/jobs`;
|
|
27
|
-
const body =
|
|
27
|
+
const body = { title, job_type_id: 9, ...oldJobId && { cloned_v4_job_id: oldJobId } };
|
|
28
28
|
const options = { revivers: exports.jobRevivers };
|
|
29
29
|
// Technically, the returning `data` will contain only the following fields:
|
|
30
30
|
// Pick<ApiJobData, 'id' | 'job_type_id' | 'user_id' | 'title' | 'created_at' | 'updated_at'>
|
package/cjs/api/job.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.js","sourceRoot":"","sources":["../../src/api/job.ts"],"names":[],"mappings":";;;AA0DA,8BASC;AAED,wBAKC;AAED,8BAIC;AAED,8BAKC;AAED,0CAKC;AAED,0BAKC;AAED,8CAIC;AAED,4CAQC;AAED,4CAWC;AAED,4CAMC;AAzID,iDAAgE;AAChE,0CASqB;AAoCR,QAAA,WAAW,GAA0B;IAChD,WAAW,EAAE,SAAS;IACtB,WAAW,EAAE,SAAS;IACtB,qBAAqB,EAAE,SAAS;IAEhC,aAAa,EAAE,CAAC,IAAgB,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"job.js","sourceRoot":"","sources":["../../src/api/job.ts"],"names":[],"mappings":"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"}
|
package/cjs/api/jobRevision.d.ts
CHANGED
|
@@ -22,7 +22,7 @@ export type ApiJobRevision = {
|
|
|
22
22
|
} & Omit<ApiSuccess, 'data'> | ApiError;
|
|
23
23
|
export type ApiJobRevisionData = Flatten<Exclude<ApiJobRevision, ApiError>['data']>;
|
|
24
24
|
export declare const jobRevisionRevivers: Revivers<ApiJobRevision, JobRevision>;
|
|
25
|
-
export declare function createJobRevision(jobId: number, languageCode: string, mapstyleSetId: number, layers: number[], output: FileFormat, jobObject: Record<string, unknown
|
|
25
|
+
export declare function createJobRevision(jobId: number, languageCode: string, mapstyleSetId: number, layers: number[], output: FileFormat, jobObject: Record<string, unknown>, skipValidation?: boolean): Promise<JobRevision>;
|
|
26
26
|
export declare function getJobRevision(jobId: number): Promise<JobRevision | undefined>;
|
|
27
27
|
export declare function getJobRevisionObject<JobObject>(jobId: number): Promise<JobObject>;
|
|
28
28
|
export type JobCanBuild = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobRevision.d.ts","sourceRoot":"","sources":["../../src/api/jobRevision.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,KAAK,KAAK,EAAiB,MAAM,YAAY,CAAC;AAG1E,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,OAAO,EAGZ,KAAK,QAAQ,EAKd,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,UAAU,GAClB,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,MAAM,GACN,KAAK,GACL,SAAS,GACT,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,MAAM,GACN,cAAc,GACd,cAAc,GACd,KAAK,GACL,cAAc,CAAC;AAEnB,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,CAAC;QACtB,eAAe,EAAE,MAAM,CAAC;QACxB,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,UAAU,CAAC;KACpB,GAAG,aAAa,CAAC;CACnB,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC;AAExC,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEpF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,cAAc,EAAE,WAAW,CAErE,CAAC;AAEF,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EAAE,EAChB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"jobRevision.d.ts","sourceRoot":"","sources":["../../src/api/jobRevision.ts"],"names":[],"mappings":"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"}
|
package/cjs/api/jobRevision.js
CHANGED
|
@@ -16,7 +16,7 @@ const utils_js_1 = require("../utils.js");
|
|
|
16
16
|
exports.jobRevisionRevivers = {
|
|
17
17
|
archived: undefined,
|
|
18
18
|
};
|
|
19
|
-
async function createJobRevision(jobId, languageCode, mapstyleSetId, layers, output, jobObject) {
|
|
19
|
+
async function createJobRevision(jobId, languageCode, mapstyleSetId, layers, output, jobObject, skipValidation) {
|
|
20
20
|
const pathname = `/v1/jobs/${jobId}/revisions`;
|
|
21
21
|
const path = `${pathname}?${utils_js_1.deletedNoneParam}`;
|
|
22
22
|
const body = {
|
|
@@ -25,6 +25,7 @@ async function createJobRevision(jobId, languageCode, mapstyleSetId, layers, out
|
|
|
25
25
|
object: JSON.stringify(jobObject),
|
|
26
26
|
output,
|
|
27
27
|
layers,
|
|
28
|
+
...skipValidation && { skip_validation: skipValidation },
|
|
28
29
|
};
|
|
29
30
|
const options = { revivers: exports.jobRevisionRevivers };
|
|
30
31
|
return (0, utils_js_1.request)(path, body, null, options);
|
|
@@ -63,9 +64,14 @@ async function registerJobRevisionBuild(jobId, status, start, end) {
|
|
|
63
64
|
async function cloneJobRevision(jobId, newTitle) {
|
|
64
65
|
const pathname = `/v1/jobs/${jobId}/revisions/${utils_js_1.lastJobRevision}/clone`;
|
|
65
66
|
const path = `${pathname}?${utils_js_1.deletedNoneParam}`;
|
|
66
|
-
const body = { title: newTitle
|
|
67
|
+
const body = { title: newTitle ?? null };
|
|
67
68
|
const options = {
|
|
68
|
-
revivers:
|
|
69
|
+
revivers: {
|
|
70
|
+
...exports.jobRevisionRevivers,
|
|
71
|
+
layers: undefined,
|
|
72
|
+
language: undefined,
|
|
73
|
+
mapstyle_set: undefined,
|
|
74
|
+
},
|
|
69
75
|
};
|
|
70
76
|
return (0, utils_js_1.request)(path, body, null, options);
|
|
71
77
|
}
|
|
@@ -83,8 +89,8 @@ async function getJobRevisionOutput(jobId) {
|
|
|
83
89
|
await createJobRevisionBuild(jobId);
|
|
84
90
|
const href = `${oauth_js_1.apiHost}/v1/jobs/${jobId}/revisions/${utils_js_1.lastJobRevision}/result/output`;
|
|
85
91
|
const headers = (0, oauth_js_1.getAuthorizationHeaders)('GET');
|
|
86
|
-
const response = await fetch(href,
|
|
87
|
-
.catch((error) => {
|
|
92
|
+
const response = await fetch(href, { headers, ...!oauth_js_1.token && { credentials: 'include' } })
|
|
93
|
+
.catch((error) => { throw new utils_js_1.NetworkError(error?.message ?? error); });
|
|
88
94
|
if (response.ok) {
|
|
89
95
|
const blob = await response.blob().catch(() => {
|
|
90
96
|
throw new utils_js_1.APIError({ success: false, error: { type: 'TypeError', message: 'Malformed Blob response' } });
|
|
@@ -93,12 +99,12 @@ async function getJobRevisionOutput(jobId) {
|
|
|
93
99
|
if (contentDisposition) {
|
|
94
100
|
const filenameRegex = /filename\*\s*=\s*UTF-8''(.+)/i;
|
|
95
101
|
const filenameMatch = contentDisposition.match(filenameRegex);
|
|
96
|
-
if (filenameMatch
|
|
102
|
+
if (filenameMatch?.[1]) {
|
|
97
103
|
return { blob, filename: filenameMatch[1] };
|
|
98
104
|
}
|
|
99
105
|
const fallbackRegex = /filename\s*=\s*"([^"]+)"/i;
|
|
100
106
|
const fallbackMatch = contentDisposition.match(fallbackRegex);
|
|
101
|
-
if (fallbackMatch
|
|
107
|
+
if (fallbackMatch?.[1]) {
|
|
102
108
|
return { blob, filename: fallbackMatch[1] };
|
|
103
109
|
}
|
|
104
110
|
}
|
|
@@ -122,9 +128,10 @@ async function getJobRevisionOutput(jobId) {
|
|
|
122
128
|
throw new utils_js_1.HTTPError(response);
|
|
123
129
|
}
|
|
124
130
|
}
|
|
125
|
-
async function createJobRevisionBuild(jobId) {
|
|
131
|
+
async function createJobRevisionBuild(jobId, skipValidation) {
|
|
126
132
|
const pathname = `/v1/jobs/${jobId}/revisions/${utils_js_1.lastJobRevision}/build`;
|
|
127
133
|
const path = `${pathname}?${utils_js_1.deletedNoneParam}`;
|
|
128
|
-
|
|
134
|
+
const body = skipValidation ? { skip_validation: skipValidation } : null;
|
|
135
|
+
return (0, utils_js_1.request)(path, body, null, { method: 'POST' });
|
|
129
136
|
}
|
|
130
137
|
//# sourceMappingURL=jobRevision.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobRevision.js","sourceRoot":"","sources":["../../src/api/jobRevision.ts"],"names":[],"mappings":";;;AAiEA,
|
|
1
|
+
{"version":3,"file":"jobRevision.js","sourceRoot":"","sources":["../../src/api/jobRevision.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,6 @@ export type ApiOrganisation = {
|
|
|
36
36
|
export type ApiOrganisationData = Flatten<Exclude<ApiOrganisation, ApiError>['data']>;
|
|
37
37
|
export declare const organisationRevivers: Revivers<ApiOrganisation, Organisation>;
|
|
38
38
|
export declare function getOrganisation(organisationId?: number | typeof myOrganisations): Promise<Organisation>;
|
|
39
|
-
export declare function listOrganisationJobs(organisationId: number | typeof myOrganisations, title: string,
|
|
39
|
+
export declare function listOrganisationJobs(organisationId: number | typeof myOrganisations, title: string, page: number, options?: Record<string, unknown>): Promise<JobSearchResult>;
|
|
40
40
|
export declare function listOrganisationShares(jobId: number): Promise<JobShare[]>;
|
|
41
41
|
//# sourceMappingURL=organisation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organisation.d.ts","sourceRoot":"","sources":["../../src/api/organisation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,QAAQ,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,KAAK,eAAe,EAAY,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,OAAO,EACZ,KAAK,QAAQ,EAGb,eAAe,EAEhB,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,uBAAuB,EAAE,MAAM,GAAG,IAAI,CAAC;QACvC,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QACpB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,EAAE,OAAO,CAAC;QACzB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;QAChC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,2BAA2B,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3C,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;QACjC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;KACjC,GAAG,aAAa,CAAC;CACnB,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC;AAExC,MAAM,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEtF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,eAAe,EAAE,YAAY,CAaxE,CAAC;AAEF,wBAAsB,eAAe,CACnC,cAAc,GAAE,MAAM,GAAG,OAAO,eAAiC,GAChE,OAAO,CAAC,YAAY,CAAC,CAKvB;AAED,wBAAsB,oBAAoB,CACxC,cAAc,EAAE,MAAM,GAAG,OAAO,eAAe,EAC/C,KAAK,EAAE,MAAM,EACb,
|
|
1
|
+
{"version":3,"file":"organisation.d.ts","sourceRoot":"","sources":["../../src/api/organisation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,QAAQ,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,KAAK,eAAe,EAAY,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,OAAO,EACZ,KAAK,QAAQ,EAGb,eAAe,EAEhB,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,uBAAuB,EAAE,MAAM,GAAG,IAAI,CAAC;QACvC,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QACpB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,EAAE,OAAO,CAAC;QACzB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;QAChC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,2BAA2B,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3C,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;QACjC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;KACjC,GAAG,aAAa,CAAC;CACnB,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC;AAExC,MAAM,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEtF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,eAAe,EAAE,YAAY,CAaxE,CAAC;AAEF,wBAAsB,eAAe,CACnC,cAAc,GAAE,MAAM,GAAG,OAAO,eAAiC,GAChE,OAAO,CAAC,YAAY,CAAC,CAKvB;AAED,wBAAsB,oBAAoB,CACxC,cAAc,EAAE,MAAM,GAAG,OAAO,eAAe,EAC/C,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,OAAO,CAAC,eAAe,CAAC,CAI1B;AAED,wBAAsB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAU/E"}
|
package/cjs/api/organisation.js
CHANGED
|
@@ -16,16 +16,16 @@ exports.organisationRevivers = {
|
|
|
16
16
|
parent_id: undefined,
|
|
17
17
|
hatching_pattern_svg_set_id: undefined,
|
|
18
18
|
template_settings: undefined,
|
|
19
|
-
trialExpiresAt: (data) =>
|
|
20
|
-
exportTemplates: (data) =>
|
|
19
|
+
trialExpiresAt: (data) => data.trial_expires_at ?? undefined,
|
|
20
|
+
exportTemplates: (data) => data.template_settings ?? '{}',
|
|
21
21
|
};
|
|
22
22
|
async function getOrganisation(organisationId = utils_js_1.myOrganisations) {
|
|
23
23
|
const path = `/v1/organisations/${organisationId}`;
|
|
24
24
|
const options = { revivers: exports.organisationRevivers };
|
|
25
25
|
return (0, utils_js_1.request)(path, null, null, options);
|
|
26
26
|
}
|
|
27
|
-
async function listOrganisationJobs(organisationId, title,
|
|
28
|
-
const search =
|
|
27
|
+
async function listOrganisationJobs(organisationId, title, page, options) {
|
|
28
|
+
const search = { ...options };
|
|
29
29
|
return (0, apiCommon_js_1.listJobs)(`/v1/organisations/${organisationId}/jobs`, title, page, search);
|
|
30
30
|
}
|
|
31
31
|
async function listOrganisationShares(jobId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organisation.js","sourceRoot":"","sources":["../../src/api/organisation.ts"],"names":[],"mappings":";;;AAiEA,0CAOC;AAED,
|
|
1
|
+
{"version":3,"file":"organisation.js","sourceRoot":"","sources":["../../src/api/organisation.ts"],"names":[],"mappings":";;;AAiEA,0CAOC;AAED,oDASC;AAED,wDAUC;AA9FD,iDAAgE;AAChE,0CAUqB;AAsCR,QAAA,oBAAoB,GAA4C;IAC3E,UAAU,EAAE,SAAS;IACrB,uBAAuB,EAAE,SAAS;IAClC,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,SAAS;IACf,eAAe,EAAE,SAAS;IAC1B,SAAS,EAAE,SAAS;IACpB,2BAA2B,EAAE,SAAS;IACtC,iBAAiB,EAAE,SAAS;IAE5B,cAAc,EAAE,CAAC,IAAyB,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,IAAI,SAAS;IACjF,eAAe,EAAE,CAAC,IAAyB,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,IAAI,IAAI;CAC/E,CAAC;AAEK,KAAK,UAAU,eAAe,CACnC,iBAAkD,0BAAe;IAEjE,MAAM,IAAI,GAAG,qBAAqB,cAAc,EAAE,CAAC;IACnD,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,4BAAoB,EAAE,CAAC;IAEnD,OAAO,IAAA,kBAAO,EAAgC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AAC3E,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACxC,cAA+C,EAC/C,KAAa,EACb,IAAY,EACZ,OAAiC;IAEjC,MAAM,MAAM,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IAE9B,OAAO,IAAA,uBAAQ,EAAC,qBAAqB,cAAc,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AACnF,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAAC,KAAa;IACxD,MAAM,QAAQ,GAAG,qBAAqB,0BAAe,SAAS,CAAC;IAC/D,MAAM,KAAK,GAAG,IAAA,0BAAe,EAAC;QAC5B,MAAM,EAAE;YACN,MAAM,EAAE,KAAK,KAAK,EAAE;SACrB;KACF,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IAEpC,OAAO,IAAA,kBAAO,EAA6B,IAAI,EAAE,IAAI,EAAE,4BAAiB,CAAC,CAAC;AAC5E,CAAC"}
|
package/cjs/api/resources.js
CHANGED
|
@@ -20,7 +20,6 @@ const user_js_1 = require("./user.js");
|
|
|
20
20
|
const font_js_1 = require("./font.js");
|
|
21
21
|
const utils_js_1 = require("../utils.js");
|
|
22
22
|
async function loadResources() {
|
|
23
|
-
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
24
23
|
const path = `/v1/users/${utils_js_1.myUser}/resources`;
|
|
25
24
|
const raw = await (0, utils_js_1.request)(path);
|
|
26
25
|
const { user, organisation, messages: { read, unread } } = raw;
|
|
@@ -29,7 +28,10 @@ async function loadResources() {
|
|
|
29
28
|
readMessages.forEach(message => (message.read = true));
|
|
30
29
|
const allMessages = [...readMessages, ...unreadMessages];
|
|
31
30
|
allMessages.sort((m1, m2) => m2.date.localeCompare(m1.date));
|
|
32
|
-
const mcSvgRevivers =
|
|
31
|
+
const mcSvgRevivers = {
|
|
32
|
+
...svg_js_1.svgRevivers,
|
|
33
|
+
name: (data) => `mc-image-${data.name}`,
|
|
34
|
+
};
|
|
33
35
|
return {
|
|
34
36
|
// @ts-expect-error TS2345
|
|
35
37
|
user: utils_js_1.processData.call((0, utils_js_1.getContext)(user_js_1.userRevivers), user),
|
|
@@ -43,10 +45,10 @@ async function loadResources() {
|
|
|
43
45
|
mapstyleSets: raw.mapstyleSets.map(utils_js_1.processData, (0, utils_js_1.getContext)(mapstyleSet_js_1.mapstyleSetRevivers)),
|
|
44
46
|
jobTypes: raw.jobTypes.map(utils_js_1.processData, (0, utils_js_1.getContext)(jobType_js_1.jobTypeRevivers)),
|
|
45
47
|
messages: allMessages,
|
|
46
|
-
layers: (
|
|
47
|
-
svgSets: (
|
|
48
|
-
fonts: (
|
|
49
|
-
fontFamilies: (
|
|
48
|
+
layers: (raw.layers?.map(utils_js_1.processData, (0, utils_js_1.getContext)(layer_js_1.layerRevivers)) ?? []),
|
|
49
|
+
svgSets: (raw.svgSets?.map(utils_js_1.processData, (0, utils_js_1.getContext)(svgSet_js_1.svgSetRevivers)) ?? []),
|
|
50
|
+
fonts: (raw.fonts?.map(utils_js_1.processData, (0, utils_js_1.getContext)(font_js_1.fontRevivers)) ?? []),
|
|
51
|
+
fontFamilies: (raw.fontFamilies?.map(utils_js_1.processData, (0, utils_js_1.getContext)(fontFamily_js_1.fontFamilyRevivers)) ?? []),
|
|
50
52
|
};
|
|
51
53
|
}
|
|
52
54
|
async function getCountries() {
|
package/cjs/api/resources.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/api/resources.ts"],"names":[],"mappings":";;AAoGA,sCAwCC;AAED,oCAEC;AAED,oCAEC;AAED,sCAEC;AAxJD,uDAAsG;AACtG,uDAAsG;AACtG,qDAAkG;AAClG,mDAA8F;AAC9F,iDAA0F;AAC1F,6CAAkF;AAClF,6CAAkF;AAClF,6CAAkF;AAClF,qCAA+E;AAC/E,2CAA8E;AAC9E,yCAA0E;AAC1E,yCAA0E;AAC1E,uCAAsE;AACtE,uCAAsE;AAEtE,0CAUqB;AA2Ed,KAAK,UAAU,aAAa
|
|
1
|
+
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/api/resources.ts"],"names":[],"mappings":"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"}
|
package/cjs/api/user.js
CHANGED
|
@@ -45,8 +45,8 @@ exports.userRevivers = {
|
|
|
45
45
|
settings: undefined,
|
|
46
46
|
permissions: undefined,
|
|
47
47
|
roles: undefined,
|
|
48
|
-
trialExpiresAt: (data) =>
|
|
49
|
-
stripeId: (data) =>
|
|
48
|
+
trialExpiresAt: (data) => data.trial_expires_at ?? undefined,
|
|
49
|
+
stripeId: (data) => data.stripe_id ?? undefined,
|
|
50
50
|
};
|
|
51
51
|
async function getUser(userId = utils_js_1.myUser) {
|
|
52
52
|
const path = `/v1/users/${userId}`;
|
package/cjs/api/user.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/api/user.ts"],"names":[],"mappings":";;;AAiKA,0BAKC;AAED,gCAQC;AAED,gCAIC;AAED,oDAWC;AAED,oDAWC;AAED,oCAOC;AAED,0CAQC;AAED,4CAKC;AAED,4CAIC;AAED,4CAKC;AAED,wCAgBC;AAED,0CAiBC;AAED,sCAMC;AAED,0CASC;AAED,8DAIC;AAWD,0DAMC;AAtUD,mDAA8F;AAC9F,2CAA8E;AAC9E,yCAA0E;AAC1E,qCAAkE;AAClE,iDAAgE;AAGhE,0CAaqB;AAuGR,QAAA,YAAY,GAA4B;IACnD,aAAa,EAAE,SAAS;IACxB,KAAK,EAAE,SAAS;IAChB,UAAU,EAAE,SAAS;IACrB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,SAAS;IACf,kBAAkB,EAAE,SAAS;IAC7B,qBAAqB,EAAE,SAAS;IAChC,wBAAwB,EAAE,SAAS;IACnC,QAAQ,EAAE,SAAS;IACnB,gBAAgB,EAAE,SAAS;IAC3B,uBAAuB,EAAE,SAAS;IAClC,UAAU,EAAE,SAAS;IACrB,OAAO,EAAE,SAAS;IAClB,YAAY,EAAE,SAAS;IACvB,aAAa,EAAE,SAAS;IACxB,QAAQ,EAAE,SAAS;IACnB,WAAW,EAAE,SAAS;IACtB,KAAK,EAAE,SAAS;IAEhB,cAAc,EAAE,CAAC,IAAiB,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/api/user.ts"],"names":[],"mappings":"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"}
|
package/cjs/oauth.js
CHANGED
|
@@ -14,7 +14,7 @@ let callbackUrl = '';
|
|
|
14
14
|
*/
|
|
15
15
|
for (let i = 0; i < window.localStorage.length; ++i) {
|
|
16
16
|
const key = window.localStorage.key(i);
|
|
17
|
-
if (key
|
|
17
|
+
if (key?.startsWith('_m4n_')) {
|
|
18
18
|
window.localStorage.removeItem(key);
|
|
19
19
|
}
|
|
20
20
|
}
|
|
@@ -58,9 +58,8 @@ async function authenticate() {
|
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
60
|
function getAuthorizationHeaders(method) {
|
|
61
|
-
var _a;
|
|
62
61
|
const cookie = !exports.token && method !== 'GET' && method !== 'HEAD'
|
|
63
|
-
?
|
|
62
|
+
? document.cookie.split(/ *; */).find(pair => pair.startsWith('XSRF-TOKEN'))?.split('=')[1]
|
|
64
63
|
: undefined;
|
|
65
64
|
return exports.token
|
|
66
65
|
? { Authorization: exports.token.toString() }
|
package/cjs/oauth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":";;;AA6BA,sCAaC;AAQD,4CAWC;AAED,oCAKC;AAKD,0DAUC;AAED,wBAIC;AAzFU,QAAA,OAAO,GAAG,EAAE,CAAC;AAEb,QAAA,KAAK,GAML,IAAI,CAAC;AAEhB,IAAI,WAAW,GAAG,EAAE,CAAC;AAErB;;GAEG;AACH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;IACpD,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEvC,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":"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"}
|
package/cjs/utils.d.ts
CHANGED
|
@@ -31,14 +31,19 @@ export declare const staticContext: {
|
|
|
31
31
|
keysToAdd: never[];
|
|
32
32
|
revivers: {};
|
|
33
33
|
};
|
|
34
|
+
export declare const defaultTimeout = 30000;
|
|
34
35
|
export declare class NetworkError extends Error {
|
|
35
36
|
}
|
|
37
|
+
export declare class TimeoutError extends Error {
|
|
38
|
+
readonly timeout: number;
|
|
39
|
+
constructor(timeout: number, message?: string);
|
|
40
|
+
}
|
|
36
41
|
export declare class HTTPError extends Error {
|
|
37
|
-
statusCode: number;
|
|
42
|
+
readonly statusCode: number;
|
|
38
43
|
constructor(response: Response);
|
|
39
44
|
}
|
|
40
45
|
export declare class APIError extends Error {
|
|
41
|
-
code: string;
|
|
46
|
+
readonly code: string;
|
|
42
47
|
constructor(apiError: ApiError);
|
|
43
48
|
}
|
|
44
49
|
export declare function getSearchParams(search: Record<string, unknown>): URLSearchParams;
|
|
@@ -50,6 +55,8 @@ export interface ExtraOptions<I extends ApiCommon, O extends Record<string, unkn
|
|
|
50
55
|
revivers?: O extends Record<string, unknown> ? Revivers<I, O> : never;
|
|
51
56
|
sendNull?: boolean;
|
|
52
57
|
withMeta?: boolean;
|
|
58
|
+
timeout?: number;
|
|
59
|
+
signal?: AbortSignal;
|
|
53
60
|
}
|
|
54
61
|
export declare class APIMeta<I extends ApiCommon, O extends Record<string, unknown> | string, A = Exclude<I, ApiError>['data'] extends unknown[] ? true : false> extends Error {
|
|
55
62
|
data: A extends true ? O[] : O;
|
package/cjs/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAE5E,MAAM,MAAM,OAAO,CAAC,IAAI,IAAI,IAAI,SAAS,KAAK,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAEzE,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,IAAI,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;CACrF;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;KAE9C,CAAC;CACH;AAED,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,QAAQ,CAAC;AAE9C,eAAO,MAAM,MAAM,OAAO,CAAC;AAC3B,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,eAAe,SAAS,CAAC;AAEtC,eAAO,MAAM,iBAAiB;;CAAyB,CAAC;AACxD,eAAO,MAAM,gBAAgB,iBAAuC,CAAC;AAErE,eAAO,MAAM,YAAY,UAA6C,CAAC;AACvE,eAAO,MAAM,aAAa;;;;CAAuE,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|