Skip to content

Commit

Permalink
feat(react): language with higher level abstractions
Browse files Browse the repository at this point in the history
Original messages:

create-delete-render utility
factory now with better defaults
initial version of node factory done
error reporting annotation works
error handling progress
generic error box
initial example implementation of error checking
more grid support
basic grid support
now with custom widget
basic ref target chooser works
dropdown
value converters
checkbox widget
more work on the tree
the MUI TreeView is working
more styling support
work on styles and colors and typography
improvement in the layout components
more editor components
cosmetics
implemented Accordion Component and an example tree, plus cosmetics
started the tree example
renderer call syntax improved and type check added
improved actions for buttons
added higher-level abstractions for buttons
details
layout improved
more high-level MUI componenets
moved all the modules into the "modules" directory, similar to the other ones
factored out the Element renderer
hello world works
  • Loading branch information
markusvoelter authored and slisson committed Jan 25, 2025
1 parent ec61257 commit 719669a
Show file tree
Hide file tree
Showing 31 changed files with 20,254 additions and 8 deletions.
2 changes: 1 addition & 1 deletion kernelf-angular-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@angular/platform-browser": "^14.0.0",
"@angular/platform-browser-dynamic": "^14.0.0",
"@angular/router": "^14.0.0",
"@modelix/ts-model-api": "file:../../modelix.core/ts-model-api",
"@modelix/ts-model-api": "3.16.0",
"angular-split": "^14.0.0",
"@modelix/kernelf-editor": "file:../kernelf-editor/build/packages/modelix-kernelf-editor.tgz",
"rxjs": "~7.5.0",
Expand Down
6 changes: 6 additions & 0 deletions mps/.mps/modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,21 @@
<project version="4">
<component name="MPSProject">
<projectModules>
<modulePath path="$PROJECT_DIR$/modules/ReactDemoLanguage.editor/ReactDemoLanguage.editor.msd" folder="react.demo" />
<modulePath path="$PROJECT_DIR$/modules/ReactDemoLanguage.sandbox/ReactDemoLanguage.sandbox.msd" folder="react.demo" />
<modulePath path="$PROJECT_DIR$/modules/ReactDemoLanguage/ReactDemoLanguage.mpl" folder="react.demo" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.notation.impl.baseLanguage/org.modelix.mps.notation.impl.baseLanguage.msd" folder="text" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.notation/org.modelix.mps.notation.mpl" folder="text" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.react.ide/org.modelix.mps.react.ide.msd" folder="react" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.react.impl.baseLanguage/org.modelix.mps.react.impl.baseLanguage.msd" folder="react" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.react.muicomponents/org.modelix.mps.react.muicomponents.mpl" folder="react" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.react/org.modelix.mps.react.mpl" folder="react" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.spreadsheets.sandbox/org.modelix.mps.spreadsheets.sandbox.msd" folder="spreadsheets" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.spreadsheets/org.modelix.mps.spreadsheets.mpl" folder="spreadsheets" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.webaspect.devkit/org.modelix.mps.webaspect.devkit.devkit" folder="aspect" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.webaspect.genplan/org.modelix.mps.webaspect.genplan.msd" folder="aspect" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.webaspect.runtime/org.modelix.mps.webaspect.runtime.msd" folder="aspect" />
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.react.stdlib/org.modelix.mps.react.stdlib.msd" folder="react" />
</projectModules>
</component>
</project>
3 changes: 3 additions & 0 deletions mps/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ mpsBuild {
publication("react") {
module("org.modelix.mps.react")
}
publication("react-demo") {
module("ReactDemoLanguage.editor")
}
}

tasks.all {
Expand Down
45 changes: 45 additions & 0 deletions mps/modules/ReactDemoLanguage.editor/ReactDemoLanguage.editor.msd
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="ReactDemoLanguage.editor" uuid="8975e489-e827-4983-b7e9-804018e8618e" moduleVersion="0">
<models>
<modelRoot type="default" contentPath="${module}">
<sourceRoot location="models" />
</modelRoot>
</models>
<facets>
<facet type="java" compile="mps" classes="mps" ext="yes" languageLevel="JAVA_10">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
<dependencies>
<dependency reexport="false">dce965c2-af99-4a0c-9895-485700f46864(ReactDemoLanguage)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">72343e01-0d46-4549-a287-bbee5acf1444(org.modelix.mps.react.stdlib)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:67accce2-9676-4728-9e9c-8b15ea30d924:org.modelix.mps.react" version="0" />
<language slang="l:09a61cec-0c2d-4a90-b590-25e493b12f35:org.modelix.mps.react.muicomponents" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="dce965c2-af99-4a0c-9895-485700f46864(ReactDemoLanguage)" version="0" />
<module reference="8975e489-e827-4983-b7e9-804018e8618e(ReactDemoLanguage.editor)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="72343e01-0d46-4549-a287-bbee5acf1444(org.modelix.mps.react.stdlib)" version="0" />
</dependencyVersions>
</solution>

Loading

0 comments on commit 719669a

Please sign in to comment.