norn-cli 1.2.1 → 1.2.3

package/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 All notable changes to the "Norn" extension will be documented in this file.
 
+## [1.2.3] - 2026-02-07
+
+### Added
+- **Duplicate import detection**: Errors shown when importing files with duplicate definitions
+  - Header groups and endpoints from `.nornapi` files
+  - Named requests and sequences from `.norn` files
+  - Blocks execution in CLI, VS Code, and Test Explorer
+  - Red squiggly on import line with descriptive error message
+
+### Fixed
+- **.nornenv validation**: `secret var = value` now shows error (use `secret name = value` instead)
+  - Syntax highlighting marks invalid pattern in red
+  - Diagnostic message explains correct usage
+- **IntelliSense context**: Script types (`bash`, `powershell`, `js`, `readJson`) only appear after `run` keyword
+- **var keyword highlighting**: `var` keyword stays colored while typing variable name
+
+## [1.2.2] - 2026-02-05
+
+### Added
+- **Coverage for sub-sequences**: Coverage now follows `run SequenceName` calls to track API calls in nested sequences
+- **Coverage for named request blocks**: Named request blocks (`[RequestName]`) with hardcoded URLs are now matched to swagger endpoints by URL path
+- **Auto-refresh coverage on save**: Coverage panel updates automatically when `.norn` or `.nornapi` files are saved
+
+### Improved
+- **IntelliSense for .nornapi files**: Content-Type header completions now work in `.nornapi` files (previously only worked in `.norn`)
+
 ## [1.2.1] - 2026-02-03
 
 ### Added

package/dist/cli.js

