Skip to content

Commit

Permalink
Automated g4 rollback of changelist 200580519.
Browse files Browse the repository at this point in the history 
*** Reason for rollback ***

Broke test runner tests (they don't transpile ES6 modules when bundling now)

*** Original change description ***

Allow the transpiler to be configured with a feature set output rather than to ES5. Allow ClosureBundler to be configured later with a different transpiler. When bundling only remove modules using the transpiler.

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=200603814
  • Loading branch information
@blickly
johnplaisted authored and blickly committed Jun 14, 2018
1 parent 25233ea commit 3441ce3
Show file tree
Hide file tree
Showing 4 changed files with 133 additions and 55 deletions.
45 changes: 21 additions & 24 deletions src/com/google/javascript/jscomp/CommandLineRunner.java
View file
Expand Up @@ -30,14 +30,11 @@
import com.google.common.io.Files;
import com.google.javascript.jscomp.AbstractCommandLineRunner.CommandLineConfig.ErrorFormatOption;
import com.google.javascript.jscomp.CompilerOptions.IsolationMode;
import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
import com.google.javascript.jscomp.SourceMap.LocationMapping;
import com.google.javascript.jscomp.deps.ClosureBundler;
import com.google.javascript.jscomp.deps.ModuleLoader;
import com.google.javascript.jscomp.parsing.parser.FeatureSet;
import com.google.javascript.jscomp.parsing.parser.FeatureSet.Feature;
import com.google.javascript.jscomp.transpile.BaseTranspiler;
import com.google.javascript.jscomp.transpile.BaseTranspiler.CompilerSupplier;
import com.google.javascript.jscomp.transpile.Transpiler;
import com.google.javascript.rhino.TokenStream;
import com.google.protobuf.TextFormat;
Expand Down Expand Up @@ -1846,9 +1843,13 @@ protected Compiler createCompiler() {
return new Compiler(getErrorPrintStream());
}

@Override
protected void prepForBundleAndAppendTo(Appendable out, CompilerInput input, String content)
throws IOException {
private ClosureBundler bundler;

private ClosureBundler getBundler() {
if (bundler != null) {
return bundler;
}

ImmutableList<String> moduleRoots;
if (!flags.moduleRoot.isEmpty()) {
moduleRoots = ImmutableList.copyOf(flags.moduleRoot);
Expand All @@ -1857,29 +1858,25 @@ protected void prepForBundleAndAppendTo(Appendable out, CompilerInput input, Str
}

CompilerOptions options = createOptions();
return bundler = new ClosureBundler(
Transpiler.NULL,
new BaseTranspiler(
new BaseTranspiler.EsmToCjsCompilerSupplier(
options.getModuleResolutionMode(),
moduleRoots,
options.getBrowserResolverPrefixReplacements()),
/* runtimeLibraryName= */ ""));
}

new ClosureBundler(
"es6".equals(input.getLoadFlags().get("module"))
? new BaseTranspiler(
new CompilerSupplier(
LanguageMode.ECMASCRIPT_NEXT.toFeatureSet().without(Feature.MODULES),
options.getModuleResolutionMode(),
moduleRoots,
options.getBrowserResolverPrefixReplacements()),
/* runtimeLibraryName= */ "")
: Transpiler.NULL)
.withPath(input.getName())
.appendTo(out, input, content);
@Override
protected void prepForBundleAndAppendTo(Appendable out, CompilerInput input, String content)
throws IOException {
getBundler().withPath(input.getName()).appendTo(out, input, content);
}

@Override
protected void appendRuntimeTo(Appendable out) throws IOException {
new ClosureBundler(
new BaseTranspiler(
new CompilerSupplier(),
// Default runtime is the module runtime.
/* runtimeLibraryName= */ ""))
.appendRuntimeTo(out);
getBundler().appendRuntimeTo(out);
}

@Override
Expand Down
32 changes: 24 additions & 8 deletions src/com/google/javascript/jscomp/deps/ClosureBundler.java
View file
Expand Up @@ -18,6 +18,7 @@
import com.google.common.base.Strings;
import com.google.common.io.CharSource;
import com.google.common.io.Files;
import com.google.javascript.jscomp.transpile.BaseTranspiler;
import com.google.javascript.jscomp.transpile.TranspileResult;
import com.google.javascript.jscomp.transpile.Transpiler;
import java.io.File;
Expand All @@ -34,6 +35,7 @@
public final class ClosureBundler {

private final Transpiler transpiler;
private final Transpiler es6ModuleTranspiler;

private final EvalMode mode;
private final String sourceUrl;
Expand All @@ -49,8 +51,13 @@ public ClosureBundler() {
}

public ClosureBundler(Transpiler transpiler) {
this(transpiler, BaseTranspiler.ES_MODULE_TO_CJS_TRANSPILER);
}

public ClosureBundler(Transpiler transpiler, Transpiler es6ModuleTranspiler) {
this(
transpiler,
es6ModuleTranspiler,
EvalMode.NORMAL,
/* sourceUrl= */ null,
/* path= */ "unknown_source",
Expand All @@ -59,6 +66,7 @@ public ClosureBundler(Transpiler transpiler) {

private ClosureBundler(
Transpiler transpiler,
Transpiler es6ModuleTranspiler,
EvalMode mode,
String sourceUrl,
String path,
Expand All @@ -68,27 +76,23 @@ private ClosureBundler(
this.sourceUrl = sourceUrl;
this.path = path;
this.sourceMapCache = sourceMapCache;
}

public final ClosureBundler withTranspiler(Transpiler newTranspiler) {
return new ClosureBundler(
newTranspiler, mode, sourceUrl, path, sourceMapCache);
this.es6ModuleTranspiler = es6ModuleTranspiler;
}

public final ClosureBundler useEval(boolean useEval) {
EvalMode newMode = useEval ? EvalMode.EVAL : EvalMode.NORMAL;
return new ClosureBundler(
transpiler, newMode, sourceUrl, path, sourceMapCache);
transpiler, es6ModuleTranspiler, newMode, sourceUrl, path, sourceMapCache);
}

public final ClosureBundler withSourceUrl(String newSourceUrl) {
return new ClosureBundler(
transpiler, mode, newSourceUrl, path, sourceMapCache);
transpiler, es6ModuleTranspiler, mode, newSourceUrl, path, sourceMapCache);
}

public final ClosureBundler withPath(String newPath) {
return new ClosureBundler(
transpiler, mode, sourceUrl, newPath, sourceMapCache);
transpiler, es6ModuleTranspiler, mode, sourceUrl, newPath, sourceMapCache);
}

/** Append the contents of the string to the supplied appendable. */
Expand Down Expand Up @@ -122,6 +126,11 @@ public void appendTo(
CharSource content) throws IOException {
if (info.isModule()) {
mode.appendGoogModule(transpile(content.read()), out, sourceUrl);
} else if ("es6".equals(info.getLoadFlags().get("module")) && transpiler == Transpiler.NULL) {
// TODO(johnplaisted): Make the default transpiler the ES_MODULE_TO_CJS_TRANSPILER. Currently
// some code is passing in unicode identifiers in non-ES6 modules the compiler fails to parse.
// Once this compiler bug is fixed we can always transpile.
mode.appendTraditional(transpileEs6Module(content.read()), out, sourceUrl);
} else {
mode.appendTraditional(transpile(content.read()), out, sourceUrl);
}
Expand All @@ -132,6 +141,9 @@ public void appendRuntimeTo(Appendable out) throws IOException {
if (!runtime.isEmpty()) {
mode.appendTraditional(runtime, out, null);
}
if (transpiler == Transpiler.NULL) {
mode.appendTraditional(es6ModuleTranspiler.runtime(), out, null);
}
}

/**
Expand All @@ -157,6 +169,10 @@ private String transpile(String s) {
return transpile(s, transpiler);
}

private String transpileEs6Module(String s) {
return transpile(s, es6ModuleTranspiler);
}

private enum EvalMode {
EVAL {
@Override
Expand Down
107 changes: 87 additions & 20 deletions src/com/google/javascript/jscomp/transpile/BaseTranspiler.java
View file
Expand Up @@ -27,6 +27,7 @@
import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
import com.google.javascript.jscomp.DiagnosticGroup;
import com.google.javascript.jscomp.DiagnosticType;
import com.google.javascript.jscomp.Es6RewriteModulesToCommonJsModules;
import com.google.javascript.jscomp.PropertyRenamingPolicy;
import com.google.javascript.jscomp.Result;
import com.google.javascript.jscomp.SourceFile;
Expand All @@ -36,8 +37,7 @@
import com.google.javascript.jscomp.deps.ModuleLoader;
import com.google.javascript.jscomp.deps.ModuleLoader.PathEscaper;
import com.google.javascript.jscomp.deps.ModuleLoader.ResolutionMode;
import com.google.javascript.jscomp.parsing.parser.FeatureSet;
import com.google.javascript.jscomp.parsing.parser.FeatureSet.Feature;
import com.google.javascript.rhino.Node;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
Expand Down Expand Up @@ -74,11 +74,11 @@ public String runtime() {
return sb.toString();
}

public static final BaseTranspiler ES5_TRANSPILER = toLanguageMode(LanguageMode.ECMASCRIPT5);
public static final BaseTranspiler ES5_TRANSPILER = new BaseTranspiler(
new CompilerSupplier(), "es6_runtime");

public static final BaseTranspiler toLanguageMode(LanguageMode languageOut) {
return new BaseTranspiler(new CompilerSupplier(languageOut.toFeatureSet()), "es6_runtime");
}
public static final BaseTranspiler ES_MODULE_TO_CJS_TRANSPILER =
new BaseTranspiler(new EsmToCjsCompilerSupplier(), "");

/**
* Wraps the Compiler into a more relevant interface, making it
Expand All @@ -92,19 +92,10 @@ public static class CompilerSupplier {
protected final ResolutionMode moduleResolution;
protected final ImmutableList<String> moduleRoots;
protected final ImmutableMap<String, String> prefixReplacements;
protected final FeatureSet outputFeatureSet;

public CompilerSupplier() {
this(LanguageMode.ECMASCRIPT5.toFeatureSet());
}

public CompilerSupplier(FeatureSet outputFeatureSet) {
// Use the default resolution mode
this(
outputFeatureSet,
new CompilerOptions().getModuleResolutionMode(),
ImmutableList.of(),
ImmutableMap.of());
this(new CompilerOptions().getModuleResolutionMode(), ImmutableList.of(), ImmutableMap.of());
}

/**
Expand All @@ -115,11 +106,9 @@ public CompilerSupplier(FeatureSet outputFeatureSet) {
* ModuleLoader.ResolutionMode#BROWSER_WITH_TRANSFORMED_PREFIXES}
*/
public CompilerSupplier(
FeatureSet outputFeatureSet,
ModuleLoader.ResolutionMode moduleResolution,
ImmutableList<String> moduleRoots,
ImmutableMap<String, String> prefixReplacements) {
this.outputFeatureSet = outputFeatureSet;
this.moduleResolution = moduleResolution;
this.moduleRoots = moduleRoots;
this.prefixReplacements = prefixReplacements;
Expand Down Expand Up @@ -168,8 +157,16 @@ protected CompilerOptions options() {

protected void setOptions(CompilerOptions options) {
options.setLanguageIn(LanguageMode.ECMASCRIPT_NEXT);
options.setOutputFeatureSet(outputFeatureSet.without(Feature.MODULES));
options.setEmitUseStrict(false);
// TODO(sdh): It would be nice to allow people to output code in
// strict mode. But currently we swallow all the input language
// strictness checks, and there are various tests that are never
// compiled and so are broken when we output 'use strict'. We
// could consider adding some sort of logging/warning/error in
// cases where the input was not strict, though there could still
// be semantic differences even if syntax is strict. Possibly
// the first step would be to allow the option of outputting strict
// and then change the default and see what breaks. b/33005948
options.setLanguageOut(LanguageMode.ECMASCRIPT5);
options.setQuoteKeywordProperties(true);
options.setSkipNonTranspilationPasses(true);
options.setVariableRenaming(VariableRenamingPolicy.OFF);
Expand Down Expand Up @@ -209,6 +206,76 @@ protected void setOptions(CompilerOptions options) {
DiagnosticType.error("JSC_CANNOT_CONVERT", ""));
}

/**
* CompilerSupplier that only transforms EcmaScript Modules into a form that can be safely
* transformed on a file by file basis and concatenated.
*/
public static class EsmToCjsCompilerSupplier extends CompilerSupplier {

public EsmToCjsCompilerSupplier() {
super();
}

public EsmToCjsCompilerSupplier(
ModuleLoader.ResolutionMode moduleResolution,
ImmutableList<String> moduleRoots,
ImmutableMap<String, String> prefixReplacements) {
super(moduleResolution, moduleRoots, prefixReplacements);
}


@Override
public CompileResult compile(URI path, String code) {
CompilerOptions options = new CompilerOptions();
options.setLanguageIn(LanguageMode.ECMASCRIPT_NEXT);
options.setEmitUseStrict(false);
options.setSourceMapOutputPath("/dev/null");
options.setSourceMapIncludeSourcesContent(true);
options.setPrettyPrint(true);
options.setModuleResolutionMode(moduleResolution);
options.setModuleRoots(moduleRoots);
options.setBrowserResolverPrefixReplacements(prefixReplacements);

// Create a compiler and run specifically this one pass on it.
Compiler compiler = compiler();
compiler.init(
ImmutableList.of(),
ImmutableList.of(SourceFile.fromCode(path.toString(), code)),
options);
compiler.parseForCompilation();

boolean transpiled = false;

if (!compiler.hasErrors()
&& compiler.getRoot().getSecondChild().getFirstFirstChild().isModuleBody()
&& !compiler
.getRoot()
.getSecondChild()
.getFirstChild()
.getBooleanProp(Node.GOOG_MODULE)) {
new Es6RewriteModulesToCommonJsModules(compiler)
.process(null, compiler.getRoot().getSecondChild());
compiler.getRoot().getSecondChild().getFirstChild().putBooleanProp(Node.TRANSPILED, true);
transpiled = true;
}

Result result = compiler.getResult();
String source = compiler.toSource();
StringBuilder sourceMap = new StringBuilder();
if (result.sourceMap != null) {
try {
result.sourceMap.appendTo(sourceMap, path.toString());
} catch (IOException e) {
// impossible, and not a big deal even if it did happen.
}
}
if (result.errors.length > 0) {
throw new TranspilationException(compiler, result.errors, result.warnings);
}
return new CompileResult(source, transpiled, transpiled ? sourceMap.toString() : "");
}
}

/**
* The source together with the additional compilation results.
*/
Expand Down
4 changes: 1 addition & 3 deletions test/com/google/javascript/jscomp/deps/ClosureBundlerTest.java
View file
Expand Up @@ -20,7 +20,6 @@
import static org.mockito.Mockito.when;

import com.google.common.collect.ImmutableMap;
import com.google.javascript.jscomp.transpile.BaseTranspiler;
import com.google.javascript.jscomp.transpile.TranspileResult;
import com.google.javascript.jscomp.transpile.Transpiler;
import java.io.IOException;
Expand Down Expand Up @@ -143,8 +142,7 @@ public void testEs6Module() throws IOException {
+ "export {x as y};"
+ "var local;\n"
+ "export function foo() { return local; }\n";
ClosureBundler bundler =
new ClosureBundler(BaseTranspiler.ES5_TRANSPILER).withPath("nested/path/foo.js");
ClosureBundler bundler = new ClosureBundler().withPath("nested/path/foo.js");
StringBuilder sb = new StringBuilder();
bundler.appendRuntimeTo(sb);
bundler.appendTo(
Expand Down

0 comments on commit 3441ce3

Please sign in to comment.