Fix globalThis in vm context.

Author: woess

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

@@ -392,6 +392,8 @@ private GraalJSAccess(String[] args) throws Exception {
             contextBuilder.option(JSContextOptions.CONSOLE_NAME, "false");
             // Node.js does not have global arguments property
             contextBuilder.option(JSContextOptions.GLOBAL_ARGUMENTS_NAME, "false");
+            // Node.js context does not have a predefined global 'global' property.
+            contextBuilder.option(JSContextOptions.GLOBAL_PROPERTY_NAME, "false");
             contextBuilder.useSystemExit(true);
 
             exposeGC = options.isGCExposed();
@@ -2836,7 +2838,10 @@ public Object contextNew(Object templateObj) {
         if (templateObj != null) {
             ObjectTemplate template = (ObjectTemplate) templateObj;
             if (template.hasPropertyHandler()) {
-                global = propertyHandlerInstantiate(context, realm, template, global, true);
+                var globalProxy = propertyHandlerInstantiate(context, realm, template, global, true);
+                assert JSObject.hasOwnProperty(global, Strings.GLOBAL_THIS) && !JSObject.hasOwnProperty(global, Strings.GLOBAL);
+                JSObject.set(global, Strings.GLOBAL_THIS, globalProxy);
+                global = globalProxy;
                 realm.setGlobalObject(global);
             } else {
                 JSObject prototype = JSOrdinary.create(context, realm);

graal-nodejs/test/graal/unit/vm.js

@@ -96,4 +96,36 @@ describe('vm', function () {
             'abc'
         );
     });
+    it('should have correct globalThis', function () {
+        var sandbox = {};
+        var fooValue = 42;
+        Object.defineProperty(sandbox, 'foo', {value: fooValue});
+        Object.defineProperty(sandbox, 'setTimeout', {value: setTimeout});
+        var context = vm.createContext(sandbox);
+        assert.strictEqual(vm.runInContext('foo', context), fooValue);
+        assert.strictEqual(vm.runInContext('globalThis.foo', context), fooValue);
+        var desc = vm.runInContext('Reflect.getOwnPropertyDescriptor(globalThis, "setTimeout")', context);
+        assert.ok(desc);
+        assert.strictEqual(desc.value, setTimeout);
+        assert.strictEqual(desc.writable, false);
+        assert.strictEqual(desc.enumerable, false);
+        assert.strictEqual(desc.configurable, false);
+    });
+    it('should allow overriding globalThis', function () {
+        var sandbox = {};
+        var fooValue = 42;
+        var globalThisOverride = {foo: 43};
+        Object.defineProperty(sandbox, 'foo', {value: fooValue});
+        Object.defineProperty(sandbox, 'globalThis', {value: globalThisOverride, configurable: true, writable: true});
+        var context = vm.createContext(sandbox);
+        assert.strictEqual(vm.runInContext('foo', context), fooValue);
+        assert.strictEqual(vm.runInContext('globalThis', context), globalThisOverride);
+        assert.strictEqual(vm.runInContext('globalThis.foo', context), globalThisOverride.foo);
+        assert.strictEqual(sandbox.globalThis, globalThisOverride);
+    });
+    it('should not have "global" property', function () {
+        var context = vm.createContext();
+        assert.strictEqual(vm.runInContext('typeof global', context), 'undefined');
+        assert.strictEqual(vm.runInContext('typeof globalThis.global', context), 'undefined');
+    });
 });