@modern-js/server-utils 1.15.1-beta.1 → 1.15.1-beta.2

package/dist/js/modern/compilers/babel/index.js

@@ -107,8 +107,8 @@ export const compileByBabel = async (appDirectory, modernConfig, compileOptions)
 
     return compiler({
       rootDir: appDirectory,
-      distDir: distDir,
-      sourceDir: sourceDir,
+      distDir,
+      sourceDir,
       extensions: FILE_EXTENSIONS
     }, babelConfig);
   }));

package/dist/js/modern/compilers/typescript/index.js

@@ -6,9 +6,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import path from 'path';
 import { logger, getAlias, fs } from '@modern-js/utils';
+import ts from 'typescript';
 import { TypescriptLoader } from "./typescript-loader";
 import { tsconfigPathsBeforeHookFactory } from "./tsconfig-paths-plugin";
-import ts from 'typescript';
 
 const readTsConfigByFile = tsConfigFile => {
   const parsedCmd = ts.getParsedCommandLineOfConfigFile(tsConfigFile, undefined, ts.sys);
@@ -41,7 +41,11 @@ export const compileByTs = async (appDirectory, modernConfig, compileOptions) =>
     distDir,
     tsconfigPath
   } = compileOptions;
-  if (!tsconfigPath) return;
+
+  if (!tsconfigPath) {
+    return;
+  }
+
   const ts = new TypescriptLoader({
     appDirectory
   }).load();
@@ -68,13 +72,13 @@ export const compileByTs = async (appDirectory, modernConfig, compileOptions) =>
       return fileName.includes(sourceDir);
     });
   });
