Skip to content

Updated Joinpoints.ts generation to integrate with Event System #68

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

Open
racoelhosilva wants to merge 4 commits into
base: staging
Choose a base branch
from
Open

Updated Joinpoints.ts generation to integrate with Event System #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4708100
feat: integrated event system on Joinpoints.ts generation
racoelhosilva Jul 23, 2024
9c66c4d
fix: changed the Event import path
racoelhosilva Jul 26, 2024
bfb6b52
Merge branch 'feature/lara-js' into feature/event-system
racoelhosilva Jul 28, 2024
1939051
Merge branch 'staging' into feature/event-system
racoelhosilva Sep 8, 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
4 changes: 3 additions & 1 deletion Lara-JS/scripts/build-interfaces.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ import {
registerJoinpointMapper,
wrapJoinPoint,
unwrapJoinPoint,
} from "lara-js/api/LaraJoinPoint.js";\n\n`
} from "lara-js/api/LaraJoinPoint.js";
import eventListener from "./clava/events/EventListener.js";
import { Event, EventTime } from "./clava/events/Events.js";\n\n`
Comment on lines +65 to +66
Copy link
Member

@joaobispo joaobispo Aug 22, 2024

Choose a reason for hiding this comment

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

The LARA framework should not know about the existence of Clava, which uses it. This is a sign that the events code currently in the Clava repository should be moved to the LARA framework repository, into the adequate folder.

I suggest moving moving the files to lara-framework/Lara-JS/src-api/lara/events and update imports accordingly.

Copy link
Member

@joaobispo joaobispo Aug 22, 2024

Choose a reason for hiding this comment

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

After looking at the code in PR#157, it is not immediately possible to move the code the the lara-framework, it would need further refactoring in order to separate the Events interface from the Clava-specific implementation.

);

generateDefaultAttributeMappers(specification.joinpoints, outputFile);
Expand Down
19 changes: 17 additions & 2 deletions Lara-JS/scripts/generate-ts-joinpoints.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,28 @@ function generateJoinpointAction(action, outputFile, joinpoints) {
)
.join(", ");

const eventParameters = action.parameters
.map((parameter) => parameter.name.split(":")[0])
.join(", ");

fs.writeSync(
outputFile,
`${generateDocumentation(action.tooltip)} ${action.name}(${parameters}): ${
action.returnType
} { return wrapJoinPoint(this._javaObject.${
} {
eventListener.emit("ACTION", new Event(EventTime.BEFORE, "${
action.name
}", this, undefined${
eventParameters.length > 0 ? `, ${eventParameters}` : ""
}));
const res = wrapJoinPoint(this._javaObject.${
action.name
}(${callParameters})); }\n`
}(${callParameters}));
eventListener.emit("ACTION", new Event(EventTime.AFTER, "${
action.name
}", this, res${eventParameters.length > 0 ? `, ${eventParameters}` : ""}));
return res;
}\n`
);
}

Expand Down