@opengis/fastify-table 1.2.92 → 1.2.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.2.92",
+  "version": "1.2.94",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/table/funcs/addTemplateDir.js

@@ -1,8 +1,18 @@
+import { existsSync, readFileSync } from 'node:fs';
+
 import userTemplateDir from './userTemplateDir.js';
+import customTokens from './customTokens.js';
+import yml2json from '../../yml/funcs/yml2json.js'
 
 export default function addTemplateDir(dir) {
   if (dir && !userTemplateDir.includes(dir)) {
     userTemplateDir.push(dir);
+
+    if (existsSync(`${dir}/tokens.yml`)) {
+      const json = yml2json(readFileSync(`${dir}/tokens.yml`));
+      Object.assign(customTokens, { ...json });
+      console.log('load user tokens', dir);
+    }
   }
   return userTemplateDir;
 }

package/server/plugins/table/funcs/customTokens.js

@@ -0,0 +1 @@
+export default {}

package/server/plugins/table/funcs/getFilterSQL/index.js

@@ -100,7 +100,7 @@ export default async function getFilterSQL({
       // const cls = await getTemplate(['cls', 'select'], el.data); // only git cls
       const cls = await getSelect(el.data, pg); // git + db cls
 
-      if (Array.isArray(cls) && cls?.length) {
+      if (Array.isArray(cls?.arr) && cls.arr.length) {
         Object.assign(el, { cls: el.data, options: cls, select: `select code, name from admin.cls where parent='${el.data}'` });
       }
       else if (typeof (cls?.sql || cls) === 'string') {

package/server/plugins/table/funcs/getFilterSQL/util/formatValue.js

@@ -12,7 +12,9 @@ export default function formatValue({
   if (!name
     || !value
     || (!dataTypeID && !extra && !sql && !options)
-    || extra?.input?.toLowerCase?.() === 'datatable') {
+    || extra?.input?.toLowerCase?.() === 'datatable'
+    || !['check', 'autocomplete', 'tags', 'avatar', 'radio'].includes(filterType) && options?.find?.(el => el?.sql)
+  ) {
     return {};
   }
 
@@ -87,10 +89,10 @@ export default function formatValue({
   }
 
   /* select query - from admin.cls / filter options */
-  if (['check', 'autocomplete', 'text', 'tags', 'avatar', 'radio'].includes(filterType)) {
+  if (['check', 'autocomplete', 'tags', 'avatar', 'radio'].includes(filterType)) {
     // multiple checks with predefined query
-    if (filterType === 'check' && options?.length) {
-      const query = options.filter(el => value.split(',').includes(el.id)).map(el => el.sql).join(' and ') || 'false';
+    if (options?.find?.(el => el?.sql)) {
+      const query = options.filter(el => value.split(',').includes(el.id)).map(el => el.sql || 'false').join(' and ') || 'false';
       return { op: '=', query };
     }
 

package/server/plugins/table/funcs/getTemplatePath.js

@@ -1,10 +1,12 @@
-import path from 'path';
-import fs, { existsSync, readdirSync } from 'fs';
+import path from 'node:path';
+import fs, { existsSync, readdirSync, readFileSync } from 'node:fs';
 
 import config from '../../../../config.js';
 
 import loadTemplatePath from './loadTemplatePath.js';
 import userTemplateDir from './userTemplateDir.js';
+import customTokens from './customTokens.js';
+import yml2json from '../../yml/funcs/yml2json.js';
 
 const cwd = process.cwd();
 
@@ -18,8 +20,16 @@ export default function getTemplatePath(type) {
 
   const moduleList = [];
   const moduleDir = path.join(cwd, 'module');
+
   if (fs.existsSync(moduleDir) && !moduleList.length) {
-    readdirSync(moduleDir).forEach(el => moduleList.push(path.join(moduleDir, el, type)));
+    readdirSync(moduleDir).forEach(el => {
+      if (existsSync(path.join(cwd, 'module', el, 'tokens.yml'))) {
+        const json = yml2json(readFileSync(path.join(cwd, 'module', el, 'tokens.yml')));
+        Object.assign(customTokens, { ...json });
+        console.log('load user tokens: root', `${cwd}/${el}`);
+      }
+      moduleList.push(path.join(moduleDir, el, type))
+    });
   }
 
   // add user template dir

package/server/plugins/table/funcs/userTokens.js

@@ -0,0 +1 @@
+export default {}

package/server/routes/util/controllers/user.tokens.js

@@ -0,0 +1,39 @@
+import { customTokens, userTokens, handlebarsSync, setOpt, getOpt } from "../../../../utils.js";
+
+export default async function userTokensAPI({ params = {}, user = {} }, reply) {
+    if (!user?.uid) {
+        return reply.status(403).send('access restricted: user');
+    }
+
+    if (!params?.token) {
+        return reply.status(400).send('not enough params: token');
+    }
+
+    if (!customTokens[params.token]) {
+        return reply.status(404).send('token not found');
+    }
+
+    // return from cache
+    if (userTokens[user.uid]?.[params.token]) {
+        const opt = await getOpt(userTokens[user.uid][params.token], user.uid);
+        if (opt) return userTokens[user.uid][params.token];
+    }
+
+    const token = setOpt(
+        {
+            ...customTokens[params.token],
+            query: handlebarsSync.compile(customTokens[params.token]?.query || 'true')({ user, uid: user.uid })
+        },
+        user.uid,
+    );
+
+    // first api call from user
+    if (!userTokens[user.uid]) {
+        userTokens[user.uid] = {};
+    }
+
+    // assign token
+    userTokens[user.uid][params.token] = token;
+
+    return token;
+}

package/server/routes/util/index.js

@@ -1,11 +1,12 @@
 import nextId from './controllers/next.id.js';
 import statusMonitor from './controllers/status.monitor.js';
+import userTokens from './controllers/user.tokens.js'
 
-async function plugin(fastify, config = {}) {
+async function plugin(app, config = {}) {
   const prefix = config.prefix || '/api';
-
-  fastify.get(`${prefix}/next-id`, {}, nextId);
-  fastify.get(`${prefix}/status-monitor`, {}, statusMonitor);
+  app.get(`${prefix}/next-id`, {}, nextId);
+  app.get(`${prefix}/status-monitor`, {}, statusMonitor);
+  app.get(`${prefix}/user-tokens/:token`, { config: { policy: ['user'] } }, userTokens);
 }
 
 export default plugin;

package/utils.js

@@ -23,6 +23,8 @@ import getTemplates from './server/plugins/table/funcs/getTemplates.js';
 import getTemplatePath from './server/plugins/table/funcs/getTemplatePath.js';
 import addTemplateDir from './server/plugins/table/funcs/addTemplateDir.js';
 import userTemplateDir from './server/plugins/table/funcs/userTemplateDir.js';
+import customTokens from './server/plugins/table/funcs/customTokens.js';
+import userTokens from './server/plugins/table/funcs/userTokens.js';
 
 // table
 import metaFormat from './server/plugins/table/funcs/metaFormat/index.js';
@@ -103,6 +105,8 @@ export {
   getTemplatePath,
   addTemplateDir,
   userTemplateDir,
+  customTokens,
+  userTokens,
 
   // security
   checkXSS,