-  const targetDir = path.join(appDirectory, './dist');
-  let program = createProgram.call(ts, {
-    rootNames: rootNames,
+  const program = createProgram.call(ts, {
+    rootNames,
     projectReferences,
-    options: _objectSpread(_objectSpread({}, options), {}, {
-      outDir: targetDir
-    })
+    options: _objectSpread({
+      rootDir: appDirectory,
+      outDir: distDir
+    }, options)
   });
   const tsconfigPathsPlugin = tsconfigPathsBeforeHookFactory(ts, absoluteBaseUrl, paths);
   const emitResult = program.emit(undefined, undefined, undefined, undefined, {
@@ -83,7 +87,8 @@ export const compileByTs = async (appDirectory, modernConfig, compileOptions) =>
   const allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
 
   if (allDiagnostics.length > 0) {
-    logger.error(ts.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost));
+    logger.error(ts.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost)); // eslint-disable-next-line no-process-exit
+
     process.exit(1);
   }
 

package/dist/js/modern/compilers/typescript/tsconfig-paths-plugin.js

@@ -7,11 +7,12 @@ const isRegExpKey = str => {
 };
 
 const resolveAliasPath = (baseUrl, filePath) => {
-  if (path.isAbsolute(filePath)) {
-    return filePath;
+  // exclude absolute path and alias
+  if (filePath.startsWith('.') || filePath.startsWith('..')) {
+    return path.resolve(baseUrl, filePath);
   }
 
-  return path.resolve(baseUrl, filePath);
+  return filePath;
 };
 
 const createAliasMatcher = (baseUrl, alias) => {
@@ -27,15 +28,23 @@ const createAliasMatcher = (baseUrl, alias) => {
 
     return o;
   }, []);
+  const cacheMap = new Map(); // eslint-disable-next-line consistent-return
+
   return requestedModule => {
+    if (cacheMap.has(requestedModule)) {
+      return cacheMap.get(requestedModule);
+    }
+
     for (const [key, value] of aliasPairs) {
       if (key instanceof RegExp) {
         if (key.test(requestedModule)) {
+          cacheMap.set(requestedModule, value);
           return value;
         }
       }
 
       if (requestedModule === key) {
+        cacheMap.set(requestedModule, value);
         return value;
       }
     }
@@ -74,7 +83,9 @@ export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
       const visitNode = node => {
         if (tsBinary.isImportDeclaration(node) || tsBinary.isExportDeclaration(node) && node.moduleSpecifier) {
           try {
-            const importPathWithQuotes = node.moduleSpecifier && node.moduleSpecifier.getText();
+            var _node$moduleSpecifier;
+
+            const importPathWithQuotes = node === null || node === void 0 ? void 0 : (_node$moduleSpecifier = node.moduleSpecifier) === null || _node$moduleSpecifier === void 0 ? void 0 : _node$moduleSpecifier.getText();
 
             if (!importPathWithQuotes) {
               return node;
@@ -128,11 +139,29 @@ function getNotAliasedPath(sf, matcher, text) {
       });
 
       if (packagePath) {
+        // eslint-disable-next-line consistent-return
         return text;
       }
-    } catch (_unused2) {}
+    } catch (_unused2) {} // handle alias to alias
+
+
+    if (!result.startsWith('.') && !result.startsWith('..')) {
+      try {
+        // Installed packages (node modules) should take precedence over root files with the same name.
+        // Ref: https://github.com/nestjs/nest-cli/issues/838
+        const packagePath = require.resolve(result, {
+          paths: [process.cwd(), ...module.paths]
+        });
+
+        if (packagePath) {
+          // eslint-disable-next-line consistent-return
+          return result;
+        }
+      } catch (_unused3) {}
+    }
   }
 
-  const resolvedPath = posix.relative(dirname(sf.fileName), result) || './';
-  return resolvedPath[0] === '.' ? resolvedPath : './' + resolvedPath;
+  const resolvedPath = posix.relative(dirname(sf.fileName), result) || './'; // eslint-disable-next-line consistent-return
+
+  return resolvedPath[0] === '.' ? resolvedPath : `./${resolvedPath}`;
 }

package/dist/js/node/compilers/babel/index.js

@@ -156,8 +156,8 @@ const compileByBabel = async (appDirectory, modernConfig, compileOptions) => {
 
     return (0, _babelCompiler.compiler)({
       rootDir: appDirectory,
-      distDir: distDir,
-      sourceDir: sourceDir,
+      distDir,
+      sourceDir,
       extensions: _common.FILE_EXTENSIONS
     }, babelConfig);
   }));

package/dist/js/node/compilers/typescript/index.js

@@ -9,12 +9,12 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
+var _typescript = _interopRequireDefault(require("typescript"));
+
 var _typescriptLoader = require("./typescript-loader");
 
 var _tsconfigPathsPlugin = require("./tsconfig-paths-plugin");
 
-var _typescript = _interopRequireDefault(require("typescript"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -58,7 +58,11 @@ const compileByTs = async (appDirectory, modernConfig, compileOptions) => {
     distDir,
     tsconfigPath
   } = compileOptions;
-  if (!tsconfigPath) return;
+
+  if (!tsconfigPath) {
+    return;
+  }
+
   const ts = new _typescriptLoader.TypescriptLoader({
     appDirectory
   }).load();
@@ -85,15 +89,13 @@ const compileByTs = async (appDirectory, modernConfig, compileOptions) => {
       return fileName.includes(sourceDir);
     });
   });
