refactor: runtime code

Author: DjDeveloperr

NativeScript/CMakeLists.txt

@@ -2,14 +2,12 @@ cmake_minimum_required(VERSION 3.15)
 
 # Metadata
 
-project(NativeScript)
+project(NativeScript CXX OBJCXX)
 
 set(NAME NativeScript)
 set(VERSION 0.1.0)
 set(BUNDLE_IDENTIFIER "org.nativescript.runtime")
 
-enable_language(OBJCXX)
-
 set(CMAKE_CXX_STANDARD 20)
 
 set(BUILD_FRAMEWORK TRUE)

NativeScript/runtime/App.h

@@ -1,16 +1,12 @@
 #ifndef APP_H
 #define APP_H
 
-// #include <hermes/hermes.h>
-// #include <hermes/hermes_api.h>
-#include "js_native_api.h"
+#include "js_native_api_types.h"
 
 class App {
-public:
-  // facebook::hermes::HermesRuntime *runtime;
-
-  static App *init(napi_env env);
-  static napi_value run(napi_env env, napi_callback_info cbinfo);
+ public:
+  static App* Init(napi_env env);
+  static napi_value Run(napi_env env, napi_callback_info cbinfo);
 };
 
-#endif // APP_H
+#endif  // APP_H

NativeScript/runtime/App.mm

@@ -1,14 +1,15 @@
 #ifdef __APPLE__
 
 #include "App.h"
+#include "js_native_api.h"
 
 #ifdef TARGET_OS_MAC
 
 #import <AppKit/AppKit.h>
 
 #endif
 
