fix: ownership problem for mac and py C loader implementation

Author: k5602

.github/workflows/release-nodejs.yml

@@ -4,10 +4,10 @@ on:
   workflow_dispatch:
   pull_request:
   push:
-    branches: [ master, develop ]
+    branches: [master, develop]
     paths:
-      - '.github/workflows/release-nodejs.yml'
-      - 'source/ports/node_port/**'
+      - ".github/workflows/release-nodejs.yml"
+      - "source/ports/node_port/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -18,9 +18,9 @@ jobs:
     name: NodeJS Port Tests
     runs-on: ${{ matrix.os }}
     strategy:
-        fail-fast: false
-        matrix:
-          os: [ubuntu-latest, windows-latest, macos-latest]
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
@@ -33,10 +33,14 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: powershell -NoProfile -ExecutionPolicy Unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://raw.githubusercontent.com/metacall/install/master/install.ps1')))"
 
+      - name: Fix NPM Permissions (macOS)
+        if: matrix.os == 'macos-latest'
+        run: sudo chown -R $(id -u):$(id -g) ~/.npm
+
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: "20"
 
       - name: Install Dependencies
         working-directory: source/ports/node_port

source/loaders/py_loader/source/py_loader_impl.c

@@ -53,54 +53,54 @@
 #endif
 
 /* Set this variable to 1 in order to debug garbage collection data
-* and threading flow for improving the debug of memory leaks and async bugs.
-* Set it to 0 in order to remove all the noise.
-*/
+ * and threading flow for improving the debug of memory leaks and async bugs.
+ * Set it to 0 in order to remove all the noise.
+ */
 #define DEBUG_PRINT_ENABLED 0
 
 typedef struct loader_impl_py_function_type
 {
 	PyObject *func;
 	PyObject **values; // Cache and re-use the values array
 	loader_impl impl;
-} * loader_impl_py_function;
+} *loader_impl_py_function;
 
 typedef struct loader_impl_py_future_type
 {
 	loader_impl impl;
 	loader_impl_py py_impl;
 	PyObject *future;
 
-} * loader_impl_py_future;
+} *loader_impl_py_future;
 
 typedef struct loader_impl_py_class_type
 {
 	PyObject *cls;
 	loader_impl impl;
 
-} * loader_impl_py_class;
+} *loader_impl_py_class;
 
 typedef struct loader_impl_py_object_type
 {
 	PyObject *obj;
 	loader_impl impl;
 	value obj_class;
 
-} * loader_impl_py_object;
+} *loader_impl_py_object;
 
 typedef struct loader_impl_py_handle_module_type
 {
 	PyObject *instance;
 	PyObject *name;
 
-} * loader_impl_py_handle_module;
+} *loader_impl_py_handle_module;
 
 typedef struct loader_impl_py_handle_type
 {
 	loader_impl_py_handle_module modules;
 	size_t size;
 
-} * loader_impl_py_handle;
+} *loader_impl_py_handle;
 
 struct loader_impl_py_type
 {
@@ -146,7 +146,7 @@ typedef struct loader_impl_py_await_invoke_callback_state_type
 	void *context;
 	PyObject *coroutine;
 
-} * loader_impl_py_await_invoke_callback_state;
+} *loader_impl_py_await_invoke_callback_state;
 
 static int py_loader_impl_check_class(loader_impl_py py_impl, PyObject *obj);
 
@@ -200,8 +200,8 @@ static const char py_loader_capsule_null_id[] = "__metacall_capsule_null__";
 PyObject *py_loader_impl_capsule_new_null(void)
 {
 	/* We want to create a new capsule with contents set to NULL, but PyCapsule
-	* does not allow that, instead we are going to identify our NULL capsule with
-	* this configuration (setting the capsule to Py_None) */
+	 * does not allow that, instead we are going to identify our NULL capsule with
+	 * this configuration (setting the capsule to Py_None) */
 	return PyCapsule_New((void *)Py_NonePtr(), py_loader_capsule_null_id, NULL);
 }
 
@@ -2111,11 +2111,22 @@ int py_loader_impl_initialize_import(loader_impl_py py_impl)
 		"		if path == None:\n"
 		"			if module_name in sys.modules:\n"
 		"				return sys.modules[module_name]\n"
-		"			else:\n"
-		"				spec = importlib.util.find_spec(module_name)\n"
-		"				if spec is None:\n"
-		"					return FileNotFoundError('Module ' + module_name + ' could not be found')\n"
-		"				return load_from_spec(module_name, spec)\n"
+		"			file_path = Path(module_name).absolute()\n"
+		"			if file_path.suffix != \'.py\':\n"
+		"				file_path = file_path.with_suffix(\'.py\')\n"
+		"			current_search_location = str(file_path.parent)\n"
+		"			if not current_search_location in sys.path:\n"
+		"				search_location = current_search_location\n"
+		"				sys.path.insert(0, current_search_location)\n"
+		"			spec = importlib.util.spec_from_file_location(file_path.stem, str(file_path))\n"
+		"			if spec is None:\n"
+		"				if search_location is not None:\n"
+		"					sys.path.pop(0)\n"
+		"				return FileNotFoundError(\'Module \' + module_name + \' could not be found\')\n"
+		"			module = load_from_spec(module_name, spec)\n"
+		"			if search_location is not None:\n"
+		"				sys.path.pop(0)\n"
+		"			return module\n"
 		"		else:\n"
 		"			current_search_location = str(Path(path).parent.absolute())\n"
 		"			if not current_search_location in sys.path:\n"
@@ -2499,9 +2510,9 @@ loader_impl_data py_loader_impl_initialize(loader_impl impl, configuration confi
 		py_loader_impl_main_module = argv[1];
 
 		/* If we are running on host, this means the main is already executed by the host, so we can skip it,
-		* otherwise if we are not in host and we run it for the first time, we can prepare the loader
-		* for running the main the first time
-		*/
+		 * otherwise if we are not in host and we run it for the first time, we can prepare the loader
+		 * for running the main the first time
+		 */
 		if (host == 0)
 		{
 			py_loader_impl_run_main = 0;
@@ -3658,7 +3669,7 @@ int py_loader_impl_discover_class(loader_impl impl, PyObject *py_class, klass c)
 					PyUnicode_AsUTF8(tuple_key),
 					args_count,
 					NULL,			   /* There's no need to pass the method implementation (tuple_val) here,
-					* it is used only for introspection, not for invoking it, that's done by name */
+										* it is used only for introspection, not for invoking it, that's done by name */
 					VISIBILITY_PUBLIC, /* TODO: check @property decorator for protected access? */
 					func_synchronicity,
 					NULL);
@@ -3725,7 +3736,7 @@ static int py_loader_impl_validate_object(loader_impl impl, PyObject *obj, objec
 			log_write("metacall", LOG_LEVEL_DEBUG, "Discover object member %s, type %s",
 					  PyUnicode_AsUTF8(dict_key),
 					  type_id_name(py_loader_impl_capi_to_value_type(dict_val)));
-			
+
 		}
 	}