Remove non-standard Array methods (#343)

CircuitVerse · Jul 28, 2024 · 477500f · 477500f
1 parent 1825ef9
commit 477500f
Show file tree

Hide file tree

Showing 54 changed files with 109 additions and 313 deletions.
diff --git a/src/globalVariables.ts b/src/globalVariables.ts
@@ -6,8 +6,6 @@ declare const window: any
 import jQuery from 'jquery'
 window.$ = window.jQuery = jQuery
 
-import Array from './simulator/src/arrayHelpers.js'
-window.Array = Array
 window.isUserLoggedIn = false
 window.logixProjectId = undefined
 

diff --git a/src/simulator/src/app.js b/src/simulator/src/app.js
@@ -1,5 +1,4 @@
 import { setup } from './setup'
-import Array from './arrayHelpers'
 
 document.addEventListener('DOMContentLoaded', () => {
     setup()
@@ -209,5 +208,3 @@ document.addEventListener('DOMContentLoaded', () => {
         subcircuits: {},
     }
 })
-
-window.Array = Array
diff --git a/src/simulator/src/arrayHelpers.js b/src/simulator/src/arrayHelpers.js
diff --git a/src/simulator/src/circuit.js b/src/simulator/src/circuit.js
@@ -398,7 +398,7 @@ export default class Scope {
         var list = []
         for (let i = 0; i < this.SubCircuit.length; i++) {
             list.push(this.SubCircuit[i].id)
-            list.extend(scopeList[this.SubCircuit[i].id].getDependencies())
+            list.push(...scopeList[this.SubCircuit[i].id].getDependencies())
         }
         return uniq(list)
     }

diff --git a/src/simulator/src/circuitElement.js b/src/simulator/src/circuitElement.js
@@ -332,7 +332,7 @@ export default class CircuitElement {
             this.drag()
             if (
                 !simulationArea.shiftDown &&
-                simulationArea.multipleObjectSelections.contains(this)
+                simulationArea.multipleObjectSelections.includes(this)
             ) {
                 for (
                     let i = 0;
@@ -348,7 +348,7 @@ export default class CircuitElement {
             this.startDragging()
             if (
                 !simulationArea.shiftDown &&
-                simulationArea.multipleObjectSelections.contains(this)
+                simulationArea.multipleObjectSelections.includes(this)
             ) {
                 for (
                     let i = 0;
@@ -376,9 +376,9 @@ export default class CircuitElement {
                 if (simulationArea.shiftDown) {
                     simulationArea.lastSelected = undefined
                     if (
-                        simulationArea.multipleObjectSelections.contains(this)
+                        simulationArea.multipleObjectSelections.includes(this)
                     ) {
-                        simulationArea.multipleObjectSelections.clean(this)
+                        simulationArea.multipleObjectSelections = simulationArea.multipleObjectSelections.filter(x => x !== this);
                     } else {
                         simulationArea.multipleObjectSelections.push(this)
                     }
@@ -578,7 +578,7 @@ export default class CircuitElement {
             if (
                 (this.hover && !simulationArea.shiftDown) ||
                 simulationArea.lastSelected === this ||
-                simulationArea.multipleObjectSelections.contains(this)
+                simulationArea.multipleObjectSelections.includes(this)
             )
                 ctx.fillStyle = colors['hover_select']
             ctx.fill()
@@ -734,7 +734,7 @@ export default class CircuitElement {
     // OVERRIDE WITH CAUTION
     delete() {
         simulationArea.lastSelected = undefined
-        this.scope[this.objectType].clean(this) // CHECK IF THIS IS VALID
+        this.scope[this.objectType] = this.scope[this.objectType].filter(x => x !== this)
         if (this.deleteNodesWhenDeleted) {
             this.deleteNodes()
         } else {
@@ -883,7 +883,7 @@ export default class CircuitElement {
                     if (
                         !this.scope.verilogWireList[
                             this.nodeList[i].bitWidth
-                        ].contains(this.nodeList[i].verilogLabel)
+                        ].includes(this.nodeList[i].verilogLabel)
                     )
                         this.scope.verilogWireList[
                             this.nodeList[i].bitWidth

diff --git a/src/simulator/src/engine.js b/src/simulator/src/engine.js
@@ -369,7 +369,7 @@ export function updateSelectionsAndPane(scope = globalScope) {
             for (let i = 0; i < updateOrder.length; i++) {
                 for (var j = 0; j < scope[updateOrder[i]].length; j++) {
                     var obj = scope[updateOrder[i]][j]
-                    if (simulationArea.multipleObjectSelections.contains(obj))
+                    if (simulationArea.multipleObjectSelections.includes(obj))
                         continue
                     var x
                     var y

diff --git a/src/simulator/src/events.js b/src/simulator/src/events.js
@@ -105,7 +105,7 @@ export function paste(copyData) {
             l !== 'objects' &&
             l !== 'CircuitElement'
         ) {
-            globalScope[l].extend(tempScope[l])
+            globalScope[l].push(...tempScope[l])
         }
     })
     for (let i = 0; i < tempScope.Input.length; i++) {
@@ -165,7 +165,7 @@ export function cut(copyList) {
             const obj = globalScope[updateOrder[i]][j]
             if (obj.objectType != 'Wire') {
                 // }&&obj.objectType!='CircuitElement'){//}&&(obj.objectType!='Node'||obj.type==2)){
-                if (!copyList.contains(globalScope[updateOrder[i]][j])) {
+                if (!copyList.includes(globalScope[updateOrder[i]][j])) {
                     globalScope[updateOrder[i]][j].cleanDelete()
                 }
             }
@@ -251,7 +251,7 @@ export function copy(copyList, cutflag = false) {
             const obj = globalScope[updateOrder[i]][j]
             if (obj.objectType != 'Wire') {
                 // }&&obj.objectType!='CircuitElement'){//}&&(obj.objectType!='Node'||obj.type==2)){
-                if (!copyList.contains(globalScope[updateOrder[i]][j])) {
+                if (!copyList.includes(globalScope[updateOrder[i]][j])) {
                     globalScope[updateOrder[i]][j].cleanDelete()
                 }
             }

diff --git a/src/simulator/src/listeners.js b/src/simulator/src/listeners.js
@@ -290,7 +290,7 @@ export default function startListeners() {
                         simulationArea.lastSelected.objectType != 'Wire' &&
                         simulationArea.lastSelected.objectType !=
                             'CircuitElement' &&
-                        !simulationArea.multipleObjectSelections.contains(
+                        !simulationArea.multipleObjectSelections.includes(
                             simulationArea.lastSelected
                         )
                     ) {
@@ -405,7 +405,7 @@ export default function startListeners() {
             if (
                 simulationArea.lastSelected &&
                 simulationArea.lastSelected !== simulationArea.root &&
-                !simulationArea.copyList.contains(simulationArea.lastSelected)
+                !simulationArea.copyList.includes(simulationArea.lastSelected)
             ) {
                 simulationArea.copyList.push(simulationArea.lastSelected)
             }
@@ -436,7 +436,7 @@ export default function startListeners() {
             if (
                 simulationArea.lastSelected &&
                 simulationArea.lastSelected !== simulationArea.root &&
-                !simulationArea.copyList.contains(simulationArea.lastSelected)
+                !simulationArea.copyList.includes(simulationArea.lastSelected)
             ) {
                 simulationArea.copyList.push(simulationArea.lastSelected)
             }

diff --git a/src/simulator/src/modules/ALU.js b/src/simulator/src/modules/ALU.js
@@ -95,7 +95,7 @@ export default class ALU extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         ) {
             ctx.fillStyle = colors['hover_select']
         }

diff --git a/src/simulator/src/modules/AndGate.js b/src/simulator/src/modules/AndGate.js
@@ -123,7 +123,7 @@ export default class AndGate extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
             ctx.fillStyle = colors['hover_select']
         ctx.fill()

diff --git a/src/simulator/src/modules/Arrow.js b/src/simulator/src/modules/Arrow.js
@@ -62,7 +62,7 @@ export default class Arrow extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
             ctx.fillStyle = colors['hover_select']
         ctx.fill()

diff --git a/src/simulator/src/modules/BitSelector.js b/src/simulator/src/modules/BitSelector.js
@@ -118,7 +118,7 @@ export default class BitSelector extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
             ctx.fillStyle = colors['hover_select']
         ctx.fill()

diff --git a/src/simulator/src/modules/Buffer.js b/src/simulator/src/modules/Buffer.js
@@ -102,7 +102,7 @@ export default class Buffer extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
             ctx.fillStyle = colors['hover_select']
         ctx.fill()

diff --git a/src/simulator/src/modules/Button.js b/src/simulator/src/modules/Button.js
@@ -86,7 +86,7 @@ export default class Button extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         ) {
             ctx.fillStyle = 'rgba(232, 13, 13,0.6)'
         }
@@ -111,7 +111,7 @@ export default class Button extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected == this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
             ctx.fillStyle = 'rgba(232, 13, 13,0.6)'
         if (this.wasClicked) ctx.fillStyle = 'rgba(232, 13, 13,0.8)'

diff --git a/src/simulator/src/modules/ConstantVal.js b/src/simulator/src/modules/ConstantVal.js
@@ -140,7 +140,7 @@ export default class ConstantVal extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
             ctx.fillStyle = colors['hover_select']
         ctx.fill()

diff --git a/src/simulator/src/modules/ControlledInverter.js b/src/simulator/src/modules/ControlledInverter.js
@@ -92,7 +92,7 @@ export default class ControlledInverter extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
             ctx.fillStyle = colors['hover_select']
         ctx.fill()

diff --git a/src/simulator/src/modules/Counter.js b/src/simulator/src/modules/Counter.js
@@ -142,7 +142,7 @@ export default class Counter extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected == this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         ) {
             ctx.fillStyle = 'rgba(255, 255, 32,0.6)'
             ctx.fill()

diff --git a/src/simulator/src/modules/Decoder.js b/src/simulator/src/modules/Decoder.js
@@ -141,7 +141,7 @@ export default class Decoder extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         ) {
             ctx.fillStyle = colors['hover_select']
         }

diff --git a/src/simulator/src/modules/Demultiplexer.js b/src/simulator/src/modules/Demultiplexer.js
@@ -206,7 +206,7 @@ export default class Demultiplexer extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         ) {
             ctx.fillStyle = colors['hover_select']
         }

diff --git a/src/simulator/src/modules/DigitalLed.js b/src/simulator/src/modules/DigitalLed.js
@@ -109,7 +109,7 @@ export default class DigitalLed extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
             ctx.fillStyle = colors['hover_select']
         ctx.fill()
@@ -135,7 +135,7 @@ export default class DigitalLed extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected == this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
             ctx.fillStyle = 'rgba(255, 255, 32,0.8)'
         ctx.fill()

diff --git a/src/simulator/src/modules/Flag.js b/src/simulator/src/modules/Flag.js
@@ -123,7 +123,7 @@ export default class Flag extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
             ctx.fillStyle = colors['hover_select']
         ctx.fill()

diff --git a/src/simulator/src/modules/Ground.js b/src/simulator/src/modules/Ground.js
@@ -58,7 +58,7 @@ export default class Ground extends CircuitElement {
         ctx.strokeStyle = [colors['stroke'], 'brown'][
             ((this.hover && !simulationArea.shiftDown) ||
                 simulationArea.lastSelected === this ||
-                simulationArea.multipleObjectSelections.contains(this)) + 0
+                simulationArea.multipleObjectSelections.includes(this)) + 0
         ]
         ctx.lineWidth = correctWidth(3)
 

diff --git a/src/simulator/src/modules/HexDisplay.js b/src/simulator/src/modules/HexDisplay.js
@@ -358,7 +358,7 @@ export default class HexDisplay extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected == this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         ) {
             ctx.fillStyle = 'rgba(255, 255, 32,0.6)'
             ctx.fill()

diff --git a/src/simulator/src/modules/ImageAnnotation.js b/src/simulator/src/modules/ImageAnnotation.js
@@ -112,7 +112,7 @@ export default class ImageAnnotation extends CircuitElement {
 
             if (
                 simulationArea.lastSelected === this ||
-                simulationArea.multipleObjectSelections.contains(this)
+                simulationArea.multipleObjectSelections.includes(this)
             ) {
                 ctx.fillStyle = 'rgba(255, 255, 32,0.1)'
                 ctx.fill()

diff --git a/src/simulator/src/modules/LSB.js b/src/simulator/src/modules/LSB.js
@@ -99,7 +99,7 @@ export default class LSB extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
         ctx.fillStyle = colors['hover_select']
         ctx.fill()

diff --git a/src/simulator/src/modules/MSB.js b/src/simulator/src/modules/MSB.js
@@ -93,7 +93,7 @@ export default class MSB extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
         ctx.fillStyle = colors['hover_select']
         ctx.fill()

diff --git a/src/simulator/src/modules/Multiplexer.js b/src/simulator/src/modules/Multiplexer.js
@@ -211,7 +211,7 @@ export default class Multiplexer extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         ) {
             ctx.fillStyle = colors['hover_select']
         }

diff --git a/src/simulator/src/modules/NandGate.js b/src/simulator/src/modules/NandGate.js
@@ -117,7 +117,7 @@ export default class NandGate extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
             ctx.fillStyle = colors['hover_select']
         ctx.fill()

diff --git a/src/simulator/src/modules/NorGate.js b/src/simulator/src/modules/NorGate.js
@@ -130,7 +130,7 @@ export default class NorGate extends CircuitElement {
         if (
             (this.hover && !simulationArea.shiftDown) ||
             simulationArea.lastSelected === this ||
-            simulationArea.multipleObjectSelections.contains(this)
+            simulationArea.multipleObjectSelections.includes(this)
         )
         ctx.fillStyle = colors['hover_select']
         ctx.fill()