norn-cli 1.3.15 → 1.3.17

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to the "Norn" extension will be documented in this file.
 
+## [1.3.17] - 2026-02-14
+
+### Fixed
+- **Import Resolution**: Improved duplicate import handling while preserving circular import detection
+  - Re-importing already loaded files is now treated as a no-op instead of a false circular error
+  - True cycles are still detected via active import stack tracking
+- **Sequence Var-Request Parsing**: Fixed multi-line `var x = METHOD ...` request collection
+  - Headers and JSON/form bodies are now preserved until the next real command boundary
+  - Body-only shorthand continues to parse correctly
+- **Syntax Highlighting**: Improved `var` request URL/header/body highlighting in `.norn` files
+  - Better distinction between endpoint captures and raw URL captures
+  - Header groups and body lines now color consistently in URL-style var requests
+
+## [1.3.16] - 2026-02-13
+
+### Fixed
+- **IntelliSense**: Additional completion fixes and reliability improvements
+
 ## [1.3.15] - 2026-02-13
 
 ### Fixed

package/dist/cli.js

@@ -20075,50 +20075,45 @@ function getNamedRequest(text, name) {
     (r) => r.name === name || r.name.toLowerCase() === name.toLowerCase()
   );
 }
-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);
-    }
-    variables[match[1]] = value;
-  }
-  return variables;
+var RUNTIME_VARIABLE_VALUE_PATTERNS = [
+  /^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)
+];
+function isRuntimeComputedVariableValue(value) {
+  return RUNTIME_VARIABLE_VALUE_PATTERNS.some((pattern) => pattern.test(value));
+}
+function isSequenceStartDeclaration(line2) {
+  return /^(?:test\s+)?sequence\s+[a-zA-Z_][a-zA-Z0-9_-]*(?:\s*\([^)]*\))?\s*$/i.test(line2);
+}
+function isSequenceEndDeclaration(line2) {
+  return /^end\s+sequence\s*$/i.test(line2);
 }
 function extractFileLevelVariables(text) {
   const variables = {};
   const lines = text.split("\n");
   const variableRegex = /^\s*var\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.+)$/;
-  let inSequence = false;
+  let sequenceDepth = 0;
   for (const line2 of lines) {
     const trimmed = line2.trim();
-    if (/^sequence\s+[a-zA-Z_][a-zA-Z0-9_-]*$/.test(trimmed)) {
-      inSequence = true;
+    if (isSequenceStartDeclaration(trimmed)) {
+      sequenceDepth++;
       continue;
     }
-    if (trimmed === "end sequence") {
-      inSequence = false;
+    if (isSequenceEndDeclaration(trimmed)) {
+      sequenceDepth = Math.max(0, sequenceDepth - 1);
       continue;
     }
-    if (!inSequence) {
+    if (sequenceDepth === 0) {
       const match = line2.match(variableRegex);
       if (match) {
         let value = match[2].trim();
+        if (isRuntimeComputedVariableValue(value)) {
+          continue;
+        }
         if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
           value = value.slice(1, -1);
         }
@@ -20278,7 +20273,7 @@ function extractImports(text) {
   }
   return imports;
 }
-async function resolveImports(text, baseDir, readFile2, alreadyImported = /* @__PURE__ */ new Set()) {
+async function resolveImports(text, baseDir, readFile2, alreadyImported = /* @__PURE__ */ new Set(), importStack = /* @__PURE__ */ new Set()) {
   const imports = extractImports(text);
   const errors = [];
   const importedContents = [];
@@ -20292,7 +20287,7 @@ async function resolveImports(text, baseDir, readFile2, alreadyImported = /* @__
   for (const imp of imports) {
     const path5 = await import("path");
     const absolutePath = path5.resolve(baseDir, imp.path);
-    if (alreadyImported.has(absolutePath)) {
+    if (importStack.has(absolutePath)) {
       errors.push({
         path: imp.path,
         error: `Circular import detected`,
@@ -20300,9 +20295,13 @@ async function resolveImports(text, baseDir, readFile2, alreadyImported = /* @__
       });
       continue;
     }
+    if (alreadyImported.has(absolutePath)) {
+      continue;
+    }
     try {
       const content = await readFile2(absolutePath);
       alreadyImported.add(absolutePath);
+      importStack.add(absolutePath);
       resolvedPaths.push(absolutePath);
       if (imp.path.endsWith(".nornapi")) {
         const apiDef = parseNornApiFile(content);
@@ -20335,7 +20334,7 @@ async function resolveImports(text, baseDir, readFile2, alreadyImported = /* @__
         continue;
       }
       const importDir = path5.dirname(absolutePath);
-      const nestedResult = await resolveImports(content, importDir, readFile2, alreadyImported);
+      const nestedResult = await resolveImports(content, importDir, readFile2, alreadyImported, importStack);
       errors.push(...nestedResult.errors);
       resolvedPaths.push(...nestedResult.resolvedPaths);
       for (const group of nestedResult.headerGroups) {
@@ -20367,7 +20366,7 @@ async function resolveImports(text, baseDir, readFile2, alreadyImported = /* @__
       if (nestedResult.importedContent) {
         importedContents.push(nestedResult.importedContent);
       }
-      const importedVariables = extractVariables(content);
+      const importedVariables = extractFileLevelVariables(content);
       const importedNamedRequests = extractNamedRequests(content);
       const importedSequences = extractSequencesFromText(content);
       for (const req of importedNamedRequests) {
@@ -20409,6 +20408,8 @@ end sequence`);
         error: error.message || "Failed to read file",
         lineNumber: imp.lineNumber
       });
+    } finally {
+      importStack.delete(absolutePath);
     }
   }
   return {
@@ -27575,6 +27576,7 @@ function extractStepsFromSequence(content) {
   const lines = content.split("\n");
   const steps = [];
   const methodRegex = /^(GET|POST|PUT|DELETE|PATCH|HEAD|OPTIONS)\s+/i;
+  const stepBoundaryRegex = /^(###|(GET|POST|PUT|DELETE|PATCH|HEAD|OPTIONS)\s+|(test\s+)?sequence\s+|end\s+sequence|end\s+if|endif\b|var\s+|run\s+|print\s+|assert\s+|if\s+|wait\s+|import\s+|return\s+|\[)/i;
   let currentRequest = [];
   let currentRequestStartLine = -1;
   let inRequest = false;
@@ -27824,11 +27826,11 @@ function extractStepsFromSequence(content) {
       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 {
+      if (trimmed !== "" && stepBoundaryRegex.test(trimmed)) {
         savePendingVarRequest();
         lineIdx--;
+      } else {
+        currentVarRequest.push(trimmed);
       }
     } else if (inRequest) {
       if (trimmed.match(/^var\s+[a-zA-Z_][a-zA-Z0-9_]*\s*=\s*\$\d+/)) {
@@ -28328,9 +28330,15 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
         }
         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 extraLines = contentLines.slice(1).map((line2) => substituteVariables(line2, runtimeVariables));
+          const hasExplicitBlank = extraLines.some((line2) => line2.trim() === "");
+          const firstNonEmpty = extraLines.find((line2) => line2.trim() !== "");
+          const startsWithHeader = firstNonEmpty ? /^[A-Za-z0-9\-_]+\s*:/.test(firstNonEmpty.trim()) : false;
+          if (hasExplicitBlank || startsWithHeader) {
+            requestText += "\n" + extraLines.join("\n");
+          } else {
+            requestText += "\n\n" + extraLines.join("\n");
+          }
         }
         const requestParsed = parserHttpRequest(requestText, runtimeVariables);
         const retryOpts = parsed.retryCount ? {

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