aws-iam-language-server 0.0.16 → 0.0.18

package/src/handlers/hover/action-value.js

@@ -1,21 +1,31 @@
 import { MarkupKind } from 'vscode-languageserver';
+import { formatActionDocumentation } from "../../lib/iam-policy/reference/documentation.js";
 import { ServiceReference } from "../../lib/iam-policy/reference/services.js";
-import { formatActionDocumentation } from "../completion/action-value.js";
+import { expandActionPattern } from "../../lib/iam-policy/wildcard.js";
 export function handleActionValueHover(location) {
-    const action = ServiceReference.getAction(location.value);
-    if (!action)
+    const actions = expandActionPattern(location.value);
+    if (actions.length === 0)
         return null;
-    const lines = [`**${action.service}:${action.name}**`];
-    if (action.description)
-        lines.push(action.description);
-    const docs = formatActionDocumentation(action);
-    if (docs)
-        lines.push(docs);
+    if (actions.length > 16) {
+        return {
+            range: location.range,
+            contents: {
+                kind: MarkupKind.Markdown,
+                value: `**${actions.length} actions**`,
+            },
+        };
+    }
+    const docs = [];
+    for (const actionName of actions) {
+        const action = ServiceReference.getAction(actionName);
+        if (action)
+            docs.push(formatActionDocumentation(action));
+    }
     return {
         range: location.range,
         contents: {
             kind: MarkupKind.Markdown,
-            value: lines.join('\n\n'),
+            value: docs.join('\n---\n'),
         },
     };
 }

package/src/handlers/hover/condition-block.js

@@ -1,18 +1,14 @@
 import { MarkupKind } from 'vscode-languageserver';
-const conditionBlockAttributes = {
-    test: 'The condition operator to evaluate (e.g., `StringEquals`, `ArnLike`, `IpAddress`).',
-    variable: 'The condition key to evaluate (e.g., `aws:SourceIp`, `s3:prefix`).',
-    values: 'List of values to compare against the condition key.',
-};
+import { conditionBlockAttributes } from "../../lib/iam-policy/reference/documentation.js";
 export function handleConditionBlockHover(location) {
-    const description = conditionBlockAttributes[location.value];
-    if (!description)
+    const attr = conditionBlockAttributes[location.value];
+    if (!attr)
         return null;
     return {
         range: location.range,
         contents: {
             kind: MarkupKind.Markdown,
-            value: description,
+            value: attr.description,
         },
     };
 }

package/src/handlers/hover/condition-key.js

@@ -1,6 +1,6 @@
 import { MarkupKind } from 'vscode-languageserver';
+import { formatConditionKeyDocumentation } from "../../lib/iam-policy/reference/documentation.js";
 import { ServiceReference } from "../../lib/iam-policy/reference/services.js";