@@ -13493,6 +13493,10 @@ async function resolveImports(text, baseDir, readFile2, alreadyImported = /* @__
   const resolvedPaths = [];
   const headerGroups = [];
   const endpoints = [];
+  const headerGroupSources = /* @__PURE__ */ new Map();
+  const endpointSources = /* @__PURE__ */ new Map();
+  const namedRequestSources = /* @__PURE__ */ new Map();
+  const sequenceSources = /* @__PURE__ */ new Map();
   for (const imp of imports) {
     const path4 = await import("path");
     const absolutePath = path4.resolve(baseDir, imp.path);
@@ -13510,16 +13514,64 @@ async function resolveImports(text, baseDir, readFile2, alreadyImported = /* @__
       resolvedPaths.push(absolutePath);
       if (imp.path.endsWith(".nornapi")) {
         const apiDef = parseNornApiFile(content);
-        headerGroups.push(...apiDef.headerGroups);
-        endpoints.push(...apiDef.endpoints);
+        for (const group of apiDef.headerGroups) {
+          const existingSource = headerGroupSources.get(group.name);
+          if (existingSource) {
+            errors.push({
+              path: imp.path,
+              error: `Duplicate header group '${group.name}': already defined in '${existingSource}'`,
+              lineNumber: imp.lineNumber
+            });
+          } else {
+            headerGroupSources.set(group.name, imp.path);
+            headerGroups.push(group);
+          }
+        }
+        for (const endpoint of apiDef.endpoints) {
+          const existingSource = endpointSources.get(endpoint.name);
+          if (existingSource) {
+            errors.push({
+              path: imp.path,
+              error: `Duplicate endpoint '${endpoint.name}': already defined in '${existingSource}'`,
+              lineNumber: imp.lineNumber
+            });
+          } else {
+            endpointSources.set(endpoint.name, imp.path);
+            endpoints.push(endpoint);
+          }
+        }
         continue;
       }
       const importDir = path4.dirname(absolutePath);
       const nestedResult = await resolveImports(content, importDir, readFile2, alreadyImported);
       errors.push(...nestedResult.errors);
       resolvedPaths.push(...nestedResult.resolvedPaths);
-      headerGroups.push(...nestedResult.headerGroups);
-      endpoints.push(...nestedResult.endpoints);
+      for (const group of nestedResult.headerGroups) {
+        const existingSource = headerGroupSources.get(group.name);
+        if (existingSource) {
+          errors.push({
+            path: imp.path,
+            error: `Duplicate header group '${group.name}': already defined in '${existingSource}'`,
+            lineNumber: imp.lineNumber
+          });
+        } else {
+          headerGroupSources.set(group.name, imp.path);
+          headerGroups.push(group);
+        }
+      }
+      for (const endpoint of nestedResult.endpoints) {
+        const existingSource = endpointSources.get(endpoint.name);
+        if (existingSource) {
+          errors.push({
+            path: imp.path,
+            error: `Duplicate endpoint '${endpoint.name}': already defined in '${existingSource}'`,
+            lineNumber: imp.lineNumber
+          });
+        } else {
+          endpointSources.set(endpoint.name, imp.path);
+          endpoints.push(endpoint);
+        }
+      }
       if (nestedResult.importedContent) {
         importedContents.push(nestedResult.importedContent);
       }
@@ -13527,15 +13579,37 @@ async function resolveImports(text, baseDir, readFile2, alreadyImported = /* @__
       const importedNamedRequests = extractNamedRequests(content);
       const importedSequences = extractSequencesFromText(content);
       for (const req of importedNamedRequests) {
-        const resolvedContent = substituteVariables(req.content, importedVariables);
-        importedContents.push(`[${req.name}]
+        const lowerName = req.name.toLowerCase();
+        const existingSource = namedRequestSources.get(lowerName);
+        if (existingSource) {
+          errors.push({
+            path: imp.path,
+            error: `Duplicate named request '${req.name}': already defined in '${existingSource}'`,
+            lineNumber: imp.lineNumber
+          });
+        } else {
+          namedRequestSources.set(lowerName, imp.path);
+          const resolvedContent = substituteVariables(req.content, importedVariables);
+          importedContents.push(`[${req.name}]
 ${resolvedContent}`);
+        }
       }
       for (const seq of importedSequences) {
-        const resolvedContent = substituteVariables(seq.content, importedVariables);
-        importedContents.push(`sequence ${seq.name}
+        const lowerName = seq.name.toLowerCase();
+        const existingSource = sequenceSources.get(lowerName);
+        if (existingSource) {
+          errors.push({
+            path: imp.path,
+            error: `Duplicate sequence '${seq.name}': already defined in '${existingSource}'`,
+            lineNumber: imp.lineNumber
+          });
+        } else {
+          sequenceSources.set(lowerName, imp.path);
+          const resolvedContent = substituteVariables(seq.content, importedVariables);
+          importedContents.push(`sequence ${seq.name}
 ${resolvedContent}
 end sequence`);
+        }
       }
     } catch (error) {
       errors.push({
@@ -21228,14 +21302,28 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
         if (endpoint && apiDefinitions) {
           const paramsStr = endpointMatch[2] || "";
           const headerGroupsStr = endpointMatch[3]?.trim() || "";
-          const paramValues = paramsStr ? paramsStr.split(",").map((p) => p.trim().replace(/^["']|["']$/g, "")) : [];
+          const paramTokens = paramsStr ? paramsStr.split(",").map((p) => p.trim()) : [];
           const params = {};
-          endpoint.parameters.forEach((paramName, idx) => {
-            if (paramValues[idx] !== void 0) {
-              const bareResolved = resolveBareVariables(paramValues[idx], runtimeVariables);
-              params[paramName] = substituteVariables(bareResolved, runtimeVariables);
+          const isNamedSyntax = paramTokens.length > 0 && paramTokens[0].includes(":");
+          if (isNamedSyntax) {
+            for (const token of paramTokens) {
+              const kvMatch = token.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*:\s*(.+)$/);
+              if (kvMatch) {
+                const paramName = kvMatch[1];
+                let paramValue = kvMatch[2].trim().replace(/^["']|["']$/g, "");
+                const bareResolved = resolveBareVariables(paramValue, runtimeVariables);
+                params[paramName] = substituteVariables(bareResolved, runtimeVariables);
+              }
             }
-          });
+          } else {
+            endpoint.parameters.forEach((paramName, idx) => {
+              if (paramTokens[idx] !== void 0) {
+                let paramValue = paramTokens[idx].replace(/^["']|["']$/g, "");
+                const bareResolved = resolveBareVariables(paramValue, runtimeVariables);
+                params[paramName] = substituteVariables(bareResolved, runtimeVariables);
+              }
+            });
+          }
           let pathWithVars = substituteVariables(endpoint.path, runtimeVariables);
           for (const paramName of endpoint.parameters) {
             const value = params[paramName];
@@ -21257,7 +21345,7 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
               }
             }
           }
-          requestDescription = `${potentialEndpointName}(${paramValues.join(", ")}) \u2192 ${parsed.method} ${resolvedUrl}`;
+          requestDescription = `${potentialEndpointName}(${paramTokens.join(", ")}) \u2192 ${parsed.method} ${resolvedUrl}`;
         } else {
           resolvedUrl = substituteVariables(parsed.url, runtimeVariables);
           requestDescription = `${parsed.method} ${resolvedUrl}`;
@@ -23389,9 +23477,22 @@ async function main() {
       workingDir,
       async (importPath) => fsPromises.readFile(importPath, "utf-8")
     );
-    for (const err of importResult.errors) {
+    const duplicateErrors = importResult.errors.filter(
+      (err) => err.error.includes("Duplicate header group") || err.error.includes("Duplicate endpoint") || err.error.includes("Duplicate named request") || err.error.includes("Duplicate sequence")
+    );
+    const otherErrors = importResult.errors.filter(
+      (err) => !err.error.includes("Duplicate header group") && !err.error.includes("Duplicate endpoint") && !err.error.includes("Duplicate named request") && !err.error.includes("Duplicate sequence")
+    );
+    for (const err of otherErrors) {
       console.error(colors.warning(`Import warning: ${err.path} - ${err.error}`));
     }
+    if (duplicateErrors.length > 0) {
+      console.error(colors.error("Cannot execute - duplicate definitions found:"));
+      for (const err of duplicateErrors) {
+        console.error(colors.error(`  ${err.path}: ${err.error}`));
+      }
+      process.exit(1);
+    }
     const fileContentWithImports = importResult.importedContent ? `${importResult.importedContent}
 
 ${fileContent}` : fileContent;
@@ -23498,9 +23599,22 @@ ${fileContent}` : fileContent;
       workingDir,
       async (importPath) => fsPromises.readFile(importPath, "utf-8")
     );
-    for (const err of importResult.errors) {
+    const duplicateErrors2 = importResult.errors.filter(
+      (err) => err.error.includes("Duplicate header group") || err.error.includes("Duplicate endpoint") || err.error.includes("Duplicate named request") || err.error.includes("Duplicate sequence")
+    );
+    const otherErrors2 = importResult.errors.filter(
+      (err) => !err.error.includes("Duplicate header group") && !err.error.includes("Duplicate endpoint") && !err.error.includes("Duplicate named request") && !err.error.includes("Duplicate sequence")
+    );
+    for (const err of otherErrors2) {
       console.error(colors.warning(`Import warning: ${err.path} - ${err.error}`));
     }
+    if (duplicateErrors2.length > 0) {
+      console.error(colors.error("Cannot execute - duplicate definitions found:"));
+      for (const err of duplicateErrors2) {
+        console.error(colors.error(`  ${err.path}: ${err.error}`));
+      }
+      process.exit(1);
+    }
     const fileContentWithImports = importResult.importedContent ? `${importResult.importedContent}
 
 ${fileContent}` : fileContent;

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