aws-iam-language-server 0.0.8 → 0.0.10

package/src/handlers/completion/resource-value.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { ResourceValueLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
+import { type CompletionContext } from './index.ts';
 export declare function completeResourceValue(location: ResourceValueLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/resource-value.js

@@ -2,8 +2,10 @@ import { CompletionItemKind } from 'vscode-languageserver';
 import { partitions } from "../../lib/iam-policy/partitions.js";
 import { ServiceReference } from "../../lib/iam-policy/reference/services.js";
 import { expandActionPattern } from "../../lib/iam-policy/wildcard.js";
+import { partialRange } from "./index.js";
 export function completeResourceValue(location, context) {
     const parts = location.partial.split(':');
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     const statement = context.handler.getStatementContext(context.uri, context.position);
     const statementActions = statement?.Action ?? statement?.NotAction ?? [];
@@ -16,6 +18,7 @@ export function completeResourceValue(location, context) {
             label: arn,
             sortText: `0-${arn}`,
             kind: CompletionItemKind.Value,
+            textEdit: { range, newText: arn },
             detail: `${resource.service}/${resource.name}`,
             documentation: {
                 kind: 'markdown',
@@ -30,6 +33,7 @@ export function completeResourceValue(location, context) {
             items.push({
                 label,
                 kind: CompletionItemKind.Constant,
+                textEdit: { range, newText: label },
             });
         }
     }
@@ -100,9 +104,11 @@ export function completeResourceValue(location, context) {
     }
     else if (parts.length === 5) {
         // suggest account
+        const label = `${location.partial}:`;
         items.push({
-            label: `${location.partial}:`,
+            label,
             kind: CompletionItemKind.Enum,
+            textEdit: { range, newText: label },
             documentation: {
                 kind: 'markdown',
                 value: 'AWS Account ID',
@@ -132,6 +138,7 @@ export function completeResourceValue(location, context) {
             items.push({
                 label,
                 kind: CompletionItemKind.Enum,
+                textEdit: { range, newText: label },
                 detail: resource.name,
                 documentation: {
                     kind: 'markdown',

package/src/handlers/completion/statement-block.d.ts

@@ -1,6 +1,6 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { StatementBlockLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
+import { type CompletionContext } from './index.ts';
 export declare function completeStatementBlock(location: StatementBlockLocation, context: CompletionContext): CompletionList;
 export declare function findHclElement(key: string): {
     policyTypes: Array<"identity" | "resource">;

package/src/handlers/completion/statement-block.js

@@ -1,5 +1,6 @@
 import { CompletionItemKind, MarkupKind } from 'vscode-languageserver';
 import { StatementKeys } from "../../lib/iam-policy/statement-keys.js";
+import { partialRange } from "./index.js";
 export function completeStatementBlock(location, context) {
     const statement = context.handler.getStatementContext(context.uri, context.position);
     const existingKeys = deriveExistingKeys(statement);
@@ -9,6 +10,7 @@ export function completeStatementBlock(location, context) {
         if (element)
             existingGroups.add(element.group);
     }
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     for (const [, element] of Object.entries(StatementKeys)) {
         if (existingKeys.includes(element.hclKey))
@@ -20,6 +22,7 @@ export function completeStatementBlock(location, context) {
         items.push({
             label: element.hclKey,
             kind: CompletionItemKind.Field,
+            textEdit: { range, newText: element.hclKey },
             documentation: {
                 kind: MarkupKind.Markdown,
                 value: element.description,

package/src/handlers/completion/statement-key.d.ts

@@ -1,4 +1,4 @@
 import type { CompletionList } from 'vscode-languageserver';
 import type { StatementKeyLocation } from '../../lib/iam-policy/location.ts';
-import type { CompletionContext } from './index.ts';
+import { type CompletionContext } from './index.ts';
 export declare function completeStatementKey(location: StatementKeyLocation, context: CompletionContext): CompletionList;

package/src/handlers/completion/statement-key.js

@@ -1,5 +1,6 @@
 import { CompletionItemKind, MarkupKind } from 'vscode-languageserver';
 import { StatementKeys } from "../../lib/iam-policy/statement-keys.js";
+import { partialRange } from "./index.js";
 export function completeStatementKey(location, context) {
     const statement = context.handler.getStatementContext(context.uri, context.position);
     const existingKeys = deriveExistingKeys(statement);
@@ -9,6 +10,7 @@ export function completeStatementKey(location, context) {
         if (element)
             existingGroups.add(element.group);
     }
+    const range = partialRange(context.position, location.partial.length);
     const items = [];
     for (const [name, element] of Object.entries(StatementKeys)) {
         if (existingKeys.includes(name))
@@ -20,6 +22,7 @@ export function completeStatementKey(location, context) {
         items.push({
             label: name,
             kind: CompletionItemKind.Field,
+            textEdit: { range, newText: name },
             documentation: {
                 kind: MarkupKind.Markdown,
                 value: element.description,

package/src/handlers/document-link/document-link.d.ts

@@ -0,0 +1,4 @@
+import type { Connection, DocumentLink, DocumentLinkParams, TextDocuments } from 'vscode-languageserver';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
+import type { TreeManager } from '../../lib/treesitter/manager.ts';
+export declare function documentLinkHandler(params: DocumentLinkParams, documents: TextDocuments<TextDocument>, _treeManager: TreeManager, connection: Connection): DocumentLink[];

package/src/handlers/document-link/document-link.js

@@ -0,0 +1,37 @@
+import { ServiceReference } from "../../lib/iam-policy/reference/services.js";
+export function documentLinkHandler(params, documents, _treeManager, connection) {
+    const document = documents.get(params.textDocument.uri);
+    if (!document)
+        return [];
+    const text = document.getText();
+    const links = [];
+    const actionSet = new Set(ServiceReference.getAllActions().map((a) => a.toLowerCase()));
+    const pattern = /[a-z0-9-]+:[A-Za-z0-9*?]+/g;
+    for (const match of text.matchAll(pattern)) {
+        if (!actionSet.has(match[0].toLowerCase()))
+            continue;
+        const [serviceName, actionName] = match[0].split(':');
+        const action = ServiceReference.getAction(serviceName, actionName);
+        if (!action)
+            continue;
+        const index = match.index ?? 0;
+        const start = document.positionAt(index);
+        const end = document.positionAt(index + match[0].length);
+        if (action.iamUrl) {
+            links.push({
+                range: { start, end },
+                target: action.iamUrl,
+                tooltip: 'IAM Actions, Conditions, and Context Keys',
+            });
+        }
+        if (action.operationUrl) {
+            links.push({
+                range: { start, end },
+                target: action.operationUrl,
+                tooltip: 'API Operation Documentation',
+            });
+        }
+    }
+    connection.console.debug(`Found ${links.length} document links in ${params.textDocument.uri}`);
+    return links;
+}

package/src/lib/iam-policy/reference/services.d.ts

@@ -5,7 +5,7 @@ export declare class ServiceReference {
     static getServicePrincipals(): string[];
     static getAllActions(): Array<string>;
     static getAllServices(): Array<string>;
-    static getActionsForService(service: string): Array<string>;
+    static getActionsForService(service: string): Array<Action>;
     static getConditionKeysForActions(actions: string[]): Array<{
         name: string;
         types: string[];

package/src/lib/iam-policy/reference/services.js

@@ -30,7 +30,11 @@ export class ServiceReference {
         return ServiceReference.#allServices;
     }
     static getActionsForService(service) {
-        return Object.keys(ServiceReference.getServiceData(service).actions);
+        return Object.entries(ServiceReference.getServiceData(service).actions).map(([actionName, action]) => {
+            if (!action.name)
+                action.name = `${service}:${actionName}`;
+            return action;
+        });
     }
     static getConditionKeysForActions(actions) {
         const keys = new Map();

package/src/lib/iam-policy/reference/types.d.ts

@@ -43,6 +43,7 @@ export type RawReference = {
 };
 export type ServiceData = {
     name: string;
+    url?: string;
     actions: Record<string, Action>;
     resources: Array<{
         name: string;
@@ -52,6 +53,8 @@ export type ServiceData = {
     conditionKeys: Record<string, ConditionKey>;
 };
 export type Action = {
+    name: string;
+    service: string;
     conditionKeys: Array<string>;
     resources: Array<{
         name: string;
@@ -64,6 +67,8 @@ export type Action = {
     }>;
     dependentActions?: Array<string>;
     permissionOnly?: boolean;
+    operationUrl?: string;
+    iamUrl?: string;
 };
 export type ConditionKey = {
     types: Array<string>;

package/src/lib/treesitter/base.d.ts

@@ -8,6 +8,7 @@ export type CursorContext = {
     keys: string[];
     role: 'key' | 'value';
     partial: string;
+    value: string;
     policyFormat: PolicyFormat;
 };
 export type StatementContext = {

package/src/lib/treesitter/hcl.js

@@ -163,8 +163,8 @@ export class TreeHcl extends TreeBase {
         }
         if (role === null)
             role = 'key';
-        const partial = this.#extractJsonencodePartial(cursorNode, position);
-        return { keys, role, partial };
+        const { partial, value } = this.#extractJsonencodePartialAndValue(cursorNode, position);
+        return { keys, role, partial, value };
     }
     #getObjectElemKey(element) {
         const keyExpression = element.namedChildren.find((child) => child.type === 'expression');
@@ -191,20 +191,21 @@ export class TreeHcl extends TreeBase {
             .map((element) => this.#getObjectElemKey(element))
             .filter((key) => key !== null);
     }
-    #extractJsonencodePartial(node, position) {
+    #extractJsonencodePartialAndValue(node, position) {
         let current = node;
         while (current) {
             if (current.type === 'identifier' || current.type === 'template_literal') {
+                const value = current.text;
                 if (position.line === current.startPosition.row) {
-                    return current.text.slice(0, position.column - current.startPosition.column);
+                    return { partial: value.slice(0, position.column - current.startPosition.column), value };
                 }
-                return current.text;
+                return { partial: value, value };
             }
             if (current.type === 'object' || current.type === 'object_elem')
                 break;
             current = current.parent;
         }
-        return '';
+        return { partial: '', value: '' };
     }
     // ---------------------------------------------------------------------------
     // Block mode — block/body/attribute, snake_case keys
@@ -226,7 +227,7 @@ export class TreeHcl extends TreeBase {
             return this.#pickBestCursorContext(context1, context2);
         }
         // Cursor is on the block itself (outside body span) — statement-key level
-        const partial = this.#extractBlockPartial(node, position);
+        const { partial, value } = this.#extractBlockPartialAndValue(node, position);
         // Check for incomplete attributes on the same line (may be in ERROR nodes
         // when tree-sitter can't parse the body due to a missing value)
         const searchParent = statementBody ?? statementBlock;
@@ -242,6 +243,7 @@ export class TreeHcl extends TreeBase {
                         keys: [id.text],
                         role: 'value',
                         partial: '',
+                        value: '',
                         policyFormat: 'hcl-block',
                     };
                 }
@@ -251,6 +253,7 @@ export class TreeHcl extends TreeBase {
             keys: [],
             role: 'key',
             partial,
+            value,
             policyFormat: 'hcl-block',
         };
     }
@@ -339,8 +342,8 @@ export class TreeHcl extends TreeBase {
         }
         if (role === null)
             role = 'key';
-        const partial = this.#extractBlockPartial(cursorNode, position);
-        return { keys, role, partial };
+        const { partial, value } = this.#extractBlockPartialAndValue(cursorNode, position);
+        return { keys, role, partial, value };
     }
     #findEnclosingBlock(node, blockName, statementBody) {
         let current = node;
@@ -390,20 +393,21 @@ export class TreeHcl extends TreeBase {
     #hasBodyAttribute(body, name) {
         return body.namedChildren.some((child) => child.type === 'attribute' && child.namedChildren.some((id) => id.type === 'identifier' && id.text === name));
     }
-    #extractBlockPartial(node, position) {
+    #extractBlockPartialAndValue(node, position) {
         let current = node;
         while (current) {
             if (current.type === 'identifier' || current.type === 'template_literal') {
+                const value = current.text;
                 if (position.line === current.startPosition.row) {
-                    return current.text.slice(0, position.column - current.startPosition.column);
+                    return { partial: value.slice(0, position.column - current.startPosition.column), value };
                 }
-                return current.text;
+                return { partial: value, value };
             }
             if (current.type === 'body' || current.type === 'attribute' || current.type === 'block')
                 break;
             current = current.parent;
         }
-        return '';
+        return { partial: '', value: '' };
     }
     // ---------------------------------------------------------------------------
     // Shared
@@ -533,20 +537,21 @@ export class TreeHcl extends TreeBase {
         }
         if (!foundStatement || !lastKey || !policyFormat)
             return null;
-        // Extract partial: when the key came from an attribute/object_elem that
-        // contains the quote (e.g., `effect = "`), it's empty. When the cursor node
-        // is inside a string (open quote slurped subsequent lines), extract from the
-        // template_literal. Otherwise extract from ERROR node text.
+        // Extract partial and value: when the key came from an attribute/object_elem
+        // that contains the quote (e.g., `effect = "`), they're empty. When the
+        // cursor node is inside a string (open quote slurped subsequent lines),
+        // extract from the template_literal. Otherwise extract from ERROR node text.
         let partial = '';
+        let value = '';
         if (!lastKeyFromAttribute) {
             if (this.#isInsideQuote(node)) {
-                partial = this.#extractQuotedPartial(node, position);
+                ({ partial, value } = this.#extractQuotedPartialAndValue(node, position));
             }
             else if (nodeBefore && this.#isInsideQuote(nodeBefore)) {
-                partial = this.#extractQuotedPartial(nodeBefore, position);
+                ({ partial, value } = this.#extractQuotedPartialAndValue(nodeBefore, position));
             }
             else {
-                partial = this.#extractPartialFromErrorNode(errorNode, position);
+                ({ partial, value } = this.#extractPartialAndValueFromErrorNode(errorNode, position));
             }
         }
         // Build keys with sub-block prefix when inside a sub-block
@@ -561,6 +566,7 @@ export class TreeHcl extends TreeBase {
             keys,
             role: 'value',
             partial,
+            value,
             policyFormat,
         };
     }
@@ -568,27 +574,29 @@ export class TreeHcl extends TreeBase {
      * Extract partial from inside a quoted string (when the open quote caused
      * tree-sitter to slurp subsequent lines into a string_lit).
      */
-    #extractQuotedPartial(node, position) {
+    #extractQuotedPartialAndValue(node, position) {
         let current = node;
         while (current) {
             if (current.type === 'template_literal') {
+                const value = current.text;
                 if (position.line === current.startPosition.row) {
-                    return current.text.slice(0, position.column - current.startPosition.column);
+                    return { partial: value.slice(0, position.column - current.startPosition.column), value };
                 }
-                return '';
+                return { partial: '', value };
             }
             if (current.type === 'quoted_template_start')
-                return '';
+                return { partial: '', value: '' };
             if (current.type === 'string_lit') {
                 // Cursor is right after the opening quote, no template_literal yet
-                return '';
+                return { partial: '', value: '' };
             }
             current = current.parent;
         }
-        return '';
+        return { partial: '', value: '' };
     }
-    #extractPartialFromErrorNode(errorNode, position) {
+    #extractPartialAndValueFromErrorNode(errorNode, position) {
         let afterColumn = 0;
+        let nextChildColumn = null;
         for (const child of errorNode.children) {
             if (child.startPosition.row !== position.line)
                 continue;
@@ -599,14 +607,20 @@ export class TreeHcl extends TreeBase {
             if (child.endPosition.column <= position.column) {
                 afterColumn = child.endPosition.column;
             }
+            else if (nextChildColumn === null && child.startPosition.column > position.column) {
+                nextChildColumn = child.startPosition.column;
+            }
         }
         const lines = errorNode.text.split('\n');
         const lineIndex = position.line - errorNode.startPosition.row;
         if (lineIndex < 0 || lineIndex >= lines.length)
-            return '';
+            return { partial: '', value: '' };
         const line = lines[lineIndex];
         const startColumn = lineIndex === 0 ? errorNode.startPosition.column : 0;
-        return line.slice(afterColumn - startColumn, position.column - startColumn);
+        const partial = line.slice(afterColumn - startColumn, position.column - startColumn);
+        const valueEnd = nextChildColumn !== null ? nextChildColumn - startColumn : line.length;
+        const value = line.slice(afterColumn - startColumn, valueEnd);
+        return { partial, value };
     }
     #getExpressionIdentifier(expression) {
         const variableExpression = expression.namedChildren.find((child) => child.type === 'variable_expr');

package/src/lib/treesitter/json.js

@@ -122,8 +122,8 @@ export class TreeJson extends TreeBase {
         }
         if (role === null)
             role = 'key';
-        const partial = this.#extractPartial(cursorNode, position);
-        return { keys, role, partial };
+        const { partial, value } = this.#extractPartialAndValue(cursorNode, position);
+        return { keys, role, partial, value };
     }
     /**
      * Walk up from a node to find an object that sits inside a Statement array.
@@ -234,23 +234,24 @@ export class TreeJson extends TreeBase {
         return false;
     }
     /**
-     * Extract the partial text the user has typed, from the nearest string_content
-     * node up to the cursor position.
+     * Extract the partial text (up to cursor) and full value from the nearest
+     * string_content node.
      */
-    #extractPartial(node, position) {
+    #extractPartialAndValue(node, position) {
         let current = node;
         while (current) {
             if (current.type === 'string_content') {
+                const value = current.text;
                 if (position.line === current.startPosition.row) {
-                    return current.text.slice(0, position.column - current.startPosition.column);
+                    return { partial: value.slice(0, position.column - current.startPosition.column), value };
                 }
-                return current.text;
+                return { partial: value, value };
             }
             if (current.type === 'object' || current.type === 'pair')
                 break;
             current = current.parent;
         }
-        return '';
+        return { partial: '', value: '' };
     }
     /**
      * Read string values from a JSON pair's value (string or array of strings).

package/src/lib/treesitter/manager.d.ts

@@ -1,7 +1,9 @@
+import type { Connection } from 'vscode-languageserver';
 import type { TreeBase } from './base.ts';
 export type DocumentFormat = 'yaml' | 'json' | 'hcl';
 export declare class TreeManager {
     #private;
+    constructor(connection: Connection);
     openDocument(uri: string, content: string, languageId: string): Promise<void>;
     updateDocument(uri: string, content: string): Promise<void>;
     closeDocument(uri: string): void;

package/src/lib/treesitter/manager.js

@@ -13,7 +13,12 @@ export class TreeManager {
         hcl: null,
     };
     #uriToFormat = new Map();
+    #connection;
+    constructor(connection) {
+        this.#connection = connection;
+    }
     async openDocument(uri, content, languageId) {
+        this.#connection.console.info(`Opening document: ${uri} with language ID: ${languageId}`);
         const format = TreeManager.#detectFormat(uri, languageId);
         if (!format)
             return;
@@ -24,6 +29,7 @@ export class TreeManager {
         this.#trees[format].openDocument(uri, content);
     }
     async updateDocument(uri, content) {
+        this.#connection.console.debug(`Updating document: ${uri} with length: ${content.length}`);
         const format = this.#uriToFormat.get(uri);
         if (!format)
             return;
@@ -33,6 +39,7 @@ export class TreeManager {
         this.#trees[format].updateDocument(uri, content);
     }
     closeDocument(uri) {
+        this.#connection.console.info(`Closing document: ${uri}`);
         const format = this.#uriToFormat.get(uri);
         if (!format)
             return;