triangulum 0.40.0 → 0.40.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9859c33882eb9d7e66102436947ac2c5a2a019ba4f0cffec39417c54206dbf1
-  data.tar.gz: fab24b3283a62a2128e966b5ef409acd8532bd61b1a248868d50b60d2a4ac605
+  metadata.gz: '0279756a9f7455aa19de3cf787244814b09684ff81f657ce703381a2c5d800ee'
+  data.tar.gz: d2e64cd66fce9eebd315ceed484bb9e4b6c4e64510b03157f7f619d612c6f34b
 SHA512:
-  metadata.gz: 16b8c2fc3fca7439e3ce9a30c3a0fb6683c80bd255dfb15775e59b250c84d69b26231815d2746d82492509aa864b5434f151f0fb0bddfb13eb7abd44479c8a7e
-  data.tar.gz: d6629f03118025460e3ffb241866986ad2601cd0e6cdd50f163726e9eca874f6e9cb0406868467fa3ffb9125f9e8cbdc3b45bfaa3870573ba2ae9827f132eb3a
+  metadata.gz: e142d2f0cdad3a852d7b3463943f12308ad6b38133dc19791c3e35203e0b56a03193d2776b53e29fa1eaab0a9b5467d510672c3829c80c666e7c361080f71161
+  data.tar.gz: 7f9aa0520477d11d58f6b3fafb1dd37190c3401a37a2e896e94411244c85748b03d89ba2c178e2b8b57c1115b5819e149ed2d5c1d36ba3ed6d6d81c02a59b562

data/lib/triangulum/js/flow-schema-extraction.js

