triangulum 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf5f529931bcb2ad36e67d227429e8e1c73a3b05e1161d74533ad60c62044537
-  data.tar.gz: 8113c4b5b1237d029e0a0aeb49bd5b5ec308e2a2aca19d9f8efb8db0d8b369db
+  metadata.gz: f0c8b52d9fbe7acc7281b3c5582f4fc74044e891efa82a7a0f8ab93bb8780dd7
+  data.tar.gz: d0b3b901d179ffbed4c3fb0939f4a8f346491b91e25fb307d9c21d1bb5b39c0b
 SHA512:
-  metadata.gz: '00835fcec65ae4bad82405a93f4e42783aae5cd632559d48ea7bd5d52bd98a958b0c84d5bac7acd74384250af8d231a8d71b3b281faa9edc3fdf9751256672c6'
-  data.tar.gz: 83ecacc5887b723fc182cab4deddd71df57c31e79b024fa87135d4e055906c132a51b9950a877b2c73442d9c670c7215421b0e0016bc70f62a2fc36910c43a99
+  metadata.gz: 9a1900ca8e9d689c5aebbf1557d0d7552f78de41b49b5bd7a95d5b83e470b3876c009704c68329fd88b03156f7671b8faf95198db3174f489ab266494c4bc996
+  data.tar.gz: 5c208b8e1a801db16cd5326a5f953980a6fcb80bc6070e4dec39b823fdb90785d3dc7f9fea56a1404ec174c57422242b2ec5ac2eee105892d1728748ed7e187d

data/lib/triangulum/js/single-validation.js

