norn-cli 1.4.0 → 1.4.2

package/out/cli.js

@@ -58,18 +58,31 @@ const response_1 = require("./cli/formatters/response");
 const junit_1 = require("./cli/reporters/junit");
 const html_1 = require("./cli/reporters/html");
 const ENV_FILENAME = '.nornenv';
+function getEnvSearchStartDirectory(targetPath) {
+    const resolvedPath = path.resolve(targetPath);
+    try {
+        const stats = fs.statSync(resolvedPath);
+        return stats.isDirectory() ? resolvedPath : path.dirname(resolvedPath);
+    }
+    catch {
+        return path.dirname(resolvedPath);
+    }
+}
 /**
  * Finds .nornenv file relative to a specific file path (for CLI usage)
  */
 function findEnvFileFromPath(filePath) {
-    let dir = path.dirname(filePath);
-    const root = path.parse(dir).root;
-    while (dir !== root) {
+    let dir = getEnvSearchStartDirectory(filePath);
+    while (true) {
         const envPath = path.join(dir, ENV_FILENAME);
         if (fs.existsSync(envPath)) {
             return envPath;
         }
-        dir = path.dirname(dir);
+        const parentDir = path.dirname(dir);
+        if (parentDir === dir) {
+            break;
+        }
+        dir = parentDir;
     }
     return undefined;
 }
@@ -134,6 +147,57 @@ function parseEnvFile(content) {
     }
     return config;
 }
