@etsoo/shared 1.0.86 → 1.0.87

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.
Files changed (9) hide show
  1. package/lib/cjs/storage/IStorage.d.ts +7 -4
  2. package/lib/cjs/storage/WindowStorage.d.ts +7 -4
  3. package/lib/cjs/storage/WindowStorage.js +16 -7
  4. package/lib/mjs/storage/IStorage.d.ts +7 -4
  5. package/lib/mjs/storage/WindowStorage.d.ts +7 -4
  6. package/lib/mjs/storage/WindowStorage.js +16 -7
  7. package/package.json +1 -1
  8. package/src/storage/IStorage.ts +7 -4
  9. package/src/storage/WindowStorage.ts +27 -11
package/lib/cjs/storage/IStorage.d.ts CHANGED
@@ -5,19 +5,22 @@ export interface IStorage {
5
5
  /**
6
6
  * Get data
7
7
  * @param key Key name
8
+ * @param persistance From the persisted data
8
9
  */
9
- getData<T>(key: string): T | undefined;
10
+ getData<T>(key: string, persistance?: boolean): T | undefined;
10
11
  /**
11
12
  * Get data with default value
12
13
  * @param key Key name
13
14
  * @param defaultValue Default value
15
+ * @param persistance From the persisted data
14
16
  */
15
- getData<T>(key: string, defaultValue: T): T;
17
+ getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
16
18
  /**
17
- * Get session storage object data
19
+ * Get object data
18
20
  * @param key Key name
21
+ * @param persistance From the persisted data
19
22
  */
20
- getObject<T extends {}>(key: string): T | undefined;
23
+ getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
21
24
  /**
22
25
  * Set data
23
26
  * @param key Key name
package/lib/cjs/storage/WindowStorage.d.ts CHANGED
@@ -14,24 +14,27 @@ export declare class WindowStorage implements IStorage {
14
14
  /**
15
15
  * Get data
16
16
  * @param key Key name
17
+ * @param persistance From the persisted data
17
18
  */
18
- getData<T>(key: string): T | undefined;
19
+ getData<T>(key: string, persistance?: boolean): T | undefined;
19
20
  /**
20
21
  * Get data with default value
21
22
  * @param key Key name
22
23
  * @param defaultValue Default value
24
+ * @param persistance From the persisted data
23
25
  */
24
- getData<T>(key: string, defaultValue: T): T;
26
+ getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
25
27
  /**
26
28
  * Get object data
27
29
  * @param key Key name
30
+ * @param persistance From the persisted data
28
31
  */
29
- getObject<T extends {}>(key: string): T | undefined;
32
+ getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
30
33
  /**
31
34
  * Set data
32
35
  * @param key Key name
33
36
  * @param data Data, null for removal
34
- * @param persistance Persist the data, false will stop persistance
37
+ * @param persistance To the persisted data, false will stop persistance
35
38
  */
36
39
  setData(key: string, data: unknown, persistance?: boolean): void;
37
40
  }
