Merge pull request #12 from 188599/minification-support

188599 · web-flow · commit 6d24947b8c50 · 2022-01-05T14:35:44.000-03:00
provided a way to specify table name during mapping
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,18 +7,24 @@
   "scripts": {
     "test": "tsc & mocha src/test/**/*.spec.js",
     "test-grep": "tsc & mocha src/test/**/*.spec.js --grep",
-    "test-single": "tsc & mocha src/test/**/*.spec.js --grep Mapper --debug-brk",
+    "test-single": "tsc && mocha --inspect src/test/**/*.spec.js --grep Mapper",
     "test-debug": "mocha -r ts-node/register src/test/**/*.spec.ts --debug-brk",
     "lint": "tslint -p tsconfig.json",
     "build": "tsc",
     "publish-npm": "tsc & npm publish",
     "publish-npm-alpha": "tsc && npm publish --tag alpha",
-    "pack": "cd dist/ & npm pack ../"
+    "pack": "cd dist/ & npm pack ../",
+    "minify": "terser -o minification-test.spec.min.js -m -- minification-test.spec.js",
+    "mapper-test-minified": "tsc && npm run minify && mocha --inspect minification-test.spec.min.js",
+    "terser": "terser",
+    "compile-watch": "tsc -w",
+    "mocha": "mocha"
   },
   "dependencies": {
     "lambda-expression": ">=0.1.4",
     "lodash": "^4.17.15",
     "moment": "^2.22.0",
+    "reflect-metadata": "^0.1.13",
     "rxjs": "^6.5.3",
     "uuid": "^3.3.2"
   },
@@ -35,9 +41,10 @@
     "mocha": "^6.2.2",
     "sinon": "^9.0.0",
     "sqlite3": "^4.1.1",
+    "terser": "^5.10.0",
     "ts-node": "^8.5.4",
     "tslint": "^5.20.1",
