norn-cli 1.3.11 → 1.3.13

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to the "Norn" extension will be documented in this file.
 
+## [1.3.13] - 2026-02-10
+
+### Fixed
+- **Script Variable Resolution**: Fixed `print` showing raw command text instead of script output
+  - `extractVariables` now skips runtime-computed values (`var x = run ...`, `var x = $1...`, `var x = METHOD url`)
+  - Variables are only pre-populated for static assignments, not scripts/captures
+- **Test Explorer Script Paths**: Fixed script path resolution when running tests through Test Explorer
+  - Scripts in imported sequences now resolve relative to the imported file, not the importing file
+  - Added `sequenceSources` parameter to Test Explorer execution path
+
+## [1.3.12] - 2026-02-10
+
+### Fixed
+- **Variable Request with Form Body**: Fixed `var x = POST EndpointName HeaderGroup` not passing URL-encoded body
+  - Body lines following the var request command are now correctly collected and sent
+  - Example: `var result = POST PostFormData FormData` followed by `key=value` lines now works
+
 ## [1.3.11] - 2026-02-09
 
 ### Fixed

package/dist/cli.js

@@ -20032,9 +20032,21 @@ function getNamedRequest(text, name) {
 function extractVariables(text) {
   const variables = {};
   const variableRegex = /^\s*var\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.+)$/gm;
+  const runtimePatterns = [
+    /^run\s+/i,
+    // var x = run ... (scripts/sequences)
+    /^\$\d+/,
+    // var x = $1... (response captures)
+    /^(GET|POST|PUT|DELETE|PATCH|HEAD|OPTIONS)\s+/i
+    // var x = METHOD url (request captures)
+  ];
   let match;
   while ((match = variableRegex.exec(text)) !== null) {
     let value = match[2].trim();
+    const isRuntimeValue = runtimePatterns.some((pattern) => pattern.test(value));
+    if (isRuntimeValue) {
+      continue;
+    }
     if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
       value = value.slice(1, -1);
     }
@@ -20338,7 +20350,7 @@ ${resolvedContent}`);
             lineNumber: imp.lineNumber
           });
         } else {
-          sequenceSources.set(lowerName, imp.path);
+          sequenceSources.set(lowerName, absolutePath);
           const resolvedContent = substituteVariables(seq.content, importedVariables);
           importedContents.push(`sequence ${seq.name}
 ${resolvedContent}
@@ -20358,7 +20370,8 @@ end sequence`);
     errors,
     resolvedPaths,
     headerGroups,
-    endpoints
+    endpoints,
+    sequenceSources
   };
 }
 function extractSequencesFromText(text) {
@@ -27519,6 +27532,20 @@ function extractStepsFromSequence(content) {
   let currentRequest = [];
   let currentRequestStartLine = -1;
   let inRequest = false;
+  let currentVarRequest = [];
+  let currentVarRequestStartLine = -1;
+  let inVarRequest = false;
+  const savePendingVarRequest = () => {
+    if (currentVarRequest.length > 0) {
+      steps.push({
+        type: "varRequest",
+        content: currentVarRequest.join("\n"),
+        lineNumber: currentVarRequestStartLine
+      });
+      currentVarRequest = [];
+      inVarRequest = false;
+    }
+  };
   for (let lineIdx = 0; lineIdx < lines.length; lineIdx++) {
     const line2 = lines[lineIdx];
     const trimmed = line2.trim();
@@ -27532,6 +27559,7 @@ function extractStepsFromSequence(content) {
         currentRequest = [];
         inRequest = false;
       }
+      savePendingVarRequest();
       steps.push({
         type: "assertion",
         content: trimmed,
@@ -27549,6 +27577,7 @@ function extractStepsFromSequence(content) {
         currentRequest = [];
         inRequest = false;
       }
+      savePendingVarRequest();
       const condition = parseIfCondition(trimmed);
       steps.push({
         type: "if",
@@ -27567,6 +27596,7 @@ function extractStepsFromSequence(content) {
         currentRequest = [];
         inRequest = false;
       }
+      savePendingVarRequest();
       steps.push({
         type: "endif",
         content: "",
@@ -27584,6 +27614,7 @@ function extractStepsFromSequence(content) {
         currentRequest = [];
         inRequest = false;
       }
+      savePendingVarRequest();
       steps.push({
         type: "print",
         content: trimmed,
@@ -27602,6 +27633,7 @@ function extractStepsFromSequence(content) {
         currentRequest = [];
         inRequest = false;
       }
+      savePendingVarRequest();
       steps.push({
         type: "wait",
         content: trimmed,
@@ -27619,6 +27651,7 @@ function extractStepsFromSequence(content) {
         currentRequest = [];
         inRequest = false;
       }
+      savePendingVarRequest();
       steps.push({
         type: "json",
         content: trimmed,
@@ -27636,6 +27669,7 @@ function extractStepsFromSequence(content) {
         currentRequest = [];
         inRequest = false;
       }
+      savePendingVarRequest();
       steps.push({
         type: "propAssign",
         content: trimmed,
@@ -27653,6 +27687,7 @@ function extractStepsFromSequence(content) {
         currentRequest = [];
         inRequest = false;
       }
+      savePendingVarRequest();
       steps.push({
         type: "script",
         content: trimmed,
@@ -27670,6 +27705,7 @@ function extractStepsFromSequence(content) {
         currentRequest = [];
         inRequest = false;
       }
+      savePendingVarRequest();
       steps.push({
         type: "varRunSequence",
         content: trimmed,
@@ -27687,6 +27723,7 @@ function extractStepsFromSequence(content) {
         currentRequest = [];
         inRequest = false;
       }
+      savePendingVarRequest();
       steps.push({
         type: "namedRequest",
         content: trimmed,
@@ -27704,11 +27741,10 @@ function extractStepsFromSequence(content) {
         currentRequest = [];
         inRequest = false;
       }
-      steps.push({
-        type: "varRequest",
-        content: trimmed,
-        lineNumber: lineIdx
-      });
+      savePendingVarRequest();
+      currentVarRequest = [trimmed];
+      currentVarRequestStartLine = lineIdx;
+      inVarRequest = true;
       continue;
     }
     if (isVarAssignCommand(trimmed)) {
@@ -27721,6 +27757,7 @@ function extractStepsFromSequence(content) {
         currentRequest = [];
         inRequest = false;
       }
+      savePendingVarRequest();
       steps.push({
         type: "varAssign",
         content: trimmed,
@@ -27736,9 +27773,17 @@ function extractStepsFromSequence(content) {
           lineNumber: currentRequestStartLine
         });
       }
+      savePendingVarRequest();
       currentRequest = [trimmed];
       currentRequestStartLine = lineIdx;
       inRequest = true;
+    } else if (inVarRequest) {
+      if (trimmed === "" || trimmed.match(/^[a-zA-Z_][a-zA-Z0-9_]*\s*[=:]\s*.+$/) || trimmed.startsWith("{") || trimmed.startsWith('"') || trimmed.startsWith("[")) {
+        currentVarRequest.push(trimmed);
+      } else {
+        savePendingVarRequest();
+        lineIdx--;
+      }
     } else if (inRequest) {
       if (trimmed.match(/^var\s+[a-zA-Z_][a-zA-Z0-9_]*\s*=\s*\$\d+/)) {
         if (currentRequest.length > 0) {
@@ -27770,6 +27815,7 @@ function extractStepsFromSequence(content) {
       lineNumber: currentRequestStartLine
     });
   }
+  savePendingVarRequest();
   return steps;
 }
 function extractCaptureDirectives(content) {
@@ -27836,7 +27882,7 @@ function getValueByPath(response, path5) {
       return void 0;
   }
 }
-async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, workingDir, fullDocumentText, onProgress, callStack, sequenceArgs, apiDefinitions, tagFilterOptions) {
+async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, workingDir, fullDocumentText, onProgress, callStack, sequenceArgs, apiDefinitions, tagFilterOptions, sequenceSources) {
   const startTime = Date.now();
   const responses = [];
   const scriptResults = [];
@@ -28155,9 +28201,10 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
       continue;
     }
     if (step.type === "varRequest") {
-      const parsed = parseVarRequestCommand(step.content);
+      const commandLine = step.content.split("\n")[0];
+      const parsed = parseVarRequestCommand(commandLine);
       if (!parsed) {
-        errors.push(`Step ${stepIdx + 1}: Invalid variable request: ${step.content}`);
+        errors.push(`Step ${stepIdx + 1}: Invalid variable request: ${commandLine}`);
         return {
           name: "",
           success: false,
@@ -28233,6 +28280,12 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
           const headerLines = Object.entries(resolvedHeaders).map(([k, v]) => `${k}: ${v}`);
           requestText += "\n" + headerLines.join("\n");
         }
+        const contentLines = step.content.split("\n");
+        if (contentLines.length > 1) {
+          const bodyLines = contentLines.slice(1);
+          const resolvedBodyLines = bodyLines.map((line2) => substituteVariables(line2, runtimeVariables));
+          requestText += "\n\n" + resolvedBodyLines.join("\n");
+        }
         const requestParsed = parserHttpRequest(requestText, runtimeVariables);
         const retryOpts = parsed.retryCount ? {
           retryCount: parsed.retryCount,
@@ -28426,12 +28479,20 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
           }
         }
         reportProgress(stepIdx, "sequenceStart", `Starting sequence ${targetName}`, void 0, targetName);
+        let subWorkingDir = workingDir;
+        if (sequenceSources) {
+          const sourceFile = sequenceSources.get(targetName.toLowerCase());
+          if (sourceFile) {
+            const path5 = await import("path");
+            subWorkingDir = path5.dirname(sourceFile);
+          }
+        }
         const subResult = await runSequenceWithJar(
           targetSequence.content,
           runtimeVariables,
           // Pass current runtime variables (includes file vars + any captured)
           cookieJar,
-          workingDir,
+          subWorkingDir,
           fullDocumentText,
           onProgress,
           // Pass through progress callback
@@ -28441,8 +28502,10 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
           // Pass bound arguments as initial scope variables
           apiDefinitions,
           // Pass API definitions for endpoint resolution
-          tagFilterOptions
+          tagFilterOptions,
           // Pass tag filter options for nested sequence filtering
+          sequenceSources
+          // Pass sequence sources for nested sequences
         );
         reportProgress(stepIdx, "sequenceEnd", `Finished sequence ${targetName}`, void 0, targetName);
         for (const subResponse of subResult.responses) {
@@ -28751,11 +28814,19 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
         }
       }
       reportProgress(stepIdx, "sequenceStart", `Starting sequence ${sequenceName}`, void 0, sequenceName);
+      let subWorkingDir = workingDir;
+      if (sequenceSources) {
+        const sourceFile = sequenceSources.get(sequenceName.toLowerCase());
+        if (sourceFile) {
+          const path5 = await import("path");
+          subWorkingDir = path5.dirname(sourceFile);
+        }
+      }
       const subResult = await runSequenceWithJar(
         targetSequence.content,
         runtimeVariables,
         cookieJar,
-        workingDir,
+        subWorkingDir,
         fullDocumentText,
         onProgress,
         [...currentCallStack, sequenceName],
@@ -28763,8 +28834,10 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
         // Pass bound arguments
         apiDefinitions,
         // Pass API definitions for endpoint resolution
-        tagFilterOptions
+        tagFilterOptions,
         // Pass tag filter options for nested sequence filtering
+        sequenceSources
+        // Pass sequence sources for nested sequences
       );
       reportProgress(stepIdx, "sequenceEnd", `Finished sequence ${sequenceName}`, void 0, sequenceName);
       for (const subResponse of subResult.responses) {
@@ -30499,7 +30572,7 @@ function formatCaseLabel(params) {
   });
   return `[${parts.join(", ")}]`;
 }
-async function runAllSequences(fileContent, variables, cookieJar, workingDir, apiDefinitions, tagFilterOptions) {
+async function runAllSequences(fileContent, variables, cookieJar, workingDir, apiDefinitions, tagFilterOptions, sequenceSources) {
   const allSequences = extractSequences(fileContent);
   const results = [];
   const testSequences = allSequences.filter((seq) => seq.isTest);
@@ -30543,7 +30616,8 @@ async function runAllSequences(fileContent, variables, cookieJar, workingDir, ap
           void 0,
           caseArgs,
           apiDefinitions,
-          tagFilterOptions
+          tagFilterOptions,
+          sequenceSources
         );
         result.name = `${seq.name}${caseLabel}`;
         results.push(result);
@@ -30567,7 +30641,8 @@ async function runAllSequences(fileContent, variables, cookieJar, workingDir, ap
         void 0,
         defaultArgs,
         apiDefinitions,
-        tagFilterOptions
+        tagFilterOptions,
+        sequenceSources
       );
       result.name = seq.name;
       results.push(result);
@@ -30742,7 +30817,8 @@ ${fileContent}` : fileContent;
         void 0,
         defaultArgs,
         apiDefinitions,
-        tagFilterOptions
+        tagFilterOptions,
+        importResult.sequenceSources
       );
       seqResult.name = targetSeq.name;
       if (options.output === "json") {
@@ -30823,7 +30899,7 @@ ${fileContent}` : fileContent;
 \u2501\u2501\u2501 ${relPath} \u2501\u2501\u2501`));
     }
     const apiDefinitions = (importResult.headerGroups?.length || 0) > 0 || (importResult.endpoints?.length || 0) > 0 ? { headerGroups: importResult.headerGroups || [], endpoints: importResult.endpoints || [] } : void 0;
-    const seqResults = await runAllSequences(fileContentWithImports, variables, cookieJar, workingDir, apiDefinitions, tagFilterOptions);
+    const seqResults = await runAllSequences(fileContentWithImports, variables, cookieJar, workingDir, apiDefinitions, tagFilterOptions, importResult.sequenceSources);
     for (const result2 of seqResults) {
       result2.sourceFile = filePath;
       allResults.push(result2);

package/package.json

@@ -2,7 +2,7 @@
   "name": "norn-cli",
   "displayName": "Norn - REST Client",
   "description": "A powerful REST client for making HTTP requests with sequences, variables, scripts, and cookie support",
-  "version": "1.3.11",
+  "version": "1.3.13",
   "publisher": "Norn-PeterKrustanov",
   "author": {
     "name": "Peter Krastanov"