+function resolveEnvironmentForPath(targetPath, selectedEnv) {
+    const envFilePath = findEnvFileFromPath(targetPath);
+    if (!envFilePath) {
+        return {
+            variables: {},
+            secretNames: new Set(),
+            secretValues: new Map(),
+            availableEnvironments: []
+        };
+    }
+    const envContent = fs.readFileSync(envFilePath, 'utf-8');
+    const envConfig = parseEnvFile(envContent);
+    const variables = { ...envConfig.common };
+    const secretNames = new Set(envConfig.secretNames);
+    const secretValues = new Map(envConfig.secretValues);
+    const availableEnvironments = envConfig.environments.map(e => e.name);
+    if (selectedEnv) {
+        const targetEnv = envConfig.environments.find(e => e.name === selectedEnv);
+        if (!targetEnv) {
+            return {
+                envFilePath,
+                variables,
+                secretNames,
+                secretValues,
+                availableEnvironments,
+                envNotFound: selectedEnv
+            };
+        }
+        Object.assign(variables, targetEnv.variables);
+        for (const [name, value] of Object.entries(targetEnv.variables)) {
+            if (secretNames.has(name)) {
+                secretValues.set(name, value);
+            }
+        }
+    }
+    return {
+        envFilePath,
+        variables,
+        secretNames,
+        secretValues,
+        availableEnvironments
+    };
+}
+function mergeSecrets(targetNames, targetValues, sourceNames, sourceValues) {
+    for (const name of sourceNames) {
+        targetNames.add(name);
+    }
+    for (const [name, value] of sourceValues) {
+        targetValues.set(name, value);
+    }
+}
 /**
  * Generate a timestamp string for report filenames
  * Format: YYYY-MM-DD-HHmmss
@@ -576,36 +640,8 @@ async function main() {
     const allErrors = [];
     let overallSuccess = true;
     const startTime = Date.now();
-    // Find env file from the input path (directory or file)
-    const envFilePath = findEnvFileFromPath(inputPath);
-    let envVariables = {};
-    let redaction = (0, redaction_1.createRedactionOptions)(new Set(), new Map(), !options.noRedact);
-    if (envFilePath) {
-        const envContent = fs.readFileSync(envFilePath, 'utf-8');
-        const envConfig = parseEnvFile(envContent);
-        envVariables = { ...envConfig.common };
-        redaction = (0, redaction_1.createRedactionOptions)(envConfig.secretNames, envConfig.secretValues, !options.noRedact);
-        if (options.env) {
-            const targetEnv = envConfig.environments.find(e => e.name === options.env);
-            if (!targetEnv) {
-                console.error(`Error: Environment '${options.env}' not found in .nornenv`);
-                console.error(`Available environments: ${envConfig.environments.map(e => e.name).join(', ') || 'none'}`);
-                process.exit(1);
-            }
-            Object.assign(envVariables, targetEnv.variables);
-            for (const [name, value] of Object.entries(targetEnv.variables)) {
-                if (envConfig.secretNames.has(name)) {
-                    redaction.secretValues.set(name, value);
-                }
-            }
-            if (options.verbose) {
-                console.log(colors.info(`Using environment: ${options.env}`));
-            }
-        }
-    }
-    else if (options.env) {
-        console.error(colors.warning(`Warning: --env specified but no .nornenv file found`));
-    }
+    const combinedSecretNames = new Set();
+    const combinedSecretValues = new Map();
     let tagFilterOptions = undefined;
     if (options.tagFilters.length > 0) {
         tagFilterOptions = {
@@ -627,9 +663,23 @@ async function main() {
     // Single file mode with specific sequence/request
     if (options.sequence || options.request) {
         const filePath = filesToRun[0];
+        const resolvedEnv = resolveEnvironmentForPath(filePath, options.env);
+        if (resolvedEnv.envNotFound) {
+            console.error(`Error: Environment '${resolvedEnv.envNotFound}' not found in .nornenv`);
+            console.error(`Available environments: ${resolvedEnv.availableEnvironments.join(', ') || 'none'}`);
+            process.exit(1);
+        }
+        if (!resolvedEnv.envFilePath && options.env) {
+            console.error(colors.warning(`Warning: --env specified but no .nornenv file found`));
+        }
+        else if (resolvedEnv.envFilePath && options.env && options.verbose) {
+            console.log(colors.info(`Using environment: ${options.env}`));
+        }
+        mergeSecrets(combinedSecretNames, combinedSecretValues, resolvedEnv.secretNames, resolvedEnv.secretValues);
+        const redaction = (0, redaction_1.createRedactionOptions)(combinedSecretNames, combinedSecretValues, !options.noRedact);
         const fileContent = fs.readFileSync(filePath, 'utf-8');
         const fileVariables = (0, parser_1.extractFileLevelVariables)(fileContent);
-        const variables = { ...envVariables, ...fileVariables };
+        const variables = { ...resolvedEnv.variables, ...fileVariables };
         const cookieJar = (0, httpClient_1.createCookieJar)();
         const workingDir = path.dirname(filePath);
         const importResult = await (0, parser_1.resolveImports)(fileContent, workingDir, async (importPath) => fsPromises.readFile(importPath, 'utf-8'));
@@ -748,9 +798,21 @@ async function main() {
     }
     // Run tests from each file
     for (const filePath of filesToRun) {
+        const resolvedEnv = resolveEnvironmentForPath(filePath, options.env);
+        if (resolvedEnv.envNotFound) {
+            console.error(`Error: Environment '${resolvedEnv.envNotFound}' not found in .nornenv`);
+            console.error(`Available environments: ${resolvedEnv.availableEnvironments.join(', ') || 'none'}`);
+            process.exit(1);
+        }
+        if (!resolvedEnv.envFilePath && options.env) {
+            const relPath = isDirectory ? path.relative(inputPath, filePath) : path.basename(filePath);
+            console.error(colors.warning(`Warning: --env specified but no .nornenv file found for ${relPath}`));
+        }
+        mergeSecrets(combinedSecretNames, combinedSecretValues, resolvedEnv.secretNames, resolvedEnv.secretValues);
+        const redaction = (0, redaction_1.createRedactionOptions)(combinedSecretNames, combinedSecretValues, !options.noRedact);
         const fileContent = fs.readFileSync(filePath, 'utf-8');
         const fileVariables = (0, parser_1.extractFileLevelVariables)(fileContent);
-        const variables = { ...envVariables, ...fileVariables };
+        const variables = { ...resolvedEnv.variables, ...fileVariables };
         const cookieJar = (0, httpClient_1.createCookieJar)();
         const workingDir = path.dirname(filePath);
         const importResult = await (0, parser_1.resolveImports)(fileContent, workingDir, async (importPath) => fsPromises.readFile(importPath, 'utf-8'));
@@ -817,6 +879,7 @@ async function main() {
         }
     }
     const totalDuration = Date.now() - startTime;
+    const redaction = (0, redaction_1.createRedactionOptions)(combinedSecretNames, combinedSecretValues, !options.noRedact);
     // Build result object for reporting
     const result = {
         success: overallSuccess,

package/out/codeLensProvider.js

@@ -38,16 +38,13 @@ exports.updateCodeLensCoverage = updateCodeLensCoverage;
 const vscode = __importStar(require("vscode"));
 const environmentProvider_1 = require("./environmentProvider");
 // Cached coverage percentage for CodeLens display
-let cachedCoveragePercentage = null;
-let cachedCoverageTotal = 0;
-let cachedCoverageCovered = 0;
 /**
  * Update the cached coverage for CodeLens display
  */
 function updateCodeLensCoverage(percentage, total, covered) {
-    cachedCoveragePercentage = percentage;
-    cachedCoverageTotal = total;
-    cachedCoverageCovered = covered;
+    void percentage;
+    void total;
+    void covered;
 }
 /**
  * Checks if a sequence declaration has only optional parameters (all have defaults).
@@ -115,13 +112,13 @@ class HttpCodeLensProvider {
      * Gets the environment display text for CodeLens
      * Returns 'add' if no env file exists, environment name if it does
      */
