@code0-tech/pictor 0.0.0-mvp.29 → 0.0.0-mvp.30

package/dist/components/d-flow/DFlow.nodes.hook.js

@@ -1,52 +1,52 @@
 import { useService as b, useStore as B } from "../../utils/contextStore.js";
-import w from "react";
+import C from "react";
 import "merge-props";
 import { DFlowReactiveService as M } from "./DFlow.service.js";
-import { DFlowFunctionReactiveService as C } from "../d-flow-function/DFlowFunction.service.js";
-import { DFlowDataTypeReactiveService as _ } from "../d-flow-data-type/DFlowDataType.service.js";
-import { md5 as V } from "js-md5";
-const j = /* @__PURE__ */ new Map([["std", "default"]]), q = (i, h) => {
-  if (!h || i.size === 0) return "";
-  const p = /[:._\-\/\s]+/, n = h.trim().toLowerCase();
-  let o = null, u = -1 / 0;
+import { DFlowFunctionReactiveService as _ } from "../d-flow-function/DFlowFunction.service.js";
+import { hashToColor as O } from "./DFlow.util.js";
+import { DFlowDataTypeReactiveService as k } from "../d-flow-data-type/DFlowDataType.service.js";
+const V = /* @__PURE__ */ new Map([["std", "default"]]), j = (i, m) => {
+  if (!m || i.size === 0) return "";
+  const v = /[:._\-\/\s]+/, o = m.trim().toLowerCase();
+  let n = null, u = -1 / 0;
   for (const [l, T] of i.entries()) {
     const a = l.trim().toLowerCase();
-    if (n === a)
+    if (o === a)
       return T;
-    let e = 0;
-    if (n.startsWith(a)) {
-      e = 2e3 + a.length * 2;
-      const d = n.charAt(a.length);
-      (d === "" || p.test(d)) && (e += 200);
+    let t = 0;
+    if (o.startsWith(a)) {
+      t = 2e3 + a.length * 2;
+      const d = o.charAt(a.length);
+      (d === "" || v.test(d)) && (t += 200);
     } else {
-      const d = Math.min(n.length, a.length);
-      let s = 0;
-      for (; s < d && n.charCodeAt(s) === a.charCodeAt(s); )
-        s++;
-      if (s > 0) {
-        e = 1e3 + s;
-        const f = n.charAt(s), g = a.charAt(s);
-        (f === "" || p.test(f) || g === "" || p.test(g)) && (e += 50);
+      const d = Math.min(o.length, a.length);
+      let r = 0;
+      for (; r < d && o.charCodeAt(r) === a.charCodeAt(r); )
+        r++;
+      if (r > 0) {
+        t = 1e3 + r;
+        const f = o.charAt(r), g = a.charAt(r);
+        (f === "" || v.test(f) || g === "" || v.test(g)) && (t += 50);
       }
     }
-    e > u ? (u = e, o = l) : (e === u && o !== null && l.length > o.length || e === u && o === null) && (o = l);
+    t > u ? (u = t, n = l) : (t === u && n !== null && l.length > n.length || t === u && n === null) && (n = l);
   }
-  return o !== null ? i.get(o) : "";
-}, ne = (i, h, p) => {
-  const n = b(M), o = B(M), u = b(C), l = B(C), T = b(_), a = B(_), e = w.useMemo(() => n.getById(i, {
-    namespaceId: h,
-    projectId: p
-  }), [i, o]);
-  return w.useMemo(() => {
-    if (!e) return [];
+  return n !== null ? i.get(n) : "";
+}, Z = (i, m, v) => {
+  const o = b(M), n = B(M), u = b(_), l = B(_), T = b(k), a = B(k), t = C.useMemo(() => o.getById(i, {
+    namespaceId: m,
+    projectId: v
+  }), [i, n]);
+  return C.useMemo(() => {
+    if (!t) return [];
     const d = [];
-    let s = 0;
-    const f = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map(), k = (t, r = f) => (r.has(t) || r.set(t, u.getById(t)), r.get(t)), A = (t, r = g) => (r.has(t) || r.set(t, T.getDataType(t)), r.get(t));
+    let r = 0;
+    const f = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Map(), A = (e, s = f) => (s.has(e) || s.set(e, u.getById(e)), s.get(e)), $ = (e, s = g) => (s.has(e) || s.set(e, T.getDataType(e)), s.get(e));
     let R = 0;
     const E = () => ++R;
     let W = 0;
     d.push({
-      id: `${e.id}`,
+      id: `${t.id}`,
       type: "trigger",
       position: {
         x: 0,
@@ -54,15 +54,16 @@ const j = /* @__PURE__ */ new Map([["std", "default"]]), q = (i, h) => {
       },
       draggable: !1,
       data: {
-        instance: e,
+        instance: t,
         flowId: i
       }
     });
-    const I = (t, r = !1, K, v = 0, S = [0], y, N = f, D = g) => {
-      const m = `${t.id}-${s++}`, L = ++W;
+    const I = (e, s = !1, K, p = 0, h = [0], y, S = f, N = g) => {
+      if (!e) return;
+      const D = `${e?.id}-${r++}`, L = ++W;
       d.push({
-        id: m,
-        type: q(j, t.functionDefinition?.identifier),
+        id: D,
+        type: j(V, e?.functionDefinition?.identifier),
         position: {
           x: 0,
           y: 0
@@ -71,24 +72,24 @@ const j = /* @__PURE__ */ new Map([["std", "default"]]), q = (i, h) => {
         parentId: y,
         extent: y ? "parent" : void 0,
         data: {
-          nodeId: t.id,
-          isParameter: r,
+          nodeId: e.id,
+          isParameter: s,
           flowId: i,
-          linkingId: r ? K : void 0,
-          scope: S,
+          linkingId: s ? K : void 0,
+          scope: h,
           // scope is now a PATH (number[])
-          depth: v,
+          depth: p,
           // structural depth (0 at root, +1 per group)
           index: L
           // global node level
         }
       });
-      const O = k(t.functionDefinition?.id, N);
-      t.parameters?.nodes?.forEach((c) => {
-        const F = O?.parameterDefinitions.find((x) => x.id == c?.runtimeParameter?.id)?.dataTypeIdentifier;
-        if ((F ? A(F, D) : void 0)?.variant === "NODE") {
+      const z = A(e?.functionDefinition?.id, S);
+      e.parameters?.nodes?.forEach((c) => {
+        const F = z?.parameterDefinitions.find((x) => x.id == c?.runtimeParameter?.id)?.dataTypeIdentifier;
+        if ((F ? $(F, N) : void 0)?.variant === "NODE") {
           if (c?.value && c.value.__typename === "NodeFunctionIdWrapper") {
-            const x = `${m}-group-${s++}`, $ = [...S, E()], z = V(`${m}-param-${JSON.stringify(c)}`), H = (J) => parseInt(J.slice(0, 8), 16) % 360;
+            const x = `${D}-group-${r++}`, w = [...h, E()];
             d.push({
               id: x,
               type: "group",
@@ -101,20 +102,20 @@ const j = /* @__PURE__ */ new Map([["std", "default"]]), q = (i, h) => {
               extent: y ? "parent" : void 0,
               data: {
                 isParameter: !0,
-                linkingId: m,
+                linkingId: D,
                 flowId: i,
-                depth: v + 1,
-                scope: $,
-                color: `hsl(${H(z)}, 100%, 72%)`
+                depth: p + 1,
+                scope: w,
+                color: O(c.value?.id ?? "")
               }
-            }), I(n.getNodeById(i, c.value.id), !1, void 0, v + 1, $, x, N, D);
+            }), I(o.getNodeById(i, c.value.id), !1, void 0, p + 1, w, x, S, N);
           }
-        } else c?.value && c.value.__typename === "NodeFunctionIdWrapper" && I(n.getNodeById(i, c.value.id), !0, m, v, S, y, N, D);
-      }), t.nextNodeId && I(n.getNodeById(e.id, t.nextNodeId), !1, void 0, v, S, y, N, D);
+        } else c?.value && c.value.__typename === "NodeFunctionIdWrapper" && I(o.getNodeById(i, c.value.id), !0, D, p, h, y, S, N);
+      }), e.nextNodeId && I(o.getNodeById(t.id, e.nextNodeId), !1, void 0, p, h, y, S, N);
     };
-    return e.startingNodeId && I(n.getNodeById(e.id, e.startingNodeId), !1, void 0, 0, [0], void 0, f, g), d;
-  }, [e, o, l, a]);
+    return t.startingNodeId && I(o.getNodeById(t.id, t.startingNodeId), !1, void 0, 0, [0], void 0, f, g), d;
+  }, [t, n, l, a]);
 };
 export {
-  ne as useFlowNodes
+  Z as useFlowNodes
 };

package/dist/components/d-flow/DFlow.service.d.ts

@@ -1,5 +1,5 @@
 import { ReactiveArrayService } from '../../utils';
-import { Flow, FlowInput, FlowSetting, LiteralValue, Namespace, NamespaceProject, NamespacesProjectsFlowsCreateInput, NamespacesProjectsFlowsCreatePayload, NamespacesProjectsFlowsDeleteInput, NamespacesProjectsFlowsDeletePayload, NamespacesProjectsFlowsUpdateInput, NamespacesProjectsFlowsUpdatePayload, NodeFunction, NodeParameter, ReferenceValue } from '@code0-tech/sagittarius-graphql-types';
+import { Flow, FlowInput, FlowSetting, LiteralValue, Maybe, Namespace, NamespaceProject, NamespacesProjectsFlowsCreateInput, NamespacesProjectsFlowsCreatePayload, NamespacesProjectsFlowsDeleteInput, NamespacesProjectsFlowsDeletePayload, NamespacesProjectsFlowsUpdateInput, NamespacesProjectsFlowsUpdatePayload, NodeFunction, NodeParameter, ReferenceValue, Scalars } from '@code0-tech/sagittarius-graphql-types';
 export type DFlowDependencies = {
     namespaceId: Namespace['id'];
     projectId: NamespaceProject['id'];
@@ -7,11 +7,12 @@ export type DFlowDependencies = {
 export declare abstract class DFlowReactiveService extends ReactiveArrayService<Flow, DFlowDependencies> {
     getById(id: Flow['id'], dependencies?: DFlowDependencies): Flow | undefined;
     protected removeParameterNode(flow: Flow, parameter: NodeParameter): void;
+    getLinkedNodesById(flowId: Flow['id'], nodeId: NodeFunction['id']): NodeFunction[];
     getNodeById(flowId: Flow['id'], nodeId: NodeFunction['id']): NodeFunction | undefined;
     getPayloadById(flowId: Flow['id']): FlowInput | undefined;
     deleteNodeById(flowId: Flow['id'], nodeId: NodeFunction['id']): Promise<void>;
     addNextNodeById(flowId: Flow['id'], parentNodeId: NodeFunction['id'] | null, nextNode: NodeFunction): Promise<void>;
-    setSettingValue(flowId: Flow['id'], settingId: FlowSetting['id'], value: FlowSetting['value']): Promise<void>;
+    setSettingValue(flowId: Flow['id'], settingIdentifier: Maybe<Scalars['String']['output']>, value: FlowSetting['value']): Promise<void>;
     setParameterValue(flowId: Flow['id'], nodeId: NodeFunction['id'], parameterId: NodeParameter['id'], value?: LiteralValue | ReferenceValue | NodeFunction): Promise<void>;
     abstract flowCreate(payload: NamespacesProjectsFlowsCreateInput): Promise<NamespacesProjectsFlowsCreatePayload | undefined>;
     abstract flowDelete(payload: NamespacesProjectsFlowsDeleteInput): Promise<NamespacesProjectsFlowsDeletePayload | undefined>;

package/dist/components/d-flow/DFlow.service.js

@@ -1,32 +1,41 @@
 import "../../utils/contextStore.js";
 import "react";
-import { ReactiveArrayService as I } from "../../utils/reactiveArrayService.js";
+import { ReactiveArrayService as N } from "../../utils/reactiveArrayService.js";
 import "merge-props";
-class m extends I {
-  getById(n, t) {
-    return this.values(t).find((i) => i.id === n);
+class m extends N {
+  getById(t, i) {
+    return this.values(i).find((n) => n.id === t);
   }
-  removeParameterNode(n, t) {
-    if (t?.value?.__typename === "NodeFunctionIdWrapper") {
-      const i = n?.nodes?.nodes?.find((e) => e?.id === t.value?.id);
-      if (i) {
-        n.nodes.nodes = n.nodes.nodes.filter((d) => d?.id !== t.value?.id);
-        let e = i.nextNodeId;
+  removeParameterNode(t, i) {
+    if (i?.value?.__typename === "NodeFunctionIdWrapper") {
+      const n = t?.nodes?.nodes?.find((e) => e?.id === i.value?.id);
+      if (n) {
+        t.nodes.nodes = t.nodes.nodes.filter((d) => d?.id !== i.value?.id);
+        let e = n.nextNodeId;
         for (; e; ) {
-          const d = n.nodes.nodes.find((o) => o?.id === e);
-          d ? (n.nodes.nodes = n.nodes.nodes.filter((o) => o?.id !== e), e = d.nextNodeId) : e = null;
+          const d = t.nodes.nodes.find((o) => o?.id === e);
+          d ? (t.nodes.nodes = t.nodes.nodes.filter((o) => o?.id !== e), e = d.nextNodeId) : e = null;
         }
-        i.parameters?.nodes?.forEach((d) => {
-          this.removeParameterNode(n, d);
+        n.parameters?.nodes?.forEach((d) => {
+          this.removeParameterNode(t, d);
         });
       }
     }
   }
-  getNodeById(n, t) {
-    return this.getById(n)?.nodes?.nodes?.find((i) => i?.id === t);
+  getLinkedNodesById(t, i) {
+    const n = this.getNodeById(t, i), e = n ? this.getLinkedNodesById(t, n.nextNodeId) : [], d = [];
+    return n?.parameters?.nodes?.forEach((o) => {
+      if (o?.value?.__typename === "NodeFunctionIdWrapper") {
+        const r = this.getNodeById(t, o.value?.id);
+        r && (d.push(r), d.push(...r ? this.getLinkedNodesById(t, r.nextNodeId) : []));
+      }
+    }), [...n ? [n] : [], ...d, ...e];
+  }
+  getNodeById(t, i) {
+    return this.getById(t)?.nodes?.nodes?.find((n) => n?.id === i);
   }
-  getPayloadById(n) {
-    const t = this.getById(n), i = (e) => ({
+  getPayloadById(t) {
+    const i = this.getById(t), n = (e) => ({
       ...e?.dataType ? {
         dataTypeId: e?.dataType?.id
       } : {},
@@ -38,19 +47,19 @@ class m extends I {
           dataTypeId: e?.genericType?.dataType?.id,
           genericMappers: e?.genericType?.genericMappers?.map((d) => ({
             target: d.target,
-            sourceDataTypeIdentifiers: d.sourceDataTypeIdentifiers?.map(i) ?? []
+            sourceDataTypeIdentifiers: d.sourceDataTypeIdentifiers?.map(n) ?? []
           })) ?? []
         }
       } : {}
     });
     return {
-      name: t?.name,
-      type: t?.type?.id,
-      settings: t?.settings?.nodes?.map((e) => ({
+      name: i?.name,
+      type: i?.type?.id,
+      settings: i?.settings?.nodes?.map((e) => ({
         flowSettingIdentifier: e?.flowSettingIdentifier,
         value: e?.value
       })),
-      nodes: t?.nodes?.nodes?.map((e) => ({
+      nodes: i?.nodes?.nodes?.map((e) => ({
         id: e?.id,
         nextNodeId: e?.nextNodeId,
         parameters: e?.parameters?.nodes?.map((d) => ({
@@ -61,7 +70,7 @@ class m extends I {
             literalValue: d.value.value
           } : {
             referenceValue: {
-              dataTypeIdentifier: i((d?.value).dataTypeIdentifier),
+              dataTypeIdentifier: n((d?.value).dataTypeIdentifier),
               depth: (d?.value).depth,
               node: (d?.value).node,
               nodeFunctionId: (d?.value).nodeFunctionId,
@@ -72,46 +81,52 @@ class m extends I {
         })) ?? [],
         runtimeFunctionId: e?.functionDefinition?.runtimeFunctionDefinition?.id
       })) ?? [],
-      startingNodeId: t?.startingNodeId
+      startingNodeId: i?.startingNodeId
     };
   }
-  async deleteNodeById(n, t) {
-    const i = this.getById(n), e = this.getNodeById(n, t), d = i?.nodes?.nodes?.find((s) => s?.nextNodeId === t), o = this.values().findIndex((s) => s.id === n);
-    !i || !e || (i.nodes.nodes = i.nodes.nodes.filter((s) => s?.id !== t), e.parameters?.nodes?.forEach((s) => this.removeParameterNode(i, s)), d ? d.nextNodeId = e.nextNodeId : i.startingNodeId = e.nextNodeId ?? void 0, this.set(o, i));
+  async deleteNodeById(t, i) {
+    const n = this.getById(t), e = this.getNodeById(t, i), d = n?.nodes?.nodes?.find((s) => s?.parameters?.nodes?.find((a) => a?.value?.__typename === "NodeFunctionIdWrapper" && a.value?.id === i)), o = n?.nodes?.nodes?.find((s) => s?.nextNodeId === i), r = this.values().findIndex((s) => s.id === t);
+    if (!(!n || !e)) {
+      if (n.nodes.nodes = n.nodes.nodes.filter((s) => s?.id !== i), e.parameters?.nodes?.forEach((s) => this.removeParameterNode(n, s)), o ? o.nextNodeId = e.nextNodeId : d || (n.startingNodeId = e.nextNodeId ?? void 0), d) {
+        const s = d.parameters?.nodes?.find((a) => a?.value?.__typename === "NodeFunctionIdWrapper" && a.value?.id === i);
+        s && (s.value = void 0);
+      }
+      this.set(r, n);
+    }
   }
-  async addNextNodeById(n, t, i) {
-    const e = this.getById(n), d = this.values().findIndex((u) => u.id === n), o = t ? this.getNodeById(n, t) : void 0;
-    if (!e || t && !o) return;
-    const r = `gid://sagittarius/NodeFunction/${Math.max(0, ...e.nodes?.nodes?.map((u) => Number(u?.id?.match(/NodeFunction\/(\d+)$/)?.[1] ?? 0)) ?? [0]) + 1}`, a = {
-      ...i,
-      id: r
+  async addNextNodeById(t, i, n) {
+    const e = this.getById(t), d = this.values().findIndex((u) => u.id === t), o = i ? this.getNodeById(t, i) : void 0;
+    if (!e || i && !o) return;
+    const s = `gid://sagittarius/NodeFunction/${Math.max(0, ...e.nodes?.nodes?.map((u) => Number(u?.id?.match(/NodeFunction\/(\d+)$/)?.[1] ?? 0)) ?? [0]) + 1}`, a = {
+      ...JSON.parse(JSON.stringify(n)),
+      id: s
     };
     o && o.nextNodeId ? a.nextNodeId = o.nextNodeId : !o && e.startingNodeId && (a.nextNodeId = e.startingNodeId), e.nodes?.nodes?.push(a), o ? o.nextNodeId = a.id : e.startingNodeId = a.id, this.set(d, e);
   }
-  async setSettingValue(n, t, i) {
-    const e = this.getById(n), d = this.values().findIndex((s) => s.id === n);
+  async setSettingValue(t, i, n) {
+    const e = this.getById(t), d = this.values().findIndex((r) => r.id === t);
     if (!e) return;
-    const o = e.settings?.nodes?.find((s) => s?.id === t);
-    o && (o.value = i, this.set(d, e));
+    const o = e.settings?.nodes?.find((r) => r?.flowSettingIdentifier === i);
+    o && (o.value = n, this.set(d, e));
   }
-  async setParameterValue(n, t, i, e) {
-    const d = this.getById(n), o = this.values().findIndex((a) => a.id === n);
+  async setParameterValue(t, i, n, e) {
+    const d = this.getById(t), o = this.values().findIndex((a) => a.id === t);
     if (!d) return;
-    const s = this.getNodeById(n, t);
-    if (!s) return;
-    const r = s.parameters?.nodes?.find((a) => a?.id === i);
-    if (r) {
-      if (this.removeParameterNode(d, r), e?.__typename === "NodeFunction") {
+    const r = this.getNodeById(t, i);
+    if (!r) return;
+    const s = r.parameters?.nodes?.find((a) => a?.id === n);
+    if (s) {
+      if (this.removeParameterNode(d, s), e?.__typename === "NodeFunction") {
         const a = Math.max(0, ...d.nodes?.nodes?.map((c) => Number(c?.id?.match(/NodeFunction\/(\d+)$/)?.[1] ?? 0)) ?? [0]), u = {
           ...e,
           id: `gid://sagittarius/NodeFunction/${a + 1}`
         };
-        d.nodes?.nodes?.push(u), r.value = {
+        d.nodes?.nodes?.push(u), s.value = {
           id: `gid://sagittarius/NodeFunction/${a + 1}`,
           __typename: "NodeFunctionIdWrapper"
         };
       } else
-        r.value = e;
+        s.value = e;
       this.set(o, d);
     }
   }

package/dist/components/d-flow/DFlow.util.d.ts

@@ -0,0 +1,4 @@
+import { DataTypeIdentifier } from '@code0-tech/sagittarius-graphql-types';
+export declare const hashToColor: (s: string) => string;
+export declare const attachDataTypeIdentifiers: <T>(identifiers: DataTypeIdentifier[], input: T) => T;
+export declare const resolveDataTypeIdentifiers: (list: DataTypeIdentifier[]) => DataTypeIdentifier[];

package/dist/components/d-flow/DFlow.util.js

@@ -0,0 +1,63 @@
+import { md5 as d } from "js-md5";
+const f = 137.50776405003785, T = (t) => {
+  const a = t.match(/\/(\d+)\s*$/);
+  return a ? Number(a[1]) : null;
+}, m = (t) => {
+  const a = T(t);
+  if (a != null)
+    return `hsl(${25 + a * f % 320}, 100%, 72%)`;
+  const n = d(d(t));
+  return `hsl(${25 + parseInt(n.slice(0, 8), 16) % 320}, 100%, 72%)`;
+}, l = (t, a) => {
+  const n = new Map(t.filter((r) => r?.id).map((r) => [r.id, r])), i = (r) => Array.isArray(r) ? r.map(i) : r && typeof r == "object" ? {
+    ...Object.fromEntries(Object.entries(r).map(([s, e]) => [s, i(e)])),
+    ...r.dataTypeIdentifierId ? {
+      dataTypeIdentifier: n.get(r.dataTypeIdentifierId) ?? null
+    } : {},
+    ...Array.isArray(r.sourceDataTypeIdentifierIds) ? {
+      sourceDataTypeIdentifiers: r.sourceDataTypeIdentifierIds.map((s) => n.get(s)).filter(Boolean)
+    } : {}
+  } : r;
+  return i(a);
+}, u = (t) => {
+  const a = new Map(t.filter((e) => e?.id).map((e) => [e.id, e])), n = /* @__PURE__ */ new Map(), i = (e) => {
+    if (!e?.id) return e;
+    if (n.has(e.id)) return n.get(e.id);
+    const o = {
+      ...e
+    };
+    if (n.set(e.id, o), e.genericType) {
+      o.genericType = {
+        ...e.genericType
+      };
+      const p = e.genericType.genericMappers;
+      Array.isArray(p) && (o.genericType.genericMappers = p.map((c) => ({
+        ...c,
+        ...Array.isArray(c.sourceDataTypeIdentifierIds) ? {
+          sourceDataTypeIdentifiers: c.sourceDataTypeIdentifierIds.map((y) => i(a.get(y) ?? null)).filter(Boolean)
+        } : {}
+      })));
+    }
+    return o;
+  }, r = t.map((e) => i(e)).filter(Boolean), s = (e) => {
+    if (!e) return e;
+    const o = e?.dataTypeIdentifiers?.nodes;
+    if (!Array.isArray(o)) return e;
+    const p = u(o), c = {
+      ...e,
+      dataTypeIdentifiers: {
+        ...e.dataTypeIdentifiers,
+        nodes: p
+      }
+    };
+    return l(p, c);
+  };
+  return r.forEach((e) => {
+    e?.dataType && (e.dataType = s(e.dataType)), e?.genericType?.dataType && (e.genericType.dataType = s(e.genericType.dataType));
+  }), r;
+};
+export {
+  l as attachDataTypeIdentifiers,
+  m as hashToColor,
+  u as resolveDataTypeIdentifiers
+};

package/dist/components/d-flow/DFlowEdge.js

@@ -1,29 +1,29 @@
-import { jsx as a, jsxs as L, Fragment as U } from "react/jsx-runtime";
-import { c as z } from "../../_virtual/compiler-runtime.js";
-import { Position as P, getSmoothStepPath as D, BaseEdge as G, EdgeLabelRenderer as T } from "@xyflow/react";
-import { memo as W } from "react";
-import { Badge as q } from "../badge/Badge.js";
-const Q = W((E) => {
-  const t = z.c(42);
-  let n, s, i, d, e, o, r, l;
+import { jsx as n, jsxs as O, Fragment as z } from "react/jsx-runtime";
+import { c as D } from "../../_virtual/compiler-runtime.js";
+import { Position as P, getSmoothStepPath as G, BaseEdge as T, EdgeLabelRenderer as W } from "@xyflow/react";
+import { memo as q } from "react";
+import { Badge as A } from "../badge/Badge.js";
+const V = q((E) => {
+  const t = D.c(43);
+  let s, i, a, d, e, o, r, l;
   if (t[0] !== E) {
     const {
-      sourceX: O,
-      sourceY: S,
-      targetX: j,
-      targetY: v,
-      id: w,
-      data: C,
-      label: F,
-      style: A,
-      ...I
+      sourceX: S,
+      sourceY: j,
+      targetX: v,
+      targetY: w,
+      id: C,
+      data: F,
+      label: I,
+      style: H,
+      ...U
     } = E;
-    e = O, o = S, r = j, l = v, s = w, n = C, i = F, d = I, t[0] = E, t[1] = n, t[2] = s, t[3] = i, t[4] = d, t[5] = e, t[6] = o, t[7] = r, t[8] = l;
+    e = S, o = j, r = v, l = w, i = C, s = F, a = I, d = U, t[0] = E, t[1] = s, t[2] = i, t[3] = a, t[4] = d, t[5] = e, t[6] = o, t[7] = r, t[8] = l;
   } else
-    n = t[1], s = t[2], i = t[3], d = t[4], e = t[5], o = t[6], r = t[7], l = t[8];
-  const X = n?.type === "parameter" ? P.Left : P.Bottom, Y = n?.type === "parameter" ? P.Right : P.Top;
+    s = t[1], i = t[2], a = t[3], d = t[4], e = t[5], o = t[6], r = t[7], l = t[8];
+  const X = s?.type === "parameter" ? P.Left : P.Bottom, Y = s?.type === "parameter" ? P.Right : P.Top;
   let h;
-  t[9] !== e || t[10] !== o || t[11] !== X || t[12] !== Y || t[13] !== r || t[14] !== l ? (h = D({
+  t[9] !== e || t[10] !== o || t[11] !== X || t[12] !== Y || t[13] !== r || t[14] !== l ? (h = G({
     sourceX: e,
     sourceY: o,
     sourcePosition: X,
@@ -33,37 +33,37 @@ const Q = W((E) => {
     borderRadius: 16,
     stepPosition: 0.5
   }), t[9] = e, t[10] = o, t[11] = X, t[12] = Y, t[13] = r, t[14] = l, t[15] = h) : h = t[15];
-  const [$, R, k] = h, x = n?.color ?? "#ffffff", y = `dflow-edge-gradient-${s}`;
+  const [$, R, k] = h, x = s?.color ?? "#ffffff", y = `dflow-edge-gradient-${i}`;
   let c, p;
-  t[16] !== x ? (c = /* @__PURE__ */ a("stop", { offset: "0", stopColor: x, stopOpacity: 0.75 }), p = /* @__PURE__ */ a("stop", { offset: "1", stopColor: x, stopOpacity: 0.25 }), t[16] = x, t[17] = c, t[18] = p) : (c = t[17], p = t[18]);
+  t[16] !== x ? (c = /* @__PURE__ */ n("stop", { offset: "0", stopColor: x, stopOpacity: 0.25 }), p = /* @__PURE__ */ n("stop", { offset: "1", stopColor: x, stopOpacity: 0.75 }), t[16] = x, t[17] = c, t[18] = p) : (c = t[17], p = t[18]);
   let f;
-  t[19] !== y || t[20] !== e || t[21] !== o || t[22] !== c || t[23] !== p || t[24] !== r || t[25] !== l ? (f = /* @__PURE__ */ a("defs", { children: /* @__PURE__ */ L("linearGradient", { id: y, x1: e, y1: o, x2: r, y2: l, gradientUnits: "userSpaceOnUse", children: [
+  t[19] !== y || t[20] !== e || t[21] !== o || t[22] !== c || t[23] !== p || t[24] !== r || t[25] !== l ? (f = /* @__PURE__ */ n("defs", { children: /* @__PURE__ */ O("linearGradient", { id: y, x1: e, y1: o, x2: r, y2: l, gradientUnits: "userSpaceOnUse", children: [
     c,
     p
   ] }) }), t[19] = y, t[20] = e, t[21] = o, t[22] = c, t[23] = p, t[24] = r, t[25] = l, t[26] = f) : f = t[26];
-  const B = `url(#${y})`;
+  const B = `url(#${y})`, L = s?.type === "default" ? "3px" : "2px";
   let m;
-  t[27] !== B ? (m = {
+  t[27] !== B || t[28] !== L ? (m = {
     stroke: B,
-    strokeWidth: "2px",
+    strokeWidth: L,
     strokeLinecap: "round"
-  }, t[27] = B, t[28] = m) : m = t[28];
+  }, t[27] = B, t[28] = L, t[29] = m) : m = t[29];
   let g;
-  t[29] !== $ || t[30] !== s || t[31] !== d || t[32] !== m ? (g = /* @__PURE__ */ a(G, { id: s, path: $, ...d, style: m }), t[29] = $, t[30] = s, t[31] = d, t[32] = m, t[33] = g) : g = t[33];
+  t[30] !== $ || t[31] !== i || t[32] !== d || t[33] !== m ? (g = /* @__PURE__ */ n(T, { id: i, path: $, ...d, style: m }), t[30] = $, t[31] = i, t[32] = d, t[33] = m, t[34] = g) : g = t[34];
   let u;
-  t[34] !== i || t[35] !== R || t[36] !== k ? (u = i ? /* @__PURE__ */ a(T, { children: /* @__PURE__ */ a("div", { style: {
+  t[35] !== a || t[36] !== R || t[37] !== k ? (u = a ? /* @__PURE__ */ n(W, { children: /* @__PURE__ */ n("div", { style: {
     position: "absolute",
     transform: `translate(-50%, -50%) translate(${R}px, ${k}px)`,
     pointerEvents: "all",
     zIndex: 100
-  }, children: /* @__PURE__ */ a(q, { color: "primary", border: !0, children: i }) }) }) : null, t[34] = i, t[35] = R, t[36] = k, t[37] = u) : u = t[37];
+  }, children: /* @__PURE__ */ n(A, { color: "primary", border: !0, children: a }) }) }) : null, t[35] = a, t[36] = R, t[37] = k, t[38] = u) : u = t[38];
   let b;
-  return t[38] !== f || t[39] !== g || t[40] !== u ? (b = /* @__PURE__ */ L(U, { children: [
+  return t[39] !== u || t[40] !== f || t[41] !== g ? (b = /* @__PURE__ */ O(z, { children: [
     f,
     g,
     u
-  ] }), t[38] = f, t[39] = g, t[40] = u, t[41] = b) : b = t[41], b;
+  ] }), t[39] = u, t[40] = f, t[41] = g, t[42] = b) : b = t[42], b;
 });
 export {
-  Q as DFlowEdge
+  V as DFlowEdge
 };

package/dist/components/d-flow-data-type/DFlowDataType.service.js

@@ -1,10 +1,10 @@
 import "../../utils/contextStore.js";
 import "react";
-import { ReactiveArrayService as f } from "../../utils/reactiveArrayService.js";
+import { ReactiveArrayService as y } from "../../utils/reactiveArrayService.js";
 import "merge-props";
 import { resolveType as s } from "../../utils/generics.js";
 import { useValueValidation as o } from "../d-flow-validation/DValueValidation.hook.js";
-class v extends f {
+class v extends y {
   getDataType(e, r) {
     if (!e || e.genericKey) return;
     const i = e.dataType?.identifier ?? e.genericType?.dataType?.identifier, t = e.dataType?.id ?? e.genericType?.dataType?.id;
@@ -15,7 +15,7 @@ class v extends f {
     if (e.__typename == "LiteralValue") {
       if (Array.isArray(e.value) && Array.from(e.value).length > 0) return this.getDataType({
         dataType: {
-          identifier: "ARRAY"
+          identifier: "LIST"
         }
       });
       if (typeof e.value == "string") return this.getDataType({
@@ -43,46 +43,49 @@ class v extends f {
     const t = this.getDataTypeFromValue(e, r, i);
     if ((t?.genericKeys?.length ?? 0) <= 0 || !t?.genericKeys) return {
       dataType: {
-        id: t?.id
+        id: t?.id,
+        identifier: t?.identifier
       }
     };
     const a = t.genericKeys.map((n) => {
-      const T = t.rules?.nodes?.find((p) => "dataTypeIdentifier" in (p?.config ?? {}) && p?.config?.dataTypeIdentifier?.genericKey == n || "inputTypes" in (p?.config ?? {}) && p.config.inputTypes?.some((y) => y.dataTypeIdentifier?.genericKey == n));
-      return T && T.variant == "CONTAINS_TYPE" && "value" in e && e?.value && t.variant === "ARRAY" ? {
+      const d = t.rules?.nodes?.find((T) => "dataTypeIdentifier" in (T?.config ?? {}) && T?.config?.dataTypeIdentifier?.genericKey == n || "inputTypes" in (T?.config ?? {}) && T.config.inputTypes?.some((p) => p.dataTypeIdentifier?.genericKey == n));
+      return d && d.variant == "CONTAINS_TYPE" && "value" in e && e?.value && t.variant === "ARRAY" ? {
         sourceDataTypeIdentifiers: [this.getTypeFromValue({
           __typename: "LiteralValue",
           value: e.value[0]
         }, r, i)],
         target: n
-      } : T && T.variant == "CONTAINS_KEY" && "value" in e && e?.value && t.variant === "OBJECT" ? {
+      } : d && d.variant == "CONTAINS_KEY" && "value" in e && e?.value && t.variant === "OBJECT" ? {
         sourceDataTypeIdentifiers: [this.getTypeFromValue({
           __typename: "LiteralValue",
           /* @ts-ignore */
-          value: e.value[T.config?.key ?? ""]
+          value: e.value[d.config?.key ?? ""]
         }, r, i)],
         target: n
-      } : T && T.variant == "RETURN_TYPE" && t.variant === "NODE" ? {
+      } : d && d.variant == "RETURN_TYPE" && t.variant === "NODE" ? {
         sourceDataTypeIdentifiers: [this.getTypeFromValue(e, r, i)],
         target: n
-      } : T && T.variant == "INPUT_TYPES" && t.variant === "NODE" ? {
+      } : d && d.variant == "INPUT_TYPES" && t.variant === "NODE" ? {
         sourceDataTypeIdentifiers: [{
           genericKey: n
         }],
         target: n
       } : null;
-    }).filter((n) => !!n), d = a.length > 0 ? {
+    }).filter((n) => !!n), f = a.length > 0 ? {
       genericType: {
         dataType: {
-          id: t.id
+          id: t.id,
+          identifier: t.identifier
         },
         genericMappers: a
       }
     } : {
       dataType: {
-        id: t.id
+        id: t.id,
+        identifier: t.identifier
       }
     };
-    return s(d, this);
+    return s(f, this);
   }
   hasDataTypes(e, r) {
     return e.every((i) => this.values(r).find((t) => t.id === (i.genericType?.dataType?.id ?? i.dataType?.id)));