More memory customizations

Author: LSafer

README.md

@@ -45,6 +45,9 @@ jamplate {
     memory 'Text', 'Value'
     memory 'Object', '{"Key": "Value"}'
     memory 'Array', '["item1", "item2"]'
+    memory 'Dynamic', { memory -> 'Dynamic Variable'}
+    memory "Random", {'' + (long) (Math.random() * (1L << 60))}
+    memory "Document", {'' + it.frame.instruction?.tree?.document()}
 }
 ```
 

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'org.jamplate'
-version '0.2.2'
+version '0.2.3'
 
 repositories {
 	mavenCentral()
@@ -16,7 +16,8 @@ repositories {
 }
 
 dependencies {
-	implementation 'org.jamplate:processor:0.2.2'
+	implementation 'org.jamplate:processor:0.2.3'
+	implementation 'org.json:json:20210307'
 }
 
 pluginBundle {

src/main/groovy/org/jamplate/gradle/JamplateExtension.groovy

@@ -15,14 +15,42 @@
  */
 package org.jamplate.gradle
 
+import org.jamplate.model.Compilation
+import org.jamplate.model.Memory
+import org.jamplate.model.Value
+import org.json.JSONObject
+
+import java.util.function.Function
+
 class JamplateExtension {
-	Map defaultMemory = new HashMap<>()
+	Map<String, Object> defaultMemory = new HashMap<>()
+	Function<Compilation, Memory> memorySupplier
+
+	void memory(String address, String value) {
+		defaultMemory.put(address, value)
+	}
+
+	void memory(String address, Number number) {
+		defaultMemory.put(address, number)
+	}
 
-	void memory(String address, Object value) {
+	void memory(String address, Value value) {
 		defaultMemory.put(address, value)
 	}
 
+	void memory(String address, List value) {
+		defaultMemory.put(address, value)
+	}
+
+	void memory(String address, Map value) {
+		defaultMemory.put(address, new JSONObject(value))
+	}
+
 	void memory(Map map) {
 		defaultMemory.putAll(map)
 	}
+
+	void replaceMemorySupplier(Function<Compilation, Memory> memorySupplier) {
+		this.memorySupplier = memorySupplier
+	}
 }

src/main/groovy/org/jamplate/gradle/JamplatePlugin.groovy

@@ -129,6 +129,7 @@ class JamplatePlugin implements Plugin<Project> {
 				it.input = input
 				it.output = output
 				it.defaultMemory = extension.defaultMemory
+				it.memorySupplier = extension.memorySupplier
 			}
 			//make the java compile task run after the jamplate task
 			project.tasks.named(sourceSet.compileJavaTaskName) {

src/main/groovy/org/jamplate/gradle/ProcessJamplateTask.groovy

@@ -27,6 +27,9 @@ import org.jamplate.impl.model.FileDocument
 import org.jamplate.model.Compilation
 import org.jamplate.model.Document
 import org.jamplate.model.Environment
+import org.jamplate.model.Memory
+
+import java.util.function.Function
 
 @SuppressWarnings('GrMethodMayBeStatic')
 class ProcessJamplateTask extends DefaultTask {
@@ -35,22 +38,19 @@ class ProcessJamplateTask extends DefaultTask {
 	@OutputDirectory
 	File output
 
-	protected Map defaultMemory
+	protected Map<String, Object> defaultMemory
+	protected Function<Compilation, Memory> memorySupplier
 
 	@TaskAction
 	void processJamplate() throws IOException {
-		jamplate(input, output, defaultMemory)
-	}
-
-	protected static void jamplate(File input, File output, Map memoryDefaults) {
 		Objects.requireNonNull(input, "input")
 		Objects.requireNonNull(output, "output")
 
 		Document[] documents = FileDocument.hierarchy(input)
 
 		Environment environment = new EnvironmentImpl()
 
-		environment.meta[Meta.MEMORY] = memoryDefaults
+		environment.meta[Meta.MEMORY] = defaultMemory
 		environment.meta[Meta.PROJECT] = input
 		environment.meta[Meta.OUTPUT] = output
 
@@ -69,7 +69,9 @@ class ProcessJamplateTask extends DefaultTask {
 				.filter({ compilation -> compilation.rootTree.document().toString().endsWith(".jamplate") })
 				.toArray({ len -> new Compilation[len] })
 
-		boolean executed = Jamplate.execute(environment, jamplates)
+		boolean executed = this.memorySupplier == null ?
+						   Jamplate.execute(environment, jamplates) :
+						   Jamplate.execute(environment, this.memorySupplier, jamplates)
 
 		if (!executed) {
 			System.err.println("Runtime Error\n")