@opengis/fastify-table 2.0.11 → 2.0.13

package/dist/server/plugins/auth/index.js

@@ -65,9 +65,8 @@ function plugin(fastify) {
             };
             req.user = req.session.passport.user;
         }
-        req.user = req.user === null ? undefined : req.user; // fix for user.uid errors, by default user is null, while with express passport it was {}, unauthorized user does not trigger serializer
-        // already done by @fastify/passport serializer / deserializer
-        // req.user = passport.user;
+        // ! intentional: null || undefined > undefined
+        req.user = req.user || req.session?.passport?.user || undefined; // fix for user.uid errors, by default user is null, while with express passport it was {}, unauthorized user does not trigger serializer
         if (config.trace && false) {
             console.log("req.user?.uid", req.user?.uid, "req.session?.passport?.user?.uid", req.session?.passport?.user?.uid, "config.auth", config.auth);
         }

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

@@ -9,7 +9,7 @@ import yml2json from "../../yml/funcs/yml2json.js";
 const cwd = process.cwd();
 export default function getTemplatePath(type) {
     if (!type)
-        return null;
+        return [];
     // form cache
     if (loadTemplatePath[type])
         return loadTemplatePath[type];

package/dist/server/plugins/table/funcs/getTemplates.js

@@ -1,15 +1,14 @@
 import fs from "node:fs";
-import path from "node:path";
-import config from "../../../../config.js";
-const loadTemplate = {};
-export default async function getTemplateDir(type) {
+import getTemplatePath from "./getTemplatePath.js";
+import loadTemplate from "./loadTemplate.js";
+export default function getTemplateDir(type) {
     if (!type)
         return null;
-    const cwd = process.cwd();
-    const typeDir = path.join(cwd, config.templateDir || "server/templates", type);
+    const arr = Array.isArray(type)
+        ? type.map((el) => getTemplatePath(el)).flat()
+        : getTemplatePath(type);
     if (!loadTemplate[type]) {
-        const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
-        loadTemplate[type] = typeList;
+        loadTemplate[type] = arr.filter((el) => fs.existsSync(el[1]));
     }
     return loadTemplate[type];
 }

package/dist/server/plugins/table/funcs/metaFormat/index.js

@@ -1,4 +1,4 @@
-import { handlebarsSync } from "../../../../helpers/index.js";
+import { handlebars } from "../../../../helpers/index.js";
 import getTemplate from "../getTemplate.js";
 import getSelectVal from "./getSelectVal.js";
 import pgClients from "../../../pg/pgClients.js";
@@ -19,17 +19,17 @@ export default async function metaFormat({ rows: original, table, cls = {}, html
         return original;
     const rows = reassign ? original : JSON.parse(JSON.stringify(original));
     // html && slot (vue component) format
-    htmlCols.forEach((attr) => {
-        rows.filter(Boolean).forEach((row) => {
-            const html = handlebarsSync.compile(attr.html)(row);
+    await Promise.all(htmlCols.map(async (attr) => {
+        await Promise.all(rows.filter(Boolean).map(async (row) => {
+            const html = await handlebars.compile(attr.html)(row);
             Object.assign(row, {
                 [attr.name]: html
                     ?.replaceAll?.(/<[^>]*>/g, "")
                     ?.replace?.(/\n/g, "")
                     ?.trim?.(),
             });
-        });
-    });
+        }));
+    }));
     // cls & select format
     await Promise.all(selectCols.concat(metaCls)?.map(async (attr) => {
         const values = [

package/package.json

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

package/dist/server/plugins/hook/index.js

@@ -1,39 +0,0 @@
-import config from "../../../config.js";
-export const hookList = {};
-export async function applyHook(name, data) {
-    if (config.trace)
-        console.log("applyHook", name);
-    if (!hookList[name]?.length)
-        return null;
-    const result = {};
-    await Promise.all(hookList[name].map(async (hook) => {
-        const hookData = await hook({ ...data, config });
-        if (hookData) {
-            if (config.trace)
-                console.log("applyHook", name, hookData);
-            Object.assign(result, hookData);
-        }
-    })).catch((err) => {
-        console.error("applyHook", name, err.toString());
-    });
-    if (Object.keys(result).length) {
-        return result;
-    }
-    return null;
-}
-export function addHook(name, fn) {
-    if (!hookList[name]) {
-        hookList[name] = [];
-    }
-    if (config.trace)
-        console.log("addHook", name);
-    hookList[name].push(fn);
-}
-export function applyHookSync(name, data) {
-    if (!hookList[name]?.length)
-        return null;
-    if (config.trace)
-        console.log("applyHookSync", name);
-    const hookData = hookList[name].map((hook) => hook(data))[0];
-    return hookData;
-}