norn-cli 1.6.2 → 1.7.0

package/CHANGELOG.md

@@ -4,6 +4,24 @@ All notable changes to the "Norn" extension will be documented in this file.
 
 ## [Unreleased]
 
+## [1.7.0] - 2026-03-07
+
+### Added
+- **Explicit Environment Lookup (Extension + CLI)**:
+  - Added `{{$env.name}}` so tests, sequences, endpoints, header groups, and interpolated strings can read directly from the active environment even when a file variable, local variable, or sequence parameter uses the same name.
+  - Added IntelliSense for the `$env` namespace and environment variable suggestions after typing `{{$env.`.
+  - Added diagnostics for invalid `{{$env...}}` references and warnings when local/file/parameter variables shadow environment variables.
+
+### Fixed
+- **Assertion String Literal Escaping**:
+  - Fixed escaped quotes in assertion string literals and quoted `var` expressions so values like `\"{orderId}\"` compare correctly instead of failing with visually identical expected/actual output.
+
+- **Parameterized Test Snippet UX**:
+  - Updated `@data` completion to insert `data()` with the cursor inside the parentheses instead of placeholder values.
+
+- **Decorator Syntax Highlighting**:
+  - Fixed `.norn` syntax coloring so decorator lines such as `@data(...)` keep their highlighting when they follow request blocks like `DELETE ...`.
+
 ## [1.6.2] - 2026-03-07
 
 ### Fixed

package/dist/cli.js

@@ -18783,6 +18783,39 @@ var init_schemaGenerator = __esm({
   }
 });
 
