@bonsae/nrg 0.18.4 → 0.19.0

package/test/client/component/config.js

@@ -18,6 +18,17 @@ var defaultConfig = {
       allow: [".."]
     }
   },
+  optimizeDeps: {
+    // @bonsae/nrg/server is a CJS bundle — prebundling converts it so browser
+    // tests can import TypeBox schemas straight from server schema modules.
+    include: [
+      "@bonsae/nrg/server",
+      "jsonpointer",
+      "ajv",
+      "ajv-formats",
+      "ajv-errors"
+    ]
+  },
   test: {
     testTimeout: 3e4,
     setupFiles: ["@bonsae/nrg/test/client/component/setup"],

package/test/client/component/index.js

@@ -1,259 +1,242 @@
-// src/test/client/component/index.ts
-import { vi } from "vitest";
-
-// src/test/client/mocks.ts
-function createRED() {
-  return {
-    _: (key) => key,
-    editor: {
-      createEditor(options) {
-        let currentValue = options.value || "";
-        const session = {
-          on(_event, _cb) {
-          }
-        };
-        return {
-          getValue: () => currentValue,
-          setValue: (val) => {
-            currentValue = val;
-          },
-          getSession: () => session,
-          focus: () => {
-          },
-          destroy: () => {
-          },
-          saveView: () => {
-          },
-          restoreView: () => {
-          }
-        };
-      },
-      prepareConfigNodeSelect: () => {
-      },
-      validateNode: () => true
-    },
-    tray: {
-      show: () => {
-      },
-      close: () => {
-      }
-    },
-    popover: {
-      tooltip: () => ({ delete: () => {
-      }, setAction: () => {
-      } })
-    },
-    nodes: {
-      registerType: () => {
-      },
-      node: () => null,
-      dirty: () => false
-    },
-    events: {
-      on: () => {
-      },
-      off: () => {
+var y = Object.defineProperty;
+var _ = (r, e, t) => e in r ? y(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
+var u = (r, e, t) => _(r, typeof e != "symbol" ? e + "" : e, t);
+import { vi as l } from "vitest";
+import { inject as m, reactive as p, watch as g } from "vue";
+import w from "jsonpointer";
+import j from "ajv";
+import $ from "ajv-formats";
+import F from "ajv-errors";
+class b {
+  constructor(e) {
+    u(this, "ajv");
+    const { customKeywords: t, customFormats: o, ...s } = e || {};
+    this.ajv = new j({
+      allErrors: !0,
+      code: {
+        source: !1
       },
-      emit: () => {
-      }
-    },
-    settings: {},
-    notify: () => {
+      coerceTypes: !0,
+      removeAdditional: !1,
+      strict: !1,
+      strictSchema: !1,
+      useDefaults: !0,
+      validateFormats: !0,
+      // NOTE: typebox handles validation via typescript
+      // NOTE: if true, types that are not serializable JSON, like Function, would not work
+      validateSchema: !1,
+      verbose: !0,
+      ...s
+    }), $(this.ajv), F(this.ajv), this.addCustomKeywords(t || []), this.addCustomFormats(o || {});
+  }
+  /**
+   * Add custom keywords to the validator
+   */
+  addCustomKeywords(e) {
+    e && e.forEach((t) => {
+      this.ajv.addKeyword(t);
+    });
+  }
+  /**
+   * Add custom formats to the validator
+   */
+  addCustomFormats(e) {
+    e && Object.entries(e).forEach(([t, o]) => {
+      o instanceof RegExp ? this.ajv.addFormat(t, o) : this.ajv.addFormat(t, { validate: o });
+    });
+  }
+  /**
+   * Create a validator function with caching
+   * @param schema - JSON Schema to validate against
+   * @param cacheKey - Optional cache key for reusing validators
+   */
+  createValidator(e, t) {
+    if (t && !e.$id && (e.$id = t), e.$id) {
+      const s = this.ajv.getSchema(e.$id);
+      if (s) return s;
     }
-  };
-}
-function ensureState(el) {
-  if (el && !el.__jqState) {
-    el.__jqState = {
-      typedInput: { value: "", type: "" },
-      listeners: {}
+    return this.ajv.compile(e);
+  }
+  /**
+   * Validate data against a schema and return a structured result
+   */
+  validate(e, t, o) {
+    const s = this.createValidator(t, o == null ? void 0 : o.cacheKey);
+    if (!s(e)) {
+      const n = this.formatErrors(s.errors);
+      if (o != null && o.throwOnError)
+        throw new f(n, s.errors || []);
+      return {
+        valid: !1,
+        errors: s.errors || void 0,
+        errorMessage: n
+      };
+    }
+    return {
+      valid: !0,
+      data: e
     };
   }
-  return el ? el.__jqState : { typedInput: { value: "", type: "" }, listeners: {} };
+  /**
+   * Format errors into a human-readable string
+   */
+  formatErrors(e, t) {
+    return !e || e.length === 0 ? "No errors" : this.ajv.errorsText(e, {
+      separator: "; ",
+      dataVar: "data",
+      ...t
+    });
+  }
+  /**
+   * Get detailed error information
+   */
+  getDetailedErrors(e) {
+    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, t) {
+    return this.ajv.addSchema(e, t), this;
+  }
+  /**
+   * Remove a schema from the validator
+   */
+  removeSchema(e) {
+    return this.ajv.removeSchema(e), this;
+  }
 }
-function createJQ(el) {
-  const state = ensureState(el);
-  const jq = {
-    0: el,
-    length: el ? 1 : 0,
-    typedInput(action, value) {
-      if (typeof action === "object") {
-        state.typedInput = { value: "", type: action.default || "" };
-        return jq;
-      }
-      if (action === "value") {
-        if (value !== void 0) {
-          state.typedInput.value = String(value);
-          if (el) el.setAttribute("value", String(value));
-          return void 0;
-        }
-        return state.typedInput.value;
-      }
-      if (action === "type") {
-        if (value !== void 0) {
-          state.typedInput.type = String(value);
-          return void 0;
-        }
-        return state.typedInput.type;
-      }
-      return jq;
-    },
-    on(event, cb) {
-      if (!state.listeners[event]) state.listeners[event] = [];
-      state.listeners[event].push(cb);
-      return jq;
-    },
-    off(event) {
-      if (event) {
-        delete state.listeners[event];
-      } else {
-        for (const key of Object.keys(state.listeners)) {
-          delete state.listeners[key];
-        }
-      }
-      return jq;
-    },
-    val(value) {
-      if (value !== void 0) {
-        if (el instanceof HTMLInputElement || el instanceof HTMLSelectElement || el instanceof HTMLTextAreaElement) {
-          el.value = String(value);
-        }
-        return jq;
-      }
-      if (el instanceof HTMLInputElement || el instanceof HTMLSelectElement || el instanceof HTMLTextAreaElement) {
-        return el.value;
+class f extends Error {
+  constructor(e, t) {
+    super(e), this.errors = t, this.name = "ValidationError", Object.setPrototypeOf(this, f.prototype);
+  }
+}
+const k = new b({
+  customKeywords: [
+    {
+      keyword: "x-nrg-skip-validation",
+      schemaType: "boolean",
+      valid: !0
+    },
+    {
+      keyword: "x-nrg-node-type",
+      type: "string",
+      validate: (r, e) => {
+        if (!e) return !0;
+        const t = RED.nodes.node(e);
+        return !!t && t.type === r;
       }
-      return "";
-    },
-    find(selector) {
-      return createJQ(el?.querySelector(selector) ?? null);
-    },
-    append(child) {
-      const childEl = child?.[0] || child;
-      if (el && childEl instanceof Element) el.appendChild(childEl);
-      return jq;
-    },
-    appendTo(target) {
-      const t = target?.[0] || target;
-      if (t instanceof Element && el) t.appendChild(el);
-      return jq;
-    },
-    html(content) {
-      if (el) el.innerHTML = content;
-      return jq;
-    },
-    empty() {
-      if (el) el.innerHTML = "";
-      return jq;
-    },
-    i18n() {
-      return jq;
-    },
-    addClass(cls) {
-      el?.classList.add(cls);
-      return jq;
-    },
-    removeClass(cls) {
-      el?.classList.remove(cls);
-      return jq;
-    },
-    __trigger(event) {
-      (state.listeners[event] || []).forEach((cb) => cb());
     }
-  };
-  return jq;
-}
-function createJQuery() {
-  return function $(selector, attrs) {
-    if (typeof selector === "string") {
-      if (selector.trim().startsWith("<")) {
-        const tpl = document.createElement("template");
-        tpl.innerHTML = selector.trim();
-        const el = tpl.content.firstElementChild;
-        if (el && attrs) {
-          for (const [key, value] of Object.entries(attrs)) {
-            if (key === "html") {
-              el.innerHTML = String(value);
-            } else {
-              el.setAttribute(key, String(value));
-            }
-          }
-        }
-        return createJQ(el);
+  ],
+  customFormats: {
+    "node-id": /^[a-zA-Z0-9-_]+$/,
+    "flow-id": /^[a-f0-9]{16}$/,
+    "topic-path": (r) => /^[a-zA-Z0-9/_-]+$/.test(r)
+  }
+});
+function O(r, e) {
+  return r && (e != null && e.properties) ? {
+    ...r,
+    properties: {
+      ...r.properties,
+      credentials: {
+        type: "object",
+        properties: e.properties
       }
-      return createJQ(document.querySelector(selector));
     }
-    if (selector instanceof Element) return createJQ(selector);
-    if (selector && typeof selector === "object" && selector.nodeType)
-      return createJQ(selector);
-    return createJQ(null);
-  };
+  } : r;
+}
+function P(r, e) {
+  const t = k.validate(r, e, {
+    cacheKey: `node-schema-${r.type}`
+  });
+  return t.valid ? [] : t.errors ?? [];
 }
-
-// src/core/client/use-form-node.ts
-import { inject } from "vue";
-function useFormNode() {
-  const node = inject("__nrg_form_node");
-  const schema = inject("__nrg_form_schema");
-  const errors = inject("__nrg_form_errors");
-  if (!node) {
+function v(r, e) {
+  return P(r, e).filter((t) => {
+    var s;
+    return ((s = t.parentSchema) == null ? void 0 : s.format) !== "password" ? !0 : w.get(r, t.instancePath) !== "__PWD__";
+  }).reduce(
+    (t, o) => {
+      var n;
+      let s = o.instancePath;
+      o.keyword === "required" && ((n = o.params) != null && n.missingProperty) && (s = `${s}/${o.params.missingProperty}`);
+      const i = `node${s.replaceAll("/", ".")}`;
+      return t[i] = o.message ?? "Invalid", t;
+    },
+    {}
+  );
+}
+function I() {
+  const r = m("__nrg_form_node"), e = m("__nrg_form_schema"), t = m("__nrg_form_errors");
+  if (!r)
     throw new Error(
       "useFormNode() must be called inside a form component mounted by NRG."
     );
-  }
   return {
-    node,
-    schema,
-    errors
+    node: r,
+    schema: e,
+    errors: t
   };
 }
-
-// src/test/client/component/index.ts
-function createNode(overrides = {}) {
-  const node = {
-    id: `test-${Math.random().toString(36).slice(2, 10)}`,
-    type: "test-node",
-    changed: false,
+let h = 0;
+function Z(r = {}) {
+  const e = "configs" in r || "configSchema" in r || "credentialsSchema" in r || "nodes" in r ? r : { configs: r }, t = p({
+    id: `test-${h}`,
+    // 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-${h++}`,
+    changed: !1,
     _def: { outputs: 1 },
-    _: (key) => key,
-    ...overrides
-  };
-  const RED = getMockRED();
-  spyOnRED(RED);
-  const provide = {
-    __nrg_form_node: node,
-    __nrg_form_schema: {},
-    __nrg_form_errors: {}
-  };
-  return { node, RED, provide };
-}
-function spyIfNeeded(obj, method) {
-  if (!vi.isMockFunction(obj[method])) {
-    vi.spyOn(obj, method);
+    _: (d) => d,
+    ...e.configs,
+    credentials: { ...e.credentials }
+  }), o = O(
+    e.configSchema,
+    e.credentialsSchema
+  );
+  let s;
+  if (o) {
+    const { $id: d, ...c } = o;
+    s = c;
   }
+  const i = S();
+  N(i), i.nodes.clear();
+  for (const d of e.nodes ?? [])
+    i.nodes.add(d);
+  const n = p(
+    s ? v(t, s) : {}
+  );
+  return s && g(
+    t,
+    () => {
+      const d = v(t, s);
+      Object.keys(n).forEach((c) => delete n[c]), Object.assign(n, d);
+    },
+    { deep: !0 }
+  ), { node: t, errors: n, RED: i, provide: {
+    __nrg_form_node: t,
+    __nrg_form_schema: s ?? {},
+    __nrg_form_errors: n
+  } };
+}
+function a(r, e) {
+  l.isMockFunction(r[e]) || l.spyOn(r, e);
 }
-function spyOnRED(RED) {
-  spyIfNeeded(RED, "_");
-  spyIfNeeded(RED, "notify");
-  spyIfNeeded(RED.editor, "createEditor");
-  spyIfNeeded(RED.editor, "prepareConfigNodeSelect");
-  spyIfNeeded(RED.editor, "validateNode");
-  spyIfNeeded(RED.tray, "show");
-  spyIfNeeded(RED.tray, "close");
-  spyIfNeeded(RED.popover, "tooltip");
-  spyIfNeeded(RED.nodes, "registerType");
-  spyIfNeeded(RED.nodes, "node");
-  spyIfNeeded(RED.nodes, "dirty");
-  spyIfNeeded(RED.events, "on");
-  spyIfNeeded(RED.events, "off");
-  spyIfNeeded(RED.events, "emit");
+function N(r) {
+  a(r, "_"), a(r, "notify"), a(r.editor, "createEditor"), a(r.editor, "prepareConfigNodeSelect"), a(r.editor, "validateNode"), a(r.tray, "show"), a(r.tray, "close"), a(r.popover, "tooltip"), a(r.popover, "create"), a(r.nodes, "registerType"), a(r.nodes, "node"), a(r.nodes, "add"), a(r.nodes, "remove"), a(r.nodes, "getType"), a(r.nodes, "dirty"), a(r.events, "on"), a(r.events, "off"), a(r.events, "emit"), a(r.comms, "subscribe"), a(r.comms, "unsubscribe");
 }
-function getMockRED() {
+function S() {
   return window.RED;
 }
 export {
-  createJQuery,
-  createNode,
-  createRED,
-  useFormNode
+  Z as createNode,
+  I as useFormNode
 };

package/test/client/component/nrg.css

@@ -0,0 +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}