develop change tokens in interpreted mode

finos · Nov 1, 2024 · 965baeb · 965baeb
1 parent 7a25c3f
commit 965baeb
Show file tree

Hide file tree

Showing 106 changed files with 6,424 additions and 6,656 deletions.
diff --git a/...n/java/org/finos/legend/engine/language/pure/compiler/toPureGraph/HelperModelBuilder.java b/...n/java/org/finos/legend/engine/language/pure/compiler/toPureGraph/HelperModelBuilder.java
@@ -80,7 +80,7 @@ public static org.eclipse.collections.api.block.function.Function<Property, org.
             if (property.defaultValue != null)
             {
                 LambdaFunction<?> lambdaFunction = HelperValueSpecificationBuilder.buildLambda(Collections.singletonList(property.defaultValue.value), Collections.emptyList(), context);
-                defaultValue = new Root_meta_pure_metamodel_function_property_DefaultValue_Impl(null, SourceInformationHelper.toM3SourceInformation(property.defaultValue.sourceInformation), null);
+                defaultValue = new Root_meta_pure_metamodel_function_property_DefaultValue_Impl(null, SourceInformationHelper.toM3SourceInformation(property.defaultValue.sourceInformation), context.pureModel.getClass("meta::pure::metamodel::function::property::DefaultValue"));
                 defaultValue._functionDefinition(lambdaFunction);
             }
             GenericType returnGenericType = context.resolveGenericType(property.type, property.propertyTypeSourceInformation);

diff --git a/...-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/README.md b/...-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/README.md
@@ -8,7 +8,7 @@ Pure IDE Light is a development environment for Pure, the language underlying th
 From the root of legend-engine, run the following to launch the Pure IDE Light server.
 
 ```
-mvn -pl legend-engine-pure-ide-light exec:java -Dexec.mainClass="org.finos.legend.engine.ide.PureIDELight" -Dexec.args="server ./legend-engine-pure-ide-light/src/main/resources/ideLightConfig.json"
+mvn -pl legend-engine-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server exec:java -Dexec.mainClass="org.finos.legend.engine.ide.PureIDELight" -Dexec.args="server ./legend-engine-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/src/main/resources/ideLightConfig.json"
 ```
 
 Then navigate to http://127.0.0.1/ide
diff --git a/legend-engine-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/pom.xml b/legend-engine-pure/legend-engine-pure-ide/legend-engine-pure-ide-light-http-server/pom.xml
@@ -260,6 +260,16 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-pure-runtime-java-extension-interpreted-functions-legendCompiler</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-pure-runtime-java-extension-interpreted-functions-javaCompiler</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-pure-runtime-java-extension-compiled-functions-javaCompiler</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.finos.legend.engine</groupId>

diff --git a/...ne-pure-ide-light-http-server/src/main/java/org/finos/legend/engine/ide/PureIDELight.java b/...ne-pure-ide-light-http-server/src/main/java/org/finos/legend/engine/ide/PureIDELight.java
@@ -99,6 +99,7 @@ protected MutableList<RepositoryCodeStorage> buildRepositories(SourceLocationCon
                 .with(this.buildCore("legend-engine-xts-haskell/legend-engine-xt-haskell-pure", "external-language-haskell"))
                 .with(this.buildCore("legend-engine-xts-daml/legend-engine-xt-daml-pure", "external-language-daml"))
                 .with(this.buildCore("legend-engine-xts-changetoken/legend-engine-xt-changetoken-pure", "pure-changetoken"))
+                .with(this.buildCore("legend-engine-xts-changetoken/legend-engine-xt-changetoken-test-pure", "pure-changetoken-test"))
                 .with(this.buildCore("legend-engine-xts-analytics/legend-engine-xts-analytics-mapping/legend-engine-xt-analytics-mapping-pure", "analytics-mapping"))
                 .with(this.buildCore("legend-engine-xts-analytics/legend-engine-xts-analytics-class/legend-engine-xt-analytics-class-pure", "analytics-class"))
                 .with(this.buildCore("legend-engine-xts-analytics/legend-engine-xts-analytics-binding/legend-engine-xt-analytics-binding-pure", "analytics-binding"))

diff --git a/legend-engine-xts-changetoken/legend-engine-xt-changetoken-compiler/pom.xml b/legend-engine-xts-changetoken/legend-engine-xt-changetoken-compiler/pom.xml
@@ -44,10 +44,6 @@
             <groupId>org.eclipse.collections</groupId>
             <artifactId>eclipse-collections-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-pure-code-compiled-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-changetoken-pure</artifactId>

diff --git a/...n-compiler/src/main/java/org/finos/legend/engine/changetoken/generation/GenerateDiff.java b/...n-compiler/src/main/java/org/finos/legend/engine/changetoken/generation/GenerateDiff.java
@@ -81,20 +81,6 @@ public GenerateDiff(List<PackageableElement> newEntities, List<PackageableElemen
         PureModelContextData pureModelContextData = pureModelContextDataBuilder.build();
         executionSupport = new CompiledExecutionSupport(new JavaCompilerState(null, classLoader), new CompiledProcessorSupport(classLoader, MetadataLazy.fromClassLoader(classLoader, CodeRepositoryProviderHelper.findCodeRepositories().collect(CodeRepository::getName)), Sets.mutable.empty()), null, new CompositeCodeStorage(new VersionControlledClassLoaderCodeStorage(classLoader, Lists.mutable.of(CodeRepositoryProviderHelper.findPlatformCodeRepository()), null)), null, null, new ConsoleCompiled(), new FunctionCache(), new ClassCache(classLoader), null, Sets.mutable.empty(), CompiledExtensionLoader.extensions());
         pureModel = new PureModel(pureModelContextData, Identity.getAnonymousIdentity().getName(), classLoader, DeploymentMode.PROD);
-        JavaSourceCodeGenerator javaSourceCodeGenerator = new JavaSourceCodeGenerator(new MixedProcessorSupport(pureModel.getExecutionSupport().getProcessorSupport()), new EmptyCodeStorage(), false, null, false, pureModel.getExecutionSupport().getCompiledExtensions(), "ChangeTokens", null, false);
-        MutableSet<String> allTypes = pureModel.getModelClasses().collect(a ->
-                core_pure_corefunctions_metaExtension.Root_meta_pure_functions_meta_fullPackageName_PackageableElement_1__String_1__String_1_((org.finos.legend.pure.m3.coreinstance.meta.pure.metamodel.PackageableElement) a, "::", pureModel.getExecutionSupport())).toSet();
-        MutableList<StringJavaSource> javaSources = Lists.mutable.empty();
-        javaSources.addAllIterable(javaSourceCodeGenerator.generatePureCoreHelperClasses(javaSourceCodeGenerator.getProcessorContext()));
-        javaSources.addAllIterable(javaSourceCodeGenerator.generateCode(allTypes));
-        try
-        {
-            compiler.compile(javaSources);
-        }
-        catch (PureJavaCompileException e)
-        {
-            throw new RuntimeException(e);
-        }
     }
 
     private static PureMap toPureMap(Map objectNode)

diff --git a/...piler/src/test/java/org/finos/legend/engine/changetoken/generation/GenerateCast2Test.java b/...piler/src/test/java/org/finos/legend/engine/changetoken/generation/GenerateCast2Test.java
diff --git a/...piler/src/test/java/org/finos/legend/engine/changetoken/generation/GenerateCast3Test.java b/...piler/src/test/java/org/finos/legend/engine/changetoken/generation/GenerateCast3Test.java