@@ -356882,13 +356882,13 @@ var m4 = (e6, n3, i5) => {
   if (!e6)
     return;
   let a4 = "index.ts", o4 = Xe(e6, n3, i5), s4 = Ue2(a4, o4), c4 = s4.getSourceFile(a4), l4 = s4.languageService.getProgram().getTypeChecker(), d5 = u3({
-    ...v3(l4, c4),
-    ...b3(l4, c4, e6)
-  }, i5), f5 = (e6.nodes?.nodes ?? []).map((e7) => e7 && D3(e7, d5));
+    ...y3(l4, c4),
+    ...x3(l4, c4, e6)
+  }, i5), f5 = (e6.nodes?.nodes ?? []).map((e7) => e7 && N3(e7, d5));
   return {
     ...e6,
-    inputSchema: d5[h4] ?? T3(),
-    outputSchema: d5[g4] ?? E3(),
+    inputSchema: d5[h4] ?? j4(),
+    outputSchema: d5[g4] ?? M3(),
     nodes: {
       ...e6.nodes,
       nodes: f5
@@ -356898,20 +356898,21 @@ var m4 = (e6, n3, i5) => {
 var h4 = "Flow_input";
 var g4 = "Flow_output";
 var _3 = (t3, n3, r3) => `Node_${Z2(t3)}_${n3}_${r3}`;
-var v3 = (e6, t3) => {
+var v3 = (t3, n3, r3, i5) => `Node_${Z2(t3)}_${n3}_ref_${r3.map(Z2).join("_")}_${i5}`;
+var y3 = (e6, t3) => {
   let n3 = t3.statements.filter(import_typescript2.default.isFunctionDeclaration).find((e7) => e7.name?.getText() === "flow");
   if (!n3)
     return {};
-  let r3 = y3(t3), a4 = (r3 ? e6.getResolvedSignature(r3) : undefined) ?? e6.getSignatureFromDeclaration(n3);
+  let r3 = b3(t3), a4 = (r3 ? e6.getResolvedSignature(r3) : undefined) ?? e6.getSignatureFromDeclaration(n3);
   if (!a4)
     return {};
-  let { input: o4, output: s4 } = w3(e6, a4, r3 ?? n3);
+  let { input: o4, output: s4 } = A4(e6, a4, r3 ?? n3);
   return {
     [h4]: o4,
     [g4]: s4
   };
 };
-var y3 = (e6) => {
+var b3 = (e6) => {
   let t3;
   return e6.forEachChild(function e7(n3) {
     if (!t3) {
@@ -356923,44 +356924,109 @@ var y3 = (e6) => {
     }
   }), t3;
 };
-var b3 = (e6, t3, n3) => {
-  let r3 = j4(t3), i5 = {};
+var x3 = (e6, t3, n3) => {
+  let r3 = B2(t3), i5 = {};
   for (let t4 of n3.nodes?.nodes ?? []) {
     if (!t4?.id)
       continue;
     let n4 = t4.parameters?.nodes;
-    if (!n4?.some(O3))
+    if (!n4?.some(L2))
       continue;
-    let a4 = A4(r3, t4);
+    let a4 = z2(r3, t4);
     a4 && n4.forEach((n5, r4) => {
-      if (!O3(n5))
+      let o4 = a4.arguments[r4];
+      if (!o4)
         return;
-      let o4 = a4.arguments[r4], s4 = o4 ? e6.getTypeAtLocation(o4).getCallSignatures()[0] : undefined;
-      if (!s4)
+      if (F2(n5)) {
+        let n6 = S3(e6, o4);
+        if (!n6)
+          return;
+        i5[_3(t4.id, r4, "input")] = n6.input, i5[_3(t4.id, r4, "output")] = n6.output;
+        return;
+      }
+      let s4 = T3(n5);
+      if (s4.length === 0)
         return;
-      let { input: c4, output: l4 } = x3(e6, s4, o4);
-      i5[_3(t4.id, r4, "input")] = c4, i5[_3(t4.id, r4, "output")] = l4;
+      let c4 = C3(o4);
+      s4.forEach((n6, a5) => {
+        let o5 = c4[a5];
+        if (!o5)
+          return;
+        let s5 = S3(e6, o5);
+        s5 && (i5[v3(t4.id, r4, n6, "input")] = s5.input, i5[v3(t4.id, r4, n6, "output")] = s5.output);
+      });
     });
   }
   return i5;
 };
-var x3 = (e6, t3, n3) => ({
-  input: `{ ${S3(e6, t3, n3).join("; ")} }`,
+var S3 = (e6, t3) => {
+  let n3 = e6.getTypeAtLocation(t3).getCallSignatures()[0];
+  if (n3)
+    return D3(e6, n3, t3);
+};
+var C3 = (e6) => {
+  let t3 = [], n3 = (e7) => {
+    if (import_typescript2.default.isArrowFunction(e7)) {
+      t3.push(e7);
+      return;
+    }
+    if (import_typescript2.default.isIdentifier(e7) && e7.text.startsWith("fn_")) {
+      let n4 = e7.parent;
+      if (!(n4 && import_typescript2.default.isCallExpression(n4) && n4.expression === e7)) {
+        t3.push(e7);
+        return;
+      }
+    }
+    e7.forEachChild(n3);
+  };
+  return n3(e6), t3;
+};
+var w3 = /\$\{([^}]+)\}/g;
+var T3 = (e6) => {
+  if (!I2(e6))
+    return [];
+  let t3 = [];
+  return E3(e6.value.value, e6.value.references, [], t3), t3;
+};
+var E3 = (e6, t3, n3, r3) => {
+  let i5 = /* @__PURE__ */ new Map;
+  for (let e7 of t3 ?? [])
+    e7?.signature && i5.set(e7.signature, e7);
+  if (i5.size === 0)
+    return;
+  let a4 = (e7) => {
+    if (typeof e7 == "string") {
+      for (let t4 of e7.matchAll(w3)) {
+        let e8 = i5.get(t4[1])?.value;
+        e8 && (e8.__typename === "SubFlowValue" ? r3.push([...n3, t4[1]]) : e8.__typename === "LiteralValue" && E3(e8.value, e8.references, [...n3, t4[1]], r3));
+      }
+      return;
+    }
+    if (Array.isArray(e7)) {
+      e7.forEach((e8) => a4(e8));
+      return;
+    }
+    typeof e7 == "object" && e7 && Object.values(e7).forEach((e8) => a4(e8));
+  };
+  a4(e6);
+};
+var D3 = (e6, t3, n3) => ({
+  input: `{ ${O3(e6, t3, n3).join("; ")} }`,
   output: ((t4) => e6.typeToString(t4, n3, import_typescript2.default.TypeFormatFlags.NoTruncation))(e6.getReturnTypeOfSignature(t3))
 });
-var S3 = (e6, t3, n3) => {
+var O3 = (e6, t3, n3) => {
   let r3 = (t4) => e6.typeToString(t4, n3, import_typescript2.default.TypeFormatFlags.NoTruncation), a4 = t3.getParameters();
   if (a4.length === 1) {
-    let t4 = C3(e6, e6.getTypeOfSymbolAtLocation(a4[0], a4[0].valueDeclaration ?? n3), n3);
+    let t4 = k3(e6, e6.getTypeOfSymbolAtLocation(a4[0], a4[0].valueDeclaration ?? n3), n3);
     if (t4)
       return t4;
   }
   return a4.map((t4) => {
-    let i5 = e6.getTypeOfSymbolAtLocation(t4, t4.valueDeclaration ?? n3), a5 = k3(t4) ? "?" : "";
+    let i5 = e6.getTypeOfSymbolAtLocation(t4, t4.valueDeclaration ?? n3), a5 = R2(t4) ? "?" : "";
     return `${t4.getName()}${a5}: ${r3(i5)}`;
   });
 };
-var C3 = (e6, t3, n3) => {
+var k3 = (e6, t3, n3) => {
   let r3 = t3, a4 = r3.target;
   if (a4 && (a4.objectFlags & import_typescript2.default.ObjectFlags.Tuple) !== 0)
     return e6.getTypeArguments(r3).map((t4, r4) => {
@@ -356968,33 +357034,43 @@ var C3 = (e6, t3, n3) => {
       return `${o4?.name && import_typescript2.default.isIdentifier(o4.name) ? o4.name.text : `arg${r4}`}${(a4.elementFlags[r4] & import_typescript2.default.ElementFlags.Optional) === 0 ? "" : "?"}: ${e6.typeToString(t4, n3, import_typescript2.default.TypeFormatFlags.NoTruncation)}`;
     });
 };
-var w3 = (e6, t3, n3) => {
+var A4 = (e6, t3, n3) => {
   let r3 = (t4) => e6.typeToString(t4, n3, import_typescript2.default.TypeFormatFlags.NoTruncation);
   return {
     input: `{ ${t3.parameters.map((t4) => {
-      let i5 = e6.getTypeOfSymbolAtLocation(t4, t4.valueDeclaration ?? n3), a4 = k3(t4) ? "?" : "";
+      let i5 = e6.getTypeOfSymbolAtLocation(t4, t4.valueDeclaration ?? n3), a4 = R2(t4) ? "?" : "";
       return `${t4.getName()}${a4}: ${r3(i5)}`;
     }).join("; ")} }`,
     output: r3(e6.getReturnTypeOfSignature(t3))
   };
 };
-var T3 = () => ({ type: "object" });
-var E3 = () => ({});
-var D3 = (e6, t3) => {
+var j4 = () => ({ type: "object" });
+var M3 = () => ({});
+var N3 = (e6, t3) => {
   let n3 = e6.parameters?.nodes;
-  if (!n3?.some(O3))
+  if (!n3?.some(L2))
     return e6;
   let r3 = n3.map((n4, r4) => {
-    if (!O3(n4))
+    if (F2(n4)) {
+      let i6 = {
+        ...n4.value,
+        inputSchema: t3[_3(e6.id, r4, "input")] ?? j4(),
+        outputSchema: t3[_3(e6.id, r4, "output")] ?? M3()
+      };
+      return {
+        ...n4,
+        value: i6
+      };
+    }
+    if (!I2(n4) || !n4.value.references?.length)
       return n4;
-    let i5 = {
-      ...n4.value,
-      inputSchema: t3[_3(e6.id, r4, "input")] ?? T3(),
-      outputSchema: t3[_3(e6.id, r4, "output")] ?? E3()
-    };
+    let i5 = P2(n4.value.references, e6.id, r4, [], t3);
     return {
       ...n4,
-      value: i5
+      value: {
+        ...n4.value,
+        references: i5
+      }
     };
   });
   return {
@@ -357005,16 +357081,42 @@ var D3 = (e6, t3) => {
     }
   };
 };
-var O3 = (e6) => e6?.value?.__typename === "SubFlowValue";
-var k3 = (e6) => {
+var P2 = (e6, t3, n3, r3, i5) => e6.map((e7) => {
+  let a4 = e7?.value;
+  if (!e7?.signature || !a4)
+    return e7;
+  let o4 = [...r3, e7.signature];
+  if (a4.__typename === "SubFlowValue") {
+    let r4 = {
+      ...a4,
+      inputSchema: i5[v3(t3, n3, o4, "input")] ?? j4(),
+      outputSchema: i5[v3(t3, n3, o4, "output")] ?? M3()
+    };
+    return {
+      ...e7,
+      value: r4
+    };
+  }
+  return a4.__typename === "LiteralValue" && a4.references?.length ? {
+    ...e7,
+    value: {
+      ...a4,
+      references: P2(a4.references, t3, n3, o4, i5)
+    }
+  } : e7;
+});
+var F2 = (e6) => e6?.value?.__typename === "SubFlowValue";
+var I2 = (e6) => e6?.value?.__typename === "LiteralValue";
+var L2 = (e6) => F2(e6) || T3(e6).length > 0;
+var R2 = (e6) => {
   let t3 = e6.valueDeclaration;
   return !!t3 && import_typescript2.default.isParameter(t3) && (!!t3.questionToken || !!t3.initializer || !!t3.dotDotDotToken);
 };
-var A4 = (t3, n3) => {
+var z2 = (t3, n3) => {
   let r3 = t3.get(`node_${Z2(n3.id)}`)?.initializer;
   return r3 && import_typescript2.default.isCallExpression(r3) ? r3 : undefined;
 };
-var j4 = (e6) => {
+var B2 = (e6) => {
   let t3 = /* @__PURE__ */ new Map;
   return e6.statements.forEach((e7) => {
     e7.forEachChild(function e8(n3) {

data/lib/triangulum/version.rb

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

metadata

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