@bonsae/nrg 0.26.3 → 0.27.0

package/test/client/component/index.js

@@ -1,16 +1,16 @@
-var j = Object.defineProperty;
-var $ = (t, e, r) => e in t ? j(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var v = (t, e, r) => $(t, typeof e != "symbol" ? e + "" : e, r);
-import { inject as F, vi as y } from "vitest";
-import { inject as l, reactive as _, watch as S } from "vue";
-import b from "jsonpointer";
+var w = Object.defineProperty;
+var $ = (r, e, t) => e in r ? w(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
+var v = (r, e, t) => $(r, typeof e != "symbol" ? e + "" : e, t);
+import { inject as b, vi as y } from "vitest";
+import { inject as l, reactive as _, watch as F } from "vue";
+import P from "jsonpointer";
 import k from "ajv";
 import O from "ajv-formats";
-import P from "ajv-errors";
-class N {
+import N from "ajv-errors";
+class S {
   constructor(e) {
     v(this, "ajv");
-    const { customKeywords: r, customFormats: o, ...a } = e || {};
+    const { customKeywords: t, customFormats: o, ...n } = e || {};
     this.ajv = new k({
       allErrors: !0,
       code: {
@@ -26,23 +26,23 @@ class N {
       // NOTE: if true, types that are not serializable JSON, like Function, would not work
       validateSchema: !1,
       verbose: !0,
-      ...a
-    }), O(this.ajv), P(this.ajv), this.addCustomKeywords(r || []), this.addCustomFormats(o || {});
+      ...n
+    }), O(this.ajv), N(this.ajv), this.addCustomKeywords(t || []), this.addCustomFormats(o || {});
   }
   /**
    * Add custom keywords to the validator
    */
   addCustomKeywords(e) {
-    e && e.forEach((r) => {
-      this.ajv.addKeyword(r);
+    e && e.forEach((t) => {
+      this.ajv.addKeyword(t);
     });
   }
   /**
    * Add custom formats to the validator
    */
   addCustomFormats(e) {
-    e && Object.entries(e).forEach(([r, o]) => {
-      o instanceof RegExp ? this.ajv.addFormat(r, o) : this.ajv.addFormat(r, { validate: o });
+    e && Object.entries(e).forEach(([t, o]) => {
+      o instanceof RegExp ? this.ajv.addFormat(t, o) : this.ajv.addFormat(t, { validate: o });
     });
   }
   /**
@@ -50,25 +50,25 @@ class N {
    * @param schema - JSON Schema to validate against
    * @param cacheKey - Optional cache key for reusing validators
    */
-  createValidator(e, r) {
-    if (r && !e.$id && (e.$id = r), e.$id) {
-      const a = this.ajv.getSchema(e.$id);
-      if (a) return a;
+  createValidator(e, t) {
+    if (t && !e.$id && (e.$id = t), e.$id) {
+      const n = this.ajv.getSchema(e.$id);
+      if (n) return n;
     }
     return this.ajv.compile(e);
   }
   /**
    * Validate data against a schema and return a structured result
    */
-  validate(e, r, o) {
-    const a = this.createValidator(r, o == null ? void 0 : o.cacheKey);
-    if (!a(e)) {
-      const i = this.formatErrors(a.errors);
+  validate(e, t, o) {
+    const n = this.createValidator(t, o == null ? void 0 : o.cacheKey);
+    if (!n(e)) {
+      const i = this.formatErrors(n.errors);
       if (o != null && o.throwOnError)
-        throw new h(i, a.errors || []);
+        throw new p(i, n.errors || []);
       return {
         valid: !1,
-        errors: a.errors || void 0,
+        errors: n.errors || void 0,
         errorMessage: i
       };
     }
@@ -80,30 +80,30 @@ class N {
   /**
    * Format errors into a human-readable string
    */
-  formatErrors(e, r) {
+  formatErrors(e, t) {
     return !e || e.length === 0 ? "No errors" : this.ajv.errorsText(e, {
       separator: "; ",
       dataVar: "data",
-      ...r
+      ...t
     });
   }
   /**
    * Get detailed error information
    */
   getDetailedErrors(e) {
-    return !e || e.length === 0 ? [] : e.map((r) => ({
-      field: r.instancePath || "/",
-      message: r.message || "Validation failed",
-      keyword: r.keyword,
-      params: r.params,
-      schemaPath: r.schemaPath
+    return !e || e.length === 0 ? [] : e.map((t) => ({
+      field: t.instancePath || "/",
+      message: t.message || "Validation failed",
+      keyword: t.keyword,
+      params: t.params,
+      schemaPath: t.schemaPath
     }));
   }
   /**
    * Add a schema to the validator for reference
    */
-  addSchema(e, r) {
-    return this.ajv.addSchema(e, r), this;
+  addSchema(e, t) {
+    return this.ajv.addSchema(e, t), this;
   }
   /**
    * Remove a schema from the validator
@@ -112,12 +112,12 @@ class N {
     return this.ajv.removeSchema(e), this;
   }
 }
-class h extends Error {
-  constructor(e, r) {
-    super(e), this.errors = r, this.name = "ValidationError", Object.setPrototypeOf(this, h.prototype);
+class p extends Error {
+  constructor(e, t) {
+    super(e), this.errors = t, this.name = "ValidationError", Object.setPrototypeOf(this, p.prototype);
   }
 }
-const V = new N({
+const V = new S({
   customKeywords: [
     {
       keyword: "x-nrg-skip-validation",
@@ -127,118 +127,126 @@ const V = new N({
     {
       keyword: "x-nrg-node-type",
       type: "string",
-      validate: (t, e) => {
+      validate: (r, e) => {
         if (!e) return !0;
-        const r = RED.nodes.node(e);
-        return !!r && r.type === t;
+        const t = RED.nodes.node(e);
+        return !!t && t.type === r;
       }
     }
   ],
   customFormats: {
-    "node-id": /^[a-zA-Z0-9-_]+$/,
-    "flow-id": /^[a-f0-9]{16}$/,
-    "topic-path": (t) => /^[a-zA-Z0-9/_-]+$/.test(t)
+    "node-id": /^[a-zA-Z0-9-_]+$/
   }
 });
-function x(t, e) {
-  return t && (e != null && e.properties) ? {
-    ...t,
+function x(r, e) {
+  const t = e == null ? void 0 : e.properties;
+  if (!t) return r;
+  const o = {
+    type: "object",
+    properties: t,
+    // Propagate `required` so required credentials are actually enforced
+    // (previously they never were, even alongside a config schema).
+    ...e != null && e.required ? { required: e.required } : {}
+  };
+  return r ? {
+    ...r,
     properties: {
-      ...t.properties,
-      credentials: {
-        type: "object",
-        properties: e.properties
-      }
+      ...r.properties,
+      credentials: o
     }
-  } : t;
+  } : {
+    type: "object",
+    properties: { credentials: o },
+    additionalProperties: !0
+  };
 }
-function K(t, e) {
-  const r = V.validate(t, e, {
-    cacheKey: `node-schema-${t.type}`
+function K(r, e) {
+  const t = V.validate(r, e, {
+    cacheKey: `node-schema-${r.type}`
   });
-  return r.valid ? [] : r.errors ?? [];
+  return t.valid ? [] : t.errors ?? [];
 }
-function g(t, e) {
-  return K(t, e).filter((r) => {
-    var a;
-    return ((a = r.parentSchema) == null ? void 0 : a.format) !== "password" ? !0 : b.get(t, r.instancePath) !== "__PWD__";
+function g(r, e) {
+  return K(r, e).filter((t) => {
+    var n;
+    return ((n = t.parentSchema) == null ? void 0 : n.format) !== "password" ? !0 : P.get(r, t.instancePath) !== "__PWD__";
   }).reduce(
-    (r, o) => {
+    (t, o) => {
       var i;
-      let a = o.instancePath;
-      o.keyword === "required" && ((i = o.params) != null && i.missingProperty) && (a = `${a}/${o.params.missingProperty}`);
-      const n = `node${a.replaceAll("/", ".")}`;
-      return r[n] = o.message ?? "Invalid", r;
+      let n = o.instancePath;
+      o.keyword === "required" && ((i = o.params) != null && i.missingProperty) && (n = `${n}/${o.params.missingProperty}`);
+      const a = `node${n.replaceAll("/", ".")}`;
+      return t[a] = o.message ?? "Invalid", t;
     },
     {}
   );
 }
 function B() {
-  const t = l("__nrg_form_node"), e = l("__nrg_form_schema"), r = l("__nrg_form_errors");
-  if (!t)
+  const r = l("__nrg_form_node"), e = l("__nrg_form_schema"), t = l("__nrg_form_errors");
+  if (!r)
     throw new Error(
       "useFormNode() must be called inside a form component mounted by NRG."
     );
   return {
-    node: t,
+    node: r,
     schema: e,
-    errors: r
+    errors: t
   };
 }
-let w = 0;
-function H(t = {}) {
-  var p;
-  const e = "type" in t || "configs" in t || "configSchema" in t || "credentialsSchema" in t || "nodes" in t ? t : { configs: t }, r = e.type ? (p = A()) == null ? void 0 : p[e.type] : void 0, o = e.configSchema ?? (r == null ? void 0 : r.configSchema), a = e.credentialsSchema ?? (r == null ? void 0 : r.credentialsSchema), n = _({
-    id: `test-${w}`,
+let j = 0;
+function H(r = {}) {
+  var h;
+  const e = "type" in r || "configs" in r || "configSchema" in r || "credentialsSchema" in r || "nodes" in r ? r : { configs: r }, t = e.type ? (h = C()) == null ? void 0 : h[e.type] : void 0, o = e.configSchema ?? (t == null ? void 0 : t.configSchema), n = e.credentialsSchema ?? (t == null ? void 0 : t.credentialsSchema), a = _({
+    id: `test-${j}`,
     // Unique type per node: validateForm caches compiled schemas by
     // `node-schema-${subject.type}`, so a shared type would silently reuse
     // the first schema for every later createNode call in the same file.
-    type: `test-node-${w++}`,
+    type: `test-node-${j++}`,
     changed: !1,
     _def: { outputs: 1 },
     _: (c) => c,
     ...e.configs,
     credentials: { ...e.credentials }
-  }), i = x(o, a);
+  }), i = x(o, n);
   let d;
   if (i) {
-    const { $id: c, ...u } = i;
-    d = u;
+    const { $id: c, ...f } = i;
+    d = f;
   }
-  const f = T();
-  C(f), f.nodes.clear();
+  const m = q();
+  T(m), m.nodes.clear();
   for (const c of e.nodes ?? [])
-    f.nodes.add(c);
-  const m = _(
-    d ? g(n, d) : {}
+    m.nodes.add(c);
+  const u = _(
+    d ? g(a, d) : {}
   );
-  return d && S(
-    n,
+  return d && F(
+    a,
     () => {
-      const c = g(n, d);
-      Object.keys(m).forEach((u) => delete m[u]), Object.assign(m, c);
+      const c = g(a, d);
+      Object.keys(u).forEach((f) => delete u[f]), Object.assign(u, c);
     },
     { deep: !0 }
-  ), { node: n, errors: m, RED: f, provide: {
-    __nrg_form_node: n,
+  ), { node: a, errors: u, RED: m, provide: {
+    __nrg_form_node: a,
     __nrg_form_schema: d ?? {},
-    __nrg_form_errors: m
+    __nrg_form_errors: u
   } };
 }
-function A() {
+function C() {
   try {
-    return F("__nrg_schemas");
+    return b("__nrg_schemas");
   } catch {
     return;
   }
 }
-function s(t, e) {
-  y.isMockFunction(t[e]) || y.spyOn(t, e);
+function s(r, e) {
+  y.isMockFunction(r[e]) || y.spyOn(r, e);
 }
-function C(t) {
-  s(t, "_"), s(t, "notify"), s(t.editor, "createEditor"), s(t.editor, "prepareConfigNodeSelect"), s(t.editor, "validateNode"), s(t.tray, "show"), s(t.tray, "close"), s(t.popover, "tooltip"), s(t.popover, "create"), s(t.nodes, "registerType"), s(t.nodes, "node"), s(t.nodes, "add"), s(t.nodes, "remove"), s(t.nodes, "getType"), s(t.nodes, "dirty"), s(t.events, "on"), s(t.events, "off"), s(t.events, "emit"), s(t.comms, "subscribe"), s(t.comms, "unsubscribe");
+function T(r) {
+  s(r, "_"), s(r, "notify"), s(r.editor, "createEditor"), s(r.editor, "prepareConfigNodeSelect"), s(r.editor, "validateNode"), s(r.tray, "show"), s(r.tray, "close"), s(r.popover, "tooltip"), s(r.popover, "create"), s(r.nodes, "registerType"), s(r.nodes, "node"), s(r.nodes, "add"), s(r.nodes, "remove"), s(r.nodes, "getType"), s(r.nodes, "dirty"), s(r.events, "on"), s(r.events, "off"), s(r.events, "emit"), s(r.comms, "subscribe"), s(r.comms, "unsubscribe");
 }
-function T() {
+function q() {
   return window.RED;
 }
 export {

package/test/client/component/nrg.css

@@ -1 +1 @@
-.nrg-label[data-v-864b02f2]{display:inline-block;width:100%;margin-bottom:4px;cursor:default}.nrg-label i[data-v-864b02f2]{margin-right:5px}.nrg-required[data-v-864b02f2]{color:var(--red-ui-text-color-error);margin-left:2px}.editor-wrapper[data-v-ea93e881]{position:relative}.expand-button[data-v-ea93e881]{position:absolute;top:-23px;right:0;z-index:10;transition:color .3s ease;cursor:pointer}.nrg-toggle-wrapper[data-v-724dcae4]{display:inline-flex;align-items:center}.nrg-toggle[data-v-724dcae4]{position:relative;display:inline-flex!important;flex-direction:column;align-items:flex-start;cursor:pointer;gap:4px;-webkit-user-select:none;user-select:none}.nrg-toggle__input[data-v-724dcae4]{position:absolute;opacity:0;width:0;height:0}.nrg-toggle__slider[data-v-724dcae4]{position:relative;display:inline-block;width:36px;min-width:36px;height:20px;background-color:var(--red-ui-secondary-border-color, #ccc);border-radius:10px;transition:background-color .2s ease}.nrg-toggle__slider[data-v-724dcae4]:after{content:"";position:absolute;top:2px;left:2px;width:16px;height:16px;background-color:#fff;border-radius:50%;transition:transform .2s ease}.nrg-toggle--checked .nrg-toggle__slider[data-v-724dcae4]{background-color:var(--red-ui-text-color-link, #0070d2)}.nrg-toggle--checked .nrg-toggle__slider[data-v-724dcae4]:after{transform:translate(16px)}.nrg-toggle__label[data-v-724dcae4]{cursor:default;white-space:nowrap}.nrg-toggle__label i[data-v-724dcae4]{margin-right:2px}
+.nrg-label[data-v-864b02f2]{display:inline-block;width:100%;margin-bottom:4px;cursor:default}.nrg-label i[data-v-864b02f2]{margin-right:5px}.nrg-required[data-v-864b02f2]{color:var(--red-ui-text-color-error);margin-left:2px}.editor-wrapper[data-v-ea93e881]{position:relative}.expand-button[data-v-ea93e881]{position:absolute;top:-23px;right:0;z-index:10;transition:color .3s ease;cursor:pointer}.nrg-toggle-wrapper[data-v-4657f355]{display:inline-flex;align-items:center}.nrg-toggle[data-v-4657f355]{position:relative;display:inline-flex!important;flex-direction:column;align-items:flex-start;cursor:pointer;gap:4px;-webkit-user-select:none;user-select:none}.nrg-toggle__input[data-v-4657f355]{position:absolute;opacity:0;width:0;height:0}.nrg-toggle__slider[data-v-4657f355]{position:relative;display:inline-block;width:36px;min-width:36px;height:20px;background-color:var(--red-ui-secondary-border-color, #ccc);border-radius:10px;transition:background-color .2s ease}.nrg-toggle__slider[data-v-4657f355]:after{content:"";position:absolute;top:2px;left:2px;width:16px;height:16px;background-color:#fff;border-radius:50%;transition:transform .2s ease}.nrg-toggle--checked .nrg-toggle__slider[data-v-4657f355]{background-color:var(--red-ui-text-color-link, #0070d2)}.nrg-toggle--checked .nrg-toggle__slider[data-v-4657f355]:after{transform:translate(16px)}.nrg-toggle__label[data-v-4657f355]{cursor:default;white-space:nowrap}.nrg-toggle__label i[data-v-4657f355]{margin-right:2px}