🦄 refactor: Add V8PatchedFileExecutor

caoccao · Jun 30, 2023 · 380334c · 380334c
1 parent 121d057
commit 380334c
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 5 deletions.
diff --git a/scripts/node/test/test_transform.js b/scripts/node/test/test_transform.js
@@ -19,7 +19,7 @@
 const { assert } = require('chai');
 const path = require('path');
 const process = require('process');
-const { JTKind, PluginContractIgnore, PluginContractChangeMethod } = require('./jaspiler/jaspiler');
+const { JTKind, PluginContractIgnore, PluginContractChangeMethod } = require('../jaspiler/jaspiler');
 
 const workingDirectory = process.cwd();
 const pathMockAllInOnePublicClass = path.join(

diff --git a/scripts/node/tutorials/02_play_with_types.js b/scripts/node/tutorials/02_play_with_types.js
@@ -18,7 +18,7 @@
 
 /// <reference types="../jaspiler/index.d.ts"/>
 
-const { JTKind } = require('./jaspiler/jaspiler');
+const { JTKind } = require('../jaspiler/jaspiler');
 
 const result = jaspiler.transformSync(
   `package com.test;

diff --git a/scripts/node/tutorials/03_builtin_annotations.js b/scripts/node/tutorials/03_builtin_annotations.js
@@ -18,7 +18,7 @@
 
 /// <reference types="../jaspiler/index.d.ts"/>
 
-const { PluginContractIgnore, PluginContractChangeMethod } = require('./jaspiler/jaspiler');
+const { PluginContractIgnore, PluginContractChangeMethod } = require('../jaspiler/jaspiler');
 
 const result = jaspiler.transformSync(
   `package com.test;

diff --git a/scripts/node/tutorials/04_parse_argv.js b/scripts/node/tutorials/04_parse_argv.js
@@ -19,7 +19,7 @@
 /// <reference types="../jaspiler/index.d.ts"/>
 
 process.argv = [process.argv[0], ...jaspiler.argv];
-
+process.chdir('../')
 const yargs = require('yargs');
 
 const argv = yargs

diff --git a/src/main/java/com/caoccao/jaspiler/JaspilerMain.java b/src/main/java/com/caoccao/jaspiler/JaspilerMain.java
@@ -19,6 +19,7 @@
 import com.caoccao.jaspiler.enums.JaspilerExitCode;
 import com.caoccao.jaspiler.utils.BaseLoggingObject;
 import com.caoccao.jaspiler.v8.V8Jaspiler;
+import com.caoccao.jaspiler.v8.V8PatchedFileExecutor;
 import com.caoccao.javet.exceptions.JavetException;
 import com.caoccao.javet.interop.NodeRuntime;
 import com.caoccao.javet.interop.V8Host;
@@ -52,7 +53,8 @@ public JaspilerExitCode execute(String[] args) {
                     nodeRuntime.setConverter(javetProxyConverter);
                     try (V8Jaspiler v8Jaspiler = new V8Jaspiler(args, nodeRuntime)) {
                         nodeRuntime.getGlobalObject().set(V8Jaspiler.NAME, v8Jaspiler);
-                        nodeRuntime.getExecutor(file).executeVoid();
+                        var executor = new V8PatchedFileExecutor(nodeRuntime, file);
+                        executor.executeVoid();
                     } finally {
                         nodeRuntime.getGlobalObject().delete(V8Jaspiler.NAME);
                         nodeRuntime.lowMemoryNotification();

diff --git a/src/main/java/com/caoccao/jaspiler/v8/V8PatchedFileExecutor.java b/src/main/java/com/caoccao/jaspiler/v8/V8PatchedFileExecutor.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2023. caoccao.com Sam Cao
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.caoccao.jaspiler.v8;
+
+import com.caoccao.javet.exceptions.JavetException;
+import com.caoccao.javet.interop.NodeRuntime;
+import com.caoccao.javet.interop.V8Runtime;
+import com.caoccao.javet.interop.executors.IV8Executor;
+import com.caoccao.javet.interop.executors.V8FileExecutor;
+import com.caoccao.javet.node.modules.NodeModuleModule;
+import com.caoccao.javet.node.modules.NodeModuleProcess;
+
+import java.io.File;
+
+public class V8PatchedFileExecutor extends V8FileExecutor {
+    public V8PatchedFileExecutor(V8Runtime v8Runtime, File scriptFile) throws JavetException {
+        super(v8Runtime, scriptFile);
+    }
+
+    @Override
+    public IV8Executor setResourceName(String resourceName) throws JavetException {
+        getV8ScriptOrigin().setResourceName(resourceName);
+        V8Runtime v8Runtime = getV8Runtime();
+        if (v8Runtime.getJSRuntimeType().isNode()) {
+            NodeRuntime nodeRuntime = (NodeRuntime) v8Runtime;
+            File resourceFile = new File(resourceName);
+            File parentFile = resourceFile.getParentFile();
+            nodeRuntime.getGlobalObject().set(NodeRuntime.PROPERTY_DIRNAME, parentFile.getAbsolutePath());
+            nodeRuntime.getGlobalObject().set(NodeRuntime.PROPERTY_FILENAME, resourceFile.getAbsolutePath());
+            nodeRuntime.getNodeModule(NodeModuleModule.class).setRequireRootDirectory(resourceFile.getAbsolutePath());
+            nodeRuntime.getNodeModule(NodeModuleProcess.class).setWorkingDirectory(parentFile.getAbsolutePath());
+        }
+        return this;
+    }
+}