Enhance grammar to support attribute mapping from sources to target #45

martin-fleck-at · 2023-12-07T20:21:03Z

Provide mapping grammar for source objects, joins and target mapping
Add new element creation for mappings in toolbar and context menu
Adapt custom serializer for new attributes
Add example for mapping

Refactorings:

Split grammar into multiple files
Replace id and id references with unquoted text
Fix auto completion in text files through completion lexer and parser
Enhance auto-completion for string, number, and boolean

Please note this PR is based on #44 to avoid conflicts but only the last commit serves the functionality described above. I'd suggest to merge the other PR first and then this one after a rebase.

github-actions · 2023-12-07T20:29:15Z

Unit Test Results

    3 files ±0   30 suites ±0 2m 32s ⏱️ -1s
  68 tests ±0   68 ✔️ ±0 0 💤 ±0 0 ❌ ±0
207 runs ±0 207 ✔️ ±0 0 💤 ±0 0 ❌ ±0

Results for commit 8460854. ± Comparison against base commit bf4c2c0.

♻️ This comment has been updated with latest results.

- Provide mapping grammar for source objects, joins and target mapping - Add new element creation for mappings in toolbar and context menu - Adapt custom serializer for new attributes - Add example for mapping Refactorings: - Split grammar into multiple files - Replace id and id references with unquoted text - Fix auto completion in text files through completion lexer and parser - Enhance auto-completion for string, number, and boolean

harmen-xb

@martin-fleck-at

I completed the other PR and rebased this branch onto latest main where I had to solve some conflicts. I think I did it the right way, but maybe you can double check.

I reviewed the code, where I put some comments on.

I also ran the tests and I see some Jest tests are failing. Could you have a look at these?

Also when I start CrossModel now the diagrams are not working anymore.

examples/mapping-example/ExampleCRM/relationships/Order_Customer.relationship.cm

extensions/crossmodel-lang/src/language-server/cross-model-validator.ts

- Only export root nodes and entity attributes for external reference - Properly check exported ids and local ids

- Workspace initialization was cancelled when a document was opened

martin-fleck-at · 2023-12-08T21:02:37Z

@harmen-xb Thank you for your review! I addressed all your concerns in a follow up commit.

harmen-xb · 2023-12-14T20:10:54Z

@martin-fleck-at Thanks for the update, sorry it took a while for me to have time to look at it.

Some observations:

Everything works fine if I only have one workspace open, but when I first open the examples/yaml-example workspace and then the e2e-tests/src/resources/sample-workspace, in the yaml-example workspace things stop working for me.

I think it depends in which order I open the workspaces which one stops working.

In this example I first openend yaml-example, and it all worked fine. Then I opended e2e-tests/src/resources/sample-workspace in the same browser on a second tab and things stopped working for the yaml-example workspace, while it works fine in the sample-workspace.

Examples within the yaml-example workspace:

When I open the form editor, it doesn't automatically update the model when changing any value. It does update when I press CTRL+S, but this was not how this perspective used to work. I have autosave enabled.
When I now click on an entity in the diagram it throws an error while trying to update the property widget:

2023-12-14T20:03:22.671Z root ERROR Request requestDiagramNodeEntityModel failed with error: Request server/requestModelDiagramNode failed with message: AST node has no document. Error: Request server/requestModelDiagramNode failed with message: AST node has no document.
    at handleResponse (/workspaces/crossmodel/node_modules/vscode-jsonrpc/lib/common/connection.js:565:48)
    at handleMessage (/workspaces/crossmodel/node_modules/vscode-jsonrpc/lib/common/connection.js:345:13)
    at processMessageQueue (/workspaces/crossmodel/node_modules/vscode-jsonrpc/lib/common/connection.js:362:17)
    at Immediate.<anonymous> (/workspaces/crossmodel/node_modules/vscode-jsonrpc/lib/common/connection.js:334:13)
    at processImmediate (node:internal/timers:466:21)

When I close and re-open the perspectives the within that single workspace the problems remain.

- Create one ModelServiceImpl per frontend connection - Improve connection reporting for server clients - Replace temporary workspace files with port commands -- Query command contributed by extension -- Extension forwards command execution to language server

martin-fleck-at · 2023-12-15T13:51:59Z

@harmen-xb Good catch! I think that was a problem that was always present but with the new commit everything should work much more stabler.

harmen-xb · 2023-12-15T16:51:43Z

@martin-fleck-at Thanks for the update! It all works quite well, functionaly I don't see any issues, but I do get error message in the console while opening a workspace:

