@malloy-publisher/server 0.0.195 → 0.0.196

package/tests/unit/duckdb/legacy_schema_migration.test.ts

@@ -0,0 +1,194 @@
+/// <reference types="bun-types" />
+
+// TODO: Remove this during projects cleanup
+
+import { afterEach, beforeEach, describe, expect, it } from "bun:test";
+import fs from "fs/promises";
+import os from "os";
+import path from "path";
+import { DuckDBConnection } from "../../../src/storage/duckdb/DuckDBConnection";
+import { initializeSchema } from "../../../src/storage/duckdb/schema";
+
+const TEST_DB_DIR = path.join(os.tmpdir(), "duckdb-legacy-migration-tests");
+
+// Seed a pre-rename schema on an *already-open* connection. We deliberately
+// avoid opening, closing, and reopening the same DuckDB file within a test:
+// on Windows runners the second `duckdb.Database(path)` call sometimes fails
+// with `Invalid Error` because the OS hasn't released the file handle yet.
+// Sharing one connection between seed and assertion sidesteps that entirely.
+async function seedLegacySchema(db: DuckDBConnection): Promise<void> {
+   // Seed a pre-rename schema: parent table named `projects` and child
+   // tables with `project_id` foreign-key columns. Mirrors what an existing
+   // installation looked like before the projects→environments rename.
+   await db.run(`
+      CREATE TABLE projects (
+         id VARCHAR PRIMARY KEY,
+         name VARCHAR NOT NULL UNIQUE,
+         path VARCHAR NOT NULL,
+         description VARCHAR,
+         metadata JSON,
+         created_at TIMESTAMP NOT NULL,
+         updated_at TIMESTAMP NOT NULL
+      )
+   `);
+   await db.run(`
+      CREATE TABLE packages (
+         id VARCHAR PRIMARY KEY,
+         project_id VARCHAR NOT NULL,
+         name VARCHAR NOT NULL,
+         description VARCHAR,
+         manifest_path VARCHAR NOT NULL,
+         metadata JSON,
+         created_at TIMESTAMP NOT NULL,
+         updated_at TIMESTAMP NOT NULL,
+         FOREIGN KEY (project_id) REFERENCES projects(id)
+      )
+   `);
+   await db.run(`
+      CREATE TABLE connections (
+         id VARCHAR PRIMARY KEY,
+         project_id VARCHAR NOT NULL,
+         name VARCHAR NOT NULL,
+         type VARCHAR NOT NULL,
+         config JSON NOT NULL,
+         created_at TIMESTAMP NOT NULL,
+         updated_at TIMESTAMP NOT NULL,
+         FOREIGN KEY (project_id) REFERENCES projects(id)
+      )
+   `);
+   await db.run(`
+      CREATE TABLE materializations (
+         id VARCHAR PRIMARY KEY,
+         project_id VARCHAR NOT NULL,
+         package_name VARCHAR NOT NULL,
+         status VARCHAR NOT NULL,
+         active_key VARCHAR,
+         started_at TIMESTAMP,
+         completed_at TIMESTAMP,
+         error TEXT,
+         metadata JSON,
+         created_at TIMESTAMP NOT NULL,
+         updated_at TIMESTAMP NOT NULL,
+         FOREIGN KEY (project_id) REFERENCES projects(id)
+      )
+   `);
+   await db.run(`
+      CREATE TABLE build_manifests (
+         id VARCHAR PRIMARY KEY,
+         project_id VARCHAR NOT NULL,
+         package_name VARCHAR NOT NULL,
+         build_id VARCHAR NOT NULL,
+         table_name VARCHAR NOT NULL,
+         source_name VARCHAR NOT NULL,
+         connection_name VARCHAR NOT NULL,
+         created_at TIMESTAMP NOT NULL,
+         updated_at TIMESTAMP NOT NULL,
+         FOREIGN KEY (project_id) REFERENCES projects(id)
+      )
+   `);
+
+   await db.run(
+      `INSERT INTO projects VALUES ('p1', 'proj-one', '/p1', 'd1', NULL,
+         TIMESTAMP '2024-01-01 00:00:00', TIMESTAMP '2024-01-01 00:00:00')`,
+   );
+   await db.run(
+      `INSERT INTO packages VALUES ('pkg1', 'p1', 'pkg-one', NULL, '/m', NULL,
+         TIMESTAMP '2024-01-01 00:00:00', TIMESTAMP '2024-01-01 00:00:00')`,
+   );
+}
+
+describe("DuckDB legacy projects schema cleanup", () => {
+   beforeEach(async () => {
+      await fs.mkdir(TEST_DB_DIR, { recursive: true });
+   });
+
+   afterEach(async () => {
+      try {
+         await fs.rm(TEST_DB_DIR, { recursive: true, force: true });
+      } catch {
+         // ignore
+      }
+   });
+
+   it("drops legacy projects schema and creates the new environments schema cleanly", async () => {
+      const dbPath = path.join(TEST_DB_DIR, "legacy.duckdb");
+      const db = new DuckDBConnection(dbPath);
+      await db.initialize();
+
+      // Seed the legacy schema on the same connection, then run the
+      // production schema-init path. This mirrors a server upgrade
+      // (legacy data on disk, new code starting up) without forcing a
+      // close+reopen, which is unreliable on Windows runners.
+      await seedLegacySchema(db);
+      await initializeSchema(db);
+
+      // Legacy parent table is gone.
+      const legacyProjects = await db.all<{ name: string }>(
+         "SELECT name FROM sqlite_master WHERE type='table' AND name='projects'",
+      );
+      expect(legacyProjects.length).toBe(0);
+
+      // New `environments` table exists and is empty (legacy data dropped).
+      const envs = await db.all<{ id: string }>("SELECT id FROM environments");
+      expect(envs.length).toBe(0);
+
+      // Child tables are queryable by `environment_id` (the new column),
+      // proving they were recreated with the new schema rather than left on
+      // the old `project_id` column.
+      const pkgs = await db.all<{ id: string }>(
+         "SELECT id FROM packages WHERE environment_id = ?",
+         ["p1"],
+      );
+      expect(pkgs.length).toBe(0);
+      const conns = await db.all<{ id: string }>(
+         "SELECT id FROM connections WHERE environment_id = ?",
+         ["p1"],
+      );
+      expect(conns.length).toBe(0);
+      const mats = await db.all<{ id: string }>(
+         "SELECT id FROM materializations WHERE environment_id = ?",
+         ["p1"],
+      );
+      expect(mats.length).toBe(0);
+      const manifests = await db.all<{ id: string }>(
+         "SELECT id FROM build_manifests WHERE environment_id = ?",
+         ["p1"],
+      );
+      expect(manifests.length).toBe(0);
+
+      await db.close();
+   });
+
+   it("is idempotent: running initializeSchema twice on a migrated DB is a no-op", async () => {
+      const dbPath = path.join(TEST_DB_DIR, "legacy_idempotent.duckdb");
+      const db = new DuckDBConnection(dbPath);
+      await db.initialize();
+
+      await seedLegacySchema(db);
+      await initializeSchema(db);
+      // Second call should hit the early-return path (isInitialized() === true).
+      await initializeSchema(db);
+
+      const envs = await db.all<{ id: string }>("SELECT id FROM environments");
+      expect(envs.length).toBe(0);
+
+      await db.close();
+   });
+
+   it("creates a fresh schema unchanged when no legacy projects table is present", async () => {
+      const dbPath = path.join(TEST_DB_DIR, "fresh.duckdb");
+      const db = new DuckDBConnection(dbPath);
+      await db.initialize();
+      await initializeSchema(db);
+
+      const envs = await db.all<{ id: string }>("SELECT id FROM environments");
+      expect(envs.length).toBe(0);
+
+      const legacy = await db.all<{ name: string }>(
+         "SELECT name FROM sqlite_master WHERE type='table' AND name='projects'",
+      );
+      expect(legacy.length).toBe(0);
+
+      await db.close();
+   });
+});

