Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions extensions/github1s/src/adapters/npmjs1s/data-source.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,13 @@ export class Npmjs1sDataSource extends DataSource {
getPackageFiles(packageName: string, version: string): Promise<PackageEntry[]> {
const mapKey = `${packageName} ${version}`;
if (!this._filesPromiseMap.has(mapKey)) {
const requestUrl = `https://unpkg.com/${packageName}@${version}/?meta`;
const filesPromise = fetch(requestUrl)
.then((response) => response.json())
.then((data) => data?.files || []);
const filesPromise = (async () => {
const packageVersions = version === 'latest' ? await this.getPackageVersions(packageName) : [];
const exactVersion = packageVersions.find((packageVersion) => packageVersion.tag === 'latest')?.name || version;
const requestUrl = `https://unpkg.com/${packageName}@${exactVersion}/?meta`;
const data = await fetch(requestUrl).then((response) => response.json());
return data?.files || [];
})();
this._filesPromiseMap.set(mapKey, filesPromise);
}
return this._filesPromiseMap.get(mapKey)!;
Expand Down Expand Up @@ -86,7 +89,9 @@ export class Npmjs1sDataSource extends DataSource {
const data = await fetch(requestUrl).then((response) => response.json(), reject);
const tagEntries = Object.entries(data?.['dist-tags'] || {}) as [string, string][];
const versionTag = tagEntries.reduce((prevVersionTag, [tag, version]) => {
prevVersionTag[version] = tag;
if (!prevVersionTag[version] || tag === 'latest') {
prevVersionTag[version] = tag;
}
return prevVersionTag;
}, {}) as Record<string, string>;
const packageVersions = Object.keys(data?.versions || {}).map((version) => {
Expand Down
3 changes: 2 additions & 1 deletion extensions/github1s/src/providers/file-system/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ export class GitHub1sFileSystemProvider implements FileSystemProvider, Disposabl
const pathParts = dirname(entry.path).split('/').filter(Boolean);
pathParts.forEach((part) => {
if (!(current.entries || (current.entries = new Map<string, Entry>())).has(part)) {
current.entries.set(part, createEntry(adapterTypes.FileType.Directory, current.uri, current.name));
const entryUri = Uri.joinPath(current.uri, current.name);
current.entries.set(part, createEntry(adapterTypes.FileType.Directory, entryUri, part));
}
current = current.entries.get(part) as Directory;
});
Expand Down
2 changes: 1 addition & 1 deletion extensions/github1s/src/providers/file-system/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export class Directory implements FileStat {
isSubmodule: boolean;

constructor(
public uri: Uri,
public uri: Uri, // parent directory uri
name: string,
options?: any,
) {
Expand Down
Loading