Skip to content

Commit 9f18fef

Browse files
diegomvhdiegomvh
committed
0.142.0
1 parent 6e84bb2 commit 9f18fef

File tree

9 files changed

+62
-60
lines changed

9 files changed

+62
-60
lines changed

‎docs/api/classes/ODataBaseCache.html‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,8 @@ <h3 id="methods">
542542

543543
<tr>
544544
<td class="col-md-4">
545-
<div class="io-line">Defined in <a href="" data-line="148"
546-
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:148</a></div>
545+
<div class="io-line">Defined in <a href="" data-line="149"
546+
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:149</a></div>
547547
</td>
548548
</tr>
549549

@@ -581,8 +581,8 @@ <h3 id="methods">
581581

582582
<tr>
583583
<td class="col-md-4">
584-
<div class="io-line">Defined in <a href="" data-line="127"
585-
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:127</a></div>
584+
<div class="io-line">Defined in <a href="" data-line="128"
585+
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:128</a></div>
586586
</td>
587587
</tr>
588588

@@ -653,8 +653,8 @@ <h3 id="methods">
653653

654654
<tr>
655655
<td class="col-md-4">
656-
<div class="io-line">Defined in <a href="" data-line="117"
657-
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:117</a></div>
656+
<div class="io-line">Defined in <a href="" data-line="116"
657+
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:116</a></div>
658658
</td>
659659
</tr>
660660

@@ -826,8 +826,8 @@ <h3 id="methods">
826826

827827
<tr>
828828
<td class="col-md-4">
829-
<div class="io-line">Defined in <a href="" data-line="178"
830-
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:178</a></div>
829+
<div class="io-line">Defined in <a href="" data-line="179"
830+
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:179</a></div>
831831
</td>
832832
</tr>
833833

@@ -907,8 +907,8 @@ <h3 id="methods">
907907

908908
<tr>
909909
<td class="col-md-4">
910-
<div class="io-line">Defined in <a href="" data-line="208"
911-
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:208</a></div>
910+
<div class="io-line">Defined in <a href="" data-line="209"
911+
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:209</a></div>
912912
</td>
913913
</tr>
914914

@@ -986,8 +986,8 @@ <h3 id="methods">
986986

987987
<tr>
988988
<td class="col-md-4">
989-
<div class="io-line">Defined in <a href="" data-line="167"
990-
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:167</a></div>
989+
<div class="io-line">Defined in <a href="" data-line="168"
990+
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:168</a></div>
991991
</td>
992992
</tr>
993993

@@ -1076,8 +1076,8 @@ <h3 id="methods">
10761076

10771077
<tr>
10781078
<td class="col-md-4">
1079-
<div class="io-line">Defined in <a href="" data-line="157"
1080-
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:157</a></div>
1079+
<div class="io-line">Defined in <a href="" data-line="158"
1080+
class="link-to-prism">projects/angular-odata/src/lib/cache/cache.ts:158</a></div>
10811081
</td>
10821082
</tr>
10831083

@@ -1500,13 +1500,13 @@ <h3 id="methods">
15001500
/**
15011501
* A cache entry that holds a payload, a last read time, and a timeout for the entry.
15021502
* @param payload The payload to cache.
1503-
* @param lastRead The last read time.
1504-
* @param timeout The timeout.
1503+
* @param lastread The last read time.
1504+
* @param timeout The timeout in seconds.
15051505
* @param tags Some tags to identify the entry.
15061506
*/
15071507
export interface ODataCacheEntry&lt;T&gt; {
15081508
payload: T;
1509-
lastRead: number;
1509+
lastread: number;
15101510
timeout: number;
15111511
tags: string[];
15121512
}
@@ -1567,9 +1567,9 @@ <h3 id="methods">
15671567
): ODataCacheEntry&lt;T&gt; {
15681568
return {
15691569
payload,
1570-
lastRead: Date.now(),
1571-
timeout: timeout || this.timeout,
1572-
tags: tags || [],
1570+
lastread: Date.now(),
1571+
timeout: (timeout ?? this.timeout) * 1000,
1572+
tags: tags ?? [],
15731573
};
15741574
}
15751575

@@ -1596,9 +1596,8 @@ <h3 id="methods">
15961596
{ timeout, scope, tags }: { timeout?: number; scope?: string[]; tags?: string[] } &#x3D; {},
15971597
) {
15981598
const entry &#x3D; this.buildEntry&lt;T&gt;(payload, { timeout, tags });
1599-
const key &#x3D; this.buildKey([...(scope || []), name]);
1599+
const key &#x3D; this.buildKey([...(scope ?? []), name]);
16001600
this.entries.set(key, entry);
1601-
this.forget();
16021601
}
16031602

