@opengis/fastify-table 2.0.98 → 2.0.100

package/dist/server/helpers/funcs/contentList.js

@@ -1,5 +1,5 @@
 import Handlebars from "handlebars";
-import getPG from "../../plugins/pg/funcs/getPG.js";
+import getPGAsync from "../../plugins/pg/funcs/getPGAsync.js";
 const maxLimit = 100;
 /**
  * Відображення даних з таблиці або запиту до БД на сторінці. За запитом отримуємо масив json із рядків бази даних.
@@ -27,7 +27,7 @@ export default async function contentList(options) {
         return "Table undefined";
     }
     try {
-        const pg = getPG();
+        const pg = await getPGAsync();
         const hasBrackets = table.trim().startsWith("(") && table.trim().endsWith(")");
         const SQL = `select *,${pg.pk[table] || "1"}::text from ${hasBrackets ? `${table} t` : table} where ${query || "1=1"} ${order ? `order by ${order}` : ""} limit ${limit !== undefined && limit !== null ? Math.min(maxLimit, +limit) : 15}`;
         const compiledSQL = Handlebars.compile(SQL)(options.data.root);

package/dist/server/plugins/pg/funcs/getPGAsync.d.ts

@@ -1,3 +1,3 @@
-declare function getPGAsync(param: any): Promise<any>;
+declare function getPGAsync(param?: any): Promise<any>;
 export default getPGAsync;
 //# sourceMappingURL=getPGAsync.d.ts.map

package/dist/server/plugins/pg/funcs/getPGAsync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPGAsync.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPGAsync.ts"],"names":[],"mappings":"AAYA,iBAAe,UAAU,CAAC,KAAK,EAAE,GAAG,gBA6DnC;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"getPGAsync.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPGAsync.ts"],"names":[],"mappings":"AAYA,iBAAe,UAAU,CAAC,KAAK,CAAC,EAAE,GAAG,gBA6DpC;AAED,eAAe,UAAU,CAAC"}

package/dist/server/plugins/table/funcs/getTemplate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTemplate.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getTemplate.ts"],"names":[],"mappings":"AAoFA,wBAA8B,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,gBAyB7D"}
+{"version":3,"file":"getTemplate.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getTemplate.ts"],"names":[],"mappings":"AA+FA,wBAA8B,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,gBAyB7D"}

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

@@ -10,7 +10,7 @@ async function readFileData(file) {
     if (ext === "yml") {
         return yaml.load(data);
     }
-    if (ext === "json") {
+    if (ext === "json" && data) {
         return JSON.parse(data);
     }
     if (ext === "md") {
@@ -44,6 +44,13 @@ async function getTemplateData(template) {
     // one file template: table, form
     if (template.length === 1) {
         const data = await readFileData(template[0][1]);
+        if (template[0][2] === "json" &&
+            path.basename(path.dirname(template[0][1])) === "table" &&
+            data?.parent) {
+            const parentTemplate = getTemplatePath("table").find((el) => el[0] === data.parent);
+            const parentData = await readFileData(parentTemplate[1]);
+            return { ...(parentData || {}), ...data };
+        }
         return data;
     }
     // multi file template: select, etc

package/package.json

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