@equinor/fusion-framework 7.3.0 → 7.3.1
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/CHANGELOG.md +275 -260
- package/dist/esm/FrameworkConfigurator.js.map +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/init.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/FrameworkConfigurator.d.ts +4 -4
- package/dist/types/index.d.ts +1 -1
- package/dist/types/init.d.ts +1 -1
- package/dist/types/types.d.ts +6 -6
- package/dist/types/version.d.ts +1 -1
- package/package.json +8 -8
- package/src/FrameworkConfigurator.ts +40 -40
- package/src/index.ts +12 -12
- package/src/init.ts +10 -10
- package/src/types.ts +13 -13
- package/src/version.ts +1 -1
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { AnyModule, ModulesConfigurator } from '@equinor/fusion-framework-module';
|
|
2
|
-
import { configureHttpClient, configureHttp, HttpClientOptions } from '@equinor/fusion-framework-module-http';
|
|
1
|
+
import { type AnyModule, ModulesConfigurator } from '@equinor/fusion-framework-module';
|
|
2
|
+
import { configureHttpClient, configureHttp, type HttpClientOptions } from '@equinor/fusion-framework-module-http';
|
|
3
3
|
import type { HttpClientMsal } from '@equinor/fusion-framework-module-http/client';
|
|
4
4
|
import { type AuthConfigFn } from '@equinor/fusion-framework-module-msal';
|
|
5
|
-
import { FusionModules } from './types';
|
|
6
|
-
import { AuthClientConfig } from '@equinor/fusion-framework-module-msal/v2';
|
|
5
|
+
import type { FusionModules } from './types';
|
|
6
|
+
import type { AuthClientConfig } from '@equinor/fusion-framework-module-msal/v2';
|
|
7
7
|
/**
|
|
8
8
|
* Module configurator for Framework modules
|
|
9
9
|
* @template TModules - Addition modules
|
package/dist/types/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FrameworkEvent, FrameworkEventInit } from '@equinor/fusion-framework-module-event';
|
|
1
|
+
import type { FrameworkEvent, FrameworkEventInit } from '@equinor/fusion-framework-module-event';
|
|
2
2
|
import type { Fusion } from './types';
|
|
3
3
|
declare module '@equinor/fusion-framework-module-event' {
|
|
4
4
|
interface FrameworkEventMap {
|
package/dist/types/init.d.ts
CHANGED
package/dist/types/types.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import type { CombinedModules, ModulesInstance } from '@equinor/fusion-framework-module';
|
|
2
2
|
import type { AnyModule } from '@equinor/fusion-framework-module';
|
|
3
|
-
import { ContextModule } from '@equinor/fusion-framework-module-context';
|
|
4
|
-
import { EventModule } from '@equinor/fusion-framework-module-event';
|
|
5
|
-
import { HttpModule } from '@equinor/fusion-framework-module-http';
|
|
6
|
-
import { MsalModule } from '@equinor/fusion-framework-module-msal';
|
|
7
|
-
import { ServiceDiscoveryModule } from '@equinor/fusion-framework-module-service-discovery';
|
|
8
|
-
import { ServicesModule } from '@equinor/fusion-framework-module-services';
|
|
3
|
+
import type { ContextModule } from '@equinor/fusion-framework-module-context';
|
|
4
|
+
import type { EventModule } from '@equinor/fusion-framework-module-event';
|
|
5
|
+
import type { HttpModule } from '@equinor/fusion-framework-module-http';
|
|
6
|
+
import type { MsalModule } from '@equinor/fusion-framework-module-msal';
|
|
7
|
+
import type { ServiceDiscoveryModule } from '@equinor/fusion-framework-module-service-discovery';
|
|
8
|
+
import type { ServicesModule } from '@equinor/fusion-framework-module-services';
|
|
9
9
|
/**
|
|
10
10
|
* interface of the modules provided by Fusion Framework
|
|
11
11
|
*/
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const version = "7.3.
|
|
1
|
+
export declare const version = "7.3.1";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@equinor/fusion-framework",
|
|
3
|
-
"version": "7.3.
|
|
3
|
+
"version": "7.3.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/esm/index.js",
|
|
6
6
|
"types": "dist/types/index.d.ts",
|
|
@@ -32,13 +32,13 @@
|
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"rxjs": "^7.8.1",
|
|
35
|
-
"@equinor/fusion-framework-module": "^4.3.
|
|
36
|
-
"@equinor/fusion-framework-module-
|
|
37
|
-
"@equinor/fusion-framework-module-
|
|
38
|
-
"@equinor/fusion-framework-module-
|
|
39
|
-
"@equinor/fusion-framework-module-
|
|
40
|
-
"@equinor/fusion-framework-module-
|
|
41
|
-
"@equinor/fusion-framework-module-services": "^5.1.
|
|
35
|
+
"@equinor/fusion-framework-module": "^4.3.6",
|
|
36
|
+
"@equinor/fusion-framework-module-context": "^5.0.17",
|
|
37
|
+
"@equinor/fusion-framework-module-event": "^4.3.1",
|
|
38
|
+
"@equinor/fusion-framework-module-http": "^6.2.2",
|
|
39
|
+
"@equinor/fusion-framework-module-msal": "^4.0.1",
|
|
40
|
+
"@equinor/fusion-framework-module-service-discovery": "^8.0.7",
|
|
41
|
+
"@equinor/fusion-framework-module-services": "^5.1.1"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"typescript": "^5.5.4"
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
type AnyModule,
|
|
3
|
+
ModuleConsoleLogger,
|
|
4
|
+
ModulesConfigurator,
|
|
5
5
|
} from '@equinor/fusion-framework-module';
|
|
6
6
|
|
|
7
7
|
import event from '@equinor/fusion-framework-module-event';
|
|
8
8
|
|
|
9
9
|
import http, {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
configureHttpClient,
|
|
11
|
+
configureHttp,
|
|
12
|
+
type HttpClientOptions,
|
|
13
13
|
} from '@equinor/fusion-framework-module-http';
|
|
14
14
|
import type { HttpClientMsal } from '@equinor/fusion-framework-module-http/client';
|
|
15
15
|
|
|
@@ -20,8 +20,8 @@ import context from '@equinor/fusion-framework-module-context';
|
|
|
20
20
|
import disco from '@equinor/fusion-framework-module-service-discovery';
|
|
21
21
|
import services from '@equinor/fusion-framework-module-services';
|
|
22
22
|
|
|
23
|
-
import { FusionModules } from './types';
|
|
24
|
-
import { AuthClientConfig } from '@equinor/fusion-framework-module-msal/v2';
|
|
23
|
+
import type { FusionModules } from './types';
|
|
24
|
+
import type { AuthClientConfig } from '@equinor/fusion-framework-module-msal/v2';
|
|
25
25
|
|
|
26
26
|
/**
|
|
27
27
|
* Module configurator for Framework modules
|
|
@@ -29,43 +29,43 @@ import { AuthClientConfig } from '@equinor/fusion-framework-module-msal/v2';
|
|
|
29
29
|
* @template TRef - usually undefined, optional references
|
|
30
30
|
*/
|
|
31
31
|
export class FrameworkConfigurator<
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
32
|
+
TModules extends Array<AnyModule> = [],
|
|
33
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
34
|
+
TRef = any,
|
|
35
35
|
> extends ModulesConfigurator<FusionModules<TModules>, TRef> {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
36
|
+
constructor() {
|
|
37
|
+
super([event, auth, http, disco, services, context]);
|
|
38
|
+
this.logger = new ModuleConsoleLogger('FrameworkConfigurator');
|
|
39
|
+
}
|
|
40
40
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
41
|
+
public configureHttp(...args: Parameters<typeof configureHttp>) {
|
|
42
|
+
this.addConfig(configureHttp(...args));
|
|
43
|
+
}
|
|
44
44
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
45
|
+
public configureHttpClient(...args: Parameters<typeof configureHttpClient>) {
|
|
46
|
+
this.addConfig(configureHttpClient(...args));
|
|
47
|
+
}
|
|
48
48
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
49
|
+
public configureMsal(cb_or_config: AuthConfigFn | AuthClientConfig, requiresAuth = true) {
|
|
50
|
+
this.addConfig({
|
|
51
|
+
module: auth,
|
|
52
|
+
configure: (builder) => {
|
|
53
|
+
if (requiresAuth !== undefined) {
|
|
54
|
+
builder.setRequiresAuth(!!requiresAuth);
|
|
55
|
+
}
|
|
56
|
+
if (typeof cb_or_config === 'function') {
|
|
57
|
+
cb_or_config(builder);
|
|
58
|
+
}
|
|
59
|
+
if (typeof cb_or_config === 'object') {
|
|
60
|
+
builder.setClientConfig(cb_or_config);
|
|
61
|
+
}
|
|
62
|
+
},
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
65
|
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
66
|
+
public configureServiceDiscovery(args: { client: HttpClientOptions<HttpClientMsal> }) {
|
|
67
|
+
this.configureHttpClient('service_discovery', args.client);
|
|
68
|
+
}
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
export default FrameworkConfigurator;
|
package/src/index.ts
CHANGED
|
@@ -1,24 +1,24 @@
|
|
|
1
|
-
import { FrameworkEvent, FrameworkEventInit } from '@equinor/fusion-framework-module-event';
|
|
1
|
+
import type { FrameworkEvent, FrameworkEventInit } from '@equinor/fusion-framework-module-event';
|
|
2
2
|
import type { Fusion } from './types';
|
|
3
3
|
|
|
4
4
|
declare module '@equinor/fusion-framework-module-event' {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
interface FrameworkEventMap {
|
|
6
|
+
onFrameworkLoaded: FrameworkEvent<FrameworkEventInit<Fusion>>;
|
|
7
|
+
}
|
|
8
8
|
}
|
|
9
9
|
|
|
10
10
|
declare global {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
interface Window {
|
|
12
|
+
Fusion: Fusion;
|
|
13
|
+
}
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
export {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
17
|
+
FrameworkConfigurator,
|
|
18
|
+
/**
|
|
19
|
+
* @deprecated use FrameworkConfigurator
|
|
20
|
+
*/
|
|
21
|
+
FrameworkConfigurator as FusionConfigurator,
|
|
22
22
|
} from './FrameworkConfigurator';
|
|
23
23
|
|
|
24
24
|
export * from './types';
|
package/src/init.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { AnyModule } from '@equinor/fusion-framework-module';
|
|
2
2
|
|
|
3
|
-
import { FrameworkConfigurator } from './FrameworkConfigurator';
|
|
3
|
+
import type { FrameworkConfigurator } from './FrameworkConfigurator';
|
|
4
4
|
import type { Fusion, FusionModules } from './types';
|
|
5
5
|
|
|
6
6
|
/**
|
|
@@ -13,17 +13,17 @@ import type { Fusion, FusionModules } from './types';
|
|
|
13
13
|
* @returns instance of framework modules
|
|
14
14
|
*/
|
|
15
15
|
export const init = async <TModules extends Array<AnyModule>, TRef extends object>(
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
configurator: FrameworkConfigurator<TModules>,
|
|
17
|
+
ref?: TRef,
|
|
18
18
|
): Promise<Fusion<TModules>> => {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
19
|
+
const modules = await configurator.initialize<FusionModules>(ref);
|
|
20
|
+
const fusion = {
|
|
21
|
+
modules,
|
|
22
|
+
};
|
|
23
|
+
window.Fusion = fusion as unknown as Fusion;
|
|
24
|
+
modules.event.dispatchEvent('onFrameworkLoaded', { detail: fusion });
|
|
25
25
|
|
|
26
|
-
|
|
26
|
+
return fusion as unknown as Fusion<TModules>;
|
|
27
27
|
};
|
|
28
28
|
|
|
29
29
|
export default init;
|
package/src/types.ts
CHANGED
|
@@ -1,30 +1,30 @@
|
|
|
1
1
|
import type { CombinedModules, ModulesInstance } from '@equinor/fusion-framework-module';
|
|
2
2
|
import type { AnyModule } from '@equinor/fusion-framework-module';
|
|
3
3
|
|
|
4
|
-
import { ContextModule } from '@equinor/fusion-framework-module-context';
|
|
5
|
-
import { EventModule } from '@equinor/fusion-framework-module-event';
|
|
6
|
-
import { HttpModule } from '@equinor/fusion-framework-module-http';
|
|
7
|
-
import { MsalModule } from '@equinor/fusion-framework-module-msal';
|
|
8
|
-
import { ServiceDiscoveryModule } from '@equinor/fusion-framework-module-service-discovery';
|
|
9
|
-
import { ServicesModule } from '@equinor/fusion-framework-module-services';
|
|
4
|
+
import type { ContextModule } from '@equinor/fusion-framework-module-context';
|
|
5
|
+
import type { EventModule } from '@equinor/fusion-framework-module-event';
|
|
6
|
+
import type { HttpModule } from '@equinor/fusion-framework-module-http';
|
|
7
|
+
import type { MsalModule } from '@equinor/fusion-framework-module-msal';
|
|
8
|
+
import type { ServiceDiscoveryModule } from '@equinor/fusion-framework-module-service-discovery';
|
|
9
|
+
import type { ServicesModule } from '@equinor/fusion-framework-module-services';
|
|
10
10
|
|
|
11
11
|
/**
|
|
12
12
|
* interface of the modules provided by Fusion Framework
|
|
13
13
|
*/
|
|
14
14
|
export type FusionModules<TModules extends Array<AnyModule> | unknown = unknown> = CombinedModules<
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
TModules,
|
|
16
|
+
[ContextModule, EventModule, HttpModule, MsalModule, ServicesModule, ServiceDiscoveryModule]
|
|
17
17
|
>;
|
|
18
18
|
|
|
19
19
|
/**
|
|
20
20
|
* Blueprint of instance of framework modules
|
|
21
21
|
*/
|
|
22
22
|
export type FusionModulesInstance<TModules extends Array<AnyModule> | unknown = unknown> =
|
|
23
|
-
|
|
23
|
+
ModulesInstance<FusionModules<TModules>>;
|
|
24
24
|
|
|
25
25
|
export interface Fusion<TModules extends Array<AnyModule> | unknown = unknown> {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
26
|
+
/**
|
|
27
|
+
* Configured services for Fusion
|
|
28
|
+
*/
|
|
29
|
+
modules: FusionModulesInstance<TModules>;
|
|
30
30
|
}
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// Generated by genversion.
|
|
2
|
-
export const version = '7.3.
|
|
2
|
+
export const version = '7.3.1';
|