@opengis/bi 1.1.2 → 1.2.1

package/package.json

@@ -1,84 +1,77 @@
-{
-  "name": "@opengis/bi",
-  "version": "1.1.2",
-  "description": "BI data visualization module",
-  "main": "dist/bi.js",
-  "browser": "dist/bi.umd.cjs",
-  "type": "module",
-  "files": [
-    "dist/*",
-    "server/*",
-    "plugin.js",
-    "utils.js",
-    "config.js"
-  ],
-  "scripts": {
-    "debug": "node --watch-path=server server",
-    "dev": "vite",
-    "type-check": "vue-tsc --noEmit",
-    "build": "vite build",
-    "build-app": "cross-env APP=true vite build",
-    "lint": "eslint .",
-    "format": "prettier --write .",
-    "test": "node --test",
-    "test21": "node --test ./test/plugins/*",
-    "start": "node server.js",
-    "prod": "cross-env NODE_ENV=production npm run start",
-    "docs:i": "npm install --prefix ./docs",
-    "docs:dev": "npm run --prefix ./docs docs:dev",
-    "docs:build": "npm run --prefix ./docs docs:build",
-    "docs:preview": "npm run --prefix ./docs docs:preview",
-    "adduser": "node script/adduser.js"
-  },
-  "keywords": [
-    "bi",
-    "data visualization",
-    "chart",
-    "opengis",
-    "vue",
-    "fastify"
-  ],
-  "author": "Softpro",
-  "license": "ISC",
-  "dependencies": {
-    "@highlightjs/vue-plugin": "github:highlightjs/vue-plugin",
-    "@jspreadsheet-ce/vue": "^5.0.0",
-    "@mapbox/sphericalmercator": "^1.2.0",
-    "@opengis/fastify-auth": "1.1.0",
-    "@opengis/fastify-table": "1.4.9",
-    "@opengis/v3-core": "^0.3.93",
-    "@opengis/v3-filter": "^0.0.71",
-    "@turf/turf": "^7.1.0",
-    "axios": "^1.3.1",
-    "cross-env": "^7.0.3",
-    "echarts": "^5.5.1",
-    "fastify": "5.3.3",
-    "fastify-plugin": "5.0.1",
-    "highlight.js": "^11.10.0",
-    "js-yaml": "^4.1.0",
-    "maplibre-gl": "^4.7.1",
-    "markdown-it": "^14.1.0",
-    "marked": "^14.1.2",
-    "vite": "^5.1.5",
-    "vue": "^3.4.27",
-    "vue-router": "^4.4.3",
-    "vue3-ace-editor": "^2.2.4"
-  },
-  "devDependencies": {
-    "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^9.12.0",
-    "@types/echarts": "^4.9.22",
-    "@types/node": "^22.7.5",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@vitejs/plugin-vue": "^5.1.4",
-    "eslint": "^8.57.1",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-vue": "^9.29.0",
-    "globals": "^15.10.0",
-    "prettier": "^3.3.3",
-    "typescript": "^5.4.5",
-    "typescript-eslint": "~8.8.1",
-    "vue-tsc": "^2.1.6"
-  }
-}
+{
+  "name": "@opengis/bi",
+  "version": "1.2.1",
+  "description": "BI data visualization module",
+  "main": "dist/bi.js",
+  "browser": "dist/bi.umd.cjs",
+  "type": "module",
+  "files": [
+    "dist",
+    "server",
+    "plugin.js",
+    "utils.js"
+  ],
+  "scripts": {
+    "prepublishOnly": "npm run build",
+    "debug": "node --watch-path=server server",
+    "dev": "vite",
+    "type-check": "vue-tsc --noEmit",
+    "build": "vite build",
+    "build-app": "cross-env APP=true vite build",
+    "lint": "eslint .",
+    "format": "prettier --write .",
+    "test": "node --test",
+    "test21": "node --test ./test/plugins/*",
+    "start": "node server.js",
+    "prod": "NODE_ENV=production npm run start",
+    "docs:i": "npm install --prefix ./docs",
+    "docs:dev": "npm run --prefix ./docs docs:dev",
+    "docs:build": "npm run --prefix ./docs docs:build",
+    "docs:preview": "npm run --prefix ./docs docs:preview",
+    "adduser": "node script/adduser.js"
+  },
+  "keywords": [
+    "bi",
+    "data visualization",
+    "chart",
+    "opengis",
+    "vue",
+    "fastify"
+  ],
+  "author": "Softpro",
+  "license": "ISC",
+  "dependencies": {},
+  "devDependencies": {
+    "@highlightjs/vue-plugin": "github:highlightjs/vue-plugin",
+    "@jspreadsheet-ce/vue": "^5.0.0",
+    "@mapbox/sphericalmercator": "^1.2.0",
+    "@opengis/fastify-table": "^2.0.33",
+    "@opengis/v3-core": "^0.3.93",
+    "@opengis/v3-filter": "^0.0.71",
+    "cross-env": "^10.1.0",
+    "@turf/turf": "^7.1.0",
+    "axios": "^1.3.1",
+    "echarts": "^5.5.1",
+    "highlight.js": "^11.10.0",
+    "marked": "^14.1.2",
+    "vite": "^5.1.5",
+    "vue": "^3.4.27",
+    "vue-router": "^4.4.3",
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.12.0",
+    "@types/echarts": "^4.9.22",
+    "@types/node": "^22.7.5",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@vitejs/plugin-vue": "^5.1.4",
+    "eslint": "^8.57.1",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-vue": "^9.29.0",
+    "globals": "^15.10.0",
+    "prettier": "^3.3.3",
+    "sass-embedded": "1.89.2",
+    "typescript": "^5.4.5",
+    "typescript-eslint": "~8.8.1",
+    "vue-tsc": "^2.1.6"
+  }
+}

