aws-iam-language-server 0.0.19 → 0.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-iam-language-server",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "type": "module",
   "bin": "./src/server.js",
   "publisher": "MichaelBarney",

package/src/handlers/completion/principal-identifier-completions.js

@@ -1,4 +1,5 @@
 import { CompletionItemKind, MarkupKind } from 'vscode-languageserver';
+import { splitArn } from "../../lib/iam-policy/arn.js";
 import { partitions } from "../../lib/iam-policy/partitions.js";
 import { principalTypes } from "../../lib/iam-policy/principals.js";
 import { partialRange } from "./index.js";
@@ -39,7 +40,7 @@ export function completePrincipalIdentifier(principalType, partial, position) {
         }
         return { items, isIncomplete: false };
     }
-    const parts = partial.split(':');
+    const parts = splitArn(partial);
     if (parts.length === 1) {
         if (config.arn.length > 0 && 'arn'.startsWith(partial.toLowerCase())) {
             items.push({
@@ -70,7 +71,7 @@ export function completePrincipalIdentifier(principalType, partial, position) {
         }
     }
     else if (parts.length === 3) {
-        const services = [...new Set(config.arn.map((pattern) => pattern.split(':')[2]))];
+        const services = [...new Set(config.arn.map((pattern) => splitArn(pattern)[2]))];
         for (const service of services) {
             if (`${parts[0]}:${parts[1]}:${service}`.toLowerCase().startsWith(partial.toLowerCase())) {
                 items.push({ label: service, kind: CompletionItemKind.Enum });
@@ -79,8 +80,8 @@ export function completePrincipalIdentifier(principalType, partial, position) {
     }
     else if (parts.length === 4) {
         const service = parts[2];
-        const serviceArns = config.arn.filter((pattern) => pattern.split(':')[2] === service);
-        const hasRegionArn = serviceArns.some((pattern) => pattern.split(':')[3].length > 0);
+        const serviceArns = config.arn.filter((pattern) => splitArn(pattern)[2] === service);
+        const hasRegionArn = serviceArns.some((pattern) => splitArn(pattern)[3].length > 0);
         if (!hasRegionArn) {
             items.push({
                 label: ':',
@@ -118,7 +119,7 @@ export function completePrincipalIdentifier(principalType, partial, position) {
         const region = parts[3];
         const account = parts[4];
         const matching = config.arn.filter((pattern) => {
-            const patternParts = pattern.split(':');
+            const patternParts = splitArn(pattern);
             if (patternParts[2] !== service)
                 return false;
             if (region.length > 0 !== patternParts[3].length > 0)

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

@@ -1,11 +1,12 @@
 import { CompletionItemKind, MarkupKind } from 'vscode-languageserver';
+import { splitArn } from "../../lib/iam-policy/arn.js";
 import { partitions } from "../../lib/iam-policy/partitions.js";
 import { formatResourceDocumentation } from "../../lib/iam-policy/reference/documentation.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 parts = splitArn(location.partial);
     const range = partialRange(context.position, location.partial.length);
     const items = [];
     const statement = context.handler.getStatementContext(context.uri, context.position);
@@ -127,7 +128,7 @@ export function completeResourceValue(location, context) {
         const resources = ServiceReference.getResourcesForActions(expandActionPattern(`${service}:*`));
         for (const resource of resources) {
             for (const arn of resource.arnFormats) {
-                const patternParts = arn.split(':');
+                const patternParts = splitArn(arn);
                 const patternRegion = patternParts[3];
                 const patternAccount = patternParts[4];
                 if (region.length > 0 !== patternRegion.length > 0)

package/src/handlers/diagnostics/resource.js

@@ -1,11 +1,12 @@
 import { isRuleEnabled } from "../../lib/config.js";
+import { splitArn } from "../../lib/iam-policy/arn.js";
 import { isRegionValidForPartition, isValidPartition, partitions } from "../../lib/iam-policy/partitions.js";
 import { ElementValidator } from "./base.js";
 import { createDiagnostic } from "./utils.js";
 const validPartitions = Object.keys(partitions);
 const accountIdPattern = /^\d{12}$/;
 function segmentRange(value, segmentIndex) {
-    const segments = value.text.split(':');
+    const segments = splitArn(value.text);
     let offset = 0;
     for (let i = 0; i < segmentIndex; i++) {
         offset += segments[i].length + 1;
@@ -22,7 +23,7 @@ function validateArn(value) {
     const diagnostics = [];
     if (!text.startsWith('arn:'))
         return [];
-    const segments = text.split(':');
+    const segments = splitArn(text);
     if (segments.length > 1 && isRuleEnabled('INVALID_PARTITION')) {
         const partition = segments[1];
         if (partition === '') {

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

@@ -1,4 +1,5 @@
 import { MarkupKind } from 'vscode-languageserver';
+import { splitArn } from "../../lib/iam-policy/arn.js";
 import { formatPrincipalTypedValueDocumentation, principalTypedValues, } from "../../lib/iam-policy/reference/documentation.js";
 import { ServiceReference } from "../../lib/iam-policy/reference/services.js";
 export function handlePrincipalTypedValueHover(location) {
@@ -35,7 +36,7 @@ export function handlePrincipalTypedValueHover(location) {
             };
         }
         if (location.value.startsWith('arn:')) {
-            const parts = location.value.split(':');
+            const parts = splitArn(location.value);
             const resource = parts.slice(5).join(':');
             if (resource.startsWith('root')) {
                 return {
@@ -77,7 +78,7 @@ export function handlePrincipalTypedValueHover(location) {
     }
     if (principalType === 'Federated') {
         if (location.value.startsWith('arn:')) {
-            const resource = location.value.split(':').slice(5).join(':');
+            const resource = splitArn(location.value).slice(5).join(':');
             if (resource.startsWith('oidc-provider/')) {
                 return {
                     range: location.range,

package/src/lib/iam-policy/arn.d.ts

@@ -5,6 +5,11 @@ export type ArnParts = {
     account: string;
     resource: string;
 };
+/**
+ * Split a string on `:` while preserving `${...}` placeholders intact.
+ * Colons inside `${...}` (e.g. `${AWS::AccountId}`) are not treated as delimiters.
+ */
+export declare function splitArn(arn: string): string[];
 /**
  * Parse an ARN string into its structural components.
  * Returns null if the string is not a valid ARN structure (fewer than 6 colon-separated segments).

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

@@ -1,10 +1,39 @@
+/**
+ * Split a string on `:` while preserving `${...}` placeholders intact.
+ * Colons inside `${...}` (e.g. `${AWS::AccountId}`) are not treated as delimiters.
+ */
+export function splitArn(arn) {
+    const segments = [];
+    let current = '';
+    let depth = 0;
+    for (let i = 0; i < arn.length; i++) {
+        if (arn[i] === '$' && arn[i + 1] === '{') {
+            depth++;
+            current += '${';
+            i++;
+        }
+        else if (depth > 0 && arn[i] === '}') {
+            depth--;
+            current += '}';
+        }
+        else if (depth === 0 && arn[i] === ':') {
+            segments.push(current);
+            current = '';
+        }
+        else {
+            current += arn[i];
+        }
+    }
+    segments.push(current);
+    return segments;
+}
 /**
  * Parse an ARN string into its structural components.
  * Returns null if the string is not a valid ARN structure (fewer than 6 colon-separated segments).
  * Everything after the 5th colon is treated as the resource portion.
  */
 export function parseArn(arn) {
-    const segments = arn.split(':');
+    const segments = splitArn(arn);
     if (segments.length < 6)
         return null;
     if (segments[0] !== 'arn')