[API] TypeScript transformation - db/ormstatements

components/api/api-modules-javascript/src/main/resources/META-INF/dirigible/modules/src/db/ormstatements.ts

@@ -13,19 +13,22 @@
 
 import { Logging } from "sdk/log";
 import * as sql from "./sql";
+import { ORMProperty } from "./orm";
 
-export function ORMStatements(orm, dialect) {
-	this.$log = Logging.getLogger('db.dao.ormstatements');
+
+export function ORMStatements(orm: ORMProperty, dialect: sql.Dialect): void {
+	this.$log = logging.getLogger('db.dao.ormstatements');
 	this.orm = orm;
 	this.orm.tableName = this.orm.table;
-	this.orm.properties.forEach(function (property) {
+	this.orm.properties.forEach((property) => {
 		property.columnName = property.column;
 	});
 	this.dialect = dialect || sql.getDialect();
 };
 ORMStatements.prototype.constructor = ORMStatements;
 
-ORMStatements.prototype.createTable = function () {
+
+ORMStatements.prototype.createTable = function(): sql.CreateTable {
 	const builder = this.dialect.create().table(this.orm.table);
 
 	this.orm.properties.forEach(function (property) {
@@ -47,20 +50,23 @@ ORMStatements.prototype.createTable = function () {
 	return builder;
 };
 
-ORMStatements.prototype.dropTable = function () {
+
+ORMStatements.prototype.dropTable = function(): sql.DropTable{
 	return this.dialect.drop().table(this.orm.table);
 };
 
-ORMStatements.prototype.insert = function () {
+
+ORMStatements.prototype.insert = function(): sql.Insert{
 	const builder = this.dialect.insert().into(this.orm.table);
 	this.orm.properties.forEach(function (property) {
 		builder.column(property.column).value('?', property);
 	});
 	return builder;
 };
 
-ORMStatements.prototype.update = function (entity) {
-	if (!entity)
+
+ORMStatements.prototype.update = function(entity: Object): sql.Update{
+	if(!entity)
 		throw Error('Illegal argument: entity[' + entity + ']');
 
 	const builder = this.dialect.update().table(this.orm.table);
@@ -74,7 +80,9 @@ ORMStatements.prototype.update = function (entity) {
 	builder.where(pkProperty.column + '=?', [pkProperty]);
 	return builder;
 };
-ORMStatements.prototype["delete"] = ORMStatements.prototype.remove = function () {
+
+
+ORMStatements.prototype["delete"] = ORMStatements.prototype.remove = function(): sql.Delete {
 	const builder = this.dialect.delete().from(this.orm.table);
 	if (arguments[0] !== undefined) {
 		let filterFieldNames = arguments[0];
@@ -89,7 +97,9 @@ ORMStatements.prototype["delete"] = ORMStatements.prototype.remove = function ()
 	}
 	return builder;
 };
-ORMStatements.prototype.find = function (params) {
+
+
+ORMStatements.prototype.find = function(params?: { select: sql.Select }): sql.Select{
 	let builder = this.dialect.select();
 	if (params !== undefined && params.select !== undefined) {
 		const selectedFields = params.select.constructor === Array ? params.select : [params.select];
@@ -100,16 +110,23 @@ ORMStatements.prototype.find = function (params) {
 			builder = builder.column(property.column);
 		}
 	}
+
 	builder = builder.from(this.orm.table)
 		.where(this.orm.getPrimaryKey().column + "=?", [this.orm.getPrimaryKey()]);
 	return builder;
 };
-ORMStatements.prototype.count = function (settings) {
+
+
+type ORMListSettings = { $limit?: string, $offset?: string, $sort?: string, $order?: string, $select?: string[], $filter?: string[],
+	limit?: string, offset?: string, sort?: string, order?: string, select?: string[], filter?: string[]};
+ORMStatements.prototype.count = function (settings: ORMListSettings): sql.Select {
 	const builder = this.dialect.select().column('COUNT(*)').from(this.orm.table);
 	addFilter(this.orm, builder, settings);
 	return builder;
 };
-ORMStatements.prototype.list = function (settings) {
+
+ORMStatements.prototype.list= function(settings: ORMListSettings): sql.Select {
+
 	let i;
 	settings = settings || {};
 	const sort = settings.$sort || settings.sort;
@@ -132,13 +149,14 @@ ORMStatements.prototype.list = function (settings) {
 	addFilter(this.orm, builder, settings);
 
 	// TODO: The following code might not be needed anymore
-	const propertyDefinitions = this.orm.properties.filter(function (property) {
+	const propertyDefinitions = this.orm.properties.filter((property) => {
 		for (var settingName in settings) {
 			if (settingName === property.name)
 				return true;
 		}
 		return false;
 	});
+
 	if (propertyDefinitions.length > 0) {
 		for (i = 0; i < propertyDefinitions.length; i++) {
 			const def = propertyDefinitions[i];
@@ -184,7 +202,7 @@ ORMStatements.prototype.list = function (settings) {
 };
 
 
-function addFilter(orm, builder, settings) {
+function addFilter(orm: ORMProperty, builder: sql.Select, settings: ORMListSettings): void {
 	//add where clause for any fields
 	if (settings?.$filter) {
 		const equalsPropertiesKeys = Object.keys(settings.$filter.equals ?? []);
@@ -231,14 +249,16 @@ function addFilter(orm, builder, settings) {
 	}
 }
 
-function addLimitAndOffset(builder, settings) {
+function addLimitAndOffset(builder: sql.Select, settings: ORMListSettings): void {
 	const limit = settings.$limit ?? settings.limit;
 	const offset = settings.$offset ?? settings.offset;
 	if (limit !== undefined && offset !== undefined) {
 		builder.limit(parseInt(limit, 10)).offset(parseInt(offset, 10));
 	}
 }
-export function create(orm, connection) {
+
+
+export function create(orm: ORMProperty, connection?: { native: any }): typeof ORMStatements{
 	let dialect;
 	if (connection) {
 		dialect = sql.getDialect(connection);