custom registry support #552
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mshanemc
commented
Mar 19, 2024
| @@ -13,3 +22,23 @@ export const metadataMemberGuard = ( | |||
| input: MetadataMember | undefined | Partial<MetadataMember> | |||
| ): input is MetadataMember => | |||
| input !== undefined && typeof input.fullName === 'string' && typeof input.type === 'string'; | |||
|
|
|||
| export const isSdrFailure = (fileResponse: FileResponse): fileResponse is FileResponseFailure => | |||
There was a problem hiding this comment.
a few of these already exist in PDR and probably could ship in SDR if they'd be broadly useful.
mshanemc
commented
Mar 19, 2024
| @@ -8,20 +8,9 @@ import { ForceIgnore, MetadataComponent, MetadataMember, RegistryAccess } from ' | |||
| import { SfError } from '@salesforce/core'; | |||
| import { filePathsFromMetadataComponent } from '@salesforce/source-deploy-retrieve/lib/src/utils/filePathGenerator'; | |||
| import { ChangeResult } from './types'; | |||
|
|
|||
| export const changeResultToMetadataComponent = ( | |||
There was a problem hiding this comment.
moved to the shared functions module for re-use
mshanemc
commented
Mar 28, 2024
| @@ -26,15 +27,14 @@ export const findConflictsInComponentSet = (cs: ComponentSet, conflicts: ChangeR | |||
| // map do dedupe by name-type-filename | |||
| const conflictMap = new Map<string, ConflictResponse>(); | |||
| conflicts | |||
| .filter((cr) => cr.name && cr.type && cs.has({ fullName: cr.name, type: cr.type })) | |||
| .filter(isChangeResultWithNameAndType) | |||
There was a problem hiding this comment.
isChangeResultWithNameAndType narrows the ConflictResponse so that other functions can depend on those props existing
mshanemc
commented
Mar 28, 2024
| @@ -25,29 +33,39 @@ export const getKeyFromObject = (element: RemoteChangeElement | ChangeResult): s | |||
|
|
|||
| export const supportsPartialDelete = (cmp: SourceComponent): boolean => !!cmp.type.supportsPartialDelete; | |||
|
|
|||
| export const isLwcLocalOnlyTest = (filePath: string): boolean => | |||
| filePath.includes('__utam__') || filePath.includes('__tests__'); | |||
| export const excludeLwcLocalOnlyTest = (filePath: string): boolean => | |||
There was a problem hiding this comment.
I just inverted it for clearer use as a filter. Both uses were negated by the consumer
mshanemc
commented
Mar 28, 2024
| export const getComponentSets = ({ | ||
| groupings, | ||
| sourceApiVersion, | ||
| registry = new RegistryAccess(), |
There was a problem hiding this comment.
feat: accepts a custom registry for passing to the metadataConverter
3 props so now it's an obj
mshanemc
commented
Mar 28, 2024
| }: { | ||
| elements: ChangeResult[]; | ||
| packageDirPaths: string[]; | ||
| registry: RegistryAccess; |
There was a problem hiding this comment.
another place that needed the registry
mshanemc
commented
Mar 28, 2024
| @@ -61,6 +67,7 @@ export const populateFilePaths = (elements: ChangeResult[], packageDirPaths: str | |||
| const matchingLocalSourceComponentsSet = ComponentSet.fromSource({ | |||
| fsPaths: packageDirPaths, | |||
| include: remoteChangesAsComponentSet, | |||
| registry, | |||
mshanemc
commented
Mar 28, 2024
| @@ -84,10 +94,9 @@ export const populateFilePaths = (elements: ChangeResult[], packageDirPaths: str | |||
| ...elementMap.get(key), | |||
| modified: true, | |||
| origin: 'remote', | |||
| filenames: [matchingComponent.xml as string, ...matchingComponent.walkContent()].filter((filename) => filename), | |||
| filenames: getAllFiles(matchingComponent), | |||
There was a problem hiding this comment.
several places use [xml, ...walkContent] and then have filter out non-strings, so that's now shared fn
mshanemc
commented
Mar 28, 2024
| .filter(sourceComponentGuard); | ||
| // component set generated from the filenames on all local changes | ||
| const resolver = new MetadataResolver( | ||
| registry, |
There was a problem hiding this comment.
needed custom reg here
WillieRuemmele
approved these changes
Mar 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
componentSet and Resolver allow the passing in a registry.
STL will now resolve the registry once when instantiated, from the projectDir, and pass that around to everything that needs it.
What issues does this PR fix or reference?
part of making @W-14608988@ work with tracking