16041603
/**
@@ -1610,7 +1609,9 @@ <h3 id="methods">
16101609
get&lt;T&gt;(name: string, { scope }: { scope?: string[] } &#x3D; {}): T | undefined {
16111610
const key &#x3D; this.buildKey([...(scope || []), name]);
16121611
const entry &#x3D; this.entries.get(key);
1613-
return entry !&#x3D;&#x3D; undefined &amp;&amp; !this.isExpired(entry) ? entry.payload : undefined;
1612+
if (entry &#x3D;&#x3D;&#x3D; undefined || this.isExpired(entry)) return undefined;
1613+
entry.lastread &#x3D; Date.now();
1614+
return entry.payload;
16141615
}
16151616

16161617
/**
@@ -1648,7 +1649,7 @@ <h3 id="methods">
16481649
* @returns Boolean indicating if the entry is expired
16491650
*/
16501651
isExpired(entry: ODataCacheEntry&lt;any&gt;) {
1651-
return entry.lastRead &lt; Date.now() - (entry.timeout || this.timeout) * 1000;
1652+
return entry.lastread &lt; (Date.now() - entry.timeout);
16521653
}
16531654

16541655
/**

‎docs/api/classes/ODataInMemoryCache.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ <h3 id="methods">
749749
</tr>
750750
<tr>
751751
<td class="col-md-4">
752-
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:148</a></code>
752+
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:149</a></code>
753753
</div>
754754
</td>
755755
</tr>
@@ -794,7 +794,7 @@ <h3 id="methods">
794794
</tr>
795795
<tr>
796796
<td class="col-md-4">
797-
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:127</a></code>
797+
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:128</a></code>
798798
</div>
799799
</td>
800800
</tr>
@@ -872,7 +872,7 @@ <h3 id="methods">
872872
</tr>
873873
<tr>
874874
<td class="col-md-4">
875-
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:117</a></code>
875+
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:116</a></code>
876876
</div>
877877
</td>
878878
</tr>
@@ -982,7 +982,7 @@ <h3 id="methods">
982982
</tr>
983983
<tr>
984984
<td class="col-md-4">
985-
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:178</a></code>
985+
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:179</a></code>
986986
</div>
987987
</td>
988988
</tr>
@@ -1069,7 +1069,7 @@ <h3 id="methods">
10691069
</tr>
10701070
<tr>
10711071
<td class="col-md-4">
1072-
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:208</a></code>
1072+
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:209</a></code>
10731073
</div>
10741074
</td>
10751075
</tr>
@@ -1154,7 +1154,7 @@ <h3 id="methods">
11541154
</tr>
11551155
<tr>
11561156
<td class="col-md-4">
1157-
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:167</a></code>
1157+
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:168</a></code>
11581158
</div>
11591159
</td>
11601160
</tr>
@@ -1250,7 +1250,7 @@ <h3 id="methods">
12501250
</tr>
12511251
<tr>
12521252
<td class="col-md-4">
1253-
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:157</a></code>
1253+
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:158</a></code>
12541254
</div>
12551255
</td>
12561256
</tr>

‎docs/api/classes/ODataInStorageCache.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ <h3 id="methods">
939939
</tr>
940940
<tr>
941941
<td class="col-md-4">
942-
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:127</a></code>
942+
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:128</a></code>
943943
</div>
944944
</td>
945945
</tr>
@@ -1017,7 +1017,7 @@ <h3 id="methods">
10171017
</tr>
10181018
<tr>
10191019
<td class="col-md-4">
1020-
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:117</a></code>
1020+
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:116</a></code>
10211021
</div>
10221022
</td>
10231023
</tr>
@@ -1127,7 +1127,7 @@ <h3 id="methods">
11271127
</tr>
11281128
<tr>
11291129
<td class="col-md-4">
1130-
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:178</a></code>
1130+
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:179</a></code>
11311131
</div>
11321132
</td>
11331133
</tr>
@@ -1214,7 +1214,7 @@ <h3 id="methods">
12141214
</tr>
12151215
<tr>
12161216
<td class="col-md-4">
1217-
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:208</a></code>
1217+
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:209</a></code>
12181218
</div>
12191219
</td>
12201220
</tr>
@@ -1299,7 +1299,7 @@ <h3 id="methods">
12991299
</tr>
13001300
<tr>
13011301
<td class="col-md-4">
1302-
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:167</a></code>
1302+
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:168</a></code>
13031303
</div>
13041304
</td>
13051305
</tr>
@@ -1395,7 +1395,7 @@ <h3 id="methods">
13951395
</tr>
13961396
<tr>
13971397
<td class="col-md-4">
1398-
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:157</a></code>
1398+
<div class="io-line">Defined in <code><a href="../classes/ODataBaseCache.html#source" target="_self" >ODataBaseCache:158</a></code>
13991399
</div>
14001400
</td>
14011401
</tr>

‎docs/api/interfaces/ODataCacheEntry.html‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ <h6><b>Properties</b></h6>
166166
<td class="col-md-4">
167167
<ul class="index-list">
168168
<li>
169-
<a href="#lastRead"
169+
<a href="#lastread"
170170
>
171-
lastRead
171+
lastread
172172
</a>
173173
</li>
174174
<li>
@@ -204,17 +204,17 @@ <h3 id="inputs">Properties</h3>
204204
<tbody>
205205
<tr>
206206
<td class="col-md-4">
207-
<a name="lastRead"></a>
208-
<span class="name "><b>lastRead</b>
209-
<a href="#lastRead">
207+
<a name="lastread"></a>
208+
<span class="name "><b>lastread</b>
209+
<a href="#lastread">
210210
<span class="icon ion-ios-link"></span>
211211
</a>
212212
</span>
213213
</td>
214214
</tr>
215215
<tr>
216216
<td class="col-md-4">
217-
<code>lastRead: <code><a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/number" target="_blank" >number</a></code>
217+
<code>lastread: <code><a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/number" target="_blank" >number</a></code>
218218
</code>
219219
</td>
220220
</tr>
@@ -346,13 +346,13 @@ <h3 id="inputs">Properties</h3>
346346
/**
347347
* A cache entry that holds a payload, a last read time, and a timeout for the entry.
348348
* @param payload The payload to cache.
349-
* @param lastRead The last read time.
350-
* @param timeout The timeout.
349+
* @param lastread The last read time.
350+
* @param timeout The timeout in seconds.
351351
* @param tags Some tags to identify the entry.
352352
*/
353353
export interface ODataCacheEntry&lt;T&gt; {
354354
payload: T;
355-
lastRead: number;
355+
lastread: number;
356356
timeout: number;
357357
tags: string[];
358358
}
@@ -413,9 +413,9 @@ <h3 id="inputs">Properties</h3>
413413
): ODataCacheEntry&lt;T&gt; {
414414
return {
415415
payload,
416-
lastRead: Date.now(),
417-
timeout: timeout || this.timeout,
418-
tags: tags || [],
416+
lastread: Date.now(),
417+
timeout: (timeout ?? this.timeout) * 1000,
418+
tags: tags ?? [],
419419
};
420420
}
421421