+// src/quotedString.ts
+function decodeQuotedStringLiteral(literal) {
+  if (literal.length < 2) {
+    return literal;
+  }
+  const quoteChar = literal[0];
+  if (quoteChar !== '"' && quoteChar !== "'" || literal[literal.length - 1] !== quoteChar) {
+    return literal;
+  }
+  const inner = literal.slice(1, -1);
+  let decoded = "";
+  for (let i = 0; i < inner.length; i++) {
+    const char = inner[i];
+    if (char !== "\\" || i === inner.length - 1) {
+      decoded += char;
+      continue;
+    }
+    const nextChar = inner[i + 1];
+    if (nextChar === "\\" || nextChar === quoteChar) {
+      decoded += nextChar;
+      i++;
+      continue;
+    }
+    decoded += char;
+  }
+  return decoded;
+}
+var init_quotedString = __esm({
+  "src/quotedString.ts"() {
+    "use strict";
+  }
+});
+
 // src/assertionRunner.ts
 var assertionRunner_exports = {};
 __export(assertionRunner_exports, {
@@ -18806,7 +18839,7 @@ function parseAssertCommand(line2) {
   if (pipeIndex !== -1) {
     message = content.substring(pipeIndex + 1).trim();
     if (message.startsWith('"') && message.endsWith('"') || message.startsWith("'") && message.endsWith("'")) {
-      message = message.slice(1, -1);
+      message = decodeQuotedStringLiteral(message);
     }
     content = content.substring(0, pipeIndex).trim();
   }
@@ -18848,8 +18881,17 @@ function parseAssertCommand(line2) {
 function findUnquotedPipe(str) {
   let inQuote = false;
   let quoteChar = "";
+  let escapeNext = false;
   for (let i = 0; i < str.length; i++) {
     const char = str[i];
+    if (escapeNext) {
+      escapeNext = false;
+      continue;
+    }
+    if (inQuote && char === "\\") {
+      escapeNext = true;
+      continue;
+    }
     if ((char === '"' || char === "'") && !inQuote) {
       inQuote = true;
       quoteChar = char;
@@ -18934,11 +18976,28 @@ function resolveValue(expr, responses, variables, getValueByPath2, responseIndex
       }
     }
   }
-  const varMatch = trimmed.match(/^\{\{([a-zA-Z_][a-zA-Z0-9_]*)\}\}$/);
+  const varMatch = trimmed.match(/^\{\{(\$env|[a-zA-Z_][a-zA-Z0-9_]*)((?:\.[a-zA-Z_][a-zA-Z0-9_]*|\[\d+\])*)\}\}$/);
   if (varMatch) {
     const varName = varMatch[1];
+    const pathPart = varMatch[2] || "";
     if (varName in variables) {
       const varValue = variables[varName];
+      if (pathPart) {
+        if (typeof varValue === "object" && varValue !== null) {
+          const path10 = pathPart.replace(/^\./, "");
+          return { value: getNestedValue2(varValue, path10) };
+        }
+        if (typeof varValue === "string") {
+          try {
+            const parsed = JSON.parse(varValue);
+            const path10 = pathPart.replace(/^\./, "");
+            return { value: getNestedValue2(parsed, path10) };
+          } catch {
+            return { value: void 0, error: `Cannot access path on non-object variable: ${varName}` };
+          }
+        }
+        return { value: void 0, error: `Cannot access path on non-object variable: ${varName}` };
+      }
       if (typeof varValue === "string" && /^-?\d+(\.\d+)?$/.test(varValue)) {
         return { value: parseFloat(varValue) };
       }
@@ -18947,7 +19006,7 @@ function resolveValue(expr, responses, variables, getValueByPath2, responseIndex
     return { value: void 0, error: `Variable {{${varName}}} is not defined` };
   }
   if (trimmed.startsWith('"') && trimmed.endsWith('"') || trimmed.startsWith("'") && trimmed.endsWith("'")) {
-    return { value: trimmed.slice(1, -1) };
+    return { value: decodeQuotedStringLiteral(trimmed) };
   }
   if (/^-?\d+(\.\d+)?$/.test(trimmed)) {
     return { value: parseFloat(trimmed) };
@@ -19227,6 +19286,7 @@ var init_assertionRunner = __esm({
   "src/assertionRunner.ts"() {
     "use strict";
     init_schemaGenerator();
+    init_quotedString();
   }
 });
 
@@ -19850,9 +19910,7 @@ function getEndpoint(definition, name) {
 function resolveHeaderValues(headerGroup, variables) {
   const resolved = {};
   for (const [name, value] of Object.entries(headerGroup.headers)) {
-    resolved[name] = value.replace(/\{\{([a-zA-Z_][a-zA-Z0-9_]*)\}\}/g, (_, varName) => {
-      return variables[varName] ?? `{{${varName}}}`;
-    });
+    resolved[name] = substituteVariables(value, variables);
   }
   return resolved;
 }
@@ -20149,9 +20207,29 @@ function valueToString(value) {
   }
   return String(value);
 }
+var ENV_SCOPE_KEY = "$env";
+function attachEnvironmentScope(variables, envVariables) {
+  if (!envVariables) {
+    return variables;
+  }
+  Object.defineProperty(variables, ENV_SCOPE_KEY, {
+    value: envVariables,
+    enumerable: false,
+    configurable: true,
+    writable: false
+  });
+  return variables;
+}
+function copyEnvironmentScope(target, source) {
+  const envScope = source[ENV_SCOPE_KEY];
+  if (envScope && typeof envScope === "object") {
+    attachEnvironmentScope(target, envScope);
+  }
+  return target;
+}
 function substituteVariables(text, variables) {
   return text.replace(
-    /\{\{(\$\d+|[a-zA-Z_][a-zA-Z0-9_]*)((?:\.[a-zA-Z_][a-zA-Z0-9_-]*|\[\d+\])*)\}\}/g,
+    /\{\{(\$env|\$\d+|[a-zA-Z_][a-zA-Z0-9_]*)((?:\.[a-zA-Z_][a-zA-Z0-9_-]*|\[\d+\])*)\}\}/g,
     (match, varName, pathPart) => {
       if (!(varName in variables)) {
         return match;
@@ -20161,8 +20239,14 @@ function substituteVariables(text, variables) {
         if (pathPart) {
           const path10 = pathPart.replace(/^\./, "");
           const nestedValue = getNestedValue(value, path10);
+          if (nestedValue === void 0 && varName === ENV_SCOPE_KEY) {
+            return match;
+          }
           return valueToString(nestedValue);
         }
+        if (varName === ENV_SCOPE_KEY) {
+          return match;
+        }
         return valueToString(value);
       }
       if (pathPart && typeof value === "string") {
@@ -20170,8 +20254,14 @@ function substituteVariables(text, variables) {
           const parsed = JSON.parse(value);
           const path10 = pathPart.replace(/^\./, "");
           const nestedValue = getNestedValue(parsed, path10);
+          if (nestedValue === void 0 && varName === ENV_SCOPE_KEY) {
+            return match;
+          }
           return valueToString(nestedValue);
         } catch {
+          if (varName === ENV_SCOPE_KEY) {
+            return match;
+          }
           return value;
         }
       }
@@ -26940,7 +27030,7 @@ function formatUserFacingError(error, context) {
 }
 
 // src/requestValidation.ts
-var PLACEHOLDER_REGEX = /\{\{([a-zA-Z_][a-zA-Z0-9_]*)\}\}/g;
+var PLACEHOLDER_REGEX = /\{\{(\$env|\$[0-9]+|[a-zA-Z_][a-zA-Z0-9_]*)((?:\.[a-zA-Z_][a-zA-Z0-9_-]*|\[\d+\])*)\}\}/g;
 function collectUnresolvedPlaceholders(text) {
   if (!text) {
     return [];
@@ -26949,15 +27039,23 @@ function collectUnresolvedPlaceholders(text) {
   let match;
   PLACEHOLDER_REGEX.lastIndex = 0;
   while ((match = PLACEHOLDER_REGEX.exec(text)) !== null) {
-    names.add(match[1]);
+    names.add(match[0]);
   }
   return [...names];
 }
+function extractEnvScopedNames(placeholders) {
+  return placeholders.filter((value) => value.startsWith("{{$env.")).map((value) => value.slice("{{$env.".length, -2).split(/[.[\]]/)[0]).filter(Boolean);
+}
 function buildMissingVariableHint(missingVars, context) {
   const env3 = context?.environment;
+  const envScopedNames = extractEnvScopedNames(missingVars);
+  const unscopedVars = missingVars.filter((value) => !value.startsWith("{{$env."));
   if (env3?.hasEnvFile && env3.availableEnvironments && env3.availableEnvironments.length > 0 && !env3.activeEnvironment) {
     return `A .nornenv file was found but no environment is selected. Select one of: ${env3.availableEnvironments.join(", ")}.`;
   }
+  if (env3?.hasEnvFile && env3.activeEnvironment && envScopedNames.length > 0 && unscopedVars.length === 0) {
+    return `Check that ${envScopedNames.map((v) => `'${v}'`).join(", ")} exist in the active environment '${env3.activeEnvironment}'.`;
+  }
   if (env3?.hasEnvFile && env3.activeEnvironment) {
     return `Check that ${missingVars.map((v) => `'${v}'`).join(", ")} exist in the active environment '${env3.activeEnvironment}' or as file-level variables.`;
   }
@@ -26975,7 +27073,7 @@ function describeUnresolvedLocation(label, vars) {
   if (vars.length === 0) {
     return void 0;
   }
-  return `${label}: unresolved ${vars.length === 1 ? "variable" : "variables"} ${vars.map((v) => `{{${v}}}`).join(", ")}`;
+  return `${label}: unresolved ${vars.length === 1 ? "variable" : "variables"} ${vars.join(", ")}`;
 }
 function shouldValidateBodyPlaceholders(parsed) {
   const method = String(parsed.method || "").toUpperCase();
@@ -26995,7 +27093,7 @@ function validatePreparedRequest(parsed, context) {
     throw new NornError({
       category: "variable-resolution",
       code: "unresolved-request-variables",
-      message: `Request could not be prepared: unresolved ${missingVars.length === 1 ? "variable" : "variables"} ${missingVars.map((v) => `{{${v}}}`).join(", ")}.`,
+      message: `Request could not be prepared: unresolved ${missingVars.length === 1 ? "variable" : "variables"} ${missingVars.join(", ")}.`,
       details,
       hint: buildMissingVariableHint(missingVars, context),
       context: {
@@ -27029,6 +27127,7 @@ function validatePreparedRequest(parsed, context) {
 }
 
 // src/sequenceRunner.ts
+init_quotedString();
 init_assertionRunner();
 function applyHeaderGroupsToRequest(parsed, requestText, headerGroups, variables) {
   const lines = requestText.split("\n");
@@ -27191,7 +27290,7 @@ function parseRunArguments(argsStr) {
     if (namedMatch) {
       let value = namedMatch[2].trim();
       if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
-        value = value.slice(1, -1);
+        value = decodeQuotedStringLiteral(value);
       }
       args.push({
         name: namedMatch[1],
@@ -27200,7 +27299,7 @@ function parseRunArguments(argsStr) {
     } else {
       let value = trimmed;
       if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
-        value = value.slice(1, -1);
+        value = decodeQuotedStringLiteral(value);
       }
       args.push({ value });
     }
@@ -27371,7 +27470,7 @@ function parseSequenceParameters(line2) {
       hasSeenDefault = true;
       let defaultValue = defaultMatch[2].trim();
       if (defaultValue.startsWith('"') && defaultValue.endsWith('"') || defaultValue.startsWith("'") && defaultValue.endsWith("'")) {
-        defaultValue = defaultValue.slice(1, -1);
+        defaultValue = decodeQuotedStringLiteral(defaultValue);
       }
       params.push({
         name: defaultMatch[1],
@@ -27498,7 +27597,7 @@ function parseTypedValue(value) {
     return parseFloat(value);
   }
   if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
-    return value.slice(1, -1);
+    return decodeQuotedStringLiteral(value);
   }
   return value;
 }
@@ -27624,7 +27723,7 @@ function parseVarAssignCommand(line2) {
 function evaluateValueExpression(expr, runtimeVariables) {
   const trimmed = expr.trim();
   if (trimmed.startsWith('"') && trimmed.endsWith('"') || trimmed.startsWith("'") && trimmed.endsWith("'")) {
-    const inner = trimmed.slice(1, -1);
+    const inner = decodeQuotedStringLiteral(trimmed);
     const substituted = substituteVariables(inner, runtimeVariables);
     return { value: substituted };
   }
@@ -27749,7 +27848,7 @@ function resolveBareVariables(text, variables) {
     const resolvedParts = parts.map((part) => {
       const partTrimmed = part.trim();
       if (partTrimmed.startsWith('"') && partTrimmed.endsWith('"') || partTrimmed.startsWith("'") && partTrimmed.endsWith("'")) {
-        return partTrimmed.slice(1, -1);
+        return decodeQuotedStringLiteral(partTrimmed);
       }
       const varMatch = partTrimmed.match(/^([a-zA-Z_][a-zA-Z0-9_]*)((?:\.[a-zA-Z_][a-zA-Z0-9_]*|\[\d+\])*)$/);
       if (varMatch) {
@@ -27775,8 +27874,19 @@ function splitExpressionParts(expr) {
   let current = "";
   let inString = false;
   let stringChar = "";
+  let escapeNext = false;
   for (let i = 0; i < expr.length; i++) {
     const char = expr[i];
+    if (escapeNext) {
+      current += char;
+      escapeNext = false;
+      continue;
+    }
+    if (inString && char === "\\") {
+      current += char;
+      escapeNext = true;
+      continue;
+    }
     if (!inString && (char === '"' || char === "'")) {
       inString = true;
       stringChar = char;
@@ -28232,7 +28342,7 @@ async function runSequenceWithJar(sequenceContent, fileVariables, cookieJar, wor
       });
     }
   };
-  const runtimeVariables = { ...fileVariables, ...sequenceArgs };
+  const runtimeVariables = copyEnvironmentScope({ ...fileVariables, ...sequenceArgs }, fileVariables);
   const buildRequestValidationContext = (stepNumber, method, url2, requestName) => ({
     source: "sequence",
     filePath: executionContext?.filePath,
@@ -28994,19 +29104,13 @@ ${indentMultiline(userMessage)}`;
                   apiRequest.endpointName
                 );
                 if (endpoint) {
-                  let resolvedPath = endpoint.path;
-                  resolvedPath = resolvedPath.replace(/\{\{([a-zA-Z_][a-zA-Z0-9_]*)\}\}/g, (_, varName) => {
-                    return runtimeVariables[varName] !== void 0 ? String(runtimeVariables[varName]) : `{{${varName}}}`;
-                  });
+                  let resolvedPath = substituteVariables(endpoint.path, runtimeVariables);
                   for (const [paramName, paramValue] of Object.entries(apiRequest.params)) {
                     let resolvedValue = paramValue;
                     if (runtimeVariables[paramValue] !== void 0) {
                       resolvedValue = String(runtimeVariables[paramValue]);
-                    } else if (paramValue.startsWith("{{") && paramValue.endsWith("}}")) {
-                      const varName = paramValue.slice(2, -2);
-                      if (runtimeVariables[varName] !== void 0) {
-                        resolvedValue = String(runtimeVariables[varName]);
-                      }
+                    } else {
+                      resolvedValue = substituteVariables(paramValue, runtimeVariables);
                     }
                     resolvedPath = resolvedPath.replace(`{${paramName}}`, resolvedValue);
                   }
@@ -29019,10 +29123,7 @@ ${indentMultiline(userMessage)}`;
                     }
                   }
                   for (const [headerName, headerValue] of Object.entries(apiRequest.inlineHeaders)) {
-                    let resolved = headerValue;
-                    resolved = resolved.replace(/\{\{([a-zA-Z_][a-zA-Z0-9_]*)\}\}/g, (_, varName) => {
-                      return runtimeVariables[varName] !== void 0 ? String(runtimeVariables[varName]) : `{{${varName}}}`;
-                    });
+                    const resolved = substituteVariables(headerValue, runtimeVariables);
                     combinedHeaders[headerName] = resolved;
                   }
                   const bodyParsed = parserHttpRequest(namedRequest.content, runtimeVariables);
@@ -32114,10 +32215,7 @@ async function runSingleRequest(fileContent, variables, cookieJar, apiDefinition
           }
         }
         for (const [headerName, headerValue] of Object.entries(apiRequest.inlineHeaders)) {
-          let resolved = headerValue;
-          resolved = resolved.replace(/\{\{([a-zA-Z_][a-zA-Z0-9_]*)\}\}/g, (_, varName) => {
-            return variables[varName] !== void 0 ? String(variables[varName]) : `{{${varName}}}`;
-          });
+          const resolved = substituteVariables(headerValue, variables);
           combinedHeaders[headerName] = resolved;
         }
         const parsed2 = {
@@ -32408,7 +32506,7 @@ async function main() {
     const redaction2 = createRedactionOptions(combinedSecretNames, combinedSecretValues, !options.noRedact);
     const fileContent = fs10.readFileSync(filePath, "utf-8");
     const fileVariables = extractFileLevelVariables(fileContent);
-    const variables = { ...resolvedEnv.variables, ...fileVariables };
+    const variables = attachEnvironmentScope({ ...resolvedEnv.variables, ...fileVariables }, resolvedEnv.variables);
     const cookieJar = createCookieJar();
     const workingDir = path9.dirname(filePath);
     const importResult = await resolveImports(
@@ -32624,7 +32722,7 @@ ${fileContent}` : fileContent;
     const redaction2 = createRedactionOptions(combinedSecretNames, combinedSecretValues, !options.noRedact);
     const fileContent = fs10.readFileSync(filePath, "utf-8");
     const fileVariables = extractFileLevelVariables(fileContent);
-    const variables = { ...resolvedEnv.variables, ...fileVariables };
+    const variables = attachEnvironmentScope({ ...resolvedEnv.variables, ...fileVariables }, resolvedEnv.variables);
     const cookieJar = createCookieJar();
     const workingDir = path9.dirname(filePath);
     const importResult = await resolveImports(

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