fix: Fix path and aliases imports

Author: kevinwang5658

src/resources/asdf/asdf.ts

@@ -27,7 +27,7 @@ export class AsdfResource extends Resource<AsdfConfig> {
       schema,
       parameterSettings: {
         plugins: { type: 'stateful', definition: new AsdfPluginsParameter() },
-      }
+      },
     }
   }
 

src/resources/shell/aliases/aliases-resource.ts

@@ -54,7 +54,7 @@ export class AliasesResource extends Resource<AliasesConfig> {
             current.filter((c) => desired.some((d) => d.alias === c.alias)),
           canModify: true,
         },
-        declarationsOnly: { default: false, setting: true },
+        declarationsOnly: { default: true, setting: true },
       },
       importAndDestroy: {
         refreshMapper(input) {

src/resources/shell/path/path-resource.test.ts

@@ -94,4 +94,20 @@ export PATH=/Users/kevinwang/.nvm/.bin/3:$PATH;
 
   })
 
+  it('Can match path declarations with ${VAR:-default} syntax', () => {
+    const pathResource = new PathResource();
+
+    const result = pathResource.findAllPathDeclarations(
+      `
+export PATH="\${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"
+`);
+
+    expect(result).toMatchObject([
+      {
+        declaration: 'export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"',
+        path: '${ASDF_DATA_DIR:-$HOME/.asdf}/shims'
+      }
+    ])
+  })
+
 })

src/resources/shell/path/path-resource.ts

@@ -27,7 +27,6 @@ export interface PathConfig extends StringIndexedObject {
 
 export class PathResource extends Resource<PathConfig> {
   private readonly PATH_DECLARATION_REGEX = /((export PATH=)|(path+=\()|(path=\())(.+?)[\n;]/g;
-  private readonly PATH_REGEX = /(?<=[="':(])([^"'\n\r]+?)(?=["':)\n;])/g
   private readonly filePaths = Utils.getShellRcFiles()
 
   getSettings(): ResourceSettings<PathConfig> {
@@ -237,24 +236,61 @@ export class PathResource extends Resource<PathConfig> {
 
     for (const declaration of pathDeclarations) {
       const trimmedDeclaration = declaration[0];
-      const paths = trimmedDeclaration.matchAll(this.PATH_REGEX);
+      // Extract the value portion after the = or ( and strip surrounding quotes/parens
+      const valueMatch = trimmedDeclaration.match(/(?:export PATH=|path\+=\(|path=\()(["']?)(.+?)\1[\n;)]/s);
+      if (!valueMatch) {
+        continue;
+      }
+      const value = valueMatch[2];
+      const paths = this.splitPathValue(value);
 
-      for (const path of paths) {
-        const trimmedPath = path[0];
-        if (trimmedPath === '$PATH') {
+      for (const p of paths) {
+        if (!p || p.trim() === '' || p === '$PATH') {
           continue;
         }
 
         results.push({
           declaration: trimmedDeclaration.trim(),
-          path: trimmedPath,
+          path: p,
         });
       }
     }
 
     return results;
   }
 
+  // Split a PATH value by ':' but treat ':' inside ${...} as literal
+  private splitPathValue(value: string): string[] {
+    const segments: string[] = [];
+    let current = '';
+    let depth = 0;
+
+    for (let i = 0; i < value.length; i++) {
+      const ch = value[i];
+      if (ch === '$' && value[i + 1] === '{') {
+        // Skip the '$', let the '{' handler increment depth
+        current += ch;
+      } else if (ch === '{') {
+        depth++;
+        current += ch;
+      } else if (ch === '}' && depth > 0) {
+        depth--;
+        current += ch;
+      } else if (ch === ':' && depth === 0) {
+        segments.push(current);
+        current = '';
+      } else {
+        current += ch;
+      }
+    }
+
+    if (current) {
+      segments.push(current);
+    }
+
+    return segments;
+  }
+
   private async resolvePathWithVariables(pathWithVariables: string): Promise<string> {
     const $ = getPty();
     const { data } = await $.spawnSafe(`echo ${pathWithVariables}`);