refactor: naming, spread like other props

salesforcecli · Dec 5, 2023 · ca653b0 · ca653b0
1 parent ab5bc89
commit ca653b0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/commands/project/retrieve/start.ts b/src/commands/project/retrieve/start.ts
@@ -373,7 +373,7 @@ const buildRetrieveAndDeleteTargets = async (
     }
     return result;
   } else {
-    const retrieveFromOrg = flags.metadata?.some(isWildcard) ? flags['target-org'].getUsername() : undefined;
+    const retrieveFromOrg = flags.metadata?.some(isRegexMatch) ? flags['target-org'].getUsername() : undefined;
 
     return {
       componentSetFromNonDeletes: await ComponentSetBuilder.build({
@@ -401,7 +401,7 @@ const buildRetrieveAndDeleteTargets = async (
               },
             }
           : {}),
-        org: retrieveFromOrg ? { username: retrieveFromOrg, exclude: [] } : undefined,
+        ...(retrieveFromOrg ? { org: { username: retrieveFromOrg, exclude: [] } } : {}),
       }),
     };
   }
@@ -440,7 +440,7 @@ const buildRetrieveOptions = async (
 });
 
 // check if we're retrieving metadata based on a pattern ...
-const isWildcard = (mdEntry: string): boolean => {
+const isRegexMatch = (mdEntry: string): boolean => {
   const mdName = mdEntry.split(':')[1];
   return mdName?.includes('*') && mdName?.length > 1 && !mdName?.includes('.*');
 };