Merge branch 'main' into 3-dev

Author: angrykoala

src/clauses/Clause.ts

@@ -96,7 +96,7 @@ export abstract class Clause extends CypherASTNode {
         throw new Error(`Cannot build root: ${root.constructor.name}`);
     }
 
-    private getEnv(prefix?: string, config: BuildConfig = {}): CypherEnvironment {
+    private getEnv(prefix: string | undefined, config: BuildConfig): CypherEnvironment {
         return new CypherEnvironment(prefix, config);
     }
 

src/utils/escape.ts

@@ -17,8 +17,6 @@
  * limitations under the License.
  */
 
-const ESCAPE_SYMBOL_REGEX = /`/g;
-
 /** These names must be escaped for variables */
 const RESERVED_VAR_NAMES = new Set(["contains", "in", "where", "is"]);
 
@@ -61,12 +59,12 @@ function escapeIfNeeded(str: string): string {
 
 function escapeString(str: string): string {
     const normalizedStr = normalizeString(str);
-    const escapedStr = normalizedStr.replaceAll(ESCAPE_SYMBOL_REGEX, "``");
+    const escapedStr = normalizedStr.replaceAll("`", "``");
     return `\`${escapedStr}\``;
 }
 
 function normalizeString(str: string): string {
-    return str.replaceAll(/\\u0060/g, "`");
+    return str.replaceAll("\\u0060", "`");
 }
 
 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.replaceAll(/\n/g, `\n${paddingStr}`);
+    const paddedNewLines = block.replaceAll("\n", `\n${paddingStr}`);
     return `${paddingStr}${paddedNewLines}`;
 }