-import { formatConditionKeyDocumentation } from "../completion/condition-key.js";
 const placeholderPattern = /\$\{[^}]+\}/g;
 function patternToRegex(pattern) {
     const escaped = pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
@@ -32,22 +32,25 @@ export function handleConditionKeyHover(location) {
         return null;
     const globalKeys = ServiceReference.getGlobalConditionKeys();
     const service = keyName.split(':')[0];
-    let global = globalKeys.find((k) => k.name === keyName);
+    let globalKey = globalKeys.find((k) => k.name === keyName);
     let conditionKey = service ? ServiceReference.getConditionKey(service, keyName) : undefined;
-    if (!global && !conditionKey) {
+    if (!globalKey && !conditionKey) {
         const match = findByPattern(keyName, globalKeys, service);
         if (!match)
             return null;
-        global = match.global;
+        globalKey = match.global;
         conditionKey = match.conditionKey;
     }
-    const types = conditionKey?.types ?? [];
-    const docs = formatConditionKeyDocumentation(types, global, conditionKey);
+    const keyDocs = [];
+    if (globalKey)
+        keyDocs.push(formatConditionKeyDocumentation(globalKey));
+    if (conditionKey)
+        keyDocs.push(formatConditionKeyDocumentation(conditionKey));
     return {
         range: location.range,
         contents: {
             kind: MarkupKind.Markdown,
-            value: `**${keyName}**\n\n${docs}`,
+            value: keyDocs.join('\n---\n'),
         },
     };
 }

package/src/handlers/hover/condition-operator.js

@@ -1,5 +1,6 @@
 import { MarkupKind } from 'vscode-languageserver';
 import { conditionOperators } from "../../lib/iam-policy/condition-operators.js";
+import { formatConditionOperatorDocumentation } from "../../lib/iam-policy/reference/documentation.js";
 export function handleConditionOperatorHover(location) {
     const operator = conditionOperators[location.value];
     if (!operator)
@@ -8,7 +9,7 @@ export function handleConditionOperatorHover(location) {
         range: location.range,
         contents: {
             kind: MarkupKind.Markdown,
-            value: operator.description,
+            value: formatConditionOperatorDocumentation(operator),
         },
     };
 }

package/src/handlers/hover/effect-value.js

@@ -1,17 +1,14 @@
 import { MarkupKind } from 'vscode-languageserver';
-const effectDescriptions = {
-    Allow: 'Grants access to the specified resources and actions.\n\nBy default, all requests are implicitly denied. An `Allow` overrides implicit denies but never overrides an explicit `Deny`.',
-    Deny: 'Explicitly denies access to the specified resources and actions.\n\nAn explicit `Deny` always takes precedence — it overrides any `Allow` statements, regardless of where they appear.',
-};
+import { effects, formatEffectDocumentation } from "../../lib/iam-policy/reference/documentation.js";
 export function handleEffectValueHover(location) {
-    const description = effectDescriptions[location.value];
-    if (!description)
+    const effect = effects[location.value];
+    if (!effect)
         return null;
     return {
         range: location.range,
         contents: {
             kind: MarkupKind.Markdown,
-            value: description,
+            value: formatEffectDocumentation(effect),
         },
     };
 }

package/src/handlers/hover/index.js

@@ -15,8 +15,7 @@ export function hoverHandler(params, treeManager, connection) {
     const handler = treeManager.getLanguageHandler(params.textDocument.uri);
     if (!handler)
         return null;
-    const position = params.position;
-    const cursorContext = handler.getCursorContext(params.textDocument.uri, position);
+    const cursorContext = handler.getCursorContext(params.textDocument.uri, params.position);
     if (!cursorContext)
         return null;
     const location = resolvePolicyLocation(cursorContext);

package/src/handlers/hover/principal-block.js

@@ -1,17 +1,14 @@
 import { MarkupKind } from 'vscode-languageserver';
-const principalBlockAttributes = {
-    type: 'The type of principal. Valid values: `*`, `AWS`, `Service`, `Federated`, `CanonicalUser`.',
-    identifiers: 'List of principal identifiers. The format depends on the `type` attribute.',
-};
+import { formatPrincipalBlockAttributeDocumentation, principalBlockAttributes, } from "../../lib/iam-policy/reference/documentation.js";
 export function handlePrincipalBlockHover(location) {
-    const description = principalBlockAttributes[location.value];
-    if (!description)
+    const principalBlockAttribute = principalBlockAttributes[location.value];
+    if (!principalBlockAttribute)
         return null;
     return {
         range: location.range,
         contents: {
             kind: MarkupKind.Markdown,
-            value: description,
+            value: formatPrincipalBlockAttributeDocumentation(principalBlockAttribute),
         },
     };
 }

package/src/handlers/hover/principal-type.js

@@ -1,22 +1,14 @@
 import { MarkupKind } from 'vscode-languageserver';
 import { principalTypes } from "../../lib/iam-policy/principals.js";
+import { formatPrincipalTypeDocumentation } from "../../lib/iam-policy/reference/documentation.js";
 export function handlePrincipalTypeHover(location) {
-    if (location.value === '*') {
-        return {
-            range: location.range,
-            contents: {
-                kind: MarkupKind.Markdown,
-                value: '**Public (unauthenticated) access**\n\nMatches all principals, including anonymous users.',
-            },
-        };
-    }
     for (const principalType of Object.values(principalTypes)) {
-        if (principalType.value === location.value) {
+        if (principalType.name === location.value) {
             return {
                 range: location.range,
                 contents: {
                     kind: MarkupKind.Markdown,
-                    value: principalType.description,
+                    value: formatPrincipalTypeDocumentation(principalType),
                 },
             };
         }

package/src/handlers/hover/principal-typed-value.js

@@ -1,4 +1,5 @@
 import { MarkupKind } from 'vscode-languageserver';
+import { formatPrincipalTypedValueDocumentation, principalTypedValues, } from "../../lib/iam-policy/reference/documentation.js";
 import { ServiceReference } from "../../lib/iam-policy/reference/services.js";
 export function handlePrincipalTypedValueHover(location) {
     if (location.value === '*') {
@@ -6,7 +7,7 @@ export function handlePrincipalTypedValueHover(location) {
             range: location.range,
             contents: {
                 kind: MarkupKind.Markdown,
-                value: '**All principals** of this type.',
+                value: formatPrincipalTypedValueDocumentation(principalTypedValues['*']),
             },
         };
     }
@@ -14,12 +15,11 @@ export function handlePrincipalTypedValueHover(location) {
     if (principalType === 'Service') {
         const principals = ServiceReference.getServicePrincipals();
         if (principals.includes(location.value)) {
-            const serviceName = location.value.split('.')[0];
             return {
                 range: location.range,
                 contents: {
                     kind: MarkupKind.Markdown,
-                    value: `**AWS service principal**\n\n\`${location.value}\` — allows the \`${serviceName}\` service to assume this role or access this resource.`,
+                    value: formatPrincipalTypedValueDocumentation(principalTypedValues.Service),
                 },
             };
         }
@@ -30,7 +30,7 @@ export function handlePrincipalTypedValueHover(location) {
                 range: location.range,
                 contents: {
                     kind: MarkupKind.Markdown,
-                    value: `**AWS account**\n\nGrants access to the root user and all IAM identities in account \`${location.value}\`.`,
+                    value: formatPrincipalTypedValueDocumentation(principalTypedValues.Account),
                 },
             };
         }
@@ -42,7 +42,7 @@ export function handlePrincipalTypedValueHover(location) {
                     range: location.range,
                     contents: {
                         kind: MarkupKind.Markdown,
-                        value: `**AWS account root user**\n\nGrants access to the root user of this account. Equivalent to specifying the account ID.`,
+                        value: formatPrincipalTypedValueDocumentation(principalTypedValues.Account),
                     },
                 };
             }
@@ -51,7 +51,7 @@ export function handlePrincipalTypedValueHover(location) {
                     range: location.range,
                     contents: {
                         kind: MarkupKind.Markdown,
-                        value: `**IAM role**\n\n\`${resource}\`\n\nAny identity that assumes this role will have the permissions granted by this statement.`,
+                        value: formatPrincipalTypedValueDocumentation(principalTypedValues.Role),
                     },
                 };
             }
@@ -60,7 +60,7 @@ export function handlePrincipalTypedValueHover(location) {
                     range: location.range,
                     contents: {
                         kind: MarkupKind.Markdown,
-                        value: `**IAM user**\n\n\`${resource}\``,
+                        value: formatPrincipalTypedValueDocumentation(principalTypedValues.User),
                     },
                 };
             }
@@ -69,7 +69,7 @@ export function handlePrincipalTypedValueHover(location) {
                     range: location.range,
                     contents: {
                         kind: MarkupKind.Markdown,
-                        value: `**Assumed role session**\n\n\`${resource}\``,
+                        value: formatPrincipalTypedValueDocumentation(principalTypedValues.RoleSession),
                     },
                 };
             }
@@ -83,7 +83,7 @@ export function handlePrincipalTypedValueHover(location) {
                     range: location.range,
                     contents: {
                         kind: MarkupKind.Markdown,
-                        value: `**OIDC identity provider**\n\n\`${resource}\``,
+                        value: formatPrincipalTypedValueDocumentation(principalTypedValues.FederatedOidc),
                     },
                 };
             }
@@ -92,27 +92,18 @@ export function handlePrincipalTypedValueHover(location) {
                     range: location.range,
                     contents: {
                         kind: MarkupKind.Markdown,
-                        value: `**SAML identity provider**\n\n\`${resource}\``,
+                        value: formatPrincipalTypedValueDocumentation(principalTypedValues.FederatedSaml),
                     },
                 };
             }
         }
-        const knownProviders = {
-            'cognito-identity.amazonaws.com': 'Amazon Cognito identity pool',
-            'www.amazon.com': 'Login with Amazon',
-            'accounts.google.com': 'Google',
-            'graph.facebook.com': 'Facebook',
+        return {
+            range: location.range,
+            contents: {
+                kind: MarkupKind.Markdown,
+                value: formatPrincipalTypedValueDocumentation(principalTypedValues.FederatedIdentity),
+            },
         };
-        const description = knownProviders[location.value];
-        if (description) {
-            return {
-                range: location.range,
-                contents: {
-                    kind: MarkupKind.Markdown,
-                    value: `**Federated identity provider**\n\n${description}`,
-                },
-            };
-        }
     }
     return null;
 }

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

