norn-cli 1.6.0 → 1.6.2

package/out/httpClient.js

@@ -1,269 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCookieJar = createCookieJar;
-exports.getSharedCookieJar = getSharedCookieJar;
-exports.clearCookies = clearCookies;
-exports.getCookiesForUrl = getCookiesForUrl;
-exports.getAllCookies = getAllCookies;
-exports.sendRequest = sendRequest;
-exports.sendRequestWithJar = sendRequestWithJar;
-const axios_1 = __importDefault(require("axios"));
-const tough_cookie_1 = require("tough-cookie");
-// Shared cookie jar for VS Code extension (persists across requests)
-let sharedCookieJar = new tough_cookie_1.CookieJar();
-/**
- * Creates a fresh cookie jar for isolated execution (CLI, sequences)
- */
-function createCookieJar() {
-    return new tough_cookie_1.CookieJar();
-}
-/**
- * Gets the shared cookie jar
- */
-function getSharedCookieJar() {
-    return sharedCookieJar;
-}
-/**
- * Clears all cookies from the shared jar
- */
-function clearCookies() {
-    sharedCookieJar = new tough_cookie_1.CookieJar();
-}
-/**
- * Gets all cookies from a jar for a specific URL
- */
-async function getCookiesForUrl(url, jar) {
-    const targetJar = jar || sharedCookieJar;
-    try {
-        const cookies = await targetJar.getCookies(url);
-        return cookies.map(cookieToInfo);
-    }
-    catch {
-        return [];
-    }
-}
-/**
- * Gets all cookies from a jar
- */
-async function getAllCookies(jar) {
-    const targetJar = jar || sharedCookieJar;
-    const serialized = await targetJar.serialize();
-    return (serialized.cookies || []).map((c) => ({
-        name: String(c.key || ''),
-        value: String(c.value || ''),
-        domain: String(c.domain || ''),
-        path: String(c.path || '/'),
-        expires: c.expires ? String(c.expires) : undefined,
-        httpOnly: Boolean(c.httpOnly),
-        secure: Boolean(c.secure),
-    }));
-}
-function cookieToInfo(cookie) {
-    return {
-        name: cookie.key,
-        value: cookie.value,
-        domain: cookie.domain || '',
-        path: cookie.path || '/',
-        expires: cookie.expires instanceof Date ? cookie.expires.toISOString() : undefined,
-        httpOnly: cookie.httpOnly || false,
-        secure: cookie.secure || false,
-    };
-}
-/**
- * Sends a request using the shared cookie jar (for VS Code extension)
- */
-async function sendRequest(request, retryOptions) {
-    return sendRequestWithJar(request, sharedCookieJar, retryOptions);
-}
-/**
- * Helper function to wait
- */
-function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-/**
- * Check if a response indicates failure (should retry)
- * Retries on: network errors, 5xx server errors, 429 rate limit
- */
-function shouldRetry(response, error) {
-    // Always retry on network errors
-    if (error)
-        return true;
-    // Retry on server errors (5xx) or rate limiting (429)
-    if (response && (response.status >= 500 || response.status === 429))
-        return true;
-    return false;
-}
-/**
- * Sends a request using a specific cookie jar
- * Manually follows redirects to properly capture Set-Cookie headers at each step
- * Supports automatic retry with linear backoff
- */
-async function sendRequestWithJar(request, jar, retryOptions) {
-    const totalAttempts = (retryOptions?.retryCount ?? 0) + 1; // +1 for initial attempt
-    const backoffMs = retryOptions?.backoffMs ?? 1000;
-    const retriedErrors = [];
-    let lastError = null;
-    let attemptsMade = 0;
-    for (let attempt = 1; attempt <= totalAttempts; attempt++) {
-        attemptsMade = attempt;
-        const startTime = Date.now();
-        const maxRedirects = 10;
-        let redirectCount = 0;
-        let currentUrl = request.url;
-        let currentMethod = request.method;
-        let currentBody = request.body;
-        let finalResponse = null;
-        let sentRequestBody = undefined;
-        let sentRequestHeaders = {};
-        try {
-            while (redirectCount <= maxRedirects) {
-                // Get cookies for current URL
-                const existingCookies = await jar.getCookies(currentUrl);
-                const cookieHeader = existingCookies.map(c => `${c.key}=${c.value}`).join('; ');
-                const headers = { ...request.headers };
-                if (cookieHeader) {
-                    headers['Cookie'] = cookieHeader;
-                }
-                // Determine how to send the body based on Content-Type
-                let data = undefined;
-                if (currentBody) {
-                    const contentType = Object.keys(headers).find((key) => key.toLowerCase() === 'content-type');
-                    const contentTypeValue = contentType ? headers[contentType] : '';
-                    if (contentTypeValue.includes('application/x-www-form-urlencoded')) {
-                        const lines = currentBody.split('\n').map(line => line.trim()).filter(line => line);
-                        const params = lines.map(line => {
-                            if (line.includes('=')) {
-                                const eqIndex = line.indexOf('=');
-                                const key = line.substring(0, eqIndex).trim();
-                                const value = line.substring(eqIndex + 1).trim();
-                                return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
-                            }
-                            const colonIndex = line.indexOf(':');
-                            if (colonIndex > 0) {
-                                const key = line.substring(0, colonIndex).trim();
-                                const value = line.substring(colonIndex + 1).trim();
-                                return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
-                            }
-                            return encodeURIComponent(line);
-                        });
-                        data = params.join('&');
-                    }
-                    else if (contentTypeValue.includes('application/json')) {
-                        try {
-                            data = JSON.parse(currentBody);
-                        }
-                        catch {
-                            data = currentBody;
-                        }
-                    }
-                    else {
-                        try {
-                            data = JSON.parse(currentBody);
-                        }
-                        catch {
-                            data = currentBody;
-                        }
-                    }
-                }
-                // Capture what we're actually sending (for debugging)
-                sentRequestBody = data;
-                sentRequestHeaders = { ...headers };
-                const response = await (0, axios_1.default)({
-                    method: currentMethod,
-                    url: currentUrl,
-                    headers,
-                    data,
-                    timeout: 30000,
-                    maxRedirects: 0,
-                    validateStatus: () => true,
-                });
-                // Store any Set-Cookie headers in the jar
-                const setCookieHeader = response.headers['set-cookie'];
-                if (setCookieHeader) {
-                    const cookies = Array.isArray(setCookieHeader) ? setCookieHeader : [setCookieHeader];
-                    for (const cookieStr of cookies) {
-                        try {
-                            await jar.setCookie(cookieStr, currentUrl);
-                        }
-                        catch {
-                            // Ignore invalid cookies
-                        }
-                    }
-                }
-                // Check if this is a redirect
-                if (response.status >= 300 && response.status < 400 && response.headers['location']) {
-                    redirectCount++;
-                    const location = response.headers['location'];
-                    currentUrl = new URL(location, currentUrl).toString();
-                    if (currentMethod !== 'GET' && currentMethod !== 'HEAD') {
-                        currentMethod = 'GET';
-                        currentBody = undefined;
-                    }
-                    continue;
-                }
-                finalResponse = response;
-                break;
-            }
-            if (!finalResponse) {
-                throw new Error('Too many redirects');
-            }
-            // Check if we should retry on this response status
-            if (shouldRetry(finalResponse, null) && attempt < totalAttempts) {
-                const waitMs = backoffMs * attempt; // Linear backoff
-                const errorMessage = `HTTP ${finalResponse.status} ${finalResponse.statusText}`;
-                retriedErrors.push(`Attempt ${attempt}: ${errorMessage}`);
-                // Call retry callback if provided
-                if (retryOptions?.onRetry) {
-                    retryOptions.onRetry(attempt, totalAttempts, errorMessage, waitMs);
-                }
-                await sleep(waitMs);
-                continue;
-            }
-            // Get ALL cookies in the jar
-            const cookies = await getAllCookies(jar);
-            const result = {
-                status: finalResponse.status,
-                statusText: finalResponse.statusText,
-                headers: finalResponse.headers,
-                body: finalResponse.data,
-                duration: Date.now() - startTime,
-                cookies,
-                requestBody: sentRequestBody,
-                requestHeaders: sentRequestHeaders,
-            };
-            // Add retry info if we made retries
-            if (attemptsMade > 1 || totalAttempts > 1) {
-                result.retryInfo = {
-                    attemptsMade,
-                    totalAttempts,
-                    retriedErrors,
-                };
-            }
-            return result;
-        }
-        catch (error) {
-            const errorMessage = error.message || String(error);
-            lastError = new Error(`${errorMessage}\nURL used: ${currentUrl || request.url}`);
-            // If we have more attempts, wait and retry
-            if (attempt < totalAttempts) {
-                const waitMs = backoffMs * attempt; // Linear backoff
-                retriedErrors.push(`Attempt ${attempt}: ${errorMessage}`);
-                // Call retry callback if provided
-                if (retryOptions?.onRetry) {
-                    retryOptions.onRetry(attempt, totalAttempts, errorMessage, waitMs);
-                }
-                await sleep(waitMs);
-                continue;
-            }
-            // No more retries, throw the error
-            throw lastError;
-        }
-    }
-    // Should never reach here, but TypeScript needs this
-    throw lastError || new Error('Request failed');
-}
-//# sourceMappingURL=httpClient.js.map

