Skip to content

deno: handle peer deps with multiple peers #465

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

Merged
sigmaSd merged 2 commits into from
May 10, 2025
Merged

deno: handle peer deps with multiple peers #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5058a56
deno: handle peer deps with multiple peers
sigmaSd May 10, 2025
63a62f8
deno: bump flatpak generator
sigmaSd May 10, 2025
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
2 changes: 1 addition & 1 deletion deno/deno.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@flatpak-contrib/flatpak-deno-generator",
"version": "1.3.1",
"version": "1.3.2",
"exports": "./src/main.ts",
"license": "MIT"
}
13 changes: 4 additions & 9 deletions deno/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,17 +221,12 @@ export async function main(
) => (val.os === undefined || val.os?.at(0) === "linux"))
// deno-lint-ignore no-explicit-any
.map(([key, val]: [string, any]) => {
let r = splitOnce(key, "@", "right");
// hande peer deps
if (/_.+$/.test(r[0])) {
const actualModule = splitOnce(r[0], "_", "right")[0];
r = splitOnce(actualModule, "@", "right");
}
const name = r[0].includes("/") ? r[0].split("/")[1] : r[0];
const r = key.match(/(^@?.+?)@([^_]+?)(?=_|$)/)!;
const name = r[1].includes("/") ? r[1].split("/")[1] : r[1];
const cpu = val.cpu?.at(0);
return {
module: r[0],
version: r[1],
module: r[1],
version: r[2],
name,
cpu: cpu === "x64" ? "x86_64" : cpu === "arm64" ? "aarch64" : cpu,
};
Expand Down
12 changes: 12 additions & 0 deletions deno/tests/main_function.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,18 @@ Deno.test("main function: generates deno-sources.json from lockfile", async () =
],
"bin": true,
},
// peer deps can have multiple peers
"@sveltejs/[email protected]_@[email protected][email protected][email protected][email protected][email protected][email protected][email protected]":
{
"integrity":
"sha512-J/Nmb2Q2y7mck2hyCX4ckVHcR5tu2J+MtBEQqpDrrgELZ2uvraQcK/ioCV61AqkdXFgriksOKIceDcQmqnGhVw==",
"dependencies": [
"@sveltejs/vite-plugin-svelte",
"debug",
"svelte",
"vite",
],
},
},
remote: {
"https://deno.land/[email protected]/uuid/v1.ts":
Expand Down