@@ -442,9 +442,8 @@ <h3 id="inputs">Properties</h3>
442442
{ timeout, scope, tags }: { timeout?: number; scope?: string[]; tags?: string[] } &#x3D; {},
443443
) {
444444
const entry &#x3D; this.buildEntry&lt;T&gt;(payload, { timeout, tags });
445-
const key &#x3D; this.buildKey([...(scope || []), name]);
445+
const key &#x3D; this.buildKey([...(scope ?? []), name]);
446446
this.entries.set(key, entry);
447-
this.forget();
448447
}
449448

450449
/**
@@ -456,7 +455,9 @@ <h3 id="inputs">Properties</h3>
456455
get&lt;T&gt;(name: string, { scope }: { scope?: string[] } &#x3D; {}): T | undefined {
457456
const key &#x3D; this.buildKey([...(scope || []), name]);
458457
const entry &#x3D; this.entries.get(key);
459-
return entry !&#x3D;&#x3D; undefined &amp;&amp; !this.isExpired(entry) ? entry.payload : undefined;
458+
if (entry &#x3D;&#x3D;&#x3D; undefined || this.isExpired(entry)) return undefined;
459+
entry.lastread &#x3D; Date.now();
460+
return entry.payload;
460461
}
461462

462463
/**
@@ -494,7 +495,7 @@ <h3 id="inputs">Properties</h3>
494495
* @returns Boolean indicating if the entry is expired
495496
*/
496497
isExpired(entry: ODataCacheEntry&lt;any&gt;) {
497-
return entry.lastRead &lt; Date.now() - (entry.timeout || this.timeout) * 1000;
498+
return entry.lastread &lt; (Date.now() - entry.timeout);
498499
}
499500

500501
/**

‎docs/api/js/search/search_index.js‎

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

‎docs/api/properties.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
</ol>
121121
<ul class="properties-list">
122122
<li>
123-
<b>Version</b> : 0.141.0</li>
123+
<b>Version</b> : 0.142.0</li>
124124
<li>
125125
<b>Description</b> : Client side OData typescript library for Angular</li>
126126
<li>

‎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": "angular-odata",
3-
"version": "0.141.0",
3+
"version": "0.142.0",
44
"license": "MIT",
55
"description": "Client side OData typescript library for Angular",
66
"repository": {

‎projects/angular-odata/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-odata",
3-
"version": "0.141.0",
3+
"version": "0.142.0",
44
"license": "MIT",
55
"description": "Client side OData typescript library for Angular",
66
"repository": {

0 commit comments

Comments
 (0)