@bonsae/nrg 0.26.2 → 0.27.0

package/test/client/component/setup.js

@@ -1,5 +1,5 @@
 import { config as D } from "vitest-browser-vue";
-import { defineComponent as V, openBlock as l, createElementBlock as c, normalizeClass as N, createCommentVNode as f, renderSlot as k, createTextVNode as W, toDisplayString as E, resolveComponent as g, createBlock as v, createElementVNode as m, shallowRef as q, withDirectives as H, vShow as J, Teleport as K, Fragment as _, renderList as L, createVNode as R } from "vue";
+import { defineComponent as V, openBlock as l, createElementBlock as c, normalizeClass as R, createCommentVNode as f, renderSlot as k, createTextVNode as W, toDisplayString as E, resolveComponent as g, createBlock as v, createElementVNode as m, shallowRef as q, withDirectives as H, vShow as J, Teleport as K, Fragment as _, renderList as j, createVNode as N } from "vue";
 import { beforeEach as Q } from "vitest";
 const Y = V({
   name: "NodeRedInputLabel",
@@ -37,7 +37,7 @@ function X(e, t, n, r, s, d) {
       "i",
       {
         key: 0,
-        class: N(e.iconClass)
+        class: R(e.iconClass)
       },
       null,
       2
@@ -53,8 +53,8 @@ function X(e, t, n, r, s, d) {
     e.required ? (l(), c("span", G, "*")) : f("v-if", !0)
   ]);
 }
-const w = /* @__PURE__ */ T(Y, [["render", X], ["__scopeId", "data-v-864b02f2"]]), j = "*************", x = V({
-  components: { NodeRedInputLabel: w },
+const S = /* @__PURE__ */ T(Y, [["render", X], ["__scopeId", "data-v-864b02f2"]]), L = "*************", x = V({
+  components: { NodeRedInputLabel: S },
   props: {
     modelValue: {
       type: [String, Number],
@@ -108,10 +108,10 @@ const w = /* @__PURE__ */ T(Y, [["render", X], ["__scopeId", "data-v-864b02f2"]]
       this.internalValue = e.target.value, this.$emit("update:modelValue", this.internalValue), this.$emit("update:value", this.internalValue), this.$emit("input", this.internalValue);
     },
     onFocus() {
-      this.type === "password" && this.internalValue === j && (this.internalValue = "");
+      this.type === "password" && this.internalValue === L && (this.internalValue = "");
     },
     onBlur() {
-      this.type === "password" && this.effectiveValue === "__PWD__" && (this.internalValue = j);
+      this.type === "password" && this.effectiveValue === "__PWD__" && (this.internalValue = L);
     }
   }
 }), ee = { style: { display: "flex", "flex-direction": "column", width: "100%" } }, te = ["type", "value", "placeholder"], ne = {
@@ -148,7 +148,7 @@ function re(e, t, n, r, s, d) {
     )) : f("v-if", !0)
   ]);
 }
-const B = /* @__PURE__ */ T(x, [["render", re]]), oe = [
+const U = /* @__PURE__ */ T(x, [["render", re]]), oe = [
   "msg",
   "flow",
   "global",
@@ -164,7 +164,7 @@ const B = /* @__PURE__ */ T(x, [["render", re]]), oe = [
   "node",
   "cred"
 ], ie = ["errorPort", "completePort", "statusPort"], se = V({
-  components: { NodeRedInputLabel: w },
+  components: { NodeRedInputLabel: S },
   props: {
     modelValue: {
       type: Object,
@@ -322,8 +322,8 @@ function de(e, t, n, r, s, d) {
     )) : f("v-if", !0)
   ]);
 }
-const U = /* @__PURE__ */ T(se, [["render", de]]), pe = V({
-  components: { NodeRedInputLabel: w },
+const B = /* @__PURE__ */ T(se, [["render", de]]), pe = V({
+  components: { NodeRedInputLabel: S },
   props: {
     modelValue: {
       type: String,
@@ -421,8 +421,8 @@ function me(e, t, n, r, s, d) {
     )) : f("v-if", !0)
   ]);
 }
-const M = /* @__PURE__ */ T(pe, [["render", me]]), he = V({
-  components: { NodeRedInputLabel: w },
+const F = /* @__PURE__ */ T(pe, [["render", me]]), he = V({
+  components: { NodeRedInputLabel: S },
   props: {
     modelValue: {
       type: [String, Array],
@@ -538,8 +538,8 @@ function $e(e, t, n, r, s, d) {
     )) : f("v-if", !0)
   ]);
 }
-const F = /* @__PURE__ */ T(he, [["render", $e]]), Ie = V({
-  components: { NodeRedInputLabel: w },
+const M = /* @__PURE__ */ T(he, [["render", $e]]), Ie = V({
+  components: { NodeRedInputLabel: S },
   props: {
     modelValue: {
       type: String,
@@ -850,7 +850,7 @@ function ke(e, t, n, r, s, d) {
     /* NEED_PATCH */
   );
 }
-const P = /* @__PURE__ */ T(Ie, [["render", ke], ["__scopeId", "data-v-ea93e881"]]), we = V({
+const P = /* @__PURE__ */ T(Ie, [["render", ke], ["__scopeId", "data-v-ea93e881"]]), Se = V({
   name: "NodeRedToggle",
   props: {
     modelValue: {
@@ -864,6 +864,13 @@ const P = /* @__PURE__ */ T(Ie, [["render", ke], ["__scopeId", "data-v-ea93e881"
     icon: {
       type: String,
       default: ""
+    },
+    /** Accessible name for the control when no visible `label` is rendered
+     *  (e.g. a bare toggle in a table cell where the column header is the
+     *  visible label but isn't programmatically associated). */
+    ariaLabel: {
+      type: String,
+      default: ""
     }
   },
   emits: ["update:modelValue"],
@@ -872,33 +879,34 @@ const P = /* @__PURE__ */ T(Ie, [["render", ke], ["__scopeId", "data-v-ea93e881"
       return this.icon ? `fa ${this.icon.startsWith("fa-") ? this.icon : `fa-${this.icon}`}` : "";
     }
   }
-}), Se = { class: "nrg-toggle-wrapper" }, qe = ["checked"], Re = {
+}), we = { class: "nrg-toggle-wrapper" }, qe = ["checked", "aria-label"], Ne = {
   key: 0,
   class: "nrg-toggle__label"
 };
-function Ne(e, t, n, r, s, d) {
-  return l(), c("div", Se, [
+function Re(e, t, n, r, s, d) {
+  return l(), c("div", we, [
     m(
       "label",
       {
-        class: N(["nrg-toggle", { "nrg-toggle--checked": e.modelValue }])
+        class: R(["nrg-toggle", { "nrg-toggle--checked": e.modelValue }])
       },
       [
         m("input", {
           type: "checkbox",
           checked: e.modelValue,
           class: "nrg-toggle__input",
+          "aria-label": e.ariaLabel || void 0,
           onChange: t[0] || (t[0] = (a) => e.$emit(
             "update:modelValue",
             a.target.checked
           ))
         }, null, 40, qe),
-        e.icon || e.label ? (l(), c("span", Re, [
+        e.icon || e.label ? (l(), c("span", Ne, [
           e.icon ? (l(), c(
             "i",
             {
               key: 0,
-              class: N(e.iconClass)
+              class: R(e.iconClass)
             },
             null,
             2
@@ -923,7 +931,7 @@ function Ne(e, t, n, r, s, d) {
     )
   ]);
 }
-const z = /* @__PURE__ */ T(we, [["render", Ne], ["__scopeId", "data-v-724dcae4"]]), _e = /* @__PURE__ */ new Set([
+const z = /* @__PURE__ */ T(Se, [["render", Re], ["__scopeId", "data-v-4657f355"]]), _e = /* @__PURE__ */ new Set([
   "id",
   "type",
   "x",
@@ -940,16 +948,16 @@ const z = /* @__PURE__ */ T(we, [["render", Ne], ["__scopeId", "data-v-724dcae4"
   "outputReturnProperties",
   ...ie
 ]);
-function Le(e) {
+function je(e) {
   return e.replace(/([A-Z])/g, " $1").replace(/^./, (t) => t.toUpperCase()).trim();
 }
-function je(e) {
+function Le(e) {
   var t, n;
   return e.type === "object" && !!((t = e.properties) != null && t.value) && !!((n = e.properties) != null && n.type);
 }
 function C(e, t, n, r) {
-  var b;
-  const s = r || t.title || Le(e), d = t["x-nrg-form"] ?? {}, a = d.icon || "";
+  var I;
+  const s = r || t.title || je(e), d = t["x-nrg-form"] ?? {}, a = d.icon || "";
   if (t["x-nrg-node-type"])
     return {
       key: e,
@@ -959,7 +967,7 @@ function C(e, t, n, r) {
       required: n,
       configType: t["x-nrg-node-type"]
     };
-  if (je(t))
+  if (Le(t))
     return {
       key: e,
       label: s,
@@ -969,7 +977,7 @@ function C(e, t, n, r) {
       // serialized schemas carry plain strings; trust them as typed-input type names
       types: d.typedInputTypes
     };
-  if (t.type === "array" && ((b = t.items) != null && b.enum))
+  if (t.type === "array" && ((I = t.items) != null && I.enum))
     return {
       key: e,
       label: s,
@@ -1049,9 +1057,8 @@ function C(e, t, n, r) {
         key: e,
         label: s,
         icon: a,
-        inputType: "text",
-        required: n,
-        htmlType: "text"
+        inputType: "object-json",
+        required: n
       };
     default:
       return d.editorLanguage ? {
@@ -1074,12 +1081,12 @@ function C(e, t, n, r) {
 const Ce = V({
   name: "NodeRedJsonSchemaForm",
   components: {
-    NodeRedInputLabel: w,
+    NodeRedInputLabel: S,
     NodeRedToggle: z,
-    NodeRedInput: B,
-    NodeRedSelectInput: F,
-    NodeRedTypedInput: U,
-    NodeRedConfigInput: M,
+    NodeRedInput: U,
+    NodeRedSelectInput: M,
+    NodeRedTypedInput: B,
+    NodeRedConfigInput: F,
     NodeRedEditorInput: P
   },
   props: {
@@ -1131,23 +1138,35 @@ const Ce = V({
     }
   },
   methods: {
+    // Parse a JSON-object field's textarea into a real object so AJV's
+    // `type: "object"` validates and the saved value is an object. On invalid
+    // JSON, keep the raw string so the type error surfaces instead of being
+    // silently swallowed. Runs on blur (`@change`) so typing isn't reformatted.
+    setObjectField(e, t) {
+      const n = this.node;
+      try {
+        n[e] = JSON.parse(t);
+      } catch {
+        n[e] = t;
+      }
+    },
     resolveI18n(e, t) {
       const n = this.$i18n(`${e}.${t}`), r = `${this.node.type}.${e}.${t}`;
       if (n && n !== r && n !== `${e}.${t}`)
         return n;
     }
   }
-}), Ae = { key: 1 }, Oe = { key: 2 }, De = ["checked", "onChange"], We = { key: 6 }, Be = ["value", "onInput"], Ue = {
+}), Oe = { key: 1 }, Ae = { key: 2 }, De = ["checked", "onChange"], We = { key: 6 }, Ue = ["value", "onInput"], Be = {
   key: 0,
   class: "node-red-vue-input-error-message"
 };
-function Me(e, t, n, r, s, d) {
-  const a = g("NodeRedInput"), h = g("NodeRedToggle"), b = g("NodeRedInputLabel"), i = g("NodeRedSelectInput"), u = g("NodeRedTypedInput"), y = g("NodeRedConfigInput"), I = g("NodeRedEditorInput");
+function Fe(e, t, n, r, s, d) {
+  const a = g("NodeRedInput"), h = g("NodeRedToggle"), I = g("NodeRedInputLabel"), i = g("NodeRedSelectInput"), u = g("NodeRedTypedInput"), y = g("NodeRedConfigInput"), b = g("NodeRedEditorInput");
   return l(), c("div", null, [
     (l(!0), c(
       _,
       null,
-      L(e.configFields, (o) => (l(), c("div", {
+      j(e.configFields, (o) => (l(), c("div", {
         key: o.key,
         class: "form-row"
       }, [
@@ -1160,15 +1179,15 @@ function Me(e, t, n, r, s, d) {
           icon: o.icon,
           required: o.required,
           error: e.errors[`node.${o.key}`]
-        }, null, 8, ["value", "onUpdate:value", "type", "label", "icon", "required", "error"])) : o.inputType === "boolean" && o.toggle ? (l(), c("div", Ae, [
-          R(h, {
+        }, null, 8, ["value", "onUpdate:value", "type", "label", "icon", "required", "error"])) : o.inputType === "boolean" && o.toggle ? (l(), c("div", Oe, [
+          N(h, {
             "model-value": e.node[o.key],
             label: o.label,
             icon: o.icon,
             "onUpdate:modelValue": (p) => e.node[o.key] = p
           }, null, 8, ["model-value", "label", "icon", "onUpdate:modelValue"])
-        ])) : o.inputType === "boolean" ? (l(), c("div", Oe, [
-          R(b, {
+        ])) : o.inputType === "boolean" ? (l(), c("div", Ae, [
+          N(I, {
             label: o.label,
             icon: o.icon,
             required: o.required
@@ -1212,7 +1231,7 @@ function Me(e, t, n, r, s, d) {
           required: o.required,
           error: e.errors[`node.${o.key}`]
         }, null, 8, ["value", "onUpdate:value", "type", "node", "prop-name", "label", "icon", "required", "error"])) : o.inputType === "array-text" ? (l(), c("div", We, [
-          R(b, {
+          N(I, {
             label: o.label,
             icon: o.icon,
             required: o.required
@@ -1231,16 +1250,25 @@ function Me(e, t, n, r, s, d) {
             style: { width: "100%", resize: "vertical", "font-family": "monospace", "font-size": "13px" },
             onInput: (p) => e.node[o.key] = p.target.value.split(`
 `).filter(Boolean)
-          }, null, 40, Be),
+          }, null, 40, Ue),
           e.errors[`node.${o.key}`] ? (l(), c(
             "span",
-            Ue,
+            Be,
             E(e.errors[`node.${o.key}`]),
             1
             /* TEXT */
           )) : f("v-if", !0)
-        ])) : o.inputType === "editor" ? (l(), v(I, {
+        ])) : o.inputType === "object-json" ? (l(), v(b, {
           key: 7,
+          value: typeof e.node[o.key] == "string" ? e.node[o.key] : JSON.stringify(e.node[o.key] ?? {}, null, 2),
+          language: "json",
+          label: o.label,
+          icon: o.icon,
+          required: o.required,
+          error: e.errors[`node.${o.key}`],
+          "onUpdate:value": (p) => e.setObjectField(o.key, p)
+        }, null, 8, ["value", "label", "icon", "required", "error", "onUpdate:value"])) : o.inputType === "editor" ? (l(), v(b, {
+          key: 8,
           value: e.node[o.key],
           "onUpdate:value": (p) => e.node[o.key] = p,
           language: o.language,
@@ -1256,11 +1284,11 @@ function Me(e, t, n, r, s, d) {
     (l(!0), c(
       _,
       null,
-      L(e.credentialFields, (o) => (l(), c("div", {
+      j(e.credentialFields, (o) => (l(), c("div", {
         key: `cred-${o.key}`,
         class: "form-row"
       }, [
-        R(a, {
+        N(a, {
           value: e.node.credentials[o.key],
           "onUpdate:value": (p) => e.node.credentials[o.key] = p,
           type: o.htmlType,
@@ -1275,8 +1303,8 @@ function Me(e, t, n, r, s, d) {
     ))
   ]);
 }
-const Fe = /* @__PURE__ */ T(Ce, [["render", Me]]);
-function A() {
+const Me = /* @__PURE__ */ T(Ce, [["render", Fe]]);
+function O() {
   const e = {
     get(t) {
       return e[t];
@@ -1317,12 +1345,12 @@ function He() {
       }
     };
     return i;
-  }, b = {
+  }, I = {
     _: (i) => i,
     editor: {
       createEditor(i) {
         let u = (i == null ? void 0 : i.value) || "";
-        const y = {}, I = {
+        const y = {}, b = {
           on(o, p) {
             (y[o] ?? (y[o] = [])).push(p);
           }
@@ -1332,7 +1360,7 @@ function He() {
           setValue: (o) => {
             u = o, (y.change ?? []).forEach((p) => p());
           },
-          getSession: () => I,
+          getSession: () => b,
           focus: () => {
           },
           destroy: () => {
@@ -1409,8 +1437,8 @@ function He() {
       filterLinks(i) {
         return n.filter(
           (u) => {
-            var y, I, o, p;
-            return (i.source === void 0 || u.source === i.source || ((y = u.source) == null ? void 0 : y.id) === ((I = i.source) == null ? void 0 : I.id)) && (i.target === void 0 || u.target === i.target || ((o = u.target) == null ? void 0 : o.id) === ((p = i.target) == null ? void 0 : p.id));
+            var y, b, o, p;
+            return (i.source === void 0 || u.source === i.source || ((y = u.source) == null ? void 0 : y.id) === ((b = i.source) == null ? void 0 : b.id)) && (i.target === void 0 || u.target === i.target || ((o = u.target) == null ? void 0 : o.id) === ((p = i.target) == null ? void 0 : p.id));
           }
         );
       },
@@ -1444,7 +1472,7 @@ function He() {
       },
       unsubscribe(i, u) {
         const y = s.findIndex(
-          (I) => I.topic === i && I.callback === u
+          (b) => b.topic === i && b.callback === u
         );
         y !== -1 && s.splice(y, 1);
       },
@@ -1452,7 +1480,7 @@ function He() {
         [...s].filter((y) => Pe(y.topic, i)).forEach((y) => y.callback(i, u));
       }
     },
-    settings: A(),
+    settings: O(),
     notify: () => ({
       update: () => {
       },
@@ -1460,23 +1488,23 @@ function He() {
       }
     })
   };
-  return Object.defineProperty(b, "__reset", {
+  return Object.defineProperty(I, "__reset", {
     enumerable: !1,
     value: () => {
       e.clear(), t.clear(), n.length = 0;
       for (const i of Object.keys(r))
         delete r[i];
-      s.length = 0, d = !1, b.settings = A();
+      s.length = 0, d = !1, I.settings = O();
     }
-  }), b;
+  }), I;
 }
-function O() {
+function A() {
   return { typedInput: { value: "", type: "" }, listeners: {} };
 }
 function Je(e) {
-  return e && !e.__jqState && (e.__jqState = O()), e ? e.__jqState : O();
+  return e && !e.__jqState && (e.__jqState = A()), e ? e.__jqState : A();
 }
-function S(e) {
+function w(e) {
   const t = Je(e), n = {
     0: e,
     length: e ? 1 : 0,
@@ -1545,7 +1573,7 @@ function S(e) {
       return r !== void 0 ? ((e instanceof HTMLInputElement || e instanceof HTMLSelectElement || e instanceof HTMLTextAreaElement) && (e.value = String(r)), n) : e instanceof HTMLInputElement || e instanceof HTMLSelectElement || e instanceof HTMLTextAreaElement ? e.value : "";
     },
     find(r) {
-      return S((e == null ? void 0 : e.querySelector(r)) ?? null);
+      return w((e == null ? void 0 : e.querySelector(r)) ?? null);
     },
     append(r) {
       const s = (r == null ? void 0 : r[0]) || r;
@@ -1586,11 +1614,11 @@ function Ke() {
         if (s && n)
           for (const [d, a] of Object.entries(n))
             d === "html" ? s.innerHTML = String(a) : s.setAttribute(d, String(a));
-        return S(s);
+        return w(s);
       }
-      return S(document.querySelector(t));
+      return w(document.querySelector(t));
     }
-    return t instanceof Element || t && typeof t == "object" && t.nodeType ? S(t) : S(null);
+    return t instanceof Element || t && typeof t == "object" && t.nodeType ? w(t) : w(null);
   };
 }
 function Qe() {
@@ -1600,13 +1628,13 @@ function Qe() {
 }
 D.global.mocks.$i18n = (e) => e;
 D.global.components = {
-  NodeRedInputLabel: w,
+  NodeRedInputLabel: S,
   NodeRedToggle: z,
-  NodeRedInput: B,
-  NodeRedTypedInput: U,
-  NodeRedConfigInput: M,
-  NodeRedSelectInput: F,
+  NodeRedInput: U,
+  NodeRedTypedInput: B,
+  NodeRedConfigInput: F,
+  NodeRedSelectInput: M,
   NodeRedEditorInput: P,
-  NodeRedJsonSchemaForm: Fe
+  NodeRedJsonSchemaForm: Me
 };
 Qe();

package/test/client/e2e/index.js

@@ -703,11 +703,17 @@ function packageJsonGenerator(options) {
         distDependencies = void 0;
       }
       const distPackageJson = {
-        ...rootPackageJson,
+        name: rootPackageJson.name,
+        version: rootPackageJson.version,
+        description: rootPackageJson.description,
+        author: rootPackageJson.author,
+        license: rootPackageJson.license,
+        homepage: rootPackageJson.homepage,
+        repository: rootPackageJson.repository,
+        bugs: rootPackageJson.bugs,
+        engines: rootPackageJson.engines,
         main: "index.js",
         type: "commonjs",
-        devDependencies: void 0,
-        scripts: void 0,
         dependencies: distDependencies,
         keywords: [
           .../* @__PURE__ */ new Set([...rootPackageJson.keywords ?? [], "node-red"])
@@ -1856,8 +1862,8 @@ function localesGenerator(options) {
         }
       },
       help: {
-        validateInput: "\u5728 input() \u8FD0\u884C\u524D\uFF0C\u6839\u636E\u8F93\u5165\u6A21\u5F0F\u6821\u9A8C\u4F20\u5165\u6D88\u606F\u3002",
-        outputs: "\u6309\u7AEF\u53E3\u7684\u8F93\u51FA\u8BBE\u7F6E\u3002\u9A8C\u8BC1\u6570\u636E\u6839\u636E\u7AEF\u53E3\u6A21\u5F0F\u6821\u9A8C\u53D1\u9001\u7684\u503C\uFF1B\u4E0A\u4E0B\u6587\u6A21\u5F0F\u63A7\u5236\u5982\u4F55\u643A\u5E26\u4F20\u5165\u6D88\u606F\u3002",
+        validateInput: "\u5728 input() \u8FD0\u884C\u524D\uFF0C\u6839\u636E\u8F93\u5165\u7ED3\u6784\u63CF\u8FF0\u6821\u9A8C\u4F20\u5165\u6D88\u606F\u3002",
+        outputs: "\u6309\u7AEF\u53E3\u7684\u8F93\u51FA\u8BBE\u7F6E\u3002\u9A8C\u8BC1\u6570\u636E\u6839\u636E\u7AEF\u53E3\u7ED3\u6784\u63CF\u8FF0\u6821\u9A8C\u53D1\u9001\u7684\u503C\uFF1B\u4E0A\u4E0B\u6587\u6A21\u5F0F\u63A7\u5236\u5982\u4F55\u643A\u5E26\u4F20\u5165\u6D88\u606F\u3002",
         lifecyclePorts: "\u53EF\u9009\u7684\u989D\u5916\u8F93\u51FA\u7AEF\u53E3\uFF0C\u5728\u51FA\u9519\u3001\u5B8C\u6210\u4EE5\u53CA\u6BCF\u6B21\u72B6\u6001\u53D8\u5316\u65F6\u89E6\u53D1\u3002",
         learnMore: "\u4E86\u89E3\u66F4\u591A"
       }

package/test/server/integration/config.js

@@ -1,9 +1,3 @@
-import { fileURLToPath as __nrgFileURLToPath } from "url";
-import { dirname as __nrgDirname } from "path";
-var __filename = __nrgFileURLToPath(import.meta.url);
-var __dirname = __nrgDirname(__filename);
-
-
 // src/test/server/integration/config.ts
 import path from "path";
 var defaultConfig = {