iobroker.vis-jsontemplate 4.5.0 → 4.6.1

package/README.md

@@ -91,6 +91,7 @@ JSONTemplate now supports async calls with await.
 | json_oid         | Selection of the data point with the corresponding JSON data.                                                                                                                                                                                                                     |
 | json_dpCount     | Number of data points to be made available in the template.                                                                                                                                                                                                                       |
 | json_dp          | Datapoint ID to be made available.                                                                                                                                                                                                                                                |
+| json_dp_variable | Optional JavaScript variable name. The variable contains the datapoint ID; the same name with `_value` appended contains its current value.                                                                                                                                       |
 | json_scriptCount | Number of JavaScript URLs to be loaded                                                                                                                                                                                                                                            |
 | json_script[]    | JavaScript URL to be loaded. See example below.                                                                                                                                                                                                                                   |
 | json_cssCount    | Number of CSS URLs to be loaded.                                                                                                                                                                                                                                                  |
@@ -124,6 +125,15 @@ B) Indexnumber of the datapoint (the number always start with 0)
 <%- dp[Object.keys(dp)[1]] %>
 ```
 
+C) An optional variable name configured for the datapoint. For a datapoint
+`0_userdata.0.selectwrite`, variable name `dpwrite`, and value `abc`:
+
+```javascript
+<%- dpwrite %>          <!-- 0_userdata.0.selectwrite -->
+<%- dpwrite_value %>    <!-- abc -->
+<%- dp[dpwrite] %>      <!-- abc -->
+```
+
 Example output of data, widget and style in the template
 
 ```ejs
