Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: include module paths in Dependencies #556

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

feat: include module paths in Dependencies #556

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
52ca4ad
feat: include module paths in Dependencies
jollytoad May 23, 2024
a0c0f4e
Merge branch 'main' into full-module-dependencies
jollytoad May 24, 2024
a01d948
Merge branch 'main' into full-module-dependencies
jollytoad May 28, 2024
fe9eed6
Merge branch 'main' into full-module-dependencies
jollytoad Jun 5, 2024
6326ee4
Merge branch 'jsr-io:main' into full-module-dependencies
jollytoad Jun 10, 2024
f2fd326
Group modules into a column per package
jollytoad Jun 10, 2024
251d670
Use a record for package modules rather than a Set to avoid potential…
jollytoad Jun 10, 2024
1709529
Revert some unnecessary changes
jollytoad Jun 10, 2024
2d8835f
Merge branch 'main' into full-module-dependencies
jollytoad Jun 18, 2024
d28c59b
Merge branch 'main' into full-module-dependencies
jollytoad Jul 4, 2024
0327665
Merge branch 'main' into full-module-dependencies
jollytoad Aug 15, 2024
e2e6b81
Merge branch 'main' into full-module-dependencies
jollytoad Sep 6, 2024
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
52 changes: 48 additions & 4 deletions frontend/routes/package/dependencies.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,15 @@ export default function Deps(
) {
const iam = scopeIAM(state, data.member);

const deps: Record<string, { link: string; constraints: Set<string> }> = {};
const deps: Record<
string,
{
link: string;
constraints: Set<string>;
modules: Record<string, string | undefined>;
defaultModule: boolean;
}
> = {};

for (const dep of data.deps) {
const key = `${dep.kind}:${dep.name}`;
Expand All @@ -36,8 +44,17 @@ export default function Deps(
dep.kind === "jsr" ? "/" : "https://www.npmjs.com/package/"
}${dep.name}`,
constraints: new Set(),
modules: {},
defaultModule: false,
};
deps[key].constraints.add(dep.constraint);
if (dep.path) {
deps[key].modules[dep.path] = dep.kind === "jsr"
? `/${dep.name}/doc/${dep.path}/~`
: undefined;
} else {
deps[key].defaultModule = true;
}
}

const list = Object.entries(deps);
Expand Down Expand Up @@ -80,8 +97,9 @@ export default function Deps(
: (
<Table
columns={[
{ title: "Name", class: "w-1/3" },
{ title: "Versions", class: "w-auto" },
{ title: "Package", class: "w-1/3" },
{ title: "Versions", class: "w-1/3" },
{ title: "Modules", class: "w-auto" },
]}
currentUrl={url}
>
Expand All @@ -90,6 +108,8 @@ export default function Deps(
name={name}
link={info.link}
constraints={[...info.constraints]}
modules={Object.entries(info.modules)}
defaultModule={info.defaultModule}
/>
))}
</Table>
Expand All @@ -100,10 +120,12 @@ export default function Deps(
}

function Dependency(
{ name, link, constraints }: {
{ name, link, constraints, modules, defaultModule }: {
name: string;
link: string;
constraints: string[];
modules: [path: string, link?: string][];
defaultModule: boolean;
},
) {
return (
Expand All @@ -116,6 +138,28 @@ function Dependency(
<TableData class="space-x-4">
{constraints.map((constraint) => <span>{constraint}</span>)}
</TableData>
<TableData>
{modules.length > 0 && (
<ul>
{defaultModule && <li class="italic">(default)</li>}
{modules.map(([path, link]) => (
<li>
{link
? (
<a href={link} class="link">
{path}
</a>
)
: (
<span>
{path}
</span>
)}
</li>
))}
</ul>
)}
</TableData>
</TableRow>
);
}
Expand Down
Loading