@entity-access/entity-access 1.0.17 → 1.0.19

package/.github/workflows/node.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches-ignore:
       - 'feature/**'
+      - 'main'
     tags-ignore:
       - '*'
 

package/dist/compiler/QueryCompiler.js

@@ -27,23 +27,23 @@ export default class QueryCompiler {
         this.sqlMethodTransformer = sqlMethodTransformer;
     }
     execute(parameters, fx, source) {
-        const { params, target, body } = this.arrowToExpression.transform(fx, source?.selectStatement.as);
+        const { params, target, body } = this.arrowToExpression.transform(fx, source?.selectStatement.sourceParameter);
         const exp = new this.expressionToSql(source, params[0], target, this);
         const query = exp.visit(body);
         return this.invoke(query, parameters);
     }
     compile(source, fx) {
-        const { params, target, body } = this.arrowToExpression.transform(fx, source?.selectStatement.as);
+        const { params, target, body } = this.arrowToExpression.transform(fx, source?.selectStatement.sourceParameter);
         return { params, target, body };
     }
     compileToSql(source, fx) {
-        const { params, target, body } = this.arrowToExpression.transform(fx, source?.selectStatement.as);
+        const { params, target, body } = this.arrowToExpression.transform(fx, source?.selectStatement.sourceParameter);
         const exp = new this.expressionToSql(source, params[0], target, this);
         const textQuery = exp.visit(body);
         return new CompiledQuery(exp.root, exp.target, textQuery);
     }
     compileExpression(source, exp) {
-        const toSql = new this.expressionToSql(source ?? null, null, exp?.as ?? source?.selectStatement?.as, this);
+        const toSql = new this.expressionToSql(source ?? null, null, exp?.sourceParameter ?? source?.selectStatement?.sourceParameter, this);
         const query = toSql.visit(exp);
         return this.invoke(query);
     }

package/dist/compiler/QueryCompiler.js.map

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

package/dist/decorators/SchemaRegistry.d.ts

@@ -1,6 +1,8 @@
 import EntityType from "../entity-query/EntityType.js";
 export default class SchemaRegistry {
+    static registerClassForName(name: string, target: any): void;
     static model(type: any): EntityType;
+    static classForName(name: any): any;
     private static map;
 }
 //# sourceMappingURL=SchemaRegistry.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaRegistry.d.ts","sourceRoot":"","sources":["../../src/decorators/SchemaRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,+BAA+B,CAAC;AAGvD,MAAM,CAAC,OAAO,OAAO,cAAc;WAEjB,KAAK,CAAC,IAAI,KAAA;IAWxB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAmC;CAExD"}
