Skip to content

Commit 94214ba

Browse files
e-oze-oz
committed
Fix types in functions overloading.
1 parent 4d39b1e commit 94214ba

File tree

7 files changed

+69
-36
lines changed

7 files changed

+69
-36
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### v1.1.1
2+
Fix types in functions overloading.
3+
14
### v1.1.0
25
New method: `getWritableSignal()` - returns a signal that you can modify using `set()` or `update()` methods, and these modifications will also update the storage key.
36

‎package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ngx-reactive-storage",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"license": "MIT",
55
"author": {
66
"name": "Evgeniy OZ",

‎projects/ngx-reactive-storage/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ngx-reactive-storage",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"license": "MIT",
55
"private": false,
66
"author": {

‎projects/ngx-reactive-storage/src/lib/idb.ts

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,38 +57,32 @@ export class RxStorage implements ReactiveStorage {
5757
return obs;
5858
}
5959

60-
getSignal<T>(key: string, options?: SignalOptions): Signal<T | undefined>;
61-
6260
getSignal<T>(key: string): Signal<T | undefined>;
6361

64-
getSignal<T>(key: string, options: {
65-
equal: ValueEqualityFn<T | undefined>;
66-
}): Signal<T | undefined>;
67-
68-
getSignal<T>(key: string, options: {
62+
getSignal<T>(key: string, options: SignalOptions & {
6963
initialValue: undefined,
7064
equal: ValueEqualityFn<T | undefined>;
7165
}): Signal<T | undefined>;
7266

73-
getSignal<T>(key: string, options: {
67+
getSignal<T>(key: string, options: SignalOptions & {
7468
initialValue: undefined,
7569
}): Signal<T | undefined>;
7670

77-
getSignal<T>(key: string, options: {
71+
getSignal<T>(key: string, options: SignalOptions & {
7872
initialValue: T;
7973
}): Signal<T>;
8074

81-
getSignal<T>(key: string, options: {
75+
getSignal<T>(key: string, options: SignalOptions & {
8276
initialValue: T;
8377
equal: ValueEqualityFn<T | undefined>;
8478
}): Signal<T>;
8579

86-
getSignal<T>(key: string, options: {
80+
getSignal<T>(key: string, options: SignalOptions & {
8781
initialValue: T;
8882
equal: undefined;
8983
}): Signal<T>;
9084

91-
getSignal<T>(key: string, options?: {
85+
getSignal<T>(key: string, options?: SignalOptions & {
9286
initialValue?: T;
9387
equal?: ValueEqualityFn<T | undefined>;
9488
}): Signal<T> {
@@ -97,13 +91,32 @@ export class RxStorage implements ReactiveStorage {
9791
return s;
9892
}
9993

100-
getWritableSignal<T>(key: string, options?: SignalOptions): WritableSignal<T | undefined>;
10194
getWritableSignal<T>(key: string): WritableSignal<T | undefined>;
102-
getWritableSignal<T>(key: string, options: { equal: ValueEqualityFn<T | undefined> }): WritableSignal<T | undefined>;
103-
getWritableSignal<T>(key: string, options: { initialValue: T }): WritableSignal<T>;
104-
getWritableSignal<T>(key: string, options: { initialValue: T, equal: ValueEqualityFn<T | undefined> }): WritableSignal<T>;
10595

106-
getWritableSignal<T>(key: string, options?: {
96+
getWritableSignal<T>(key: string, options: SignalOptions & {
97+
initialValue: undefined,
98+
equal: ValueEqualityFn<T | undefined>;
99+
}): WritableSignal<T | undefined>;
100+
101+
getWritableSignal<T>(key: string, options: SignalOptions & {
102+
initialValue: undefined,
103+
}): WritableSignal<T | undefined>;
104+
105+
getWritableSignal<T>(key: string, options: SignalOptions & {
106+
initialValue: T;
107+
}): WritableSignal<T>;
108+
109+
getWritableSignal<T>(key: string, options: SignalOptions & {
110+
initialValue: T;
111+
equal: ValueEqualityFn<T | undefined>;
112+
}): WritableSignal<T>;
113+
114+
getWritableSignal<T>(key: string, options: SignalOptions & {
115+
initialValue: T;
116+
equal: undefined;
117+
}): WritableSignal<T>;
118+
119+
getWritableSignal<T>(key: string, options?: SignalOptions & {
107120
initialValue?: T;
108121
equal?: ValueEqualityFn<T | undefined>;
109122
}): WritableSignal<T> {

‎projects/ngx-reactive-storage/src/lib/local-storage.ts

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,38 +47,36 @@ export class RxLocalStorage implements ReactiveStorage {
4747
return this.observer.getObservable<T>(key, value);
4848
}
4949

50-
getSignal<T>(key: string, options?: SignalOptions): Signal<T | undefined>;
51-
5250
getSignal<T>(key: string): Signal<T | undefined>;
5351

54-
getSignal<T>(key: string, options: {
52+
getSignal<T>(key: string, options: SignalOptions & {
5553
equal: ValueEqualityFn<T | undefined>;
5654
}): Signal<T | undefined>;
5755

58-
getSignal<T>(key: string, options: {
56+
getSignal<T>(key: string, options: SignalOptions & {
5957
initialValue: undefined,
6058
equal: ValueEqualityFn<T | undefined>;
6159
}): Signal<T | undefined>;
6260

63-
getSignal<T>(key: string, options: {
61+
getSignal<T>(key: string, options: SignalOptions & {
6462
initialValue: undefined,
6563
}): Signal<T | undefined>;
6664

67-
getSignal<T>(key: string, options: {
65+
getSignal<T>(key: string, options: SignalOptions & {
6866
initialValue: T;
6967
}): Signal<T>;
7068

71-
getSignal<T>(key: string, options: {
69+
getSignal<T>(key: string, options: SignalOptions & {
7270
initialValue: T;
7371
equal: ValueEqualityFn<T | undefined>;
7472
}): Signal<T>;
7573

76-
getSignal<T>(key: string, options: {
74+
getSignal<T>(key: string, options: SignalOptions & {
7775
initialValue: T;
7876
equal: undefined;
7977
}): Signal<T>;
8078

81-
getSignal<T>(key: string, options?: {
79+
getSignal<T>(key: string, options?: SignalOptions & {
8280
initialValue?: T;
8381
equal?: ValueEqualityFn<T | undefined>;
8482
}): Signal<T> {
@@ -94,13 +92,32 @@ export class RxLocalStorage implements ReactiveStorage {
9492
return this.observer.getSignal<T>(key, value, options?.equal);
9593
}
9694

97-
getWritableSignal<T>(key: string, options?: SignalOptions): WritableSignal<T | undefined>;
9895
getWritableSignal<T>(key: string): WritableSignal<T | undefined>;
99-
getWritableSignal<T>(key: string, options: { equal: ValueEqualityFn<T | undefined> }): WritableSignal<T | undefined>;
100-
getWritableSignal<T>(key: string, options: { initialValue: T }): WritableSignal<T>;
101-
getWritableSignal<T>(key: string, options: { initialValue: T, equal: ValueEqualityFn<T | undefined> }): WritableSignal<T>;
10296

103-
getWritableSignal<T>(key: string, options?: {
97+
getWritableSignal<T>(key: string, options: SignalOptions & {
98+
initialValue: undefined,
99+
equal: ValueEqualityFn<T | undefined>;
100+
}): WritableSignal<T | undefined>;
101+
102+
getWritableSignal<T>(key: string, options: SignalOptions & {
103+
initialValue: undefined,
104+
}): WritableSignal<T | undefined>;
105+
106+
getWritableSignal<T>(key: string, options: SignalOptions & {
107+
initialValue: T;
108+
}): WritableSignal<T>;
109+
110+
getWritableSignal<T>(key: string, options: SignalOptions & {
111+
initialValue: T;
112+
equal: ValueEqualityFn<T | undefined>;
113+
}): WritableSignal<T>;
114+
115+
getWritableSignal<T>(key: string, options: SignalOptions & {
116+
initialValue: T;
117+
equal: undefined;
118+
}): WritableSignal<T>;
119+
120+
getWritableSignal<T>(key: string, options?: SignalOptions & {
104121
initialValue?: T;
105122
equal?: ValueEqualityFn<T | undefined>;
106123
}): WritableSignal<T> {

‎projects/ngx-reactive-storage/src/lib/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,5 @@ export type ReactiveStorage = {
6666

6767
export type SignalOptions<T = unknown> = {
6868
initialValue?: unknown;
69-
equal: ValueEqualityFn<T>;
69+
equal?: ValueEqualityFn<T>;
7070
};

0 commit comments

Comments
 (0)