-App *App::init(napi_env env) {
+App *App::Init(napi_env env) {
   App *appInst = new App();
 
   napi_value global, App, app;
@@ -18,13 +19,13 @@
   napi_create_object(env, &App);
   napi_set_named_property(env, global, "App", App);
 
-  napi_create_function(env, "run", NAPI_AUTO_LENGTH, run, appInst, &app);
+  napi_create_function(env, "run", NAPI_AUTO_LENGTH, Run, appInst, &app);
   napi_set_named_property(env, App, "run", app);
 
   return appInst;
 }
 
-napi_value App::run(napi_env env, napi_callback_info cbinfo) {
+napi_value App::Run(napi_env env, napi_callback_info cbinfo) {
   App *appInst = nullptr;
   napi_get_cb_info(env, cbinfo, nullptr, nullptr, nullptr, (void **)&appInst);
 

NativeScript/runtime/Console.cpp

@@ -3,11 +3,11 @@
 #include <iostream>
 #include <string>
 
-#include "js_native_api_types.h"
+#include "js_native_api.h"
 
 namespace nativescript {
 
-void Console::init(napi_env env) {
+void Console::Init(napi_env env) {
   napi_value global, Console, console;
 
   napi_get_global(env, &global);
@@ -16,7 +16,7 @@ void Console::init(napi_env env) {
       {
           .utf8name = "log",
           .name = nullptr,
-          .method = log,
+          .method = Log,
           .getter = nullptr,
           .setter = nullptr,
           .value = nullptr,
@@ -26,7 +26,7 @@ void Console::init(napi_env env) {
       {
           .utf8name = "error",
           .name = nullptr,
-          .method = log,
+          .method = Log,
           .getter = nullptr,
           .setter = nullptr,
           .value = nullptr,
@@ -36,7 +36,7 @@ void Console::init(napi_env env) {
       {
           .utf8name = "warn",
           .name = nullptr,
-          .method = log,
+          .method = Log,
           .getter = nullptr,
           .setter = nullptr,
           .value = nullptr,
@@ -45,7 +45,7 @@ void Console::init(napi_env env) {
       },
   };
 
-  napi_define_class(env, "Console", NAPI_AUTO_LENGTH, Console::constructor,
+  napi_define_class(env, "Console", NAPI_AUTO_LENGTH, Console::Constructor,
                     nullptr, 3, properties, &Console);
 
   napi_new_instance(env, Console, 0, nullptr, &console);
@@ -76,13 +76,13 @@ void Console::init(napi_env env) {
   napi_define_properties(env, global, 2, globalProperties);
 }
 
-napi_value Console::constructor(napi_env env, napi_callback_info cbinfo) {
+napi_value Console::Constructor(napi_env env, napi_callback_info cbinfo) {
   napi_value thisArg;
   napi_get_cb_info(env, cbinfo, nullptr, nullptr, &thisArg, nullptr);
   return thisArg;
 }
 
-napi_value Console::log(napi_env env, napi_callback_info cbinfo) {
+napi_value Console::Log(napi_env env, napi_callback_info cbinfo) {
   size_t argc = 0;
   ConsoleStream stream;
   void* data = nullptr;

NativeScript/runtime/Console.h

@@ -1,7 +1,7 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-#include "js_native_api.h"
+#include "js_native_api_types.h"
 
 namespace nativescript {
 
@@ -13,11 +13,11 @@ enum ConsoleStream {
 
 class Console {
  public:
-  static void init(napi_env env);
+  static void Init(napi_env env);
 
-  static napi_value constructor(napi_env env, napi_callback_info cbinfo);
+  static napi_value Constructor(napi_env env, napi_callback_info cbinfo);
 
-  static napi_value log(napi_env env, napi_callback_info cbinfo);
+  static napi_value Log(napi_env env, napi_callback_info cbinfo);
 };
 
 }  // namespace nativescript

NativeScript/runtime/NativeScript.mm

@@ -21,16 +21,16 @@ @implementation NativeScript
 
 - (void)runScriptString:(NSString*)script runLoop:(BOOL)runLoop {
   std::string cppScript = [script UTF8String];
-  runtime_->runScriptString(cppScript);
+  runtime_->RunScript(cppScript);
   if (runLoop) {
-    runtime_->runRunLoop();
+    runtime_->RunLoop();
   }
 }
 
 - (void)runMainApplication {
   std::string spec = "./app/bundle.js";
-  runtime_->evaluateModule(spec);
-  runtime_->runRunLoop();
+  runtime_->RunModule(spec);
+  runtime_->RunLoop();
 }
 
 - (bool)liveSync {
@@ -59,7 +59,7 @@ - (instancetype)initWithConfig:(Config*)config {
     RuntimeConfig.IsDebug = [config IsDebug];
     RuntimeConfig.LogToSystemConsole = [config LogToSystemConsole];
 
-    runtime_ = std::make_unique<Runtime>(RuntimeConfig.BaseDir);
+    runtime_ = std::make_unique<Runtime>();
 
     // TODO: separate runtime init and measure the time
 

NativeScript/runtime/Performance.cpp

@@ -1,10 +1,11 @@
 #include "Performance.h"
 
+#include "js_native_api.h"
 #include "mach/mach_time.h"
 
 namespace nativescript {
 
-void Performance::init(napi_env env) {
+void Performance::Init(napi_env env) {
   napi_value global, Performance, performance;
 
   napi_get_global(env, &global);
@@ -13,7 +14,7 @@ void Performance::init(napi_env env) {
       {
           .utf8name = "now",
           .name = nullptr,
-          .method = now,
+          .method = Now,
           .getter = nullptr,
           .setter = nullptr,
           .value = nullptr,
@@ -23,7 +24,7 @@ void Performance::init(napi_env env) {
   };
 
   napi_define_class(env, "Performance", NAPI_AUTO_LENGTH,
-                    Performance::constructor, nullptr, 1, properties,
+                    Performance::Constructor, nullptr, 1, properties,
                     &Performance);
 
   napi_new_instance(env, Performance, 0, nullptr, &performance);
@@ -44,14 +45,14 @@ void Performance::init(napi_env env) {
   napi_define_properties(env, global, 1, globalProperties);
 }
 
-napi_value Performance::constructor(napi_env env, napi_callback_info cbinfo) {
+napi_value Performance::Constructor(napi_env env, napi_callback_info cbinfo) {
   napi_value thisArg;
   napi_get_cb_info(env, cbinfo, nullptr, nullptr, &thisArg, nullptr);
 
   return thisArg;
 }
 
-napi_value Performance::now(napi_env env, napi_callback_info cbinfo) {
+napi_value Performance::Now(napi_env env, napi_callback_info cbinfo) {
   uint64_t time = mach_absolute_time();
   mach_timebase_info_data_t timebase;
   mach_timebase_info(&timebase);

NativeScript/runtime/Performance.h

@@ -1,17 +1,17 @@
 #ifndef PERFORMANCE_H
 #define PERFORMANCE_H
 
-#include "js_native_api.h"
+#include "js_native_api_types.h"
 
 namespace nativescript {
 
 class Performance {
  public:
-  static void init(napi_env env);
+  static void Init(napi_env env);
 
-  static napi_value constructor(napi_env env, napi_callback_info cbinfo);
+  static napi_value Constructor(napi_env env, napi_callback_info cbinfo);
 
-  static napi_value now(napi_env env, napi_callback_info cbinfo);
+  static napi_value Now(napi_env env, napi_callback_info cbinfo);
 };
 
 }  // namespace nativescript

NativeScript/runtime/Require.cpp

@@ -9,39 +9,39 @@
 #include "NapiUtil.h"
 #include "js_native_api.h"
 
-napi_value Require::createRequire(napi_env env, std::string& path,
+napi_value Require::CreateRequire(napi_env env, std::string& path,
                                   std::string& tilde, Require** pRequire) {
   Require* require = new Require(path, tilde);
   if (pRequire) {
     *pRequire = require;
   }
   napi_value result;
   napi_create_function(env, "require", NAPI_AUTO_LENGTH,
-                       Require::requireCallback, require, &result);
+                       Require::RequireCallback, require, &result);
   napi_ref ref;
   // napi_wrap(env, result, require, Require::finalize, nullptr, &ref);
-  napi_add_finalizer(env, result, require, Require::finalize, nullptr, &ref);
+  napi_add_finalizer(env, result, require, Require::Finalize, nullptr, &ref);
   return result;
 }
 
-Require* Require::init(napi_env env, std::string& path, std::string& tilde) {
+Require* Require::Init(napi_env env, std::string& path, std::string& tilde) {
   napi_value global;
   napi_get_global(env, &global);
 
   Require* out = nullptr;
-  napi_value require = createRequire(env, path, tilde, &out);
+  napi_value require = CreateRequire(env, path, tilde, &out);
 
   napi_set_named_property(env, global, "require", require);
 
   return out;
 }
 
-void Require::finalize(napi_env env, void* data, void* hint) {
+void Require::Finalize(napi_env env, void* data, void* hint) {
   Require* require = (Require*)data;
   delete require;
 }
 
-std::string Require::resolve(std::string& spec) {
+std::string Require::Resolve(std::string& spec) {
   if (spec.find("/") == 0) {
     return spec;
   }
@@ -85,8 +85,8 @@ void finalize_dlobject(napi_env env, void* finalize_data, void* finalize_hint) {
 
 typedef napi_value napi_module_register_fn(napi_env env, napi_value exports);
 
-napi_value Require::require(napi_env env, std::string& spec) {
-  std::string path = resolve(spec);
+napi_value Require::RequireModule(napi_env env, std::string spec) {
+  std::string path = Resolve(spec);
 
   if (path.ends_with(".node") || path.ends_with(".dylib") ||
       path.ends_with(".so")) {
@@ -181,7 +181,7 @@ napi_value Require::require(napi_env env, std::string& spec) {
 
   std::string dirname = path.substr(0, path.rfind("/"));
 
-  require = Require::createRequire(env, dirname, tilde);
+  require = Require::CreateRequire(env, dirname, tilde);
 
   napi_create_string_utf8(env, dirname.c_str(), NAPI_AUTO_LENGTH, &__dirname);
 
@@ -210,12 +210,12 @@ napi_value Require::require(napi_env env, std::string& spec) {
   return exports;
 }
 
-napi_value Require::requireCallback(napi_env env, napi_callback_info cbinfo) {
+napi_value Require::RequireCallback(napi_env env, napi_callback_info cbinfo) {
   napi_value arg;
   Require* require;
   size_t argc = 1;
   napi_get_cb_info(env, cbinfo, &argc, &arg, nullptr, (void**)&require);
   std::string spec = getStringValue(env, arg);
-  napi_value res = require->require(env, spec);
+  napi_value res = require->RequireModule(env, spec);
   return res;
 }

NativeScript/runtime/Require.h

@@ -8,18 +8,18 @@ class Require {
 public:
   Require(std::string path, std::string tilde) : path(path), tilde(tilde) {}
 
-  static Require *init(napi_env env, std::string &path, std::string &tilde);
+  static Require *Init(napi_env env, std::string &path, std::string &tilde);
 
-  static napi_value createRequire(napi_env env, std::string &path,
+  static napi_value CreateRequire(napi_env env, std::string &path,
                                   std::string &tilde,
                                   Require **pRequire = nullptr);
 
-  static void finalize(napi_env env, void *data, void *hint);
+  static void Finalize(napi_env env, void *data, void *hint);
 
-  std::string resolve(std::string &spec);
-  napi_value require(napi_env env, std::string &spec);
+  std::string Resolve(std::string &spec);
+  napi_value RequireModule(napi_env env, std::string spec);
 
-  static napi_value requireCallback(napi_env env, napi_callback_info cbinfo);
+  static napi_value RequireCallback(napi_env env, napi_callback_info cbinfo);
 
   std::string path;
   std::string tilde;