-    "typescript": "~3.2.2"
+    "typescript": "^4.5.4"
   },
   "keywords": [
     "orm",
diff --git a/src/adapters/sqlite3-database-adapter.ts b/src/adapters/sqlite3-database-adapter.ts
@@ -39,7 +39,7 @@ export class SQLite3DatabaseAdapter extends BaseDatabaseAdapter<SQLite3ObjectInt
         databaseNative: SQLite3ObjectInterface
     ): (fn: (transaction: WebSqlTransactionInterface) => void) => Promise<any> {
         return (fn: (transaction: DatabaseBaseTransaction) => void): Promise<any> => {
-            return new Promise<any>((resolve, reject) => {
+            return new Promise<void>((resolve, reject) => {
                 this.executeSql(databaseNative, "BEGIN TRANSACTION", [])
                     .then(_ => {
                         try {
diff --git a/src/core/row-result.ts b/src/core/row-result.ts
@@ -70,7 +70,7 @@ export class RowResult<T> {
                 ModelUtils.set(result, column.fieldReference, value);
                 // TODO: essa associação será redundante para itens de primeiro nivel, mas será mantida para compatibilidade com itens de segundo nivel ou mais, pois há mapper que buscam a propriedade de sub nivel pelo nome da coluna por exemplo: 'cliente_cidade_uf_id'
                 // BREAKING-CHANGE: Na proxima versão da aplicação essa compatibilidade deve ser removida, o que era causar quebra de versão, onde terá que ser alterada implementações que o "mapper" para obter valores de propriedades de sub nivel.
-                result[column.column] = value;
+                (result as any)[column.column] = value;
             }
         });
         return result;
diff --git a/src/core/utils.ts b/src/core/utils.ts
@@ -205,10 +205,6 @@ export class Utils {
         return this.isQueryCompilable(value) || this.isQueryCompiledArray(value);
     }
 
-    public static databaseName<T>(tablename: TypeOrString<T>): string {
-        return this.getValueByTypeOrString(tablename);
-    }
-
     public static getMapperTable<T>(
         typeT: (new () => T) | QueryBuilder<T> | { _builder: () => QueryBuilder<T> },
         getMapper: (tKey: (new () => any) | string) => MetadataTable<any>
@@ -244,10 +240,6 @@ export class Utils {
                             : ExpressionOrValueEnum.Expression;
     }
 
-    public static getValueByTypeOrString<T>(param: TypeOrString<T>): string {
-        return this.isString(param) ? param as string : (param as (new () => T)).name;
-    }
-
     public static getColumn<TReturn, T>(expression: ExpressionOrColumn<TReturn, T>, separator?: string): string {
         const type = this.expressionOrColumn(expression);
         switch (type) {
diff --git a/src/crud/crud.ts b/src/crud/crud.ts
@@ -10,6 +10,7 @@ import { Utils } from "../core/utils";
 import { KeyUtils } from "../core/key-utils";
 import { QueryBuilder } from "./query/query-builder";
 import { MetadataTableBase } from "../metadata-table-base";
+import { MapperUtils } from "../mapper/mapper-utils";
 
 export class Crud {
     public enableLog: boolean;
@@ -137,16 +138,13 @@ export class Crud {
     }
 
     private getDatabase() {
-        // if (!this._database) {
-        //     throw new DatabaseBuilderError("Transaction ou Database not specified in query.");
-        // }
         return this._database;
     }
 
     private getMapper<T>(tKey: (new () => T) | string): MetadataTable<T> {
         const metadata = this._getMapper.get(tKey);
         if (Utils.isNull(metadata)) {
-            throw new DatabaseBuilderError(`Mapper for "${Utils.isString(tKey) ? tKey : (tKey as new () => T).name}" not found!"`);
+            throw new DatabaseBuilderError(`Mapper for "${MapperUtils.resolveKey(tKey)}" not found!"`);
         }
         return metadata;
     }
diff --git a/src/crud/delete/delete-columns-builder.ts b/src/crud/delete/delete-columns-builder.ts
@@ -10,6 +10,5 @@ export class DeleteColumnsBuilder<T> extends ColumnsValuesBuilder<T, DeleteColum
 
     protected columnFormat(column: Column): string {
         throw new DatabaseBuilderError(`Mapper '${this.mapperTable.tableName}', method not supported.`);
-        // throw new DatabaseBuilderError(`Mapper '${this.metadata.newable.name}', method not supported.`);
     }
 }
diff --git a/src/crud/insert/insert-columns-builder.ts b/src/crud/insert/insert-columns-builder.ts
@@ -12,11 +12,6 @@ export class InsertColumnsBuilder<T> extends ColumnsValuesBuilder<T, InsertColum
         return super.isAddColumn(column) && !(column.primaryKeyType === PrimaryKeyType.AutoIncrement);
     }
 
-    // protected columnFormat(column: Column): string {
-    //     // return column.primaryKeyType === PrimaryKeyType.AutoIncrement ? void 0 : column.name;
-    //     // return column.isAutoIncrement ? void 0 : column.name;
-    // }
-
     protected allowGenerateKey(): boolean {
         return true;
     }
diff --git a/src/crud/projection-builder.ts b/src/crud/projection-builder.ts
@@ -14,6 +14,7 @@ import { DatabaseBuilderError } from "../core/errors";
 import { SqlCompilable } from "./sql-compilable";
 import { ProjectionModel } from "./projection-model";
 import { ProjectionCompile } from "./projection-compile";
+import { MapperUtils } from "../mapper/mapper-utils";
 
 export class ProjectionBuilder<T> {
     private _projections: ProjectionModel[] = [];
@@ -47,7 +48,7 @@ export class ProjectionBuilder<T> {
 
     public allByMap(metadata: MetadataTable<T>) {
         if (Utils.isNull(metadata)) {
-            throw new DatabaseBuilderError(`Mapper not found for '${this._typeT.name}'`);
+            throw new DatabaseBuilderError(`Mapper not found for '${MapperUtils.resolveKey(this._typeT)}'`);
         }
         this.selectAllColumns(metadata.mapperTable);
     }
diff --git a/src/crud/sql-base-builder.ts b/src/crud/sql-base-builder.ts
@@ -29,8 +29,8 @@ export abstract class SqlBaseBuilder<T> implements QueryCompilable {
         this._alias = this.createAlias(this._alias, this._tablename);
     }
 
-    protected createTablename<TTable>(currentTypeT: new () => TTable, currentMapper: MapperTable): string {
-        return currentTypeT ? currentTypeT.name : currentMapper.tableName;
+    protected createTablename<TTable>(_currentTypeT: new () => TTable, currentMapper: MapperTable): string {
+        return currentMapper.tableName;
     }
 
     protected createAlias(currentAlias: string, currentTablename: string): string {
diff --git a/src/database-helper.ts b/src/database-helper.ts
@@ -4,6 +4,7 @@ import * as moment from "moment";
 import { FieldType } from "./core/enums/field-type";
 import { ColumnType } from "./core/enums/column-type";
 import { DatabaseBuilderError } from "./core/errors";
+import { MapperUtils } from "./mapper/mapper-utils";
 
 export class DatabaseHelper {
 
@@ -32,7 +33,7 @@ export class DatabaseHelper {
     }
 
     public getFieldType<T>(type: string | (new () => T), constructorName?: string) {
-        const typeCase: string = (Utils.isString(type) ? type as string : (type as new () => void).name).toLowerCase();
+        const typeCase: string = typeof type === 'string' ? type : MapperUtils.resolveKey(type).toLowerCase();
         switch (typeCase) {
             case "string":
                 return FieldType.STRING;
@@ -77,7 +78,7 @@ export class DatabaseHelper {
     public getType(value: ValueTypeToParse): FieldType {
         const valueFormatted = this.preFormatValue(value);
         const tipo = typeof valueFormatted;
-        return this.getFieldType(tipo, valueFormatted ? valueFormatted.constructor.name : void 0);
+        return this.getFieldType(tipo, valueFormatted?.constructor.name);
     }
 
     public parseToColumnType(type: FieldType): ColumnType {
diff --git a/src/ddl/alter/alter-builder.ts b/src/ddl/alter/alter-builder.ts
@@ -4,6 +4,7 @@ import { MapperTable } from "../../mapper-table";
 import { DdlCompiled } from "../../core/ddl-compided";
 import { ExpressionOrColumn, Utils, ValueTypeToParse } from "../../core/utils";
 import { DatabaseBuilderError } from "../../core";
+import { MapperUtils } from "../../mapper/mapper-utils";
 
 export class AlterBuilder<T> extends DdlBaseBuilder<T> {
 
@@ -13,7 +14,7 @@ export class AlterBuilder<T> extends DdlBaseBuilder<T> {
         typeT: new () => T,
         private readonly _mapperTable: MapperTable
     ) {
-        super(typeT && typeT.name ? typeT.name : _mapperTable.tableName);
+        super(_mapperTable.tableName);
         if (Utils.isNull(_mapperTable)) {
             throw new DatabaseBuilderError(`Mapper not found for '${this._tablename}'`);
         }
@@ -50,7 +51,7 @@ export class AlterBuilder<T> extends DdlBaseBuilder<T> {
     public renameTable<TNewTable>(
         newTableName: string | (new () => TNewTable)
     ): AlterBuilder<T> {
-        this._patternOperation = () => `RENAME TO ${(Utils.isString(newTableName) ? newTableName as string : (newTableName as new () => void).name)}`;
+        this._patternOperation = () => `RENAME TO ${MapperUtils.resolveKey(newTableName)}`;
         return this;
     }
 
diff --git a/src/ddl/create/create-builder.ts b/src/ddl/create/create-builder.ts
@@ -11,7 +11,7 @@ export class CreateBuilder<T> extends DdlBaseBuilder<T> {
         typeT: new () => T,
         private _mapperTable: MapperTable
     ) {
-        super(typeT && typeT.name ? typeT.name : _mapperTable.tableName);
+        super(_mapperTable.tableName);
         if (Utils.isNull(_mapperTable)) {
             throw new DatabaseBuilderError(`Mapper not found for '${this._tablename}'`);
         }
diff --git a/src/ddl/ddl.ts b/src/ddl/ddl.ts
@@ -67,7 +67,7 @@ export class Ddl {
                     FROM sqlite_master
                 WHERE type = 'table' AND
                         name = ?;
-                `, [Utils.databaseName(tablename)])
+                `, [this._getMapper.get(tablename).tableName])
                 .then(result => {
                     resolve(result.rows.length > 0);
                 })
@@ -87,7 +87,7 @@ export class Ddl {
                 SELECT name
                     FROM pragma_table_info(?)
                 WHERE name = ?;
-                `, [Utils.databaseName(tablename), Utils.getColumn(column)])
+                `, [this._getMapper.get(tablename).tableName, Utils.getColumn(column)])
                 .then(result => {
                     resolve(result.rows.length > 0);
                 })
diff --git a/src/ddl/drop/drop-builder.ts b/src/ddl/drop/drop-builder.ts
@@ -10,7 +10,7 @@ export class DropBuilder<T> extends DdlBaseBuilder<T> {
         typeT: new () => T,
         private _mapperTable: MapperTable
     ) {
-        super(typeT && typeT.name ? typeT.name : _mapperTable.tableName);
+        super(_mapperTable.tableName);
         if (Utils.isNull(_mapperTable)) {
             throw new DatabaseBuilderError(`Mapper not found for '${this._tablename}'`);
         }
diff --git a/src/mapper/mapper-base.ts b/src/mapper/mapper-base.ts
diff --git a/src/mapper/mapper-utils.ts b/src/mapper/mapper-utils.ts
diff --git a/src/metadata-table.ts b/src/metadata-table.ts
diff --git a/src/test/managed-transaction.spec.ts b/src/test/managed-transaction.spec.ts
diff --git a/src/test/mapper.spec.ts b/src/test/mapper.spec.ts
diff --git a/src/test/models/mapper-test-model.ts b/src/test/models/mapper-test-model.ts

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export class RowResult<T> {`
`70`	`70`	`ModelUtils.set(result, column.fieldReference, value);`
`71`	`71`	`// TODO: essa associação será redundante para itens de primeiro nivel, mas será mantida para compatibilidade com itens de segundo nivel ou mais, pois há mapper que buscam a propriedade de sub nivel pelo nome da coluna por exemplo: 'cliente_cidade_uf_id'`
`72`	`72`	`// BREAKING-CHANGE: Na proxima versão da aplicação essa compatibilidade deve ser removida, o que era causar quebra de versão, onde terá que ser alterada implementações que o "mapper" para obter valores de propriedades de sub nivel.`
`73`		`- result[column.column] = value;`
	`73`	`+ (result as any)[column.column] = value;`
`74`	`74`	`}`
`75`	`75`	`});`
`76`	`76`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import { Utils } from "../core/utils";`
`10`	`10`	`import { KeyUtils } from "../core/key-utils";`
`11`	`11`	`import { QueryBuilder } from "./query/query-builder";`
`12`	`12`	`import { MetadataTableBase } from "../metadata-table-base";`
	`13`	`+import { MapperUtils } from "../mapper/mapper-utils";`
`13`	`14`
`14`	`15`	`export class Crud {`
`15`	`16`	`public enableLog: boolean;`
`@@ -137,16 +138,13 @@ export class Crud {`
`137`	`138`	`}`
`138`	`139`
`139`	`140`	`private getDatabase() {`
`140`		`- // if (!this._database) {`
`141`		`- // throw new DatabaseBuilderError("Transaction ou Database not specified in query.");`
`142`		`- // }`
`143`	`141`	`return this._database;`
`144`	`142`	`}`
`145`	`143`
`146`	`144`	`private getMapper<T>(tKey: (new () => T) \| string): MetadataTable<T> {`
`147`	`145`	`const metadata = this._getMapper.get(tKey);`
`148`	`146`	`if (Utils.isNull(metadata)) {`
`149`		- throw new DatabaseBuilderError(`Mapper for "${Utils.isString(tKey) ? tKey : (tKey as new () => T).name}" not found!"`);
	`147`	+ throw new DatabaseBuilderError(`Mapper for "${MapperUtils.resolveKey(tKey)}" not found!"`);
`150`	`148`	`}`
`151`	`149`	`return metadata;`
`152`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,5 @@ export class DeleteColumnsBuilder<T> extends ColumnsValuesBuilder<T, DeleteColum`
`10`	`10`
`11`	`11`	`protected columnFormat(column: Column): string {`
`12`	`12`	throw new DatabaseBuilderError(`Mapper '${this.mapperTable.tableName}', method not supported.`);
`13`		- // throw new DatabaseBuilderError(`Mapper '${this.metadata.newable.name}', method not supported.`);
`14`	`13`	`}`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,6 @@ export class InsertColumnsBuilder<T> extends ColumnsValuesBuilder<T, InsertColum`
`12`	`12`	`return super.isAddColumn(column) && !(column.primaryKeyType === PrimaryKeyType.AutoIncrement);`
`13`	`13`	`}`
`14`	`14`
`15`		`- // protected columnFormat(column: Column): string {`
`16`		`- // // return column.primaryKeyType === PrimaryKeyType.AutoIncrement ? void 0 : column.name;`
`17`		`- // // return column.isAutoIncrement ? void 0 : column.name;`
`18`		`- // }`
`19`		`-`
`20`	`15`	`protected allowGenerateKey(): boolean {`
`21`	`16`	`return true;`
`22`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import { DatabaseBuilderError } from "../core/errors";`
`14`	`14`	`import { SqlCompilable } from "./sql-compilable";`
`15`	`15`	`import { ProjectionModel } from "./projection-model";`
`16`	`16`	`import { ProjectionCompile } from "./projection-compile";`
	`17`	`+import { MapperUtils } from "../mapper/mapper-utils";`
`17`	`18`
`18`	`19`	`export class ProjectionBuilder<T> {`
`19`	`20`	`private _projections: ProjectionModel[] = [];`
`@@ -47,7 +48,7 @@ export class ProjectionBuilder<T> {`
`47`	`48`
`48`	`49`	`public allByMap(metadata: MetadataTable<T>) {`
`49`	`50`	`if (Utils.isNull(metadata)) {`
`50`		- throw new DatabaseBuilderError(`Mapper not found for '${this._typeT.name}'`);
	`51`	+ throw new DatabaseBuilderError(`Mapper not found for '${MapperUtils.resolveKey(this._typeT)}'`);
`51`	`52`	`}`
`52`	`53`	`this.selectAllColumns(metadata.mapperTable);`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ export abstract class SqlBaseBuilder<T> implements QueryCompilable {`
`29`	`29`	`this._alias = this.createAlias(this._alias, this._tablename);`
`30`	`30`	`}`
`31`	`31`
`32`		`- protected createTablename<TTable>(currentTypeT: new () => TTable, currentMapper: MapperTable): string {`
`33`		`- return currentTypeT ? currentTypeT.name : currentMapper.tableName;`
	`32`	`+ protected createTablename<TTable>(_currentTypeT: new () => TTable, currentMapper: MapperTable): string {`
	`33`	`+ return currentMapper.tableName;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`protected createAlias(currentAlias: string, currentTablename: string): string {`