@@ -133,6 +143,9 @@ Example output of data, widget and style in the template
     .replace(/ /g, '&nbsp;'); %>
 ```
 
+If an error occurs, it is displayed in the widget and output to the
+browser console (F12).
+
 #### Advanced use case
 
 In the examples above, only the pure output was covered.
@@ -410,6 +423,18 @@ Loop over the attributes of an object
   Placeholder for the next version (at the beginning of the line):
   ### **WORK IN PROGRESS**
 -->
+### 4.6.1 (2026-07-31)
+
+- Improved error output.
+
+### 4.6.0 (2026-07-30)
+
+- some changes. see readme/below
+
+#### Changes 2026-07-30
+
+- add optional variable names to extra datapoints
+
 ### 4.5.0 (2026-07-29)
 
 - some changes. see readme/below
@@ -437,15 +462,6 @@ Loop over the attributes of an object
 - Due to an inconsistency between the vis1 and vis2 widgets,
   both `widgetid` and `widgetID` are now passed to the template.
 
-### 4.4.3 (2026-04-21)
-
-- revert repochecker warning about fs/node:fs and path/node:path
-  because of error loading ejs
-
-### 4.4.2 (2026-04-13)
-
-- fix runtime
-
 [Older changelogs can be found there](CHANGELOG_OLD.md)
 
 ## License

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "vis-jsontemplate",
-    "version": "4.5.0",
+    "version": "4.6.1",
     "news": {
+      "4.6.1": {
+        "en": "- Improved error output.",
+        "de": "- Verbesserte Fehlerausgabe.",
+        "ru": "- Улучшен вывод сообщений об ошибках.",
+        "pt": "- Melhorada a saída de erros.",
+        "nl": "- Verbeterde foutuitvoer.",
+        "fr": "- Amélioration de l'affichage des erreurs.",
+        "it": "- Migliorata la visualizzazione degli errori.",
+        "es": "- Se ha mejorado la salida de errores.",
+        "pl": "- Ulepszono wyświetlanie błędów.",
+        "uk": "- Покращено виведення повідомлень про помилки.",
+        "zh-cn": "- 改进了错误输出。"
+      },
+      "4.6.0": {
+        "en": "- some changes. see readme/below",
+        "de": "- einige änderungen. siehe readme/unten",
+        "ru": "- некоторые изменения. см. readme/low",
+        "pt": "- algumas mudanças. ver lerme/abaixo",
+        "nl": "- wat veranderingen. zie readme/onder",
+        "fr": "- quelques changements. voir lecture/ci-dessous",
+        "it": "- qualche cambiamento. vedi readme/below",
+        "es": "- algunos cambios. ver readme/below",
+        "pl": "- kilka zmian. patrz readme / poniżej",
+        "uk": "- деякі зміни. переглянути файл",
+        "zh-cn": "- 一些变化。 见readme/以下"
+      },
       "4.5.0": {
         "en": "- some changes. see readme/below\n\n#### Changes 2026-07-29\n\n- repair widget rendering\n- add search and fullscreen to ejs-edit for vis-2 widget\n- improve ki documentation for regex expressions\n- improve vis-2 ejs edit theme for dark mode",
         "de": "- einige änderungen. siehe readme/unten\n\nÄnderungen 2026-07-29\n\n- reparatur widget rendering\n- hinzufügen von suche und vollbild zu ejs-edit für vis-2 widget\n- verbesserung der ki-dokumentation für regex-ausdrücke\n- verbesserung von vis-2 ejs edit theme für den dunklen modus",
@@ -67,32 +93,6 @@
         "pl": "napraw środowisko wykonawcze",
         "uk": "фіксувати runtime",
         "zh-cn": "固定运行时间"
-      },
-      "4.4.1": {
-        "en": "fix regression\nupdate packages",
-        "de": "regression\nupdate-pakete",
-        "ru": "фиксировать регрессию\nобновление пакетов",
-        "pt": "corrigir regressão\natualizar pacotes",
-        "nl": "repareren regressie\npakketten bijwerken",
-        "fr": "fixer la régression\nmettre à jour les paquets",
-        "it": "correzione della regressione\npacchetti di aggiornamento",
-        "es": "regreso\nactualizar paquetes",
-        "pl": "naprawić regresję\naktualizacja pakietów",
-        "uk": "фіксація регресія\nоновлення пакетів",
-        "zh-cn": "修复回归\n更新软件包"
-      },
-      "4.4.0": {
-        "en": "- optimize lib size\n- The ability to load additional JavaScript and CSS files\n  has been added (also for vis2).\n- Improve react components\n- align translation for vis2 widget",
-        "de": "- optimierung der lib-größe\n- Die Möglichkeit, zusätzliche JavaScript- und CSS-Dateien zu laden\nwurde hinzugefügt (auch für vis2).\n- Reaktionskomponenten verbessern\n- übersetzung ausrichten für vis2 widget",
-        "ru": "оптимизируйте размер lib\nВозможность загрузки дополнительных файлов JavaScript и CSS\nдобавлено (также для vis2).\nУлучшение компонентов реакции\nперевод для vis2 widget",
-        "pt": "- otimizar o tamanho da lib\n- A capacidade de carregar arquivos adicionais de JavaScript e CSS\nfoi adicionado (também para vis2).\n- Melhorar os componentes de reacção\n- alinhar a tradução para o widget vis2",
-        "nl": "- optimalisatie van de grootte van de lib\n- De mogelijkheid om extra JavaScript- en CSS-bestanden te laden\nis toegevoegd (ook voor vis2).\n- Verbeter reactiecomponenten\n- align vertaling voor vis2 widget",
-        "fr": "- optimiser la taille de la lib\n- La possibilité de charger des fichiers supplémentaires JavaScript et CSS\na été ajouté (également pour vis2).\n- Améliorer les composants de réaction\n- traduction alignée pour le widget vis2",
-        "it": "- ottimizza la dimensione lib\n- La capacità di caricare ulteriori file JavaScript e CSS\nè stato aggiunto (anche per vis2).\n- Migliorare i componenti reattivi\n- traduzione allineare per widget vis2",
-        "es": "- optimizar el tamaño de la lib\n- La capacidad de cargar archivos adicionales JavaScript y CSS\nse ha añadido (también para vis2).\n- Mejorar los componentes de reacción\n- traducción alineada para vis2 widget",
-        "pl": "- optymalizacja rozmiaru lib\n- Możliwość wczytania dodatkowych plików JavaScript i CSS\nzostał dodany (także dla vis2).\n- Poprawa składników reakcji\n- tłumaczenie wyrównawcze dla vis2 widget",
-        "uk": "- оптимізація розміру lib\n- Можливість завантаження додаткових файлів JavaScript та CSS\nдодано (також для vis2).\n- Покращити компоненти реакції\n- вирівняти переклад для віджету vis2",
-        "zh-cn": "- 优化自由体积\n- 装入额外的 JavaScript 和 CSS 文件的能力\n已添加(也用于对比2).\n- 改进反应组件\n- 对齐粘合元件的翻译"
       }
     },
     "titleLang": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.vis-jsontemplate",
-  "version": "4.5.0",
+  "version": "4.6.1",
   "description": "vis-jsontemplate",
   "author": {
     "name": "oweitman",

package/widgets/vis-jsontemplate/dist/jsontemplate-dist.js

@@ -1,10 +1,27 @@
 (() => {
   var __create = Object.create;
   var __defProp = Object.defineProperty;
+  var __defProps = Object.defineProperties;
   var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+  var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
   var __getOwnPropNames = Object.getOwnPropertyNames;
+  var __getOwnPropSymbols = Object.getOwnPropertySymbols;
   var __getProtoOf = Object.getPrototypeOf;
   var __hasOwnProp = Object.prototype.hasOwnProperty;
+  var __propIsEnum = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+  var __spreadValues = (a, b) => {
+    for (var prop in b || (b = {}))
+      if (__hasOwnProp.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    if (__getOwnPropSymbols)
+      for (var prop of __getOwnPropSymbols(b)) {
+        if (__propIsEnum.call(b, prop))
+          __defNormalProp(a, prop, b[prop]);
+      }
+    return a;
+  };
+  var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
   var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
     get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
   }) : x)(function(x) {
@@ -58,7 +75,7 @@
   var version;
   var init_package = __esm({
     "../package.json"() {
-      version = "4.5.0";
+      version = "4.6.1";
     }
   });
 
@@ -71,6 +88,104 @@
         const i18n = yield res.json();
         $.extend(true, systemDictionary, i18n);
       }));
+      var EJS_CONTEXT_NAMES = /* @__PURE__ */ new Set(["widgetid", "widgetID", "data", "dp", "style", "widget", "I18n"]);
+      var RESERVED_WORDS = /* @__PURE__ */ new Set([
+        "await",
+        "break",
+        "case",
+        "catch",
+        "class",
+        "const",
+        "continue",
+        "debugger",
+        "default",
+        "delete",
+        "do",
+        "else",
+        "enum",
+        "export",
+        "extends",
+        "false",
+        "finally",
+        "for",
+        "function",
+        "if",
+        "implements",
+        "import",
+        "in",
+        "instanceof",
+        "interface",
+        "let",
+        "new",
+        "null",
+        "package",
+        "private",
+        "protected",
+        "public",
+        "return",
+        "static",
+        "super",
+        "switch",
+        "this",
+        "throw",
+        "true",
+        "try",
+        "typeof",
+        "var",
+        "void",
+        "while",
+        "with",
+        "yield"
+      ]);
+      function isValidJavaScriptIdentifier(value) {
+        if (typeof value !== "string" || !value) {
+          return false;
+        }
+        return /^[$_\p{ID_Start}][$\u200C\u200D_\p{ID_Continue}]*$/u.test(value) && !RESERVED_WORDS.has(value);
+      }
+      function getDatapointVariableName(data, index) {
+        var _a, _b;
+        const value = (_b = (_a = data == null ? void 0 : data[`json_dp_variable${index}`]) != null ? _a : data == null ? void 0 : data[`json_dp_variable-${index}`]) != null ? _b : "";
+        return typeof value === "string" ? value.trim() : "";
+      }
+      function buildDatapointVariables(data, dpCount) {
+        const variables = {};
+        const usedNames = /* @__PURE__ */ new Set();
+        for (let i = 1; i <= dpCount; i++) {
+          const name = getDatapointVariableName(data, i);
+          if (!name) {
+            continue;
+          }
+          if (!isValidJavaScriptIdentifier(name)) {
+            throw new Error(`Invalid JavaScript variable name: ${name}`);
+          }
+          const valueName = `${name}_value`;
+          if (EJS_CONTEXT_NAMES.has(name) || EJS_CONTEXT_NAMES.has(valueName)) {
+            throw new Error(`Variable name is already used by the template context: ${name}`);
+          }
+          if (usedNames.has(name) || usedNames.has(valueName)) {
+            throw new Error(`Variable name is used more than once: ${name}`);
+          }
+          usedNames.add(name);
+          usedNames.add(valueName);
+          const oid = data[`json_dp${i}`];
+          if (oid) {
+            Object.defineProperty(variables, name, {
+              value: oid,
+              enumerable: true,
+              configurable: true,
+              writable: true
+            });
+            Object.defineProperty(variables, valueName, {
+              value: vis.states.attr(`${oid}.val`),
+              enumerable: true,
+              configurable: true,
+              writable: true
+            });
+          }
+        }
+        return variables;
+      }
       vis.binds["jsontemplate"] = {
         version,
         _assetCache: vis.binds["jsontemplate"] && vis.binds["jsontemplate"]._assetCache || /* @__PURE__ */ new Map(),
@@ -215,20 +330,22 @@
               }
               let text = "";
               try {
+                const datapointVariables = buildDatapointVariables(data, dpCount);
                 text = yield ejs.render(
                   template,
-                  {
+                  __spreadProps(__spreadValues({}, datapointVariables), {
                     widgetID,
                     widgetid: widgetID,
                     data: oiddata,
                     dp: datapoints,
                     widget: data,
                     style
-                  },
+                  }),
                   { async: true }
                 );
               } catch (e) {
                 text = vis.binds["jsontemplate"].escapeHTML(e.message).replace(/(?:\r\n|\r|\n)/g, "<br>");
+                console.error(e.message);
                 text = text.replace(/ /gm, "&nbsp;");
                 text = `<code style="color:red;">${text}</code>`;
               }