-    getEnvDisplay() {
-        const envFile = (0, environmentProvider_1.findEnvFile)();
+    getEnvDisplay(documentPath) {
+        const envFile = (0, environmentProvider_1.findEnvFileFromPath)(documentPath);
         if (!envFile) {
             return { text: '+ Add env file', hasEnvFile: false };
         }
         const activeEnv = (0, environmentProvider_1.getActiveEnvironment)();
-        const availableEnvs = (0, environmentProvider_1.getAvailableEnvironments)();
+        const availableEnvs = (0, environmentProvider_1.getAvailableEnvironments)(envFile);
         if (availableEnvs.length === 0) {
             return { text: 'env: (empty)', hasEnvFile: true };
         }
@@ -137,7 +134,7 @@ class HttpCodeLensProvider {
         // Match matchesSchema assertions: assert $1.body matchesSchema "./schema.json"
         // Note: .+? is non-greedy to not consume matchesSchema
         const matchesSchemaRegex = /^\s*assert\s+.+?\s+matchesSchema\s+["']?([^"']+)["']?/i;
-        const envInfo = this.getEnvDisplay();
+        const envInfo = this.getEnvDisplay(document.uri.fsPath);
         const isNornApiFile = document.languageId === 'nornapi';
         const isNornFile = document.languageId === 'norn';
         // Track if we're inside a sequence
@@ -163,16 +160,13 @@ class HttpCodeLensProvider {
                         arguments: [swaggerMatch[1], document.uri.fsPath],
                         tooltip: 'Generate JSON Schema files from OpenAPI response definitions'
                     }));
-                    // Add coverage CodeLens if we have coverage data
-                    if (cachedCoveragePercentage !== null) {
-                        const coverageIcon = cachedCoveragePercentage >= 80 ? '$(pass)' :
-                            cachedCoveragePercentage >= 50 ? '$(warning)' : '$(error)';
-                        codeLenses.push(new vscode.CodeLens(range, {
-                            title: `${coverageIcon} Coverage: ${cachedCoveragePercentage}% (${cachedCoverageCovered}/${cachedCoverageTotal})`,
-                            command: 'norn.showCoverage',
-                            tooltip: `API Coverage: ${cachedCoverageCovered} of ${cachedCoverageTotal} response codes tested. Click to view details.`
-                        }));
-                    }
+                    // Add file-scoped coverage CodeLens
+                    codeLenses.push(new vscode.CodeLens(range, {
+                        title: '$(graph) Show Coverage',
+                        command: 'norn.showCoverage',
+                        arguments: [document.uri.fsPath],
+                        tooltip: 'Show API coverage for this .nornapi file (includes this folder and subfolders only).'
+                    }));
                     continue;
                 }
             }