Skip to content

Commit

Permalink
export MPS Concept alias/shortDescription to LW JSON annotation
Browse files Browse the repository at this point in the history
  • Loading branch information
Niko Stotz committed May 27, 2024
1 parent a88c0ef commit c18ace0
Show file tree
Hide file tree
Showing 16 changed files with 4,110 additions and 123 deletions.
2 changes: 2 additions & 0 deletions changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog for LionWeb-MPS

## Next
* For concepts with alias and/or short description, export annotation with that information.

* Filter nodes of abstract concepts or interfaces from exporting to LionWeb JSON.

* Updated both technical and reference documentation.
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version=0.2.4-SNAPSHOT
lionwebRelease=2023.1
lionwebJavaVersion=0.2.9
lionwebJavaVersion=0.2.14-SNAPSHOT
mpsVersionSuffix=2021.1
mpsVersion=2021.1.4
mpsExtensionsVersion=2021.1.2365.a4d7bb2
Expand Down
9 changes: 9 additions & 0 deletions ...web.mps.converter.TestAbstract/models/io.lionweb.mps.converter.TestAbstract.structure.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<concept id="2992811758677295509" name="jetbrains.mps.lang.structure.structure.AttributeInfo" flags="ng" index="M6xJ_" />
<concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
<property id="6714410169261853888" name="conceptId" index="EcuMT" />
<property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
<property id="4628067390765956802" name="abstract" index="R5$K7" />
<property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
</concept>
Expand Down Expand Up @@ -43,6 +44,7 @@
<property role="R5$K7" value="true" />
<property role="19KtqR" value="true" />
<property role="34LRSv" value="AbstractPartition" />
<property role="R4oN_" value="Short Desc AbstractPartition" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="3KvTa3" id="34Q84zM$f93" role="lGtFl">
<property role="3KvTac" value="true" />
Expand All @@ -53,6 +55,7 @@
<property role="TrG5h" value="ConcretePartition" />
<property role="19KtqR" value="true" />
<property role="34LRSv" value="ConcretePartition" />
<property role="R4oN_" value="Short Desc ConcretePartition" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="3KvTa3" id="34Q84zM$f96" role="lGtFl">
<property role="3KvTac" value="true" />
Expand All @@ -63,32 +66,38 @@
<property role="TrG5h" value="AbstractConcept" />
<property role="R5$K7" value="true" />
<property role="34LRSv" value="AbstractConcept" />
<property role="R4oN_" value="Short Desc AbstractConcept" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
</node>
<node concept="1TIwiD" id="34Q84zM$f99">
<property role="EcuMT" value="3546057254280163913" />
<property role="TrG5h" value="ConcreteConcept" />
<property role="34LRSv" value="ConcreteConcept" />
<property role="R4oN_" value="Short Desc ConcreteConcept" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
</node>
<node concept="1TIwiD" id="34Q84zM$f9a">
<property role="EcuMT" value="3546057254280163914" />
<property role="TrG5h" value="AbstractAnnotation" />
<property role="R5$K7" value="true" />
<property role="34LRSv" value="AbstractAnnotation" />
<property role="R4oN_" value="Short Desc AbstractAnnotation" />
<ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
<node concept="M6xJ_" id="34Q84zM$f9b" role="lGtFl" />
</node>
<node concept="1TIwiD" id="34Q84zM$f9d">
<property role="EcuMT" value="3546057254280163917" />
<property role="TrG5h" value="ConcreteAnnotation" />
<property role="34LRSv" value="ConcreteAnnotation" />
<property role="R4oN_" value="Short Desc ConcreteAnnotation" />
<ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
<node concept="M6xJ_" id="34Q84zM$f9e" role="lGtFl" />
</node>
<node concept="PlHQZ" id="34Q84zM$f9f">
<property role="EcuMT" value="3546057254280163919" />
<property role="TrG5h" value="AbstractInterface" />
<property role="R4oN_" value="Short Desc AbstractInterface" />
<property role="34LRSv" value="AbstractInterface" />
</node>
</model>

