You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2019/10/28 18:41:08 UTC
[royale-compiler] branch develop updated: compiler-jx: added
jsx-factory option to customize the function called when using JSX
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/develop by this push:
new b64164b compiler-jx: added jsx-factory option to customize the function called when using JSX
b64164b is described below
commit b64164b6460acfbf5c83eefb9e503114eff3cb22
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Mon Oct 28 11:41:05 2019 -0700
compiler-jx: added jsx-factory option to customize the function called when using JSX
---
.../royale/compiler/clients/JSConfiguration.java | 23 ++++++++++++++++++++++
.../internal/codegen/js/jx/LiteralEmitter.java | 5 ++++-
.../internal/codegen/js/royale/TestRoyaleJSX.java | 11 +++++++++++
3 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/JSConfiguration.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/JSConfiguration.java
index eda4012..47b4a66 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/JSConfiguration.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/JSConfiguration.java
@@ -581,4 +581,27 @@ public class JSConfiguration extends Configuration
jsVectorIndexChecks = value;
}
+
+ //
+ // 'jsx-factory'
+ //
+
+ private String jsxFactory = "React.createElement";
+
+ public String getJsxFactory()
+ {
+ return jsxFactory;
+ }
+
+ /**
+ * Customize the factory to use for JSX. Defaults to React.createElement
+ */
+ @Config(advanced = true)
+ @Mapping("jsx-factory")
+ public void setJsxFactory(ConfigurationValue cv, String value)
+ throws ConfigurationException
+ {
+ jsxFactory = value;
+ }
+
}
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java
index 20bf91b..983e541 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java
@@ -30,6 +30,7 @@ import org.apache.royale.compiler.common.IMetaInfo;
import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.projects.RoyaleJSProject;
import org.apache.royale.compiler.internal.scopes.FunctionScope;
import org.apache.royale.compiler.internal.tree.as.LiteralNode;
import org.apache.royale.compiler.internal.tree.as.RegExpLiteralNode;
@@ -237,6 +238,8 @@ public class LiteralEmitter extends JSSubEmitter implements
private void emitJSX(XMLLiteralNode node)
{
+ RoyaleJSProject project = (RoyaleJSProject) getProject();
+ String jsxFactory = project.config.getJsxFactory();
int childCount = node.getContentsNode().getChildCount();
Stack<String> elementStack = new Stack<String>();
String elementName = null;
@@ -333,7 +336,7 @@ public class LiteralEmitter extends JSSubEmitter implements
}
elementName = getElementNameToEmit(elementName, node);
elementStack.push(elementName);
- write("React.createElement");
+ write(jsxFactory);
write(ASEmitterTokens.PAREN_OPEN);
write(elementName);
value = value.substring(endNameIndex);
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleJSX.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleJSX.java
index b519e9b..8197c4c 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleJSX.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleJSX.java
@@ -20,7 +20,9 @@
package org.apache.royale.compiler.internal.codegen.js.royale;
import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
+import org.apache.royale.compiler.internal.projects.RoyaleJSProject;
import org.apache.royale.compiler.internal.test.ASTestBase;
import org.apache.royale.compiler.tree.as.IFunctionNode;
@@ -28,6 +30,15 @@ import org.junit.Test;
public class TestRoyaleJSX extends ASTestBase
{
+ @Override
+ public void setUp()
+ {
+ backend = createBackend();
+ project = new RoyaleJSProject(workspace, backend);
+ project.config = new JSGoogConfiguration();
+ super.setUp();
+ }
+
@Test
public void testJSXMetadataWithoutXMLLiterals()
{