Skip to content

Commit f2dabb7

Browse files
committed
Fix unit test for package builder after Salesforce update.
1 parent 17fc3f5 commit f2dabb7

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

packages/core/src/fs/cachedFileSystem.ts

+2
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ export class CachedFileSystemAdapter extends FileSystem {
3030
return this.innerFs.stat(path, options);
3131
}
3232

33+
@cache()
3334
public readDirectory(path: string): Promise<FileInfo[]> {
3435
return this.innerFs.readDirectory(path);
3536
}
3637

38+
@cache()
3739
public findFiles(patterns: string | string[]): Promise<string[]> {
3840
return this.innerFs.findFiles(patterns);
3941
}

src/lib/salesforce/deploymentPackageBuilder.ts

+6-4
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,10 @@ export class SalesforcePackageBuilder {
184184
private async addBundledSources(bundleFolder: string, metadataType: MetadataType) {
185185
const bundleFiles = await this.fs.readDirectory(bundleFolder);
186186
const componentName = bundleFolder.split(/\\|\//g).pop()!;
187-
for (const file of bundleFiles.map(entry => path.join(bundleFolder, entry.name))) {
188-
if (await this.fs.isFile(file)) {
189-
await this.addSingleSourceFile(file, metadataType, componentName);
187+
for (const file of bundleFiles) {
188+
if (file.isFile()) {
189+
await this.addSingleSourceFile(path.join(bundleFolder, file.name), metadataType, componentName);
190+
this.addParsedFile(path.join(bundleFolder, file.name));
190191
}
191192
}
192193
}
@@ -417,7 +418,8 @@ export class SalesforcePackageBuilder {
417418
if (metaSuffixMatch) {
418419
return metaSuffixMatch[1];
419420
}
420-
return file.split(/\\|\//g).pop()?.match(/\.([^.]+)$/i)?.[1];
421+
const suffix = file.split(/\\|\//g).pop()?.match(/\.([^.]+)$/i)?.[1];
422+
return suffix?.toLowerCase() != 'xml' ? suffix : undefined;
421423
}
422424

423425
private async getComponentTypeFromSource(file: string) {

0 commit comments

Comments
 (0)