norn-cli 2.4.0 → 2.5.0

package/out/nornenvFoldingProvider.js

@@ -1,63 +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.NornenvFoldingProvider = void 0;
-const vscode = __importStar(require("vscode"));
-const nornenvLanguageModel_1 = require("./nornenvLanguageModel");
-function findLastNonEmptyLine(document, startLine, candidateEndLine) {
-    let endLine = candidateEndLine;
-    while (endLine > startLine && document.lineAt(endLine).text.trim() === '') {
-        endLine--;
-    }
-    return endLine;
-}
-class NornenvFoldingProvider {
-    provideFoldingRanges(document) {
-        const model = (0, nornenvLanguageModel_1.parseNornenvDocumentModel)(document.getText());
-        const ranges = [];
-        for (let index = 0; index < model.sections.length; index++) {
-            const section = model.sections[index];
-            const nextSection = model.sections[index + 1];
-            const candidateEndLine = nextSection ? nextSection.lineNumber - 1 : document.lineCount - 1;
-            const endLine = findLastNonEmptyLine(document, section.lineNumber, candidateEndLine);
-            if (endLine > section.lineNumber) {
-                ranges.push(new vscode.FoldingRange(section.lineNumber, endLine, vscode.FoldingRangeKind.Region));
-            }
-        }
-        return ranges;
-    }
-}
-exports.NornenvFoldingProvider = NornenvFoldingProvider;
-//# sourceMappingURL=nornenvFoldingProvider.js.map

package/out/nornenvHoverProvider.js

@@ -1,114 +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.NornenvHoverProvider = void 0;
-const vscode = __importStar(require("vscode"));
-const environmentParser_1 = require("./environmentParser");
-const environmentProvider_1 = require("./environmentProvider");
-const nornenvLanguageModel_1 = require("./nornenvLanguageModel");
-function buildSelfDeclarationDetail(name, value, sectionKind, sectionName) {
-    if (!sectionKind || !sectionName) {
-        return {
-            name,
-            value,
-            sourceKind: 'common',
-            inherited: false
-        };
-    }
-    return {
-        name,
-        value,
-        sourceKind: sectionKind,
-        sourceName: sectionName,
-        inherited: false
-    };
-}
-class NornenvHoverProvider {
-    provideHover(document, position) {
-        try {
-            const text = document.getText();
-            const model = (0, nornenvLanguageModel_1.parseNornenvDocumentModel)(text);
-            const lineText = document.lineAt(position.line).text;
-            const reference = (0, nornenvLanguageModel_1.getNornenvReferenceAtPosition)(lineText, position.character);
-            const declarationAtCursor = (0, nornenvLanguageModel_1.getNornenvDeclarationAtPosition)(model, position.line, position.character);
-            const variableName = reference?.name ?? declarationAtCursor?.name;
-            if (!variableName) {
-                return undefined;
-            }
-            const filePath = document.uri.scheme === 'file' ? document.uri.fsPath : undefined;
-            const config = (0, nornenvLanguageModel_1.loadResolvedNornenvConfigFromText)(text, filePath);
-            const activeEnvironment = (0, environmentProvider_1.getActiveEnvironment)(filePath);
-            const activeDetails = activeEnvironment
-                ? (0, environmentParser_1.resolveEffectiveEnvVariableDetails)(activeEnvironment, config)
-                : new Map();
-            const containingSection = (0, nornenvLanguageModel_1.getNornenvSectionAtLine)(model, position.line);
-            const sectionInheritedDetails = containingSection
-                ? (0, environmentParser_1.resolveInheritedVariableDetails)(containingSection.name, config)
-                : new Map();
-            let detail = activeDetails.get(variableName) ?? sectionInheritedDetails.get(variableName);
-            if (!detail && declarationAtCursor) {
-                detail = buildSelfDeclarationDetail(declarationAtCursor.name, declarationAtCursor.value, declarationAtCursor.sectionKind, declarationAtCursor.sectionName);
-            }
-            if (!detail) {
-                const markdown = new vscode.MarkdownString(`\`${variableName}\` is not resolved in the active .nornenv context.`);
-                return new vscode.Hover(markdown, new vscode.Range(position, position));
-            }
-            const secret = config.secretNames.has(variableName);
-            const sourceDeclaration = (0, nornenvLanguageModel_1.findNornenvSourceDeclaration)(model, detail);
-            const sourceLabel = (0, nornenvLanguageModel_1.formatNornenvSourceLabel)(detail);
-            const lines = [
-                `**\`${variableName}\`**`,
-                `Defined in \`${sourceLabel}\`${sourceDeclaration ? ` (line ${sourceDeclaration.lineNumber + 1})` : ''}.`
-            ];
-            if (activeEnvironment) {
-                lines.push(`Active env \`${activeEnvironment}\` resolves to \`${(0, nornenvLanguageModel_1.formatNornenvDisplayValue)(detail.value, secret)}\`.`);
-            }
-            else {
-                lines.push(`Value: \`${(0, nornenvLanguageModel_1.formatNornenvDisplayValue)(detail.value, secret)}\`.`);
-            }
-            if (detail.inherited && activeEnvironment) {
-                lines.push(`Inherited by \`env:${activeEnvironment}\`.`);
-            }
-            const markdown = new vscode.MarkdownString(lines.join('\n\n'));
-            markdown.isTrusted = false;
-            return new vscode.Hover(markdown);
-        }
-        catch {
-            return undefined;
-        }
-    }
-}
-exports.NornenvHoverProvider = NornenvHoverProvider;
-//# sourceMappingURL=nornenvHoverProvider.js.map

