X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FCircularArray.ts;h=4fafe5280a78cd849667f94e12e7e198e16f2dc7;hb=42b8cf5cdca8eaab1e7442f7c92c2a5ed97434f6;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..4fafe528 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.
 
+export 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,35 +30,39 @@ 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;
   }
 
-  public splice(start: number, deleteCount?: number, ...items: T[]): T[] {
-    let itemsRemoved: T[];
-    if (arguments.length >= 3 && typeof deleteCount !== 'undefined') {
-      itemsRemoved = super.splice(start, deleteCount);
-      // FIXME: that makes the items insert not in place
-      this.push(...items);
+  public splice(start: number, deleteCount?: number, ...items: T[]): CircularArray<T> {
+    let itemsRemoved: T[] = [];
+    if (arguments.length >= 3 && deleteCount !== undefined) {
+      itemsRemoved = super.splice(start, deleteCount, ...items);
+      if (this.length > this.size) {
+        const itemsOverflowing = super.splice(0, this.length - this.size);
+        itemsRemoved = new CircularArray<T>(
+          itemsRemoved.length + itemsOverflowing.length,
+          ...itemsRemoved,
+          ...itemsOverflowing,
+        );
+      }
     } else if (arguments.length === 2) {
       itemsRemoved = super.splice(start, deleteCount);
     } else {
       itemsRemoved = super.splice(start);
     }
-    return itemsRemoved;
+    return itemsRemoved as CircularArray<T>;
   }
 
   public resize(size: number): void {
@@ -76,9 +85,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`);
     }
   }
 }