package/tests/unit/ducklake/ducklake.test.ts

@@ -4,7 +4,7 @@ import fs from "fs/promises";
 import path from "path";
 import { components } from "../../../src/api";
 import {
-   createProjectConnections,
+   createEnvironmentConnections,
    deleteDuckLakeConnectionFile,
    testConnectionConfig,
 } from "../../../src/service/connection";
@@ -143,7 +143,7 @@ describe("DuckLake Connection Tests", () => {
             };
 
             const { malloyConnections, apiConnections } =
-               await createProjectConnections(
+               await createEnvironmentConnections(
                   [ducklakeConnection],
                   testProjectPath,
                );
@@ -212,7 +212,7 @@ describe("DuckLake Connection Tests", () => {
                },
             };
 
-            const { malloyConnections } = await createProjectConnections(
+            const { malloyConnections } = await createEnvironmentConnections(
                [ducklakeConnection],
                testProjectPath,
             );
@@ -268,7 +268,7 @@ describe("DuckLake Connection Tests", () => {
                },
             };
 
-            const { malloyConnections } = await createProjectConnections(
+            const { malloyConnections } = await createEnvironmentConnections(
                [ducklakeConnection],
                testProjectPath,
             );
@@ -333,7 +333,7 @@ describe("DuckLake Connection Tests", () => {
                },
             };
 
-            const { malloyConnections } = await createProjectConnections(
+            const { malloyConnections } = await createEnvironmentConnections(
                [ducklakeConnection],
                testProjectPath,
             );
@@ -400,7 +400,7 @@ describe("DuckLake Connection Tests", () => {
                },
             };
 
-            const { malloyConnections } = await createProjectConnections(
+            const { malloyConnections } = await createEnvironmentConnections(
                [ducklakeConnection],
                testProjectPath,
             );
@@ -470,7 +470,7 @@ describe("DuckLake Connection Tests", () => {
                },
             };
 
-            const { malloyConnections } = await createProjectConnections(
+            const { malloyConnections } = await createEnvironmentConnections(
                [ducklakeConnection],
                testProjectPath,
             );
@@ -529,7 +529,7 @@ describe("DuckLake Connection Tests", () => {
                },
             };
 
-            const { malloyConnections } = await createProjectConnections(
+            const { malloyConnections } = await createEnvironmentConnections(
                [ducklakeConnection],
                testProjectPath,
             );
@@ -553,7 +553,7 @@ describe("DuckLake Connection Tests", () => {
    describe("Error Handling", () => {
       it("should throw error if DuckLake catalog connection is missing", async () => {
          await expect(
-            createProjectConnections(
+            createEnvironmentConnections(
                [
                   {
                      name: "ducklake_no_catalog",
@@ -576,7 +576,7 @@ describe("DuckLake Connection Tests", () => {
 
       it("should throw error if DuckLake storage bucketUrl is missing", async () => {
          await expect(
-            createProjectConnections(
+            createEnvironmentConnections(
                [
                   {
                      name: "ducklake_no_bucket",
@@ -607,7 +607,7 @@ describe("DuckLake Connection Tests", () => {
 
       it("should throw error if DuckLake connection config is missing", async () => {
          await expect(
-            createProjectConnections(
+            createEnvironmentConnections(
                [
                   {
                      name: "ducklake_missing_config",
@@ -653,19 +653,21 @@ describe("DuckLake Connection Tests", () => {
          };
 
          // Create connection twice - second should handle already attached gracefully
-         const { malloyConnections: conn1 } = await createProjectConnections(
-            [ducklakeConnection],
-            testProjectPath,
-         );
+         const { malloyConnections: conn1 } =
+            await createEnvironmentConnections(
+               [ducklakeConnection],
+               testProjectPath,
+            );
          const connection1 = conn1.get(
             "ducklake_duplicate_test",
          ) as DuckDBConnection;
          createdConnections.push(connection1);
 
-         const { malloyConnections: conn2 } = await createProjectConnections(
-            [ducklakeConnection],
-            testProjectPath,
-         );
+         const { malloyConnections: conn2 } =
+            await createEnvironmentConnections(
+               [ducklakeConnection],
+               testProjectPath,
+            );
          const connection2 = conn2.get(
             "ducklake_duplicate_test",
          ) as DuckDBConnection;
@@ -714,7 +716,7 @@ describe("DuckLake Connection Tests", () => {
                },
             };
 
-            const { malloyConnections } = await createProjectConnections(
+            const { malloyConnections } = await createEnvironmentConnections(
                [ducklakeConnection],
                testProjectPath,
             );
@@ -771,7 +773,7 @@ describe("DuckLake Connection Tests", () => {
             },
          };
 
-         const { malloyConnections } = await createProjectConnections(
+         const { malloyConnections } = await createEnvironmentConnections(
             [ducklakeConnection],
             testProjectPath,
          );
@@ -903,7 +905,7 @@ describe("DuckLake Connection Tests", () => {
                return;
             }
 
-            const { apiConnections } = await createProjectConnections(
+            const { apiConnections } = await createEnvironmentConnections(
                [
                   {
                      name: "ducklake_attrs_test",

package/tests/unit/mcp/prompt_happy.test.ts

@@ -3,13 +3,13 @@ import { describe, it, expect } from "bun:test";
 import { promptHandlerMap } from "../../../src/mcp/prompts/handlers";
 
 describe("Prompt Handlers – happy paths", () => {
-   const projectStore = undefined; // no ProjectStore needed for minimal tests
+   const environmentStore = undefined; // no EnvironmentStore needed for minimal tests
 
    it("explain handler returns text message", async () => {
       const handler = promptHandlerMap["explain-malloy-query@1.0.0"];
       const res = await handler(
          { query_code: "run: t -> { aggregate: c is count() }" },
-         projectStore as any,
+         environmentStore as any,
       );
       expect(res.messages.length).toBe(1);
       expect(res.messages[0].role).toBe("user");
@@ -21,9 +21,9 @@ describe("Prompt Handlers – happy paths", () => {
       const res = await handler(
          {
             natural_language_goal: "total sales by day",
-            target_model_uri: "malloy://project/p/pkg/models/m.malloy",
+            target_model_uri: "malloy://environment/e/pkg/models/m.malloy",
          },
-         projectStore as any,
+         environmentStore as any,
       );
       expect(res.messages[0].role).toBe("user");
    });
@@ -33,9 +33,9 @@ describe("Prompt Handlers – happy paths", () => {
       const res = await handler(
          {
             sql_query: "SELECT 1",
-            target_model_uri: "malloy://project/p/pkg/models/m.malloy",
+            target_model_uri: "malloy://environment/e/pkg/models/m.malloy",
          },
-         projectStore as any,
+         environmentStore as any,
       );
       expect(res.messages[0].content.type).toBe("text");
    });
@@ -43,8 +43,8 @@ describe("Prompt Handlers – happy paths", () => {
    it("summarize handler returns message", async () => {
       const handler = promptHandlerMap["summarize-malloy-model@1.0.0"];
       const res = await handler(
-         { model_uri: "malloy://project/p/pkg/models/m.malloy" },
-         projectStore as any,
+         { model_uri: "malloy://environment/e/pkg/models/m.malloy" },
+         environmentStore as any,
       );
       expect(res.messages[0].content.type).toBe("text");
    });

package/dist/app/assets/HomePage-DbZS0N7G.js

@@ -1 +0,0 @@
-import{d as o,j as a,i as e}from"./index-Bu0ub036.js";function i(){const t=o();return a.jsx(e,{onClickProject:t})}export{i as default};

package/dist/app/assets/MainPage-CBuWkbmr.js

@@ -1,2 +0,0 @@
-import{u as V,g as F,r as g,R as _,a as X,b as S,c as M,e as A,j as e,s as m,f as w,h as v,k as I,P as Y,m as R,l as J,n as z,B as K,o as N,p as Z,T as U,q,t as oo,d as ro,v as f,C as j,w as eo,x as to,I as ao,M as so,y as $,S as no,z as lo,A as io,O as co,D as po}from"./index-Bu0ub036.js";function uo(o,r,t,a,n){const[s,i]=g.useState(()=>n&&t?t(o).matches:a?a(o).matches:r);return X(()=>{if(!t)return;const p=t(o),u=()=>{i(p.matches)};return u(),p.addEventListener("change",u),()=>{p.removeEventListener("change",u)}},[o,t]),s}const go={..._},L=go.useSyncExternalStore;function xo(o,r,t,a,n){const s=g.useCallback(()=>r,[r]),i=g.useMemo(()=>{if(n&&t)return()=>t(o).matches;if(a!==null){const{matches:c}=a(o);return()=>c}return s},[s,o,a,n,t]),[p,u]=g.useMemo(()=>{if(t===null)return[s,()=>()=>{}];const c=t(o);return[()=>c.matches,l=>(c.addEventListener("change",l),()=>{c.removeEventListener("change",l)})]},[s,t,o]);return L(u,p,i)}function O(o={}){const{themeId:r}=o;return function(a,n={}){let s=V();s&&r&&(s=s[r]||s);const i=typeof window<"u"&&typeof window.matchMedia<"u",{defaultMatches:p=!1,matchMedia:u=i?window.matchMedia:null,ssrMatchMedia:d=null,noSsr:c=!1}=F({name:"MuiUseMediaQuery",props:n,theme:s});let l=typeof a=="function"?a(s):a;return l=l.replace(/^@media( ?)/m,""),l.includes("print")&&console.warn(["MUI: You have provided a `print` query to the `useMediaQuery` hook.","Using the print media query to modify print styles can lead to unexpected results.","Consider using the `displayPrint` field in the `sx` prop instead.","More information about `displayPrint` on our docs: https://mui.com/system/display/#display-in-print."].join(`
-`)),(L!==void 0?xo:uo)(l,p,u,d,c)}}O();function mo(o){return S("MuiAppBar",o)}M("MuiAppBar",["root","positionFixed","positionAbsolute","positionSticky","positionStatic","positionRelative","colorDefault","colorPrimary","colorSecondary","colorInherit","colorTransparent","colorError","colorInfo","colorSuccess","colorWarning"]);const fo=o=>{const{color:r,position:t,classes:a}=o,n={root:["root",`color${v(r)}`,`position${v(t)}`]};return I(n,mo,a)},D=(o,r)=>o?`${o?.replace(")","")}, ${r})`:r,bo=m(Y,{name:"MuiAppBar",slot:"Root",overridesResolver:(o,r)=>{const{ownerState:t}=o;return[r.root,r[`position${v(t.position)}`],r[`color${v(t.color)}`]]}})(R(({theme:o})=>({display:"flex",flexDirection:"column",width:"100%",boxSizing:"border-box",flexShrink:0,variants:[{props:{position:"fixed"},style:{position:"fixed",zIndex:(o.vars||o).zIndex.appBar,top:0,left:"auto",right:0,"@media print":{position:"absolute"}}},{props:{position:"absolute"},style:{position:"absolute",zIndex:(o.vars||o).zIndex.appBar,top:0,left:"auto",right:0}},{props:{position:"sticky"},style:{position:"sticky",zIndex:(o.vars||o).zIndex.appBar,top:0,left:"auto",right:0}},{props:{position:"static"},style:{position:"static"}},{props:{position:"relative"},style:{position:"relative"}},{props:{color:"inherit"},style:{"--AppBar-color":"inherit"}},{props:{color:"default"},style:{"--AppBar-background":o.vars?o.vars.palette.AppBar.defaultBg:o.palette.grey[100],"--AppBar-color":o.vars?o.vars.palette.text.primary:o.palette.getContrastText(o.palette.grey[100]),...o.applyStyles("dark",{"--AppBar-background":o.vars?o.vars.palette.AppBar.defaultBg:o.palette.grey[900],"--AppBar-color":o.vars?o.vars.palette.text.primary:o.palette.getContrastText(o.palette.grey[900])})}},...Object.entries(o.palette).filter(J(["contrastText"])).map(([r])=>({props:{color:r},style:{"--AppBar-background":(o.vars??o).palette[r].main,"--AppBar-color":(o.vars??o).palette[r].contrastText}})),{props:r=>r.enableColorOnDark===!0&&!["inherit","transparent"].includes(r.color),style:{backgroundColor:"var(--AppBar-background)",color:"var(--AppBar-color)"}},{props:r=>r.enableColorOnDark===!1&&!["inherit","transparent"].includes(r.color),style:{backgroundColor:"var(--AppBar-background)",color:"var(--AppBar-color)",...o.applyStyles("dark",{backgroundColor:o.vars?D(o.vars.palette.AppBar.darkBg,"var(--AppBar-background)"):null,color:o.vars?D(o.vars.palette.AppBar.darkColor,"var(--AppBar-color)"):null})}},{props:{color:"transparent"},style:{"--AppBar-background":"transparent","--AppBar-color":"inherit",backgroundColor:"var(--AppBar-background)",color:"var(--AppBar-color)",...o.applyStyles("dark",{backgroundImage:"none"})}}]}))),ho=g.forwardRef(function(r,t){const a=A({props:r,name:"MuiAppBar"}),{className:n,color:s="primary",enableColorOnDark:i=!1,position:p="fixed",...u}=a,d={...a,color:s,position:p,enableColorOnDark:i},c=fo(d);return e.jsx(bo,{square:!0,component:"header",ownerState:d,elevation:4,className:w(c.root,n,p==="fixed"&&"mui-fixed"),ref:t,...u})}),yo=z(e.jsx("path",{d:"M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"})),vo=m(K,{name:"MuiBreadcrumbCollapsed"})(R(({theme:o})=>({display:"flex",marginLeft:`calc(${o.spacing(1)} * 0.5)`,marginRight:`calc(${o.spacing(1)} * 0.5)`,...o.palette.mode==="light"?{backgroundColor:o.palette.grey[100],color:o.palette.grey[700]}:{backgroundColor:o.palette.grey[700],color:o.palette.grey[100]},borderRadius:2,"&:hover, &:focus":{...o.palette.mode==="light"?{backgroundColor:o.palette.grey[200]}:{backgroundColor:o.palette.grey[600]}},"&:active":{boxShadow:o.shadows[0],...o.palette.mode==="light"?{backgroundColor:N(o.palette.grey[200],.12)}:{backgroundColor:N(o.palette.grey[600],.12)}}}))),ko=m(yo)({width:24,height:16});function Bo(o){const{slots:r={},slotProps:t={},...a}=o,n=o;return e.jsx("li",{children:e.jsx(vo,{focusRipple:!0,...a,ownerState:n,children:e.jsx(ko,{as:r.CollapsedIcon,ownerState:n,...t.collapsedIcon})})})}function Co(o){return S("MuiBreadcrumbs",o)}const jo=M("MuiBreadcrumbs",["root","ol","li","separator"]),So=o=>{const{classes:r}=o;return I({root:["root"],li:["li"],ol:["ol"],separator:["separator"]},Co,r)},Mo=m(U,{name:"MuiBreadcrumbs",slot:"Root",overridesResolver:(o,r)=>[{[`& .${jo.li}`]:r.li},r.root]})({}),Ao=m("ol",{name:"MuiBreadcrumbs",slot:"Ol"})({display:"flex",flexWrap:"wrap",alignItems:"center",padding:0,margin:0,listStyle:"none"}),wo=m("li",{name:"MuiBreadcrumbs",slot:"Separator"})({display:"flex",userSelect:"none",marginLeft:8,marginRight:8});function Io(o,r,t,a){return o.reduce((n,s,i)=>(i<o.length-1?n=n.concat(s,e.jsx(wo,{"aria-hidden":!0,className:r,ownerState:a,children:t},`separator-${i}`)):n.push(s),n),[])}const Ro=g.forwardRef(function(r,t){const a=A({props:r,name:"MuiBreadcrumbs"}),{children:n,className:s,component:i="nav",slots:p={},slotProps:u={},expandText:d="Show path",itemsAfterCollapse:c=1,itemsBeforeCollapse:l=1,maxItems:h=8,separator:k="/",...Q}=a,[T,W]=g.useState(!1),b={...a,component:i,expanded:T,expandText:d,itemsAfterCollapse:c,itemsBeforeCollapse:l,maxItems:h,separator:k},y=So(b),H=Z({elementType:p.CollapsedIcon,externalSlotProps:u.collapsedIcon,ownerState:b}),P=g.useRef(null),G=x=>{const C=()=>{W(!0);const E=P.current.querySelector("a[href],button,[tabindex]");E&&E.focus()};return l+c>=x.length?x:[...x.slice(0,l),e.jsx(Bo,{"aria-label":d,slots:{CollapsedIcon:p.CollapsedIcon},slotProps:{collapsedIcon:H},onClick:C},"ellipsis"),...x.slice(x.length-c,x.length)]},B=g.Children.toArray(n).filter(x=>g.isValidElement(x)).map((x,C)=>e.jsx("li",{className:y.li,children:x},`child-${C}`));return e.jsx(Mo,{ref:t,component:i,color:"textSecondary",className:w(y.root,s),ownerState:b,...Q,children:e.jsx(Ao,{className:y.ol,ref:P,ownerState:b,children:Io(T||h&&B.length<=h?B:G(B),y.separator,k,b)})})});function zo(o){return S("MuiToolbar",o)}M("MuiToolbar",["root","gutters","regular","dense"]);const To=o=>{const{classes:r,disableGutters:t,variant:a}=o;return I({root:["root",!t&&"gutters",a]},zo,r)},Po=m("div",{name:"MuiToolbar",slot:"Root",overridesResolver:(o,r)=>{const{ownerState:t}=o;return[r.root,!t.disableGutters&&r.gutters,r[t.variant]]}})(R(({theme:o})=>({position:"relative",display:"flex",alignItems:"center",variants:[{props:({ownerState:r})=>!r.disableGutters,style:{paddingLeft:o.spacing(2),paddingRight:o.spacing(2),[o.breakpoints.up("sm")]:{paddingLeft:o.spacing(3),paddingRight:o.spacing(3)}}},{props:{variant:"dense"},style:{minHeight:48}},{props:{variant:"regular"},style:o.mixins.toolbar}]}))),Eo=g.forwardRef(function(r,t){const a=A({props:r,name:"MuiToolbar"}),{className:n,component:s="div",disableGutters:i=!1,variant:p="regular",...u}=a,d={...a,component:s,disableGutters:i,variant:p},c=To(d);return e.jsx(Po,{as:s,className:w(c.root,n),ref:t,ownerState:d,...u})}),No=O({themeId:q}),$o=z(e.jsx("path",{d:"M10 6 8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"})),Do=z(e.jsx("path",{d:"M3 18h18v-2H3zm0-5h18v-2H3zm0-7v2h18V6z"}));function Uo(){const o=oo(),r=o["*"],t=ro();return e.jsx(f,{sx:{display:"flex",alignItems:"center"},children:e.jsxs(Ro,{"aria-label":"breadcrumb",separator:e.jsx($o,{sx:{fontSize:14,color:"text.secondary"}}),sx:{"& .MuiBreadcrumbs-separator":{margin:"0 6px"}},children:[o.projectName&&e.jsx(j,{onClick:a=>t(`/${o.projectName}/`,a),label:o.projectName,size:"medium",sx:{backgroundColor:"background.paper",color:"primary.main",fontWeight:500,height:"32px",fontSize:"1rem",cursor:"pointer","&:hover":{backgroundColor:"primary.100"}}}),o.packageName&&e.jsx(j,{onClick:a=>t(`/${o.projectName}/${o.packageName}/`,a),label:o.packageName,size:"medium",sx:{backgroundColor:"background.paper",color:"primary.main",fontWeight:500,height:"32px",fontSize:"1rem",cursor:"pointer","&:hover":{backgroundColor:"secondary.100"}}}),r&&e.jsx(j,{onClick:a=>t(`/${o.projectName}/${o.packageName}/${r}`,a),label:r,size:"medium",sx:{backgroundColor:"background.paper",color:"primary.main",fontWeight:500,height:"32px",fontSize:"1rem",cursor:"pointer","&:hover":{backgroundColor:"grey.200"}}})]})})}function Lo({logoHeader:o,endCap:r}){const t=eo(),a=to(),n=No(a.breakpoints.down("sm")),[s,i]=g.useState(null),p=!!s,u=l=>{i(l.currentTarget)},d=()=>i(null),c=[{label:"Malloy Docs",link:"https://docs.malloydata.dev/documentation/",sx:{color:"primary.main"}},{label:"Publisher Docs",link:"https://github.com/malloydata/publisher/blob/main/README.md",sx:{color:"primary.main"}},{label:"Publisher API",link:"/api-doc.html",sx:{color:"primary.main"}}];return e.jsxs(ho,{position:"sticky",elevation:0,sx:{backgroundColor:"background.paper",borderBottom:"1px solid",borderColor:"divider"},children:[e.jsxs(Eo,{sx:{justifyContent:"space-between",flexWrap:"nowrap",minHeight:44},children:[o||e.jsxs(f,{sx:{display:"flex",alignItems:"center",gap:1,cursor:"pointer"},onClick:()=>t("/"),children:[e.jsx(f,{component:"img",src:"/logo.svg",alt:"Malloy",sx:{width:28,height:28}}),e.jsx(U,{variant:"h6",sx:{color:"text.primary",fontWeight:700,letterSpacing:"-0.025em",fontSize:{xs:"1.1rem",sm:"1.25rem"}},children:"Malloy Publisher"})]}),n?e.jsxs(e.Fragment,{children:[e.jsx(ao,{color:"inherit",onClick:u,children:e.jsx(Do,{})}),e.jsxs(so,{anchorEl:s,open:p,onClose:d,anchorOrigin:{vertical:"bottom",horizontal:"right"},children:[c.map(l=>e.jsx($,{onClick:()=>{d(),window.location.href=l.link},sx:l.sx,children:l.label},l.label)),r&&e.jsx($,{children:r})]})]}):e.jsxs(no,{direction:"row",spacing:2,alignItems:"center",children:[c.map(l=>e.jsx(lo,{href:l.link,sx:l.sx,children:l.label},l.label)),r]})]}),e.jsx(f,{sx:{borderTop:"1px solid white",paddingLeft:"16px",paddingRight:"16px",marginBottom:"1px",overflowX:"auto"},children:e.jsx(Uo,{})})]})}function Qo({headerProps:o}){return e.jsxs(f,{sx:{display:"flex",flexDirection:"column",minHeight:"100vh"},children:[e.jsx(Lo,{...o}),e.jsx(io,{maxWidth:"xl",component:"main",sx:{flex:1,display:"flex",flexDirection:"column",py:2,gap:2},children:e.jsx(f,{sx:{flex:1},children:e.jsx(g.Suspense,{fallback:e.jsx(po,{}),children:e.jsx(co,{})})})})]})}export{Qo as default};

package/dist/app/assets/ModelPage-Bt37smot.js

@@ -1 +0,0 @@
-import{t as n,j as e,E as i,F as t,G as c}from"./index-Bu0ub036.js";function o(){const a=n(),r=a["*"];if(!a.projectName)return e.jsx("div",{children:e.jsx("h2",{children:"Missing project name"})});if(!a.packageName)return e.jsx("div",{children:e.jsx("h2",{children:"Missing package name"})});const s=i({projectName:a.projectName,packageName:a.packageName,modelPath:r});return r?.endsWith(".malloy")?e.jsx(t,{resourceUri:s,runOnDemand:!0,maxResultSize:512*1024}):r?.endsWith(".malloynb")?e.jsx(c,{resourceUri:s,maxResultSize:1024*1024}):e.jsx("div",{children:e.jsxs("h2",{children:["Unrecognized file type: ",r]})})}export{o as default};

package/dist/app/assets/PackagePage-DLZe50WG.js

@@ -1 +0,0 @@
-import{t as n,d as c,j as e,E as t,H as o}from"./index-Bu0ub036.js";function l(){const{projectName:s,packageName:a}=n(),r=c();if(s)if(a){const i=t({projectName:s,packageName:a});return e.jsx(o,{onClickPackageFile:r,resourceUri:i})}else return e.jsx("div",{children:e.jsx("h2",{children:"Missing package name"})});else return e.jsx("div",{children:e.jsx("h2",{children:"Missing project name"})})}export{l as default};

package/dist/app/assets/ProjectPage-FQTEPXP4.js

@@ -1 +0,0 @@
-import{d as a,t as n,j as e,E as o,J as c}from"./index-Bu0ub036.js";function u(){const r=a(),{projectName:s}=n();if(s){const t=o({projectName:s});return e.jsx(c,{onSelectPackage:r,resourceUri:t})}else return e.jsx("div",{children:e.jsx("h2",{children:"Missing project name"})})}export{u as default};

package/dist/app/assets/WorkbookPage-CkAo16ar.js

@@ -1 +0,0 @@
-import{t as a,j as e,E as t,Z as c}from"./index-Bu0ub036.js";function d(){const{workspace:r,workbookPath:s,projectName:i,packageName:n}=a();if(r)if(s)if(i)if(n){const o=t({projectName:i,packageName:n});return e.jsx(c,{workbookPath:{path:s,workspace:r},resourceUri:o},`${s}`)}else return e.jsx("div",{children:e.jsx("h2",{children:"Missing package name"})});else return e.jsx("div",{children:e.jsx("h2",{children:"Missing project name"})});else return e.jsx("div",{children:e.jsx("h2",{children:"Missing workbook path"})});else return e.jsx("div",{children:e.jsx("h2",{children:"Missing workspace"})})}export{d as default};

package/src/mcp/resources/project_resource.ts

@@ -1,184 +0,0 @@
-import {
-   McpServer,
-   ResourceTemplate,
-} from "@modelcontextprotocol/sdk/server/mcp.js";
-import type { ListResourcesResult } from "@modelcontextprotocol/sdk/types.js"; // Needed for list return type
-import { logger } from "../../logger";
-import { ProjectStore } from "../../service/project_store";
-import { getInternalError, getNotFoundError } from "../error_messages"; // Needed for error handling in list AND get
-import { handleResourceGet, McpGetResourceError } from "../handler_utils";
-import { RESOURCE_METADATA } from "../resource_metadata";
-
-// Define an interface for the package object augmented with project name
-interface PackageWithProject {
-   name?: string;
-   // Add other relevant package properties if needed
-   projectName: string;
-}
-
-/**
- * Registers the Malloy Project resource type with the MCP server.
- * Handles getting details for the hardcoded 'home' project and listing packages within it.
- */
-export function registerProjectResource(
-   mcpServer: McpServer,
-   projectStore: ProjectStore,
-): void {
-   mcpServer.resource(
-      "project",
-      new ResourceTemplate("malloy://project/{projectName}", {
-         /**
-          * Handles ListResources requests.
-          * If projectName is specified, lists packages for that project (only 'home' supported).
-          * If projectName is not specified (general ListResources call), lists packages for the default 'home' project.
-          */
-         list: async (/* extra: ListProjectExtra - Deleted */): Promise<ListResourcesResult> => {
-            logger.info(
-               "[MCP LOG] Entering ListResources (project) handler (listing ALL packages)...",
-            );
-            // Ignore parameters from 'extra' as URI path params aren't passed to list handlers.
-
-            try {
-               const allProjects = await projectStore.listProjects();
-               logger.info(
-                  `[MCP LOG] Found ${allProjects.length} projects defined.`,
-               );
-
-               const packagePromises = allProjects.map(async (proj) => {
-                  try {
-                     logger.info(
-                        `[MCP LOG] Getting project '${proj.name}' to list its packages...`,
-                     );
-                     const projectInstance = await projectStore.getProject(
-                        proj.name!,
-                        false,
-                     ); // Use proj.name
-                     const packages = await projectInstance.listPackages();
-                     logger.info(
-                        `[MCP LOG] Found ${packages.length} packages in project '${proj.name}'.`,
-                     );
-                     // Return packages along with their project name for URI construction
-                     return packages.map((pkg) => ({
-                        ...pkg,
-                        projectName: proj.name,
-                     }));
-                  } catch (projectError) {
-                     logger.error(
-                        `[MCP Server Error] Error getting/listing packages for project ${proj.name}:`,
-                        { error: projectError },
-                     );
-                     return []; // Return empty array for this project on error
-                  }
-               });
-
-               const results = await Promise.allSettled(packagePromises);
-               const allPackagesWithProjectName = results
-                  .filter((result) => result.status === "fulfilled")
-                  // Use the specific interface instead of any[]
-                  .flatMap(
-                     (result) =>
-                        (result as PromiseFulfilledResult<PackageWithProject[]>)
-                           .value,
-                  );
-
-               logger.info(
-                  `[MCP LOG] Total packages found across all projects: ${allPackagesWithProjectName.length}`,
-               );
-
-               const packageMetadata = RESOURCE_METADATA.package;
-               const mappedResources = allPackagesWithProjectName.map((pkg) => {
-                  const name = pkg.name || "unknown";
-                  // Construct URI using the package's specific projectName
-                  const uri = `malloy://project/${pkg.projectName}/package/${name}`;
-                  return {
-                     uri: uri,
-                     name: name,
-                     type: "package",
-                     description: packageMetadata?.description as
-                        | string
-                        | undefined,
-                     metadata: packageMetadata,
-                  };
-               });
-
-               logger.info(
-                  `[MCP LOG] ListResources (project): Returning ${mappedResources.length} package resources.`,
-               );
-               return {
-                  resources: mappedResources,
-               };
-            } catch (error) {
-               // Catch errors from projectStore.listProjects() itself
-               logger.error(`[MCP Server Error] Error listing projects:`, {
-                  error,
-               });
-               const errorDetails = getInternalError(
-                  `ListResources (project - initial list)`,
-                  error,
-               );
-               logger.error("MCP ListResources (project) error:", {
-                  error: errorDetails.message,
-               });
-               logger.info(
-                  "[MCP LOG] ListResources (project): Returning empty on error listing projects.",
-               );
-               return { resources: [] };
-            }
-         },
-      }),
-      /** Handles GetResource requests for Malloy Projects */
-      (uri, params) =>
-         handleResourceGet(
-            uri,
-            params,
-            "project",
-            async ({ projectName }: { projectName?: unknown }) => {
-               logger.info(
-                  `[MCP LOG] Entering GetResource (project) handler for projectName: ${projectName}`,
-               );
-               // Validate project name parameter
-               if (typeof projectName !== "string") {
-                  logger.error(
-                     "[MCP LOG] GetResource (project): Invalid project name param.",
-                  );
-                  throw new Error("Invalid project name parameter.");
-               }
-
-               try {
-                  logger.info(
-                     `[MCP LOG] GetResource: Getting project '${projectName}'...`,
-                  );
-                  // Get the project instance, but we might not need its metadata directly
-                  await projectStore.getProject(projectName, false);
-                  // Construct the definition object expected by the test
-                  const definition = { name: projectName };
-                  logger.info(
-                     `[MCP LOG] GetResource (project): Returning definition for '${projectName}'.`,
-                  );
-                  // Return the explicit definition structure
-                  return definition;
-               } catch (error) {
-                  logger.error(
-                     `[MCP LOG] GetResource (project): Error caught for '${projectName}':`,
-                     { error },
-                  );
-                  // Catch expected errors from this specific resource logic
-                  if (error instanceof Error) {
-                     // Use getNotFoundError for the specific project not found case
-                     // or a generic message for the invalid param case.
-                     const errorDetails = getNotFoundError(
-                        error.message.includes("not found")
-                           ? `Project '${projectName}'` // More specific context
-                           : `Invalid project identifier provided for URI ${uri.href}`, // Generic but informative
-                     );
-                     // Re-throw structured error for handleResourceGet to catch
-                     throw new McpGetResourceError(errorDetails);
-                  }
-                  // Re-throw unexpected errors to be caught by handleResourceGet's generic handler
-                  throw error;
-               }
-            },
-            RESOURCE_METADATA.project,
-         ),
-   );
-}

package/src/service/resolve_project.ts

@@ -1,13 +0,0 @@
-import { ProjectNotFoundError } from "../errors";
-import { ResourceRepository } from "../storage/DatabaseInterface";
-
-export async function resolveProjectId(
-   repository: ResourceRepository,
-   projectName: string,
-): Promise<string> {
-   const dbProject = await repository.getProjectByName(projectName);
-   if (!dbProject) {
-      throw new ProjectNotFoundError(`Project '${projectName}' not found`);
-   }
-   return dbProject.id;
-}