Fix issue #30 in resolving local modules with relative paths and work…

…around for #28 (#31)

package.json

@@ -11,10 +11,14 @@
   },
   "author": "Deepal Jayasekara <dpjayasekara@gmail.com>",
   "license": "ISC",
+  "engines": {
+    "node": "<=12.15.0"
+  },
   "dependencies": {
     "colors": "1.4.0",
     "mkdirp": "0.5.1",
-    "rimraf": "3.0.0"
+    "rimraf": "3.0.0",
+    "semver": "7.1.3"
   },
   "repository": {
     "type": "git",

src/baapan.js

@@ -6,6 +6,7 @@ import { Module } from 'module';
 import path from 'path';
 import 'colors';
 import repl from 'repl';
+import compatibility from './versionCheck';
 
 export default class BaapanREPLServer {
   constructor(options = {}) {
@@ -48,8 +49,14 @@ export default class BaapanREPLServer {
 
   installModule(moduleName) {
     console.info(`Fetching and installing module '${moduleName}' from npm...`.grey.italic);
-    execSync(`npm install --silent ${moduleName}`, { cwd: this.options.workspacePath });
-    console.info('Done!'.grey.italic);
+    try {
+      execSync(`npm install --silent ${moduleName}`, { cwd: this.options.workspacePath });
+      console.info('Done!'.grey.italic);
+    } catch (err) {
+      const e = new Error(`Could not install module! ${err.message || 'Unknown Error'}`.red);
+      e.stack = null;
+      throw e;
+    }
   }
 
   /**
@@ -70,6 +77,7 @@ export default class BaapanREPLServer {
         execSync('npm init -y --scope baapan', { cwd: this.options.workspacePath });
       }
     }
+    mkdirp.sync(path.join(this.options.workspacePath, 'node_modules'));
   }
 
   initializeReplHistory() {
@@ -113,18 +121,21 @@ export default class BaapanREPLServer {
     const workspaceModulesDir = path.join(this.options.workspacePath, 'node_modules');
     const originalRequire = Module.prototype.require;
     Module.prototype.require = function (moduleName) {
-      // Inject workspace node_modules directory
-      this.paths.unshift(workspaceModulesDir);
+      // This is required in node versions >= 12.3.0
+      if (!this.paths.includes(process.cwd())) this.paths.unshift(process.cwd());
+      // The following behaviour is broken in latest node versions.
+      // Skip it if the node version is not supported
+      if (compatibility.isSupportedNodeVersion() && !this.paths.includes(workspaceModulesDir)) {
+        this.paths.unshift(workspaceModulesDir);
+      }
       try {
-        return originalRequire.apply(this, [moduleName]);
+        return originalRequire.call(this, moduleName);
       } catch (err) {
         const moduleInfo = BaapanREPLServer.getModuleInfo(moduleName);
         if (!moduleInfo.isThirdPartyModule) throw err;
 
         self.installModule(moduleInfo.path);
-        return originalRequire.apply(this, [
-          path.join(self.options.workspacePath, 'node_modules', moduleName),
-        ]);
+        return originalRequire.call(this, path.join(self.options.workspacePath, 'node_modules', moduleName));
       }
     };
   }

src/entrypoint.js

@@ -13,9 +13,13 @@ const mergedNodeOpts = (
     .filter((opt) => !!opt)
 );
 
-require('child_process').spawn(nodePath, [...mergedNodeOpts, libPath], {
-  cwd: process.cwd(),
-  env: process.env,
-  stdio: 'inherit',
-  windowsHide: true,
-});
+if (mergedNodeOpts.length) {
+  require('child_process').spawn(nodePath, [...mergedNodeOpts, libPath], {
+    cwd: process.cwd(),
+    env: process.env,
+    stdio: 'inherit',
+    windowsHide: true,
+  });
+} else {
+  require(libPath);
+}

src/index.js

@@ -1,9 +1,17 @@
 #!/usr/bin/env node
 import os from 'os';
 import path from 'path';
+import compatibility from './versionCheck';
 import BaapanREPLServer from './baapan';
 import 'colors';
 
+// Temporary warning for https://github.com/deepal/baapan/issues/28
+if (!compatibility.isSupportedNodeVersion()) {
+  console.error(
+    `Your current Node version (${compatibility.currentNodeVersion}) is not fully supported yet, but we are working on it. Currently we only support Node ${compatibility.requiredNodeVersion}`.yellow,
+  );
+}
+
 let workspacePath = process.env.BAAPAN_WS_PATH;
 let replHistoryPath = null;
 let persistWorkspace = true;

src/versionCheck.js

@@ -0,0 +1,15 @@
+import semver from 'semver';
+import pkg from '../package.json';
+
+const { engines } = pkg;
+
+export default {
+  currentNodeVersion: process.version,
+  requiredNodeVersion: (engines && engines.node) || 'none',
+  isSupportedNodeVersion() {
+    if (engines && engines.node) {
+      return semver.satisfies(process.version, engines.node);
+    }
+    return true;
+  },
+};