@equinor/fusion-framework-module-bookmark 2.2.0 → 3.0.0
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 +84 -0
- package/dist/esm/BookmarkConfigurator.js +6 -3
- package/dist/esm/BookmarkConfigurator.js.map +1 -1
- package/dist/esm/BookmarkProvider.js +287 -219
- package/dist/esm/BookmarkProvider.js.map +1 -1
- package/dist/esm/bookmark-config.schema.js +5 -4
- package/dist/esm/bookmark-config.schema.js.map +1 -1
- package/dist/esm/bookmark.schemas.js +4 -1
- package/dist/esm/bookmark.schemas.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/BookmarkProvider.actions.d.ts +7 -175
- package/dist/types/BookmarkProvider.d.ts +47 -46
- package/dist/types/BookmarkProvider.reducer.d.ts +7 -90
- package/dist/types/bookmark-config.schema.d.ts +13 -104
- package/dist/types/bookmark.schemas.d.ts +20 -376
- package/dist/types/types.d.ts +96 -18
- package/dist/types/version.d.ts +1 -1
- package/package.json +12 -12
- package/src/BookmarkConfigurator.ts +10 -5
- package/src/BookmarkProvider.ts +377 -307
- package/src/bookmark-config.schema.ts +7 -6
- package/src/bookmark.schemas.ts +6 -2
- package/src/types.ts +92 -28
- package/src/version.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,89 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
+
## 3.0.0
|
|
4
|
+
|
|
5
|
+
### Major Changes
|
|
6
|
+
|
|
7
|
+
- [#3394](https://github.com/equinor/fusion-framework/pull/3394) [`c222c67`](https://github.com/equinor/fusion-framework/commit/c222c673bc7cdefff6eb0cd9436bfa3d1f185295) Thanks [@odinr](https://github.com/odinr)! - feat: migrate to zod v4
|
|
8
|
+
|
|
9
|
+
Updated source code to migrate from zod v3 to v4. Updated zod dependency from v3.25.76 to v4.1.8 and modified schema definitions in the bookmark module to use explicit key and value types for records, simplified function schema definitions, and replaced zod-inferred types with explicit TypeScript interfaces.
|
|
10
|
+
|
|
11
|
+
Key changes in source code:
|
|
12
|
+
|
|
13
|
+
- Fixed record schema definitions to use explicit key and value types (`z.record(z.string(), z.unknown())`)
|
|
14
|
+
- Simplified function schema definitions by removing complex chaining (`.args()` and `.returns()`)
|
|
15
|
+
- Replaced zod-inferred types with explicit TypeScript interfaces for better performance
|
|
16
|
+
- Enhanced `BookmarkData` type definition with proper generic constraints
|
|
17
|
+
- Added helper functions for config parsing (`parseBookmarkConfig`)
|
|
18
|
+
|
|
19
|
+
Breaking changes: Record schemas must specify both key and value types explicitly. Function schema definitions now require explicit typing.
|
|
20
|
+
|
|
21
|
+
Links:
|
|
22
|
+
|
|
23
|
+
- [Zod v4 Migration Guide](https://github.com/colinhacks/zod/releases/tag/v4.0.0)
|
|
24
|
+
- [Zod v4.1.8 Release Notes](https://github.com/colinhacks/zod/releases/tag/v4.1.8)
|
|
25
|
+
|
|
26
|
+
## 2.2.1
|
|
27
|
+
|
|
28
|
+
### Patch Changes
|
|
29
|
+
|
|
30
|
+
- [#3395](https://github.com/equinor/fusion-framework/pull/3395) [`29f6710`](https://github.com/equinor/fusion-framework/commit/29f6710238baf9b29f42394b30cb8b97f25462c3) Thanks [@odinr](https://github.com/odinr)! - Updated immer from 9.0.16 to 10.1.3 across all packages.
|
|
31
|
+
|
|
32
|
+
### Breaking Changes
|
|
33
|
+
|
|
34
|
+
- Immer 10.x introduces stricter TypeScript types for draft functions
|
|
35
|
+
- `ValidRecipeReturnType` type constraints have changed
|
|
36
|
+
- Promise return types in draft functions are no longer automatically handled
|
|
37
|
+
|
|
38
|
+
### Fixes Applied
|
|
39
|
+
|
|
40
|
+
- Updated BookmarkProvider to handle new immer type constraints
|
|
41
|
+
- Fixed ObservableInput type assignments in mergeScan operations
|
|
42
|
+
- Removed async/await from immer draft functions to comply with new type requirements
|
|
43
|
+
|
|
44
|
+
### Links
|
|
45
|
+
|
|
46
|
+
- [Immer 10.0.0 Release Notes](https://github.com/immerjs/immer/releases/tag/v10.0.0)
|
|
47
|
+
- [Immer Migration Guide](https://github.com/immerjs/immer/blob/main/MIGRATION.md)
|
|
48
|
+
|
|
49
|
+
- [#3402](https://github.com/equinor/fusion-framework/pull/3402) [`7bb88c6`](https://github.com/equinor/fusion-framework/commit/7bb88c6247f3d93eccf363d610116c519f1ecff4) Thanks [@dependabot](https://github.com/apps/dependabot)! - chore: bump @types/uuid from 9.0.8/10.0.0 to 11.0.0
|
|
50
|
+
|
|
51
|
+
Updated TypeScript type definitions for UUID operations across multiple packages. This major version update provides improved type safety and compatibility with the latest UUID library features.
|
|
52
|
+
|
|
53
|
+
### Affected Packages
|
|
54
|
+
|
|
55
|
+
- @equinor/fusion-framework-module-bookmark: @types/uuid ^9.0.8 → ^11.0.0
|
|
56
|
+
- @equinor/fusion-framework-module-feature-flag: @types/uuid ^10.0.0 → ^11.0.0
|
|
57
|
+
- @equinor/fusion-observable: @types/uuid ^10.0.0 → ^11.0.0
|
|
58
|
+
- @equinor/fusion-query: @types/uuid ^10.0.0 → ^11.0.0
|
|
59
|
+
|
|
60
|
+
### Links
|
|
61
|
+
|
|
62
|
+
- [@types/uuid on npm](https://www.npmjs.com/package/@types/uuid)
|
|
63
|
+
- [DefinitelyTyped @types/uuid](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/uuid)
|
|
64
|
+
|
|
65
|
+
- [#3347](https://github.com/equinor/fusion-framework/pull/3347) [`11143fa`](https://github.com/equinor/fusion-framework/commit/11143fa3002fb8a6c095052a04c7e596c56bafa8) Thanks [@dependabot](https://github.com/apps/dependabot)! - chore: bump uuid from 11.0.3 to 13.0.0
|
|
66
|
+
|
|
67
|
+
### Breaking Changes
|
|
68
|
+
|
|
69
|
+
- v13.0.0: Make browser exports the default
|
|
70
|
+
- v12.0.0: Update to TypeScript 5.2, remove CommonJS support, drop Node 16 support
|
|
71
|
+
|
|
72
|
+
### New Features
|
|
73
|
+
|
|
74
|
+
- Improved v4() performance
|
|
75
|
+
- Added Node 24 to CI matrix
|
|
76
|
+
- Restored node: prefix support
|
|
77
|
+
|
|
78
|
+
### Links
|
|
79
|
+
|
|
80
|
+
- [GitHub releases](https://github.com/uuidjs/uuid/releases/tag/v13.0.0)
|
|
81
|
+
- [npm changelog](https://www.npmjs.com/package/uuid?activeTab=versions)
|
|
82
|
+
|
|
83
|
+
- Updated dependencies [[`29f6710`](https://github.com/equinor/fusion-framework/commit/29f6710238baf9b29f42394b30cb8b97f25462c3), [`7bb88c6`](https://github.com/equinor/fusion-framework/commit/7bb88c6247f3d93eccf363d610116c519f1ecff4), [`11143fa`](https://github.com/equinor/fusion-framework/commit/11143fa3002fb8a6c095052a04c7e596c56bafa8)]:
|
|
84
|
+
- @equinor/fusion-query@5.2.13
|
|
85
|
+
- @equinor/fusion-observable@8.5.3
|
|
86
|
+
|
|
3
87
|
## 2.2.0
|
|
4
88
|
|
|
5
89
|
### Minor Changes
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BaseConfigBuilder, } from '@equinor/fusion-framework-module';
|
|
2
2
|
import { BookmarkClient } from './BookmarkClient';
|
|
3
|
-
import { bookmarkConfigSchema } from './bookmark-config.schema';
|
|
3
|
+
import { bookmarkConfigSchema, parseBookmarkConfig } from './bookmark-config.schema';
|
|
4
4
|
const initialBookmarkConfig = bookmarkConfigSchema
|
|
5
5
|
.pick({
|
|
6
6
|
filters: true,
|
|
@@ -9,6 +9,9 @@ const initialBookmarkConfig = bookmarkConfigSchema
|
|
|
9
9
|
})
|
|
10
10
|
.partial()
|
|
11
11
|
.optional();
|
|
12
|
+
const parseInitialBookmarkConfigConfig = (initial) => {
|
|
13
|
+
return initialBookmarkConfig.parse(initial);
|
|
14
|
+
};
|
|
12
15
|
/**
|
|
13
16
|
* Configurator for the bookmark module.
|
|
14
17
|
* This class provides a set of methods for configuring the bookmark module.
|
|
@@ -188,7 +191,7 @@ export class BookmarkModuleConfigurator extends BaseConfigBuilder {
|
|
|
188
191
|
this._set('eventProvider', this._resolveEventProvider.bind(this));
|
|
189
192
|
}
|
|
190
193
|
// call super to create config
|
|
191
|
-
return super._createConfig(init,
|
|
194
|
+
return super._createConfig(init, parseInitialBookmarkConfigConfig(initial));
|
|
192
195
|
}
|
|
193
196
|
/**
|
|
194
197
|
* @internal Create a default context resolver for the bookmark module.
|
|
@@ -291,7 +294,7 @@ export class BookmarkModuleConfigurator extends BaseConfigBuilder {
|
|
|
291
294
|
}
|
|
292
295
|
async _processConfig(config, _init) {
|
|
293
296
|
try {
|
|
294
|
-
return
|
|
297
|
+
return parseBookmarkConfig(config);
|
|
295
298
|
}
|
|
296
299
|
catch (err) {
|
|
297
300
|
this.#log?.error('Failed to parse config', config, err.issues ?? err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BookmarkConfigurator.js","sourceRoot":"","sources":["../../src/BookmarkConfigurator.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,GAIlB,MAAM,kCAAkC,CAAC;AAM1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"BookmarkConfigurator.js","sourceRoot":"","sources":["../../src/BookmarkConfigurator.ts"],"names":[],"mappings":"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"}
|