Merge pull request #598 from neo4j/more-code-cleanup

Minor improvements on code

Author: angrykoala

src/expressions/map/MapExpr.ts

@@ -42,9 +42,9 @@ export class MapExpr implements CypherCompilable {
         if (typeof keyOrValues === "string") {
             this.setField(keyOrValues, value);
         } else {
-            Object.entries(keyOrValues).forEach(([key, value]) => {
+            for (const [key, value] of Object.entries(keyOrValues)) {
                 this.setField(key, value);
-            });
+            }
         }
     }
 

src/expressions/map/MapProjection.ts

@@ -101,9 +101,9 @@ export class MapProjection implements CypherCompilable {
     }
 
     private setExtraValues(values: Record<string, Expr>): void {
-        Object.entries(values).forEach(([key, value]) => {
+        for (const [key, value] of Object.entries(values)) {
             if (!value) throw new Error(`Missing value on map key ${key}`);
             this.extraValues.set(key, value);
-        });
+        }
     }
 }

src/namespaces/apoc/cypher/run-first-column.ts

@@ -85,7 +85,7 @@ class RunFirstColumnFunction extends CypherFunction {
     }
 
     private escapeQuery(query: string): string {
-        return query.replace(/(["\\])/g, "\\$1");
+        return query.replaceAll(/(["\\])/g, "\\$1");
     }
 
     private parseVariablesInput(variables: Variable[] | MapExpr | Record<string, Expr>): Variable[] | MapExpr {

src/references/Variable.ts

@@ -31,11 +31,7 @@ export class Variable {
     /**
      * @internal
      */
-    public prefix: string;
-
-    constructor() {
-        this.prefix = "var";
-    }
+    public prefix: string = "var";
 
     /** Access individual property via the PropertyRef class */
     public property(...path: Array<string | Expr>): PropertyRef {

src/utils/escape.ts

@@ -66,7 +66,7 @@ function escapeString(str: string): string {
 }
 
 function normalizeString(str: string): string {
-    return str.replace(/\\u0060/g, "`");
+    return str.replaceAll(/\\u0060/g, "`");
 }
 
 function needsEscape(str: string): boolean {

src/utils/pad-block.ts

@@ -19,6 +19,6 @@
 
 export function padBlock(block: string, spaces = 4): string {
     const paddingStr = " ".repeat(spaces);
-    const paddedNewLines = block.replace(/\n/g, `\n${paddingStr}`);
+    const paddedNewLines = block.replaceAll(/\n/g, `\n${paddingStr}`);
     return `${paddingStr}${paddedNewLines}`;
 }