Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[API] TypeScript transformation - mongodb #3409

Closed
wants to merge 4 commits into from
Closed

[API] TypeScript transformation - mongodb #3409

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d11023
Added types to parameters and methods
TIVMOF Feb 8, 2024
32fb593
Added more types to parameters and methods
TIVMOF Feb 8, 2024
3508e9b
Added more types to parameters
TIVMOF Feb 9, 2024
c1192fd
Added more types to parameters ana methods in dao.ts
TIVMOF Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...pi-modules-javascript/src/main/resources/META-INF/dirigible/modules/src/mongodb/client.ts
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dbObject is changed from DBObject to any, because this method is used in dao.ts with {} type, instead of DBObject.

Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class DBCollection {

constructor(private native: any) { }

insert(dbObject: DBObject): void {
insert(dbObject: any): void {
dbObject = implicit(dbObject);
this.native.insert(dbObject.native);
};
Expand Down
30 changes: 15 additions & 15 deletions ...i/api-modules-javascript/src/main/resources/META-INF/dirigible/modules/src/mongodb/dao.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ const mongoClient = mongodb.getClient();
const db = mongoClient.getDB();

export class DAO {
$log;
$log: any;

constructor(private orm, logCtxName, dataSourceName, databaseType) {
constructor(private orm, logCtxName: string, dataSourceName: string, databaseType: string) {
if (orm === undefined) {
throw Error('Illegal argument: orm[' + orm + ']');
}
Expand All @@ -39,7 +39,7 @@ export class DAO {
this.$log = logging.getLogger(loggerName);
}

notify(event, ...a) {
notify(event: string, ...a: any): void {
var func = this[event];
if (!this[event])
return;
Expand All @@ -50,7 +50,7 @@ export class DAO {
};

//Prepare a JSON object for insert into DB
createNoSQLEntity(entity) {
createNoSQLEntity(entity: any): {} {
var persistentItem = {};
var mandatories = this.orm.getMandatoryProperties();
for (var i = 0; i < mandatories.length; i++) {
Expand All @@ -73,7 +73,7 @@ export class DAO {
return persistentItem;
};

validateEntity(entity, skip) {
validateEntity(entity: any, skip: any): void {
if (entity === undefined || entity === null) {
throw new Error('Illegal argument: entity is ' + entity);
}
Expand All @@ -97,7 +97,7 @@ export class DAO {
}
};

insert(_entity) {
insert(_entity: any): any {

var entities = _entity;
if (_entity.constructor !== Array) {
Expand Down Expand Up @@ -161,7 +161,7 @@ export class DAO {
};

// update entity from a JSON object. Returns the id of the updated entity.
update(entity) {
update(entity: any): DAO {

this.$log.info('Updating {}[{}] entity', this.orm.table, entity !== undefined ? entity[this.orm.getPrimaryKey().name] : entity);

Expand Down Expand Up @@ -198,7 +198,7 @@ export class DAO {
};

// delete entity by id, or array of ids, or delete all (if not argument is provided).
remove(id) {
remove(id: number): void {

var ids = [];
if (arguments.length === 0) {
Expand All @@ -220,7 +220,7 @@ export class DAO {

for (var i = 0; i < ids.length; i++) {

var id = ids[i];
var id: number = ids[i];

if (ids.length > 1)
this.$log.info('Deleting {}[{}] entity', this.orm.table, id);
Expand All @@ -245,7 +245,7 @@ export class DAO {

};

expand(expansionPath, context) {
expand(expansionPath: string, context: any): void {
this.$log.info('Expanding for association path {} and context entity {}', expansionPath, (typeof arguments[1] !== 'object' ? 'id ' : '') + JSON.stringify(arguments[1]));
throw Error("Not implemented.");
};
Expand All @@ -255,7 +255,7 @@ export class DAO {
If requested as expanded the returned entity will comprise associated (dependent) entities too. Expand can be a string tha tis a valid association name defined in this dao orm or
an array of such names.
*/
find(id, expand, select) {
find(id: number, expand: any, select: any): any {

if (typeof arguments[0] === 'object') {
id = arguments[0].id;
Expand All @@ -270,7 +270,7 @@ export class DAO {
}

try {
var entity;
var entity: any;
if (select !== undefined) {
if (select.constructor !== Array) {
if (select.constructor === String) {
Expand Down Expand Up @@ -313,7 +313,7 @@ export class DAO {
}
};

count() {
count(): number {

this.$log.info('Counting ' + this.orm.table + ' entities');

Expand Down Expand Up @@ -342,7 +342,7 @@ export class DAO {
* - $limit
* - $offset
*/
list(settings) {
list(settings: any): any[] {

settings = settings || {};

Expand Down Expand Up @@ -444,7 +444,7 @@ export class DAO {
* oDefinition can be table definition or standard orm definition object. Or it can be a valid path to
* a .table file, or any other text file contianing a standard dao orm definition.
*/
export function create(oDefinition, logCtxName, dataSourceName, databaseType) {
export function create(oDefinition: any, logCtxName: string, dataSourceName: string, databaseType: string): DAO {
var orm;

orm = oDefinition;
Expand Down