@opengis/admin 0.2.129 → 0.2.131

package/server/helpers/index.js

@@ -7,6 +7,8 @@ import tableList from "./list/tableList.js";
 import buttonHelper from "./core/buttonHelper.js";
 import select from "./core/select.js";
 import badge from "./core/badge.js";
+import coalesce from "./core/coalesce.js";
+import mdToHTML from "./utils/mdToHTML.js";
 
 
 import ifCond from "./temp/ifCond.js";
@@ -17,6 +19,7 @@ import contentList from "./temp/contentList.js";
 export default async function route() {
 
     handlebars.registerHelper('token', token);
+    handlebars.registerHelper('mdToHTML', mdToHTML);
     handlebars.registerHelper('descriptionList', descriptionList);
     handlebars.registerHelper('tableList', tableList);
     handlebars.registerHelper('button', buttonHelper);
@@ -28,4 +31,6 @@ export default async function route() {
     handlebars.registerHelper('ifCond', ifCond);
     handlebars.registerHelper('empty', () => { });
     handlebarsSync.registerHelper('empty', () => { });
+    handlebars.registerHelper('coalesce', coalesce);
+    handlebarsSync.registerHelper('coalesce', coalesce);
 }

package/server/helpers/list/descriptionList.js

@@ -1,16 +1,17 @@
-import { handlebarsSync, handlebars } from '@opengis/fastify-table/utils.js'
+import { config, handlebarsSync, handlebars } from '@opengis/fastify-table/utils.js'
 
-function format(d, key, data) {
+async function format(d, key, data) {
     if (!key?.includes) return '';
     if (d === true) return 'Так';
-    if (d === false) return 'Ні'
+    if (d === false) return 'Ні';
 
     if (key.startsWith('{{') && key.match(/\{\{([^\s]+)/)?.[1] in handlebarsSync.helpers) {
         return handlebarsSync.compile(key)(data);
-    } else if (key.startsWith('{{') && key.includes(' ') && !(key.match(/\{\{([^\s]+)/)?.[1] in handlebars.helpers)) {
-        return null;
+    } else if (key.startsWith('{{')) {
+        return handlebars.compile(key)(data);
     }
 
+    // if (config.local && config.debug) console.log('descriptionList:d', d, key, data);
     if (!d) return null;
     return d;
 }
@@ -29,15 +30,17 @@ export default async function descriptionList(data, opt) {
 
     for (let i = 0; i < keys.length; i += 2) {
         const name = keys[i];
-        const nameHBS = name.includes('{{') ? handlebarsSync.compile(name)({ ...data, hash }) : false
+        const nameHBS = name.includes('{{') ? await handlebars.compile(name)({ ...data, hash }) : false;
 
         if (!nameHBS && name.includes('{{')) continue;
 
         const key = keys[i + 1];
 
-        const d1 = format(data[key], key, data)
-            || (key.includes('{{') ? await handlebars.compile(key)(data) : '-')
-            || '-';
+        const d1 = await format(data[key], key, data) || '-';
+
+        if (config.local && config.debug && d1 === '-') {
+            // console.log('descriptionList:for', name, nameHBS, key, data);
+        }
 
         result.push(`<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4">
             <dt class="text-gray-900">${nameHBS || name}</dt>

package/server/helpers/utils/mdToHTML.js

@@ -0,0 +1,17 @@
+import md from 'markdown-it';
+
+const md1 = md({ html: true });
+
+/**
+ * Перетворення з файла readme.md до формату HTML.
+ * Потрабно вставити в хелпер шлях до файла або текст readme.md і за допомогою бібліотеки markdown-it перетвориться в HTML.
+
+ * @returns {String} Returns HTML
+*/
+export default function mdToHTML(data, options) {
+  // auto detect HTML or MD
+  // const result = md().render(data);
+  if (!data) return 'empty data';
+  const result = md1.render(data);
+  return result;
+};