package/plugin.js

@@ -1,22 +1,22 @@
 import fp from 'fastify-plugin';
-import path from 'node:path';
-import { fileURLToPath } from 'url';
+// import path from 'node:path';
+// import { fileURLToPath } from 'url';
 
-import { config, addTemplateDir, execMigrations } from '@opengis/fastify-table/utils.js';
+//import { config, addTemplateDir, execMigrations } from '@opengis/fastify-table/utils.js';
 
-const fileName = fileURLToPath(import.meta.url);
-const dirName = path.dirname(fileName);
+//const fileName = fileURLToPath(import.meta.url);
+// const dirName = path.dirname(fileName);
 
 async function plugin(fastify, opt) {
-  fastify.register(import('./server/routes/dashboard/index.mjs'), config);
-  fastify.register(import('./server/routes/dataset/index.mjs'), config);
+  fastify.register(import('./server/routes/dashboard/index.mjs'), opt);
+  fastify.register(import('./server/routes/dataset/index.mjs'), opt);
 
-  fastify.register(import('./server/routes/data/index.mjs'), config);
-  fastify.register(import('./server/routes/edit/index.mjs'), config);
-  fastify.register(import('./server/routes/map/index.mjs'), config);
-  config.templates?.forEach(el => addTemplateDir(el));
+  fastify.register(import('./server/routes/data/index.mjs'), opt);
+  fastify.register(import('./server/routes/edit/index.mjs'), opt);
+  fastify.register(import('./server/routes/map/index.mjs'), opt);
+  // config.templates?.forEach(el => addTemplateDir(el));
 
-  const dir = path.join(dirName, 'server/migrations');
-  execMigrations(dir).catch(err => console.log(err));
+  // const dir = path.join(dirName, 'server/migrations');
+  // execMigrations(dir).catch(err => console.log(err));
 }
 export default fp(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/data/controllers/data.js

@@ -35,19 +35,20 @@ export default async function dataAPI(req, reply) {
 
   const pg = widgetData.pg || req.pg || pgClients.client;
 
-  const { fields: cols } = await pg.query(
+  const error1 = {};
+  const { fields: cols = [] } = await pg.query(
     `select * from ${data.table} t ${widgetData.tableSQL || data.tableSQL || ''} limit 0`
-  );
-  const columnTypes = cols.map((el) => ({
+  ).catch(err => Object.assign(error1, { error: err.toString() })) || {};
+  const columnTypes = cols?.map?.((el) => ({
     name: el.name,
     type: pg.pgType?.[el.dataTypeID],
   }));
 
   // data param
-  const { x, cls, groupbyCls, metric, table, where, tableSQL, groupby, xName, yName, xType, yType, error } =
+  const { x, cls, groupbyCls, metric, table, where, tableSQL, groupby, xName, yName, xType, yType, error = error1 } =
     normalizeData(widgetData, query, columnTypes);
 
-  if (error) { return reply.status(400).send(error); }
+  // if (error) { return reply.status(400).send(error); }
 
   // auto Index
   if (pg.pk?.[data.table]) {
@@ -187,7 +188,7 @@ export default async function dataAPI(req, reply) {
 
   const res = {
     time: Date.now() - time,
-    error: errorSql || (!widgetData.sql ? widgetData.error : undefined),
+    error: error || errorSql || (!widgetData.sql ? widgetData.error : undefined),
     dimensions,
     filter: xName,
     dimensionsType: [xType, yType].filter((el) => el)?.length

package/server/routes/data/controllers/util/chartSQL.js

@@ -1,5 +1,5 @@
-function number({ metric, where, table, samples }) {
-  const sql = `select ${metric} from ${table} where ${where} ${samples ? 'limit 10' : ''}`;
+function number({ metric, where, table, samples, fx }) {
+  const sql = `select ${fx || metric} from ${table} where ${where} ${samples ? 'limit 10' : ''}`;
   return sql;
 }
 function table({ columns = [], table, where, samples }) {