fix(js-sdk): parse Dockerfile ENV/ARG values with spaces

.changeset/fix-dockerfile-env-quoted-values.md

@@ -0,0 +1,5 @@
+---
+'e2b': patch
+---
+
+Fix `Template.fromDockerfile` parsing of `ENV`/`ARG` values that contain whitespace. A quoted value like `ENV NAME="John Doe"` (and an unquoted `ENV KEY=hello world`) was split into a malformed key; it is now parsed as a single value with surrounding quotes stripped, matching the Python SDK. Multiple `key=value` pairs on one line stay separated.

packages/js-sdk/src/template/dockerfileParser.ts

@@ -231,67 +231,36 @@ function handleEnvInstruction(
   const argumentsData = instruction.getArguments()
   const keyword = instruction.getKeyword()
 
-  if (argumentsData && argumentsData.length >= 1) {
-    const envVars: Record<string, string> = {}
-
-    if (argumentsData.length === 2) {
-      // ENV key value format OR multiple key=value pairs (from line continuation)
-      const firstArg = argumentsData[0].getValue()
-      const secondArg = argumentsData[1].getValue()
-
-      // Check if both arguments contain '=' (multiple key=value pairs)
-      if (firstArg.includes('=') && secondArg.includes('=')) {
-        // Both are key=value pairs (line continuation)
-        for (const arg of argumentsData) {
-          const envString = arg.getValue()
-          const equalIndex = envString.indexOf('=')
-          if (equalIndex > 0) {
-            const key = envString.substring(0, equalIndex)
-            const value = envString.substring(equalIndex + 1)
-            envVars[key] = value
-          }
-        }
-      } else {
-        // Traditional ENV key value format
-        envVars[firstArg] = secondArg
-      }
-    } else if (argumentsData.length === 1) {
-      // ENV/ARG key=value format (single argument) or ARG key (without default)
-      const envString = argumentsData[0].getValue()
-
-      // Check if it's a simple key=value or just a key (for ARG without default)
-      const equalIndex = envString.indexOf('=')
-      if (equalIndex > 0) {
-        const key = envString.substring(0, equalIndex)
-        const value = envString.substring(equalIndex + 1)
-        envVars[key] = value
-      } else if (keyword === 'ARG' && envString.trim()) {
-        // ARG without default value - set as empty ENV
-        const key = envString.trim()
-        envVars[key] = ''
-      }
-    } else {
-      // Multiple arguments (from line continuation with backslashes)
-      for (const arg of argumentsData) {
-        const envString = arg.getValue()
-        const equalIndex = envString.indexOf('=')
-        if (equalIndex > 0) {
-          const key = envString.substring(0, equalIndex)
-          const value = envString.substring(equalIndex + 1)
-          envVars[key] = value
-        } else if (keyword === 'ARG') {
-          // ARG without default value
-          const key = envString
-          envVars[key] = ''
-        }
-      }
-    }
+  if (!argumentsData || argumentsData.length === 0) {
+    return
+  }
 
-    // Call setEnvs once with all environment variables from this instruction
-    if (Object.keys(envVars).length > 0) {
-      templateBuilder.setEnvs(envVars)
+  // dockerfile-ast splits arguments on whitespace, including inside quotes, so
+  // rejoin them to recover the raw value and parse it like the Python SDK: in
+  // the `key=value` form a value runs across whitespace until the next `key=`
+  // token, and surrounding quotes are stripped. Parsing each token in isolation
+  // mangled `ENV NAME="John Doe"` and `ENV KEY=a b` into a broken key.
+  const value = argumentsData.map((arg) => arg.getValue()).join(' ')
+  const envVars: Record<string, string> = {}
+
+  if (value.includes('=')) {
+    const pairRegex = /(\w+)=([^\s]*(?:\s+(?!\w+=)[^\s]*)*)/g
+    let match: RegExpExecArray | null
+    while ((match = pairRegex.exec(value)) !== null) {
+      envVars[match[1]] = match[2].replace(/^["']+|["']+$/g, '')
+    }
+  } else {
+    const spaceForm = value.match(/^(\S+)\s+([\s\S]+)$/)
+    if (spaceForm) {
+      envVars[spaceForm[1]] = spaceForm[2].replace(/^["']+|["']+$/g, '')
+    } else if (keyword === 'ARG' && value.trim()) {
+      envVars[value.trim()] = ''
     }
   }
+
+  if (Object.keys(envVars).length > 0) {
+    templateBuilder.setEnvs(envVars)
+  }
 }
 
 function handleCmdEntrypointInstruction(

packages/js-sdk/tests/template/methods/fromDockerfile.test.ts

@@ -196,3 +196,24 @@ COPY --chown=anotheruser config.json /config/`
   assert.equal(copyInstruction2.args[1], '/config/')
   assert.equal(copyInstruction2.args[2], 'anotheruser') // user from --chown (without group)
 })
+
+buildTemplateTest('fromDockerfile parses quoted and spaced ENV values', async () => {
+  const dockerfile = `FROM node:24
+ENV NAME="John Doe"
+ENV GREETING=hello world
+ENV A=1 B=2`
+
+  const template = Template().fromDockerfile(dockerfile)
+
+  const envInstructions = (
+    // @ts-expect-error - instructions is not a property of TemplateBuilder
+    template.instructions as { type: InstructionType; args: string[] }[]
+  ).filter((i) => i.type === InstructionType.ENV)
+
+  // A quoted value with a space stays a single value (was split into a broken key).
+  assert.deepEqual(envInstructions[0].args, ['NAME', 'John Doe'])
+  // An unquoted value runs to the next `key=` token.
+  assert.deepEqual(envInstructions[1].args, ['GREETING', 'hello world'])
+  // Multiple key=value pairs on one line stay separated.
+  assert.deepEqual(envInstructions[2].args, ['A', '1', 'B', '2'])
+})