backup/JWebAssembly
1
0
Fork 0
mirror of https://github.com/i-net-software/JWebAssembly.git synced 2025-03-25 07:27:52 +01:00
Code Issues Projects Releases Activity

evaluate the JavaScript lazy for more dynamic JavaScript (non GC polyfill)

Browse Source
This commit is contained in:
Volker Berlin 2019-09-15 15:38:32 +02:00
parent 2a5856971b
commit f19423d53a
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/de/inetsoftware/jwebassembly/javascript/JavaScriptWriter.java
View File

@ -36,7 +36,7 @@ public class JavaScriptWriter {
/** annotation attribute for the JavaScript content */ /** annotation attribute for the JavaScript content */
static final String JAVA_SCRIPT_CONTENT = "js"; static final String JAVA_SCRIPT_CONTENT = "js";
private Map<String, Map<String, String>> modules = new HashMap<>(); private Map<String, Map<String, Function<String, Object>>> modules = new HashMap<>();
/** /**
* Create a new instance * Create a new instance
@ -59,13 +59,12 @@ public class JavaScriptWriter {
* the other values of the annotation * the other values of the annotation
*/ */
public void addImport( String module, String name, Function<String, Object> annotationValues ) { public void addImport( String module, String name, Function<String, Object> annotationValues ) {
String content = (String)annotationValues.apply( JAVA_SCRIPT_CONTENT ); Map<String, Function<String, Object>> moduleEntries = modules.get( module );
Map<String, String> moduleEntries = modules.get( module );
if( moduleEntries == null ) { if( moduleEntries == null ) {
modules.put( module, moduleEntries = new HashMap<>() ); modules.put( module, moduleEntries = new HashMap<>() );
} }
String old = moduleEntries.put( name, content ); Function<String, Object> old = moduleEntries.put( name, annotationValues );
if( old != null ) { if( old != null ) {
System.err.println( "Redefine JavaScript function: " + module + "." + name ); System.err.println( "Redefine JavaScript function: " + module + "." + name );
} }
@ -96,15 +95,16 @@ public class JavaScriptWriter {
void finish( Appendable out ) throws IOException { void finish( Appendable out ) throws IOException {
out.append( "'use strict';var wasmImports = {\n" ); out.append( "'use strict';var wasmImports = {\n" );
boolean isFirst = true; boolean isFirst = true;
for( Entry<String, Map<String, String>> module : modules.entrySet() ) { for( Entry<String, Map<String, Function<String, Object>>> module : modules.entrySet() ) {
if( !isFirst ) { if( !isFirst ) {
out.append( ",\n" ); out.append( ",\n" );
} }
out.append( module.getKey() ).append( ':' ); out.append( module.getKey() ).append( ':' );
Map<String, String> functions = module.getValue(); Map<String, Function<String, Object>> functions = module.getValue();
boolean hasContent = false; boolean hasContent = false;
for( String content : functions.values() ) { for( Function<String, Object> annotationValues : functions.values() ) {
String content = (String)annotationValues.apply( JAVA_SCRIPT_CONTENT );
if( content != null && !content.isEmpty() ) { if( content != null && !content.isEmpty() ) {
hasContent = true; hasContent = true;
break; break;
@ -116,11 +116,12 @@ public class JavaScriptWriter {
// write the function // write the function
boolean isFirstFunc = true; boolean isFirstFunc = true;
for( Entry<String, String> func : functions.entrySet() ) { for( Entry<String, Function<String, Object>> func : functions.entrySet() ) {
if( !isFirstFunc ) { if( !isFirstFunc ) {
out.append( ",\n" ); out.append( ",\n" );
} }
out.append( func.getKey() ).append( ':' ).append( func.getValue() ); String content = (String)func.getValue().apply( JAVA_SCRIPT_CONTENT );
out.append( func.getKey() ).append( ':' ).append( content );
isFirstFunc = false; isFirstFunc = false;
} }