aws-iam-language-server 0.0.19 → 0.0.20

package/package.json

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

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/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')