package/out/nornenvInlayHintsProvider.js

@@ -1,99 +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.NornenvInlayHintsProvider = void 0;
-const vscode = __importStar(require("vscode"));
-const environmentParser_1 = require("./environmentParser");
-const environmentTemplates_1 = require("./environmentTemplates");
-const environmentProvider_1 = require("./environmentProvider");
-const nornenvLanguageModel_1 = require("./nornenvLanguageModel");
-const inlayHintResolver_1 = require("./inlayHintResolver");
-const TEMPLATE_TOKEN_REGEX = /\{\{([^{}]+)\}\}/g;
-class NornenvInlayHintsProvider {
-    emitter = new vscode.EventEmitter();
-    environmentSubscription;
-    onDidChangeInlayHints = this.emitter.event;
-    constructor() {
-        this.environmentSubscription = (0, environmentProvider_1.onDidChangeActiveEnvironment)(() => {
-            this.emitter.fire();
-        });
-    }
-    provideInlayHints(document, range) {
-        const hints = [];
-        try {
-            const filePath = document.uri.scheme === 'file' ? document.uri.fsPath : undefined;
-            const config = (0, nornenvLanguageModel_1.loadResolvedNornenvConfigFromText)(document.getText(), filePath);
-            const activeEnvironment = (0, environmentProvider_1.getActiveEnvironment)(filePath);
-            const variables = activeEnvironment
-                ? (0, environmentParser_1.resolveEffectiveEnvVariables)(activeEnvironment, config)
-                : { ...config.common };
-            const activeEnv = activeEnvironment
-                ? config.environments.find(env => env.name === activeEnvironment)
-                : undefined;
-            (0, environmentTemplates_1.attachEnvironmentTemplateScopes)(variables, config.common, activeEnv?.variables);
-            const model = (0, nornenvLanguageModel_1.parseNornenvDocumentModel)(document.getText());
-            for (const declaration of model.declarations) {
-                if (declaration.lineNumber < range.start.line || declaration.lineNumber > range.end.line) {
-                    continue;
-                }
-                TEMPLATE_TOKEN_REGEX.lastIndex = 0;
-                for (const match of declaration.value.matchAll(TEMPLATE_TOKEN_REGEX)) {
-                    const resolved = (0, inlayHintResolver_1.resolveInlayValueLabel)(match[1], variables, config.secretNames);
-                    if (!resolved) {
-                        // Unresolvable (unknown / response ref / cycle) — diagnostics handle the squiggle.
-                        // We stay quiet inline to avoid clutter.
-                        continue;
-                    }
-                    const tokenEnd = declaration.valueStart + (match.index ?? 0) + match[0].length;
-                    const hint = new vscode.InlayHint(new vscode.Position(declaration.lineNumber, tokenEnd), resolved.label, vscode.InlayHintKind.Parameter);
-                    hint.tooltip = resolved.secret
-                        ? `'${match[1].trim()}' resolves from a secret value.`
-                        : `'${match[1].trim()}' resolves to '${resolved.value}'.`;
-                    hints.push(hint);
-                }
-            }
-        }
-        catch {
-            return [];
-        }
-        return hints;
-    }
-    dispose() {
-        this.environmentSubscription.dispose();
-        this.emitter.dispose();
-    }
-}
-exports.NornenvInlayHintsProvider = NornenvInlayHintsProvider;
-//# sourceMappingURL=nornenvInlayHintsProvider.js.map

package/out/nornenvLanguageModel.js

