triangulum 0.34.0 → 0.35.0

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

@@ -175542,7 +175542,7 @@ function mapDataType(dataType) {
   };
 }
 
-// ../dist/utils-BZOsWQq3.js
+// ../dist/utils-CAOAm6k-.js
 var import_typescript = __toESM(require_typescript(), 1);
 function t2() {
   return t2 = Object.assign ? Object.assign.bind() : function(e6) {
@@ -175804,9 +175804,13 @@ function g3(e6) {
   if (typeof e6 == "string" && e6 !== "")
     return e6;
 }
-var A3 = { DATE: "date" };
-var j3 = (e6) => e6 != null && (e6 in A3);
-var ye2 = `
+var k3 = {
+  DATE: "date",
+  TYPE: "type"
+};
+var A3 = (e6) => e6 != null && (e6 in k3);
+var me2 = new Set(Object.values(k3));
+var Te2 = `
     interface Array<T> { 
         [n: number]: T; 
         length: number; 
@@ -175827,17 +175831,17 @@ var ye2 = `
 
     import ReturnType = Utils.ReturnType;
 `;
-function be2(t3, n3) {
+function J2(t3, n3) {
   let r3 = /* @__PURE__ */ new Map;
-  return r3.set(t3, n3), r3.set("lib.codezero.d.ts", ye2), a2(u3(r3), [t3, "lib.codezero.d.ts"], import_typescript.default, xe2);
+  return r3.set(t3, n3), r3.set("lib.codezero.d.ts", Te2), a2(u3(r3), [t3, "lib.codezero.d.ts"], import_typescript.default, Ee2);
 }
-var xe2 = {
+var Ee2 = {
   target: import_typescript.default.ScriptTarget.Latest,
   lib: ["lib.codezero.d.ts"],
   noEmit: true,
   strictNullChecks: true
 };
-function Se2(e6) {
+function De2(e6) {
   let t3 = [], n3 = 0, r3 = null, i3 = "";
   for (let a3 of e6) {
     if (r3)
@@ -175856,11 +175860,16 @@ function Se2(e6) {
   }
   return t3.push(i3), t3.map((e7) => (e7.trim().split(/\s+/).find((e8) => e8 !== "const" && e8 !== "in" && e8 !== "out") ?? "").match(/^[A-Za-z_$][A-Za-z0-9_$]*/)?.[0] ?? "").filter((e7) => e7.length > 0);
 }
-function X2(e6, t3 = "any", n3 = true) {
-  let r3 = Array.from(new Set(e6?.flatMap((e7) => e7.genericKeys || []).flatMap(Se2))).map((e7) => `type ${e7} = ${t3};`).join(`
+var Oe2 = /* @__PURE__ */ new Set([
+  "number",
+  "string",
+  "boolean"
+]);
+function Y2(e6, t3 = "any", n3 = true) {
+  let r3 = Array.from(new Set(e6?.flatMap((e7) => e7.genericKeys || []).flatMap(De2))).map((e7) => `type ${e7} = ${t3};`).join(`
 `), i3 = e6?.map((e7) => {
-    let t4 = (e7.genericKeys?.length ?? 0) > 0 ? `<${e7.genericKeys?.join(",")}>` : "", n4 = j3(e7.identifier) ? `${e7.type} & {}` : e7.type;
-    return `type ${e7.identifier}${t4} = ${n4};`;
+    let t4 = A3(e7.identifier), n4 = (e7.genericKeys?.length ?? 0) > 0 ? t4 ? `<${e7.genericKeys.map((e8) => e8.includes("=") ? e8 : `${e8} = any`).join(", ")}>` : `<${e7.genericKeys?.join(",")}>` : "", r4 = e7.type?.trim() ?? "", i4 = t4 ? Oe2.has(r4) ? `${e7.type} & {}` : "{}" : e7.type;
+    return `type ${e7.identifier}${n4} = ${i4};`;
   }).join(`
 `), a3 = e6?.filter((e7) => (e7.genericKeys?.length ?? 0) > 0).map((e7) => `declare const __widen_${e7.identifier}: ${e7.identifier}<${e7.genericKeys.map(() => "any").join(", ")}>;`).join(`
 `) ?? "";
@@ -175868,9 +175877,37 @@ function X2(e6, t3 = "any", n3 = true) {
 ${i3}
 ${a3}`;
 }
+var ke2 = /^[A-Za-z0-9_$<>\[\]{}(),.:?|&+\-'"\s]+$/;
+var Ae2 = (e6) => {
+  if (!ke2.test(e6))
+    return false;
+  let t3 = {
+    "<": ">",
+    "[": "]",
+    "{": "}",
+    "(": ")"
+  }, n3 = [], r3 = null;
+  for (let i3 of e6) {
+    if (r3) {
+      i3 === r3 && (r3 = null);
+      continue;
+    }
+    if (i3 === "'" || i3 === '"')
+      r3 = i3;
+    else if (t3[i3])
+      n3.push(t3[i3]);
+    else if ((i3 === ">" || i3 === "]" || i3 === "}" || i3 === ")") && n3.pop() !== i3)
+      return false;
+  }
+  return r3 === null && n3.length === 0;
+};
+var X2 = (e6, t3) => {
+  let n3 = t3?.trim();
+  return !n3 || !Ae2(n3) ? e6 : `(${e6}) as unknown as ${n3}`;
+};
 var Z2 = (e6) => e6?.replace(/[^a-zA-Z0-9]/g, "_");
 var Q2 = (e6) => e6.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
-var Ce2 = (e6, t3) => {
+var je2 = (e6, t3) => {
   let n3 = e6.match(/^\$\{([^}]+)\}$/);
   if (n3 && t3.has(n3[1]))
     return t3.get(n3[1]);
@@ -175889,8 +175926,8 @@ var Ce2 = (e6, t3) => {
   }
   return a3 += Q2(e6.slice(o3)), "`" + a3 + "`";
 };
-var $2 = (e6, t3) => typeof e6 == "string" ? Ce2(e6, t3) : Array.isArray(e6) ? `[${e6.map((e7) => $2(e7, t3)).join(", ")}]` : typeof e6 == "object" && e6 ? `{${Object.entries(e6).map(([e7, n3]) => `${h3(e7)}: ${$2(n3, t3)}`).join(", ")}}` : h3(e6) ?? "undefined";
-function we2(e6, t3, n3, r3 = false, i3 = true) {
+var $2 = (e6, t3) => typeof e6 == "string" ? je2(e6, t3) : Array.isArray(e6) ? `[${e6.map((e7) => $2(e7, t3)).join(", ")}]` : typeof e6 == "object" && e6 ? `{${Object.entries(e6).map(([e7, n3]) => `${h3(e7)}: ${$2(n3, t3)}`).join(", ")}}` : h3(e6) ?? "undefined";
+function Me2(e6, t3, n3, r3 = false, i3 = true) {
   let a3 = e6?.nodes?.nodes || [], o3 = new Map(t3?.map((e7) => [e7.identifier, e7])), s3 = /* @__PURE__ */ new Set, c3 = (t4) => {
     let n4 = typeof t4.inputIndex == "number" ? `p_${Z2(t4.nodeFunctionId ?? "undefined")}_${t4.parameterIndex}[${t4.inputIndex}]` : t4.nodeFunctionId ? `node_${Z2(t4.nodeFunctionId)}` : `flow_${Z2(e6?.id ?? "undefined")}`;
     return t4.referencePath?.forEach((e7) => {
@@ -175922,12 +175959,20 @@ ${d4(e7.startingNodeId || e7.functionDefinition?.id, r4 + "    ")}${r4}}`, u4 =
       return `${t4}// Error: Function ${n4.functionDefinition.identifier} not found
 `;
     let i4 = (n4.parameters?.nodes || []).map((n5, i5) => {
-      let a4 = n5.value;
-      return a4 ? a4.__typename === "ReferenceValue" ? `/* @pos ${e7} ${i5} */ ${c3(a4)}` : a4.__typename === "LiteralValue" ? `/* @pos ${e7} ${i5} */ ${u4(a4.value, a4.references, {
-        id: e7,
-        index: i5,
-        indent: t4
-      })}` : a4.__typename === "SubFlowValue" ? `/* @pos ${e7} ${i5} */ ${l3(a4, e7, i5, t4)}` : r3 ? `/* @pos ${e7} ${i5} */ {}` : `/* @pos ${e7} ${i5} */ undefined` : r3 ? `/* @pos ${e7} ${i5} */ {}` : `/* @pos ${e7} ${i5} */ undefined`;
+      let a4 = n5.value, o4 = r3 ? `/* @pos ${e7} ${i5} */ ${X2("{}", n5.cast)}` : `/* @pos ${e7} ${i5} */ undefined`;
+      if (!a4)
+        return o4;
+      if (a4.__typename === "ReferenceValue")
+        return `/* @pos ${e7} ${i5} */ ${X2(c3(a4), n5.cast)}`;
+      if (a4.__typename === "LiteralValue") {
+        let r4 = u4(a4.value, a4.references, {
+          id: e7,
+          index: i5,
+          indent: t4
+        });
+        return r4 === undefined ? `/* @pos ${e7} ${i5} */ undefined` : `/* @pos ${e7} ${i5} */ ${X2(r4, n5.cast)}`;
+      }
+      return a4.__typename === "SubFlowValue" ? `/* @pos ${e7} ${i5} */ ${l3(a4, e7, i5, t4)}` : o4;
     }), f5 = `node_${Z2(n4.id)}`, p5 = `fn_${n4?.functionDefinition?.identifier?.replace(/::/g, "_")}`;
     i4.includes("undefined");
     let m5 = `${t4}`;
@@ -175943,7 +175988,7 @@ ${d4(e7.startingNodeId || e7.functionDefinition?.id, r4 + "    ")}${r4}}`, u4 =
                 ${d4(n4.parameters?.nodes?.[2]?.value?.startingNodeId || n4.parameters?.nodes?.[2]?.value?.functionDefinition?.identifier, t4 + "    ")}
             }`) : m5 += `const ${f5} = /* @pos ${e7} null */ ${p5}(${i4.join(", ")}) ;
 `, n4.nextNodeId && (m5 += d4(n4.nextNodeId, t4)), m5;
-  }, f4 = X2(n3), p4 = `declare function flow${e6?.signature ?? "(): void"}`, m4 = t3?.map((e7) => `declare function fn_${e7.identifier?.replace(/::/g, "_")}${e7.signature}`).join(`
+  }, f4 = Y2(n3), p4 = `declare function flow${e6?.signature ?? "(): void"}`, m4 = t3?.map((e7) => `declare function fn_${e7.identifier?.replace(/::/g, "_")}${e7.signature}`).join(`
 `), g4 = new Set(a3.map((e7) => e7?.nextNodeId).filter((e7) => !!e7)), _3 = /* @__PURE__ */ new Set;
   return a3.forEach((e7) => e7?.parameters?.nodes?.forEach((e8) => {
     e8?.value?.__typename === "SubFlowValue" && (e8.value.startingNodeId || e8.value.functionDefinition?.id) && _3.add(e8.value.startingNodeId || e8.value.functionDefinition?.id);
@@ -175955,7 +176000,10 @@ ${d4(e7.startingNodeId || e7.functionDefinition?.id, r4 + "    ")}${r4}}`, u4 =
         ${m4}
 
         (() =>
-            ${e6 ? `const flow_${Z2(e6.id ?? "")} = /* @pos null null */ flow(${e6.settings?.nodes?.map((e7, t4) => `/* @pos null ${t4} */ ${e7?.value !== null && e7?.value !== undefined ? h3(e7?.value) : undefined}`).join(", ") ?? ""});` : ""}
+            ${e6 ? `const flow_${Z2(e6.id ?? "")} = /* @pos null null */ flow(${e6.settings?.nodes?.map((e7, t4) => {
+    let n4 = e7?.value !== null && e7?.value !== undefined ? h3(e7.value) : undefined;
+    return `/* @pos null ${t4} */ ${n4 === undefined ? "undefined" : X2(n4, e7?.cast)}`;
+  }).join(", ") ?? ""});` : ""}
             ${a3.filter((e7) => e7?.id && !g4.has(e7.id) && !_3.has(e7.id)).map((e7) => d4(e7.id)).join(`
 `)}
         )();
@@ -175964,32 +176012,32 @@ ${d4(e7.startingNodeId || e7.functionDefinition?.id, r4 + "    ")}${r4}}`, u4 =
 
 // ../dist/index.js
 var import_typescript2 = __toESM(require_typescript(), 1);
-var g4 = 2345;
-var _3 = 2322;
-var v3 = 2339;
-var y3 = (e6, t3, n3) => {
+var _3 = 2345;
+var v3 = 2322;
+var y3 = 2339;
+var b3 = (e6, t3, n3) => {
   if (e6.getStart() > t3 || e6.getEnd() < n3)
     return;
   let r3 = e6;
   return e6.forEachChild((e7) => {
-    let i3 = y3(e7, t3, n3);
+    let i3 = b3(e7, t3, n3);
     i3 && (r3 = i3);
   }), r3;
 };
-var b3 = (e6, t3, n3) => {
+var x3 = (e6, t3, n3) => {
   if (e6.start === undefined || e6.length === undefined)
     return false;
-  let r3 = y3(t3, e6.start, e6.start + e6.length);
+  let r3 = b3(t3, e6.start, e6.start + e6.length);
   if (!r3)
     return false;
-  if ((e6.code === g4 || e6.code === _3) && import_typescript2.default.isExpression(r3)) {
+  if ((e6.code === _3 || e6.code === v3) && import_typescript2.default.isExpression(r3)) {
     let e7 = n3.getTypeAtLocation(r3);
     if (!e7.isUnion())
       return false;
     let t4 = n3.getContextualType(r3);
     return t4 ? e7.types.some((e8) => (e8.flags & (import_typescript2.default.TypeFlags.Null | import_typescript2.default.TypeFlags.Undefined)) === 0 && n3.isTypeAssignableTo(e8, t4)) : false;
   }
-  if (e6.code === v3 && import_typescript2.default.isPropertyAccessExpression(r3.parent)) {
+  if (e6.code === y3 && import_typescript2.default.isPropertyAccessExpression(r3.parent)) {
     let e7 = n3.getNonNullableType(n3.getTypeAtLocation(r3.parent.expression));
     if (!e7.isUnion())
       return false;
@@ -175998,7 +176046,7 @@ var b3 = (e6, t3, n3) => {
   }
   return false;
 };
-var x3 = (e6, t3, n3) => {
+var S3 = (e6, t3, n3) => {
   if (!e6?.startingNodeId)
     return {
       isValid: false,
@@ -176036,18 +176084,18 @@ var x3 = (e6, t3, n3) => {
       returnType: "void",
       diagnostics: i3
     };
-  let a3 = we2(e6, t3, n3, false, false), s3 = "index.ts", c3 = be2(s3, a3), l3 = c3.getSourceFile(s3), d4 = c3.languageService.getProgram(), f5 = d4.getTypeChecker(), m4 = d4.getSemanticDiagnostics(l3).map((e7) => {
+  let a3 = Me2(e6, t3, n3, false, false), s3 = "index.ts", c3 = J2(s3, a3), l3 = c3.getSourceFile(s3), u4 = c3.languageService.getProgram(), f4 = u4.getTypeChecker(), p5 = u4.getSemanticDiagnostics(l3).map((e7) => {
     let t4 = import_typescript2.flattenDiagnosticMessageText(e7.messageText, `
 `), n4, r4 = null;
     if (e7.start !== undefined) {
-      let t5 = l3.getFullText(), i5 = Math.max(0, e7.start - 300), a4 = Math.min(t5.length, e7.start), o3 = t5.substring(i5, a4), s4 = /\/\* @pos ([^ ]+) (\d+|null) \*\//g, c4, u4 = null, d5 = -1;
+      let t5 = l3.getFullText(), i5 = Math.max(0, e7.start - 300), a4 = Math.min(t5.length, e7.start), o3 = t5.substring(i5, a4), s4 = /\/\* @pos ([^ ]+) (\d+|null) \*\//g, c4, u5 = null, d4 = -1;
       for (;(c4 = s4.exec(o3)) !== null; ) {
         let t6 = i5 + c4.index + c4[0].length;
-        t6 <= e7.start && t6 > d5 && (d5 = t6, u4 = c4);
+        t6 <= e7.start && t6 > d4 && (d4 = t6, u5 = c4);
       }
-      u4 && (n4 = u4[1] === "null" ? null : u4[1], r4 = parseInt(u4[2], 10));
+      u5 && (n4 = u5[1] === "null" ? null : u5[1], r4 = parseInt(u5[2], 10));
     }
-    let i4 = b3(e7, l3, f5) ? "warning" : "error";
+    let i4 = x3(e7, l3, f4) ? "warning" : "error";
     return {
       message: t4,
       code: e7.code,
@@ -176057,14 +176105,14 @@ var x3 = (e6, t3, n3) => {
     };
   }).filter((e7) => e7 !== null);
   return {
-    isValid: !m4.some((e7) => e7?.severity === "error"),
+    isValid: !p5.some((e7) => e7?.severity === "error"),
     returnType: "void",
-    diagnostics: m4
+    diagnostics: p5
   };
 };
 
 // ../entrypoint/single-validation.ts
 var data = await readSingleValidation(console);
 var validationInput = mapToFlowValidation(data);
-var result = x3(validationInput.flow, validationInput.functions, validationInput.dataTypes);
+var result = S3(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.34.0'
+  VERSION = '0.35.0'
 end

metadata

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