@entity-access/entity-access 1.0.251 → 1.0.253

package/.vscode/launch.json

@@ -32,7 +32,8 @@
             "args": [
                 "--test-file",
                 // "./dist/tests/eternity/eternity-tests.js"
-                "${file}"
+                "${file}",
+                "--test-only-postgres"
             ],
             "outFiles": [
                 "${workspaceFolder}/dist/**/*.js"

package/dist/common/symbols/symbols.d.ts

@@ -1,4 +1,5 @@
 export declare const modelSymbol: unique symbol;
 export declare const contextSymbol: unique symbol;
 export declare const arrayParameterFragmentSymbol: unique symbol;
+export declare const entityTypeSymbol: unique symbol;
 //# sourceMappingURL=symbols.d.ts.map

package/dist/common/symbols/symbols.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"symbols.d.ts","sourceRoot":"","sources":["../../../src/common/symbols/symbols.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,eAAkB,CAAC;AAC3C,eAAO,MAAM,aAAa,eAAoB,CAAC;AAC/C,eAAO,MAAM,4BAA4B,eAAmC,CAAC"}
+{"version":3,"file":"symbols.d.ts","sourceRoot":"","sources":["../../../src/common/symbols/symbols.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,eAAkB,CAAC;AAC3C,eAAO,MAAM,aAAa,eAAoB,CAAC;AAC/C,eAAO,MAAM,4BAA4B,eAAmC,CAAC;AAC7E,eAAO,MAAM,gBAAgB,eAAuB,CAAC"}

package/dist/common/symbols/symbols.js

@@ -1,4 +1,5 @@
 export const modelSymbol = Symbol("model");
 export const contextSymbol = Symbol("context");
 export const arrayParameterFragmentSymbol = Symbol("arrayParameterFragment");
+export const entityTypeSymbol = Symbol("entityType");
 //# sourceMappingURL=symbols.js.map

package/dist/common/symbols/symbols.js.map

@@ -1 +1 @@
-{"version":3,"file":"symbols.js","sourceRoot":"","sources":["../../../src/common/symbols/symbols.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;AAC3C,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAC/C,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"symbols.js","sourceRoot":"","sources":["../../../src/common/symbols/symbols.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;AAC3C,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAC/C,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAC7E,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC"}

package/dist/compiler/QueryCompiler.d.ts

@@ -24,9 +24,9 @@ export default class QueryCompiler {
         values: any[];
     };
     compile(source: EntityQuery, fx: (p: any) => (x: any) => any): {
-        params: ParameterExpression[];
-        target: ParameterExpression;
-        body: Expression;
+        params: any;
+        target: any;
+        body: any;
     };
     compileToSql(source: EntityQuery, fx: (p: any) => (x: any) => any): CompiledQuery;
     compileExpression(source: EntityQuery, exp: Expression): {

package/dist/decorators/ForeignKey.d.ts

@@ -1,9 +1,10 @@
 import type { IClassOf } from "./IClassOf.js";
-export default function ForeignKey<T, TRelated>({ key: name, related: c, relatedProperty: inv, relatedKey: invKey, dotNotCreateIndex }: {
-    key: (item: T) => any;
-    related: IClassOf<TRelated>;
-    relatedProperty: (item: TRelated) => any;
-    relatedKey?: (item: TRelated) => any;
-    dotNotCreateIndex?: boolean;
-}): (target: T, key: string) => any;
+export default function MultiForeignKeys<T, TRelated>(relatedEntityType: IClassOf<TRelated>, { inverseProperty, foreignKeys, doNotCreateIndex }: {
+    inverseProperty: (x: TRelated) => T[];
+    foreignKeys: {
+        foreignKey: (x: T) => any;
+        key: (x: TRelated) => any;
+    }[];
+    doNotCreateIndex?: boolean;
+}): (target: T, name: string) => void;
 //# sourceMappingURL=ForeignKey.d.ts.map

package/dist/decorators/ForeignKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ForeignKey.d.ts","sourceRoot":"","sources":["../../src/decorators/ForeignKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAK9C,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,CAAC,EAAE,QAAQ,EAC1C,EACI,GAAG,EAAE,IAAI,EACT,OAAO,EAAE,CAAC,EACV,eAAe,EAAE,GAAG,EACpB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EACpB,EAAG;IAEI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,GAAG,CAAC;IAEtB,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE5B,eAAe,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC;IAEzC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B,YAGW,CAAC,OAAO,MAAM,KAAG,GAAG,CAgBvC"}
+{"version":3,"file":"ForeignKey.d.ts","sourceRoot":"","sources":["../../src/decorators/ForeignKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAK9C,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,CAAC,EAAE,QAAQ,EAChD,iBAAiB,EAAE,QAAQ,CAAC,QAAQ,CAAC,EACrC,EACI,eAAe,EACf,WAAW,EACX,gBAAgB,EACnB,EAAE;IACC,eAAe,EAAE,CAAC,CAAC,EAAE,QAAQ,KAAK,CAAC,EAAE,CAAC;IACtC,WAAW,EAAE;QAAE,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC;QAAC,GAAG,EAAE,CAAC,CAAC,EAAE,QAAQ,KAAK,GAAG,CAAA;KAAE,EAAE,CAAC;IACxE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC7B,YAEe,CAAC,QAAQ,MAAM,UAuBlC"}

package/dist/decorators/ForeignKey.js

@@ -1,18 +1,53 @@
 import SchemaRegistry from "./SchemaRegistry.js";
 import NameParser from "./parser/NameParser.js";
-export default function ForeignKey({ key: name, related: c, relatedProperty: inv, relatedKey: invKey, dotNotCreateIndex }) {
-    return (target, key) => {
+export default function MultiForeignKeys(relatedEntityType, { inverseProperty, foreignKeys, doNotCreateIndex }) {
+    return (target, name) => {
         const cn = target.constructor ?? target;
         const type = SchemaRegistry.model(cn);
+        const fkMap = [];
+        const relatedType = SchemaRegistry.model(relatedEntityType);
+        for (const { foreignKey, key } of foreignKeys) {
+            const fkColumn = type.getColumn(NameParser.parseMember(foreignKey));
+            const relatedKeyColumn = relatedType.getColumn(NameParser.parseMember(key));
+            fkMap.push({ fkColumn, relatedKeyColumn });
+        }
         type.addRelation({
             type,
-            name: key,
-            foreignKey: NameParser.parseMember(name),
-            relatedTypeClass: c,
-            relatedName: NameParser.parseMember(inv),
-            relatedKey: invKey ? NameParser.parseMember(invKey) : void 0,
-            dotNotCreateIndex
+            name,
+            fkMap,
+            relatedTypeClass: relatedEntityType,
+            relatedName: NameParser.parseMember(inverseProperty),
+            doNotCreateIndex
         });
     };
 }
+// export default function ForeignKey<T, TRelated>(
+//     {
+//         key: name,
+//         related: c,
+//         relatedProperty: inv,
+//         relatedKey: invKey,
+//         dotNotCreateIndex
+//     } : {
+//             key: (item: T) => any,
+//             related: IClassOf<TRelated>,
+//             relatedProperty: (item: TRelated) => any,
+//             relatedKey?: (item: TRelated) => any,
+//             dotNotCreateIndex?: boolean,
+//         }
+//     ) {
+//     return (target: T, key: string): any => {
+//         const cn = target.constructor ?? target;
+//         const type = SchemaRegistry.model(cn);
+//         type.addRelation({
+//             type,
+//             name: key,
+//             foreignKey: NameParser.parseMember(name),
+//             relatedTypeClass: c,
+//             relatedName: NameParser.parseMember(inv),
+//             relatedKey: invKey ? NameParser.parseMember(invKey) : void 0,
+//             dotNotCreateIndex
+//         });
+//     };
+// }
 //# sourceMappingURL=ForeignKey.js.map

package/dist/decorators/ForeignKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"ForeignKey.js","sourceRoot":"","sources":["../../src/decorators/ForeignKey.ts"],"names":[],"mappings":"AACA,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAGhD,MAAM,CAAC,OAAO,UAAU,UAAU,CAC9B,EACI,GAAG,EAAE,IAAI,EACT,OAAO,EAAE,CAAC,EACV,eAAe,EAAE,GAAG,EACpB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAWhB;IAGL,OAAO,CAAC,MAAS,EAAE,GAAW,EAAO,EAAE;QAEnC,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC;QACxC,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,CAAC,WAAW,CAAC;YACb,IAAI;YACJ,IAAI,EAAE,GAAG;YACT,UAAU,EAAE,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC;YACxC,gBAAgB,EAAE,CAAC;YACnB,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC;YACxC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC5D,iBAAiB;SACpB,CAAC,CAAC;IAEP,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"ForeignKey.js","sourceRoot":"","sources":["../../src/decorators/ForeignKey.ts"],"names":[],"mappings":"AAEA,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAEhD,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACpC,iBAAqC,EACrC,EACI,eAAe,EACf,WAAW,EACX,gBAAgB,EAKnB;IAED,OAAO,CAAC,MAAS,EAAE,IAAY,EAAE,EAAE;QAC/B,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC;QACxC,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEtC,MAAM,KAAK,GAAG,EAAc,CAAC;QAE7B,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAE5D,KAAK,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,WAAW,EAAE,CAAC;YAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;YACpE,MAAM,gBAAgB,GAAG,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5E,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,WAAW,CAAC;YACb,IAAI;YACJ,IAAI;YACJ,KAAK;YACL,gBAAgB,EAAE,iBAAiB;YACnC,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,eAAe,CAAC;YACpD,gBAAgB;SACnB,CAAC,CAAC;IACP,CAAC,CAAC;AACN,CAAC;AAGD,mDAAmD;AACnD,QAAQ;AACR,qBAAqB;AACrB,sBAAsB;AACtB,gCAAgC;AAChC,8BAA8B;AAC9B,4BAA4B;AAC5B,YAAY;AAEZ,qCAAqC;AAErC,2CAA2C;AAE3C,wDAAwD;AAExD,oDAAoD;AACpD,2CAA2C;AAC3C,YAAY;AAEZ,UAAU;AACV,gDAAgD;AAEhD,mDAAmD;AACnD,iDAAiD;AAEjD,6BAA6B;AAC7B,oBAAoB;AACpB,yBAAyB;AACzB,wDAAwD;AACxD,mCAAmC;AACnC,wDAAwD;AACxD,4EAA4E;AAC5E,gCAAgC;AAChC,cAAc;AAEd,SAAS;AACT,IAAI"}

package/dist/decorators/IColumn.d.ts

@@ -2,6 +2,10 @@ import EntityType from "../entity-query/EntityType.js";
 import { IClassOf } from "./IClassOf.js";
 import { IForeignKeyConstraint } from "./IForeignKeyConstraint.js";
 import { ISqlType } from "./ISqlType.js";
+export type FKType = {
+    fkColumn: IColumn;
+    relatedKeyColumn: IColumn;
+};
 export interface IColumn {
     name?: string;
     columnName?: string;
@@ -65,15 +69,14 @@ export interface IEntityRelation {
     isInverseRelation?: boolean;
     isCollection?: boolean;
     singleInverseRelation?: any;
-    foreignKey: string;
     relatedTypeClass: IClassOf<any>;
     relatedTypeClassFactory?: () => IClassOf<any>;
-    fkColumn?: IColumn;
+    fkMap: FKType[];
     relatedName: string;
     relatedKey?: string;
     relatedEntity?: EntityType;
     relatedRelation?: IEntityRelation;
-    dotNotCreateIndex?: boolean;
+    doNotCreateIndex?: boolean;
     foreignKeyConstraint?: IForeignKeyConstraint;
 }
 //# sourceMappingURL=IColumn.d.ts.map

package/dist/decorators/IColumn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IColumn.d.ts","sourceRoot":"","sources":["../../src/decorators/IColumn.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,MAAM,WAAW,OAAO;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;OAGG;IACH,UAAU,CAAC,EAAE,YAAY,GAAG,WAAW,CAAC;IACxC,SAAS,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;IACpC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAEzB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,GAAG,MAAM,CAAE;IAEhC;;OAEG;IACH,UAAU,CAAC,EAAE,eAAe,CAAC;IAE7B,QAAQ,CAAC,EAAE,GAAG,CAAC;IAEf,MAAM,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAE5B,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,qBAAqB,CAAC,MAAA;IAGtB,UAAU,EAAE,MAAM,CAAC;IAEnB,gBAAgB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEhC,uBAAuB,CAAC,EAAE,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;IAE9C,QAAQ,CAAC,EAAE,OAAO,CAAC;IAGnB,WAAW,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IAGpB,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAEhD"}
+{"version":3,"file":"IColumn.d.ts","sourceRoot":"","sources":["../../src/decorators/IColumn.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,MAAM,MAAM,MAAM,GAAG;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtE,MAAM,WAAW,OAAO;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;OAGG;IACH,UAAU,CAAC,EAAE,YAAY,GAAG,WAAW,CAAC;IACxC,SAAS,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;IACpC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAEzB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,GAAG,MAAM,CAAE;IAEhC;;OAEG;IACH,UAAU,CAAC,EAAE,eAAe,CAAC;IAE7B,QAAQ,CAAC,EAAE,GAAG,CAAC;IAEf,MAAM,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAE5B,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,qBAAqB,CAAC,MAAA;IAKtB,gBAAgB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEhC,uBAAuB,CAAC,EAAE,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;IAE9C,KAAK,EAAE,MAAM,EAAE,CAAC;IAGhB,WAAW,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IAGpB,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAEhD"}

package/dist/decorators/Relate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Relate.d.ts","sourceRoot":"","sources":["../../src/decorators/Relate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAKnE,MAAM,WAAW,YAAY,CAAC,CAAC,EAAE,QAAQ;IACrC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,QAAQ,CAAC;IAChC,eAAe,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,EAAE,CAAC;IACzC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAChD;AAED,MAAM,WAAW,eAAe,CAAC,CAAC,EAAE,QAAQ;IACxC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,QAAQ,CAAC;IAChC,eAAe,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAChD;AAED,MAAM,WAAW,oBAAoB,CAAC,CAAC,EAAE,QAAQ;IAC7C,IAAI,EAAE,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/B,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,QAAQ,CAAC;IAChC,eAAe,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,EAAE,CAAC;IACzC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAChD;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,EAAE,QAAQ;IAChD,IAAI,EAAE,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/B,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,QAAQ,CAAC;IAChC,eAAe,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAChD;AACD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,oBAAoB,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;AAC7G,wBAAgB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;AAmC5H,wBAAgB,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,uBAAuB,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;AACnH,wBAAgB,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC"}
+{"version":3,"file":"Relate.d.ts","sourceRoot":"","sources":["../../src/decorators/Relate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAKnE,MAAM,WAAW,YAAY,CAAC,CAAC,EAAE,QAAQ;IACrC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,QAAQ,CAAC;IAChC,eAAe,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,EAAE,CAAC;IACzC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAChD;AAED,MAAM,WAAW,eAAe,CAAC,CAAC,EAAE,QAAQ;IACxC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,QAAQ,CAAC;IAChC,eAAe,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAChD;AAED,MAAM,WAAW,oBAAoB,CAAC,CAAC,EAAE,QAAQ;IAC7C,IAAI,EAAE,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/B,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,QAAQ,CAAC;IAChC,eAAe,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,EAAE,CAAC;IACzC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAChD;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,EAAE,QAAQ;IAChD,IAAI,EAAE,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/B,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,QAAQ,CAAC;IAChC,eAAe,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,oBAAoB,CAAC,EAAE,qBAAqB,CAAC;CAChD;AACD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,oBAAoB,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;AAC7G,wBAAgB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;AAoC5H,wBAAgB,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,uBAAuB,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;AACnH,wBAAgB,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC"}

package/dist/decorators/Relate.js

@@ -9,20 +9,21 @@ export function RelateTo(c, p) {
         }
     }
     const { property, inverseKey: invKey, inverseProperty, dotNotCreateIndex, foreignKeyConstraint } = p;
-    return (target, foreignKey) => {
+    return (target, fkName) => {
         const cn = target.constructor ?? target;
         const entityType = SchemaRegistry.model(cn);
         const name = NameParser.parseMember(property);
         entityType.addRelation({
             type: entityType,
             name,
-            foreignKey,
+            fkName,
+            fkMap: null,
             relatedTypeClass: c,
             relatedTypeClassFactory: p.type,
             relatedName: NameParser.parseMember(inverseProperty),
             relatedKey: invKey ? NameParser.parseMember(invKey) : void 0,
             foreignKeyConstraint,
-            dotNotCreateIndex
+            doNotCreateIndex: dotNotCreateIndex
         });
     };
 }
@@ -35,19 +36,20 @@ export function RelateToOne(c, p) {
         }
     }
     const { property, inverseKey: invKey, inverseProperty, dotNotCreateIndex } = p;
-    return (target, foreignKey) => {
+    return (target, fkName) => {
         const cn = target.constructor ?? target;
         const entityType = SchemaRegistry.model(cn);
         const name = NameParser.parseMember(property);
         entityType.addRelation({
             type: entityType,
             name,
-            foreignKey,
+            fkName,
+            fkMap: null,
             relatedTypeClass: c,
             relatedTypeClassFactory: p.type,
             relatedName: NameParser.parseMember(inverseProperty),
             relatedKey: invKey ? NameParser.parseMember(invKey) : void 0,
-            dotNotCreateIndex,
+            doNotCreateIndex: dotNotCreateIndex,
             singleInverseRelation: true
         });
     };

package/dist/decorators/Relate.js.map

@@ -1 +1 @@
-{"version":3,"file":"Relate.js","sourceRoot":"","sources":["../../src/decorators/Relate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Relate.js","sourceRoot":"","sources":["../../src/decorators/Relate.ts"],"names":[],"mappings":"AAEA,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAsChD,MAAM,UAAU,QAAQ,CAAC,CAAC,EAAE,CAAE;IAE1B,IAAI,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;QACf,CAAC,GAAG,CAAC,CAAC;QACN,kBAAkB;QAClB,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;YACT,CAAC,GAAG,KAAK,CAAC,CAAC;QACf,CAAC;IACL,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,GAAG,CAAC,CAAC;IAErG,OAAO,CAAC,MAAW,EAAE,MAAc,EAAO,EAAE;QAExC,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC;QACxC,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAE5C,MAAM,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE9C,UAAU,CAAC,WAAW,CAAC;YACnB,IAAI,EAAE,UAAU;YAChB,IAAI;YACJ,MAAM;YACN,KAAK,EAAE,IAAI;YACX,gBAAgB,EAAE,CAAC;YACnB,uBAAuB,EAAE,CAAC,CAAC,IAAI;YAC/B,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,eAAe,CAAC;YACpD,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC5D,oBAAoB;YACpB,gBAAgB,EAAE,iBAAiB;SACtC,CAAC,CAAC;IAEP,CAAC,CAAC;AACN,CAAC;AAID,MAAM,UAAU,WAAW,CAAC,CAAC,EAAE,CAAE;IAE7B,IAAI,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;QACf,CAAC,GAAG,CAAC,CAAC;QACN,kBAAkB;QAClB,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;YACT,CAAC,GAAG,KAAK,CAAC,CAAC;QACf,CAAC;IACL,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,CAAC,CAAC;IAE/E,OAAO,CAAC,MAAW,EAAE,MAAc,EAAO,EAAE;QAExC,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC;QACxC,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAE5C,MAAM,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE9C,UAAU,CAAC,WAAW,CAAC;YACnB,IAAI,EAAE,UAAU;YAChB,IAAI;YACJ,MAAM;YACN,KAAK,EAAC,IAAI;YACV,gBAAgB,EAAE,CAAC;YACnB,uBAAuB,EAAE,CAAC,CAAC,IAAI;YAC/B,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,eAAe,CAAC;YACpD,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC5D,gBAAgB,EAAE,iBAAiB;YACnC,qBAAqB,EAAE,IAAI;SAC9B,CAAC,CAAC;IAEP,CAAC,CAAC;AACN,CAAC;AAED,kEAAkE;AAClE,QAAQ;AACR,sFAAsF;AACtF,WAAW;AAEX,2CAA2C;AAC3C,kDAAkD;AAElD,gDAAgD;AAChD,uCAAuC;AACvC,QAAQ;AAER,MAAM;AACN,gDAAgD;AAEhD,mDAAmD;AACnD,iDAAiD;AAEjD,uCAAuC;AACvC,oBAAoB;AACpB,kDAAkD;AAClD,+BAA+B;AAC/B,mCAAmC;AACnC,wDAAwD;AACxD,4EAA4E;AAC5E,iCAAiC;AACjC,0CAA0C;AAC1C,cAAc;AACd,SAAS;AACT,IAAI"}

package/dist/entity-query/EntityType.d.ts

@@ -36,7 +36,11 @@ export default class EntityType {
     getColumn(name: string): IColumn;
     getField(name: string): IColumn;
     getFieldMap(p: ParameterExpression): ExpressionAs[];
-    addRelation(relation: IEntityRelation, getInverseModel?: (t: any) => EntityType): IEntityRelation;
+    addRelation(relation: IEntityRelation & {
+        fkName?: string;
+    }, getInverseModel?: (t: any) => EntityType): IEntityRelation & {
+        fkName?: string;
+    };
     selectAllFields(): {
         type: "SelectStatement";
         preferLeftJoins: boolean;

package/dist/entity-query/EntityType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityType.d.ts","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAIrD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAiB,mBAAmB,EAAmB,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE1I,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,eAAO,MAAM,uBAAuB,eAA8B,CAAC;AACnE,eAAO,MAAM,eAAe,eAA8B,CAAC;AAE3D,MAAM,WAAW,eAAe;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC9B;AAGD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAE3B,SAAgB,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEzC,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,WAAW,EAAE,MAAM,CAAC;IACpC,SAAgB,UAAU,EAAE,MAAM,CAAC;IAGnC,SAAgB,OAAO,EAAE,OAAO,EAAE,CAAM;IAExC,SAAgB,SAAS,EAAE,eAAe,EAAE,CAAM;IAElD,SAAgB,OAAO,EAAE,MAAM,EAAE,CAAM;IAEvC,SAAgB,IAAI,EAAE,OAAO,EAAE,CAAM;IAErC,SAAgB,OAAO,EAAE,OAAO,EAAE,CAAM;IAExC,IACW,kBAAkB,oEAO5B;IAED,OAAO,CAAC,QAAQ,CAAmC;IACnD,OAAO,CAAC,SAAS,CAAmC;IACpD,OAAO,CAAC,WAAW,CAA2C;IAE9D,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,SAAS,CAAkB;gBAEvB,QAAQ,CAAC,EAAE,UAAU,EAAE,gBAAgB,CAAC,EAAE,kBAAkB;IAWxE,CAAC,uBAAuB,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIzC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe;IAM1C,SAAS,CAAC,CAAC,EAAE,OAAO;IAkBpB,SAAS,CAAC,IAAI,EAAE,MAAM;IAItB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAIrB,WAAW,CAAC,CAAC,EAAE,mBAAmB;IAKzC,WAAW,CAAC,QAAQ,EAAE,eAAe,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC,KAAA,KAAK,UAAU;IA0DnE,eAAe;;;;;;;;;;;;;IAiBf,eAAe;;;;;;;;;;;;;IAmBf,GAAG,CAAC,GAAG,EAAE,GAAG;CAatB"}
+{"version":3,"file":"EntityType.d.ts","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAIrD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAiB,mBAAmB,EAAmB,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE1I,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,eAAO,MAAM,uBAAuB,eAA8B,CAAC;AACnE,eAAO,MAAM,eAAe,eAA8B,CAAC;AAE3D,MAAM,WAAW,eAAe;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC9B;AAGD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAE3B,SAAgB,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEzC,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,WAAW,EAAE,MAAM,CAAC;IACpC,SAAgB,UAAU,EAAE,MAAM,CAAC;IAGnC,SAAgB,OAAO,EAAE,OAAO,EAAE,CAAM;IAExC,SAAgB,SAAS,EAAE,eAAe,EAAE,CAAM;IAElD,SAAgB,OAAO,EAAE,MAAM,EAAE,CAAM;IAEvC,SAAgB,IAAI,EAAE,OAAO,EAAE,CAAM;IAErC,SAAgB,OAAO,EAAE,OAAO,EAAE,CAAM;IAExC,IACW,kBAAkB,oEAO5B;IAED,OAAO,CAAC,QAAQ,CAAmC;IACnD,OAAO,CAAC,SAAS,CAAmC;IACpD,OAAO,CAAC,WAAW,CAA2C;IAE9D,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,SAAS,CAAkB;gBAEvB,QAAQ,CAAC,EAAE,UAAU,EAAE,gBAAgB,CAAC,EAAE,kBAAkB;IAWxE,CAAC,uBAAuB,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIzC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe;IAM1C,SAAS,CAAC,CAAC,EAAE,OAAO;IAqCpB,SAAS,CAAC,IAAI,EAAE,MAAM;IAItB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAIrB,WAAW,CAAC,CAAC,EAAE,mBAAmB;IAKzC,WAAW,CAAC,QAAQ,EAAE,eAAe,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC,KAAA,KAAK,UAAU;iBAA7C,MAAM;;IAyElD,eAAe;;;;;;;;;;;;;IAiBf,eAAe;;;;;;;;;;;;;IAmBf,GAAG,CAAC,GAAG,EAAE,GAAG;CAatB"}

package/dist/entity-query/EntityType.js

@@ -44,8 +44,27 @@ export default class EntityType {
     addColumn(c) {
         const existing = this.fieldMap.get(c.name);
         if (existing) {
-            c.fkRelation = existing.fkRelation;
-            c.fkRelation.fkColumn = c;
+            const fkRelation = c.fkRelation = existing.fkRelation;
+            if (fkRelation) {
+                fkRelation.fkMap = [{ fkColumn: c, relatedKeyColumn: null }];
+                // if(!fkRelation.fkMap?.length) {
+                //     fkRelation.fkMap = [{ fkColumn: c, relatedKeyColumn: null}];
+                // } else {
+                //     if(fkRelation.fkMap.length === 1) {
+                //         fkRelation.fkMap[0].fkColumn = c;
+                //     }
+                // }
+            }
+            // if (fkRelation?.fkMap) {
+            //     if (!c.fkRelation.fkMap.length) {
+            //         c.fkRelation.fkMap = [{ fkColumn: c, relatedKeyColumn: null }];
+            //     } else {
+            //         c.fkRelation.fkMap[0].fkColumn = c;
+            //     }
+            // } else {
+            //     c
+            // }
+            // c.fkRelation.fkColumn = c;
         }
         this.fieldMap.set(c.name, c);
         this.columnMap.set(c.columnName, c);
@@ -70,35 +89,45 @@ export default class EntityType {
         // we will also set fk to the corresponding column
         this.relations.push(relation);
         this.relationMap.set(relation.name, relation);
-        // find fk...
-        let fkColumn = this.fieldMap.get(relation.foreignKey);
-        if (!fkColumn) {
-            fkColumn = {
-                name: relation.foreignKey,
-                // columnName: relation.foreignKey,
-                fkRelation: relation,
-                dataType: "BigInt"
-            };
-            this.fieldMap.set(relation.foreignKey, fkColumn);
-        }
-        fkColumn.fkRelation = relation;
-        relation.fkColumn = fkColumn;
-        if (fkColumn.dataType === "Double") {
-            fkColumn.dataType = "BigInt";
+        if (!relation.fkMap) {
+            // find fk...
+            let fkColumn = this.fieldMap.get(relation.fkName);
+            if (!fkColumn) {
+                fkColumn = {
+                    name: relation.fkName,
+                    // columnName: relation.foreignKey,
+                    fkRelation: relation,
+                    dataType: "BigInt"
+                };
+                this.fieldMap.set(relation.fkName, fkColumn);
+                relation.fkMap = [{ fkColumn, relatedKeyColumn: null }];
+            }
+            fkColumn.fkRelation = relation;
+            // relation.fkColumn = fkColumn;
+            if (fkColumn.dataType === "Double") {
+                fkColumn.dataType = "BigInt";
+            }
         }
         if (!getInverseModel) {
             return relation;
         }
         // let us set inverse relations...
         const relatedType = getInverseModel(relation.relatedTypeClass);
+        relation.fkMap[0].relatedKeyColumn ??= relatedType.keys[0];
+        relation.fkMap = [...relation.fkMap.map((x) => ({ ...x }))];
+        for (const iterator of relation.fkMap) {
+            iterator.fkColumn = this.getField(iterator.fkColumn.name);
+            // iterator.fkColumn.fkRelation = relation;
+            iterator.relatedKeyColumn = relatedType.getField(iterator.relatedKeyColumn.name);
+            iterator.relatedKeyColumn.entityType = relatedType;
+        }
         relation.relatedEntity = relatedType;
         const inverseRelation = {
             name: relation.relatedName,
-            foreignKey: "",
             relatedName: relation.name,
             relatedTypeClass: this.typeClass,
-            dotNotCreateIndex: true,
-            fkColumn,
+            doNotCreateIndex: true,
+            fkMap: null,
             isInverseRelation: true,
             isCollection: relation.singleInverseRelation ? false : true,
             relatedRelation: relation,
@@ -110,11 +139,14 @@ export default class EntityType {
         relation.relatedRelation = inverseRelation;
         let { foreignKeyConstraint } = relation;
         if (foreignKeyConstraint) {
-            foreignKeyConstraint = { ...foreignKeyConstraint };
-            relation.foreignKeyConstraint = foreignKeyConstraint;
-            foreignKeyConstraint.name ||= `FK_${this.name}_${fkColumn.name}_${this.typeClass.name}_${relatedType.keys[0].name}`;
-            foreignKeyConstraint.column = fkColumn;
-            foreignKeyConstraint.refColumns = relatedType.keys;
+            if (relation.fkMap.length === 1) {
+                const { fkColumn } = relation.fkMap[0];
+                foreignKeyConstraint = { ...foreignKeyConstraint };
+                relation.foreignKeyConstraint = foreignKeyConstraint;
+                foreignKeyConstraint.name ||= `FK_${this.name}_${fkColumn.name}_${this.typeClass.name}_${relatedType.keys[0].name}`;
+                foreignKeyConstraint.column = fkColumn;
+                foreignKeyConstraint.refColumns = relatedType.keys;
+            }
         }
         return relation;
     }

package/dist/entity-query/EntityType.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityType.js","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EntityType.js","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"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"}

package/dist/migrations/postgres/PostgresAutomaticMigrations.js

@@ -9,7 +9,7 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
         await this.createColumns(driver, type, nonKeyColumns);
         await this.createIndexes(context, type, nonKeyColumns.filter((x) => x.fkRelation
             && (!x.key || type.keys.indexOf(x) !== 0)
-            && !x.fkRelation?.dotNotCreateIndex));
+            && !x.fkRelation?.doNotCreateIndex));
     }
     async createIndexes(context, type, fkColumns) {
         for (const iterator of fkColumns) {

package/dist/migrations/postgres/PostgresAutomaticMigrations.js.map

@@ -1 +1 @@
-{"version":3,"file":"PostgresAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PostgresAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/postgres/PostgresAutomaticMigrations.ts"],"names":[],"mappings":"AAQA,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,kBAAkB;IAEvE,KAAK,CAAC,YAAY,CAAC,OAAsB,EAAE,IAAgB;QAGvD,gCAAgC;QAChC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAEvB,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;QAElC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAE3C,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;QAEtD,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/D,CAAC,CAAC,UAAU;eACT,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;eACtC,CAAC,CAAC,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAE7C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAsB,EAAE,IAAgB,EAAE,SAAoB;QAC9E,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAC/B,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ;gBAC5B,CAAC,CAAC,GAAG,QAAQ,CAAC,UAAU,cAAc;gBACtC,CAAC,CAAC,EAAE,CAAC;YACT,MAAM,QAAQ,GAAW;gBACrB,IAAI,EAAE,MAAM,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC,UAAU,EAAE;gBAC9C,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,KAAK,WAAW,EAAC,CAAC;gBACxF,MAAM;aACT,CAAC;YACF,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QACrD,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAsB,EAAE,IAAgB,EAAE,aAAwB;QAElF,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM;YACxB,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI;YAC/B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAEZ,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;QAClE,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;YACnC,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;YACvC,IAAI,GAAG,GAAG,eAAe,IAAI,6BAA6B,UAAU,GAAG,CAAC;YACxE,GAAG,IAAI,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAE1C,IAAI,QAAQ,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;gBAC7B,GAAG,IAAI,YAAY,CAAC;YACxB,CAAC;YAED,IAAI,QAAQ,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;gBACpC,GAAG,IAAI,yBAAyB,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC;YACnG,CAAC;YAED,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACvC,GAAG,IAAI,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC;YAC1C,CAAC;YAED,MAAM,MAAM,CAAC,YAAY,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;QACzC,CAAC;IAEL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAsB,EAAE,IAAgB,EAAE,IAAe;QAEvE,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM;YACpB,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI;YAC/B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAEhB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC1B,IAAI,GAAG,GAAG,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC;YACpC,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;gBACrB,QAAO,QAAQ,CAAC,SAAS,EAAE,CAAC;oBACxB,KAAK,UAAU;wBACX,GAAG,IAAI,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;wBAC3D,GAAG,IAAI,kDAAkD,CAAC;wBAC1D,MAAM;oBACV,KAAK,UAAU;wBACX,GAAG,IAAI,kCAAkC,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC;wBACxG,MAAM;gBACd,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,GAAG,IAAI,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;gBAC1C,GAAG,IAAI,kBAAkB,CAAC;YAC9B,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;QAED,MAAM,MAAM,CAAC,YAAY,CAAC,8BAA8B,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;yBAChE,IAAI,iBAAiB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;UAC3E,CAAC,CAAC;IAER,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAsB,EAAE,KAAa,EAAE,IAAgB;QACtE,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM;YACxB,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI;YAC/B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QACZ,MAAM,SAAS,GAAI,KAAK,CAAC,IAAI,CAAC;QAC9B,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,IAAI,KAAK,GAAG,UAAU,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,wBAAwB,SAAS,OAAO,IAAI,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QAC1H,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACf,KAAK,IAAI,WAAW,KAAK,CAAC,MAAM,GAAG,CAAC;QACxC,CAAC;QACD,MAAM,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAsB,EAAE,UAAiC;QAC7E,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM;YACxB,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI;YAC/B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAEZ,IAAI,IAAI,GAAG;;SAEV,CAAC;QAEF,MAAM,MAAM,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,IAAI,IAAI,6BAA6B,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;QAElC,MAAM,CAAC,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;YACjB,OAAO;QACX,CAAC;QAED,IAAI,GAAG,eAAe,IAAI,mBAAmB,UAAU,CAAC,IAAI;2BACzC,UAAU,CAAC,MAAM,CAAC,UAAU;yBAC9B,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI;kBAC/C,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;eAC3D,CAAC;QAER,QAAO,UAAU,CAAC,OAAO,EAAE,CAAC;YACxB,KAAK,QAAQ;gBACT,IAAI,IAAI,oBAAoB,CAAC;gBAC7B,MAAM;YACV,KAAK,UAAU;gBACX,IAAI,IAAI,qBAAqB,CAAC;gBAC9B,MAAM;YACV,KAAK,aAAa;gBACd,IAAI,IAAI,wBAAwB,CAAC;gBACjC,MAAM;YACV,KAAK,UAAU;gBACX,IAAI,IAAI,qBAAqB,CAAC;gBAC9B,MAAM;QACd,CAAC;QAED,IAAI,CAAC;YACD,MAAM,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,6BAA6B;YAC7B,OAAO,CAAC,IAAI,CAAC,4BAA4B,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;YAC5D,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;IAEL,CAAC;CAGJ"}

package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js

@@ -10,7 +10,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
         await this.createColumns(driver, type, nonKeyColumns);
         await this.createIndexes(context, type, nonKeyColumns.filter((x) => x.fkRelation
             && (!x.key || type.keys.indexOf(x) !== 0)
-            && !x.fkRelation?.dotNotCreateIndex));
+            && !x.fkRelation?.doNotCreateIndex));
     }
     async createIndexes(context, type, fkColumns) {
         for (const iterator of fkColumns) {

package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqlServerAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/sql-server/SqlServerAutomaticMigrations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SqlServerAutomaticMigrations.js","sourceRoot":"","sources":["../../../src/migrations/sql-server/SqlServerAutomaticMigrations.ts"],"names":[],"mappings":"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"}

package/dist/model/EntityModel.js

@@ -16,8 +16,8 @@ const getOrCreateModel = (map, type, namingConvention) => {
             ? column.columnName
             : (namingConvention
                 ? namingConvention(column.columnName) : column.columnName);
-        t.addColumn(column);
         column.entityType = t;
+        t.addColumn(column);
     }
     t.indexes.push(...original.indexes.map((i) => ({ ...i, columns: [...i.columns.map((c) => ({ ...c }))] })));
     // sort keys...
@@ -31,7 +31,7 @@ const getOrCreateModel = (map, type, namingConvention) => {
         if (iterator.isInverseRelation) {
             continue;
         }
-        const relation = { ...iterator, fkColumn: void 0, relatedEntity: void 0, type: t };
+        const relation = { ...iterator, relatedEntity: void 0, type: t };
         t.addRelation(relation, (tc) => getOrCreateModel(map, tc, namingConvention));
     }
     return t;

package/dist/model/EntityModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityModel.js","sourceRoot":"","sources":["../../src/model/EntityModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EntityModel.js","sourceRoot":"","sources":["../../src/model/EntityModel.ts"],"names":[],"mappings":"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"}

package/dist/model/EntitySource.d.ts

@@ -5,7 +5,12 @@ import { contextSymbol, modelSymbol } from "../common/symbols/symbols.js";
 export type ISaveDirect<T> = {
     keys: Partial<T>;
     changes: Partial<T>;
-    mode: "selectOrInsert" | "insert";
+    mode: "selectOrInsert";
+    updateAfterSelect?: never;
+} | {
+    keys?: never;
+    mode: "insert";
+    changes: Partial<T>;
     updateAfterSelect?: never;
 } | {
     keys?: Partial<T>;

package/dist/model/EntitySource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntitySource.d.ts","sourceRoot":"","sources":["../../src/model/EntitySource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAC;AAC5D,OAAO,KAAK,EAAc,YAAY,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE7F,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAsB1E,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IACzB,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAEpB,IAAI,EAAE,gBAAgB,GAAG,QAAQ,CAAC;IAClC,iBAAiB,CAAC,EAAE,KAAK,CAAA;CAC5B,GAAG;IACA,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAEpB,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAA;IACzB;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAC,CAAC,KAAK,CAAC,CAAA;CACpC,GAAG;IACA,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAC;IACf,iBAAiB,CAAC,EAAE,KAAK,CAAC;IAC1B,OAAO,CAAC,EAAE,KAAK,CAAA;CAClB,CAAC;AAEF,qBAAa,YAAY,CAAC,CAAC,GAAG,GAAG;IAkBzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAjBrB,UAAU,KAEf;IAEF,IAAI,CAAC,WAAW,CAAC,eAEhB;IAED,IAAG,CAAC,aAAa,CAAC,kBAEjB;IAED,OAAO,CAAC,MAAM,CAAa;gBAIN,KAAK,EAAE,UAAU,EACjB,OAAO,EAAE,aAAa;IAK9B,UAAU,CAAC,EACpB,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,iBAAiB,EACpB,EAAE,WAAW,CAAC,CAAC,CAAC,EAAG,KAAK,SAAI,GAAG,OAAO,CAAC,CAAC,CAAC;IA8EnC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAexC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAa/B;;;OAGG;IACI,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAkBvB,GAAG,IAAI,YAAY,CAAC,CAAC,CAAC;IAItB,QAAQ,CAAC,IAAI,GAAE,MAAM,GAAG,QAAiB,GAAG,YAAY,CAAC,CAAC,CAAC;IAM3D,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IAIpD,OAAO;IAYP,OAAO;;;;CAOjB"}
+{"version":3,"file":"EntitySource.d.ts","sourceRoot":"","sources":["../../src/model/EntitySource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAC;AAC5D,OAAO,KAAK,EAAc,YAAY,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE7F,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAsB1E,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IACzB,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAEpB,IAAI,EAAE,gBAAgB,CAAC;IACvB,iBAAiB,CAAC,EAAE,KAAK,CAAA;CAC5B,GAAG;IACA,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,iBAAiB,CAAC,EAAE,KAAK,CAAC;CAC7B,GAAG;IACA,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAEpB,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAA;IACzB;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAC,CAAC,KAAK,CAAC,CAAA;CACpC,GAAG;IACA,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAC;IACf,iBAAiB,CAAC,EAAE,KAAK,CAAC;IAC1B,OAAO,CAAC,EAAE,KAAK,CAAA;CAClB,CAAC;AAEF,qBAAa,YAAY,CAAC,CAAC,GAAG,GAAG;IAkBzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAjBrB,UAAU,KAEf;IAEF,IAAI,CAAC,WAAW,CAAC,eAEhB;IAED,IAAG,CAAC,aAAa,CAAC,kBAEjB;IAED,OAAO,CAAC,MAAM,CAAa;gBAIN,KAAK,EAAE,UAAU,EACjB,OAAO,EAAE,aAAa;IAK9B,UAAU,CAAC,EACpB,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,iBAAiB,EACpB,EAAE,WAAW,CAAC,CAAC,CAAC,EAAG,KAAK,SAAI,GAAG,OAAO,CAAC,CAAC,CAAC;IA8EnC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAexC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAa/B;;;OAGG;IACI,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAkBvB,GAAG,IAAI,YAAY,CAAC,CAAC,CAAC;IAItB,QAAQ,CAAC,IAAI,GAAE,MAAM,GAAG,QAAiB,GAAG,YAAY,CAAC,CAAC,CAAC;IAM3D,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IAIpD,OAAO;IAYP,OAAO;;;;CAOjB"}