-
-  const targetDir = _path.default.join(appDirectory, './dist');
-
-  let program = createProgram.call(ts, {
-    rootNames: rootNames,
+  const program = createProgram.call(ts, {
+    rootNames,
     projectReferences,
-    options: _objectSpread(_objectSpread({}, options), {}, {
-      outDir: targetDir
-    })
+    options: _objectSpread({
+      rootDir: appDirectory,
+      outDir: distDir
+    }, options)
   });
   const tsconfigPathsPlugin = (0, _tsconfigPathsPlugin.tsconfigPathsBeforeHookFactory)(ts, absoluteBaseUrl, paths);
   const emitResult = program.emit(undefined, undefined, undefined, undefined, {
@@ -102,7 +104,8 @@ const compileByTs = async (appDirectory, modernConfig, compileOptions) => {
   const allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
 
   if (allDiagnostics.length > 0) {
-    _utils.logger.error(ts.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost));
+    _utils.logger.error(ts.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost)); // eslint-disable-next-line no-process-exit
+
 
     process.exit(1);
   }

package/dist/js/node/compilers/typescript/tsconfig-paths-plugin.js

@@ -20,11 +20,12 @@ const isRegExpKey = str => {
 };
 
 const resolveAliasPath = (baseUrl, filePath) => {
-  if (_path.default.isAbsolute(filePath)) {
-    return filePath;
+  // exclude absolute path and alias
+  if (filePath.startsWith('.') || filePath.startsWith('..')) {
+    return _path.default.resolve(baseUrl, filePath);
   }
 
-  return _path.default.resolve(baseUrl, filePath);
+  return filePath;
 };
 
 const createAliasMatcher = (baseUrl, alias) => {
@@ -40,15 +41,23 @@ const createAliasMatcher = (baseUrl, alias) => {
 
     return o;
   }, []);
+  const cacheMap = new Map(); // eslint-disable-next-line consistent-return
+
   return requestedModule => {
+    if (cacheMap.has(requestedModule)) {
+      return cacheMap.get(requestedModule);
+    }
+
     for (const [key, value] of aliasPairs) {
       if (key instanceof RegExp) {
         if (key.test(requestedModule)) {
+          cacheMap.set(requestedModule, value);
           return value;
         }
       }
 
       if (requestedModule === key) {
+        cacheMap.set(requestedModule, value);
         return value;
       }
     }
@@ -87,7 +96,9 @@ function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
       const visitNode = node => {
         if (tsBinary.isImportDeclaration(node) || tsBinary.isExportDeclaration(node) && node.moduleSpecifier) {
           try {
-            const importPathWithQuotes = node.moduleSpecifier && node.moduleSpecifier.getText();
+            var _node$moduleSpecifier;
+
+            const importPathWithQuotes = node === null || node === void 0 ? void 0 : (_node$moduleSpecifier = node.moduleSpecifier) === null || _node$moduleSpecifier === void 0 ? void 0 : _node$moduleSpecifier.getText();
 
             if (!importPathWithQuotes) {
               return node;
@@ -142,11 +153,29 @@ function getNotAliasedPath(sf, matcher, text) {
       });
 
       if (packagePath) {
+        // eslint-disable-next-line consistent-return
         return text;
       }
-    } catch (_unused2) {}
+    } catch (_unused2) {} // handle alias to alias
+
+
+    if (!result.startsWith('.') && !result.startsWith('..')) {
+      try {
+        // Installed packages (node modules) should take precedence over root files with the same name.
+        // Ref: https://github.com/nestjs/nest-cli/issues/838
+        const packagePath = require.resolve(result, {
+          paths: [process.cwd(), ...module.paths]
+        });
+
+        if (packagePath) {
+          // eslint-disable-next-line consistent-return
+          return result;
+        }
+      } catch (_unused3) {}
+    }
   }
 
-  const resolvedPath = _path.posix.relative((0, _path.dirname)(sf.fileName), result) || './';
-  return resolvedPath[0] === '.' ? resolvedPath : './' + resolvedPath;
+  const resolvedPath = _path.posix.relative((0, _path.dirname)(sf.fileName), result) || './'; // eslint-disable-next-line consistent-return
+
+  return resolvedPath[0] === '.' ? resolvedPath : `./${resolvedPath}`;
 }

package/dist/js/treeshaking/compilers/typescript/index.js

@@ -4,9 +4,9 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import path from 'path';
 import { logger, getAlias, fs } from '@modern-js/utils';
+import ts from 'typescript';
 import { TypescriptLoader } from "./typescript-loader";
 import { tsconfigPathsBeforeHookFactory } from "./tsconfig-paths-plugin";
-import ts from 'typescript';
 
 var readTsConfigByFile = function readTsConfigByFile(tsConfigFile) {
   var parsedCmd = ts.getParsedCommandLineOfConfigFile(tsConfigFile, undefined, ts.sys);
@@ -61,7 +61,7 @@ var copyFiles = /*#__PURE__*/function () {
 
 export var compileByTs = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(appDirectory, modernConfig, compileOptions) {
-    var sourceDirs, distDir, tsconfigPath, ts, createProgram, formatHost, alias, aliasOption, _aliasOption$paths, paths, _aliasOption$absolute, absoluteBaseUrl, _readTsConfigByFile, options, fileNames, projectReferences, rootNames, targetDir, program, tsconfigPathsPlugin, emitResult, allDiagnostics, _iterator, _step, source;
+    var sourceDirs, distDir, tsconfigPath, ts, createProgram, formatHost, alias, aliasOption, _aliasOption$paths, paths, _aliasOption$absolute, absoluteBaseUrl, _readTsConfigByFile, options, fileNames, projectReferences, rootNames, program, tsconfigPathsPlugin, emitResult, allDiagnostics, _iterator, _step, source;
 
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
@@ -95,13 +95,13 @@ export var compileByTs = /*#__PURE__*/function () {
                 return fileName.includes(sourceDir);
               });
             });
-            targetDir = path.join(appDirectory, './dist');
             program = createProgram.call(ts, {
               rootNames: rootNames,
               projectReferences: projectReferences,
-              options: _objectSpread(_objectSpread({}, options), {}, {
-                outDir: targetDir
-              })
+              options: _objectSpread({
+                rootDir: appDirectory,
+                outDir: distDir
+              }, options)
             });
             tsconfigPathsPlugin = tsconfigPathsBeforeHookFactory(ts, absoluteBaseUrl, paths);
             emitResult = program.emit(undefined, undefined, undefined, undefined, {
@@ -110,52 +110,53 @@ export var compileByTs = /*#__PURE__*/function () {
             allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
 
             if (allDiagnostics.length > 0) {
-              logger.error(ts.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost));
+              logger.error(ts.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost)); // eslint-disable-next-line no-process-exit
+
               process.exit(1);
             }
 
             _iterator = _createForOfIteratorHelper(sourceDirs);
-            _context2.prev = 19;
+            _context2.prev = 18;
 
             _iterator.s();
 
-          case 21:
+          case 20:
             if ((_step = _iterator.n()).done) {
-              _context2.next = 27;
+              _context2.next = 26;
               break;
             }
 
             source = _step.value;
-            _context2.next = 25;
+            _context2.next = 24;
             return copyFiles(source, distDir, tsconfigPath);
 
-          case 25:
-            _context2.next = 21;
+          case 24:
+            _context2.next = 20;
             break;
 
-          case 27:
-            _context2.next = 32;
+          case 26:
+            _context2.next = 31;
             break;
 
-          case 29:
-            _context2.prev = 29;
-            _context2.t0 = _context2["catch"](19);
+          case 28:
+            _context2.prev = 28;
+            _context2.t0 = _context2["catch"](18);
 
             _iterator.e(_context2.t0);
 
-          case 32:
-            _context2.prev = 32;
+          case 31:
+            _context2.prev = 31;
 
             _iterator.f();
 
-            return _context2.finish(32);
+            return _context2.finish(31);
 
-          case 35:
+          case 34:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[19, 29, 32, 35]]);
+    }, _callee2, null, [[18, 28, 31, 34]]);
   }));
 
   return function compileByTs(_x4, _x5, _x6) {

package/dist/js/treeshaking/compilers/typescript/tsconfig-paths-plugin.js

@@ -10,11 +10,12 @@ var isRegExpKey = function isRegExpKey(str) {
 };
 
 var resolveAliasPath = function resolveAliasPath(baseUrl, filePath) {
-  if (path.isAbsolute(filePath)) {
-    return filePath;
+  // exclude absolute path and alias
+  if (filePath.startsWith('.') || filePath.startsWith('..')) {
+    return path.resolve(baseUrl, filePath);
   }
 
-  return path.resolve(baseUrl, filePath);
+  return filePath;
 };
 
 var createAliasMatcher = function createAliasMatcher(baseUrl, alias) {
@@ -31,7 +32,13 @@ var createAliasMatcher = function createAliasMatcher(baseUrl, alias) {
 
     return o;
   }, []);
+  var cacheMap = new Map(); // eslint-disable-next-line consistent-return
+
   return function (requestedModule) {
+    if (cacheMap.has(requestedModule)) {
+      return cacheMap.get(requestedModule);
+    }
+
     var _iterator = _createForOfIteratorHelper(aliasPairs),
         _step;
 
@@ -43,11 +50,13 @@ var createAliasMatcher = function createAliasMatcher(baseUrl, alias) {
 
         if (key instanceof RegExp) {
           if (key.test(requestedModule)) {
+            cacheMap.set(requestedModule, value);
             return value;
           }
         }
 
         if (requestedModule === key) {
+          cacheMap.set(requestedModule, value);
           return value;
         }
       }
@@ -91,7 +100,9 @@ export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
       var visitNode = function visitNode(node) {
         if (tsBinary.isImportDeclaration(node) || tsBinary.isExportDeclaration(node) && node.moduleSpecifier) {
           try {
-            var importPathWithQuotes = node.moduleSpecifier && node.moduleSpecifier.getText();
+            var _node$moduleSpecifier;
+
+            var importPathWithQuotes = node === null || node === void 0 ? void 0 : (_node$moduleSpecifier = node.moduleSpecifier) === null || _node$moduleSpecifier === void 0 ? void 0 : _node$moduleSpecifier.getText();
 
             if (!importPathWithQuotes) {
               return node;
@@ -145,11 +156,29 @@ function getNotAliasedPath(sf, matcher, text) {
       });
 
       if (packagePath) {
+        // eslint-disable-next-line consistent-return
         return text;
       }
-    } catch (_unused2) {}
+    } catch (_unused2) {} // handle alias to alias
+
+
+    if (!result.startsWith('.') && !result.startsWith('..')) {
+      try {
+        // Installed packages (node modules) should take precedence over root files with the same name.
+        // Ref: https://github.com/nestjs/nest-cli/issues/838
+        var _packagePath = require.resolve(result, {
+          paths: [process.cwd()].concat(_toConsumableArray(module.paths))
+        });
+
+        if (_packagePath) {
+          // eslint-disable-next-line consistent-return
+          return result;
+        }
+      } catch (_unused3) {}
+    }
   }
 
-  var resolvedPath = posix.relative(dirname(sf.fileName), result) || './';
-  return resolvedPath[0] === '.' ? resolvedPath : './' + resolvedPath;
+  var resolvedPath = posix.relative(dirname(sf.fileName), result) || './'; // eslint-disable-next-line consistent-return
+
+  return resolvedPath[0] === '.' ? resolvedPath : "./".concat(resolvedPath);
 }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.15.1-beta.1",
+  "version": "1.15.1-beta.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -41,7 +41,6 @@
     "@modern-js/utils": "1.15.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "recursive-readdir": "2.2.2",
     "tsconfig-paths": "3.14.1"
   },
   "devDependencies": {
@@ -53,7 +52,6 @@
     "@types/node": "^14",
     "@types/react": "^17",
     "@types/react-dom": "^17",
-    "@types/recursive-readdir": "2.2.0",
     "jest": "^27",
     "ts-jest": "^27.0.4",
     "typescript": "^4"