fix: explicit file name for catalog contributions

erdalkaraca · erdalkaraca · commit 6cf107a5d075 · 2026-03-28T17:00:44.000Z
diff --git a/packages/core/src/commands/wget.ts b/packages/core/src/commands/wget.ts
@@ -64,7 +64,9 @@ registerAll({
                 return;
             }
 
-            const defaultFileName = fileNameFromUrl(url);
+            const explicitName =
+                typeof context.params?.filename === "string" ? context.params.filename.trim() : "";
+            const defaultFileName = explicitName || fileNameFromUrl(url);
             let savePath: string;
             const targetPath = context.params?.targetPath;
 
diff --git a/packages/extension-catalog/src/api.ts b/packages/extension-catalog/src/api.ts
@@ -2,4 +2,4 @@ export {
     getCatalogBaseUrl,
     registerCatalog,
 } from "./register-catalog";
-export type { CatalogContribution } from "./register-catalog";
+export type { CatalogContribution, CatalogResourceState } from "./register-catalog";
diff --git a/packages/extension-catalog/src/lyra-catalog.ts b/packages/extension-catalog/src/lyra-catalog.ts
@@ -93,12 +93,22 @@ export class LyraCatalog extends LyraPart {
         });
     }
 
+    private wgetParamsFromCatalogData(data: { url?: string; filename?: string }) {
+        if (!data?.url) return null;
+        const params: { url: string; filename?: string } = { url: data.url };
+        if (typeof data.filename === "string" && data.filename.trim()) {
+            params.filename = data.filename.trim();
+        }
+        return params;
+    }
+
     onItemDblClicked(event: Event) {
         const item = event.currentTarget as HTMLElement & { model?: TreeNode; expanded?: boolean };
         const node = item?.model;
         if (!node) return;
-        if (node.data?.url) {
-            this.executeCommand("wget", { url: node.data.url });
+        const wgetParams = this.wgetParamsFromCatalogData(node.data);
+        if (wgetParams) {
+            this.executeCommand("wget", wgetParams);
             return;
         }
         if (!node.leaf && "expanded" in item) {
@@ -108,8 +118,9 @@ export class LyraCatalog extends LyraPart {
 
     private runWgetForSelection() {
         const item = activeSelectionSignal.get();
-        if (item && "url" in item && item.url) {
-            this.executeCommand("wget", { url: item.url });
+        const wgetParams = item && this.wgetParamsFromCatalogData(item as { url?: string; filename?: string });
+        if (wgetParams) {
+            this.executeCommand("wget", wgetParams);
         }
     }
 
diff --git a/packages/extension-catalog/src/register-catalog.ts b/packages/extension-catalog/src/register-catalog.ts
@@ -3,6 +3,12 @@ import {
     type TreeContribution,
 } from "@eclipse-lyra/core";
 
+/** Leaf item state: optional filename when URL is not path-shaped (e.g. data: in production bundles). */
+export type CatalogResourceState = {
+    url: string;
+    filename?: string;
+};
+
 export interface CatalogContribution extends TreeContribution {
     items?: CatalogContribution[];
 }
diff --git a/packages/extension-duckdb/src/duckdb-catalog.ts b/packages/extension-duckdb/src/duckdb-catalog.ts
@@ -11,16 +11,16 @@ const DUCKDB_CATALOG: CatalogContribution = {
             icon: "file-lines",
             contributionId: "catalog.duckdb.basics",
             items: [
-                { label: "Hello DuckDB", icon: "file-code", state: { url: new URL("./catalog/hello-duckdb.sql", import.meta.url).href } },
-                { label: "Aggregations and filters", icon: "file-code", state: { url: new URL("./catalog/aggregations.sql", import.meta.url).href } },
+                { label: "Hello DuckDB", icon: "file-code", state: { url: new URL("./catalog/hello-duckdb.sql", import.meta.url).href, filename: "hello-duckdb.sql" } },
+                { label: "Aggregations and filters", icon: "file-code", state: { url: new URL("./catalog/aggregations.sql", import.meta.url).href, filename: "aggregations.sql" } },
             ],
         },
         {
             label: "Data types & functions",
             icon: "file-lines",
             contributionId: "catalog.duckdb.types",
             items: [
-                { label: "Types and built-in functions", icon: "file-code", state: { url: new URL("./catalog/types-and-functions.sql", import.meta.url).href } },
+                { label: "Types and built-in functions", icon: "file-code", state: { url: new URL("./catalog/types-and-functions.sql", import.meta.url).href, filename: "types-and-functions.sql" } },
             ],
         },
     ],
diff --git a/packages/extension-notebook/src/notebook-catalog.ts b/packages/extension-notebook/src/notebook-catalog.ts
@@ -11,23 +11,23 @@ const NOTEBOOK_CATALOG: CatalogContribution = {
             icon: "file-code",
             contributionId: "catalog.notebooks.javascript",
             items: [
-                { label: "JavaScript basics", icon: "lyra jupyter", state: { url: new URL("./catalog/javascript-basics.ipynb", import.meta.url).href } },
+                { label: "JavaScript basics", icon: "lyra jupyter", state: { url: new URL("./catalog/javascript-basics.ipynb", import.meta.url).href, filename: "javascript-basics.ipynb" } },
             ],
         },
         {
             label: "DuckDB",
             icon: "file-code",
             contributionId: "catalog.notebooks.duckdb",
             items: [
-                { label: "DuckDB in notebooks", icon: "lyra jupyter", state: { url: new URL("./catalog/duckdb-sample.ipynb", import.meta.url).href } },
+                { label: "DuckDB in notebooks", icon: "lyra jupyter", state: { url: new URL("./catalog/duckdb-sample.ipynb", import.meta.url).href, filename: "duckdb-sample.ipynb" } },
             ],
         },
         {
             label: "PGlite",
             icon: "file-code",
             contributionId: "catalog.notebooks.pglite",
             items: [
-                { label: "PostgreSQL in notebooks", icon: "lyra jupyter", state: { url: new URL("./catalog/pglite-sample.ipynb", import.meta.url).href } },
+                { label: "PostgreSQL in notebooks", icon: "lyra jupyter", state: { url: new URL("./catalog/pglite-sample.ipynb", import.meta.url).href, filename: "pglite-sample.ipynb" } },
             ],
         },
     ],
diff --git a/packages/extension-pglite/src/pglite-catalog.ts b/packages/extension-pglite/src/pglite-catalog.ts
@@ -11,16 +11,16 @@ const PGLITE_CATALOG: CatalogContribution = {
             icon: "file-lines",
             contributionId: "catalog.pglite.basics",
             items: [
-                { label: "Hello PostgreSQL", icon: "file-code", state: { url: new URL("./catalog/hello-pglite.sql", import.meta.url).href } },
-                { label: "Tables and constraints", icon: "file-code", state: { url: new URL("./catalog/tables-and-constraints.sql", import.meta.url).href } },
+                { label: "Hello PostgreSQL", icon: "file-code", state: { url: new URL("./catalog/hello-pglite.sql", import.meta.url).href, filename: "hello-pglite.sql" } },
+                { label: "Tables and constraints", icon: "file-code", state: { url: new URL("./catalog/tables-and-constraints.sql", import.meta.url).href, filename: "tables-and-constraints.sql" } },
             ],
         },
         {
             label: "Queries",
             icon: "file-lines",
             contributionId: "catalog.pglite.queries",
             items: [
-                { label: "Joins and subqueries", icon: "file-code", state: { url: new URL("./catalog/joins-and-subqueries.sql", import.meta.url).href } },
+                { label: "Joins and subqueries", icon: "file-code", state: { url: new URL("./catalog/joins-and-subqueries.sql", import.meta.url).href, filename: "joins-and-subqueries.sql" } },
             ],
         },
     ],

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,9 @@ registerAll({`
`64`	`64`	`return;`
`65`	`65`	`}`
`66`	`66`
`67`		`- const defaultFileName = fileNameFromUrl(url);`
	`67`	`+ const explicitName =`
	`68`	`+ typeof context.params?.filename === "string" ? context.params.filename.trim() : "";`
	`69`	`+ const defaultFileName = explicitName \|\| fileNameFromUrl(url);`
`68`	`70`	`let savePath: string;`
`69`	`71`	`const targetPath = context.params?.targetPath;`
`70`	`72`