[GR-40100] Do not wrap Commonjs module sources.

PullRequest: js/2540

Author: eleinadani

graal-js/src/com.oracle.truffle.js.parser/src/com/oracle/truffle/js/parser/GraalJSEvaluator.java

@@ -152,7 +152,7 @@ public ScriptNode parseEval(JSContext context, Node lastNode, Source source) {
      */
     @TruffleBoundary(transferToInterpreterOnException = false)
     @Override
-    public ScriptNode parseFunction(JSContext context, String parameterList, String body, boolean generatorFunction, boolean asyncFunction, String sourceName) {
+    public ScriptNode parseFunction(JSContext context, String parameterList, String body, boolean generatorFunction, boolean asyncFunction, String sourceName, Source inheritFrom) {
         String wrappedBody = "\n" + body + "\n";
         try {
             GraalJSParserHelper.checkFunctionSyntax(context, context.getParserOptions(), parameterList, wrappedBody, generatorFunction, asyncFunction, sourceName);
@@ -182,8 +182,12 @@ public ScriptNode parseFunction(JSContext context, String parameterList, String
         code.append(") {");
         code.append(wrappedBody);
         code.append("})");
-        Source source = Source.newBuilder(JavaScriptLanguage.ID, code.toString(), sourceName).build();
-
+        Source source;
+        if (inheritFrom == null) {
+            source = Source.newBuilder(JavaScriptLanguage.ID, code.toString(), sourceName).build();
+        } else {
+            source = Source.newBuilder(inheritFrom).content(code.toString()).name(sourceName).build();
+        }
         return parseEval(context, null, source, false, null);
     }
 

graal-js/src/com.oracle.truffle.js.test/commonjs/github-621.js

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ */
+
+})();
+
+console.log("This shouldn't work!");
+
+(function () {

graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/builtins/CommonJSRequireTest.java

@@ -617,6 +617,17 @@ public void requireEmpty() {
         }
     }
 
+    @Test
+    public void testGit621() {
+        Path f = getTestRootFolder();
+        try (Context cx = testContext(f)) {
+            cx.eval(ID, "require('./github-621').foo;");
+            assert false : "Should throw";
+        } catch (PolyglotException e) {
+            Assert.assertTrue(e.getMessage().contains("Expected eof but found }"));
+        }
+    }
+
     // ##### ES Modules
 
     @Test

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/ConstructorBuiltins.java

@@ -2143,7 +2143,7 @@ protected ScriptNode cacheLookup(LRUCache<CachedSourceKey, ScriptNode> cache, Ca
         @TruffleBoundary(transferToInterpreterOnException = false)
         protected final ScriptNode parseFunction(String paramList, String body, String sourceName) {
             CompilerAsserts.neverPartOfCompilation();
-            return context.getEvaluator().parseFunction(context, paramList, body, generatorFunction, asyncFunction, sourceName);
+            return context.getEvaluator().parseFunction(context, paramList, body, generatorFunction, asyncFunction, sourceName, null);
         }
 
         @TruffleBoundary(transferToInterpreterOnException = false)

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/commonjs/CommonJSRequireBuiltin.java

@@ -44,15 +44,14 @@
 import java.util.Objects;
 import java.util.Stack;
 
-import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.strings.TruffleString;
 import com.oracle.truffle.js.builtins.GlobalBuiltins;
-import com.oracle.truffle.js.lang.JavaScriptLanguage;
+import com.oracle.truffle.js.nodes.ScriptNode;
 import com.oracle.truffle.js.nodes.function.JSBuiltin;
 import com.oracle.truffle.js.runtime.Errors;
 import com.oracle.truffle.js.runtime.JSArguments;
@@ -122,8 +121,7 @@ private static void debugStackPop() {
         }
     }
 
-    private static final String MODULE_END = "\n});";
-    private static final String MODULE_PREAMBLE = "(function (exports, require, module, __filename, __dirname) {";
+    private static final String MODULE_FUNCTION_ARGS = "exports, require, module, __filename, __dirname";
 
     @TruffleBoundary
     static TruffleFile getModuleResolveCurrentWorkingDirectory(JSContext context, TruffleLanguage.Env env) {
@@ -224,10 +222,10 @@ private Object evalJavaScriptFile(TruffleFile modulePath, String moduleIdentifie
         JSObject env = JSOrdinary.create(getContext(), getRealm());
         JSObject.set(env, Strings.ENV_PROPERTY_NAME, JSOrdinary.create(getContext(), getRealm()));
         // Parse the module
-        CharSequence characters = MODULE_PREAMBLE + source.getCharacters() + MODULE_END;
-        Source moduleSources = Source.newBuilder(source).content(characters).mimeType(JavaScriptLanguage.TEXT_MIME_TYPE).build();
-        CallTarget moduleCallTarget = realm.getEnv().parsePublic(moduleSources);
-        Object moduleExecutableFunction = moduleCallTarget.call();
+        JSContext context = realm.getContext();
+        String body = source.getCharacters().toString();
+        ScriptNode scriptNode = context.getEvaluator().parseFunction(context, MODULE_FUNCTION_ARGS, body, false, false, source.getPath(), source);
+        Object moduleExecutableFunction = scriptNode.run(realm);
         // Execute the module.
         if (JSFunction.isJSFunction(moduleExecutableFunction)) {
             log("adding to cache ", normalizedPath);

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/Evaluator.java

@@ -121,7 +121,7 @@ public interface Evaluator {
     /**
      * Parse function using parameter list and body, to be used by the {@code Function} constructor.
      */
-    ScriptNode parseFunction(JSContext context, String parameterList, String body, boolean generatorFunction, boolean asyncFunction, String sourceName);
+    ScriptNode parseFunction(JSContext context, String parameterList, String body, boolean generatorFunction, boolean asyncFunction, String sourceName, Source inheritFrom);
 
     default ScriptNode parseScript(JSContext context, Source source) {
         return parseScript(context, source, "", "", context.getParserOptions().isStrict());

graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/GraalJSAccess.java

@@ -2198,7 +2198,7 @@ public Object scriptCompilerCompileFunctionInContext(Object context, Object sour
             GraalJSParserHelper.checkFunctionSyntax(jsContext, parserOptions, parameterList, bodyJavaString, false, false, sourceNameJavaString);
         } catch (com.oracle.js.parser.ParserException ex) {
             // throw the correct JS error
-            nodeEvaluator.parseFunction(jsContext, parameterList, bodyJavaString, false, false, sourceNameJavaString);
+            nodeEvaluator.parseFunction(jsContext, parameterList, bodyJavaString, false, false, sourceNameJavaString, null);
         }
 
         StringBuilder code = new StringBuilder();