@entity-access/entity-access 1.0.200 → 1.0.202

package/src/model/EntityModel.ts

@@ -19,7 +19,10 @@ const getOrCreateModel = (map: Map<any, EntityType>, type: IClassOf<any>, naming
     map.set(type,  t);
     for (const iterator of original.columns) {
         const column = { ... iterator };
-        column.columnName = column.explicitName ? column.columnName : (namingConvention ? namingConvention(column.columnName) : column.columnName);
+        column.columnName = column.explicitName
+            ? column.columnName
+            : (namingConvention
+                    ? namingConvention(column.columnName) : column.columnName);
         t.addColumn(column);
         column.entityType = t;
     }
@@ -54,7 +57,11 @@ export default class EntityModel {
         let source = this.sources.get(type);
         if (!source) {
             const cache = (this.context.driver[driverModelCache] ??= new Map());
-            const entityType = getOrCreateModel(cache, type, this.context.driver.compiler.namingConvention);
+            const entityType = getOrCreateModel(
+                cache,
+                type,
+                this.context.driver.compiler.namingConvention
+            );
             this.types.set(type, entityType);
             source = new EntitySource(entityType, this.context);
             this.sources.set(type, source);

package/src/model/EntityQuery.ts

@@ -33,7 +33,7 @@ export default class EntityQuery<T = any>
     }
 
     map(parameters: any, fx: any): any {
-        return this.extend(parameters, fx, (select, body) => {
+        const q = this.extend(parameters, fx, (select, body) => {
             const fields = [] as Expression[];
             switch(body.type) {
                 case "NewObjectExpression":
@@ -41,7 +41,7 @@ export default class EntityQuery<T = any>
                     for (const iterator of noe.properties) {
                         fields.push(ExpressionAs.create({
                             expression: iterator.expression,
-                            alias: iterator.alias
+                            alias: Expression.quotedIdentifier(iterator.alias.value)
                         }));
                     }
                     break;
@@ -52,6 +52,8 @@ export default class EntityQuery<T = any>
             }
             return { ... select, fields };
         });
+        q.type = null;
+        return q;
     }
 
     withSignal(signal: AbortSignal): any {
@@ -111,14 +113,19 @@ export default class EntityQuery<T = any>
             }
 
             signal?.throwIfAborted();
+            let select = this.selectStatement;
 
-            query = this.context.driver.compiler.compileExpression(this, this.selectStatement);
+            if (type && select.model) {
+                select = { ... select, fields: select.model.getFieldMap(select.sourceParameter) };
+            }
+
+            query = this.context.driver.compiler.compileExpression(this, select);
             this.traceQuery?.(query.text);
             const reader = await this.context.connection.executeReader(query, signal);
             scope.register(reader);
             for await (const iterator of reader.next(10, signal)) {
                 if (type) {
-                    const item = type?.map(iterator) ?? iterator;
+                    const item = type.map(iterator) as any;
                     // set identity...
                     const entry = this.context.changeSet.getEntry(item, item);
                     relationMapper.fix(entry);
@@ -138,6 +145,9 @@ export default class EntityQuery<T = any>
         let query: { text, values };
         let reader: IDbReader;
         try {
+            if (select.model) {
+                select = { ... select, fields: select.model.getFieldMap(select.sourceParameter) };
+            }
             query = this.context.driver.compiler.compileExpression(this, select);
             this.traceQuery?.(query.text);
             reader = await this.context.connection.executeReader(query, signal);

package/src/query/ast/ExpressionToSql.ts

@@ -323,7 +323,9 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
     }
 
     visitIdentifier(e: Identifier): ITextQuery {
-        // need to visit parameters
+        if (e.quoted) {
+            return [this.compiler.quote(e.value)];
+        }
         return [e.value];
     }
 
@@ -358,10 +360,10 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
                 const name = this.scope.nameOf(parameter);
 
                 // need to change name as per naming convention here...
-                const namingConvention = this.compiler.namingConvention;
-                if (scope.model && namingConvention) {
-                    chain[0] = namingConvention(chain[0]);
-                }
+                // const namingConvention = this.compiler.namingConvention;
+                // if (scope.model && namingConvention) {
+                //     chain[0] = namingConvention(chain[0]);
+                // }
 
                 return [ QueryParameter.create(() => name) , "." , chain.join(".")];
             }
@@ -669,7 +671,11 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
             const scope = this.scope.get(pe);
             const peModel = scope?.model;
             if (peModel) {
-                const { relation } = peModel.getProperty(id.value);
+                const { relation, field } = peModel.getProperty(id.value);
+                if (field) {
+                    // we need to replace field with column name...
+                    return Expression.member(target, field.columnName);
+                }
                 if (relation) {
 
                     const { fkColumn } = relation;

package/src/query/ast/Expressions.ts

@@ -66,6 +66,10 @@ export abstract class Expression {
         return Identifier.create({ value: name });
     }
 
+    static quotedIdentifier(name: string) {
+        return Identifier.create({ value: name, quoted: true });
+    }
+
     static logicalAnd(left: Expression, right: Expression): BinaryExpression {
         return BinaryExpression.create({ left, operator: "AND", right});
     }
@@ -307,6 +311,7 @@ export class Constant extends Expression {
 export class Identifier extends Expression {
     readonly type = "Identifier";
     public value: string;
+    public quoted: boolean;
 }
 
 export class NullExpression extends Expression {

package/src/tests/db-tests/tests/select-map.ts

@@ -0,0 +1,19 @@
+import assert from "assert";
+import { TestConfig } from "../../TestConfig.js";
+import { createContext, headPhoneCategory } from "../../model/createContext.js";
+import Sql from "../../../sql/Sql.js";
+
+export default async function(this: TestConfig) {
+
+    if (!this.db) {
+        return;
+    }
+
+    const context = await createContext(this.driver);
+
+    const f = await context.orderItems.all()
+        .map({}, (p) => ({ orderID, amount }) => ({ orderID, amount }))
+        .first();
+
+    console.log(f);
+}

package/src/workflows/WorkflowStorage.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import { randomUUID } from "crypto";
 import Column from "../decorators/Column.js";
 import Index from "../decorators/Index.js";
@@ -293,7 +294,7 @@ export default class WorkflowStorage {
                     list.push(iterator);
                 }
             } catch (error) {
-                console.error(error);            
+                console.error(error);
             }
         }
         return list;