Enforce eslint prefer-template (#346)

node-saml · Jul 18, 2023 · 1eee0d0 · 1eee0d0
1 parent fa2a403
commit 1eee0d0
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 149 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -28,6 +28,7 @@
     "eqeqeq": ["error", "smart"],
     "no-var": "error",
     "prefer-const": "error",
+    "prefer-template": "error",
     "deprecation/deprecation": "warn",
     "@typescript-eslint/no-non-null-assertion": "error",
     "@typescript-eslint/no-unused-vars": "warn",

diff --git a/src/c14n-canonicalization.ts b/src/c14n-canonicalization.ts
@@ -230,13 +230,11 @@ export class C14nCanonicalization implements CanonicalizationOrTransformationAlg
       }
     }
 
-    return (
-      (isAfterDocument ? "\n" : "") +
-      "<!--" +
-      utils.encodeSpecialCharactersInText(node.data) +
-      "-->" +
-      (isBeforeDocument ? "\n" : "")
-    );
+    const afterDocument = isAfterDocument ? "\n" : "";
+    const beforeDocument = isBeforeDocument ? "\n" : "";
+    const encodedText = utils.encodeSpecialCharactersInText(node.data);
+
+    return `${afterDocument}<!--${encodedText}-->${beforeDocument}`;
   }
 
   /**

diff --git a/src/exclusive-canonicalization.ts b/src/exclusive-canonicalization.ts
@@ -242,13 +242,11 @@ export class ExclusiveCanonicalization implements CanonicalizationOrTransformati
       }
     }
 
-    return (
-      (isAfterDocument ? "\n" : "") +
-      "<!--" +
-      utils.encodeSpecialCharactersInText(node.data) +
-      "-->" +
-      (isBeforeDocument ? "\n" : "")
-    );
+    const afterDocument = isAfterDocument ? "\n" : "";
+    const beforeDocument = isBeforeDocument ? "\n" : "";
+    const encodedText = utils.encodeSpecialCharactersInText(node.data);
+
+    return `${afterDocument}<!--${encodedText}-->${beforeDocument}`;
   }
 
   /**
@@ -293,7 +291,7 @@ export class ExclusiveCanonicalization implements CanonicalizationOrTransformati
             if (prefix === ancestorNamespace.prefix) {
               node.setAttributeNS(
                 "http://www.w3.org/2000/xmlns/",
-                "xmlns:" + prefix,
+                `xmlns:${prefix}`,
                 ancestorNamespace.namespaceURI
               );
             }