package/out/jsonFileReader.js

@@ -1,320 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonVariableStore = void 0;
-exports.isJsonCommand = isJsonCommand;
-exports.parseJsonCommand = parseJsonCommand;
-exports.readJsonFile = readJsonFile;
-exports.getNestedValue = getNestedValue;
-exports.setNestedValue = setNestedValue;
-exports.isPropertyAssignment = isPropertyAssignment;
-exports.parsePropertyAssignment = parsePropertyAssignment;
-exports.valueToString = valueToString;
-exports.substituteVariablesWithJson = substituteVariablesWithJson;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-/**
- * Checks if a line is a JSON file command.
- * Formats:
- *   var name = run readJson ./path/to/file.json
- *   var name = run readJson "/path with spaces/file.json"
- */
-function isJsonCommand(line) {
-    const trimmed = line.trim();
-    return /^var\s+[a-zA-Z_][a-zA-Z0-9_]*\s*=\s*run\s+readJson\s+/i.test(trimmed);
-}
-/**
- * Parses a JSON file command line.
- * Format: var <name> = run readJson <path>
- */
-function parseJsonCommand(line) {
-    const trimmed = line.trim();
-    // Match: var varName = run readJson path
-    const match = trimmed.match(/^var\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*run\s+readJson\s+(.+)$/i);
-    if (!match) {
-        return null;
-    }
-    let filePath = match[2].trim();
-    // Remove quotes if present
-    if ((filePath.startsWith('"') && filePath.endsWith('"')) ||
-        (filePath.startsWith("'") && filePath.endsWith("'"))) {
-        filePath = filePath.slice(1, -1);
-    }
-    return {
-        varName: match[1],
-        filePath
-    };
-}
-/**
- * Reads and parses a JSON file.
- */
-function readJsonFile(filePath, workingDir) {
-    // Resolve relative paths
-    const resolvedPath = path.isAbsolute(filePath)
-        ? filePath
-        : path.resolve(workingDir || process.cwd(), filePath);
-    try {
-        if (!fs.existsSync(resolvedPath)) {
-            return {
-                success: false,
-                error: `File not found: ${resolvedPath}`,
-                filePath: resolvedPath
-            };
-        }
-        const content = fs.readFileSync(resolvedPath, 'utf-8');
-        const data = JSON.parse(content);
-        return {
-            success: true,
-            data,
-            filePath: resolvedPath
-        };
-    }
-    catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        return {
-            success: false,
-            error: `Failed to read/parse JSON file: ${message}`,
-            filePath: resolvedPath
-        };
-    }
-}
-/**
- * Gets a value from an object using a dot-notation path.
- * Supports array indexing with brackets: obj.array[0].property
- *
- * @param obj The source object
- * @param path The dot-notation path (e.g., "user.addresses[0].city")
- * @returns The value at the path, or undefined if not found
- */
-function getNestedValue(obj, path) {
-    if (!path || obj === null || obj === undefined) {
-        return obj;
-    }
-    // Convert [0] to .0 and split by dots
-    const parts = path.replace(/\[(\d+)\]/g, '.$1').split('.').filter(p => p !== '');
-    let current = obj;
-    for (const part of parts) {
-        if (current === null || current === undefined) {
-            return undefined;
-        }
-        current = current[part];
-    }
-    return current;
-}
-/**
- * Sets a value in an object using a dot-notation path.
- * Creates intermediate objects/arrays as needed.
- * Supports array indexing with brackets: obj.array[0].property
- *
- * @param obj The source object to modify
- * @param path The dot-notation path (e.g., "user.addresses[0].city")
- * @param value The value to set
- * @returns true if successful, false if the path is invalid
- */
-function setNestedValue(obj, path, value) {
-    if (!path || obj === null || obj === undefined || typeof obj !== 'object') {
-        return false;
-    }
-    // Convert [0] to .0 and split by dots
-    const parts = path.replace(/\[(\d+)\]/g, '.$1').split('.').filter(p => p !== '');
-    if (parts.length === 0) {
-        return false;
-    }
-    let current = obj;
-    for (let i = 0; i < parts.length - 1; i++) {
-        const part = parts[i];
-        const nextPart = parts[i + 1];
-        if (current[part] === undefined || current[part] === null) {
-            // Create intermediate object or array based on next part
-            current[part] = /^\d+$/.test(nextPart) ? [] : {};
-        }
-        current = current[part];
-        if (typeof current !== 'object') {
-            return false; // Can't navigate further
-        }
-    }
-    const lastPart = parts[parts.length - 1];
-    current[lastPart] = value;
-    return true;
-}
-/**
- * Checks if a line is a property assignment command.
- * Format: varName.property.path = value
- *         varName[0].property = value
- */
-function isPropertyAssignment(line) {
-    const trimmed = line.trim();
-    // Match: identifier followed by . or [ then = something
-    // But NOT starting with 'var ' or other keywords
-    return /^[a-zA-Z_][a-zA-Z0-9_]*[\.\[]/.test(trimmed) &&
-        /=/.test(trimmed) &&
-        !trimmed.startsWith('var ') &&
-        !trimmed.startsWith('run ') &&
-        !trimmed.startsWith('print ') &&
-        !trimmed.startsWith('assert ') &&
-        !trimmed.startsWith('sequence ');
-}
-/**
- * Parses a property assignment command.
- * Format: varName.path.to.property = value
- * Returns the variable name, the property path, and the value.
- */
-function parsePropertyAssignment(line) {
-    const trimmed = line.trim();
-    // Match: varName.path = value OR varName[0].path = value
-    const match = trimmed.match(/^([a-zA-Z_][a-zA-Z0-9_]*)((?:\.[a-zA-Z_][a-zA-Z0-9_]*|\[\d+\])+)\s*=\s*(.+)$/);
-    if (!match) {
-        return null;
-    }
-    const varName = match[1];
-    let propertyPath = match[2];
-    const value = match[3].trim();
-    // Remove leading dot if present
-    if (propertyPath.startsWith('.')) {
-        propertyPath = propertyPath.substring(1);
-    }
-    return {
-        varName,
-        propertyPath,
-        value
-    };
-}
-/**
- * Converts a value to a string for use in variable substitution.
- */
-function valueToString(value) {
-    if (value === null) {
-        return 'null';
-    }
-    if (value === undefined) {
-        return '';
-    }
-    if (typeof value === 'object') {
-        return JSON.stringify(value);
-    }
-    return String(value);
-}
-/**
- * Storage for JSON objects loaded during sequence execution.
- * Maps variable names to their parsed JSON data.
- */
-class JsonVariableStore {
-    jsonObjects = new Map();
-    /**
-     * Stores a JSON object under the given variable name.
-     */
-    set(varName, data) {
-        this.jsonObjects.set(varName, data);
-    }
-    /**
-     * Gets the raw JSON object for a variable.
-     */
-    get(varName) {
-        return this.jsonObjects.get(varName);
-    }
-    /**
-     * Checks if a variable is a JSON object.
-     */
-    has(varName) {
-        return this.jsonObjects.has(varName);
-    }
-    /**
-     * Gets a nested value from a JSON variable.
-     * @param varName The variable name
-     * @param path Optional dot-notation path within the object
-     */
-    getValue(varName, path) {
-        const obj = this.jsonObjects.get(varName);
-        if (obj === undefined) {
-            return undefined;
-        }
-        if (!path) {
-            return obj;
-        }
-        return getNestedValue(obj, path);
-    }
-    /**
-     * Clears all stored JSON objects.
-     */
-    clear() {
-        this.jsonObjects.clear();
-    }
-    /**
-     * Gets all variable names that have JSON objects stored.
-     */
-    getVariableNames() {
-        return Array.from(this.jsonObjects.keys());
-    }
-}
-exports.JsonVariableStore = JsonVariableStore;
-/**
- * Substitutes variables in text, with support for JSON object property access.
- * Handles both simple variables {{varName}} and nested access {{varName.property.path}}
- *
- * @param text The text containing variable references
- * @param variables Simple string variables (name -> value)
- * @param jsonStore Optional JSON variable store for complex objects
- */
-function substituteVariablesWithJson(text, variables, jsonStore) {
-    // Match {{varName}} or {{varName.path.to.property}} or {{varName[0].property}}
-    return text.replace(/\{\{([a-zA-Z_][a-zA-Z0-9_]*)((?:\.[a-zA-Z_][a-zA-Z0-9_]*|\[\d+\])*)\}\}/g, (match, varName, pathPart) => {
-        // First check if it's a JSON object with a path
-        if (jsonStore && jsonStore.has(varName)) {
-            const path = pathPart ? pathPart.replace(/^\./, '') : '';
-            const value = jsonStore.getValue(varName, path);
-            return valueToString(value);
-        }
-        // Check if there's a path and we have a simple variable that might be JSON
-        if (pathPart && varName in variables) {
-            // Try to parse the variable value as JSON
-            try {
-                const parsed = JSON.parse(variables[varName]);
-                const path = pathPart.replace(/^\./, '');
-                const value = getNestedValue(parsed, path);
-                return valueToString(value);
-            }
-            catch {
-                // Not JSON, fall through to simple substitution
-            }
-        }
-        // Simple variable substitution
-        if (varName in variables) {
-            return variables[varName];
-        }
-        // Variable not found, return original
-        return match;
-    });
-}
-//# sourceMappingURL=jsonFileReader.js.map