77import * as path from 'path' ;
88import { SfdxCommand } from '@salesforce/command' ;
99import { ComponentSet } from '@salesforce/source-deploy-retrieve' ;
10- import { fs , SfdxError } from '@salesforce/core' ;
10+ import { fs , SfdxError , Logger } from '@salesforce/core' ;
1111import { ComponentLike } from '@salesforce/source-deploy-retrieve/lib/src/common' ;
1212
1313export type FlagOptions = {
1414 packagenames ?: string [ ] ;
1515 sourcepath : string [ ] ;
1616 manifest : string ;
1717 metadata : string [ ] ;
18+ apiversion ?: string ;
1819} ;
1920
2021export abstract class SourceCommand extends SfdxCommand {
21- public static MINIMUM_SRC_WAIT_MINUTES = 1 ;
2222 public static DEFAULT_SRC_WAIT_MINUTES = 33 ;
2323 /**
2424 * will create one ComponentSet to be deployed/retrieved
@@ -27,11 +27,13 @@ export abstract class SourceCommand extends SfdxCommand {
2727 * @param options: FlagOptions where to create ComponentSets from
2828 */
2929 protected async createComponentSet ( options : FlagOptions ) : Promise < ComponentSet > {
30+ const logger = Logger . childFromRoot ( this . constructor . name ) ;
3031 const setAggregator : ComponentLike [ ] = [ ] ;
3132
3233 // go through options to create a list of ComponentSets
3334 // we'll then combine all of those to deploy/retrieve
3435 if ( options . sourcepath ) {
36+ logger . debug ( `Building ComponentSet from sourcepath: ${ options . sourcepath . toString ( ) } ) ;
3537 options . sourcepath . forEach ( ( filepath ) => {
3638 if ( fs . fileExistsSync ( filepath ) ) {
3739 setAggregator . push ( ...ComponentSet . fromSource ( path . resolve ( filepath ) ) ) ;
@@ -41,38 +43,69 @@ export abstract class SourceCommand extends SfdxCommand {
4143 } ) ;
4244 }
4345
46+ // Return empty ComponentSet and use packageNames in the library via `.retrieve` options
4447 if ( options . packagenames ) {
45- // return ComponentSet and use packageNames in the library via `.retrieve` options
48+ logger . debug ( `Building ComponentSet for packagenames: ${ options . packagenames . toString ( ) } ` ) ;
4649 setAggregator . push ( ...new ComponentSet ( [ ] ) ) ;
4750 }
4851
52+ // Resolve manifest with source in package directories.
4953 if ( options . manifest ) {
50- setAggregator . push (
51- ...( await ComponentSet . fromManifestFile ( options . manifest , {
52- // to create a link to the actual source component we need to have it resolve through all packages
53- // to find the matching source metadata
54- // this allows us to deploy after
55- resolve : process . cwd ( ) ,
56- } ) )
57- ) ;
54+ logger . debug ( `Building ComponentSet from manifest: ${ options . manifest } ) ;
55+ const packageDirs = this . project . getUniquePackageDirectories ( ) . map ( ( pDir ) => pDir . fullPath ) ;
56+ for ( const packageDir of packageDirs ) {
57+ logger . debug ( `Searching in packageDir: ${ packageDir } ) ;
58+ const compSet = await ComponentSet . fromManifestFile ( options . manifest , { resolve : packageDir } ) ;
59+ setAggregator . push ( ...compSet ) ;
60+ }
5861 }
5962
63+ // Resolve metadata entries with source in package directories.
6064 if ( options . metadata ) {
65+ logger . debug ( `Building ComponentSet from metadata: ${ options . metadata . toString ( ) } ) ;
66+
67+ // Build a Set of metadata entries
68+ const filter = new ComponentSet ( ) ;
6169 options . metadata . forEach ( ( entry ) => {
6270 const splitEntry = entry . split ( ':' ) ;
63- const metadata : ComponentLike = {
71+ filter . add ( {
6472 type : splitEntry [ 0 ] ,
65- // either -m ApexClass or -m ApexClass:MyApexClass
6673 fullName : splitEntry . length === 1 ? '*' : splitEntry [ 1 ] ,
67- } ;
68- const cs = new ComponentSet ( [ metadata ] ) ;
69- // we need to search the entire project for the matching metadata component
70- // no better way than to have it search than process.cwd()
71- cs . resolveSourceComponents ( process . cwd ( ) , { filter : cs } ) ;
72- setAggregator . push ( ...cs ) ;
74+ } ) ;
7375 } ) ;
76+
77+ // Search the packages directories for matching metadata
78+ const packageDirs = this . project . getUniquePackageDirectories ( ) . map ( ( pDir ) => pDir . fullPath ) ;
79+ logger . debug ( `Searching for matching metadata in packageDirs: ${ packageDirs . toString ( ) } ) ;
80+ setAggregator . push ( ...ComponentSet . fromSource ( { inclusiveFilter : filter , fsPaths : packageDirs } ) ) ;
81+ }
82+
83+ const componentSet = new ComponentSet ( setAggregator ) ;
84+
85+ // This is only for debug output of matched files based on the command flags.
86+ // It will log up to 20 file matches.
87+ // TODO: add logger.debugEnabled
88+ if ( componentSet . size ) {
89+ logger . debug ( `Matching metadata files (${ componentSet . size } ) ;
90+ const components = componentSet . getSourceComponents ( ) . toArray ( ) ;
91+ for ( let i = 0 ; i < componentSet . size ; i ++ ) {
92+ if ( components [ i ] ?. content ) {
93+ logger . debug ( components [ i ] . content ) ;
94+ } else if ( components [ i ] ?. xml ) {
95+ logger . debug ( components [ i ] . xml ) ;
96+ }
97+
98+ if ( i > 18 ) {
99+ logger . debug ( `(showing 20 of ${ componentSet . size } ) ;
100+ break ;
101+ }
102+ }
103+ }
104+
105+ if ( options . apiversion ) {
106+ componentSet . apiVersion = options . apiversion ;
74107 }
75108
76- return new ComponentSet ( setAggregator ) ;
109+ return componentSet ;
77110 }
78111}
0 commit comments