Skip to content

Commit

Permalink
Add additional passes, source map input support, and update File argu…
Browse files Browse the repository at this point in the history 
…ment names

to match JSON format in Closure JAR.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=129675880
  • Loading branch information
@blickly
thorogood authored and blickly committed Aug 8, 2016
1 parent 283d816 commit 75d0d95
Showing 1 changed file with 65 additions and 26 deletions.
91 changes: 65 additions & 26 deletions src/com/google/javascript/jscomp/gwt/client/GwtRunner.java
View file
Expand Up @@ -29,6 +29,7 @@
import com.google.javascript.jscomp.DiagnosticType;
import com.google.javascript.jscomp.JSError;
import com.google.javascript.jscomp.SourceFile;
import com.google.javascript.jscomp.SourceMapInput;
import com.google.javascript.jscomp.WarningLevel;

import jsinterop.annotations.JsPackage;
Expand All @@ -45,6 +46,9 @@
*/
public final class GwtRunner implements EntryPoint {

private static final CompilationLevel DEFAULT_COMPILATION_LEVEL =
CompilationLevel.SIMPLE_OPTIMIZATIONS;

private static final Map<String, CompilationLevel> COMPILATION_LEVEL_MAP =
ImmutableMap.of(
"WHITESPACE_ONLY",
Expand Down Expand Up @@ -72,17 +76,22 @@ private GwtRunner() {}
@JsType(namespace = JsPackage.GLOBAL, name = "Object", isNative = true)
private interface Flags {
@JsProperty boolean getAngularPass();
@JsProperty boolean getAssumeFunctionWrapper();
@JsProperty String getCompilationLevel();
@JsProperty boolean getDartPass();
@JsProperty boolean getExportLocalPropertyDefinitions();
@JsProperty boolean getGenerateExports();
@JsProperty String getLanguageIn();
@JsProperty String getLanguageOut();
@JsProperty boolean getChecksOnly();
@JsProperty boolean getNewTypeInf();
@JsProperty boolean getPolymerPass();
@JsProperty boolean getPreserveTypeAnnotations();
@JsProperty boolean getProcessCommonJSModules();
@JsProperty String getRenamePrefixNamespace();
@JsProperty boolean getRewritePolyfills();
@JsProperty boolean getRewritePolyfills(); // default true
@JsProperty String getWarningLevel();
@JsProperty boolean getUseTypesForOptimization(); // default true

// These flags do not match the Java compiler JAR.
@JsProperty File[] getJsCode();
Expand All @@ -91,9 +100,10 @@ private interface Flags {
}

@JsType(namespace = JsPackage.GLOBAL, name = "Object", isNative = true)
private interface File {
@JsProperty String getName();
@JsProperty String getSource();
private static class File {
@JsProperty String path;
@JsProperty String src;
@JsProperty String sourceMap;
}

@JsType(namespace = JsPackage.GLOBAL, name = "Object", isNative = true)
Expand Down Expand Up @@ -131,24 +141,31 @@ private static void applyDefaultOptions(CompilerOptions options) {
}

private static void applyOptionsFromFlags(CompilerOptions options, Flags flags) {
if (flags == null) {
return;
}

CompilationLevel level = DEFAULT_COMPILATION_LEVEL;
if (flags.getCompilationLevel() != null) {
CompilationLevel level =
COMPILATION_LEVEL_MAP.get(flags.getCompilationLevel().toUpperCase());
if (level != null) {
level.setOptionsForCompilationLevel(options);
level = COMPILATION_LEVEL_MAP.get(flags.getCompilationLevel().toUpperCase());
if (level == null) {
throw new RuntimeException(
"Bad value for compilationLevel: " + flags.getCompilationLevel());
}
}
level.setOptionsForCompilationLevel(options);
if (flags.getAssumeFunctionWrapper()) {
level.setWrappedOutputOptimizations(options);
}
if (flags.getUseTypesForOptimization()) {
level.setTypeBasedOptimizationOptions(options);
}

WarningLevel warningLevel = WarningLevel.DEFAULT;
if (flags.getWarningLevel() != null) {
WarningLevel level = WARNING_LEVEL_MAP.get(flags.getWarningLevel().toUpperCase());
if (level != null) {
level.setOptionsForWarningLevel(options);
warningLevel = WARNING_LEVEL_MAP.get(flags.getWarningLevel().toUpperCase());
if (warningLevel == null) {
throw new RuntimeException(
"Bad value for compilationLevel: " + flags.getCompilationLevel());
}
}
warningLevel.setOptionsForWarningLevel(options);

if (flags.getLanguageIn() != null) {
LanguageMode languageIn = LanguageMode.fromString(flags.getLanguageIn());
Expand All @@ -170,10 +187,13 @@ private static void applyOptionsFromFlags(CompilerOptions options, Flags flags)

options.setAngularPass(flags.getAngularPass());
options.setChecksOnly(flags.getChecksOnly());
options.setDartPass(flags.getDartPass());
options.setExportLocalPropertyDefinitions(flags.getExportLocalPropertyDefinitions());
options.setGenerateExports(flags.getGenerateExports());
options.setNewTypeInference(flags.getNewTypeInf());
options.setPolymerPass(flags.getPolymerPass());
options.setPreserveTypeAnnotations(flags.getPreserveTypeAnnotations());
options.setProcessCommonJSModules(flags.getProcessCommonJSModules());
options.setRenamePrefixNamespace(flags.getRenamePrefixNamespace());
options.setRewritePolyfills(flags.getRewritePolyfills());
}
Expand All @@ -187,35 +207,54 @@ private static List<SourceFile> fromFileArray(File[] src, String unknownPrefix)
if (src != null) {
for (int i = 0; i < src.length; ++i) {
File file = src[i];
String name = file.getName();
if (name == null) {
name = unknownPrefix + i;
String path = file.path;
if (path == null) {
path = unknownPrefix + i;
}
String source = file.getSource();
if (source == null) {
source = "";
}
out.add(SourceFile.fromCode(name, source));
out.add(SourceFile.fromCode(path, file.src != null ? file.src : ""));
}
}
return ImmutableList.copyOf(out);
}

private static ImmutableMap<String, SourceMapInput> buildSourceMaps(
File[] src, String unknownPrefix) {
ImmutableMap.Builder<String, SourceMapInput> inputSourceMaps = new ImmutableMap.Builder<>();
if (src != null) {
for (int i = 0; i < src.length; ++i) {
File file = src[i];
if (file.sourceMap == null || file.sourceMap.isEmpty()) {
continue;
}
String path = file.path;
if (path == null) {
path = unknownPrefix + i;
}
path += ".map";
SourceFile sf = SourceFile.fromCode(path, file.sourceMap);
inputSourceMaps.put(path, new SourceMapInput(sf));
}
}
return inputSourceMaps.build();
}

/**
* Public compiler call. Exposed in {@link #exportCompile}.
*/
public static ModuleOutput compile(Flags flags) {
List<SourceFile> externs = fromFileArray(flags.getExterns(), "Extern_");
List<SourceFile> jsCode = fromFileArray(flags.getJsCode(), "Input_");
ImmutableMap<String, SourceMapInput> sourceMaps = buildSourceMaps(flags.getJsCode(), "Input_");

CompilerOptions options = new CompilerOptions();
applyDefaultOptions(options);
applyOptionsFromFlags(options, flags);
options.setInputSourceMaps(sourceMaps);
disableUnsupportedOptions(options);

NodeErrorManager errorManager = new NodeErrorManager();
Compiler compiler = new Compiler();
compiler.setErrorManager(errorManager);

List<SourceFile> externs = fromFileArray(flags.getExterns(), "Extern_");
List<SourceFile> jsCode = fromFileArray(flags.getJsCode(), "Input_");
compiler.compile(externs, jsCode, options);

ModuleOutput output = new ModuleOutput();
Expand Down

0 comments on commit 75d0d95

Please sign in to comment.