resolver fix for quoted js literals

Author: icecrasher321

apps/sim/executor/variables/resolver.test.ts

@@ -99,6 +99,57 @@ describe('VariableResolver function block inputs', () => {
     expect(result.contextVariables).toEqual({ __blockRef_0: 'hello world' })
   })
 
+  it('breaks JavaScript string literals around quoted block references', () => {
+    const { block, ctx, resolver } = createResolver('javascript')
+
+    const result = resolver.resolveInputsForFunctionBlock(
+      ctx,
+      'function',
+      { code: "const rawEmail = '<Producer.result>';\nreturn rawEmail" },
+      block
+    )
+
+    expect(result.resolvedInputs.code).toBe(
+      "const rawEmail = '' + JSON.stringify(globalThis[\"__blockRef_0\"]) + '';\nreturn rawEmail"
+    )
+    expect(result.displayInputs.code).toBe('const rawEmail = \'"hello world"\';\nreturn rawEmail')
+    expect(result.contextVariables).toEqual({ __blockRef_0: 'hello world' })
+  })
+
+  it('uses template interpolation for JavaScript template literal block references', () => {
+    const { block, ctx, resolver } = createResolver('javascript')
+
+    const result = resolver.resolveInputsForFunctionBlock(
+      ctx,
+      'function',
+      { code: 'return `value: <Producer.result>`' },
+      block
+    )
+
+    expect(result.resolvedInputs.code).toBe(
+      'return `value: ${JSON.stringify(globalThis["__blockRef_0"])}`'
+    )
+    expect(result.displayInputs.code).toBe('return `value: "hello world"`')
+    expect(result.contextVariables).toEqual({ __blockRef_0: 'hello world' })
+  })
+
+  it('breaks Python string literals around quoted block references', () => {
+    const { block, ctx, resolver } = createResolver('python')
+
+    const result = resolver.resolveInputsForFunctionBlock(
+      ctx,
+      'function',
+      { code: "raw_email = '<Producer.result>'\nreturn raw_email" },
+      block
+    )
+
+    expect(result.resolvedInputs.code).toBe(
+      "raw_email = '' + json.dumps(globals()[\"__blockRef_0\"]) + ''\nreturn raw_email"
+    )
+    expect(result.displayInputs.code).toBe('raw_email = \'"hello world"\'\nreturn raw_email')
+    expect(result.contextVariables).toEqual({ __blockRef_0: 'hello world' })
+  })
+
   it('uses separate Python context variables for repeated mutable references', () => {
     const { block, ctx, resolver } = createResolver('python')
 

apps/sim/executor/variables/resolver.ts

@@ -24,6 +24,7 @@ export const FUNCTION_BLOCK_DISPLAY_CODE_KEY = '_runtimeDisplayCode'
 const logger = createLogger('VariableResolver')
 
 type ShellQuoteContext = 'single' | 'double' | null
+type CodeStringQuoteContext = ShellQuoteContext | 'template'
 
 export class VariableResolver {
   private resolvers: Resolver[]
@@ -351,14 +352,29 @@ export class VariableResolver {
     value: unknown
   ): string {
     if (language === 'python') {
-      return `globals()[${JSON.stringify(varName)}]`
+      const expression = `globals()[${JSON.stringify(varName)}]`
+      const quoteContext = this.getCodeStringQuoteContext(template, matchIndex)
+      if (quoteContext === 'single' || quoteContext === 'double') {
+        const quote = quoteContext === 'single' ? "'" : '"'
+        return `${quote} + json.dumps(${expression}) + ${quote}`
+      }
+      return expression
     }
 
     if (language === 'shell') {
       return this.formatShellContextVariableReference(varName, template, matchIndex, value)
     }
 
-    return `globalThis[${JSON.stringify(varName)}]`
+    const expression = `globalThis[${JSON.stringify(varName)}]`
+    const quoteContext = this.getCodeStringQuoteContext(template, matchIndex)
+    if (quoteContext === 'template') {
+      return `\${JSON.stringify(${expression})}`
+    }
+    if (quoteContext === 'single' || quoteContext === 'double') {
+      const quote = quoteContext === 'single' ? "'" : '"'
+      return `${quote} + JSON.stringify(${expression}) + ${quote}`
+    }
+    return expression
   }
 
   private formatDisplayValueForCodeContext(
@@ -397,6 +413,27 @@ export class VariableResolver {
     return JSON.stringify(value)
   }
 
+  private getCodeStringQuoteContext(template: string, index: number): CodeStringQuoteContext {
+    let quoteContext: CodeStringQuoteContext = null
+
+    for (let i = 0; i < index; i++) {
+      const char = template[i]
+      if (quoteContext !== null && char === '\\') {
+        i++
+        continue
+      }
+      if (char === "'" && quoteContext !== 'double' && quoteContext !== 'template') {
+        quoteContext = quoteContext === 'single' ? null : 'single'
+      } else if (char === '"' && quoteContext !== 'single' && quoteContext !== 'template') {
+        quoteContext = quoteContext === 'double' ? null : 'double'
+      } else if (char === '`' && quoteContext !== 'single' && quoteContext !== 'double') {
+        quoteContext = quoteContext === 'template' ? null : 'template'
+      }
+    }
+
+    return quoteContext
+  }
+
   private formatShellContextVariableReference(
     varName: string,
     template: string,