X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FCircularArray.ts;h=f87ddd458bf5e67e82ee90d88932a349769f224b;hb=ec4a242aa5f1a9d4201d0ec9988f9dd931978589;hp=cb7e3bf5f5d8f52a1d3aaab704d8ace1cf482098;hpb=9be37455e6a46ff9c2ab39211fb1c9fb4202d245;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/CircularArray.ts b/src/utils/CircularArray.ts
index cb7e3bf5..f87ddd45 100644
--- a/src/utils/CircularArray.ts
+++ b/src/utils/CircularArray.ts
@@ -1,5 +1,10 @@
-export const DEFAULT_CIRCULAR_ARRAY_SIZE = 2000;
+// Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
+const DEFAULT_CIRCULAR_ARRAY_SIZE = 1024;
+
+/**
+ * Array with a maximum length and shifting items when full.
+ */
 export class CircularArray<T> extends Array<T> {
   public size: number;
 
@@ -25,18 +30,16 @@ export class CircularArray<T> extends Array<T> {
     if (length > this.size) {
       super.splice(this.size, items.length);
     }
-    return length;
+    return this.length;
   }
 
   public concat(...items: (T | ConcatArray<T>)[]): CircularArray<T> {
-    const concatenatedCircularArray = super.concat(
-      items as T[]
-    ) as CircularArray<T>;
+    const concatenatedCircularArray = super.concat(items as T[]) as CircularArray<T>;
     concatenatedCircularArray.size = this.size;
     if (concatenatedCircularArray.length > concatenatedCircularArray.size) {
       concatenatedCircularArray.splice(
         0,
-        concatenatedCircularArray.length - concatenatedCircularArray.size
+        concatenatedCircularArray.length - concatenatedCircularArray.size,
       );
     }
     return concatenatedCircularArray;
@@ -44,7 +47,7 @@ export class CircularArray<T> extends Array<T> {
 
   public splice(start: number, deleteCount?: number, ...items: T[]): T[] {
     let itemsRemoved: T[];
-    if (arguments.length >= 3 && typeof deleteCount !== 'undefined') {
+    if (arguments.length >= 3 && deleteCount !== undefined) {
       itemsRemoved = super.splice(start, deleteCount);
       // FIXME: that makes the items insert not in place
       this.push(...items);
@@ -76,9 +79,12 @@ export class CircularArray<T> extends Array<T> {
     return this.length === this.size;
   }
 
-  private checkSize(size: number) {
+  private checkSize(size: number): void {
+    if (!Number.isSafeInteger(size)) {
+      throw new TypeError(`Invalid circular array size: ${size} is not a safe integer`);
+    }
     if (size < 0) {
-      throw new RangeError('Invalid circular array size');
+      throw new RangeError(`Invalid circular array size: ${size} < 0`);
     }
   }
 }