@@ -1,187 +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.parseNornenvDocumentModel = parseNornenvDocumentModel;
-exports.loadResolvedNornenvConfigFromText = loadResolvedNornenvConfigFromText;
-exports.getNornenvSectionAtLine = getNornenvSectionAtLine;
-exports.getNornenvReferenceAtPosition = getNornenvReferenceAtPosition;
-exports.getNornenvDeclarationAtPosition = getNornenvDeclarationAtPosition;
-exports.findNornenvSourceDeclaration = findNornenvSourceDeclaration;
-exports.formatNornenvSourceLabel = formatNornenvSourceLabel;
-exports.formatNornenvDisplayValue = formatNornenvDisplayValue;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const environmentParser_1 = require("./environmentParser");
-const SECTION_HEADER_REGEX = /^\s*\[(env|template):([a-zA-Z_][a-zA-Z0-9_-]*)(?:\s+extends\s+([^\]]+))?\]\s*$/i;
-const TEMPLATE_TOKEN_REGEX = /\{\{([^{}]+)\}\}/g;
-function parseParentList(clause) {
-    if (!clause) {
-        return [];
-    }
-    return clause
-        .split(',')
-        .map(parent => parent.trim())
-        .filter(parent => /^[a-zA-Z_][a-zA-Z0-9_-]*$/.test(parent));
-}
-function parseTemplateReference(rawReference) {
-    return rawReference.trim().match(/^(?:\$env\.)?([a-zA-Z_][a-zA-Z0-9_]*)$/)?.[1];
-}
-function parseNornenvDocumentModel(text) {
-    const sections = [];
-    const declarations = [];
-    const lines = text.split('\n');
-    let currentSection;
-    for (let lineNumber = 0; lineNumber < lines.length; lineNumber++) {
-        const line = lines[lineNumber];
-        const sectionMatch = line.trim().match(SECTION_HEADER_REGEX);
-        if (sectionMatch) {
-            currentSection = {
-                kind: sectionMatch[1].toLowerCase(),
-                name: sectionMatch[2],
-                parents: parseParentList(sectionMatch[3]),
-                lineNumber
-            };
-            sections.push(currentSection);
-            continue;
-        }
-        const connectionMatch = line.match(/^(\s*)(secret\s+)?connectionString\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.*)$/i);
-        if (connectionMatch) {
-            const displayName = connectionMatch[3];
-            const name = `${displayName}_connectionString`;
-            const nameStart = line.indexOf(displayName);
-            const value = connectionMatch[4];
-            const valueStart = line.length - value.length;
-            declarations.push({
-                name,
-                displayName,
-                value,
-                secret: Boolean(connectionMatch[2]),
-                sectionKind: currentSection?.kind,
-                sectionName: currentSection?.name,
-                lineNumber,
-                nameStart,
-                nameEnd: nameStart + displayName.length,
-                valueStart,
-                valueEnd: line.length
-            });
-            continue;
-        }
-        const variableMatch = line.match(/^(\s*)(secret|var)\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.*)$/i);
-        if (variableMatch) {
-            const name = variableMatch[3];
-            const nameStart = line.indexOf(name);
-            const value = variableMatch[4];
-            const valueStart = line.length - value.length;
-            declarations.push({
-                name,
-                displayName: name,
-                value,
-                secret: variableMatch[2].toLowerCase() === 'secret',
-                sectionKind: currentSection?.kind,
-                sectionName: currentSection?.name,
-                lineNumber,
-                nameStart,
-                nameEnd: nameStart + name.length,
-                valueStart,
-                valueEnd: line.length
-            });
-        }
-    }
-    return { sections, declarations };
-}
-function loadResolvedNornenvConfigFromText(text, filePath) {
-    const parsed = (0, environmentParser_1.parseEnvFile)(text, filePath);
-    if (!filePath) {
-        return parsed;
-    }
-    return (0, environmentParser_1.resolveNornenvImports)(parsed, path.dirname(filePath), filePath, importedPath => fs.readFileSync(importedPath, 'utf-8')).config;
-}
-function getNornenvSectionAtLine(model, lineNumber) {
-    let current;
-    for (const section of model.sections) {
-        if (section.lineNumber > lineNumber) {
-            break;
-        }
-        current = section;
-    }
-    return current;
-}
-function getNornenvReferenceAtPosition(lineText, character) {
-    TEMPLATE_TOKEN_REGEX.lastIndex = 0;
-    for (const match of lineText.matchAll(TEMPLATE_TOKEN_REGEX)) {
-        const start = match.index ?? 0;
-        const end = start + match[0].length;
-        if (character < start || character > end) {
-            continue;
-        }
-        const name = parseTemplateReference(match[1]);
-        if (!name) {
-            return undefined;
-        }
-        return {
-            name,
-            raw: match[0],
-            start,
-            end
-        };
-    }
-    return undefined;
-}
-function getNornenvDeclarationAtPosition(model, lineNumber, character) {
-    return model.declarations.find(declaration => declaration.lineNumber === lineNumber &&
-        character >= declaration.nameStart &&
-        character <= declaration.nameEnd);
-}
-function findNornenvSourceDeclaration(model, detail) {
-    return model.declarations.find(declaration => {
-        if (declaration.name !== detail.name) {
-            return false;
-        }
-        if (detail.sourceKind === 'common') {
-            return !declaration.sectionName;
-        }
-        return declaration.sectionKind === detail.sourceKind && declaration.sectionName === detail.sourceName;
-    });
-}
-function formatNornenvSourceLabel(detail) {
-    if (detail.sourceKind === 'common') {
-        return 'common';
-    }
-    return `${detail.sourceKind}:${detail.sourceName ?? ''}`;
-}
-function formatNornenvDisplayValue(value, secret) {
-    return secret ? '******** (secret)' : value;
-}
-//# sourceMappingURL=nornenvLanguageModel.js.map