javonet-nodejs-sdk 2.0.4 → 2.1.0

package/Binaries/Ruby/{MacOs/X64/sdk/core/ruby_command.rb → Windows/X64/utils/command.rb}

@@ -1,87 +1,91 @@
-require_relative 'runtime_lib'
-require_relative 'ruby_command_type'
-
-class RubyCommand
-  def initialize(runtime_lib, command_type, payload)
-    @runtime_lib = runtime_lib
-    @command_type = command_type
-    @payload = payload
-  end
-
-  def runtime_lib
-    @runtime_lib
-  end
-
-  def command_type
-    @command_type
-  end
-
-  def payload
-    @payload
-  end
-
-  def to_string
-    'Runtime Library: ' + RuntimeLib.get_name(@runtime_lib).to_s + ' ' + 'Ruby command type: ' + RubyCommandType.get_name(@command_type).to_s + ' ' + 'with parameters: ' + @payload.to_s
-  end
-
-  def eql?(other)
-    @is_equal = false
-    if self == other
-      @is_equal = true
-    end
-    if other == nil or self.class != other.class
-      @is_equal = false
-    end
-    if self.command_type == other.command_type and self.runtime_lib == other.runtime_lib
-      @is_equal = true
-    end
-    if payload.length == other.payload.length
-      i = 0
-      array_item_equal = false
-      payload.each { |payload_item|
-        if payload_item.eql? other.payload[i]
-          array_item_equal = true
-        else
-          array_item_equal = false
-        end
-        i += 1
-      }
-      @is_equal = array_item_equal
-    else
-      @is_equal = false
-    end
-    return @is_equal
-  end
-
-  def create_response(response)
-    return RubyCommand.new(@runtime_lib, RubyCommandType::RESPONSE, [response])
-  end
-
-  def create_reference(guid)
-    return RubyCommand.new(@runtime_lib, RubyCommandType::REFERENCE, [guid])
-  end
-
-  def create_array_response(array)
-    return RubyCommand.new(@runtime_lib, RubyCommandType::ARRAY, [array])
-  end
-
-  def drop_first_payload_argument
-    payload_args = []
-    payload_args = payload_args + @payload
-    if payload_args.length != 0
-      payload_args.delete_at(0)
-    end
-    return RubyCommand.new(@runtime_lib, @command_type, payload_args)
-  end
-
-  def add_arg_to_payload(argument)
-    merged_payload = payload + [argument]
-    return RubyCommand.new(@runtime_lib, @command_type, merged_payload)
-  end
-
-  def add_arg_to_payload_on_beginning(argument)
-    merged_payload = [argument] + payload
-    return RubyCommand.new(@runtime_lib, @command_type, merged_payload)
-  end
-
+require_relative 'runtime_name'
+require_relative 'command_type'
+
+class Command
+  def initialize(runtime_name, command_type, payload)
+    @runtime_name = runtime_name
+    @command_type = command_type
+    @payload = payload
+  end
+
+  def runtime_name
+    @runtime_name
+  end
+
+  def command_type
+    @command_type
+  end
+
+  def payload
+    @payload
+  end
+
+  def to_string
+    'Runtime Library: ' + RuntimeName.get_name(@runtime_name).to_s + ' ' + 'Ruby command type: ' + CommandType.get_name(@command_type).to_s + ' ' + 'with parameters: ' + @payload.to_s
+  end
+
+  def eql?(other)
+    @is_equal = false
+    if self == other
+      @is_equal = true
+    end
+    if other == nil or self.class != other.class
+      @is_equal = false
+    end
+    if self.command_type == other.command_type and self.runtime_name == other.runtime_name
+      @is_equal = true
+    end
+    if payload.length == other.payload.length
+      i = 0
+      array_item_equal = false
+      payload.each { |payload_item|
+        if payload_item.eql? other.payload[i]
+          array_item_equal = true
+        else
+          array_item_equal = false
+        end
+        i += 1
+      }
+      @is_equal = array_item_equal
+    else
+      @is_equal = false
+    end
+    return @is_equal
+  end
+
+  def create_response(response)
+    return Command.new(@runtime_name, CommandType::VALUE, [response])
+  end
+
+  def create_reference(guid)
+    return Command.new(@runtime_name, CommandType::REFERENCE, [guid])
+  end
+
+  def create_array_response(array)
+    return Command.new(@runtime_name, CommandType::ARRAY, [array])
+  end
+
+  def drop_first_payload_argument
+    payload_args = []
+    payload_args = payload_args + @payload
+    if payload_args.length != 0
+      payload_args.delete_at(0)
+    end
+    return Command.new(@runtime_name, @command_type, payload_args)
+  end
+
+  def add_arg_to_payload(argument)
+    merged_payload = payload + [argument]
+    return Command.new(@runtime_name, @command_type, merged_payload)
+  end
+
+  def add_arg_to_payload_on_beginning(current_command)
+    if current_command.nil?
+      return Command.new(@runtime_name, @command_type, @payload)
+    else
+      merged_payload = [current_command] + payload
+      return Command.new(@runtime_name, @command_type, merged_payload)
+    end
+  end
+
 end