+{"version":3,"file":"SchemaRegistry.d.ts","sourceRoot":"","sources":["../../src/decorators/SchemaRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,+BAA+B,CAAC;AAIvD,MAAM,CAAC,OAAO,OAAO,cAAc;IAE/B,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;WAQvC,KAAK,CAAC,IAAI,KAAA;WAYV,YAAY,CAAC,IAAI,KAAA;IAI/B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAmC;CAExD"}

package/dist/decorators/SchemaRegistry.js

@@ -1,5 +1,13 @@
 import EntityType from "../entity-query/EntityType.js";
+const classForNameMap = new Map();
 export default class SchemaRegistry {
+    static registerClassForName(name, target) {
+        const existing = classForNameMap.get(name);
+        if (existing && existing !== target) {
+            throw new Error(`${name} is already registered for ${target}`);
+        }
+        classForNameMap.set(name, target);
+    }
     static model(type) {
         let model = this.map.get(type);
         if (!model) {
@@ -7,9 +15,13 @@ export default class SchemaRegistry {
             // @ts-expect-error readonly for compile time only
             model.typeClass = type;
             this.map.set(type, model);
+            this.registerClassForName(type.name, model);
         }
         return model;
     }
+    static classForName(name) {
+        return classForNameMap.get(name);
+    }
     static map = new Map();
 }
 //# sourceMappingURL=SchemaRegistry.js.map

package/dist/decorators/SchemaRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaRegistry.js","sourceRoot":"","sources":["../../src/decorators/SchemaRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,+BAA+B,CAAC;AAGvD,MAAM,CAAC,OAAO,OAAO,cAAc;IAExB,MAAM,CAAC,KAAK,CAAC,IAAI;QACpB,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,EAAE;YACR,KAAK,GAAG,IAAI,UAAU,EAAE,CAAC;YACzB,kDAAkD;YAClD,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SAC7B;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,MAAM,CAAC,GAAG,GAAyB,IAAI,GAAG,EAAE,CAAC"}
+{"version":3,"file":"SchemaRegistry.js","sourceRoot":"","sources":["../../src/decorators/SchemaRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,+BAA+B,CAAC;AAEvD,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;AAElC,MAAM,CAAC,OAAO,OAAO,cAAc;IAE/B,MAAM,CAAC,oBAAoB,CAAC,IAAY,EAAE,MAAW;QACjD,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,QAAQ,IAAI,QAAQ,KAAK,MAAM,EAAE;YACjC,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,8BAA8B,MAAM,EAAE,CAAC,CAAC;SAClE;QACD,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAI;QACpB,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,EAAE;YACR,KAAK,GAAG,IAAI,UAAU,EAAE,CAAC;YACzB,kDAAkD;YAClD,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC1B,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SAC/C;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,IAAI;QAC3B,OAAO,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAEO,MAAM,CAAC,GAAG,GAAyB,IAAI,GAAG,EAAE,CAAC"}

package/dist/decorators/Table.d.ts

@@ -1,6 +1,8 @@
 export interface ITable {
     name: string;
     schema?: string;
+    entityName?: string;
 }
-export default function Table<T>(name: string, schema?: string): any;
+export default function Table<T extends Function>(name: string, schema?: string): any;
+export declare function EntityName(name: string): (target: any) => void;
 //# sourceMappingURL=Table.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/decorators/Table.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,CAAC,EAC3B,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,MAAM,GAAG,GAAG,CAQxB"}
+{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/decorators/Table.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAGD,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,CAAC,SAAS,QAAQ,EAC5C,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,MAAM,GAAG,GAAG,CAQxB;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,yBAItC"}

package/dist/decorators/Table.js

@@ -1,4 +1,5 @@
 import SchemaRegistry from "./SchemaRegistry.js";
+// eslint-disable-next-line @typescript-eslint/ban-types
 export default function Table(name, schema) {
     return (target) => {
         const model = SchemaRegistry.model(target);
@@ -8,4 +9,9 @@ export default function Table(name, schema) {
         model.schema = schema;
     };
 }
+export function EntityName(name) {
+    return (target) => {
+        SchemaRegistry.registerClassForName(name, target);
+    };
+}
 //# sourceMappingURL=Table.js.map

package/dist/decorators/Table.js.map

@@ -1 +1 @@
-{"version":3,"file":"Table.js","sourceRoot":"","sources":["../../src/decorators/Table.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAOjD,MAAM,CAAC,OAAO,UAAU,KAAK,CACzB,IAAY,EACZ,MAAe;IACf,OAAO,CAAC,MAAS,EAAE,EAAE;QACjB,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3C,4BAA4B;QAC5B,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,4BAA4B;QAC5B,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;IAC1B,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"Table.js","sourceRoot":"","sources":["../../src/decorators/Table.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAQjD,wDAAwD;AACxD,MAAM,CAAC,OAAO,UAAU,KAAK,CACzB,IAAY,EACZ,MAAe;IACf,OAAO,CAAC,MAAS,EAAE,EAAE;QACjB,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3C,4BAA4B;QAC5B,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,4BAA4B;QAC5B,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;IAC1B,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAY;IACnC,OAAO,CAAC,MAAM,EAAE,EAAE;QACd,cAAc,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC,CAAC;AACN,CAAC"}

package/dist/di/di.d.ts

@@ -15,7 +15,7 @@ export declare class ServiceProvider implements IDisposable {
     add<T1, T extends T1>(type: IAbstractClassOf<T1> | IClassOf<T1>, instance: T): T;
     createScope(): ServiceProvider;
     create<T>(type: IClassOf<T>): T;
-    resolve(type: any): any;
+    resolve<T>(type: IClassOf<T>): T;
     dispose(): void;
     [Symbol.disposable](): void;
     private getRegistration;

package/dist/di/di.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"di.d.ts","sourceRoot":"","sources":["../../src/di/di.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAEvE,OAAO,kBAAkB,CAAC;AAI1B,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,QAAQ,CAAC;AAI/D,eAAO,MAAM,wBAAwB,eAA+B,CAAC;AACrE,eAAO,MAAM,uBAAuB,eAA8B,CAAC;AAEnE,QAAA,MAAM,mBAAmB,eAA0B,CAAC;AAMpD,qBAAa,eAAgB,YAAW,WAAW;IAE/C,OAAc,MAAM,kBAAyB;WAE/B,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAKjE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,KAAA,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAMpD,OAAO,CAAC,GAAG,CAA2B;IACtC,OAAO,CAAC,WAAW,CAAgB;gBAEvB,MAAM,CAAC,EAAE,eAAe;IAKpC,GAAG,CAAC,EAAE,EAAE,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC;IAQ5E,WAAW;IAIX,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAK/B,OAAO,CAAC,IAAI,KAAA;IAwCZ,OAAO;IAIP,CAAC,MAAM,CAAC,UAAU,CAAC;IAUnB,OAAO,CAAC,eAAe;IA0BvB,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,cAAc;CAoBzB;AAED,MAAM,WAAW,kBAAkB;IAE/B,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,eAAe,KAAK,GAAG,CAAC;CAC1C;AAGD,eAAO,MAAM,iBAAiB;mBACX,WAAW,2BAAsB,eAAe,KAAK,GAAG;;CAI1E,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,MAAM,KAAA,EAAE,GAAG,KAAA,EAAE,KAAK,CAAC,EAAE,MAAM,QA0BzD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,eAAe,KAAK,GAAG,yBAIjF;AAED,eAAO,MAAM,iBAAiB,uBAAwB,CAAC;AAEvD,eAAO,MAAM,cAAc,uBAAqB,CAAC;AAEjD,eAAO,MAAM,iBAAiB,uBAAwB,CAAC"}
+{"version":3,"file":"di.d.ts","sourceRoot":"","sources":["../../src/di/di.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAEvE,OAAO,kBAAkB,CAAC;AAI1B,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,QAAQ,CAAC;AAI/D,eAAO,MAAM,wBAAwB,eAA+B,CAAC;AACrE,eAAO,MAAM,uBAAuB,eAA8B,CAAC;AAEnE,QAAA,MAAM,mBAAmB,eAA0B,CAAC;AAMpD,qBAAa,eAAgB,YAAW,WAAW;IAE/C,OAAc,MAAM,kBAAyB;WAE/B,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAKjE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,KAAA,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAMpD,OAAO,CAAC,GAAG,CAA2B;IACtC,OAAO,CAAC,WAAW,CAAgB;gBAEvB,MAAM,CAAC,EAAE,eAAe;IAKpC,GAAG,CAAC,EAAE,EAAE,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC;IAQ5E,WAAW;IAIX,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAK/B,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAwChC,OAAO;IAIP,CAAC,MAAM,CAAC,UAAU,CAAC;IAUnB,OAAO,CAAC,eAAe;IA0BvB,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,cAAc;CAoBzB;AAED,MAAM,WAAW,kBAAkB;IAE/B,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,eAAe,KAAK,GAAG,CAAC;CAC1C;AAGD,eAAO,MAAM,iBAAiB;mBACX,WAAW,2BAAsB,eAAe,KAAK,GAAG;;CAI1E,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,MAAM,KAAA,EAAE,GAAG,KAAA,EAAE,KAAK,CAAC,EAAE,MAAM,QA0BzD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,eAAe,KAAK,GAAG,yBAIjF;AAED,eAAO,MAAM,iBAAiB,uBAAwB,CAAC;AAEvD,eAAO,MAAM,cAAc,uBAAqB,CAAC;AAEjD,eAAO,MAAM,iBAAiB,uBAAwB,CAAC"}

package/dist/di/di.js.map

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

package/dist/drivers/sql-server/ExpressionToSqlServer.js

@@ -61,12 +61,12 @@ export default class ExpressionToSqlServer extends ExpressionToSql {
         if (e.source.type === "ValuesStatement") {
             const v = e.source;
             const rows = v.values.map((x) => prepare `(${this.visitArray(x)})`);
-            source = prepare `(VALUES ${rows}) as ${this.visit(e.as)}(${this.visitArray(v.fields)})`;
+            source = prepare `(VALUES ${rows}) as ${this.visit(e.sourceParameter)}(${this.visitArray(v.fields)})`;
             as = [];
         }
         else {
             source = this.visit(e.source);
-            as = e.as ? prepare ` AS ${this.visit(e.as)}` : "";
+            as = e.sourceParameter ? prepare ` AS ${this.visit(e.sourceParameter)}` : "";
         }
         // const as = e.as ? prepare ` AS ${this.visit(e.as)}` : "";
         const offset = showFetch ? prepare ` OFFSET ${Number(e.offset).toString()} ROWS ` : "";

package/dist/drivers/sql-server/ExpressionToSqlServer.js.map

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

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

@@ -8,6 +8,7 @@ export default class EntityType {
     readonly typeClass: IClassOf<any>;
     readonly name: string;
     readonly schema: string;
+    readonly entityName: string;
     readonly columns: IColumn[];
     readonly relations: IEntityRelation[];
     readonly keys: IColumn[];
@@ -29,7 +30,7 @@ export default class EntityType {
     selectAllFields(): {
         type: "SelectStatement";
         source: import("../query/ast/Expressions.js").ValuesStatement | import("../query/ast/Expressions.js").TableSource;
-        as: import("../query/ast/Expressions.js").ParameterExpression;
+        sourceParameter: import("../query/ast/Expressions.js").ParameterExpression;
         fields: (Expression | QuotedLiteral | ExpressionAs)[];
         where: Expression;
         orderBy: import("../query/ast/Expressions.js").OrderByExpression[];
@@ -42,7 +43,7 @@ export default class EntityType {
     selectOneNumber(): {
         type: "SelectStatement";
         source: import("../query/ast/Expressions.js").ValuesStatement | import("../query/ast/Expressions.js").TableSource;
-        as: import("../query/ast/Expressions.js").ParameterExpression;
+        sourceParameter: import("../query/ast/Expressions.js").ParameterExpression;
         fields: (Expression | QuotedLiteral | ExpressionAs)[];
         where: Expression;
         orderBy: import("../query/ast/Expressions.js").OrderByExpression[];

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,EAAE,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAIrH;;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;IAG/B,SAAgB,OAAO,EAAE,OAAO,EAAE,CAAM;IAExC,SAAgB,SAAS,EAAE,eAAe,EAAE,CAAM;IAElD,SAAgB,IAAI,EAAE,OAAO,EAAE,CAAM;IAErC,SAAgB,OAAO,EAAE,OAAO,EAAE,CAAM;IAExC,IACW,kBAAkB,iCAO5B;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;IAE5B,WAAW,CAAC,IAAI,EAAE,MAAM;;;;IAMxB,SAAS,CAAC,CAAC,EAAE,OAAO;IAkBpB,SAAS,CAAC,IAAI,EAAE,MAAM;IAItB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAI5B,WAAW,CAAC,QAAQ,EAAE,eAAe;IA0C9B,eAAe;;;;;;;;;;;;;IAqBf,eAAe;;;;;;;;;;;;;CAiBzB"}
+{"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,EAAE,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAIrH;;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,UAAU,EAAE,MAAM,CAAC;IAGnC,SAAgB,OAAO,EAAE,OAAO,EAAE,CAAM;IAExC,SAAgB,SAAS,EAAE,eAAe,EAAE,CAAM;IAElD,SAAgB,IAAI,EAAE,OAAO,EAAE,CAAM;IAErC,SAAgB,OAAO,EAAE,OAAO,EAAE,CAAM;IAExC,IACW,kBAAkB,iCAO5B;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;IAE5B,WAAW,CAAC,IAAI,EAAE,MAAM;;;;IAMxB,SAAS,CAAC,CAAC,EAAE,OAAO;IAkBpB,SAAS,CAAC,IAAI,EAAE,MAAM;IAItB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAI5B,WAAW,CAAC,QAAQ,EAAE,eAAe;IA0C9B,eAAe;;;;;;;;;;;;;IAqBf,eAAe;;;;;;;;;;;;;CAiBzB"}

package/dist/entity-query/EntityType.js

@@ -17,6 +17,7 @@ export default class EntityType {
     typeClass;
     name;
     schema;
+    entityName;
     columns = [];
     relations = [];
     keys = [];
@@ -114,7 +115,7 @@ export default class EntityType {
         this.selectAll = SelectStatement.create({
             source,
             model: this,
-            as,
+            sourceParameter: as,
             fields
         });
         return { ...this.selectAll };
@@ -131,7 +132,7 @@ export default class EntityType {
         this.selectOne = SelectStatement.create({
             source,
             model: this,
-            as,
+            sourceParameter: as,
             fields
         });
         return { ...this.selectOne };

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/model/verification/VerificationSession.js

@@ -70,7 +70,7 @@ export default class VerificationSession {
             return;
         }
         const eq = query;
-        const compare = Expression.equal(Expression.member(eq.selectStatement.as, relatedModel.keys[0].columnName), Expression.constant(value));
+        const compare = Expression.equal(Expression.member(eq.selectStatement.sourceParameter, relatedModel.keys[0].columnName), Expression.constant(value));
         const typeName = TypeInfo.nameOfType(type);
         this.addError(query, compare, `Unable to access entity ${typeName} through foreign key ${TypeInfo.nameOfType(change.type)}.${relation.name}.\n`);
     }
@@ -84,7 +84,7 @@ export default class VerificationSession {
         let compare;
         const eq = query;
         for (const [key, value] of keys) {
-            const test = Expression.equal(Expression.member(eq.selectStatement.as, Expression.quotedLiteral(key)), Expression.constant(value));
+            const test = Expression.equal(Expression.member(eq.selectStatement.sourceParameter, Expression.quotedLiteral(key)), Expression.constant(value));
             compare = compare
                 ? Expression.logicalAnd(compare, test)
                 : test;
@@ -99,7 +99,7 @@ export default class VerificationSession {
         this.select.fields = [
             Expression.as(Expression.templateLiteral(this.field), "error")
         ];
-        this.select.as = ParameterExpression.create({ name: "x" });
+        this.select.sourceParameter = ParameterExpression.create({ name: "x" });
         const source = ValuesStatement.create({
             values: [
                 [Identifier.create({ value: "1" })]

package/dist/model/verification/VerificationSession.js.map

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

package/dist/query/ast/DebugStringVisitor.js

@@ -125,7 +125,7 @@ export default class DebugStringVisitor extends Visitor {
     }
     visitSelectStatement(e) {
         const select = `SELECT\n\t${this.visitArray(e.fields, ",\n\t")}\n\tFROM ${this.visit(e.source)}`;
-        const as = e.as ? this.visit(e.as) : "";
+        const as = e.sourceParameter ? this.visit(e.sourceParameter) : "";
         const joins = e.joins?.length > 0 ? this.visitArray(e.joins, "\n\t") : "";
         const where = e.where ? `\n\tWHERE ${this.visit(e.where)}` : "";
         const orderBy = e.orderBy ? `\n\tORDER BY ${this.visitArray(e.orderBy, "\n\t\tTHEN BY")}` : "";

package/dist/query/ast/DebugStringVisitor.js.map

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

package/dist/query/ast/ExpressionToSql.js

@@ -50,7 +50,7 @@ export default class ExpressionToSql extends Visitor {
         const source = e.source.type === "ValuesStatement"
             ? prepare `(${this.visit(e.source)})`
             : this.visit(e.source);
-        const as = e.as ? prepare ` AS ${this.compiler.quotedLiteral(this.scope.nameOf(e.as))}` : "";
+        const as = e.sourceParameter ? prepare ` AS ${this.compiler.quotedLiteral(this.scope.nameOf(e.sourceParameter))}` : "";
         const fields = this.visitArray(e.fields, ",\n\t\t");
         return prepare `SELECT
         ${fields}
@@ -58,8 +58,8 @@ export default class ExpressionToSql extends Visitor {
     }
     prepareStatement(e) {
         // inject parameter and types if we don't have it..
-        if (e.as && e.model) {
-            this.scope.create({ parameter: e.as, selectStatement: e });
+        if (e.sourceParameter && e.model) {
+            this.scope.create({ parameter: e.sourceParameter, selectStatement: e });
         }
         const joins = e.joins;
         if (joins?.length) {
@@ -137,8 +137,8 @@ export default class ExpressionToSql extends Visitor {
                             }
                             param1.model = relatedModel;
                             this.scope.create({ parameter: param1, model: relatedModel, selectStatement: select });
-                            this.scope.alias(param1, select.as, select);
-                            select.as = param1;
+                            this.scope.alias(param1, select.sourceParameter, select);
+                            select.sourceParameter = param1;
                             const targetKey = MemberExpression.create({
                                 target: parameter,
                                 property: Identifier.create({

package/dist/query/ast/ExpressionToSql.js.map

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

package/dist/query/ast/Expressions.d.ts

@@ -104,7 +104,7 @@ export type Expand = {
 export declare class SelectStatement extends Expression {
     readonly type = "SelectStatement";
     source: TableSource | ValuesStatement;
-    as: ParameterExpression;
+    sourceParameter: ParameterExpression;
     fields: (Expression | QuotedLiteral | ExpressionAs)[];
     where: Expression;
     orderBy: OrderByExpression[];

package/dist/query/ast/Expressions.d.ts.map

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

package/dist/query/ast/Expressions.js

@@ -174,7 +174,7 @@ export class ArrowFunctionExpression extends Expression {
 export class SelectStatement extends Expression {
     type = "SelectStatement";
     source;
-    as;
+    sourceParameter;
     fields;
     where;
     orderBy;