Merge branch 'main' into caleb/fix/this

Author: philippedistributive

python/pythonmonkey/require.py

@@ -299,7 +299,13 @@ def _createRequireInner(*args):
     module.paths.push(path + '/node_modules');
   module.require.path.push(python.pythonMonkey.dir + '/builtin_modules');
   module.require.path.push(python.pythonMonkey.nodeModules);
+
+  /* Add a .py loader, making it the first extension to be enumerated so py modules take precedence */
+  const extCopy = Object.assign({}, module.require.extensions);
+  for (let ext in module.require.extensions)
+    delete module.require.extensions[ext];
   module.require.extensions['.py'] = loadPythonModule;
+  Object.assign(module.require.extensions, extCopy);
 
   if (isMain)
   {

tests/js/collide.simple

@@ -0,0 +1,20 @@
+/**
+ * @file        collide.simple
+ *              Test to ensure require module identitifier collision that resolves both py and js
+ *              modules correctly prefers py modules.
+ * @author      Wes Garland <[email protected]>
+ * @date        Mar 2024
+ */
+
+const { which } = require('./modules/collide')
+const whichjs = require('./modules/collide.js').which;
+const whichpy = require('./modules/collide.py').which;
+
+if (which !== 'python')
+  throw new Error(`python module was not preferred, got ${which} instead`)
+
+if (whichpy !== 'python')
+  throw new Error(`python module was not explicitly loaded, got ${whichpy} instead`)
+
+if (whichjs !== 'javascript')
+  throw new Error(`javascript module was not explicitly loaded, got ${whichjs} instead`)

tests/js/modules/collide.js

@@ -0,0 +1 @@
+exports.which = "javascript"

tests/js/modules/collide.py

@@ -0,0 +1 @@
+exports['which']="python"