package/Binaries/Ruby/Windows/X64/{sdk/core/ruby_command_type.rb → utils/command_type.rb}

@@ -1,5 +1,5 @@
-class RubyCommandType
-  RESPONSE = 0
+class CommandType
+  VALUE = 0
   LOAD_LIBRARY = 1
   INVOKE_STATIC_METHOD = 2
   GET_STATIC_FIELD = 3
@@ -18,65 +18,59 @@ class RubyCommandType
   INVOKE_GLOBAL_METHOD = 16
   DESTRUCT_REFERENCE = 17
   ARRAY = 18
-
+  ARRAY_GET_ITEM = 19
+  ARRAY_GET_SIZE = 20
+  ARRAY_GET_RANK = 21
+  ARRAY_SET_ITEM = 22
 
   def self.get_name(command_number)
-    if command_number == 0
-      return 'RESPONSE'
-    end
-    if command_number == 1
+    case command_number
+    when 0
+      return 'VALUE'
+    when 1
       return 'LOAD_LIBRARY'
-    end
-    if command_number == 2
+    when 2
       return 'INVOKE_STATIC_METHOD'
-    end
-    if command_number == 3
+    when 3
       return 'GET_STATIC_FIELD'
-    end
-    if command_number == 4
+    when 4
       return 'SET_STATIC_FIELD'
-    end
-    if command_number == 5
+    when 5
       return 'CREATE_CLASS_INSTANCE'
-    end
-    if command_number == 6
+    when 6
       return 'GET_TYPE'
-    end
-    if command_number == 7
+    when 7
       return 'REFERENCE'
-    end
-    if command_number == 8
+    when 8
       return 'GET_MODULE'
-    end
-    if command_number == 9
+    when 9
       return 'INVOKE_INSTANCE_METHOD'
-    end
-    if command_number == 10
+    when 10
       return 'EXCEPTION'
-    end
-    if command_number == 11
+    when 11
       return 'HEART_BEAT'
-    end
-    if command_number == 12
+    when 12
       return 'CAST'
-    end
-    if command_number == 13
+    when 13
       return 'GET_INSTANCE_FIELD'
-    end
-    if command_number == 14
+    when 14
       return 'OPTIMIZE'
-    end
-    if command_number == 15
+    when 15
       return 'GENERATE_LIB'
-    end
-    if command_number == 16
+    when 16
       return 'INVOKE_GLOBAL_METHOD'
-    end
-    if command_number == 17
+    when 17
       return 'DESTRUCT_REFERENCE'
-    end
-    if command_number == 18
+    when 18
       return 'ARRAY'
+    when 19
+      return 'ARRAY_GET_ITEM'
+    when 20
+      return 'ARRAY_GET_SIZE'
+    when 21
+      return 'ARRAY_GET_RANK'
+    when 22
+      return 'ARRAY_SET_ITEM'
     end
   end
 end