89 changes: 54 additions & 35 deletions languages/io.lionweb.mps.converter.lang/models/io.lionweb.mps.converter.lang.intentions.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,41 +601,6 @@
</node>
</node>
<node concept="3clFbH" id="z1IqfFSRxr" role="3cqZAp" />
<node concept="3cpWs8" id="z1IqfFSPZD" role="3cqZAp">
<node concept="3cpWsn" id="z1IqfFSPZE" role="3cpWs9">
<property role="TrG5h" value="deserializer" />
<node concept="3uibUv" id="z1IqfFSPWh" role="1tU5fm">
<ref role="3uigEE" to="6peh:z1IqfFwqda" resolve="Deserializer" />
</node>
<node concept="2ShNRf" id="z1IqfFSPZF" role="33vP2m">
<node concept="1pGfFk" id="z1IqfFSPZG" role="2ShVmc">
<ref role="37wK5l" to="6peh:z1IqfFwqeg" resolve="Deserializer" />
<node concept="37vLTw" id="z1IqfFSPZH" role="37wK5m">
<ref role="3cqZAo" node="z1IqfFSMnI" resolve="inputStream" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="z1IqfFSQk$" role="3cqZAp">
<node concept="3cpWsn" id="z1IqfFSQk_" role="3cpWs9">
<property role="TrG5h" value="jsonLanguages" />
<node concept="_YKpA" id="z1IqfFSQiz" role="1tU5fm">
<node concept="3uibUv" id="z1IqfFSQiA" role="_ZDj9">
<ref role="3uigEE" to="imb3:~Language" resolve="Language" />
</node>
</node>
<node concept="2OqwBi" id="z1IqfFSQkA" role="33vP2m">
<node concept="37vLTw" id="z1IqfFSQkB" role="2Oq$k0">
<ref role="3cqZAo" node="z1IqfFSPZE" resolve="deserializer" />
</node>
<node concept="liA8E" id="z1IqfFSQkC" role="2OqNvi">
<ref role="37wK5l" to="6peh:5wsogBc3YTv" resolve="deserializeLanguages" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="z1IqfFSR_T" role="3cqZAp" />
<node concept="3cpWs8" id="5M3rB6C9CdV" role="3cqZAp">
<node concept="3cpWsn" id="5M3rB6C9CdW" role="3cpWs9">
<property role="TrG5h" value="repository" />
Expand Down Expand Up @@ -671,6 +636,51 @@
</node>
</node>
</node>
<node concept="3cpWs8" id="z1IqfFSPZD" role="3cqZAp">
<node concept="3cpWsn" id="z1IqfFSPZE" role="3cpWs9">
<property role="TrG5h" value="deserializer" />
<node concept="3uibUv" id="z1IqfFSPWh" role="1tU5fm">
<ref role="3uigEE" to="6peh:z1IqfFwqda" resolve="Deserializer" />
</node>
<node concept="2ShNRf" id="z1IqfFSPZF" role="33vP2m">
<node concept="1pGfFk" id="z1IqfFSPZG" role="2ShVmc">
<ref role="37wK5l" to="6peh:z1IqfFwqeg" resolve="Deserializer" />
<node concept="37vLTw" id="z1IqfFSPZH" role="37wK5m">
<ref role="3cqZAo" node="z1IqfFSMnI" resolve="inputStream" />
</node>
<node concept="2ShNRf" id="5hsSXrmD6rv" role="37wK5m">
<node concept="1pGfFk" id="5hsSXrmDcUm" role="2ShVmc">
<ref role="37wK5l" to="6peh:5JNiskj4SJa" resolve="JsonConstants" />
<node concept="2YIFZM" id="5hsSXrmDeQ3" role="37wK5m">
<ref role="37wK5l" to="imb3:~LionCoreBuiltins.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="imb3:~LionCoreBuiltins" resolve="LionCoreBuiltins" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="5hsSXrmD5g8" role="3cqZAp" />
<node concept="3cpWs8" id="z1IqfFSQk$" role="3cqZAp">
<node concept="3cpWsn" id="z1IqfFSQk_" role="3cpWs9">
<property role="TrG5h" value="jsonLanguages" />
<node concept="_YKpA" id="z1IqfFSQiz" role="1tU5fm">
<node concept="3uibUv" id="z1IqfFSQiA" role="_ZDj9">
<ref role="3uigEE" to="imb3:~Language" resolve="Language" />
</node>
</node>
<node concept="2OqwBi" id="z1IqfFSQkA" role="33vP2m">
<node concept="37vLTw" id="z1IqfFSQkB" role="2Oq$k0">
<ref role="3cqZAo" node="z1IqfFSPZE" resolve="deserializer" />
</node>
<node concept="liA8E" id="z1IqfFSQkC" role="2OqNvi">
<ref role="37wK5l" to="6peh:5wsogBc3YTv" resolve="deserializeLanguages" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="z1IqfFSR_T" role="3cqZAp" />
<node concept="3cpWs8" id="5M3rB6C9D6w" role="3cqZAp">
<node concept="3cpWsn" id="5M3rB6C9D6x" role="3cpWs9">
<property role="TrG5h" value="mapper" />
Expand Down Expand Up @@ -1707,6 +1717,15 @@
<node concept="37vLTw" id="1apSfP9EUNZ" role="37wK5m">
<ref role="3cqZAo" node="1apSfP9EUNO" resolve="inputStream" />
</node>
<node concept="2ShNRf" id="5hsSXrmDfRr" role="37wK5m">
<node concept="1pGfFk" id="5hsSXrmDfRs" role="2ShVmc">
<ref role="37wK5l" to="6peh:5JNiskj4SJa" resolve="JsonConstants" />
<node concept="2YIFZM" id="5hsSXrmDfRt" role="37wK5m">
<ref role="37wK5l" to="imb3:~LionCoreBuiltins.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="imb3:~LionCoreBuiltins" resolve="LionCoreBuiltins" />
</node>
</node>
</node>
</node>
</node>
</node>
Expand Down
10 changes: 10 additions & 0 deletions solutions/io.lionweb.mps.client.connector/models/io.lionweb.mps.client.connector.impl.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
<import index="imb3" ref="9d6d7230-3178-4b3f-a837-7c0180c86207/java:io.lionweb.lioncore.java.language(io.lionweb.lionweb.java/)" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
Expand Down Expand Up @@ -1473,6 +1474,15 @@
<ref role="37wK5l" to="781x:~HttpResponse.body()" resolve="body" />
</node>
</node>
<node concept="2ShNRf" id="5hsSXrmD6rv" role="37wK5m">
<node concept="1pGfFk" id="5hsSXrmDcUm" role="2ShVmc">
<ref role="37wK5l" to="6peh:5JNiskj4SJa" resolve="JsonConstants" />
<node concept="2YIFZM" id="5hsSXrmDeQ3" role="37wK5m">
<ref role="37wK5l" to="imb3:~LionCoreBuiltins.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="imb3:~LionCoreBuiltins" resolve="LionCoreBuiltins" />
</node>
</node>
</node>
</node>
</node>
</node>
Expand Down
9 changes: 9 additions & 0 deletions solutions/io.lionweb.mps.json.test.support/models/io.lionweb.mps.json.test.support.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,15 @@
<node concept="37vLTw" id="5wsogBctiIh" role="37wK5m">
<ref role="3cqZAo" node="5sACIIsjktS" resolve="input" />
</node>
<node concept="2ShNRf" id="5hsSXrmD6rv" role="37wK5m">
<node concept="1pGfFk" id="5hsSXrmDcUm" role="2ShVmc">
<ref role="37wK5l" to="6peh:5JNiskj4SJa" resolve="JsonConstants" />
<node concept="2YIFZM" id="5hsSXrmDeQ3" role="37wK5m">
<ref role="37wK5l" to="imb3:~LionCoreBuiltins.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="imb3:~LionCoreBuiltins" resolve="LionCoreBuiltins" />
</node>
</node>
</node>
</node>
</node>
</node>
Expand Down
11 changes: 10 additions & 1 deletion solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.json2lioncore@tests.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,15 @@
</node>
</node>
</node>
<node concept="2ShNRf" id="5hsSXrmD6rv" role="37wK5m">
<node concept="1pGfFk" id="5hsSXrmDcUm" role="2ShVmc">
<ref role="37wK5l" to="6peh:5JNiskj4SJa" resolve="JsonConstants" />
<node concept="2YIFZM" id="5hsSXrmDeQ3" role="37wK5m">
<ref role="37wK5l" to="imb3:~LionCoreBuiltins.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="imb3:~LionCoreBuiltins" resolve="LionCoreBuiltins" />
</node>
</node>
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -1058,7 +1067,7 @@
<ref role="3xOPvv" node="18UigYR952J" resolve="TestAnnotation" />
</node>
<node concept="Xl_RD" id="1xqd6pt3Z53" role="2XxRq1">
<property role="Xl_RC" value="TestAnnotation-metamodel.json" />
<property role="Xl_RC" value="TestAnnotation-metamodel-nodescriptions.json" />
</node>
</node>
</node>
Expand Down
36 changes: 34 additions & 2 deletions solutions/io.lionweb.mps.json.test/models/io.lionweb.mps.json.test.json2slanguage@tests.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,29 @@
</node>
</node>
</node>
<node concept="1LZb2c" id="5IwPrBrF9at" role="1SL9yI">
<property role="TrG5h" value="TestAbstract" />
<node concept="3cqZAl" id="5IwPrBrF9au" role="3clF45" />
<node concept="3clFbS" id="5IwPrBrF9av" role="3clF47">
<node concept="3clFbF" id="5IwPrBrHVrN" role="3cqZAp">
<node concept="2OqwBi" id="5IwPrBrHVrO" role="3clFbG">
<node concept="2WthIp" id="5IwPrBrHVrP" role="2Oq$k0" />
<node concept="2XshWL" id="5IwPrBrHVrQ" role="2OqNvi">
<ref role="2WH_rO" node="5ocQ9W1x$VD" resolve="export" />
<node concept="pHN19" id="5IwPrBrHVrR" role="2XxRq1">
<node concept="2V$Bhx" id="5IwPrBrI0U4" role="2V$M_3">
<property role="2V$B1T" value="3ecd737b-418b-4a70-a991-f6b83f0e3247" />
<property role="2V$B1Q" value="io.lionweb.mps.converter.TestAbstract" />
</node>
</node>
<node concept="Xl_RD" id="5IwPrBrHW5I" role="2XxRq1">
<property role="Xl_RC" value="TestAbstract-metamodel.json" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1lH9Xt" id="5sACIIszQ7U">
<property role="TrG5h" value="importJson2SLanguage" />
Expand Down Expand Up @@ -493,7 +516,7 @@
<node concept="3clFbS" id="5ocQ9W1vI8$" role="1zxBo7">
<node concept="3cpWs8" id="5ocQ9W1vI8_" role="3cqZAp">
<node concept="3cpWsn" id="5ocQ9W1vI8A" role="3cpWs9">
<property role="TrG5h" value="unserializer" />
<property role="TrG5h" value="deserializer" />
<node concept="3uibUv" id="5ocQ9W1vI8B" role="1tU5fm">
<ref role="3uigEE" to="6peh:z1IqfFwqda" resolve="Deserializer" />
</node>
Expand All @@ -508,6 +531,15 @@
</node>
</node>
</node>
<node concept="2ShNRf" id="5hsSXrmD6rv" role="37wK5m">
<node concept="1pGfFk" id="5hsSXrmDcUm" role="2ShVmc">
<ref role="37wK5l" to="6peh:5JNiskj4SJa" resolve="JsonConstants" />
<node concept="2YIFZM" id="5hsSXrmDeQ3" role="37wK5m">
<ref role="37wK5l" to="imb3:~LionCoreBuiltins.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="imb3:~LionCoreBuiltins" resolve="LionCoreBuiltins" />
</node>
</node>
</node>
</node>
</node>
</node>
Expand All @@ -522,7 +554,7 @@
</node>
<node concept="2OqwBi" id="5ocQ9W1vI8L" role="33vP2m">
<node concept="37vLTw" id="5ocQ9W1vI8M" role="2Oq$k0">
<ref role="3cqZAo" node="5ocQ9W1vI8A" resolve="unserializer" />
<ref role="3cqZAo" node="5ocQ9W1vI8A" resolve="deserializer" />
</node>
<node concept="liA8E" id="5ocQ9W1vI8N" role="2OqNvi">
<ref role="37wK5l" to="6peh:5wsogBc3YTv" resolve="deserializeLanguages" />
Expand Down
Loading

0 comments on commit c18ace0

Please sign in to comment.