norn-cli 1.3.3 → 1.3.5

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to the "Norn" extension will be documented in this file.
 
+## [1.3.5] - 2026-02-09
+
+### Fixed
+- **Endpoint Syntax Body Extraction**: Fixed form body not being sent with named requests using endpoint syntax
+  - `[PostFormWithEndpoint]` followed by `POST HttpBinPost Form` and body lines now works correctly
+  - Applies to standalone named requests (outside sequences) using `.nornapi` endpoints
+- **Header Group Syntax Highlighting**: Fixed header group not showing green when on same line as URL
+  - `POST {{url}}/post Form` now correctly colors `Form` as header group
+
+## [1.3.4] - 2026-02-09
+
+### Fixed
+- **Header Groups with Raw URLs**: Header groups now work with regular URL requests, not just endpoint syntax
+  - `GET https://example.com/api Json` now correctly applies the Json header group
+  - Header groups on separate lines after URL also work
+  - Both extension and CLI support this fix
+  - Named requests (`[RequestName]`) also support header groups with raw URLs
+- **CLI Named Requests with Endpoints**: Fixed body not being sent when using endpoint syntax
+  - `POST HttpBinPost Form` with body lines now correctly sends the form data
+- **Syntax Highlighting for Form Parameters**: Added proper coloring for URL-encoded form body parameters
+  - `firstname=Alice` now shows key as parameter (purple), `=` as operator, value as string
+
 ## [1.3.3] - 2026-02-08
 
 ### Fixed

package/dist/cli.js

@@ -26686,6 +26686,64 @@ function parsePropertyAssignment(line2) {
 
 // src/sequenceRunner.ts
 init_assertionRunner();
+function applyHeaderGroupsToRequest(parsed, requestText, headerGroups, variables) {
+  const lines = requestText.split("\n");
+  const headerGroupNames = headerGroups.map((hg) => hg.name);
+  const headerGroupHeaders = {};
+  const foundGroups = [];
+  for (const line2 of lines) {
+    const trimmed = line2.trim();
+    if (!trimmed || trimmed.startsWith("#") || trimmed.startsWith("var ")) {
+      continue;
+    }
+    const methodMatch = trimmed.match(/^(GET|POST|PUT|DELETE|PATCH|HEAD|OPTIONS)\s+(.+)$/i);
+    if (methodMatch) {
+      const afterMethod = methodMatch[2];
+      const tokens = afterMethod.split(/\s+/);
+      for (let i = tokens.length - 1; i >= 0; i--) {
+        if (headerGroupNames.includes(tokens[i])) {
+          foundGroups.push(tokens[i]);
+        } else {
+          break;
+        }
+      }
+      continue;
+    }
+    if (/^[A-Za-z0-9\-_]+\s*:\s*.+$/.test(trimmed)) {
+      continue;
+    }
+    if (trimmed.startsWith("{") || trimmed.startsWith("[") || trimmed.startsWith('"')) {
+      continue;
+    }
+    const potentialGroups = trimmed.split(/\s+/);
+    for (const groupName of potentialGroups) {
+      if (headerGroupNames.includes(groupName)) {
+        foundGroups.push(groupName);
+      }
+    }
+  }
+  for (const groupName of foundGroups) {
+    const group = headerGroups.find((hg) => hg.name === groupName);
+    if (group) {
+      const resolvedHeaders = resolveHeaderValues(group, variables);
+      Object.assign(headerGroupHeaders, resolvedHeaders);
+    }
+  }
+  let modifiedUrl = parsed.url;
+  for (const groupName of foundGroups) {
+    const endPattern = new RegExp(`\\s+${groupName}$`);
+    modifiedUrl = modifiedUrl.replace(endPattern, "");
+  }
+  modifiedUrl = modifiedUrl.trim();
+  const result = {
+    ...parsed,
+    url: modifiedUrl
+  };
+  if (Object.keys(headerGroupHeaders).length > 0) {
+    result.headers = { ...headerGroupHeaders, ...parsed.headers };
+  }
+  return result;
+}
 function isRunNamedRequestCommand(line2) {
   const trimmed = line2.trim();
   if (!trimmed.toLowerCase().startsWith("run ")) {
@@ -28721,10 +28779,16 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
           } else {
             parsed = parserHttpRequest(step.content, runtimeVariables);
             requestDescription = `${parsed.method} ${parsed.url}`;
+            if (apiDefinitions && apiDefinitions.headerGroups.length > 0) {
+              parsed = applyHeaderGroupsToRequest(parsed, step.content, apiDefinitions.headerGroups, runtimeVariables);
+            }
           }
         } else {
           parsed = parserHttpRequest(step.content, runtimeVariables);
           requestDescription = `${parsed.method} ${parsed.url}`;
+          if (apiDefinitions && apiDefinitions.headerGroups.length > 0) {
+            parsed = applyHeaderGroupsToRequest(parsed, step.content, apiDefinitions.headerGroups, runtimeVariables);
+          }
         }
         const { retryCount, backoffMs } = extractRetryOptions(step.content);
         const retryOpts = retryCount ?? parsed.retryCount ? {
@@ -30232,13 +30296,55 @@ async function runSingleRequest(fileContent, variables, cookieJar, apiDefinition
           method: apiRequest.method,
           url: resolvedPath,
           headers: combinedHeaders,
-          body: void 0
+          body: apiRequest.body
         };
         return await sendRequestWithJar(parsed2, cookieJar);
       }
     }
   }
-  const parsed = parserHttpRequest(requestContent, variables);
+  let parsed = parserHttpRequest(requestContent, variables);
+  if (apiDefinitions && apiDefinitions.headerGroups.length > 0) {
+    const headerGroupNames = apiDefinitions.headerGroups.map((hg) => hg.name);
+    const foundGroups = [];
+    for (const line2 of requestLines) {
+      const trimmed = line2.trim();
+      if (!trimmed || trimmed.startsWith("#") || trimmed.startsWith("var ")) {
+        continue;
+      }
+      const methodMatch = trimmed.match(/^(GET|POST|PUT|DELETE|PATCH|HEAD|OPTIONS)\s+(.+)$/i);
+      if (methodMatch) {
+        const afterMethod = methodMatch[2];
+        const tokens = afterMethod.split(/\s+/);
+        for (let i = tokens.length - 1; i >= 0; i--) {
+          if (headerGroupNames.includes(tokens[i])) {
+            foundGroups.push(tokens[i]);
+          } else {
+            break;
+          }
+        }
+        continue;
+      }
+      if (/^[A-Za-z0-9\-_]+\s*:\s*.+$/.test(trimmed)) {
+        continue;
+      }
+      const potentialGroups = trimmed.split(/\s+/);
+      for (const groupName of potentialGroups) {
+        if (headerGroupNames.includes(groupName)) {
+          foundGroups.push(groupName);
+        }
+      }
+    }
+    for (const groupName of foundGroups) {
+      const group = apiDefinitions.headerGroups.find((hg) => hg.name === groupName);
+      if (group) {
+        const resolvedHeaders = resolveHeaderValues(group, variables);
+        parsed.headers = { ...resolvedHeaders, ...parsed.headers };
+      }
+      const endPattern = new RegExp(`\\s+${groupName}$`);
+      parsed.url = parsed.url.replace(endPattern, "");
+    }
+    parsed.url = parsed.url.trim();
+  }
   return await sendRequestWithJar(parsed, cookieJar);
 }
 function discoverNornFiles(dirPath) {

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.3",
+  "version": "1.3.5",
   "publisher": "Norn-PeterKrustanov",
   "author": {
     "name": "Peter Krastanov"