@lobb-js/lobb-ext-reports 0.11.0 → 0.11.1

package/extensions/reports/workflows.ts

@@ -0,0 +1,73 @@
+import type { Lobb, Workflow } from "@lobb-js/core";
+import type { Context } from "hono";
+
+export const workflows: Workflow[] = [
+  {
+    // Intercept GET /api/collections/reports_charts/:id when ?action=run_query
+    // is present — runs the chart's parsed function and short-circuits the
+    // default findOne behaviour by throwing a Response.
+    name: "reports_chartsRunQueryHandler",
+    eventName: "core.controllers.preFindOne",
+    handler: async (input, ctx) => {
+      if (input.collectionName !== "reports_charts") return input;
+
+      const c = input.context as Context;
+      const actionQuery = c.req.query("action");
+      if (!actionQuery) return input;
+
+      if (actionQuery !== "run_query") {
+        throw new ctx.LobbError({
+          code: "BAD_REQUEST",
+          message: `The passed (${actionQuery}) action query param is not supported`,
+        });
+      }
+
+      const lobb = c.get("lobb") as Lobb;
+      const reportRecordId = input.id;
+      const contextParam = c.req.query("context");
+      const context = JSON.parse(contextParam ?? "{}");
+
+      const driver = lobb.databaseService.getDriver();
+      const pool = driver.getConnection();
+      using client = await pool.connect();
+
+      const chartRecord = (await lobb.collectionService.findOne({
+        collectionName: "reports_charts",
+        client,
+        id: reportRecordId,
+      })).data;
+
+      if (!chartRecord) {
+        throw new ctx.LobbError({
+          code: "NOT_FOUND",
+          message: `The chart you are looking for does not exist.`,
+        });
+      }
+
+      const pendingQueries: Promise<unknown>[] = [];
+
+      async function query(sql: string, args: Record<string, any>) {
+        const promise = client.query(sql, args).then((result) => result.rows);
+        pendingQueries.push(promise);
+        return await promise;
+      }
+
+      try {
+        const chartReturnedValue = await lobb.utils.runParsedFunction(
+          chartRecord.chart,
+          query,
+          context,
+        );
+        await Promise.allSettled(pendingQueries);
+        throw new Response(JSON.stringify(chartReturnedValue), {
+          status: 200,
+          headers: { "Content-Type": "application/json" },
+        });
+      } catch (error) {
+        if (error instanceof Response) throw error;
+        await Promise.allSettled(pendingQueries);
+        throw error;
+      }
+    },
+  },
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobb-js/lobb-ext-reports",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "license": "UNLICENSED",
   "type": "module",
   "publishConfig": {
@@ -32,7 +32,7 @@
     "package": "svelte-package --input extensions/reports/studio"
   },
   "dependencies": {
-    "@lobb-js/core": "^0.31.9",
+    "@lobb-js/core": "^0.32.1",
     "chart.js": "^4.4.8",
     "gridstack": "^12.6.0",
     "hono": "^4.7.0",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@faker-js/faker": "^9.6.0",
-    "@lobb-js/studio": "^0.29.0",
+    "@lobb-js/studio": "^0.29.1",
     "@lucide/svelte": "^0.563.1",
     "@sveltejs/adapter-node": "^5.5.4",
     "@sveltejs/kit": "^2.60.1",

package/extensions/reports/collectionRoutes.ts

@@ -1,10 +0,0 @@
-import type { Hono } from "hono";
-
-import { ChartsController } from "./controllers/chartsController.ts";
-
-export function collectionRoutes(route: Hono) {
-  route.get(
-    "/reports_charts/:id",
-    ChartsController.findOne,
-  );
-}

package/extensions/reports/controllers/chartsController.ts

@@ -1,78 +0,0 @@
-import type { Context } from "hono";
-import type { Lobb } from "@lobb-js/core";
-import { LobbError } from "@lobb-js/core";
-
-export class ChartsController {
-  public static async findOne(c: Context) {
-    const lobb = c.get("lobb") as Lobb;
-    const reportRecordId = c.req.param("id");
-    const actionQuery = c.req.query("action");
-    const context = c.req.query("context");
-
-    if (actionQuery) {
-      if (actionQuery === "run_query") {
-        return await handleRunQuery(
-          reportRecordId,
-          lobb,
-          c,
-          JSON.parse(context ?? "{}"),
-        );
-      } else {
-        throw new LobbError({
-          code: "BAD_REQUEST",
-          message:
-            `The passed (${actionQuery}) action query param is not supported`,
-        });
-      }
-    }
-
-    return await lobb.collectionControllers.findOne(
-      c,
-    ) as Response;
-  }
-}
-
-async function handleRunQuery(
-  reportRecordId: string,
-  lobb: Lobb,
-  c: Context,
-  context: Record<string, unknown>,
-) {
-  const driver = lobb.databaseService.getDriver();
-  const pool = driver.getConnection();
-  using client = await pool.connect();
-
-  const chartRecord = (await lobb.collectionService.findOne({
-    collectionName: "reports_charts",
-    client,
-    id: reportRecordId,
-  })).data;
-
-  if (!chartRecord) {
-    throw new LobbError({
-      code: "NOT_FOUND",
-      message: `The chart you are looking for does not exist.`,
-    });
-  }
-
-  const pendingQueries: Promise<unknown>[] = [];
-
-  async function query(sql: string, args: Record<string, any>) {
-    const promise = client.query(sql, args).then((result) => result.rows);
-    pendingQueries.push(promise);
-    return await promise;
-  }
-
-  try {
-    const chartReturnedValue = await lobb.utils.runParsedFunction(
-      chartRecord.chart,
-      query,
-      context,
-    );
-    await Promise.allSettled(pendingQueries);
-    return c.json(chartReturnedValue, 200);
-  } catch (error) {
-    await Promise.allSettled(pendingQueries);
-    throw error;
-  }
-}