Refactored string escape preprocessing

Author: David Haeffner

packages/selianize/__tests__/__snapshots__/command.spec.js.snap

@@ -22,7 +22,10 @@ exports[`command code emitter should emit \`mouse up at\` event 1`] = `"await dr
 
 exports[`command code emitter should emit \`mouse up\` event 1`] = `"await driver.wait(until.elementLocated(By.id(\`button\`)), configuration.timeout);await driver.findElement(By.id(\`button\`)).then(element => {return driver.actions({bridge: true}).move({origin: element}).release().perform();});"`;
 
-exports[`command code emitter should emit \`run script\` command 1`] = `"await driver.executeScript(\`alert('test');\\\\nalert('Im annoying');\`);"`;
+exports[`command code emitter should emit \`run script\` command 1`] = `
+"await driver.executeScript(\`alert('test');
+alert('Im annoying');\`);"
+`;
 
 exports[`command code emitter should emit \`set window size\` command 1`] = `
 "try {

packages/selianize/src/command.js

@@ -125,17 +125,16 @@ export function emit(command, options = config, snapshot) {
       if (options.skipStdLibEmitting && !emitters[command.command].isAdditional)
         return res({ skipped: true })
       try {
+        const ignoreEscaping = command.command === 'storeJson'
         let result = await emitters[command.command](
           preprocessParameter(
             command.target,
             emitters[command.command].target,
-            command
+            { ignoreEscaping }
           ),
-          preprocessParameter(
-            command.value,
-            emitters[command.command].value,
-            command
-          )
+          preprocessParameter(command.value, emitters[command.command].value, {
+            ignoreEscaping,
+          })
         )
         if (command.opensWindow) result = emitNewWindowHandling(result, command)
         res(result)
@@ -160,21 +159,21 @@ export function canEmit(commandName) {
   return !!emitters[commandName]
 }
 
-function preprocessParameter(param, preprocessor, command) {
+function preprocessParameter(param, preprocessor, { ignoreEscaping }) {
   const escapedParam = escapeString(param, {
     preprocessor,
-    commandName: command ? command.command : undefined,
+    ignoreEscaping,
   })
   if (preprocessor) {
     return preprocessor(escapedParam)
   }
   return defaultPreprocessor(escapedParam)
 }
 
-function escapeString(string, { preprocessor, commandName }) {
-  if (commandName && commandName === 'storeJson') return string
+function escapeString(string, { preprocessor, ignoreEscaping }) {
+  if (ignoreEscaping) return string
   else if (preprocessor && preprocessor.name === 'scriptPreprocessor')
-    return stringEscape(string.replace(/"/g, "'"), '"')
+    return string.replace(/"/g, "'")
   else return stringEscape(string)
 }
 

packages/side-utils/src/code-export/emit.js

@@ -27,18 +27,19 @@ export function emitCommand(
   { variableLookup, emitNewWindowHandling }
 ) {
   if (emitter) {
+    const ignoreEscaping = command.command === 'storeJson'
     let result = emitter(
       preprocessParameter(
         command.target,
         emitter.targetPreprocessor,
         variableLookup,
-        command.command
+        { ignoreEscaping }
       ),
       preprocessParameter(
         command.value,
         emitter.valuePreprocessor,
         variableLookup,
-        command.command
+        { ignoreEscaping }
       )
     )
     if (command.opensWindow) result = emitNewWindowHandling(command, result)

packages/side-utils/src/code-export/preprocessor.js

@@ -17,20 +17,20 @@
 
 import stringEscape from '../string-escape'
 
-function escapeString(string, { preprocessor, commandName }) {
-  if (commandName && commandName === 'storeJson') return string
+function escapeString(string, { preprocessor, ignoreEscaping }) {
+  if (ignoreEscaping) return string
   else if (preprocessor && preprocessor.name === 'scriptPreprocessor')
-    return stringEscape(string.replace(/"/g, "'"), '"')
+    return string.replace(/"/g, "'")
   else return stringEscape(string)
 }
 
 export function preprocessParameter(
   param,
   preprocessor,
   variableLookup,
-  commandName
+  { ignoreEscaping }
 ) {
-  const escapedParam = escapeString(param, { preprocessor, commandName })
+  const escapedParam = escapeString(param, { preprocessor, ignoreEscaping })
   return preprocessor
     ? preprocessor(escapedParam, variableLookup)
     : defaultPreprocessor(escapedParam, variableLookup)