@elyx-code/project-logic-tree 0.0.6915 → 0.0.6916

package/dist/index.js

@@ -51428,58 +51428,58 @@ const lst = {
   outputDescription: null,
   error: VZt,
   parent: null
-}, Hi = ie[d.Operation][Fi.DeriveKeyPBKDF2], mu = {
+}, zi = ie[d.Operation][Fi.DeriveKeyPBKDF2], mu = {
   id: "crypto-derive-key-pbkdf2--ref",
   type: d.GenericReference,
-  entityId: Hi.id,
+  entityId: zi.id,
   version: "1",
   entityType: d.ActionDescriptor
 }, NZt = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--password-ref",
-  entityId: Hi.inputs.password.id,
+  entityId: zi.inputs.password.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, xZt = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--salt-ref",
-  entityId: Hi.inputs.salt.id,
+  entityId: zi.inputs.salt.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, $Zt = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--iterations-ref",
-  entityId: Hi.inputs.iterations.id,
+  entityId: zi.inputs.iterations.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, LZt = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--length-ref",
-  entityId: Hi.inputs.length.id,
+  entityId: zi.inputs.length.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, GZt = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--hash-alg-ref",
-  entityId: Hi.inputs.hashAlg.id,
+  entityId: zi.inputs.hashAlg.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, MZt = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--password-encoding-ref",
-  entityId: Hi.inputs.passwordEncoding.id,
+  entityId: zi.inputs.passwordEncoding.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, BZt = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--salt-encoding-ref",
-  entityId: Hi.inputs.saltEncoding.id,
+  entityId: zi.inputs.saltEncoding.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, UZt = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--output-encoding-ref",
-  entityId: Hi.inputs.outputEncoding.id,
+  entityId: zi.inputs.outputEncoding.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, Mp = {
@@ -51488,7 +51488,7 @@ const lst = {
   interactiveEntities: null,
   actionEntities: null,
   inferred: !1,
-  id: Hi.inputs.password.dataType.id,
+  id: zi.inputs.password.dataType.id,
   deletable: !1,
   editable: !1,
   type: d.DataType,
@@ -51511,49 +51511,49 @@ const lst = {
   parent: NZt
 }, kZt = {
   ...Mp,
-  id: Hi.inputs.salt.dataType.id,
+  id: zi.inputs.salt.dataType.id,
   parent: xZt
 }, Yk = {
   ...Mp,
-  id: Hi.inputs.iterations.dataType.id,
+  id: zi.inputs.iterations.dataType.id,
   entity: Ne,
   parent: $Zt
 }, jZt = {
   ...Yk,
-  id: Hi.inputs.length.dataType.id,
+  id: zi.inputs.length.dataType.id,
   parent: LZt
 }, FZt = {
   ...Mp,
-  id: Hi.inputs.hashAlg.dataType.id,
+  id: zi.inputs.hashAlg.dataType.id,
   entity: Lt,
   options: Hk,
   parent: GZt
 }, KZt = {
   ...Mp,
-  id: Hi.inputs.passwordEncoding.dataType.id,
+  id: zi.inputs.passwordEncoding.dataType.id,
   entity: Lt,
   options: Ao,
   parent: MZt
 }, qZt = {
   ...Mp,
-  id: Hi.inputs.saltEncoding.dataType.id,
+  id: zi.inputs.saltEncoding.dataType.id,
   entity: Lt,
   options: Ao,
   parent: BZt
 }, ZZt = {
   ...Mp,
-  id: Hi.inputs.outputEncoding.dataType.id,
+  id: zi.inputs.outputEncoding.dataType.id,
   entity: Lt,
   options: Ao,
   parent: UZt
 }, SZt = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--iterations-default-parent-ref",
-  entityId: Hi.inputs.iterations.id,
+  entityId: zi.inputs.iterations.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, WZt = {
-  id: Hi.inputs.iterations.defaultValue.id,
+  id: zi.inputs.iterations.defaultValue.id,
   deletable: !1,
   editable: !1,
   type: d.LiteralValue,
@@ -51572,11 +51572,11 @@ const lst = {
 }, HZt = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--length-default-parent-ref",
-  entityId: Hi.inputs.length.id,
+  entityId: zi.inputs.length.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, zZt = {
-  id: Hi.inputs.length.defaultValue.id,
+  id: zi.inputs.length.defaultValue.id,
   deletable: !1,
   editable: !1,
   type: d.LiteralValue,
@@ -51595,11 +51595,11 @@ const lst = {
 }, JZt = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--hash-alg-default-parent-ref",
-  entityId: Hi.inputs.hashAlg.id,
+  entityId: zi.inputs.hashAlg.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, YZt = {
-  id: Hi.inputs.hashAlg.defaultValue.id,
+  id: zi.inputs.hashAlg.defaultValue.id,
   deletable: !1,
   editable: !1,
   type: d.LiteralValue,
@@ -51618,11 +51618,11 @@ const lst = {
 }, QZt = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--password-encoding-default-parent-ref",
-  entityId: Hi.inputs.passwordEncoding.id,
+  entityId: zi.inputs.passwordEncoding.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, XZt = {
-  id: Hi.inputs.passwordEncoding.defaultValue.id,
+  id: zi.inputs.passwordEncoding.defaultValue.id,
   deletable: !1,
   editable: !1,
   type: d.LiteralValue,
@@ -51641,11 +51641,11 @@ const lst = {
 }, e6t = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--salt-encoding-default-parent-ref",
-  entityId: Hi.inputs.saltEncoding.id,
+  entityId: zi.inputs.saltEncoding.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, t6t = {
-  id: Hi.inputs.saltEncoding.defaultValue.id,
+  id: zi.inputs.saltEncoding.defaultValue.id,
   deletable: !1,
   editable: !1,
   type: d.LiteralValue,
@@ -51664,11 +51664,11 @@ const lst = {
 }, i6t = {
   type: d.GenericReference,
   id: "crypto-pbkdf2--output-encoding-default-parent-ref",
-  entityId: Hi.inputs.outputEncoding.id,
+  entityId: zi.inputs.outputEncoding.id,
   version: "1",
   entityType: d.ValueDescriptor
 }, r6t = {
-  id: Hi.inputs.outputEncoding.defaultValue.id,
+  id: zi.inputs.outputEncoding.defaultValue.id,
   deletable: !1,
   editable: !1,
   type: d.LiteralValue,
@@ -51685,7 +51685,7 @@ const lst = {
   autogeneration: null,
   parent: i6t
 }, n6t = {
-  id: Hi.inputs.password.id,
+  id: zi.inputs.password.id,
   deletable: !1,
   editable: !1,
   type: d.ValueDescriptor,
@@ -51704,7 +51704,7 @@ const lst = {
   index: 0,
   parent: mu
 }, a6t = {
-  id: Hi.inputs.salt.id,
+  id: zi.inputs.salt.id,
   deletable: !1,
   editable: !1,
   type: d.ValueDescriptor,
@@ -51723,7 +51723,7 @@ const lst = {
   index: 1,
   parent: mu
 }, s6t = {
-  id: Hi.inputs.iterations.id,
+  id: zi.inputs.iterations.id,
   deletable: !1,
   editable: !1,
   type: d.ValueDescriptor,
@@ -51742,7 +51742,7 @@ const lst = {
   index: 2,
   parent: mu
 }, l6t = {
-  id: Hi.inputs.length.id,
+  id: zi.inputs.length.id,
   deletable: !1,
   editable: !1,
   type: d.ValueDescriptor,
@@ -51761,7 +51761,7 @@ const lst = {
   index: 3,
   parent: mu
 }, o6t = {
-  id: Hi.inputs.hashAlg.id,
+  id: zi.inputs.hashAlg.id,
   deletable: !1,
   editable: !1,
   type: d.ValueDescriptor,
@@ -51780,7 +51780,7 @@ const lst = {
   index: 4,
   parent: mu
 }, d6t = {
-  id: Hi.inputs.passwordEncoding.id,
+  id: zi.inputs.passwordEncoding.id,
   deletable: !1,
   editable: !1,
   type: d.ValueDescriptor,
@@ -51799,7 +51799,7 @@ const lst = {
   index: 5,
   parent: mu
 }, u6t = {
-  id: Hi.inputs.saltEncoding.id,
+  id: zi.inputs.saltEncoding.id,
   deletable: !1,
   editable: !1,
   type: d.ValueDescriptor,
@@ -51818,7 +51818,7 @@ const lst = {
   index: 6,
   parent: mu
 }, p6t = {
-  id: Hi.inputs.outputEncoding.id,
+  id: zi.inputs.outputEncoding.id,
   deletable: !1,
   editable: !1,
   type: d.ValueDescriptor,
@@ -51838,7 +51838,7 @@ const lst = {
   parent: mu
 }, c6t = {
   ...Mp,
-  id: Hi.dataType.id,
+  id: zi.dataType.id,
   entity: be,
   // encoded derived key as string
   parent: mu
@@ -51850,7 +51850,7 @@ const lst = {
   entityType: d.ActionDescriptor
 }, y6t = {
   parentRelationType: k.ReturnedError,
-  id: Hi.error.id,
+  id: zi.error.id,
   deletable: !1,
   editable: !1,
   type: d.ValueDescriptor,
@@ -159049,11 +159049,11 @@ const oIi = /* @__PURE__ */ ys(Wu), UZi = /* @__PURE__ */ OQe({
   __proto__: null,
   default: oIi
 }, [Wu]);
-var Ot = /* @__PURE__ */ ((s) => (s.SearchStatement = "search-statement", s.NestedSearchStatement = "nested-search-statement", s.DataSource = "data-source", s.ColumnRef = "column-ref", s.ValueRef = "value-ref", s.LiteralValue = "search-statement-literal-value", s.WhereStatement = "where-statement", s.AggregationStatement = "aggregation-statement", s.SortStatement = "sort-statement", s.AllColumnsSelector = "all-columns-selector", s.FunctionCall = "function-call", s))(Ot || {}), zi = /* @__PURE__ */ ((s) => (s.Table = "table", s.Query = "query", s.Aggregation = "aggregation", s.Function = "function", s))(zi || {}), wV = /* @__PURE__ */ ((s) => (s.Ascending = "asc", s.Descending = "desc", s))(wV || {}), Hl = /* @__PURE__ */ ((s) => (s.Like = "like", s.NotLike = "not-like", s.In = "in", s.Equal = "=", s.Between = "-", s.BiggerThan = ">", s.SmallerThan = "<", s.BiggerThanOrEqualTo = ">=", s.SmallerThanOrEqualTo = "<=", s.NotEqual = "!=", s))(Hl || {}), $t = /* @__PURE__ */ ((s) => (s.String = "string", s.Number = "number", s.Boolean = "boolean", s.Null = "null", s.Date = "date", s.Array = "array", s))($t || {}), ya = /* @__PURE__ */ ((s) => (s.Inner = "inner", s.Left = "left", s.Right = "right", s.Full = "full", s.Cross = "cross", s.Self = "self", s.Natural = "natural", s))(ya || {}), Xr = /* @__PURE__ */ ((s) => (s.Scalar = "SCALAR", s.Aggregate = "AGGREGATE", s.TableValued = "TABLE_VALUED", s))(Xr || {}), Yn = /* @__PURE__ */ ((s) => (s.Upper = "UPPER", s.Lower = "LOWER", s.Max = "MAX", s.Min = "MIN", s.JsonBuildObject = "json_build_object", s.RowToJson = "row_to_json", s.JsonAgg = "json_agg", s.Count = "COUNT", s.GenerateSeries = "generate_series", s.Unnest = "unnest", s.Coalesce = "COALESCE", s.Concat = "CONCAT", s.Sum = "SUM", s.Length = "LENGTH", s.Round = "ROUND", s.Now = "NOW", s))(Yn || {});
+var Ot = /* @__PURE__ */ ((s) => (s.SearchStatement = "search-statement", s.NestedSearchStatement = "nested-search-statement", s.DataSource = "data-source", s.ColumnRef = "column-ref", s.ValueRef = "value-ref", s.LiteralValue = "search-statement-literal-value", s.WhereStatement = "where-statement", s.AggregationStatement = "aggregation-statement", s.SortStatement = "sort-statement", s.AllColumnsSelector = "all-columns-selector", s.FunctionCall = "function-call", s))(Ot || {}), Ji = /* @__PURE__ */ ((s) => (s.Table = "table", s.Query = "query", s.Aggregation = "aggregation", s.Function = "function", s))(Ji || {}), wV = /* @__PURE__ */ ((s) => (s.Ascending = "asc", s.Descending = "desc", s))(wV || {}), Hl = /* @__PURE__ */ ((s) => (s.Like = "like", s.NotLike = "not-like", s.In = "in", s.Equal = "=", s.Between = "-", s.BiggerThan = ">", s.SmallerThan = "<", s.BiggerThanOrEqualTo = ">=", s.SmallerThanOrEqualTo = "<=", s.NotEqual = "!=", s))(Hl || {}), $t = /* @__PURE__ */ ((s) => (s.String = "string", s.Number = "number", s.Boolean = "boolean", s.Null = "null", s.Date = "date", s.Array = "array", s))($t || {}), ya = /* @__PURE__ */ ((s) => (s.Inner = "inner", s.Left = "left", s.Right = "right", s.Full = "full", s.Cross = "cross", s.Self = "self", s.Natural = "natural", s))(ya || {}), Xr = /* @__PURE__ */ ((s) => (s.Scalar = "SCALAR", s.Aggregate = "AGGREGATE", s.TableValued = "TABLE_VALUED", s))(Xr || {}), Yn = /* @__PURE__ */ ((s) => (s.Upper = "UPPER", s.Lower = "LOWER", s.Max = "MAX", s.Min = "MIN", s.JsonBuildObject = "json_build_object", s.RowToJson = "row_to_json", s.JsonAgg = "json_agg", s.Count = "COUNT", s.GenerateSeries = "generate_series", s.Unnest = "unnest", s.Coalesce = "COALESCE", s.Concat = "CONCAT", s.Sum = "SUM", s.Length = "LENGTH", s.Round = "ROUND", s.Now = "NOW", s))(Yn || {});
 const kZi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   AggregationStatementType: ya,
-  DataSourceType: zi,
+  DataSourceType: Ji,
   FunctionNames: Yn,
   SQLFunctionCategory: Xr,
   SearchLiteralValueType: $t,
@@ -159301,7 +159301,7 @@ class dT {
   get columns() {
     var p;
     return (((p = this.dataSource) == null ? void 0 : p.columns) || []).map((i) => {
-      const r = new Ji(this.owner);
+      const r = new Hi(this.owner);
       return r.source = i, r.parent = this.dataSource, r.as = i.as, r;
     });
   }
@@ -159313,7 +159313,7 @@ class dT {
     var p;
     return (((p = this.dataSource) == null ? void 0 : p.selections) || []).map((i) => {
       if (i.type === Ot.ColumnRef) {
-        const r = new Ji(this.owner);
+        const r = new Hi(this.owner);
         return r.source = i, r.parent = i.parent, r.as = i.as, r;
       } else if (i.type === Ot.AllColumnsSelector) {
         const r = new tf(this.owner);
@@ -159325,14 +159325,14 @@ class dT {
   get selectedColumns() {
     var p;
     return (((p = this.dataSource) == null ? void 0 : p.selectedColumns) || []).map((i) => {
-      const r = new Ji(this.owner);
+      const r = new Hi(this.owner);
       return r.source = i, r.parent = i.parent, r.as = i.as, r;
     });
   }
   get primaryKeys() {
     var p;
     return (((p = this.dataSource) == null ? void 0 : p.primaryKeys) || []).map((i) => {
-      const r = new Ji(this.owner);
+      const r = new Hi(this.owner);
       return r.source = i, r.parent = i.parent, r.as = i.as, r;
     });
   }
@@ -159345,7 +159345,7 @@ class dT {
     var i;
     const p = ((i = this.dataSource) == null ? void 0 : i.primaryKey) || null;
     if (p) {
-      const r = new Ji(this.owner);
+      const r = new Hi(this.owner);
       return r.source = p, r.parent = p.parent, r.as = p.as, r;
     }
     return null;
@@ -159512,7 +159512,7 @@ class $q {
   // The goal is to remove all references to that data source in a non-destructive way
   removeDataSource(p) {
     var i, r;
-    this.left instanceof Ji && ((i = this.left.parent) == null ? void 0 : i.id) === (p == null ? void 0 : p.id) && (this.left = null, this.remove()), this.right instanceof Ji && ((r = this.right.parent) == null ? void 0 : r.id) === (p == null ? void 0 : p.id) && (this.right = null, this.remove()), this.and.forEach((a) => {
+    this.left instanceof Hi && ((i = this.left.parent) == null ? void 0 : i.id) === (p == null ? void 0 : p.id) && (this.left = null, this.remove()), this.right instanceof Hi && ((r = this.right.parent) == null ? void 0 : r.id) === (p == null ? void 0 : p.id) && (this.right = null, this.remove()), this.and.forEach((a) => {
       a.removeDataSource(p);
     }), this.or.forEach((a) => {
       a.removeDataSource(p);
@@ -159531,7 +159531,7 @@ class $q {
       let c = "";
       if (this.left instanceof OT)
         c = this.left.toQuery();
-      else if (this.left instanceof Ji) {
+      else if (this.left instanceof Hi) {
         const f = this.left.as;
         c = ((r = this.left.parent) == null ? void 0 : r.as) + "." + f;
       } else
@@ -159539,7 +159539,7 @@ class $q {
       let e = "";
       if (this.right instanceof OT)
         e = this.right.toQuery();
-      else if (this.right instanceof Ji) {
+      else if (this.right instanceof Hi) {
         const f = this.right.as;
         e = ((a = this.right.parent) == null ? void 0 : a.as) + "." + f;
       } else
@@ -159628,7 +159628,7 @@ class DV {
   get columns() {
     var p;
     return (((p = this.statement) == null ? void 0 : p.columns) || []).map((i) => {
-      const r = new Ji(this.owner);
+      const r = new Hi(this.owner);
       return r.source = i, r.parent = i.parent, r.as = i.as, r;
     });
   }
@@ -159640,7 +159640,7 @@ class DV {
     var p;
     return (((p = this.statement) == null ? void 0 : p.selections) || []).map((i) => {
       if (i.type === Ot.ColumnRef) {
-        const r = new Ji(this.owner);
+        const r = new Hi(this.owner);
         return r.source = i, r.parent = i.parent, r.as = i.as, r;
       } else if (i.type === Ot.AllColumnsSelector) {
         const r = new tf(this.owner);
@@ -159652,14 +159652,14 @@ class DV {
   get selectedColumns() {
     var p;
     return (((p = this.statement) == null ? void 0 : p.selectedColumns) || []).map((i) => {
-      const r = new Ji(this.owner);
+      const r = new Hi(this.owner);
       return r.source = i, r.parent = i.parent, r.as = i.as, r;
     });
   }
   get primaryKeys() {
     var p;
     return (((p = this.statement) == null ? void 0 : p.primaryKeys) || []).map((i) => {
-      const r = new Ji(this.owner);
+      const r = new Hi(this.owner);
       return r.source = i, r.parent = i.parent, r.as = i.as, r;
     });
   }
@@ -159672,7 +159672,7 @@ class DV {
     var i;
     const p = ((i = this.statement) == null ? void 0 : i.primaryKey) || null;
     if (p) {
-      const r = new Ji(this.owner);
+      const r = new Hi(this.owner);
       return r.source = p, r.parent = p.parent, r.as = p.as, r;
     }
     return null;
@@ -159690,7 +159690,7 @@ class Xn {
     R(this, "query", null);
     R(this, "aggregation", null);
     R(this, "functionCall", null);
-    R(this, "sourceType", zi.Table);
+    R(this, "sourceType", Ji.Table);
     // Store manual aliases for functions
     R(this, "_asFallback", "");
     this.owner = p;
@@ -159703,59 +159703,61 @@ class Xn {
     return Ot.DataSource;
   }
   get isValid() {
-    return (this.sourceType === zi.Function ? !!this.functionCall && this.functionCall.isValid : !!this.entity || !!this.query || !!this.aggregation) && !!this.as;
+    return (this.sourceType === Ji.Function ? !!this.functionCall && this.functionCall.isValid : !!this.entity || !!this.query || !!this.aggregation) && !!this.as;
   }
   get source() {
-    return this.sourceType === zi.Table ? this.entity : this.sourceType === zi.Query ? this.query : this.sourceType === zi.Aggregation ? this.aggregation : this.sourceType === zi.Function ? this.functionCall : null;
+    return this.sourceType === Ji.Table ? this.entity : this.sourceType === Ji.Query ? this.query : this.sourceType === Ji.Aggregation ? this.aggregation : this.sourceType === Ji.Function ? this.functionCall : null;
   }
   set as(p) {
-    this._asFallback = p, this.sourceType === zi.Query && this.source ? this.source.as = p : this.sourceType === zi.Function && this.functionCall && (this.functionCall.as = p);
+    this._asFallback = p, this.sourceType === Ji.Query && this.source ? this.source.as = p : this.sourceType === Ji.Function && this.functionCall && (this.functionCall.as = p);
   }
   get as() {
     var p, i;
-    return this.sourceType === zi.Function ? this._asFallback || ((p = this.functionCall) == null ? void 0 : p.as) || "FunctionTable" : this.source && (((i = this.source) == null ? void 0 : i.as) || `"${this.source.name ? Wd(this.source.name) : ""}"`) || "";
+    return this.sourceType === Ji.Function ? this._asFallback || ((p = this.functionCall) == null ? void 0 : p.as) || "FunctionTable" : this.source && (((i = this.source) == null ? void 0 : i.as) || `"${this.source.name ? Wd(this.source.name) : ""}"`) || "";
   }
   get columns() {
     var p, i, r;
-    if (this.sourceType === zi.Table)
+    if (this.sourceType === Ji.Table)
       return (this.entity ? mn(this.entity) : []).map((c) => {
-        const e = new Ji(this.owner);
+        const e = new Hi(this.owner);
         return e.source = c, e.parent = this, e.as = rr(c.name), e;
       }) || [];
-    if (this.sourceType === zi.Query) {
+    if (this.sourceType === Ji.Query) {
       const a = [];
       return (p = this.query) == null || p.selections.forEach((c) => {
         var e;
         if (c.type === Ot.ColumnRef) {
-          const f = new Ji(this.owner);
+          const f = new Hi(this.owner);
           f.source = c, f.parent = this, f.as = c.as, a.push(f);
         } else
           c.type === Ot.AllColumnsSelector && ((e = c.parent) == null ? void 0 : e.type) === Ot.DataSource && c.parent.columns.forEach((m) => {
-            const b = new Ji(this.owner);
+            const b = new Hi(this.owner);
             b.source = m, b.parent = this, b.as = m.as, a.push(b);
           });
       }), a;
     } else {
-      if (this.sourceType === zi.Aggregation)
+      if (this.sourceType === Ji.Aggregation)
         return (((r = (i = this.aggregation) == null ? void 0 : i.dataSource) == null ? void 0 : r.columns) || []).map((a) => {
-          const c = new Ji(this.owner);
+          const c = new Hi(this.owner);
           return c.source = a, c.parent = this, c.as = a.as, c;
         });
-      if (this.sourceType === zi.Function) {
-        const a = new Ji(this.owner);
-        return a.parent = this, a.as = this.as, [a];
+      if (this.sourceType === Ji.Function) {
+        const a = new Hi(this.owner);
+        a.parent = this, a.as = "value";
+        const c = new Hi(this.owner);
+        return c.parent = this, c.as = this.as, [a, c];
       }
     }
     return [];
   }
   get selections() {
     var p, i;
-    return this.sourceType === zi.Table ? this.columns : this.sourceType === zi.Query ? ((p = this.query) == null ? void 0 : p.selections) || [] : this.sourceType === zi.Aggregation ? ((i = this.aggregation) == null ? void 0 : i.selections) || [] : [];
+    return this.sourceType === Ji.Table ? this.columns : this.sourceType === Ji.Query ? ((p = this.query) == null ? void 0 : p.selections) || [] : this.sourceType === Ji.Aggregation ? ((i = this.aggregation) == null ? void 0 : i.selections) || [] : [];
   }
   // Resolves the ultimate entity under any change of data sources
   get mainPersistedEntity() {
     var p, i, r;
-    return this.sourceType === zi.Table ? this.entity : this.sourceType === zi.Query ? ((p = this.query) == null ? void 0 : p.mainPersistedEntity) || null : this.sourceType === zi.Aggregation && ((r = (i = this.aggregation) == null ? void 0 : i.dataSource) == null ? void 0 : r.mainPersistedEntity) || null;
+    return this.sourceType === Ji.Table ? this.entity : this.sourceType === Ji.Query ? ((p = this.query) == null ? void 0 : p.mainPersistedEntity) || null : this.sourceType === Ji.Aggregation && ((r = (i = this.aggregation) == null ? void 0 : i.dataSource) == null ? void 0 : r.mainPersistedEntity) || null;
   }
   // Flattens the list of selected columns
   get selectedColumns() {
@@ -159805,7 +159807,7 @@ class Xn {
     return i.length > 0 ? i[0] : null;
   }
 }
-class Ji {
+class Hi {
   constructor(p) {
     R(this, "owner");
     R(this, "source", null);
@@ -159931,7 +159933,7 @@ class Lq {
   // This can be useful to provide entity specific behaviour on the results of a query if it can safely be assumed that the entity is untouched
   get isUntouchedEntity() {
     var r, a;
-    if (!this.isValid || !this.from || !this.mainPersistedEntity || this.from.sourceType === zi.Query && (!this.from.query || !((r = this.from.query.statement) != null && r.isUntouchedEntity)) || this.validSelections.length === 0 || this.aggregations.some((c) => c.isValid))
+    if (!this.isValid || !this.from || !this.mainPersistedEntity || this.from.sourceType === Ji.Query && (!this.from.query || !((r = this.from.query.statement) != null && r.isUntouchedEntity)) || this.validSelections.length === 0 || this.aggregations.some((c) => c.isValid))
       return !1;
     if (this.validSelections.length === 1 && this.validSelections[0].type === Ot.AllColumnsSelector && ((a = this.validSelections[0].parent) == null ? void 0 : a.id) === this.from.id)
       return !0;
@@ -159957,7 +159959,7 @@ class Lq {
     const p = [];
     return this.from && p.push(this.from), this.aggregations.forEach((i) => {
       const r = new Xn(this);
-      r.aggregation = i, r.sourceType = zi.Aggregation;
+      r.aggregation = i, r.sourceType = Ji.Aggregation;
       const a = this.addDataSource(r);
       p.push(a);
     }), p;
@@ -159966,7 +159968,7 @@ class Lq {
     return Ot.SearchStatement;
   }
   get mainPersistedEntity() {
-    return this.from && this.from.sourceType === zi.Table ? this.from.entity : this.from && this.from.sourceType === zi.Query && this.from.query ? this.from.query.mainPersistedEntity : null;
+    return this.from && this.from.sourceType === Ji.Table ? this.from.entity : this.from && this.from.sourceType === Ji.Query && this.from.query ? this.from.query.mainPersistedEntity : null;
   }
   get mainDatabaseEntity() {
     const p = this.mainPersistedEntity;
@@ -160126,14 +160128,14 @@ class Lq {
         m && E < this.validSelections.length - 1 && (p += ", ");
       });
     }
-    if (this.from && this.from.isValid && (p += " FROM ", this.from.sourceType === zi.Table ? this.from.entity && (p += `"${Wd((i = this.from.entity) == null ? void 0 : i.name)}"`) : this.from.sourceType === zi.Function ? (r = this.from.functionCall) != null && r.isValid && (p += `${this.from.functionCall.toQuery()} AS ${this.from.as}`) : (c = (a = this.from) == null ? void 0 : a.query) != null && c.isValid && (p += `(${(f = (e = this.from) == null ? void 0 : e.query) == null ? void 0 : f.toQuery()}) AS ${((h = this.from) == null ? void 0 : h.as) || "NestedQuery"}`), this.aggregations.length > 0 && this.aggregations.forEach((m) => {
+    if (this.from && this.from.isValid && (p += " FROM ", this.from.sourceType === Ji.Table ? this.from.entity && (p += `"${Wd((i = this.from.entity) == null ? void 0 : i.name)}"`) : this.from.sourceType === Ji.Function ? (r = this.from.functionCall) != null && r.isValid && (p += `${this.from.functionCall.toQuery()} AS ${this.from.as}`) : (c = (a = this.from) == null ? void 0 : a.query) != null && c.isValid && (p += `(${(f = (e = this.from) == null ? void 0 : e.query) == null ? void 0 : f.toQuery()}) AS ${((h = this.from) == null ? void 0 : h.as) || "NestedQuery"}`), this.aggregations.length > 0 && this.aggregations.forEach((m) => {
       var E, A, _, P, V, U, M, B, K, re, X, le;
       if (!m.isValid)
         return;
       let b = "";
-      m.joinType === ya.Inner ? b += "INNER JOIN " : m.joinType === ya.Left ? b += "LEFT JOIN " : m.joinType === ya.Right ? b += "RIGHT JOIN " : m.joinType === ya.Full ? b += "FULL JOIN " : m.joinType === ya.Cross ? b += "CROSS JOIN " : m.joinType === ya.Self ? b += "SELF JOIN " : m.joinType === ya.Natural && (b += "NATURAL JOIN "), ((E = m.dataSource) == null ? void 0 : E.sourceType) === zi.Table ? (A = m.dataSource) != null && A.entity && (b += `"${Wd(
+      m.joinType === ya.Inner ? b += "INNER JOIN " : m.joinType === ya.Left ? b += "LEFT JOIN " : m.joinType === ya.Right ? b += "RIGHT JOIN " : m.joinType === ya.Full ? b += "FULL JOIN " : m.joinType === ya.Cross ? b += "CROSS JOIN " : m.joinType === ya.Self ? b += "SELF JOIN " : m.joinType === ya.Natural && (b += "NATURAL JOIN "), ((E = m.dataSource) == null ? void 0 : E.sourceType) === Ji.Table ? (A = m.dataSource) != null && A.entity && (b += `"${Wd(
         (P = (_ = m.dataSource) == null ? void 0 : _.entity) == null ? void 0 : P.name
-      )}"`) : ((V = m.dataSource) == null ? void 0 : V.sourceType) === zi.Function ? b += `${(M = (U = m.dataSource) == null ? void 0 : U.functionCall) == null ? void 0 : M.toQuery()} AS ${(B = m.dataSource) == null ? void 0 : B.as}` : b += `(${(re = (K = m.dataSource) == null ? void 0 : K.query) == null ? void 0 : re.toQuery()}) AS ${(X = m.dataSource) == null ? void 0 : X.as}`, b += m.on ? " ON " + ((le = m.on) == null ? void 0 : le.toQuery()) : "", p += " " + b;
+      )}"`) : ((V = m.dataSource) == null ? void 0 : V.sourceType) === Ji.Function ? b += `${(M = (U = m.dataSource) == null ? void 0 : U.functionCall) == null ? void 0 : M.toQuery()} AS ${(B = m.dataSource) == null ? void 0 : B.as}` : b += `(${(re = (K = m.dataSource) == null ? void 0 : K.query) == null ? void 0 : re.toQuery()}) AS ${(X = m.dataSource) == null ? void 0 : X.as}`, b += m.on ? " ON " + ((le = m.on) == null ? void 0 : le.toQuery()) : "", p += " " + b;
     })), this.where && this.where.isValid && this.from && this.from.isValid && (p += " WHERE " + this.where.toQuery()), this.validSortings.length > 0) {
       const m = this.validSortings.sort((E, A) => E.index - A.index);
       let b = "";
@@ -160293,7 +160295,7 @@ const FZi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty(
   __proto__: null,
   AggregationStatement: dT,
   AllColumnsSelector: tf,
-  ColumnRef: Ji,
+  ColumnRef: Hi,
   DataSource: Xn,
   FunctionCall: OT,
   NestedSearchStatement: DV,
@@ -160730,7 +160732,7 @@ function Qo(s, p, i, r, a = !1) {
         (Q) => Nt(Q.as) === Nt(ae.text)
       );
       if (H) {
-        c.left = new Ji(i), c.left.source = H.source, c.left.as = Nt(H.as);
+        c.left = new Hi(i), c.left.source = H.source, c.left.as = Nt(H.as);
         const Q = new Xn(i);
         Q.entity = ((e = H.parent) == null ? void 0 : e.entity) || null, Q.query = ((f = H.parent) == null ? void 0 : f.query) || null, Q.aggregation = ((h = H.parent) == null ? void 0 : h.aggregation) || null, Q.sourceType = ((m = H.parent) == null ? void 0 : m.sourceType) || null;
         const pe = i.addDataSource(Q);
@@ -160753,7 +160755,7 @@ function Qo(s, p, i, r, a = !1) {
       if (a)
         debugger;
       if (Q) {
-        c.left = new Ji(i), c.left.source = Q, c.left.as = Nt(Q.as);
+        c.left = new Hi(i), c.left.source = Q, c.left.as = Nt(Q.as);
         const pe = new Xn(i);
         pe.entity = ((b = Q.parent) == null ? void 0 : b.entity) || null, pe.query = ((E = Q.parent) == null ? void 0 : E.query) || null, pe.aggregation = ((A = Q.parent) == null ? void 0 : A.aggregation) || null, pe.sourceType = ((_ = Q.parent) == null ? void 0 : _.sourceType) || null;
         const se = i.addDataSource(pe);
@@ -160825,7 +160827,7 @@ function Qo(s, p, i, r, a = !1) {
         (Q) => Nt(Q.as) === Nt(ue.text)
       );
       if (H) {
-        c.right = new Ji(i), c.right.source = H, c.right.as = Nt(H.as);
+        c.right = new Hi(i), c.right.source = H, c.right.as = Nt(H.as);
         const Q = new Xn(i);
         Q.entity = ((P = H.parent) == null ? void 0 : P.entity) || null, Q.query = ((V = H.parent) == null ? void 0 : V.query) || null, Q.aggregation = ((U = H.parent) == null ? void 0 : U.aggregation) || null, Q.sourceType = ((M = H.parent) == null ? void 0 : M.sourceType) || null;
         const pe = i.addDataSource(Q);
@@ -160848,7 +160850,7 @@ function Qo(s, p, i, r, a = !1) {
       if (a)
         debugger;
       if (Q) {
-        c.right = new Ji(i), c.right.source = Q, c.right.as = Nt(Q.as);
+        c.right = new Hi(i), c.right.source = Q, c.right.as = Nt(Q.as);
         const pe = new Xn(i);
         pe.entity = ((B = Q.parent) == null ? void 0 : B.entity) || null, pe.query = ((K = Q.parent) == null ? void 0 : K.query) || null, pe.aggregation = ((re = Q.parent) == null ? void 0 : re.aggregation) || null, pe.sourceType = ((X = Q.parent) == null ? void 0 : X.sourceType) || null;
         const se = i.addDataSource(pe);
@@ -160996,7 +160998,7 @@ function Wq(s, p, i, r) {
       (P) => Nt(P.as) === A
     );
     if (_) {
-      const P = new Ji(i);
+      const P = new Hi(i);
       P.source = _, P.as = A;
       const V = new Xn(i);
       return V.entity = ((a = _.parent) == null ? void 0 : a.entity) || null, V.query = ((c = _.parent) == null ? void 0 : c.query) || null, V.aggregation = ((e = _.parent) == null ? void 0 : e.aggregation) || null, V.sourceType = ((f = _.parent) == null ? void 0 : f.sourceType) || null, P.parent = i.addDataSource(V), P;
@@ -161007,7 +161009,7 @@ function Wq(s, p, i, r) {
       (P) => Nt(P.as) === A
     );
     if (_) {
-      const P = new Ji(i);
+      const P = new Hi(i);
       P.source = _, P.as = A;
       const V = new Xn(i);
       return V.entity = ((h = _.parent) == null ? void 0 : h.entity) || null, V.query = ((m = _.parent) == null ? void 0 : m.query) || null, V.aggregation = ((b = _.parent) == null ? void 0 : b.aggregation) || null, V.sourceType = ((E = _.parent) == null ? void 0 : E.sourceType) || null, P.parent = i.addDataSource(V), P;
@@ -161067,7 +161069,7 @@ function PV(s, p, i, r, a, c = {
       debugger;
     if (s.right.expr.type === "func_call") {
       const K = new Xn(r);
-      K.sourceType = zi.Function, K.as = Nt(
+      K.sourceType = Ji.Function, K.as = Nt(
         s.right.alias.text
       );
       const re = Qd(
@@ -161103,7 +161105,7 @@ function PV(s, p, i, r, a, c = {
       );
       f.push(...X.errors), re.statement = X.state;
       const le = new Xn(r);
-      le.query = re, le.sourceType = zi.Query;
+      le.query = re, le.sourceType = Ji.Query;
       const te = ((U = X.state) == null ? void 0 : U.columns.map((Q) => {
         const pe = _.find(
           (se) => se.from === Nt(Q.as)
@@ -161151,7 +161153,7 @@ function PV(s, p, i, r, a, c = {
             column: ae
           };
         });
-        m.push(...X), re.entity = K.entity, re.sourceType = zi.Table;
+        m.push(...X), re.entity = K.entity, re.sourceType = Ji.Table;
         const le = new dT(
           r
         ), te = uT(
@@ -161192,7 +161194,7 @@ function PV(s, p, i, r, a, c = {
           column: ae
         };
       });
-      m.push(...X), re.entity = K.entity, re.sourceType = zi.Table;
+      m.push(...X), re.entity = K.entity, re.sourceType = Ji.Table;
       const le = new dT(
         r
       ), te = uT(
@@ -161268,29 +161270,29 @@ function zq(s, p, i, r = !1) {
             if (E) {
               const A = new ld(p);
               A.inputMap = E;
-              const _ = new Ji(p);
+              const _ = new Hi(p);
               _.source = A, _.as = e.alias.text, f.push(_);
             }
           } else {
             const b = new pr(p);
             G(h.value).isValid() ? (b.value = new Date(h.value), b.valueType = $t.Date) : (b.value = h.value, b.valueType = $t.String);
-            const E = new Ji(p);
+            const E = new Hi(p);
             E.source = b, E.as = e.alias.text, f.push(E);
           }
         else if (h.type === "number_literal") {
           const m = new pr(p);
           m.value = h.value, m.valueType = $t.Number;
-          const b = new Ji(p);
+          const b = new Hi(p);
           b.source = m, b.as = e.alias.text, f.push(b);
         } else if (h.type === "boolean_literal") {
           const m = new pr(p);
           m.value = h.value, m.valueType = $t.Boolean;
-          const b = new Ji(p);
+          const b = new Hi(p);
           b.source = m, b.as = e.alias.text, f.push(b);
         } else if (h.type === "null_literal") {
           const m = new pr(p);
           m.value = h.value, m.valueType = $t.Null;
-          const b = new Ji(p);
+          const b = new Hi(p);
           b.source = m, b.as = e.alias.text, f.push(b);
         }
       } else if (e.type === "func_call") {
@@ -161309,29 +161311,29 @@ function zq(s, p, i, r = !1) {
           if (b) {
             const E = new ld(p);
             E.inputMap = b;
-            const A = new Ji(p);
+            const A = new Hi(p);
             A.source = E, A.as = e.value.toString(), f.push(A);
           }
         } else {
           const m = new pr(p);
           G(e.value).isValid() ? (m.value = new Date(e.value), m.valueType = $t.Date) : (m.value = e.value, m.valueType = $t.String);
-          const b = new Ji(p);
+          const b = new Hi(p);
           b.source = m, b.as = e.value.toString(), f.push(b);
         }
       else if (e.type === "number_literal") {
         const h = new pr(p);
         h.value = e.value, h.valueType = $t.Number;
-        const m = new Ji(p);
+        const m = new Hi(p);
         m.source = h, m.as = e.value.toString(), f.push(m);
       } else if (e.type === "boolean_literal") {
         const h = new pr(p);
         h.value = e.value, h.valueType = $t.Boolean;
-        const m = new Ji(p);
+        const m = new Hi(p);
         m.source = h, m.as = "boolean", f.push(m);
       } else if (e.type === "null_literal") {
         const h = new pr(p);
         h.value = e.value, h.valueType = $t.Null;
-        const m = new Ji(p);
+        const m = new Hi(p);
         m.source = h, m.as = "empty", f.push(m);
       }
       return f;
@@ -161424,7 +161426,7 @@ function kc(s, p, i = null, r = !1) {
   );
   if (CV(p).forEach((Q) => {
     const pe = new Xn(c);
-    pe.entity = Q, pe.sourceType = zi.Table, pe.as = Q.name, c.addDataSource(pe);
+    pe.entity = Q, pe.sourceType = Ji.Table, pe.as = Q.name, c.addDataSource(pe);
   }), !s)
     return {
       state: c,
@@ -161467,7 +161469,7 @@ function kc(s, p, i = null, r = !1) {
       });
     else {
       const se = new Xn(c);
-      se.sourceType = zi.Table, se.entity = pe, c.from = c.addDataSource(se);
+      se.sourceType = Ji.Table, se.entity = pe, c.from = c.addDataSource(se);
     }
   } else if ((h == null ? void 0 : h.type) === "query") {
     const Q = new DV(c);
@@ -161478,12 +161480,12 @@ function kc(s, p, i = null, r = !1) {
     );
     a.push(...pe.errors), Q.statement = pe.state;
     const se = new Xn(c);
-    se.sourceType = zi.Query, se.query = Q;
+    se.sourceType = Ji.Query, se.query = Q;
     const me = c.addDataSource(se);
     c.from = me;
   } else if ((h == null ? void 0 : h.type) === "function") {
     const Q = new Xn(c);
-    Q.sourceType = zi.Function, Q.as = h.as || "FuncTable";
+    Q.sourceType = Ji.Function, Q.as = h.as || "FuncTable";
     const pe = Qd(
       h.functionCall,
       c.columns,
@@ -161549,7 +161551,7 @@ function kc(s, p, i = null, r = !1) {
   ) === pe);
   P.forEach((Q) => {
     var me, ve, De, Re, xe, Ue, Se;
-    const pe = new Ji(c), se = (((me = c.from) == null ? void 0 : me.columns) || []).find(
+    const pe = new Hi(c), se = (((me = c.from) == null ? void 0 : me.columns) || []).find(
       (Qe) => Qe.as === Q.from
     );
     if (se) {
@@ -161566,10 +161568,10 @@ function kc(s, p, i = null, r = !1) {
       for (let De = 0; De < ve.columns.length; De++) {
         const Re = ve.columns[De];
         if (Nt(Re.as) === Q.from) {
-          const xe = new Ji(c);
+          const xe = new Hi(c);
           xe.source = Re, xe.as = Nt(Q.to);
           const Ue = new Xn(c);
-          Ue.sourceType = zi.Aggregation, Ue.aggregation = ve;
+          Ue.sourceType = Ji.Aggregation, Ue.aggregation = ve;
           const Se = c.addDataSource(Ue);
           xe.parent = Se, Ue.functionCall = ((pe = ve.dataSource) == null ? void 0 : pe.functionCall) || null, Ue.as = ((se = ve.dataSource) == null ? void 0 : se.as) || "", c.addSelection(xe);
           return;