@bonsae/nrg 0.13.1 → 0.15.0

package/vite/index.js

@@ -88,7 +88,9 @@ function mergeOptions(defaults, overrides) {
   for (const key of Object.keys(overrides)) {
     const overrideVal = overrides[key];
     const defaultVal = defaults[key];
-    if (overrideVal !== void 0 && !Array.isArray(overrideVal) && !Array.isArray(defaultVal) && typeof overrideVal === "object" && typeof defaultVal === "object" && overrideVal !== null && defaultVal !== null) {
+    if (overrideVal !== void 0 && Array.isArray(overrideVal) && Array.isArray(defaultVal)) {
+      result[key] = [.../* @__PURE__ */ new Set([...defaultVal, ...overrideVal])];
+    } else if (overrideVal !== void 0 && !Array.isArray(overrideVal) && !Array.isArray(defaultVal) && typeof overrideVal === "object" && typeof defaultVal === "object" && overrideVal !== null && defaultVal !== null) {
       result[key] = mergeOptions(
         defaultVal,
         overrideVal
@@ -105,7 +107,7 @@ import { spawn } from "child_process";
 import getPort from "get-port";
 import detect from "detect-port";
 import { builtinModules } from "module";
-import treeKill2 from "tree-kill";
+import treeKill from "tree-kill";
 import fs2 from "fs";
 import os from "os";
 import path2 from "path";
@@ -290,7 +292,7 @@ var NodeRedLauncher = class {
     return "node-red";
   }
   findRuntimeSettingsFilepath() {
-    const runtimeSettingsFilepath = this.options.runtime.settingsFilepath;
+    const runtimeSettingsFilepath = this.options.runtime?.settingsFilepath;
     if (runtimeSettingsFilepath) {
       const resolved2 = path2.resolve(runtimeSettingsFilepath);
       if (fs2.existsSync(resolved2)) {
@@ -426,7 +428,7 @@ module.exports = settings;
               }
               if (line.includes("Started flows") || line.includes("Server now running")) {
                 this.isReady = true;
-                resolve();
+                resolve(void 0);
               }
             }
           });
@@ -451,7 +453,7 @@ module.exports = settings;
                 )
               );
             }
-            resolve();
+            resolve(void 0);
           });
         } catch (error) {
           reject(new NodeRedStartError(error));
@@ -465,7 +467,7 @@ module.exports = settings;
       if (this.process) {
         const pid = this.process.pid;
         if (pid) {
-          treeKill2(pid, "SIGKILL");
+          treeKill(pid, "SIGKILL");
         }
         this.process = null;
       }
@@ -483,15 +485,15 @@ module.exports = settings;
     const stopProcess = new Promise((resolve) => {
       this.process.once("exit", () => {
         this.process = null;
-        resolve();
+        resolve(void 0);
       });
-      treeKill2(pid, "SIGTERM", (error) => {
+      treeKill(pid, "SIGTERM", (error) => {
         if (error) {
           try {
             process.kill(pid, "SIGTERM");
           } catch {
             this.process = null;
-            resolve();
+            resolve(void 0);
           }
         }
       });
@@ -501,9 +503,9 @@ module.exports = settings;
     } catch {
       this.logger.warn("Graceful shutdown timed out, force killing...");
       await new Promise((resolve) => {
-        treeKill2(pid, "SIGKILL", () => {
+        treeKill(pid, "SIGKILL", () => {
           this.process = null;
-          resolve();
+          resolve(void 0);
         });
       });
     }
@@ -522,7 +524,7 @@ module.exports = settings;
         );
         if (pid) {
           await new Promise((resolve) => {
-            treeKill2(pid, "SIGKILL", () => resolve());
+            treeKill(pid, "SIGKILL", () => resolve());
           });
           await new Promise((resolve) => setTimeout(resolve, 1e3));
         }
@@ -546,6 +548,7 @@ module.exports = settings;
 
 // src/vite/plugins/server.ts
 import chokidar from "chokidar";
+import treeKill2 from "tree-kill";
 import path12 from "path";
 
 // src/vite/server/build.ts
@@ -658,18 +661,34 @@ function getSchemaReferences(filePath) {
     }
   }
   const schemaRefs = /* @__PURE__ */ new Map();
-  function extractIdentifiers(node) {
+  const recordPortNames = /* @__PURE__ */ new Map();
+  let outputsSchemaIsRecord = false;
+  function extractIdentifiers(node, propName) {
     if (ts.isIdentifier(node)) return [node.text];
     if (ts.isArrayLiteralExpression(node)) {
       return node.elements.filter(ts.isIdentifier).map((el) => el.text);
     }
+    if (ts.isObjectLiteralExpression(node) && propName === "outputsSchema") {
+      const ids = [];
+      outputsSchemaIsRecord = true;
+      for (const prop of node.properties) {
+        if (ts.isPropertyAssignment(prop) && ts.isIdentifier(prop.initializer)) {
+          const portName = ts.isIdentifier(prop.name) ? prop.name.text : ts.isStringLiteral(prop.name) ? prop.name.text : void 0;
+          if (portName) {
+            ids.push(prop.initializer.text);
+            recordPortNames.set(prop.initializer.text, portName);
+          }
+        }
+      }
+      return ids;
+    }
     return [];
   }
   for (const stmt of source.statements) {
     if (ts.isClassDeclaration(stmt)) {
       for (const member of stmt.members) {
         if (ts.isPropertyDeclaration(member) && ts.isIdentifier(member.name) && member.name.text in SCHEMA_PROP_SEMANTICS && member.initializer) {
-          const ids = extractIdentifiers(member.initializer);
+          const ids = extractIdentifiers(member.initializer, member.name.text);
           if (ids.length > 0) {
             schemaRefs.set(member.name.text, ids);
           }
@@ -683,7 +702,7 @@ function getSchemaReferences(filePath) {
         if (arg && ts.isObjectLiteralExpression(arg)) {
           for (const prop of arg.properties) {
             if (ts.isPropertyAssignment(prop) && ts.isIdentifier(prop.name) && prop.name.text in SCHEMA_PROP_SEMANTICS) {
-              const ids = extractIdentifiers(prop.initializer);
+              const ids = extractIdentifiers(prop.initializer, prop.name.text);
               if (ids.length > 0) {
                 schemaRefs.set(prop.name.text, ids);
               }
@@ -696,21 +715,57 @@ function getSchemaReferences(filePath) {
   const result = [];
   for (const [propName, identifiers] of schemaRefs) {
     const semanticName = SCHEMA_PROP_SEMANTICS[propName];
-    const isArray = identifiers.length > 1;
+    const isArray = identifiers.length > 1 && !outputsSchemaIsRecord;
+    const isRecord = propName === "outputsSchema" && outputsSchemaIsRecord;
     for (const identifier of identifiers) {
       const importSource = importMap.get(identifier);
       if (importSource) {
         result.push({
           localName: identifier,
-          semanticName: isArray ? identifier : semanticName,
+          semanticName: isArray || isRecord ? identifier : semanticName,
           importSource,
-          tupleProp: isArray ? semanticName : void 0
+          tupleProp: isArray || isRecord ? semanticName : void 0,
+          recordPortName: isRecord ? recordPortNames.get(identifier) : void 0
         });
       }
     }
   }
   return result;
 }
+function getFactoryInfo(filePath) {
+  const content = fs3.readFileSync(filePath, "utf-8");
+  const source = ts.createSourceFile(
+    filePath,
+    content,
+    ts.ScriptTarget.ESNext,
+    true
+  );
+  for (const stmt of source.statements) {
+    if (ts.isExportAssignment(stmt) && stmt.expression && ts.isCallExpression(stmt.expression)) {
+      const callee = stmt.expression.expression;
+      if (ts.isIdentifier(callee)) {
+        if (callee.text === "defineIONode" || callee.text === "defineConfigNode") {
+          return { factoryName: callee.text };
+        }
+      }
+    }
+  }
+  return null;
+}
+function buildTypeArg(schemaMap, semanticName, portNameMap) {
+  const names = schemaMap.get(semanticName);
+  if (!names || names.length === 0) return "any";
+  if (names.length === 1 && !portNameMap?.has(names[0]))
+    return `Infer<typeof ${names[0]}>`;
+  if (portNameMap && names.some((n) => portNameMap.has(n))) {
+    const entries = names.map((n) => {
+      const portName = portNameMap.get(n);
+      return portName ? `${portName}: Infer<typeof ${n}>` : null;
+    }).filter(Boolean);
+    return `{ ${entries.join(", ")} }`;
+  }
+  return `[${names.map((n) => `Infer<typeof ${n}>`).join(", ")}]`;
+}
 function buildNodeReexports(srcDir, entryFile) {
   const nodesDir = path3.join(srcDir, "nodes");
   const nodeFiles = collectTsFiles(nodesDir);
@@ -719,15 +774,78 @@ function buildNodeReexports(srcDir, entryFile) {
     const relPath = rel.startsWith(".") ? rel : `./${rel}`;
     const specifier = relPath.replace(/\.ts$/, "");
     const ns = toPascalCase(path3.basename(file, ".ts"));
-    const lines = [`export { default as ${ns} } from "${specifier}";`];
-    const typePairs = getNodeTypeExports(file);
-    if (typePairs.length > 0) {
-      const prefixed = typePairs.map(
-        ({ localName, semanticName }) => `${localName} as ${ns}${semanticName}`
-      ).join(", ");
-      lines.push(`export type { ${prefixed} } from "${specifier}";`);
-    }
     const schemaRefs = getSchemaReferences(file);
+    const factoryInfo = getFactoryInfo(file);
+    const lines = [];
+    if (factoryInfo) {
+      const interfaceName = factoryInfo.factoryName === "defineIONode" ? "IIONode" : "IConfigNode";
+      lines.push(`import _${ns} from "${specifier}";`);
+      const schemaMap = /* @__PURE__ */ new Map();
+      const portNameMap = /* @__PURE__ */ new Map();
+      for (const ref of schemaRefs) {
+        const key = ref.tupleProp ?? ref.semanticName;
+        if (!schemaMap.has(key)) schemaMap.set(key, []);
+        schemaMap.get(key).push(ref.localName);
+        if (ref.recordPortName) {
+          portNameMap.set(ref.localName, ref.recordPortName);
+        }
+      }
+      const hasSchemas = schemaMap.size > 0;
+      const hasRecordOutputs = portNameMap.size > 0;
+      const nrgImports = ["NodeConstructor", interfaceName];
+      if (hasSchemas) nrgImports.push("Infer");
+      lines.push(
+        `import type { ${nrgImports.join(", ")} } from "@bonsae/nrg/server";`
+      );
+      if (hasSchemas) {
+        const bySource2 = /* @__PURE__ */ new Map();
+        for (const ref of schemaRefs) {
+          const resolvedSource = path3.relative(
+            path3.dirname(entryFile),
+            path3.resolve(path3.dirname(file), ref.importSource)
+          ).replace(/\\/g, "/");
+          const sourceSpecifier = resolvedSource.startsWith(".") ? resolvedSource : `./${resolvedSource}`;
+          if (!bySource2.has(sourceSpecifier))
+            bySource2.set(sourceSpecifier, []);
+          const list = bySource2.get(sourceSpecifier);
+          if (!list.includes(ref.localName)) list.push(ref.localName);
+        }
+        for (const [source, names] of bySource2) {
+          lines.push(`import type { ${names.join(", ")} } from "${source}";`);
+        }
+      }
+      let typeArgs;
+      if (factoryInfo.factoryName === "defineIONode") {
+        const outputsArg = buildTypeArg(
+          schemaMap,
+          "OutputsSchema",
+          portNameMap.size > 0 ? portNameMap : void 0
+        );
+        typeArgs = [
+          buildTypeArg(schemaMap, "ConfigSchema"),
+          buildTypeArg(schemaMap, "CredentialsSchema"),
+          buildTypeArg(schemaMap, "InputSchema"),
+          outputsArg
+        ].join(", ");
+      } else {
+        typeArgs = [
+          buildTypeArg(schemaMap, "ConfigSchema"),
+          buildTypeArg(schemaMap, "CredentialsSchema")
+        ].join(", ");
+      }
+      lines.push(
+        `export const ${ns}: NodeConstructor<${interfaceName}<${typeArgs}>> = _${ns};`
+      );
+    } else {
+      lines.push(`export { default as ${ns} } from "${specifier}";`);
+      const typePairs = getNodeTypeExports(file);
+      if (typePairs.length > 0) {
+        const prefixed = typePairs.map(
+          ({ localName, semanticName }) => `${localName} as ${ns}${semanticName}`
+        ).join(", ");
+        lines.push(`export type { ${prefixed} } from "${specifier}";`);
+      }
+    }
     const bySource = /* @__PURE__ */ new Map();
     for (const ref of schemaRefs) {
       const resolvedSource = path3.relative(
@@ -1038,10 +1156,10 @@ async function build(serverOpts, buildContext) {
     srcDir = "./server",
     entry = "index.ts",
     format = "esm",
+    external = [],
     bundled = [],
     types = true,
-    nodeTarget = "node22",
-    plugins: userPlugins = []
+    nodeTarget = "node22"
   } = serverOpts;
   const entries = Array.isArray(entry) ? entry : [entry];
   const resolvedSrcDir = path5.resolve(srcDir);
@@ -1066,8 +1184,7 @@ async function build(serverOpts, buildContext) {
       entryNames: Object.keys(entryPoints),
       format
     }),
-    isEsm ? esmWrapper() : cjsWrapper(),
-    ...userPlugins
+    isEsm ? esmWrapper() : cjsWrapper()
   ];
   if (types && !buildContext.isDev) {
     plugins.push(
@@ -1092,6 +1209,7 @@ async function build(serverOpts, buildContext) {
         formats: [isEsm ? "es" : "cjs"]
       },
       rollupOptions: {
+        external,
         output: {
           entryFileNames: isEsm ? "[name].mjs" : "[name].js",
           exports: isEsm ? void 0 : "auto",
@@ -1504,9 +1622,10 @@ function generateHelpDoc(nodeClass, labels, t) {
     if (inputSection) lines.push(inputSection);
   }
   if (nodeClass.outputsSchema) {
-    if (Array.isArray(nodeClass.outputsSchema)) {
+    const os2 = nodeClass.outputsSchema;
+    if (Array.isArray(os2)) {
       const portSections = [];
-      nodeClass.outputsSchema.forEach((schema, i) => {
+      os2.forEach((schema, i) => {
         const title = `${t.sections.port} ${i + 1}`;
         const portPropLabels = labels.outputs?.[i];
         const section = generateSchemaSection({
@@ -1522,6 +1641,26 @@ function generateHelpDoc(nodeClass, labels, t) {
       if (portSections.length) {
         lines.push(
           `<h3>${t.sections.outputs}</h3>
+${portSections.join("\n")}`
+        );
+      }
+    } else if (!("type" in os2 || "properties" in os2)) {
+      const portSections = [];
+      for (const [portName, schema] of Object.entries(os2)) {
+        const portPropLabels = labels.outputs?.[portName];
+        const section = generateSchemaSection({
+          title: portName,
+          schema,
+          t,
+          labels: portPropLabels,
+          heading: "####",
+          includeDefault: false
+        });
+        if (section) portSections.push(section);
+      }
+      if (portSections.length) {
+        lines.push(
+          `<h3>${t.sections.outputs}</h3>
 ${portSections.join("\n")}`
         );
       }
@@ -1529,7 +1668,7 @@ ${portSections.join("\n")}`
       const outputPropLabels = labels.outputs?.[0];
       const section = generateSchemaSection({
         title: t.sections.output,
-        schema: nodeClass.outputsSchema,
+        schema: os2,
         t,
         labels: outputPropLabels,
         includeDefault: false
@@ -1664,6 +1803,7 @@ ${resourcesTags}`
 // src/vite/client/plugins/locales-generator.ts
 import fs8 from "fs";
 import path8 from "path";
+import { merge } from "es-toolkit";
 function localesGenerator(options) {
   const { outDir, docsDir, labelsDir } = options;
   const languages = [
@@ -1678,6 +1818,108 @@ function localesGenerator(options) {
     "zh-CN",
     "zh-TW"
   ];
+  const frameworkLabels = {
+    "en-US": {
+      configs: { name: "Name" },
+      toggles: {
+        validateInput: "Validate Input",
+        validateOutput: "Validate Output",
+        errorPort: "Error Port",
+        completePort: "Complete Port",
+        statusPort: "Status Port"
+      }
+    },
+    de: {
+      configs: { name: "Name" },
+      toggles: {
+        validateInput: "Eingabe validieren",
+        validateOutput: "Ausgabe validieren",
+        errorPort: "Fehler-Port",
+        completePort: "Abschluss-Port",
+        statusPort: "Status-Port"
+      }
+    },
+    "es-ES": {
+      configs: { name: "Nombre" },
+      toggles: {
+        validateInput: "Validar entrada",
+        validateOutput: "Validar salida",
+        errorPort: "Puerto de error",
+        completePort: "Puerto de completado",
+        statusPort: "Puerto de estado"
+      }
+    },
+    fr: {
+      configs: { name: "Nom" },
+      toggles: {
+        validateInput: "Valider l'entr\xE9e",
+        validateOutput: "Valider la sortie",
+        errorPort: "Port d'erreur",
+        completePort: "Port de compl\xE9tion",
+        statusPort: "Port de statut"
+      }
+    },
+    ko: {
+      configs: { name: "\uC774\uB984" },
+      toggles: {
+        validateInput: "\uC785\uB825 \uAC80\uC99D",
+        validateOutput: "\uCD9C\uB825 \uAC80\uC99D",
+        errorPort: "\uC624\uB958 \uD3EC\uD2B8",
+        completePort: "\uC644\uB8CC \uD3EC\uD2B8",
+        statusPort: "\uC0C1\uD0DC \uD3EC\uD2B8"
+      }
+    },
+    "pt-BR": {
+      configs: { name: "Nome" },
+      toggles: {
+        validateInput: "Validar Entrada",
+        validateOutput: "Validar Sa\xEDda",
+        errorPort: "Porta de Erro",
+        completePort: "Porta de Conclus\xE3o",
+        statusPort: "Porta de Status"
+      }
+    },
+    ru: {
+      configs: { name: "\u0418\u043C\u044F" },
+      toggles: {
+        validateInput: "\u041F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C \u0432\u0445\u043E\u0434",
+        validateOutput: "\u041F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C \u0432\u044B\u0445\u043E\u0434",
+        errorPort: "\u041F\u043E\u0440\u0442 \u043E\u0448\u0438\u0431\u043A\u0438",
+        completePort: "\u041F\u043E\u0440\u0442 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u0438\u044F",
+        statusPort: "\u041F\u043E\u0440\u0442 \u0441\u0442\u0430\u0442\u0443\u0441\u0430"
+      }
+    },
+    ja: {
+      configs: { name: "\u540D\u524D" },
+      toggles: {
+        validateInput: "\u5165\u529B\u691C\u8A3C",
+        validateOutput: "\u51FA\u529B\u691C\u8A3C",
+        errorPort: "\u30A8\u30E9\u30FC\u30DD\u30FC\u30C8",
+        completePort: "\u5B8C\u4E86\u30DD\u30FC\u30C8",
+        statusPort: "\u30B9\u30C6\u30FC\u30BF\u30B9\u30DD\u30FC\u30C8"
+      }
+    },
+    "zh-CN": {
+      configs: { name: "\u540D\u79F0" },
+      toggles: {
+        validateInput: "\u9A8C\u8BC1\u8F93\u5165",
+        validateOutput: "\u9A8C\u8BC1\u8F93\u51FA",
+        errorPort: "\u9519\u8BEF\u7AEF\u53E3",
+        completePort: "\u5B8C\u6210\u7AEF\u53E3",
+        statusPort: "\u72B6\u6001\u7AEF\u53E3"
+      }
+    },
+    "zh-TW": {
+      configs: { name: "\u540D\u7A31" },
+      toggles: {
+        validateInput: "\u9A57\u8B49\u8F38\u5165",
+        validateOutput: "\u9A57\u8B49\u8F38\u51FA",
+        errorPort: "\u932F\u8AA4\u7AEF\u53E3",
+        completePort: "\u5B8C\u6210\u7AEF\u53E3",
+        statusPort: "\u72C0\u614B\u7AEF\u53E3"
+      }
+    }
+  };
   return {
     name: "vite-plugin-node-red:client:locales-generator",
     apply: "build",
@@ -1762,6 +2004,15 @@ ${content}
           return parsed;
         }
       );
+      for (const [lang, nodeTypes] of labelLangs.entries()) {
+        const defaults = frameworkLabels[lang] ?? frameworkLabels["en-US"];
+        for (const nodeType of Object.keys(nodeTypes)) {
+          nodeTypes[nodeType] = merge(
+            structuredClone(defaults),
+            nodeTypes[nodeType]
+          );
+        }
+      }
       writeOutput(
         labelLangs,
         "index.json",
@@ -2025,10 +2276,9 @@ async function build2(clientBuildOptions, buildContext) {
     licensePath = "./LICENSE",
     locales,
     staticDirs = {},
-    external = ["jquery", "node-red", "vue"],
-    globals = { jquery: "$", "node-red": "RED", vue: "Vue" },
-    manualChunks,
-    plugins: userPlugins = []
+    external = [],
+    globals = {},
+    manualChunks
   } = clientBuildOptions;
   const physicalEntryPath = path11.resolve(srcDir, entry);
   let entryPath;
@@ -2057,8 +2307,7 @@ async function build2(clientBuildOptions, buildContext) {
       path11.resolve(srcDir, "components"),
       path11.resolve(srcDir, "nodes"),
       !generatedEntry
-    ),
-    ...userPlugins
+    )
   ];
   plugins.push(
     htmlGenerator({
@@ -2385,7 +2634,7 @@ function serverPlugin(options) {
           const pid = nodeRedLauncher.pid;
           if (pid) {
             try {
-              treeKill(pid, "SIGKILL");
+              treeKill2(pid, "SIGKILL");
             } catch {
             }
           }