package/lib/cjs/storage/WindowStorage.js CHANGED
@@ -34,10 +34,13 @@ class WindowStorage {
34
34
  * Get data
35
35
  * @param key Key name
36
36
  * @param defaultValue Default value
37
+ * @param persistance From the persisted data
37
38
  */
38
- getData(key, defaultValue) {
39
+ getData(key, defaultValue, persistance) {
39
40
  // Get storage
40
- const data = sessionStorage.getItem(key);
41
+ const data = persistance
42
+ ? localStorage.getItem(key)
43
+ : sessionStorage.getItem(key);
41
44
  // No default value
42
45
  if (defaultValue == null)
43
46
  return Utils_1.Utils.parseString(data);
@@ -47,10 +50,13 @@ class WindowStorage {
47
50
  /**
48
51
  * Get object data
49
52
  * @param key Key name
53
+ * @param persistance From the persisted data
50
54
  */
51
- getObject(key) {
55
+ getObject(key, persistance) {
52
56
  // Get storage
53
- const data = sessionStorage.getItem(key);
57
+ const data = persistance
58
+ ? localStorage.getItem(key)
59
+ : sessionStorage.getItem(key);
54
60
  if (data == null)
55
61
  return undefined;
56
62
  return JSON.parse(data);
@@ -59,12 +65,15 @@ class WindowStorage {
59
65
  * Set data
60
66
  * @param key Key name
61
67
  * @param data Data, null for removal
62
- * @param persistance Persist the data, false will stop persistance
68
+ * @param persistance To the persisted data, false will stop persistance
63
69
  */
64
70
  setData(key, data, persistance) {
71
+ if (persistance) {
72
+ StorageUtils_1.StorageUtils.setLocalData(key, data);
73
+ return;
74
+ }
65
75
  StorageUtils_1.StorageUtils.setSessionData(key, data);
66
- if (persistance ||
67
- (persistance == null && this.globalFields.includes(key))) {
76
+ if (persistance !== false && this.globalFields.includes(key)) {
68
77
  StorageUtils_1.StorageUtils.setLocalData(key, data);
69
78
  }
70
79
  }
package/lib/mjs/storage/IStorage.d.ts CHANGED
@@ -5,19 +5,22 @@ export interface IStorage {
5
5
  /**
6
6
  * Get data
7
7
  * @param key Key name
8
+ * @param persistance From the persisted data
8
9
  */
9
- getData<T>(key: string): T | undefined;
10
+ getData<T>(key: string, persistance?: boolean): T | undefined;
10
11
  /**
11
12
  * Get data with default value
12
13
  * @param key Key name
13
14
  * @param defaultValue Default value
15
+ * @param persistance From the persisted data
14
16
  */
15
- getData<T>(key: string, defaultValue: T): T;
17
+ getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
16
18
  /**
17
- * Get session storage object data
19
+ * Get object data
18
20
  * @param key Key name
21
+ * @param persistance From the persisted data
19
22
  */
20
- getObject<T extends {}>(key: string): T | undefined;
23
+ getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
21
24
  /**
22
25
  * Set data
23
26
  * @param key Key name
package/lib/mjs/storage/WindowStorage.d.ts CHANGED
@@ -14,24 +14,27 @@ export declare class WindowStorage implements IStorage {
14
14
  /**
15
15
  * Get data
16
16
  * @param key Key name
17
+ * @param persistance From the persisted data
17
18
  */
18
- getData<T>(key: string): T | undefined;
19
+ getData<T>(key: string, persistance?: boolean): T | undefined;
19
20
  /**
20
21
  * Get data with default value
21
22
  * @param key Key name
22
23
  * @param defaultValue Default value
24
+ * @param persistance From the persisted data
23
25
  */
24
- getData<T>(key: string, defaultValue: T): T;
26
+ getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
25
27
  /**
26
28
  * Get object data
27
29
  * @param key Key name
30
+ * @param persistance From the persisted data
28
31
  */
29
- getObject<T extends {}>(key: string): T | undefined;
32
+ getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
30
33
  /**
31
34
  * Set data
32
35
  * @param key Key name
33
36
  * @param data Data, null for removal
34
- * @param persistance Persist the data, false will stop persistance
37
+ * @param persistance To the persisted data, false will stop persistance
35
38
  */
36
39
  setData(key: string, data: unknown, persistance?: boolean): void;
37
40
  }
package/lib/mjs/storage/WindowStorage.js CHANGED
@@ -31,10 +31,13 @@ export class WindowStorage {
31
31
  * Get data
32
32
  * @param key Key name
33
33
  * @param defaultValue Default value
34
+ * @param persistance From the persisted data
34
35
  */
35
- getData(key, defaultValue) {
36
+ getData(key, defaultValue, persistance) {
36
37
  // Get storage
37
- const data = sessionStorage.getItem(key);
38
+ const data = persistance
39
+ ? localStorage.getItem(key)
40
+ : sessionStorage.getItem(key);
38
41
  // No default value
39
42
  if (defaultValue == null)
40
43
  return Utils.parseString(data);
@@ -44,10 +47,13 @@ export class WindowStorage {
44
47
  /**
45
48
  * Get object data
46
49
  * @param key Key name
50
+ * @param persistance From the persisted data
47
51
  */
48
- getObject(key) {
52
+ getObject(key, persistance) {
49
53
  // Get storage
50
- const data = sessionStorage.getItem(key);
54
+ const data = persistance
55
+ ? localStorage.getItem(key)
56
+ : sessionStorage.getItem(key);
51
57
  if (data == null)
52
58
  return undefined;
53
59
  return JSON.parse(data);
@@ -56,12 +62,15 @@ export class WindowStorage {
56
62
  * Set data
57
63
  * @param key Key name
58
64
  * @param data Data, null for removal
59
- * @param persistance Persist the data, false will stop persistance
65
+ * @param persistance To the persisted data, false will stop persistance
60
66
  */
61
67
  setData(key, data, persistance) {
68
+ if (persistance) {
69
+ StorageUtils.setLocalData(key, data);
70
+ return;
71
+ }
62
72
  StorageUtils.setSessionData(key, data);
63
- if (persistance ||
64
- (persistance == null && this.globalFields.includes(key))) {
73
+ if (persistance !== false && this.globalFields.includes(key)) {
65
74
  StorageUtils.setLocalData(key, data);
66
75
  }
67
76
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/shared",
3
- "version": "1.0.86",
3
+ "version": "1.0.87",
4
4
  "description": "TypeScript shared utilities and functions",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
package/src/storage/IStorage.ts CHANGED
@@ -5,21 +5,24 @@ export interface IStorage {
5
5
  /**
6
6
  * Get data
7
7
  * @param key Key name
8
+ * @param persistance From the persisted data
8
9
  */
9
- getData<T>(key: string): T | undefined;
10
+ getData<T>(key: string, persistance?: boolean): T | undefined;
10
11
 
11
12
  /**
12
13
  * Get data with default value
13
14
  * @param key Key name
14
15
  * @param defaultValue Default value
16
+ * @param persistance From the persisted data
15
17
  */
16
- getData<T>(key: string, defaultValue: T): T;
18
+ getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
17
19
 
18
20
  /**
19
- * Get session storage object data
21
+ * Get object data
20
22
  * @param key Key name
23
+ * @param persistance From the persisted data
21
24
  */
22
- getObject<T extends {}>(key: string): T | undefined;
25
+ getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
23
26
 
24
27
  /**
25
28
  * Set data
package/src/storage/WindowStorage.ts CHANGED
@@ -33,24 +33,33 @@ export class WindowStorage implements IStorage {
33
33
  /**
34
34
  * Get data
35
35
  * @param key Key name
36
+ * @param persistance From the persisted data
36
37
  */
37
- getData<T>(key: string): T | undefined;
38
+ getData<T>(key: string, persistance?: boolean): T | undefined;
38
39
 
39
40
  /**
40
41
  * Get data with default value
41
42
  * @param key Key name
42
43
  * @param defaultValue Default value
44
+ * @param persistance From the persisted data
43
45
  */
44
- getData<T>(key: string, defaultValue: T): T;
46
+ getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
45
47
 
46
48
  /**
47
49
  * Get data
48
50
  * @param key Key name
49
51
  * @param defaultValue Default value
52
+ * @param persistance From the persisted data
50
53
  */
51
- getData<T>(key: string, defaultValue?: T): T | undefined {
54
+ getData<T>(
55
+ key: string,
56
+ defaultValue?: T,
57
+ persistance?: boolean
58
+ ): T | undefined {
52
59
  // Get storage
53
- const data = sessionStorage.getItem(key);
60
+ const data = persistance
61
+ ? localStorage.getItem(key)
62
+ : sessionStorage.getItem(key);
54
63
 
55
64
  // No default value
56
65
  if (defaultValue == null) return Utils.parseString<T>(data);
@@ -62,11 +71,16 @@ export class WindowStorage implements IStorage {
62
71
  /**
63
72
  * Get object data
64
73
  * @param key Key name
74
+ * @param persistance From the persisted data
65
75
  */
66
- getObject<T extends {}>(key: string) {
76
+ getObject<T extends {}>(key: string, persistance?: boolean) {
67
77
  // Get storage
68
- const data = sessionStorage.getItem(key);
78
+ const data = persistance
79
+ ? localStorage.getItem(key)
80
+ : sessionStorage.getItem(key);
81
+
69
82
  if (data == null) return undefined;
83
+
70
84
  return <T>JSON.parse(data);
71
85
  }
72
86
 
@@ -74,14 +88,16 @@ export class WindowStorage implements IStorage {
74
88
  * Set data
75
89
  * @param key Key name
76
90
  * @param data Data, null for removal
77
- * @param persistance Persist the data, false will stop persistance
91
+ * @param persistance To the persisted data, false will stop persistance
78
92
  */
79
93
  setData(key: string, data: unknown, persistance?: boolean) {
94
+ if (persistance) {
95
+ StorageUtils.setLocalData(key, data);
96
+ return;
97
+ }
98
+
80
99
  StorageUtils.setSessionData(key, data);
81
- if (
82
- persistance ||
83
- (persistance == null && this.globalFields.includes(key))
84
- ) {
100
+ if (persistance !== false && this.globalFields.includes(key)) {
85
101
  StorageUtils.setLocalData(key, data);
86
102
  }
87
103
  }