@@ -1,5 +1,6 @@
 import { MarkupKind } from 'vscode-languageserver';
 import { parseArn } from "../../lib/iam-policy/arn.js";
+import { formatResourceDocumentation } from "../../lib/iam-policy/reference/documentation.js";
 import { ServiceReference } from "../../lib/iam-policy/reference/services.js";
 export function handleResourceValueHover(location) {
     if (location.value === '*') {
@@ -17,29 +18,15 @@ export function handleResourceValueHover(location) {
     const resources = ServiceReference.getResources(parsed);
     if (resources.length === 0)
         return null;
-    const lines = [];
-    for (let i = 0; i < resources.length; i++) {
-        lines.push(`**${parsed.service} ${resources[i].name}**`);
-        if (resources[i].arnFormats.length > 0) {
-            lines.push('\n**ARNs**');
-            for (const format of resources[i].arnFormats) {
-                lines.push(`- \`${format}\``);
-            }
-        }
-        if (resources[i].conditionKeys.length > 0) {
-            lines.push('\n**Condition keys**');
-            for (const key of resources[i].conditionKeys) {
-                lines.push(`- \`${key}\``);
-            }
-        }
-        if (i + 1 !== resources.length)
-            lines.push('\n---\n');
+    const docs = [];
+    for (const resource of resources) {
+        docs.push(formatResourceDocumentation(resource));
     }
     return {
         range: location.range,
         contents: {
             kind: MarkupKind.Markdown,
-            value: lines.join('\n'),
+            value: docs.join('\n---\n'),
         },
     };
 }

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

@@ -1,4 +1,5 @@
 import { MarkupKind } from 'vscode-languageserver';
+import { formatStatementElementDocumentation } from "../../lib/iam-policy/reference/documentation.js";
 import { StatementKeys } from "../../lib/iam-policy/statement-keys.js";
 export function handleStatementKeyHover(_connection, location) {
     const statementKey = StatementKeys[location.value];
@@ -8,7 +9,7 @@ export function handleStatementKeyHover(_connection, location) {
         range: location.range,
         contents: {
             kind: MarkupKind.Markdown,
-            value: statementKey.description,
+            value: formatStatementElementDocumentation(statementKey),
         },
     };
 }

package/src/lib/iam-policy/arn.js

@@ -32,7 +32,6 @@ function tokensMatch(a, b) {
         return true;
     if (a.includes('?') || b.includes('?'))
         return true;
-    // Placeholders expect a value — don't match empty strings
     if (a !== '' && b !== '' && (placeholderPattern.test(a) || placeholderPattern.test(b)))
         return true;
     return false;