Allow alias, path and git to declare multiple things at once (clean up the config file by alot)

Author: kevinwang5658

package.json

@@ -1,6 +1,6 @@
 {
   "name": "default",
-  "version": "0.16.1",
+  "version": "0.17.0-beta4",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

src/resources/git/repository/git-repository.ts

@@ -116,12 +116,6 @@ export class GitRepositoryResource extends Resource<GitRepositoryConfig> {
         return null;
       }
 
-      console.log('Refresh', {
-        parentDirectory: parameters.parentDirectory,
-        repositories,
-        autoVerifySSH: parameters.autoVerifySSH,
-      })
-
       return {
         parentDirectory: parameters.parentDirectory,
         repositories,
@@ -209,7 +203,7 @@ Please delete ${plan.currentConfig.directory ?? (plan.currentConfig.repositories
 
     const baseUrl = groups!.url!
     const { data: existingKey } = await $.spawnSafe(`ssh-keygen -F ${baseUrl}`)
-    console.log(`Is key blank: ${this.isBlank(existingKey)}`)
+
     if (!this.isBlank(existingKey)) {
       // An existing key is already in the file. Skipping..
       return;

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

@@ -18,6 +18,11 @@ import { Utils } from '../../../utils/index.js';
 
 const ALIAS_REGEX = /^'?([^=]+?)'?='?(.*?)'?$/
 
+interface AliasDeclaration {
+  alias: string;
+  value: string;
+}
+
 export const schema = z.object({
   aliases: z
     .array(z.object({
@@ -26,10 +31,14 @@ export const schema = z.object({
     }))
     .describe('Aliases to create')
     .optional(),
+  declarationsOnly: z.boolean().default(false),
 })
 
 export type AliasesConfig = z.infer<typeof schema>;
 export class AliasesResource extends Resource<AliasesConfig> {
+  private readonly ALIAS_DECLARATION_REGEX = /^\s*alias\s+([A-Z_a-z][\w-]*)\s*=\s*(["']?)(.+?)\2\s*(?:#.*)?$/gm;
+  readonly filePaths = Utils.getShellRcFiles()
+
   getSettings(): ResourceSettings<AliasesConfig> {
     return {
       id: 'aliases',
@@ -43,37 +52,46 @@ export class AliasesResource extends Resource<AliasesConfig> {
           filterInStatelessMode: (desired, current) =>
             current.filter((c) => desired.some((d) => d.alias === c.alias)),
           canModify: true,
-        }
+        },
+        declarationsOnly: { default: false, setting: true },
       },
       importAndDestroy: {
-        requiredParameters: ['aliases'],
-      },
-      allowMultiple: {
-        identifyingParameters: ['alias'],
-      },
+        refreshMapper(input) {
+          if ((input.aliases?.length === 0 || !input?.aliases) && input?.aliases === undefined) {
+            return { aliases: [], declarationsOnly: true };
+          }
+
+          return input;
+        }
+      }
     }
   }
 
   override async refresh(parameters: any, context: RefreshContext<AliasesConfig>): Promise<Partial<AliasesConfig> | null> {
     const $ = getPty();
 
     const { data, status } = await $.spawnSafe('alias', { interactive: true });
-
-    console.log('Data', data);
-
     if (status === SpawnStatus.ERROR) {
       return null;
     }
 
-    const aliases = data.split(/\n/g)
+    let aliases = data.split(/\n/g)
       .map((l) => l.trim())
       .map((l) => l.match(ALIAS_REGEX))
       .filter(Boolean)
       .map((m) => (m ? { alias: m[1], value: m[2] } : null))
       .filter(Boolean) as Array<{ alias: string; value: string }>;
 
-    console.log('Command type', context.commandType);
-    console.log('Aliases', aliases);
+    if (parameters.declarationsOnly) {
+      const aliasDeclarations: AliasDeclaration[] = [];
+      for (const file of this.filePaths) {
+        if (await FileUtils.fileExists(file)) {
+          aliasDeclarations.push(...this.findAllDeclarations(await fs.readFile(file, 'utf8')));
+        }
+      }
+
+      aliases = aliases.filter((a) => aliasDeclarations.some((d) => d.alias === a.alias));
+    }
 
     // If validation plan and no aliases match, return null
     if (context.commandType === 'validationPlan'
@@ -128,15 +146,12 @@ export class AliasesResource extends Resource<AliasesConfig> {
         ?.filter((a) => !pc.previousValue?.some((c) => c.alias === a.alias)
         || pc.previousValue?.some((c) => c.alias === a.alias && c.value !== a.value));
 
-      console.log('Aliases to add', aliasesToAdd);
-
       await this.removeAliases(aliasesToRemove);
       await this.addAliases(aliasesToAdd);
     }
   }
 
   async destroy(plan: DestroyPlan<AliasesConfig>): Promise<void> {
-    console.log(plan.currentConfig.aliases);
     await this.removeAliases(plan.currentConfig.aliases ?? []);
   }
 
@@ -192,6 +207,16 @@ export class AliasesResource extends Resource<AliasesConfig> {
       await FileUtils.addToStartupFile(aliasString);
     }
   }
-}
 
+  findAllDeclarations(contents: string): AliasDeclaration[] {
+    const results = [];
+    const aliasDeclarations = contents.matchAll(this.ALIAS_DECLARATION_REGEX);
+
+    for (const declaration of aliasDeclarations) {
+      const [_, alias, __, value ] = declaration;
+      results.push({ alias, value });
+    }
 
+    return results;
+  }
+}

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

@@ -51,13 +51,18 @@ export class PathResource extends Resource<PathConfig> {
         }
       },
       allowMultiple: {
-        matcher: (desired, current) => {
+        matcher(desired, current) {
           if (desired.path) {
             return desired.path === current.path;
           }
 
           const currentPaths = new Set(current.paths)
           return desired.paths?.some((p) => currentPaths.has(p)) ?? false;
+        },
+        async findAllParameters() {
+          return [{
+            paths: []
+          }]
         }
       }
     }
@@ -249,6 +254,12 @@ export class PathResource extends Resource<PathConfig> {
 
     return results;
   }
+
+  private async resolvePathWithVariables(pathWithVariables: string): Promise<string> {
+    const $ = getPty();
+    const { data } = await $.spawnSafe(`echo ${pathWithVariables}`);
+    return data.trim();
+  }
 }
 
 interface PathDeclaration {

src/resources/tart/tart-vm.ts

@@ -72,13 +72,7 @@ export class TartVmResource extends Resource<TartVmConfig> {
     // Parse the JSON output to get the list of VMs
     try {
       const vmList = JSON.parse(data);
-      console.log('VM list:', vmList);
-      console.log('Local name:', parameters.localName);
-      console.log('Includes VM:', vmList.some((vm: { Name: string }) => vm.Name === parameters.localName));
-
       if (!vmList.some((vm: { Name: string }) => vm.Name === parameters.localName)) {
-        console.log('Not found! returning null')
-
         return null;
       }
     } catch(e) {
@@ -96,8 +90,6 @@ export class TartVmResource extends Resource<TartVmConfig> {
     try {
       // Get VM configuration using tart get
       const { status: getStatus, data: getData } = await $.spawnSafe(`tart get ${parameters.localName} --format json`);
-      console.log('Get data:', getData);
-      console.log('Status:', getStatus);
 
       if (getStatus === SpawnStatus.SUCCESS) {
         // Parse the output to extract configuration

src/resources/xcode-tools/xcode-tools.ts

@@ -67,8 +67,6 @@ export class XcodeToolsResource extends Resource<XCodeToolsConfig> {
           return compare(coerce(currentVer)!, coerce(prevVer)!) > 0 ? current : prev;
         }) : xcodeToolsVersion.at(0)!;
 
-      console.log('Latest version', latestVersion);
-
       await $.spawn(`softwareupdate -i "${latestVersion}" --verbose`, { requiresRoot: true, interactive: true });
 
     } finally {