v.0.4.2

Correções na mapeando de references sem instanciado do atributo

Author: fernandocode

package.json

@@ -1,6 +1,6 @@
 {
   "name": "database-builder",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Library to assist in creating and maintaining SQL commands.",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

src/metadata-table.ts

@@ -87,16 +87,20 @@ export class MetadataTable<T> extends MetadataTableBase<T> {
         const columnKey = this.columnName(expressionKey);
         const column = `${columnReference}_${columnKey}`;
         const instance = this.validInstanceMapper(this.instance, column);
-        const referenceInstance = this.validExpressionMapper(instance, expression)(instance);
-        const mapperReference = this.getMapper(referenceInstance.constructor.name);
-        const mapperColumnReference = mapperReference.mapperTable.getColumnByField(expressionKey);
+        let fieldType: FieldType;
+        if (type) {
+            fieldType = this._databaseHelper.getFieldType(type);
+        } else {
+            const referenceInstance = this.validExpressionMapper(instance, expression)(instance);
+            const mapperReference = this.getMapper(referenceInstance.constructor.name);
+            const mapperColumnReference = mapperReference.mapperTable.getColumnByField(expressionKey);
+            fieldType = mapperColumnReference
+                ? mapperColumnReference.fieldType
+                : this.getTypeByExpression(referenceInstance, this.validExpressionMapper(referenceInstance, expressionKey));
+        }
         this.addReference(
             column,
-            type
-                ? this._databaseHelper.getFieldType(type)
-                : mapperColumnReference
-                    ? mapperColumnReference.fieldType
-                    : this.getTypeByExpression(referenceInstance, this.validExpressionMapper(referenceInstance, expressionKey))
+            fieldType
         );
         return this;
     }
@@ -165,7 +169,8 @@ export class MetadataTable<T> extends MetadataTableBase<T> {
     private validExpressionMapper<TReturn, TType>(
         instance: TType, expression: ReturnExpression<TReturn, TType>
     ): ReturnExpression<TReturn, TType> {
-        if (Utils.isNull(expression) || Utils.isNull(expression(instance))) {
+        const expressionByInstance = expression(instance);
+        if (Utils.isNull(expression) || Utils.isNull(expressionByInstance)) {
             throw new DatabaseBuilderError(`Mapper: ${this.newable.name}, can not get instance of mapped property ('${this.columnName(expression)}')`);
         }
         return expression;

src/test/mapper.spec.ts

@@ -29,8 +29,11 @@ describe("Mapper", () => {
         m = m.ignore(x => x.cliente);
         expect(m.mapperTable.getColumnByField(expressionClienteKey)).to.equal(void 0);
         m = m.referenceKey(x => x.cliente, x => x.idErp);
+        m = m.referenceKey(x => x.clienteNotInitialized, x => x.idErp, Number);
         const expressionClienteCodeImport: Expression<ContasAReceber> = (x => x.cliente.idErp);
+        const expressionClienteNotInitializedCodeImport: Expression<ContasAReceber> = (x => x.clienteNotInitialized.idErp);
         expect(m.mapperTable.getColumnByField(expressionClienteCodeImport).column).to.equal(Utils.getColumn(expressionClienteCodeImport));
+        expect(m.mapperTable.getColumnByField(expressionClienteNotInitializedCodeImport).column).to.equal(Utils.getColumn(expressionClienteNotInitializedCodeImport));
     });
 
     const mapperGuidClass = mapperBase.mapper(GuidClazz)

src/test/models/contas-a-receber.ts

@@ -6,6 +6,7 @@ export class ContasAReceber extends BaseModelErp {
     // public numero: string = "";
     // public dataEmissao: moment.Moment = moment();
     public cliente: Cliente = new Cliente();
+    public clienteNotInitialized: Cliente;
     public dataVencimento: moment.Moment = moment();
     public dataRecebimento: string;
     // public dataProtesto: moment.Moment = moment();