@@ -30,6 +30,7 @@ export type Contents = {
3030 sourceMembers : Record < string , MemberRevision > ;
3131} ;
3232type MemberRevisionMapEntry = [ string , MemberRevision ] ;
33+ type PinoLogger = ReturnType < ( typeof Logger ) [ 'getRawRootLogger' ] > ;
3334
3435const FILENAME = 'maxRevision.json' ;
3536
@@ -88,7 +89,7 @@ export class RemoteSourceTrackingService {
8889 private static instanceMap = new Map < string , RemoteSourceTrackingService > ( ) ;
8990 public readonly filePath : string ;
9091
91- private logger ! : Logger ;
92+ private logger ! : PinoLogger ;
9293 private serverMaxRevisionCounter = 0 ;
9394 private sourceMembers = new Map < string , MemberRevision > ( ) ;
9495
@@ -146,10 +147,8 @@ export class RemoteSourceTrackingService {
146147 if ( elements . length === 0 ) {
147148 return ;
148149 }
149- const quiet = elements . length > 100 ;
150- if ( quiet ) {
151- this . logger . debug ( `Syncing ${ elements . length } ) ;
152- }
150+ const quietLogger = elements . length > 100 ? this . logger . silent : this . logger . debug ;
151+ quietLogger ( `Syncing ${ elements . length } ) ;
153152
154153 // this can be super-repetitive on a large ExperienceBundle where there is an element for each file but only one Revision for the entire bundle
155154 // any item in an aura/LWC bundle needs to represent the top (bundle) level and the file itself
@@ -159,11 +158,9 @@ export class RemoteSourceTrackingService {
159158 if ( ! revision ) {
160159 this . logger . warn ( `found no matching revision for ${ metadataKey } ) ;
161160 } else if ( doesNotMatchServer ( revision ) ) {
162- if ( ! quiet ) {
163- this . logger . debug (
164- `Syncing ${ metadataKey } ${ revision . lastRetrievedFromServer } ${ revision . serverRevisionCounter }
165- ) ;
166- }
161+ quietLogger (
162+ `Syncing ${ metadataKey } ${ revision . lastRetrievedFromServer } ${ revision . serverRevisionCounter }
163+ ) ;
167164 this . setMemberRevision ( metadataKey , { ...revision , lastRetrievedFromServer : revision . serverRevisionCounter } ) ;
168165 }
169166 } ) ;
@@ -377,13 +374,17 @@ ${formatSourceMemberWarnings(outstandingSourceMembers)}`
377374 if ( sourceMembers . length === 0 ) {
378375 return ;
379376 }
380- const quiet = sourceMembers . length > 100 ;
381- if ( quiet ) {
382- this . logger . debug ( `Upserting ${ sourceMembers . length } ) ;
383- }
377+ const quietLogger = sourceMembers . length > 100 ? this . logger . silent : this . logger . debug ;
378+ quietLogger ( `Upserting ${ sourceMembers . length } ) ;
384379
385- let serverMaxRevisionCounter = this . serverMaxRevisionCounter ;
386- sourceMembers . forEach ( ( change ) => {
380+ // Update the serverMaxRevisionCounter to the highest RevisionCounter
381+ this . serverMaxRevisionCounter = Math . max (
382+ this . serverMaxRevisionCounter ,
383+ ...sourceMembers . map ( ( m ) => m . RevisionCounter )
384+ ) ;
385+ this . logger . debug ( `Updating serverMaxRevisionCounter to ${ this . serverMaxRevisionCounter } ) ;
386+
387+ sourceMembers . map ( ( change ) => {
387388 // try accessing the sourceMembers object at the index of the change's name
388389 // if it exists, we'll update the fields - if it doesn't, we'll create and insert it
389390 const key = getMetadataKey ( change . MemberType , change . MemberName ) ;
@@ -395,35 +396,23 @@ ${formatSourceMemberWarnings(outstandingSourceMembers)}`
395396 } ;
396397 if ( sourceMember . lastRetrievedFromServer ) {
397398 // We are already tracking this element so we'll update it
398- if ( ! quiet ) {
399- this . logger . debug (
400- `Updating ${ key } ${ change . RevisionCounter } ${ sync ? ' and syncing' : '' }
401- ) ;
402- }
399+ quietLogger ( `Updating ${ key } ${ change . RevisionCounter } ${ sync ? ' and syncing' : '' } ) ;
403400 sourceMember . serverRevisionCounter = change . RevisionCounter ;
404401 sourceMember . isNameObsolete = change . IsNameObsolete ;
405- } else if ( ! quiet ) {
402+ } else {
406403 // We are not yet tracking it so we'll insert a new record
407- this . logger . debug (
408- `Inserting ${ key } ${ change . RevisionCounter } ${ sync ? ' and syncing' : '' }
409- ) ;
404+ quietLogger ( `Inserting ${ key } ${ change . RevisionCounter } ${ sync ? ' and syncing' : '' } ) ;
410405 }
411406
412407 // If we are syncing changes then we need to update the lastRetrievedFromServer field to
413408 // match the RevisionCounter from the SourceMember.
414409 if ( sync ) {
415410 sourceMember . lastRetrievedFromServer = change . RevisionCounter ;
416411 }
417- // Keep track of the highest RevisionCounter for setting the serverMaxRevisionCounter
418- if ( change . RevisionCounter > serverMaxRevisionCounter ) {
419- serverMaxRevisionCounter = change . RevisionCounter ;
420- }
412+
421413 // Update the state with the latest SourceMember data
422414 this . setMemberRevision ( key , sourceMember ) ;
423415 } ) ;
424- // Update the serverMaxRevisionCounter to the highest RevisionCounter
425- this . serverMaxRevisionCounter = serverMaxRevisionCounter ;
426- this . logger . debug ( `Updating serverMaxRevisionCounter to ${ serverMaxRevisionCounter } ) ;
427416
428417 await this . write ( ) ;
429418 }
@@ -435,7 +424,7 @@ ${formatSourceMemberWarnings(outstandingSourceMembers)}`
435424 const messages = Messages . loadMessages ( '@salesforce/source-tracking' , 'source' ) ;
436425 throw new SfError ( messages . getMessage ( 'NonSourceTrackedOrgError' ) , 'NonSourceTrackedOrgError' ) ;
437426 }
438- this . logger = await Logger . child ( this . constructor . name ) ;
427+ this . logger = Logger . getRawRootLogger ( ) . child ( { name : this . constructor . name } ) ;
439428 if ( fs . existsSync ( this . filePath ) ) {
440429 // read the file contents and turn it into the map
441430 const rawContents = await readFileContents ( this . filePath ) ;
@@ -486,9 +475,7 @@ ${formatSourceMemberWarnings(outstandingSourceMembers)}`
486475
487476 // because `serverMaxRevisionCounter` is always updated, we need to select > to catch the most recent change
488477 const query = `SELECT MemberType, MemberName, IsNameObsolete, RevisionCounter FROM SourceMember WHERE RevisionCounter > ${ rev } ;
489- if ( ! quiet ) {
490- this . logger . debug ( `Query: ${ query } ) ;
491- }
478+ this . logger [ quiet ? 'silent' : 'debug' ] ( `Query: ${ query } ) ;
492479 const queryResult = await queryFn ( this . org . getConnection ( ) , query ) ;
493480 this . queryCache . set ( rev , queryResult ) ;
494481
@@ -536,15 +523,15 @@ const revisionToRemoteChangeElement = ([memberKey, memberRevision]: MemberRevisi
536523 * iterate SourceMember keys and compare their decoded value with the decoded key.
537524 * if there's a match, return the matching decoded key, otherwise, return the original key
538525 */
539- function getDecodedKeyIfSourceMembersHas ( {
526+ const getDecodedKeyIfSourceMembersHas = ( {
540527 key,
541528 sourceMembers,
542529 logger,
543530} : {
544531 sourceMembers : Map < string , MemberRevision > ;
545532 key : string ;
546- logger : Logger ;
547- } ) : string {
533+ logger : PinoLogger ;
534+ } ) : string => {
548535 try {
549536 const originalKeyDecoded = decodeURIComponent ( key ) ;
550537 const match = Array . from ( sourceMembers . keys ( ) ) . find (
@@ -560,7 +547,7 @@ function getDecodedKeyIfSourceMembersHas({
560547 logger . debug ( `Could not decode metadata key: ${ key } ${ errMsg } ) ;
561548 }
562549 return key ;
563- }
550+ } ;
564551
565552const getFilePath = ( orgId : string ) : string => path . join ( '.sf' , 'orgs' , orgId , FILENAME ) ;
566553
@@ -579,7 +566,7 @@ const readFileContents = async (filePath: string): Promise<Contents | Record<str
579566} ;
580567
581568export const calculateTimeout =
582- ( logger : Logger ) =>
569+ ( logger : PinoLogger ) =>
583570 ( memberCount : number ) : Duration => {
584571 const overriddenTimeout = env . getNumber ( 'SFDX_SOURCE_MEMBER_POLLING_TIMEOUT' , 0 ) ;
585572 if ( overriddenTimeout > 0 ) {
@@ -603,9 +590,11 @@ export const querySourceMembersTo = async (conn: Connection, toRevision: number)
603590
604591const queryFn = async ( conn : Connection , query : string ) : Promise < SourceMember [ ] > => {
605592 try {
606- return ( await conn . tooling . query < SourceMember > ( query , { autoFetch : true , maxFetch : 50_000 } ) ) . records ;
593+ return ( await conn . tooling . query < SourceMember > ( query , { autoFetch : true , maxFetch : 50_000 } ) ) . records . map (
594+ sourceMemberCorrections
595+ ) ;
607596 } catch ( error ) {
608- throw error instanceof Error ? SfError . wrap ( error ) : error ;
597+ throw SfError . wrap ( error ) ;
609598 }
610599} ;
611600
@@ -625,3 +614,11 @@ const revisionDoesNotMatch = ([, member]: MemberRevisionMapEntry): boolean => do
625614
626615const doesNotMatchServer = ( member : MemberRevision ) : boolean =>
627616 member . serverRevisionCounter !== member . lastRetrievedFromServer ;
617+
618+ /** A series of workarounds for server-side bugs. Each bug should be filed against a team, with a WI, so we know when these are fixed and can be removed */
619+ const sourceMemberCorrections = ( sourceMember : SourceMember ) : SourceMember => {
620+ if ( sourceMember . MemberType === 'QuickActionDefinition' ) {
621+ return { ...sourceMember , MemberType : 'QuickAction' } ; // W-15837125
622+ }
623+ return sourceMember ;
624+ } ;
0 commit comments