@opengis/bi 1.2.5 → 1.2.7

package/dist/{vs-funnel-bar-CyPcyYTP.js → vs-funnel-bar-BzIfzGso.js}

@@ -1,4 +1,4 @@
-import { _ as n, c, a as o, b as h, d as l } from "./import-file-iZU4En2W.js";
+import { _ as n, c, a as o, b as h, d as l } from "./import-file-DnbEvuUN.js";
 import { createElementBlock as d, openBlock as p } from "vue";
 const u = {
   name: "VsFunnelBar",

package/dist/{vs-list-BoMIMCT2.js → vs-list-_I6Z56hC.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as l, openBlock as h, createStaticVNode as V, createElementVNode as a, withDirectives as B, toDisplayString as L, vShow as P, Fragment as z, renderList as S, normalizeClass as G, resolveComponent as j, createVNode as D } from "vue";
-import { _ as p } from "./import-file-iZU4En2W.js";
+import { _ as p } from "./import-file-DnbEvuUN.js";
 function N(t) {
   return [
     {
@@ -180,9 +180,9 @@ const O = {
   class: "icon icon-tabler icons-tabler-outline icon-tabler-list-details"
 };
 function J(t, e) {
-  return h(), l("svg", W, [...e[0] || (e[0] = [
+  return h(), l("svg", W, e[0] || (e[0] = [
     V('<path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M13 5h8"></path><path d="M13 9h5"></path><path d="M13 15h8"></path><path d="M13 19h5"></path><path d="M3 4m0 1a1 1 0 0 1 1 -1h4a1 1 0 0 1 1 1v4a1 1 0 0 1 -1 1h-4a1 1 0 0 1 -1 -1z"></path><path d="M3 14m0 1a1 1 0 0 1 1 -1h4a1 1 0 0 1 1 1v4a1 1 0 0 1 -1 1h-4a1 1 0 0 1 -1 -1z"></path>', 7)
-  ])]);
+  ]));
 }
 const U = /* @__PURE__ */ p(R, [["render", J]]), Z = {}, q = {
   class: "shrink-0 size-3",
@@ -197,10 +197,10 @@ const U = /* @__PURE__ */ p(R, [["render", J]]), Z = {}, q = {
   "stroke-linejoin": "round"
 };
 function A(t, e) {
-  return h(), l("svg", q, [...e[0] || (e[0] = [
+  return h(), l("svg", q, e[0] || (e[0] = [
     a("path", { d: "M18 6 6 18" }, null, -1),
     a("path", { d: "m6 6 12 12" }, null, -1)
-  ])]);
+  ]));
 }
 const K = /* @__PURE__ */ p(Z, [["render", A]]), zt = {
   pink: ["#fde7e2", "#feafbe", "#fd58a4", "#d7038e", "#86007b"],
@@ -407,7 +407,7 @@ const ot = {}, nt = {
   class: "icon icon-tabler icons-tabler-outline icon-tabler-home"
 };
 function at(t, e) {
-  return h(), l("svg", nt, [...e[0] || (e[0] = [
+  return h(), l("svg", nt, e[0] || (e[0] = [
     a("path", {
       stroke: "none",
       d: "M0 0h24v24H0z",
@@ -416,7 +416,7 @@ function at(t, e) {
     a("path", { d: "M5 12l-2 0l9 -9l9 9l-2 0" }, null, -1),
     a("path", { d: "M5 12v7a2 2 0 0 0 2 2h10a2 2 0 0 0 2 -2v-7" }, null, -1),
     a("path", { d: "M9 21v-6a2 2 0 0 1 2 -2h2a2 2 0 0 1 2 2v6" }, null, -1)
-  ])]);
+  ]));
 }
 const ct = /* @__PURE__ */ p(ot, [["render", at]]), lt = {
   props: ["bbox", "map"],
@@ -450,7 +450,7 @@ const Mt = /* @__PURE__ */ p(lt, [["render", dt]]), ut = {}, pt = {
   "stroke-linejoin": "#9E9E9E"
 };
 function ft(t, e) {
-  return h(), l("svg", pt, [...e[0] || (e[0] = [
+  return h(), l("svg", pt, e[0] || (e[0] = [
     a("circle", {
       cx: "12",
       cy: "12",
@@ -466,7 +466,7 @@ function ft(t, e) {
       cy: "19",
       r: "1"
     }, null, -1)
-  ])]);
+  ]));
 }
 const mt = /* @__PURE__ */ p(ut, [["render", ft]]), yt = {
   components: { legendIcon: U, menuIcon: mt, closeIcon: K },

package/dist/{vs-map-DesSaN8x.js → vs-map-BsmBbjRv.js}

@@ -1,5 +1,5 @@
-import { c as E, l as L, p as $, V as T, a as B, b as H, d as O, e as F } from "./vs-list-BoMIMCT2.js";
-import { _ as V, c as N } from "./import-file-iZU4En2W.js";
+import { c as E, l as L, p as $, V as T, a as B, b as H, d as O, e as F } from "./vs-list-_I6Z56hC.js";
+import { _ as V, c as N } from "./import-file-DnbEvuUN.js";
 import { resolveComponent as u, createElementBlock as p, openBlock as i, Fragment as w, createElementVNode as l, createBlock as C, createCommentVNode as m, createVNode as x, Teleport as P, toDisplayString as f, renderList as S, normalizeStyle as k, normalizeClass as I } from "vue";
 const R = {
   components: { legendIcon: L, closeIcon: E },

package/dist/{vs-map-cluster-Br3XHcWM.js → vs-map-cluster-DT3jfiks.js}

@@ -1,5 +1,5 @@
-import { c as F, l as G, p as T, b as A, V as P, a as Z, d as q, e as D } from "./vs-list-BoMIMCT2.js";
-import { _ as x, V as K, c as W, e as j } from "./import-file-iZU4En2W.js";
+import { c as F, l as G, p as T, b as A, V as P, a as Z, d as q, e as D } from "./vs-list-_I6Z56hC.js";
+import { _ as x, V as K, c as W, e as j } from "./import-file-DnbEvuUN.js";
 import { createElementBlock as p, createCommentVNode as S, openBlock as c, createElementVNode as r, normalizeClass as I, Fragment as N, renderList as R, toDisplayString as O, normalizeStyle as J, createStaticVNode as Q, resolveComponent as g, withDirectives as M, createBlock as k, resolveDynamicComponent as U, createVNode as z, vShow as C } from "vue";
 const X = {
   components: { legendIcon: G, closeIcon: F },
@@ -88,7 +88,7 @@ const ot = /* @__PURE__ */ x(X, [["render", st]]), rt = {}, nt = {
   class: "icon icon-tabler icons-tabler-outline icon-tabler-map"
 };
 function at(e, s) {
-  return c(), p("svg", nt, [...s[0] || (s[0] = [
+  return c(), p("svg", nt, s[0] || (s[0] = [
     r("path", {
       stroke: "none",
       d: "M0 0h24v24H0z",
@@ -97,7 +97,7 @@ function at(e, s) {
     r("path", { d: "M3 7l6 -3l6 3l6 -3v13l-6 3l-6 -3l-6 3v-13" }, null, -1),
     r("path", { d: "M9 4v13" }, null, -1),
     r("path", { d: "M15 7v13" }, null, -1)
-  ])]);
+  ]));
 }
 const lt = /* @__PURE__ */ x(rt, [["render", at]]), it = {}, ct = {
   xmlns: "http://www.w3.org/2000/svg",
@@ -112,7 +112,7 @@ const lt = /* @__PURE__ */ x(rt, [["render", at]]), it = {}, ct = {
   class: "icon icon-tabler icons-tabler-outline icon-tabler-table"
 };
 function pt(e, s) {
-  return c(), p("svg", ct, [...s[0] || (s[0] = [
+  return c(), p("svg", ct, s[0] || (s[0] = [
     r("path", {
       stroke: "none",
       d: "M0 0h24v24H0z",
@@ -121,7 +121,7 @@ function pt(e, s) {
     r("path", { d: "M3 5a2 2 0 0 1 2 -2h14a2 2 0 0 1 2 2v14a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2 -2v-14z" }, null, -1),
     r("path", { d: "M3 10h18" }, null, -1),
     r("path", { d: "M10 3v18" }, null, -1)
-  ])]);
+  ]));
 }
 const dt = /* @__PURE__ */ x(it, [["render", pt]]), ht = {}, ut = {
   xmlns: "http://www.w3.org/2000/svg",
@@ -136,9 +136,9 @@ const dt = /* @__PURE__ */ x(it, [["render", pt]]), ht = {}, ut = {
   class: "icon icon-tabler icons-tabler-outline icon-tabler-align-box-left-stretch"
 };
 function mt(e, s) {
-  return c(), p("svg", ut, [...s[0] || (s[0] = [
+  return c(), p("svg", ut, s[0] || (s[0] = [
     Q('<path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M3 5a2 2 0 0 1 2 -2h14a2 2 0 0 1 2 2v14a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2 -2v-14z"></path><path d="M9 17h-2"></path><path d="M13 12h-6"></path><path d="M11 7h-4"></path>', 5)
-  ])]);
+  ]));
 }
 const gt = /* @__PURE__ */ x(ht, [["render", mt]]), ft = {
   mixins: [W, D],

package/dist/{vs-number-sHlpEuZn.js → vs-number-D28OvROP.js}

@@ -1,4 +1,4 @@
-import { _ as c, c as o, f as n } from "./import-file-iZU4En2W.js";
+import { _ as c, c as o, f as n } from "./import-file-DnbEvuUN.js";
 import { createElementBlock as i, openBlock as m, toDisplayString as s } from "vue";
 const u = {
   name: "VsNumber",

package/dist/{vs-table-C8ibl5_z.js → vs-table-YpK1qNz6.js}

@@ -1,4 +1,4 @@
-import { _ as m, c as f, b as _, d as b } from "./import-file-iZU4En2W.js";
+import { _ as m, c as f, b as _, d as b } from "./import-file-DnbEvuUN.js";
 import { createElementBlock as a, openBlock as r, createElementVNode as s, Fragment as n, renderList as c, toDisplayString as d } from "vue";
 const x = {
   name: "VsTable",

package/dist/{vs-text-CK4PX9CJ.js → vs-text-BU0n2bXl.js}

@@ -1,7 +1,7 @@
 var ge = Object.defineProperty;
 var ke = (c, e, t) => e in c ? ge(c, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[e] = t;
 var k = (c, e, t) => ke(c, typeof e != "symbol" ? e + "" : e, t);
-import { _ as de, c as xe } from "./import-file-iZU4En2W.js";
+import { _ as de, c as xe } from "./import-file-DnbEvuUN.js";
 import { createElementBlock as V, openBlock as J, createCommentVNode as be } from "vue";
 function Q() {
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/bi",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "BI data visualization module",
   "main": "dist/bi.js",
   "browser": "dist/bi.umd.cjs",
@@ -42,7 +42,9 @@
   "author": "Softpro",
   "license": "ISC",
   "dependencies": {
-    "@mapbox/sphericalmercator": "^1.2.0"
+    "@mapbox/sphericalmercator": "^1.2.0",
+    "@opengis/table": "^0.0.30",
+    "lucide-vue-next": "^0.546.0"
   },
   "devDependencies": {
     "@highlightjs/vue-plugin": "github:highlightjs/vue-plugin",

package/server/plugins/vite.js

@@ -1,69 +1,69 @@
-import fs from 'fs';
-import path from 'path';
-import config from '../../config.js';
-
-const { disableAuth } = config;
-const isProduction = process.env.NODE_ENV === 'production';
-
-async function plugin(fastify) {
-  // vite server
-  if (!isProduction) {
-    const vite = await import('vite');
-
-    const viteServer = await vite.createServer({
-      server: {
-        middlewareMode: true,
-      },
-    });
-    // hot reload
-    viteServer.watcher.on('all', (d, t) => {
-      if (!t.includes('module') && !t.includes('templates')) return;
-      // console.log(d, t);
-      viteServer.ws.send({ type: 'full-reload' });
-    });
-
-    // this is middleware for vite's dev servert
-    fastify.addHook('onRequest', async (req, reply) => {
-      // const { user } = req.session?.passport || {};
-      const next = () => new Promise((resolve) => {
-        viteServer.middlewares(req.raw, reply.raw, () => resolve());
-      });
-      await next();
-    });
-    fastify.get('*', async () => {});
-    return;
-  }
-
-  // From Build
-  fastify.get('*', async (req, reply) => {
-    // console.log(disableAuth)
-    if (!req.user && !disableAuth) return reply.redirect('/login');
-    const stream = fs.createReadStream('dist/index.html');
-    return reply
-      .headers({ 'Cache-Control': 'public, no-cache' })
-      .type('text/html')
-      .send(stream);
-  });
-  fastify.get('/assets/:file', async (req, reply) => {
-    const stream = fs.createReadStream(`dist/assets/${req.params.file}`);
-    const ext = path.extname(req.params.file);
-    const mime = {
-      '.js': 'text/javascript',
-      '.css': 'text/css',
-      '.woff2': 'application/font-woff',
-      '.png': 'image/png',
-    }[ext];
-    // reply.cacheControl('max-age', '1d');
-    return mime
-      ? reply
-        .headers({
-          'Cache-Control': 'public, max-age=3600',
-          'Content-Encoding': 'identity',
-        })
-        .type(mime)
-        .send(stream)
-      : stream;
-  });
-}
-
-export default plugin;
+import fs from 'fs';
+import path from 'path';
+import config from '../../config.js';
+
+const { disableAuth } = config;
+const isProduction = process.env.NODE_ENV === 'production';
+
+async function plugin(fastify) {
+  // vite server
+  if (!isProduction) {
+    const vite = await import('vite');
+
+    const viteServer = await vite.createServer({
+      server: {
+        middlewareMode: true,
+      },
+    });
+    // hot reload
+    viteServer.watcher.on('all', (d, t) => {
+      if (!t.includes('module') && !t.includes('templates')) return;
+      // console.log(d, t);
+      viteServer.ws.send({ type: 'full-reload' });
+    });
+
+    // this is middleware for vite's dev servert
+    fastify.addHook('onRequest', async (req, reply) => {
+      // const { user } = req.session?.passport || {};
+      const next = () => new Promise((resolve) => {
+        viteServer.middlewares(req.raw, reply.raw, () => resolve());
+      });
+      await next();
+    });
+    fastify.get('*', async () => {});
+    return;
+  }
+
+  // From Build
+  fastify.get('*', async (req, reply) => {
+    // console.log(disableAuth)
+    if (!req.user && !disableAuth) return reply.redirect('/login');
+    const stream = fs.createReadStream('dist/index.html');
+    return reply
+      .headers({ 'Cache-Control': 'public, no-cache' })
+      .type('text/html')
+      .send(stream);
+  });
+  fastify.get('/assets/:file', async (req, reply) => {
+    const stream = fs.createReadStream(`dist/assets/${req.params.file}`);
+    const ext = path.extname(req.params.file);
+    const mime = {
+      '.js': 'text/javascript',
+      '.css': 'text/css',
+      '.woff2': 'application/font-woff',
+      '.png': 'image/png',
+    }[ext];
+    // reply.cacheControl('max-age', '1d');
+    return mime
+      ? reply
+        .headers({
+          'Cache-Control': 'public, max-age=3600',
+          'Content-Encoding': 'identity',
+        })
+        .type(mime)
+        .send(stream)
+      : stream;
+  });
+}
+
+export default plugin;

package/server/routes/dashboard/controllers/utils/yaml.js

@@ -1,11 +1,11 @@
-import yaml from 'js-yaml';
-
-yaml.loadSafe = (yml) => {
-  try {
-    return yaml.load(yml);
-  } catch (err) {
-    return { error: err.toString() };
-  }
-};
-
-export default yaml;
+import yaml from 'js-yaml';
+
+yaml.loadSafe = (yml) => {
+  try {
+    return yaml.load(yml);
+  } catch (err) {
+    return { error: err.toString() };
+  }
+};
+
+export default yaml;

package/server/routes/map/controllers/cluster.js

@@ -1,125 +1,125 @@
-import { getFilterSQL, logger, pgClients, getMeta } from '@opengis/fastify-table/utils.js';
-
-import { getWidget } from '../../../../utils.js';
-
-import downloadClusterData from './utils/downloadClusterData.js';
-
-const clusterExists = {};
-
-export default async function cluster(req, reply) {
-  const { query = {} } = req;
-  const { widget, filter, dashboard, search } = query;
-
-  if (!widget) {
-    return { message: 'not enough params: widget', status: 400 };
-  }
-
-  const { pg = req.pg || pgClients.client, data, style, controls } = await getWidget({ pg: req.pg, dashboard, widget });
-
-  const pkey = pg.pk?.[data?.table];
-
-  if (!pkey) {
-    return {
-      message: `invalid ${widget ? 'widget' : 'dashboard'}: table pk not found (${data?.table})`,
-      status: 400,
-    };
-  }
-
-  // data param
-  const {
-    table,
-    query: where = '1=1',
-    metrics = [],
-    cluster,
-    clusterTable = {},
-  } = data;
-
-  if (!cluster) {
-    return {
-      message: `invalid ${widget ? 'widget' : 'dashboard'}: cluster column not specified`,
-      status: 400,
-    };
-  }
-
-  if (!metrics.length) {
-    return {
-      message: `invalid ${widget ? 'widget' : 'dashboard'}: metric columns not found`,
-      status: 400,
-    };
-  }
-
-  if (!clusterTable?.name) {
-    Object.assign(clusterTable, {
-      name: 'bi.cluster',
-      title: 'title',
-      query: `type='${cluster}'`,
-    });
-  }
-
-  try {
-    if (cluster && !clusterExists[cluster]) {
-      const res = await downloadClusterData({ pg, cluster });
-      if (res) return res;
-      clusterExists[cluster] = 1;
-    }
-
-    if (clusterTable?.name && !pg.pk?.[clusterTable?.name]) {
-      return {
-        message: 'invalid widget params: clusterTable pkey not found',
-        status: 404,
-      };
-    }
-
-    const { bounds, extentStr } = await pg.query(`select count(*),
-      st_asgeojson(st_extent(geom))::json as bounds,
-      replace(regexp_replace(st_extent(geom)::box2d::text,'BOX\\(|\\)','','g'),' ',',') as "extentStr"
-    from ${table} where ${where || '1=1'}`).then((res) => res.rows?.[0] || {});
-    const extent = extentStr ? extentStr.split(',') : undefined;
-
-    // get sql
-    const { optimizedSQL } =
-      filter || search
-        ? await getFilterSQL({ pg, table, filter, search })
-        : {};
-
-    const { columns = [] } = await getMeta({ pg, table });
-    const columnList = columns.map(el => el.name);
-
-    if (query.metric && typeof query.metric === 'string') {
-      const checkInvalid = query.metric.split(',').find(el => !columnList.includes(el) && el !== 'count');
-      if (checkInvalid) {
-        return reply.status(404).send(`invalid query metric value: ${checkInvalid}`);
-      }
-    }
-
-    const multipleMetrics = query.metric ? query.metric.split(',').map(el => el === 'count' ? 'count(*)' : `sum(${el.replace(/'/g, "''")})::float as ${el}`).join(',') : null;
-    const multipleMetricsOrder = query.metric ? query.metric.split(',').map(el => el === 'count' ? 'count(*)' : `sum(${el.replace(/'/g, "''")})::float`).join(',') : null;
-    const metricFunc = multipleMetrics
-      || `${clusterTable?.operator || 'sum'}("${metrics[0]}")::float`;
-
-    const q = `select b.*, ${metricFunc} ${multipleMetrics ? '' : 'as metric'} 
-        from ${optimizedSQL ? `(${optimizedSQL})` : table} q 
-        left join lateral (select "${pg.pk?.[clusterTable?.name]}" as id, ${clusterTable?.column || cluster} as name, ${clusterTable?.title} as title from ${clusterTable?.name} where ${clusterTable?.codifierColumn || 'codifier'}=q."${clusterTable?.column || cluster}" limit 1)b on 1=1
-        where ${where} group by b.id, b.name, b.title order by ${multipleMetricsOrder || metricFunc} desc`;
-
-    if (query.sql === '1') return q;
-
-    // auto Index
-    //  autoIndex({ table, columns: (metrics || []).concat([cluster]) });
-
-    const { rows = [] } = await pg.query(q);
-    const vals = rows.map((el) => el.metric - 0).sort((a, b) => a - b);
-    const len = vals.length;
-    const sizes = [
-      vals[0],
-      vals[Math.floor(len / 4)],
-      vals[Math.floor(len / 2)],
-      vals[Math.floor(len * 0.75)],
-      vals[len - 1],
-    ];
-    return { sizes, style, controls, metrics, rows, columns: columns.map(({ name, title, dataTypeID }) => ({ name, title, type: pg.pgType[dataTypeID] })), bounds, extent, count: rows.length, total: rows?.reduce((acc, curr) => (curr.metric || 0) + acc, 0) };
-  } catch (err) {
-    logger.file('bi/cluster/error', { error: err.toString(), query });
-    return { error: err.toString(), status: 500 };
-  }
-}
+import { getFilterSQL, logger, pgClients, getMeta } from '@opengis/fastify-table/utils.js';
+
+import { getWidget } from '../../../../utils.js';
+
+import downloadClusterData from './utils/downloadClusterData.js';
+
+const clusterExists = {};
+
+export default async function cluster(req, reply) {
+  const { query = {} } = req;
+  const { widget, filter, dashboard, search } = query;
+
+  if (!widget) {
+    return { message: 'not enough params: widget', status: 400 };
+  }
+
+  const { pg = req.pg || pgClients.client, data, style, controls } = await getWidget({ pg: req.pg, dashboard, widget });
+
+  const pkey = pg.pk?.[data?.table];
+
+  if (!pkey) {
+    return {
+      message: `invalid ${widget ? 'widget' : 'dashboard'}: table pk not found (${data?.table})`,
+      status: 400,
+    };
+  }
+
+  // data param
+  const {
+    table,
+    query: where = '1=1',
+    metrics = [],
+    cluster,
+    clusterTable = {},
+  } = data;
+
+  if (!cluster) {
+    return {
+      message: `invalid ${widget ? 'widget' : 'dashboard'}: cluster column not specified`,
+      status: 400,
+    };
+  }
+
+  if (!metrics.length) {
+    return {
+      message: `invalid ${widget ? 'widget' : 'dashboard'}: metric columns not found`,
+      status: 400,
+    };
+  }
+
+  if (!clusterTable?.name) {
+    Object.assign(clusterTable, {
+      name: 'bi.cluster',
+      title: 'title',
+      query: `type='${cluster}'`,
+    });
+  }
+
+  try {
+    if (cluster && !clusterExists[cluster]) {
+      const res = await downloadClusterData({ pg, cluster });
+      if (res) return res;
+      clusterExists[cluster] = 1;
+    }
+
+    if (clusterTable?.name && !pg.pk?.[clusterTable?.name]) {
+      return {
+        message: 'invalid widget params: clusterTable pkey not found',
+        status: 404,
+      };
+    }
+
+    const { bounds, extentStr } = await pg.query(`select count(*),
+      st_asgeojson(st_extent(geom))::json as bounds,
+      replace(regexp_replace(st_extent(geom)::box2d::text,'BOX\\(|\\)','','g'),' ',',') as "extentStr"
+    from ${table} where ${where || '1=1'}`).then((res) => res.rows?.[0] || {});
+    const extent = extentStr ? extentStr.split(',') : undefined;
+
+    // get sql
+    const { optimizedSQL } =
+      filter || search
+        ? await getFilterSQL({ pg, table, filter, search })
+        : {};
+
+    const { columns = [] } = await getMeta({ pg, table });
+    const columnList = columns.map(el => el.name);
+
+    if (query.metric && typeof query.metric === 'string') {
+      const checkInvalid = query.metric.split(',').find(el => !columnList.includes(el) && el !== 'count');
+      if (checkInvalid) {
+        return reply.status(404).send(`invalid query metric value: ${checkInvalid}`);
+      }
+    }
+
+    const multipleMetrics = query.metric ? query.metric.split(',').map(el => el === 'count' ? 'count(*)' : `sum(${el.replace(/'/g, "''")})::float as ${el}`).join(',') : null;
+    const multipleMetricsOrder = query.metric ? query.metric.split(',').map(el => el === 'count' ? 'count(*)' : `sum(${el.replace(/'/g, "''")})::float`).join(',') : null;
+    const metricFunc = multipleMetrics
+      || `${clusterTable?.operator || 'sum'}("${metrics[0]}")::float`;
+
+    const q = `select b.*, ${metricFunc} ${multipleMetrics ? '' : 'as metric'} 
+        from ${optimizedSQL ? `(${optimizedSQL})` : table} q 
+        left join lateral (select "${pg.pk?.[clusterTable?.name]}" as id, ${clusterTable?.column || cluster} as name, ${clusterTable?.title} as title from ${clusterTable?.name} where ${clusterTable?.codifierColumn || 'codifier'}=q."${clusterTable?.column || cluster}" limit 1)b on 1=1
+        where ${where} group by b.id, b.name, b.title order by ${multipleMetricsOrder || metricFunc} desc`;
+
+    if (query.sql === '1') return q;
+
+    // auto Index
+    //  autoIndex({ table, columns: (metrics || []).concat([cluster]) });
+
+    const { rows = [] } = await pg.query(q);
+    const vals = rows.map((el) => el.metric - 0).sort((a, b) => a - b);
+    const len = vals.length;
+    const sizes = [
+      vals[0],
+      vals[Math.floor(len / 4)],
+      vals[Math.floor(len / 2)],
+      vals[Math.floor(len * 0.75)],
+      vals[len - 1],
+    ];
+    return { sizes, style, controls, metrics, rows, columns: columns.map(({ name, title, dataTypeID }) => ({ name, title, type: pg.pgType[dataTypeID] })), bounds, extent, count: rows.length, total: rows?.reduce((acc, curr) => (curr.metric || 0) + acc, 0) };
+  } catch (err) {
+    logger.file('bi/cluster/error', { error: err.toString(), query });
+    return { error: err.toString(), status: 500 };
+  }
+}