package/Binaries/Ruby/Windows/X64/{sdk/core → utils}/explicit_cast.rb

@@ -1,13 +1,13 @@
 class ExplicitCast
   def cast(value, target_type)
-    RubyCommand.new(
+    Command.new(
       100,
-      RubyCommandType::CAST,
+      CommandType::CAST,
       [
         value,
-        RubyCommand.new(
+        Command.new(
           100,
-          RubyCommandType::GET_TYPE,
+          CommandType::GET_TYPE,
           target_type
         )
       ]

package/Binaries/Ruby/Windows/X64/{sdk/core/runtime_lib.rb → utils/runtime_name.rb}

@@ -1,4 +1,4 @@
-module RuntimeLib
+module RuntimeName
   CLR = 0
   GO = 1
   JVM = 2

package/addon/JavonetNodejsRuntimeAddon.cpp

@@ -15,7 +15,7 @@ void InitializeTransmitter(const FunctionCallbackInfo<Value>& args) {
 #ifdef _WIN32
 	nativeLibFullPath = nodeJsAddonPath + "\\Binaries\\Native\\Windows\\X64\\JavonetNodejsRuntimeNative.dll";
 	nodejsSharedLibFullPath = nodeJsAddonPath + "\\Binaries\\Native\\Windows\\X64\\libnode.dll";
-	
+
 	NodeJsSharedLibInstance = LoadLibraryA(nodejsSharedLibFullPath.c_str());
 	if (!NodeJsSharedLibInstance) {
 		char errorMessage[300];
@@ -39,8 +39,21 @@ void InitializeTransmitter(const FunctionCallbackInfo<Value>& args) {
 
 #if defined(__linux__)
 	nativeLibFullPath = nodeJsAddonPath + "/Binaries/Native/Linux/X64/libJavonetNodejsRuntimeNative.so";
-	JavonetNodejsRuntimeNativeLibInstance = dlopen(nativeLibFullPath.c_str(), RTLD_LAZY);
+	nodejsSharedLibFullPath = nodeJsAddonPath + "/Binaries/Native/Linux/X64/libnode.so.72";
+
+	NodeJsSharedLibInstance = dlopen(nodejsSharedLibFullPath.c_str(), RTLD_LAZY);
 	char* error = dlerror();
+	if (NodeJsSharedLibInstance == NULL || error != NULL) {
+		char errorMessage[300];
+
+		sprintf(errorMessage, "%s %s \n%s %s", "libnode.so.72 not found in: ", nodejsSharedLibFullPath.c_str(), "Error: ", error);
+		isolate->ThrowException(Exception::Error(
+			String::NewFromUtf8(isolate, errorMessage,
+				NewStringType::kNormal).ToLocalChecked()));
+		return;
+	}
+	JavonetNodejsRuntimeNativeLibInstance = dlopen(nativeLibFullPath.c_str(), RTLD_LAZY);
+	error = dlerror();
 	if (JavonetNodejsRuntimeNativeLibInstance == NULL || error != NULL) {
 		char errorMessage[300];
 
@@ -53,8 +66,22 @@ void InitializeTransmitter(const FunctionCallbackInfo<Value>& args) {
 #endif	//__linux__
 #if defined(__APPLE__)
 	nativeLibFullPath = nodeJsAddonPath + "/Binaries/Native/MacOs/X64/libJavonetNodejsRuntimeNative.dylib";
-	JavonetNodejsRuntimeNativeLibInstance = dlopen(nativeLibFullPath.c_str(), RTLD_LAZY);
+	nodejsSharedLibFullPath = nodeJsAddonPath + "/Binaries/Native/MacOs/X64/libnode.72.dylib";
+
+	NodeJsSharedLibInstance = dlopen(nodejsSharedLibFullPath.c_str(), RTLD_LAZY);
 	char* error = dlerror();
+	if (NodeJsSharedLibInstance == NULL || error != NULL) {
+		char errorMessage[300];
+
+		sprintf(errorMessage, "%s %s \n%s %s", "libnode.72.dylib not found in: ", nodejsSharedLibFullPath.c_str(), "Error: ", error);
+		isolate->ThrowException(Exception::Error(
+			String::NewFromUtf8(isolate, errorMessage,
+				NewStringType::kNormal).ToLocalChecked()));
+		return;
+	}
+
+	JavonetNodejsRuntimeNativeLibInstance = dlopen(nativeLibFullPath.c_str(), RTLD_LAZY);
+	error = dlerror();
 	if (JavonetNodejsRuntimeNativeLibInstance == NULL || error != NULL) {
 		char errorMessage[300];
 		sprintf(errorMessage, "%s %s \n%s %s", "Native library not found in: ", nativeLibFullPath.c_str(), "Error: ", error);
@@ -62,7 +89,7 @@ void InitializeTransmitter(const FunctionCallbackInfo<Value>& args) {
 			String::NewFromUtf8(isolate, errorMessage,
 				NewStringType::kNormal).ToLocalChecked()));
 		return;
-	}
+}
 #endif	 //__APPLE__
 
 	SendCommandNative_Fn = (SendCommandNative)getProccessAddress(JavonetNodejsRuntimeNativeLibInstance, "SendCommand");
@@ -70,7 +97,7 @@ void InitializeTransmitter(const FunctionCallbackInfo<Value>& args) {
 	ActivateNative_Fn = (ActivateNative)getProccessAddress(JavonetNodejsRuntimeNativeLibInstance, "Activate");
 
 	if (SendCommandNative_Fn == nullptr ||
-		ReadResponseNative_Fn == nullptr||
+		ReadResponseNative_Fn == nullptr ||
 		ActivateNative_Fn == nullptr)
 	{
 		isolate->ThrowException(Exception::Error(
@@ -88,14 +115,14 @@ void SendCommand(const FunctionCallbackInfo<Value>& args)
 	context = isolate->GetCurrentContext();
 	messageArray = args[0].As<Uint8Array>();
 	messageLen = messageArray->Length();
-	
+
 	if (messageLen > 0)
 	{
 		message = new byte[messageLen];
 
 		for (size_t i = 0; i < messageLen; i++)
 		{
-			message[i] = messageArray->Get(context, i).ToLocalChecked()->Uint32Value(context).FromMaybe(0);			
+			message[i] = messageArray->Get(context, i).ToLocalChecked()->Uint32Value(context).FromMaybe(0);
 		}
 
 		responseLen = SendCommandNative_Fn((byte*)message, messageLen);
@@ -107,7 +134,7 @@ void SendCommand(const FunctionCallbackInfo<Value>& args)
 
 		for (size_t j = 0; j < responseLen; j++)
 		{
-			
+
 			responseArray->Set(context, j, Uint32::New(isolate, (int32_t)response[j]));
 		}
 		if (message)
@@ -133,13 +160,13 @@ void Activate(const FunctionCallbackInfo<Value>& args)
 {
 	isolate = args.GetIsolate();
 	if (
-	    args.Length() != 5 ||
-	    !args[0]->IsString() ||
-	    !args[1]->IsString() ||
-	    !args[2]->IsString() ||
-	    !args[3]->IsString() ||
-	    !args[4]->IsString()
-	    ) {
+		args.Length() != 5 ||
+		!args[0]->IsString() ||
+		!args[1]->IsString() ||
+		!args[2]->IsString() ||
+		!args[3]->IsString() ||
+		!args[4]->IsString()
+		) {
 		isolate->ThrowException(Exception::TypeError(
 			String::NewFromUtf8(isolate, "Wrong number of arguments or wrong argument types.",
 				NewStringType::kNormal).ToLocalChecked()));

package/addon/JavonetNodejsRuntimeAddon.h

@@ -33,6 +33,7 @@ HINSTANCE NodeJsSharedLibInstance{ nullptr };
 #define getProccessAddress dlsym
 typedef unsigned char byte;
 void* JavonetNodejsRuntimeNativeLibInstance{ nullptr };
+void* NodeJsSharedLibInstance{ nullptr };
 #endif	//__linux__ || __APPLE__
 
 std::string nativeLibFullPath{ "" };

package/lib/core/exception/ExceptionSerializer.js

@@ -0,0 +1,71 @@
+const CommandType = require("../../utils/CommandType");
+const Command = require("../../utils/Command");
+const Runtime = require("../../utils/RuntimeName");
+const ExceptionType = require("../../utils/ExceptionType");
+
+
+class ExceptionSerializer {
+
+
+    static serializeException(exception, command){
+        let exceptionCommand = new Command(
+            Runtime.Nodejs,
+            CommandType.Exception,
+            []
+        )
+        exceptionCommand = exceptionCommand.addArgToPayload(this.getExceptionCode(exception))
+        exceptionCommand = exceptionCommand.addArgToPayload(command.toString())
+        exceptionCommand = exceptionCommand.addArgToPayload(exception.name)
+        exceptionCommand = exceptionCommand.addArgToPayload(exception.message)
+
+        let stackClasses = []
+        let stackMethods = []
+        let stackLines = []
+        let stackFiles = []
+
+        this.serializeStackTrace(exception, stackClasses, stackMethods, stackLines, stackFiles)
+        exceptionCommand = exceptionCommand.addArgToPayload(stackClasses.join("|"))
+        exceptionCommand = exceptionCommand.addArgToPayload(stackMethods.join("|"))
+        exceptionCommand = exceptionCommand.addArgToPayload(stackLines.join("|"))
+        exceptionCommand = exceptionCommand.addArgToPayload(stackFiles.join("|"))
+
+        return exceptionCommand
+    }
+
+    static getExceptionCode(exception) {
+        switch (exception.name) {
+            case "Error":
+                return ExceptionType.EXCEPTION
+            case "TypeError":
+                return ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION
+            case "RangeError":
+                return ExceptionType.INDEX_OUT_OF_BOUNDS_EXCEPTION
+            default:
+                return exception.name;
+        }
+    }
+
+    static serializeStackTrace(exception, stackClasses, stackMethods, stackLines, stackFiles) {
+        const stackTrace = exception.stack.split('\n').slice(1);
+
+        for (let i = 0; i < stackTrace.length; i++) {
+            const parts = stackTrace[i].trim().match(/at\s(.*)\s\((.*):(\d+):(\d+)\)/);
+            if (parts) {
+                stackClasses.push(parts[1]);
+                stackMethods.push('unknown');
+                stackLines.push(parts[3]);
+                stackFiles.push(parts[2]);
+            } else {
+                const parts = stackTrace[i].trim().match(/at\s(.*):(\d+):(\d+)/);
+                if (parts) {
+                    stackClasses.push('unknown');
+                    stackMethods.push('unknown');
+                    stackLines.push(parts[2]);
+                    stackFiles.push(parts[1]);
+                }
+            }
+        }
+    }
+}
+
+module.exports = ExceptionSerializer

package/lib/core/exception/ExceptionThrower.js

@@ -0,0 +1,73 @@
+const ExceptionType = require("../../utils/ExceptionType");
+
+
+class ExceptionThrower {
+
+    static throwException(commandException) {
+        let javonetStackCommand = commandException.payload[1];
+        let exceptionName = commandException.payload[2];
+        let exceptionMessage =  commandException.payload[3];
+
+        let stackTraceClasses = commandException.payload[4];
+        let stackTraceMethods = commandException.payload[5];
+        let stackTraceLines = commandException.payload[6];
+        let stackTraceFiles = commandException.payload[7];
+
+        let exceptionType = commandException.payload[0];
+
+        switch (exceptionType) {
+            case ExceptionType.EXCEPTION:
+            case ExceptionType.IO_EXCEPTION:
+            case ExceptionType.FILE_NOT_FOUND_EXCEPTION:
+            case ExceptionType.RUNTIME_EXCEPTION:
+            case ExceptionType.ARITHMETIC_EXCEPTION:
+                let error = new Error()
+                error.stack = this.serializeStack(stackTraceClasses, stackTraceMethods, stackTraceLines, stackTraceFiles)
+                error.name = exceptionName
+                error.message = exceptionMessage
+                error.path = javonetStackCommand
+                throw error
+            case ExceptionType.ILLEGAL_ARGUMENT_EXCEPTION:
+            case ExceptionType.NULL_POINTER_EXCEPTION:
+                let typeError = new TypeError()
+                typeError.stack = this.serializeStack(stackTraceClasses, stackTraceMethods, stackTraceLines, stackTraceFiles)
+                typeError.name = exceptionName
+                typeError.message = exceptionMessage
+                typeError.path = javonetStackCommand
+                throw typeError
+            case ExceptionType.INDEX_OUT_OF_BOUNDS_EXCEPTION:
+                let rangeError = new RangeError()
+                rangeError.stack = this.serializeStack(stackTraceClasses, stackTraceMethods, stackTraceLines, stackTraceFiles)
+                rangeError.name = exceptionName
+                rangeError.message = exceptionMessage
+                rangeError.path = javonetStackCommand
+                throw rangeError
+            default:
+                let defaultError = new Error()
+                defaultError.stack = this.serializeStack(stackTraceClasses, stackTraceMethods, stackTraceLines, stackTraceFiles)
+                defaultError.name = exceptionName
+                defaultError.message = exceptionMessage
+                defaultError.path = javonetStackCommand
+                throw defaultError
+        }
+    }
+
+    static serializeStack(stackTraceClasses, stackTraceMethods, stackTraceLines, stackTraceFiles) {
+        let stackTraceClassesArray = stackTraceClasses.split('|')
+        let stackTraceMethodsArray = stackTraceMethods.split('|')
+        let stackTraceLinesArray = stackTraceLines.split('|')
+        let stackTraceFilesArray = stackTraceFiles.split('|')
+
+        const stackFrames = [];
+
+
+        for (let i = 0; i < stackTraceClassesArray.length; i++) {
+            const frameString = `    at ${stackTraceClassesArray[i]}.${stackTraceMethodsArray[i]} (${stackTraceFilesArray[i]}:${stackTraceLinesArray[i]})`;
+            stackFrames.push(frameString);
+        }
+        return stackFrames.join("\n")
+
+
+    }
+}
+module.exports = ExceptionThrower

package/lib/core/generator/handler/GeneratorHandler.js

@@ -11,7 +11,7 @@ class GeneratorHandler {
         for (let i = 0; i < command.payload.length; i++) {
             let existing_string_builder = new NodejsStringBuilder();
             let payloadItem = command.payload[i]
-            generator_handlers.GENERATOR_HANDLER[command.payload[i].commandId].generate_code(existing_string_builder, command, command.payload[i], generator_handlers)
+            generator_handlers.GENERATOR_HANDLER[command.payload[i].commandType].generate_code(existing_string_builder, command, command.payload[i], generator_handlers)
             this.generate_class_file(existing_string_builder, command.payload[i].payload[0], file_path)
             loadedClassFiles.push(this.generate_class_file(existing_string_builder, payloadItem.payload[0],file_path))
         }

package/lib/core/generator/handler/GetTypeGeneratorHandler.js

@@ -16,7 +16,7 @@ class GetTypeGeneratorHandler extends AbstractGeneratorHandler {
             used_object, handlers)
         existing_string_builder.append(OS.EOL)
         for (let i = 2; i < used_object.payload.length; i++) {
-            handlers.GENERATOR_HANDLER[used_object.payload[i].commandId].generate_code(existing_string_builder, common_command, used_object.payload[i], handlers)
+            handlers.GENERATOR_HANDLER[used_object.payload[i].commandType].generate_code(existing_string_builder, common_command, used_object.payload[i], handlers)
             existing_string_builder.append(OS.EOL)
         }
         existing_string_builder.append("}")

package/lib/core/generator/handler/shared/body/SharedBodyHandler.js

@@ -6,7 +6,7 @@ class SharedBodyHandler extends AbstractGeneratorHandler {
     generate_code(existing_string_builder, common_command, used_object, handlers) {
         existing_string_builder.append("{");
         existing_string_builder.append(os.EOL);
-        handlers.SHARED_BODY_HANDLER[used_object.commandId].generate_code(existing_string_builder, common_command, used_object, handlers)
+        handlers.SHARED_BODY_HANDLER[used_object.commandType].generate_code(existing_string_builder, common_command, used_object, handlers)
         existing_string_builder.append("}");
     }
 }

package/lib/core/generator/handler/shared/body/SharedCreateInstanceBodyHandler.js

@@ -1,14 +1,14 @@
 const AbstractGeneratorHandler = require("../../AbstractGeneratorHandler");
 const CommonGenerator = require("../../../internal/CommonGenerator");
 const StringUtils = require("../../../utils/StringUtils");
-const RuntimeJs = require("../../../../../utils/Runtime");
+const RuntimeName = require("../../../../../utils/RuntimeName");
 const OS = require("os");
 
 class SharedCreateInstanceBodyHandler extends AbstractGeneratorHandler {
 
     generate_code(existing_string_builder, common_command, used_object, handlers) {
         existing_string_builder.append("this.instance = Javonet.inMemory().")
-        existing_string_builder.append(StringUtils.capitalizeFirstLetter(Object.keys(RuntimeJs)[common_command.runtime]))
+        existing_string_builder.append(StringUtils.capitalizeFirstLetter(Object.keys(RuntimeName)[common_command.runtimeName]))
         existing_string_builder.append("().")
         existing_string_builder.append("getType(\"")
         existing_string_builder.append(used_object.payload[0])

package/lib/core/generator/handler/shared/body/SharedGetStaticFieldBodyHandler.js

@@ -1,7 +1,7 @@
 const AbstractGeneratorHandler = require("../../AbstractGeneratorHandler");
 const SharedHandlerType = require("../../../internal/SharedHandlerType");
 const StringUtils = require("../../../utils/StringUtils");
-const RuntimeJs = require("../../../../../utils/Runtime");
+const RuntimeName = require("../../../../../utils/RuntimeName");
 const OS = require("os");
 
 class SharedGetStaticFieldBodyHandler extends AbstractGeneratorHandler {
@@ -11,7 +11,7 @@ class SharedGetStaticFieldBodyHandler extends AbstractGeneratorHandler {
             used_object.payload[1],
             handlers)
         existing_string_builder.append("Javonet.inMemory().")
-        existing_string_builder.append(StringUtils.capitalizeFirstLetter(Object.keys(RuntimeJs)[common_command.runtime]))
+        existing_string_builder.append(StringUtils.capitalizeFirstLetter(Object.keys(RuntimeName)[common_command.runtimeName]))
         existing_string_builder.append("().")
         existing_string_builder.append("getType(\"")
         existing_string_builder.append(used_object.payload[3])

package/lib/core/generator/handler/shared/body/SharedGetTypeBodyHandler.js

@@ -1,13 +1,13 @@
 const AbstractGeneratorHandler = require("../../AbstractGeneratorHandler");
 const StringUtils = require("../../../utils/StringUtils");
-const RuntimeJs = require("../../../../../utils/Runtime");
+const RuntimeName = require("../../../../../utils/RuntimeName");
 const OS = require("os");
 
 class SharedGetTypeBodyHandler extends AbstractGeneratorHandler {
 
     generate_code(existing_string_builder, common_command, used_object, handlers) {
         existing_string_builder.append("return Javonet.inMemory().")
-        existing_string_builder.append(StringUtils.capitalizeFirstLetter(Object.keys(RuntimeJs)[common_command.runtime]))
+        existing_string_builder.append(StringUtils.capitalizeFirstLetter(Object.keys(RuntimeName)[common_command.runtimeName]))
         existing_string_builder.append("().")
         existing_string_builder.append("getType(\"")
         existing_string_builder.append(used_object.payload[0])