yamchart 0.4.15 → 0.4.16

package/dist/{dev-7XROGYXG.js → dev-XC47BMBS.js}

@@ -61,7 +61,7 @@ import fastifyStatic from "@fastify/static";
 
 // ../server/dist/services/config-loader.js
 import { readFile, readdir, access } from "fs/promises";
-import { join, extname } from "path";
+import { join, extname, relative, dirname } from "path";
 import { parse as parseYaml } from "yaml";
 import { watch } from "chokidar";
 var ConfigLoader = class {
@@ -69,8 +69,12 @@ var ConfigLoader = class {
   project = null;
   connections = /* @__PURE__ */ new Map();
   charts = /* @__PURE__ */ new Map();
+  chartFolders = /* @__PURE__ */ new Map();
+  chartFilePaths = /* @__PURE__ */ new Map();
   models = /* @__PURE__ */ new Map();
   dashboards = /* @__PURE__ */ new Map();
+  dashboardFolders = /* @__PURE__ */ new Map();
+  dashboardFilePaths = /* @__PURE__ */ new Map();
   schedules = /* @__PURE__ */ new Map();
   watcher = null;
   onChangeCallbacks = [];
@@ -78,6 +82,15 @@ var ConfigLoader = class {
     this.projectDir = projectDir;
   }
   async load() {
+    this.connections.clear();
+    this.charts.clear();
+    this.chartFolders.clear();
+    this.chartFilePaths.clear();
+    this.models.clear();
+    this.dashboards.clear();
+    this.dashboardFolders.clear();
+    this.dashboardFilePaths.clear();
+    this.schedules.clear();
     await this.loadProject();
     await this.loadConnections();
     await this.loadCharts();
@@ -129,18 +142,31 @@ var ConfigLoader = class {
     } catch {
       return;
     }
-    const files = await readdir(chartsDir);
-    for (const file of files) {
-      if (extname(file) !== ".yaml" && extname(file) !== ".yml")
-        continue;
-      const filePath = join(chartsDir, file);
-      const content = await readFile(filePath, "utf-8");
-      const parsed = parseYaml(content);
-      const result = ChartSchema.safeParse(parsed);
-      if (result.success) {
-        this.charts.set(result.data.name, result.data);
-      } else {
-        console.warn(`Invalid chart file ${file}: ${result.error.message}`);
+    await this.loadChartsFromDir(chartsDir, chartsDir);
+  }
+  async loadChartsFromDir(dir, baseDir) {
+    const entries = await readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = join(dir, entry.name);
+      if (entry.isDirectory() && dir === baseDir) {
+        await this.loadChartsFromDir(fullPath, baseDir);
+      } else if (entry.isFile() && (extname(entry.name) === ".yaml" || extname(entry.name) === ".yml")) {
+        const content = await readFile(fullPath, "utf-8");
+        const parsed = parseYaml(content);
+        const result = ChartSchema.safeParse(parsed);
+        if (result.success) {
+          const name = result.data.name;
+          if (this.charts.has(name)) {
+            console.warn(`Duplicate chart name "${name}" in ${relative(baseDir, fullPath)} (already loaded from ${relative(baseDir, this.chartFilePaths.get(name))})`);
+            continue;
+          }
+          this.charts.set(name, result.data);
+          this.chartFilePaths.set(name, fullPath);
+          const relDir = relative(baseDir, dirname(fullPath)).replace(/\\/g, "/");
+          this.chartFolders.set(name, relDir || "");
+        } else {
+          console.warn(`Invalid chart file ${entry.name}: ${result.error.message}`);
+        }
       }
     }
   }
@@ -181,18 +207,31 @@ var ConfigLoader = class {
     } catch {
       return;
     }
-    const files = await readdir(dashboardsDir);
-    for (const file of files) {
-      if (extname(file) !== ".yaml" && extname(file) !== ".yml")
-        continue;
-      const filePath = join(dashboardsDir, file);
-      const content = await readFile(filePath, "utf-8");
-      const parsed = parseYaml(content);
-      const result = DashboardSchema.safeParse(parsed);
-      if (result.success) {
-        this.dashboards.set(result.data.name, result.data);
-      } else {
-        console.warn(`Invalid dashboard file ${file}: ${result.error.message}`);
+    await this.loadDashboardsFromDir(dashboardsDir, dashboardsDir);
+  }
+  async loadDashboardsFromDir(dir, baseDir) {
+    const entries = await readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = join(dir, entry.name);
+      if (entry.isDirectory() && dir === baseDir) {
+        await this.loadDashboardsFromDir(fullPath, baseDir);
+      } else if (entry.isFile() && (extname(entry.name) === ".yaml" || extname(entry.name) === ".yml")) {
+        const content = await readFile(fullPath, "utf-8");
+        const parsed = parseYaml(content);
+        const result = DashboardSchema.safeParse(parsed);
+        if (result.success) {
+          const name = result.data.name;
+          if (this.dashboards.has(name)) {
+            console.warn(`Duplicate dashboard name "${name}" in ${relative(baseDir, fullPath)} (already loaded from ${relative(baseDir, this.dashboardFilePaths.get(name))})`);
+            continue;
+          }
+          this.dashboards.set(name, result.data);
+          this.dashboardFilePaths.set(name, fullPath);
+          const relDir = relative(baseDir, dirname(fullPath)).replace(/\\/g, "/");
+          this.dashboardFolders.set(name, relDir || "");
+        } else {
+          console.warn(`Invalid dashboard file ${entry.name}: ${result.error.message}`);
+        }
       }
     }
   }
@@ -252,11 +291,6 @@ var ConfigLoader = class {
   }
   async reload() {
     try {
-      this.connections.clear();
-      this.charts.clear();
-      this.models.clear();
-      this.dashboards.clear();
-      this.schedules.clear();
       await this.load();
       for (const callback of this.onChangeCallbacks) {
         callback();
@@ -292,6 +326,12 @@ var ConfigLoader = class {
   getChartByName(name) {
     return this.charts.get(name);
   }
+  getChartFolder(name) {
+    return this.chartFolders.get(name) ?? "";
+  }
+  getChartFilePath(name) {
+    return this.chartFilePaths.get(name);
+  }
   getModels() {
     return Array.from(this.models.values());
   }
@@ -315,6 +355,12 @@ var ConfigLoader = class {
   getDashboardByName(name) {
     return this.dashboards.get(name);
   }
+  getDashboardFolder(name) {
+    return this.dashboardFolders.get(name) ?? "";
+  }
+  getDashboardFilePath(name) {
+    return this.dashboardFilePaths.get(name);
+  }
   getSchedules() {
     return Array.from(this.schedules.values());
   }
@@ -646,7 +692,8 @@ async function configRoutes(fastify, options) {
         name: c.name,
         title: c.title,
         description: c.description,
-        type: c.chart.type
+        type: c.chart.type,
+        folder: configLoader.getChartFolder(c.name)
       })),
       connections: connections.map((c) => ({
         name: c.name,
@@ -906,7 +953,8 @@ async function dashboardRoutes(fastify, options) {
     return dashboards.map((d) => ({
       name: d.name,
       title: d.title,
-      description: d.description
+      description: d.description,
+      folder: configLoader.getDashboardFolder(d.name)
     }));
   });
   fastify.get("/api/dashboards/:id", async (request, reply) => {
@@ -947,7 +995,7 @@ async function dashboardRoutes(fastify, options) {
       }
       updated = { ...dashboard, layout };
     }
-    const filePath = join3(projectDir, "dashboards", `${id}.yaml`);
+    const filePath = configLoader.getDashboardFilePath(id) ?? join3(projectDir, "dashboards", `${id}.yaml`);
     await writeFile(filePath, stringifyYaml(updated));
     await configLoader.load();
     const commitMessage = message || `Update ${dashboard.title} layout`;
@@ -13445,10 +13493,10 @@ data: ${data}
 }
 
 // ../server/dist/server.js
-import { join as join4, dirname } from "path";
+import { join as join4, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 import { access as access2, readFile as readFile2 } from "fs/promises";
-var __dirname = dirname(fileURLToPath(import.meta.url));
+var __dirname = dirname2(fileURLToPath(import.meta.url));
 var packageJsonPath = join4(__dirname, "..", "package.json");
 var packageJson = JSON.parse(await readFile2(packageJsonPath, "utf-8"));
 var VERSION = packageJson.version;
@@ -13790,4 +13838,4 @@ async function runDevServer(projectDir, options) {
 export {
   runDevServer
 };
-//# sourceMappingURL=dev-7XROGYXG.js.map
+//# sourceMappingURL=dev-XC47BMBS.js.map