@@ -173252,15 +173252,15 @@ function mapDataType(dataType) {
 
 // ../dist/triangulum.es.js
 var import_typescript = __toESM(require_typescript(), 1);
-function R() {
-  return R = Object.assign ? Object.assign.bind() : function(t) {
+function k() {
+  return k = Object.assign ? Object.assign.bind() : function(t) {
     for (var n = 1;n < arguments.length; n++) {
       var i = arguments[n];
-      for (var r in i)
-        ({}).hasOwnProperty.call(i, r) && (t[r] = i[r]);
+      for (var a in i)
+        ({}).hasOwnProperty.call(i, a) && (t[a] = i[a]);
     }
     return t;
-  }, R.apply(null, arguments);
+  }, k.apply(null, arguments);
 }
 var K = false;
 try {
@@ -173271,53 +173271,53 @@ var ee = K && typeof localStorage.getItem == "function" && /* @__PURE__ */ local
 var W = ee ? console.log : function(t) {
   return "";
 };
-function te(t, n, i, r, g) {
-  r === undefined && (r = {});
-  var l = R({}, Y(i), r), p = re(t, n, l, i, g), u = p.languageServiceHost, c = p.updateFile, d = p.deleteFile, a = i.createLanguageService(u), F = a.getCompilerOptionsDiagnostics();
-  if (F.length) {
-    var s = G(t, r, i);
-    throw new Error(i.formatDiagnostics(F, s.compilerHost));
+function te(t, n, i, a, c) {
+  a === undefined && (a = {});
+  var g = k({}, Y(i), a), f = re(t, n, g, i, c), p = f.languageServiceHost, u = f.updateFile, m = f.deleteFile, r = i.createLanguageService(p), d = r.getCompilerOptionsDiagnostics();
+  if (d.length) {
+    var o = G(t, a, i);
+    throw new Error(i.formatDiagnostics(d, o.compilerHost));
   }
   return {
     name: "vfs",
     sys: t,
-    languageService: a,
+    languageService: r,
     getSourceFile: function(e) {
-      var o;
-      return (o = a.getProgram()) == null ? undefined : o.getSourceFile(e);
+      var s;
+      return (s = r.getProgram()) == null ? undefined : s.getSourceFile(e);
     },
-    createFile: function(e, o) {
-      c(i.createSourceFile(e, o, l.target, false));
+    createFile: function(e, s) {
+      u(i.createSourceFile(e, s, g.target, false));
     },
-    updateFile: function(e, o, f) {
-      var v = a.getProgram().getSourceFile(e);
-      if (!v)
+    updateFile: function(e, s, l) {
+      var h = r.getProgram().getSourceFile(e);
+      if (!h)
         throw new Error("Did not find a source file for " + e);
-      var T = v.text, S = f ?? i.createTextSpan(0, T.length), C = T.slice(0, S.start) + o + T.slice(S.start + S.length), w = i.updateSourceFile(v, C, {
-        span: S,
-        newLength: o.length
+      var T = h.text, v = l ?? i.createTextSpan(0, T.length), _ = T.slice(0, v.start) + s + T.slice(v.start + v.length), E = i.updateSourceFile(h, _, {
+        span: v,
+        newLength: s.length
       });
-      c(w);
+      u(E);
     },
     deleteFile: function(e) {
-      var o = a.getProgram().getSourceFile(e);
-      o && d(o);
+      var s = r.getProgram().getSourceFile(e);
+      s && m(s);
     }
   };
 }
-function I(t) {
+function O(t) {
   throw new Error("Method '" + t + "' is not implemented.");
 }
-function k(t, n) {
+function I(t, n) {
   return function() {
-    for (var i = arguments.length, r = new Array(i), g = 0;g < i; g++)
-      r[g] = arguments[g];
-    var l = n.apply(undefined, r), p = typeof l == "string" ? l.slice(0, 80) + "..." : l;
-    return W.apply(undefined, ["> " + t].concat(r)), W("< " + p), l;
+    for (var i = arguments.length, a = new Array(i), c = 0;c < i; c++)
+      a[c] = arguments[c];
+    var g = n.apply(undefined, a), f = typeof g == "string" ? g.slice(0, 80) + "..." : g;
+    return W.apply(undefined, ["> " + t].concat(a)), W("< " + f), g;
   };
 }
 var Y = function(n) {
-  return R({}, n.getDefaultCompilerOptions(), {
+  return k({}, n.getDefaultCompilerOptions(), {
     jsx: n.JsxEmit.React,
     strict: true,
     esModuleInterop: true,
@@ -173338,17 +173338,17 @@ function ne(t) {
   return {
     args: [],
     createDirectory: function() {
-      return I("createDirectory");
+      return O("createDirectory");
     },
-    directoryExists: k("directoryExists", function(n) {
+    directoryExists: I("directoryExists", function(n) {
       return Array.from(t.keys()).some(function(i) {
         return i.startsWith(n);
       });
     }),
     exit: function() {
-      return I("exit");
+      return O("exit");
     },
-    fileExists: k("fileExists", function(n) {
+    fileExists: I("fileExists", function(n) {
       return t.has(n) || t.has(J(n));
     }),
     getCurrentDirectory: function() {
@@ -173358,12 +173358,12 @@ function ne(t) {
       return [];
     },
     getExecutingFilePath: function() {
-      return I("getExecutingFilePath");
+      return O("getExecutingFilePath");
     },
-    readDirectory: k("readDirectory", function(n) {
+    readDirectory: I("readDirectory", function(n) {
       return n === "/" ? Array.from(t.keys()) : [];
     }),
-    readFile: k("readFile", function(n) {
+    readFile: I("readFile", function(n) {
       var i;
       return (i = t.get(n)) != null ? i : t.get(J(n));
     }),
@@ -173374,10 +173374,10 @@ function ne(t) {
 `,
     useCaseSensitiveFileNames: true,
     write: function() {
-      return I("write");
+      return O("write");
     },
-    writeFile: function(i, r) {
-      t.set(i, r);
+    writeFile: function(i, a) {
+      t.set(i, a);
     },
     deleteFile: function(i) {
       t.delete(i);
@@ -173385,12 +173385,12 @@ function ne(t) {
   };
 }
 function G(t, n, i) {
-  var r = /* @__PURE__ */ new Map, g = function(u) {
-    return r.set(u.fileName, u), u;
-  }, l = {
-    compilerHost: R({}, t, {
-      getCanonicalFileName: function(u) {
-        return u;
+  var a = /* @__PURE__ */ new Map, c = function(p) {
+    return a.set(p.fileName, p), p;
+  }, g = {
+    compilerHost: k({}, t, {
+      getCanonicalFileName: function(p) {
+        return p;
       },
       getDefaultLibFileName: function() {
         return "/" + i.getDefaultLibFileName(n);
@@ -173398,57 +173398,57 @@ function G(t, n, i) {
       getNewLine: function() {
         return t.newLine;
       },
-      getSourceFile: function(u, c) {
-        var d;
-        return r.get(u) || g(i.createSourceFile(u, t.readFile(u), (d = c ?? n.target) != null ? d : Y(i).target, false));
+      getSourceFile: function(p, u) {
+        var m;
+        return a.get(p) || c(i.createSourceFile(p, t.readFile(p), (m = u ?? n.target) != null ? m : Y(i).target, false));
       },
       useCaseSensitiveFileNames: function() {
         return t.useCaseSensitiveFileNames;
       }
     }),
-    updateFile: function(u) {
-      var c = r.has(u.fileName);
-      return t.writeFile(u.fileName, u.text), r.set(u.fileName, u), c;
+    updateFile: function(p) {
+      var u = a.has(p.fileName);
+      return t.writeFile(p.fileName, p.text), a.set(p.fileName, p), u;
     },
-    deleteFile: function(u) {
-      var c = r.has(u.fileName);
-      return r.delete(u.fileName), t.deleteFile(u.fileName), c;
+    deleteFile: function(p) {
+      var u = a.has(p.fileName);
+      return a.delete(p.fileName), t.deleteFile(p.fileName), u;
     }
   };
-  return l;
+  return g;
 }
-function re(t, n, i, r, g) {
-  var l = [].concat(n), p = G(t, i, r), u = p.compilerHost, c = p.updateFile, d = p.deleteFile, a = /* @__PURE__ */ new Map, F = 0, s = R({}, u, {
+function re(t, n, i, a, c) {
+  var g = [].concat(n), f = G(t, i, a), p = f.compilerHost, u = f.updateFile, m = f.deleteFile, r = /* @__PURE__ */ new Map, d = 0, o = k({}, p, {
     getProjectVersion: function() {
-      return F.toString();
+      return d.toString();
     },
     getCompilationSettings: function() {
       return i;
     },
     getCustomTransformers: function() {
-      return g;
+      return c;
     },
     getScriptFileNames: function() {
-      return l.slice();
+      return g.slice();
     },
-    getScriptSnapshot: function(o) {
-      var f = t.readFile(o);
-      if (f && typeof f == "string")
-        return r.ScriptSnapshot.fromString(f);
+    getScriptSnapshot: function(s) {
+      var l = t.readFile(s);
+      if (l && typeof l == "string")
+        return a.ScriptSnapshot.fromString(l);
     },
-    getScriptVersion: function(o) {
-      return a.get(o) || "0";
+    getScriptVersion: function(s) {
+      return r.get(s) || "0";
     },
     writeFile: t.writeFile
   }), y = {
-    languageServiceHost: s,
-    updateFile: function(o) {
-      F++, a.set(o.fileName, F.toString()), l.includes(o.fileName) || l.push(o.fileName), c(o);
+    languageServiceHost: o,
+    updateFile: function(s) {
+      d++, r.set(s.fileName, d.toString()), g.includes(s.fileName) || g.push(s.fileName), u(s);
     },
-    deleteFile: function(o) {
-      F++, a.set(o.fileName, F.toString());
-      var f = l.indexOf(o.fileName);
-      f !== -1 && l.splice(f, 1), d(o);
+    deleteFile: function(s) {
+      d++, r.set(s.fileName, d.toString());
+      var l = g.indexOf(s.fileName);
+      l !== -1 && g.splice(l, 1), m(s);
     }
   };
   return y;
@@ -173456,47 +173456,49 @@ function re(t, n, i, r, g) {
 var ie = (t, n, i) => {
   if (!t)
     return { parameters: [], returnType: "any" };
-  const r = t.id || "temp_node_id", g = {
+  const a = t.id || "temp_node_id", c = {
     ...t,
-    id: r,
+    id: a,
     parameters: {
       ...t.parameters,
       nodes: t.parameters?.nodes?.map((e) => e?.value ? e : { ...e, value: null }) || []
     }
-  }, l = r + "_params", p = {
-    ...g,
-    id: l,
+  }, g = a + "_params", f = {
+    ...c,
+    id: g,
     parameters: {
-      ...g.parameters,
-      nodes: g.parameters.nodes.map((e) => e.value?.__typename === "LiteralValue" && e.value.value !== null && typeof e.value.value != "object" ? { ...e, value: null } : e)
+      ...c.parameters,
+      nodes: c.parameters.nodes.map((e) => e.value?.__typename === "LiteralValue" && e.value.value !== null && typeof e.value.value != "object" ? { ...e, value: null } : e)
     }
-  }, c = se({
-    nodes: { __typename: "NodeFunctionConnection", nodes: [g, p] }
-  }, n, i), d = L(r), a = L(l), F = c.parameters.get(d) || [], s = c.parameters.get(a) || [];
+  }, u = se({
+    nodes: { __typename: "NodeFunctionConnection", nodes: [c, f] }
+  }, n, i), m = A(a), r = A(g), d = u.parameters.get(m) || [], o = u.parameters.get(r) || [];
   return {
-    parameters: F.map((e, o) => {
-      const f = s[o];
-      return f && f !== "any" && f !== "unknown" ? f : e;
+    parameters: d.map((e, s) => {
+      const l = o[s];
+      return l && l !== "any" && l !== "unknown" ? l : e;
     }),
-    returnType: c.nodes.get(d) || "any"
+    returnType: u.nodes.get(m) || "any"
   };
 };
-var H = /* @__PURE__ */ ((t) => (t[t.PRIMITIVE = 0] = "PRIMITIVE", t[t.TYPE = 1] = "TYPE", t[t.ARRAY = 2] = "ARRAY", t[t.OBJECT = 3] = "OBJECT", t[t.NODE = 4] = "NODE", t))(H || {});
+var B = /* @__PURE__ */ ((t) => (t[t.PRIMITIVE = 0] = "PRIMITIVE", t[t.TYPE = 1] = "TYPE", t[t.ARRAY = 2] = "ARRAY", t[t.OBJECT = 3] = "OBJECT", t[t.NODE = 4] = "NODE", t))(B || {});
 var q = (t, n) => {
-  const r = `
-        ${O(n)}
+  const a = `
+        ${R(n)}
         type TargetType = ${t};
         const val: TargetType = {} as any;
-    `, g = "index.ts", l = P(g, r), p = l.getSourceFile(g), c = l.languageService.getProgram().getTypeChecker();
-  let d = 1;
-  const a = (F) => {
-    if (import_typescript.default.isVariableDeclaration(F) && F.name.getText() === "val") {
-      const s = c.getTypeAtLocation(F);
-      s.getCallSignatures().length > 0 ? d = 4 : c.isArrayType(s) ? d = 2 : s.isStringLiteral() || s.isNumberLiteral() || (s.getFlags() & (import_typescript.default.TypeFlags.String | import_typescript.default.TypeFlags.Number | import_typescript.default.TypeFlags.Boolean | import_typescript.default.TypeFlags.EnumLiteral | import_typescript.default.TypeFlags.BigInt | import_typescript.default.TypeFlags.ESSymbol)) !== 0 ? d = 0 : s.isClassOrInterface() || (s.getFlags() & import_typescript.default.TypeFlags.Object) !== 0 ? d = 3 : d = 1;
-    }
-    import_typescript.default.forEachChild(F, a);
+    `;
+  console.log(a);
+  const c = "index.ts", g = L(c, a), f = g.getSourceFile(c), u = g.languageService.getProgram().getTypeChecker();
+  let m = 1;
+  const r = (d) => {
+    if (import_typescript.default.isVariableDeclaration(d) && d.name.getText() === "val") {
+      const o = u.getTypeAtLocation(d);
+      o.getCallSignatures().length > 0 ? m = 4 : u.isArrayType(o) ? m = 2 : o.isStringLiteral() || o.isNumberLiteral() || (o.getFlags() & (import_typescript.default.TypeFlags.String | import_typescript.default.TypeFlags.Number | import_typescript.default.TypeFlags.Boolean | import_typescript.default.TypeFlags.EnumLiteral | import_typescript.default.TypeFlags.BigInt | import_typescript.default.TypeFlags.ESSymbol)) !== 0 ? m = 0 : o.isClassOrInterface() || (o.getFlags() & import_typescript.default.TypeFlags.Object) !== 0 ? m = 3 : m = 1;
+    }
+    import_typescript.default.forEachChild(d, r);
   };
-  return a(p), d;
+  return r(f), m;
 };
 var ae = `
     interface Array<T> { 
@@ -173515,11 +173517,11 @@ var ae = `
     type Record<K extends keyof any, T> = { [P in K]: T; };
     type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;
 `;
-function P(t, n) {
+function L(t, n) {
   const i = /* @__PURE__ */ new Map;
   i.set(t, n), i.set("lib.codezero.d.ts", ae);
-  const r = ne(i);
-  return te(r, [t, "lib.codezero.d.ts"], import_typescript.default, oe);
+  const a = ne(i);
+  return te(a, [t, "lib.codezero.d.ts"], import_typescript.default, oe);
 }
 var oe = {
   target: import_typescript.default.ScriptTarget.Latest,
@@ -173527,155 +173529,155 @@ var oe = {
   noEmit: true,
   strictNullChecks: true
 };
-function O(t) {
-  const n = Array.from(new Set(t?.flatMap((r) => r.genericKeys || []))).map((r) => `type ${r} = any;`).join(`
-`), i = t?.map((r) => `type ${r.identifier}${(r.genericKeys?.length ?? 0) > 0 ? `<${r.genericKeys?.join(",")}>` : ""} = ${r.type};`).join(`
+function R(t, n = "any") {
+  const i = Array.from(new Set(t?.flatMap((c) => c.genericKeys || []))).map((c) => `type ${c} = ${n};`).join(`
+`), a = t?.map((c) => `type ${c.identifier}${(c.genericKeys?.length ?? 0) > 0 ? `<${c.genericKeys?.join(",")}>` : ""} = ${c.type};`).join(`
 `);
-  return `${n}
-${i}`;
+  return `${i}
+${a}`;
 }
-var L = (t) => t.replace(/[^a-zA-Z0-9]/g, "_");
-function U(t, n, i, r = false) {
-  const g = t?.nodes?.nodes || [], l = new Map(n?.map((e) => [e.identifier, e])), p = /* @__PURE__ */ new Set, u = (e, o, f) => {
-    const v = g.find((A) => A?.id === e);
-    if (!v || !v.functionDefinition?.identifier)
+var A = (t) => t.replace(/[^a-zA-Z0-9]/g, "_");
+function H(t, n, i, a = false) {
+  const c = t?.nodes?.nodes || [], g = new Map(n?.map((e) => [e.identifier, e])), f = /* @__PURE__ */ new Set, p = (e, s, l) => {
+    const h = c.find((D) => D?.id === e);
+    if (!h || !h.functionDefinition?.identifier)
       return "undefined";
-    const S = (v.parameters?.nodes || []).map((A, x) => {
-      const E = A.value;
-      if (!E)
-        return r ? `/* @pos ${e} ${x} */ {}` : `/* @pos ${e} ${x} */ undefined`;
-      if (E.__typename === "ReferenceValue") {
-        const $ = E;
-        if (!$.nodeFunctionId)
-          return `/* @pos ${e} ${x} */ undefined`;
-        let _ = $.inputIndex !== undefined ? `p_${L($.nodeFunctionId)}_${$.parameterIndex}[${$.inputIndex}]` : `node_${L($.nodeFunctionId)}`;
-        return $.referencePath?.forEach((h) => {
-          _ += `?.${h.path}`;
-        }), `/* @pos ${e} ${x} */ ${_}`;
-      }
-      return E.__typename === "LiteralValue" ? `/* @pos ${e} ${x} */ ${JSON.stringify(E.value)}` : E.__typename === "NodeFunctionIdWrapper" ? u(E.id, e, x) : r ? `/* @pos ${e} ${x} */ ({} as any)` : `/* @pos ${e} ${x} */ undefined`;
-    }).join(", "), w = `${`fn_${v.functionDefinition.identifier.replace(/::/g, "_")}`}(${S})`;
-    return o !== undefined && f !== undefined ? `${w}` : w;
-  }, c = (e, o = "") => {
-    if (p.has(e))
+    const v = (h.parameters?.nodes || []).map((D, S) => {
+      const w = D.value;
+      if (!w)
+        return a ? `/* @pos ${e} ${S} */ {}` : `/* @pos ${e} ${S} */ undefined`;
+      if (w.__typename === "ReferenceValue") {
+        const N = w;
+        if (!N.nodeFunctionId)
+          return `/* @pos ${e} ${S} */ undefined`;
+        let C = N.inputIndex !== undefined ? `p_${A(N.nodeFunctionId)}_${N.parameterIndex}[${N.inputIndex}]` : `node_${A(N.nodeFunctionId)}`;
+        return N.referencePath?.forEach(($) => {
+          C += `?.${$.path}`;
+        }), `/* @pos ${e} ${S} */ ${C}`;
+      }
+      return w.__typename === "LiteralValue" ? `/* @pos ${e} ${S} */ ${JSON.stringify(w.value)}` : w.__typename === "NodeFunctionIdWrapper" ? p(w.id, e, S) : a ? `/* @pos ${e} ${S} */ ({} as any)` : `/* @pos ${e} ${S} */ undefined`;
+    }).join(", "), E = `${`fn_${h.functionDefinition.identifier.replace(/::/g, "_")}`}(${v})`;
+    return s !== undefined && l !== undefined ? `${E}` : E;
+  }, u = (e, s = "") => {
+    if (f.has(e))
       return "";
-    const f = g.find((_) => _?.id === e);
-    if (!f || !f.functionDefinition)
+    const l = c.find((C) => C?.id === e);
+    if (!l || !l.functionDefinition)
       return "";
-    if (p.add(e), !l.get(f.functionDefinition.identifier))
-      return `${o}// Error: Function ${f.functionDefinition.identifier} not found
+    if (f.add(e), !g.get(l.functionDefinition.identifier))
+      return `${s}// Error: Function ${l.functionDefinition.identifier} not found
 `;
     let T = { parameters: [] };
-    r || (T = ie(f, n, i));
-    const C = (f.parameters?.nodes || []).map((_, h) => {
-      const b = _.value;
+    a || (T = ie(l, n, i));
+    const _ = (l.parameters?.nodes || []).map((C, $) => {
+      const b = C.value;
       if (!b)
-        return r ? `/* @pos ${e} ${h} */ {}` : `/* @pos ${e} ${h} */ undefined`;
+        return a ? `/* @pos ${e} ${$} */ {}` : `/* @pos ${e} ${$} */ undefined`;
       if (b.__typename === "ReferenceValue") {
-        const N = b;
-        if (!N.nodeFunctionId)
-          return `/* @pos ${e} ${h} */ undefined`;
-        let D = N.inputIndex !== undefined ? `p_${L(N.nodeFunctionId)}_${N.parameterIndex}[${N.inputIndex}]` : `node_${L(N.nodeFunctionId)}`;
-        return N.referencePath?.forEach((V) => {
-          D += `?.${V.path}`;
-        }), `/* @pos ${e} ${h} */ ${D}`;
+        const x = b;
+        if (!x.nodeFunctionId)
+          return `/* @pos ${e} ${$} */ undefined`;
+        let P = x.inputIndex !== undefined ? `p_${A(x.nodeFunctionId)}_${x.parameterIndex}[${x.inputIndex}]` : `node_${A(x.nodeFunctionId)}`;
+        return x.referencePath?.forEach((V) => {
+          P += `?.${V.path}`;
+        }), `/* @pos ${e} ${$} */ ${P}`;
       }
       if (b.__typename === "LiteralValue")
-        return `/* @pos ${e} ${h} */ ${JSON.stringify(b.value)}`;
+        return `/* @pos ${e} ${$} */ ${JSON.stringify(b.value)}`;
       if (b.__typename === "NodeFunctionIdWrapper") {
-        const N = b;
-        if (r) {
-          const D = `p_${L(e)}_${h}`, V = c(N.id, o + "    ");
-          return `/* @pos ${e} ${h} */ (...${D}) => {
-${V}${o}}`;
-        } else {
-          const D = T.parameters[h];
-          if (D ? q(D, i) === H.NODE : false) {
-            const M = `p_${L(e)}_${h}`, j = c(N.id, o + "    ");
-            return `/* @pos ${e} ${h} */ (...${M}) => {
-${j}${o}}`;
+        const x = b;
+        if (a) {
+          const P = `p_${A(e)}_${$}`, V = u(x.id, s + "    ");
+          return `/* @pos ${e} ${$} */ (...${P}) => {
+${V}${s}}`;
+        } else {
+          const P = T.parameters[$];
+          if (P ? q(P, i) === B.NODE : false) {
+            const M = `p_${A(e)}_${$}`, j = u(x.id, s + "    ");
+            return `/* @pos ${e} ${$} */ (...${M}) => {
+${j}${s}}`;
           } else {
-            const M = u(N.id, e, h);
-            return `/* @pos ${e} ${h} */ ${M}`;
+            const M = p(x.id, e, $);
+            return `/* @pos ${e} ${$} */ ${M}`;
           }
         }
       }
-      return r ? `/* @pos ${e} ${h} */ {}` : `/* @pos ${e} ${h} */ undefined`;
-    }).join(", "), w = `node_${L(f.id)}`, A = `fn_${f?.functionDefinition?.identifier?.replace(/::/g, "_")}`, x = C.includes("undefined"), E = f.functionDefinition.identifier === "std::control::return";
-    let $ = `${o}${E ? "return " : `const ${w} = `}${A}(${C}) ;
+      return a ? `/* @pos ${e} ${$} */ {}` : `/* @pos ${e} ${$} */ undefined`;
+    }).join(", "), E = `node_${A(l.id)}`, D = `fn_${l?.functionDefinition?.identifier?.replace(/::/g, "_")}`, S = _.includes("undefined"), w = l.functionDefinition.identifier === "std::control::return";
+    let N = `${s}${w ? "return " : `const ${E} = `}${D}(${_}) ;
 `;
-    return f.nextNodeId && ($ += c(f.nextNodeId, o)), $;
-  }, d = O(i), a = n?.map((e) => `declare function fn_${e.identifier?.replace(/::/g, "_")}${e.signature}`).join(`
-`), F = new Set(g.map((e) => e?.nextNodeId).filter((e) => !!e)), s = /* @__PURE__ */ new Set;
-  g.forEach((e) => e?.parameters?.nodes?.forEach((o) => {
-    o?.value?.__typename === "NodeFunctionIdWrapper" && o.value.id && s.add(o.value.id);
+    return l.nextNodeId && (N += u(l.nextNodeId, s)), N;
+  }, m = R(i), r = n?.map((e) => `declare function fn_${e.identifier?.replace(/::/g, "_")}${e.signature}`).join(`
+`), d = new Set(c.map((e) => e?.nextNodeId).filter((e) => !!e)), o = /* @__PURE__ */ new Set;
+  c.forEach((e) => e?.parameters?.nodes?.forEach((s) => {
+    s?.value?.__typename === "NodeFunctionIdWrapper" && s.value.id && o.add(s.value.id);
   }));
-  const y = g.filter((e) => e?.id && !F.has(e.id) && !s.has(e.id)).map((e) => c(e.id)).join(`
+  const y = c.filter((e) => e?.id && !d.has(e.id) && !o.has(e.id)).map((e) => u(e.id)).join(`
 `);
-  return `${d}
-${a}
+  return `${m}
+${r}
 
 // --- Flow ---
 ${y}`;
 }
 function se(t, n, i) {
-  const r = U(t, n, i, true), g = "index.ts", l = P(g, r), p = l.getSourceFile(g), c = l.languageService.getProgram().getTypeChecker(), d = /* @__PURE__ */ new Map, a = /* @__PURE__ */ new Map, F = /* @__PURE__ */ new Map;
+  const a = H(t, n, i, true), c = "index.ts", g = L(c, a), f = g.getSourceFile(c), u = g.languageService.getProgram().getTypeChecker(), m = /* @__PURE__ */ new Map, r = /* @__PURE__ */ new Map, d = /* @__PURE__ */ new Map;
   (t?.nodes?.nodes || []).forEach((e) => {
-    e?.id && F.set(L(e.id), e);
+    e?.id && d.set(A(e.id), e);
   });
   const y = (e) => {
     if (import_typescript.default.isVariableDeclaration(e) && e.name.getText().startsWith("node_")) {
-      const o = e.name.getText().replace("node_", ""), f = c.getTypeAtLocation(e);
-      if (d.set(o, c.typeToString(f, e, import_typescript.default.TypeFormatFlags.NoTruncation)), e.initializer && import_typescript.default.isCallExpression(e.initializer)) {
-        const v = c.getResolvedSignature(e.initializer);
-        if (v) {
-          const T = v.getParameters().map((S) => {
-            const C = c.getTypeOfSymbolAtLocation(S, e.initializer);
-            return c.typeToString(C, e.initializer, import_typescript.default.TypeFormatFlags.NoTruncation);
+      const s = e.name.getText().replace("node_", ""), l = u.getTypeAtLocation(e);
+      if (m.set(s, u.typeToString(l, e, import_typescript.default.TypeFormatFlags.NoTruncation)), e.initializer && import_typescript.default.isCallExpression(e.initializer)) {
+        const h = u.getResolvedSignature(e.initializer);
+        if (h) {
+          const T = h.getParameters().map((v) => {
+            const _ = u.getTypeOfSymbolAtLocation(v, e.initializer);
+            return u.typeToString(_, e.initializer, import_typescript.default.TypeFormatFlags.NoTruncation);
           });
-          a.set(o, T);
+          r.set(s, T);
         }
       }
     }
     if (import_typescript.default.isReturnStatement(e) && e.expression && import_typescript.default.isCallExpression(e.expression)) {
-      const o = e.expression;
-      c.getResolvedSignature(o);
+      const s = e.expression;
+      u.getResolvedSignature(s);
     }
     import_typescript.default.forEachChild(e, y);
   };
-  return y(p), { nodes: d, parameters: a };
+  return y(f), { nodes: m, parameters: r };
 }
-var de = (t, n, i) => {
-  const r = U(t, n, i), g = "index.ts", l = P(g, r), p = l.getSourceFile(g), d = l.languageService.getProgram().getSemanticDiagnostics(p).map((a) => {
-    const F = import_typescript.flattenDiagnosticMessageText(a.messageText, `
+var ye = (t, n, i) => {
+  const a = H(t, n, i), c = "index.ts", g = L(c, a), f = g.getSourceFile(c), m = g.languageService.getProgram().getSemanticDiagnostics(f).map((r) => {
+    const d = import_typescript.flattenDiagnosticMessageText(r.messageText, `
 `);
-    let s, y;
-    if (a.start !== undefined) {
-      const e = p.getFullText(), o = Math.max(0, a.start - 300), f = Math.min(e.length, a.start), v = e.substring(o, f), T = /\/\* @pos ([^ ]+) (\d+) \*\//g;
-      let S, C = null, w = -1;
-      for (;(S = T.exec(v)) !== null; ) {
-        const x = o + S.index + S[0].length;
-        x <= a.start && x > w && (w = x, C = S);
+    let o, y;
+    if (r.start !== undefined) {
+      const e = f.getFullText(), s = Math.max(0, r.start - 300), l = Math.min(e.length, r.start), h = e.substring(s, l), T = /\/\* @pos ([^ ]+) (\d+) \*\//g;
+      let v, _ = null, E = -1;
+      for (;(v = T.exec(h)) !== null; ) {
+        const S = s + v.index + v[0].length;
+        S <= r.start && S > E && (E = S, _ = v);
       }
-      C && (s = C[1], y = parseInt(C[2], 10));
+      _ && (o = _[1], y = parseInt(_[2], 10));
     }
     return {
-      message: F,
-      code: a.code,
+      message: d,
+      code: r.code,
       severity: "error",
-      nodeId: s,
+      nodeId: o,
       parameterIndex: y
     };
-  }).filter((a) => a !== null);
+  }).filter((r) => r !== null);
   return {
-    isValid: !d.some((a) => a?.severity === "error"),
+    isValid: !m.some((r) => r?.severity === "error"),
     returnType: "void",
-    diagnostics: d
+    diagnostics: m
   };
 };
 
 // ../entrypoint/single-validation.ts
 var data = await readSingleValidation(console);
 var validationInput = mapToFlowValidation(data);
-var result = de(validationInput.flow, validationInput.functions, validationInput.dataTypes);
+var result = ye(validationInput.flow, validationInput.functions, validationInput.dataTypes);
 console.info(JSON.stringify(result));

data/lib/triangulum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Triangulum
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triangulum
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Niklas van Schrick