@darajs/core 1.14.0 → 1.14.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/api/http.d.ts +2 -3
- package/dist/api/http.d.ts.map +1 -1
- package/dist/api/http.js +7 -5
- package/dist/api/http.js.map +1 -1
- package/dist/{dara_core-1.14.0-py3-none-any.whl → dara_core-1.14.2-py3-none-any.whl} +0 -0
- package/dist/jest-setup.d.ts.map +1 -1
- package/dist/jest-setup.js +11 -0
- package/dist/jest-setup.js.map +1 -1
- package/dist/umd/dara.core.umd.js +2 -3
- package/package.json +10 -9
package/dist/api/http.d.ts
CHANGED
|
@@ -23,8 +23,7 @@ export declare class RequestExtrasSerializable {
|
|
|
23
23
|
* Light wrapper around fetch.
|
|
24
24
|
*
|
|
25
25
|
* @param url URL
|
|
26
|
-
* @param options
|
|
27
|
-
* @param extras request extras to be merged into the options
|
|
26
|
+
* @param options optional fetch options. Multiple option sets can be provided, they will be merged in order with later options overriding earlier ones.
|
|
28
27
|
*/
|
|
29
|
-
export declare function request(url: string | URL, options: RequestInit
|
|
28
|
+
export declare function request(url: string | URL, ...options: RequestInit[]): Promise<Response>;
|
|
30
29
|
//# sourceMappingURL=http.d.ts.map
|
package/dist/api/http.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../js/api/http.tsx"],"names":[],"mappings":"AAQA;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC;AAExC;;;GAGG;AACH,qBAAa,yBAAyB;IAClC,MAAM,EAAE,aAAa,CAAC;gBAEV,MAAM,EAAE,aAAa;IAIjC;;;OAGG;IACH,cAAc,IAAI,aAAa,GAAG,IAAI;IAoBtC;;OAEG;IACH,MAAM,IAAI,MAAM,GAAG,IAAI;CAS1B;AAED
|
|
1
|
+
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../js/api/http.tsx"],"names":[],"mappings":"AAQA;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC;AAExC;;;GAGG;AACH,qBAAa,yBAAyB;IAClC,MAAM,EAAE,aAAa,CAAC;gBAEV,MAAM,EAAE,aAAa;IAIjC;;;OAGG;IACH,cAAc,IAAI,aAAa,GAAG,IAAI;IAoBtC;;OAEG;IACH,MAAM,IAAI,MAAM,GAAG,IAAI;CAS1B;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAoE7F"}
|
package/dist/api/http.js
CHANGED
|
@@ -65,15 +65,14 @@ export class RequestExtrasSerializable {
|
|
|
65
65
|
* Light wrapper around fetch.
|
|
66
66
|
*
|
|
67
67
|
* @param url URL
|
|
68
|
-
* @param options
|
|
69
|
-
* @param extras request extras to be merged into the options
|
|
68
|
+
* @param options optional fetch options. Multiple option sets can be provided, they will be merged in order with later options overriding earlier ones.
|
|
70
69
|
*/
|
|
71
|
-
export function request(url, options
|
|
70
|
+
export function request(url, ...options) {
|
|
72
71
|
return __awaiter(this, void 0, void 0, function* () {
|
|
73
72
|
var _a, _b;
|
|
74
73
|
// block on the token in case it's locked, i.e. being refreshed by another concurrent request
|
|
75
74
|
const sessionToken = yield globalStore.getValue(getTokenKey());
|
|
76
|
-
const mergedOptions =
|
|
75
|
+
const mergedOptions = options.reduce((acc, opt) => (Object.assign(Object.assign({}, acc), opt)), {});
|
|
77
76
|
const { headers } = mergedOptions, other = __rest(mergedOptions, ["headers"]);
|
|
78
77
|
const headersInterface = new Headers(headers);
|
|
79
78
|
// default to json accept header
|
|
@@ -98,7 +97,10 @@ export function request(url, options, extras) {
|
|
|
98
97
|
// If it's already being replaced, this will instead wait for the replacement to complete
|
|
99
98
|
// rather than invoking the refresh again.
|
|
100
99
|
const refreshedToken = yield globalStore.replaceValue(getTokenKey(), () => __awaiter(this, void 0, void 0, function* () {
|
|
101
|
-
const refreshResponse = yield fetch(`${baseUrl}/api/auth/refresh-token`,
|
|
100
|
+
const refreshResponse = yield fetch(`${baseUrl}/api/auth/refresh-token`, {
|
|
101
|
+
headers: headersInterface,
|
|
102
|
+
method: 'POST',
|
|
103
|
+
});
|
|
102
104
|
if (refreshResponse.ok) {
|
|
103
105
|
const { token } = yield refreshResponse.json();
|
|
104
106
|
return token;
|
package/dist/api/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../js/api/http.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,iDAAiD;AACjD,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,WAAW,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAOnD;;;GAGG;AACH,MAAM,OAAO,yBAAyB;IAGlC,YAAY,MAAqB;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,cAAc;QACV,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,MAAM,CAAC;QACvB,CAAC;QAED,MAAM,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE5C,4BAA4B;QAC5B,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAClD,YAAY,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QACjE,CAAC;QAED,OAAO,YAAY,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,MAAM;QACF,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAE3C,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;CACJ;AAED
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../js/api/http.tsx"],"names":[],"mappings":"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"}
|
|
Binary file
|
package/dist/jest-setup.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jest-setup.d.ts","sourceRoot":"","sources":["../js/jest-setup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jest-setup.d.ts","sourceRoot":"","sources":["../js/jest-setup.ts"],"names":[],"mappings":"AAEA,OAAO,2BAA2B,CAAC"}
|
package/dist/jest-setup.js
CHANGED
|
@@ -1,7 +1,18 @@
|
|
|
1
|
+
/* eslint-disable import/no-extraneous-dependencies */
|
|
1
2
|
// eslint-disable-next-line import/no-extraneous-dependencies
|
|
2
3
|
import '@testing-library/jest-dom';
|
|
3
4
|
import { RecoilEnv } from 'recoil';
|
|
5
|
+
// @ts-expect-error typescript is not happy but this works
|
|
6
|
+
import { fetch as fetchImpl } from 'whatwg-fetch';
|
|
4
7
|
// disable duplicate atom key checking in tests, as we clear the registries between tests
|
|
5
8
|
// but recoil does not provide a way to clear the atoms in their internals, so the warnings are false positives
|
|
6
9
|
RecoilEnv.RECOIL_DUPLICATE_ATOM_KEY_CHECKING_ENABLED = false;
|
|
10
|
+
// Override global fetch to always include credentials
|
|
11
|
+
// This simplifies the tests as we don't have to pass credentials: 'include' to every request
|
|
12
|
+
// In reality in a browser we're always dealing with same-origin in Dara so this is fine
|
|
13
|
+
global.fetch = (input, info) => {
|
|
14
|
+
const init = info || {};
|
|
15
|
+
init.credentials = 'include';
|
|
16
|
+
return fetchImpl(input, init);
|
|
17
|
+
};
|
|
7
18
|
//# sourceMappingURL=jest-setup.js.map
|
package/dist/jest-setup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jest-setup.js","sourceRoot":"","sources":["../js/jest-setup.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"jest-setup.js","sourceRoot":"","sources":["../js/jest-setup.ts"],"names":[],"mappings":"AAAA,sDAAsD;AACtD,6DAA6D;AAC7D,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,0DAA0D;AAC1D,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,cAAc,CAAC;AAElD,yFAAyF;AACzF,+GAA+G;AAC/G,SAAS,CAAC,0CAA0C,GAAG,KAAK,CAAC;AAE7D,sDAAsD;AACtD,6FAA6F;AAC7F,wFAAwF;AACxF,MAAM,CAAC,KAAK,GAAG,CAAC,KAAK,EAAE,IAAK,EAAE,EAAE;IAC5B,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACxB,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;IAC7B,OAAO,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAClC,CAAC,CAAC"}
|
|
@@ -55047,10 +55047,10 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
|
|
|
55047
55047
|
return JSON.stringify(serializable);
|
|
55048
55048
|
}
|
|
55049
55049
|
}
|
|
55050
|
-
async function request(url, options
|
|
55050
|
+
async function request(url, ...options) {
|
|
55051
55051
|
var _a, _b;
|
|
55052
55052
|
const sessionToken = await store.getValue(getTokenKey());
|
|
55053
|
-
const mergedOptions =
|
|
55053
|
+
const mergedOptions = options.reduce((acc, opt) => ({ ...acc, ...opt }), {});
|
|
55054
55054
|
const { headers, ...other } = mergedOptions;
|
|
55055
55055
|
const headersInterface = new Headers(headers);
|
|
55056
55056
|
if (!headersInterface.has("Accept")) {
|
|
@@ -55073,7 +55073,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
|
|
|
55073
55073
|
const refreshedToken = await store.replaceValue(getTokenKey(), async () => {
|
|
55074
55074
|
const refreshResponse = await fetch(`${baseUrl}/api/auth/refresh-token`, {
|
|
55075
55075
|
headers: headersInterface,
|
|
55076
|
-
...other,
|
|
55077
55076
|
method: "POST"
|
|
55078
55077
|
});
|
|
55079
55078
|
if (refreshResponse.ok) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@darajs/core",
|
|
3
|
-
"version": "1.14.
|
|
3
|
+
"version": "1.14.2",
|
|
4
4
|
"description": "Dara Framework core",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.js",
|
|
@@ -37,9 +37,9 @@
|
|
|
37
37
|
"@babel/preset-env": "^7.23.0",
|
|
38
38
|
"@babel/preset-react": "^7.22.15",
|
|
39
39
|
"@babel/preset-typescript": "^7.23.0",
|
|
40
|
-
"@darajs/eslint-config": "1.14.
|
|
41
|
-
"@darajs/prettier-config": "1.14.
|
|
42
|
-
"@darajs/stylelint-config": "1.14.
|
|
40
|
+
"@darajs/eslint-config": "1.14.2",
|
|
41
|
+
"@darajs/prettier-config": "1.14.2",
|
|
42
|
+
"@darajs/stylelint-config": "1.14.2",
|
|
43
43
|
"@rollup/plugin-inject": "^4.0.4",
|
|
44
44
|
"@testing-library/dom": "^9.3.0",
|
|
45
45
|
"@testing-library/jest-dom": "^5.16.5",
|
|
@@ -58,6 +58,7 @@
|
|
|
58
58
|
"@types/react-router-dom": "^5.3.3",
|
|
59
59
|
"@types/recoil": "^0.0.9",
|
|
60
60
|
"@types/styled-components": "^5.1.23",
|
|
61
|
+
"@types/whatwg-fetch": "^0.0.33",
|
|
61
62
|
"@vitejs/plugin-react": "2.1.0",
|
|
62
63
|
"babel-jest": "^29.5.0",
|
|
63
64
|
"concurrently": "^8.0.1",
|
|
@@ -78,10 +79,10 @@
|
|
|
78
79
|
"whatwg-fetch": "^3.6.2"
|
|
79
80
|
},
|
|
80
81
|
"dependencies": {
|
|
81
|
-
"@darajs/styled-components": "1.14.
|
|
82
|
-
"@darajs/ui-components": "1.14.
|
|
83
|
-
"@darajs/ui-notifications": "1.14.
|
|
84
|
-
"@darajs/ui-utils": "1.14.
|
|
82
|
+
"@darajs/styled-components": "1.14.2",
|
|
83
|
+
"@darajs/ui-components": "1.14.2",
|
|
84
|
+
"@darajs/ui-notifications": "1.14.2",
|
|
85
|
+
"@darajs/ui-utils": "1.14.2",
|
|
85
86
|
"@fortawesome/fontawesome-free": "~6.4.0",
|
|
86
87
|
"@recoiljs/refine": "^0.1.1",
|
|
87
88
|
"@tanstack/query-core": "^4.0.0",
|
|
@@ -116,5 +117,5 @@
|
|
|
116
117
|
"publishConfig": {
|
|
117
118
|
"access": "public"
|
|
118
119
|
},
|
|
119
|
-
"gitHead": "
|
|
120
|
+
"gitHead": "2036681dbadd1bc53cb3243abb0289a570853b2c"
|
|
120
121
|
}
|