2023-12-15T16:43:46.902Z root ERROR Request executeCommand failed with error: The command 'glsp:port' cannot be executed. There are no active handlers available for the command. Error: The command 'glsp:port' cannot be executed. There are no active handlers available for the command.
    at CommandRegistry.executeCommand (http://localhost:3000/bundle.js:64979:29)
    at RpcProxyFactory.onRequest (http://localhost:3000/bundle.js:70028:49)
    at RpcProtocol.requestHandler (http://localhost:3000/bundle.js:70009:80)
    at RpcProtocol.handleRequest (http://localhost:3000/bundle.js:69185:39)
    at RpcProtocol.handleMessage (http://localhost:3000/bundle.js:69087:26)
    at http://localhost:3000/bundle.js:69070:66
    at http://localhost:3000/bundle.js:66120:69
    at CallbackList.invoke (http://localhost:3000/bundle.js:66126:26)
    at Emitter.fire (http://localhost:3000/bundle.js:66241:36)
    at ChannelMultiplexer.handleData (http://localhost:3000/bundle.js:68743:38)

2023-12-15T16:50:21.859Z root ERROR Request executeCommand failed with error: Unhandled method modelserver:port Error: Unhandled method modelserver:port
    at handleResponse (/workspaces/crossmodel/extensions/crossmodel-lang/out/extension.cjs:5360:40)
    at handleMessage (/workspaces/crossmodel/extensions/crossmodel-lang/out/extension.cjs:5169:11)
    at processMessageQueue (/workspaces/crossmodel/extensions/crossmodel-lang/out/extension.cjs:5184:13)
    at Immediate.<anonymous> (/workspaces/crossmodel/extensions/crossmodel-lang/out/extension.cjs:5160:11)
    at processImmediate (node:internal/timers:466:21)

martin-fleck-at · 2023-12-15T16:58:02Z

@harmen-xb Yeah, I saw that too but unfortunately it is a log statement that automatically happens in Theia, see https://github.com/eclipse-theia/theia/blob/c30a79f90d9393e392cabfebbce612695cbe0d40/packages/core/src/common/messaging/proxy-factory.ts#L177. Even though it re-throws the error and we catch and ignore it the log already happens. If it is a big issue, I can definitely see how to best fix it.

harmen-xb · 2023-12-15T17:40:08Z

It's not a big issue, it's just something I didn't see before. And the console was all nice and clean lately :).

martin-fleck-at · 2023-12-17T21:02:35Z

@harmen-xb If everything else works, could you please approve the PR so we can merge it or is there anything else I should have a look at?

harmen-xb

Changes all look good. For the mentioned issue in the comment I will make an issue on repo level. Is there an issue in Theia already for this port error message?

harmen-xb · 2023-12-18T06:31:47Z

@martin-fleck-at Yes, PR is merged.

The port error message should be an issue on the Theia repo I assume?

martin-fleck-at · 2023-12-18T08:57:36Z

@harmen-xb Yes, that is correct.

martin-fleck-at · 2023-12-19T11:58:42Z

@harmen-xb I opened a ticket on the Theia side for it: eclipse-theia/theia#13189

martin-fleck-at force-pushed the feature/mapping branch from 7735d88 to 43c0d44 Compare December 7, 2023 20:32

harmen-xb force-pushed the feature/mapping branch from 43c0d44 to f4dd129 Compare December 8, 2023 10:30

Updated e2e example and yaml-example files to match the new grammer.

742e19d

harmen-xb requested changes Dec 8, 2023

View reviewed changes

examples/mapping-example/ExampleCRM/relationships/Order_Customer.relationship.cm Outdated Show resolved Hide resolved

extensions/crossmodel-lang/src/language-server/cross-model-validator.ts Show resolved Hide resolved

martin-fleck-at added 2 commits December 8, 2023 21:29

Fix test cases and clean up id validation

1a7ffdc

- Only export root nodes and entity attributes for external reference - Properly check exported ids and local ids

Fix opening of editors by waiting for workspace initialization

b9adbdb

- Workspace initialization was cancelled when a document was opened

harmen-xb self-requested a review December 18, 2023 06:26

harmen-xb approved these changes Dec 18, 2023

View reviewed changes

harmen-xb merged commit 0e252e7 into main Dec 18, 2023
5 checks passed

harmen-xb deleted the feature/mapping branch December 18, 2023 06:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enhance grammar to support attribute mapping from sources to target #45

Enhance grammar to support attribute mapping from sources to target #45

martin-fleck-at commented Dec 7, 2023

github-actions bot commented Dec 7, 2023 •

edited

Loading

harmen-xb left a comment •

edited

Loading

martin-fleck-at commented Dec 8, 2023

harmen-xb commented Dec 14, 2023

martin-fleck-at commented Dec 15, 2023

harmen-xb commented Dec 15, 2023

martin-fleck-at commented Dec 15, 2023

harmen-xb commented Dec 15, 2023

martin-fleck-at commented Dec 17, 2023

harmen-xb left a comment

harmen-xb commented Dec 18, 2023

martin-fleck-at commented Dec 18, 2023

martin-fleck-at commented Dec 19, 2023

Enhance grammar to support attribute mapping from sources to target #45

Enhance grammar to support attribute mapping from sources to target #45

Conversation

martin-fleck-at commented Dec 7, 2023

github-actions bot commented Dec 7, 2023 • edited Loading

Unit Test Results

harmen-xb left a comment • edited Loading

Choose a reason for hiding this comment

martin-fleck-at commented Dec 8, 2023

harmen-xb commented Dec 14, 2023

martin-fleck-at commented Dec 15, 2023

harmen-xb commented Dec 15, 2023

martin-fleck-at commented Dec 15, 2023

harmen-xb commented Dec 15, 2023

martin-fleck-at commented Dec 17, 2023

harmen-xb left a comment

Choose a reason for hiding this comment

harmen-xb commented Dec 18, 2023

martin-fleck-at commented Dec 18, 2023

martin-fleck-at commented Dec 19, 2023

github-actions bot commented Dec 7, 2023 •

edited

Loading

harmen-xb left a comment •

edited

Loading