@modern-js/server-utils 1.21.5 → 2.0.0-beta.1

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

@@ -4,28 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.compileByTs = void 0;
-
 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");
-
 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; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 const readTsConfigByFile = tsConfigFile => {
   const parsedCmd = _typescript.default.getParsedCommandLineOfConfigFile(tsConfigFile, undefined, _typescript.default.sys);
-
   const {
     options,
     fileNames,
@@ -37,32 +26,25 @@ const readTsConfigByFile = tsConfigFile => {
     projectReferences
   };
 };
-
 const copyFiles = async (from, to, tsconfigPath) => {
   if (await _utils.fs.pathExists(from)) {
     const basename = _path.default.basename(from);
-
     const targetDir = _path.default.join(to, basename);
-
     await _utils.fs.copy(from, targetDir, {
       filter: src => !['.ts'].includes(_path.default.extname(src)) && src !== tsconfigPath
     });
   }
 };
-
 const compileByTs = async (appDirectory, config, compileOptions) => {
   _utils.logger.info(`Running ts compile...`);
-
   const {
     sourceDirs,
     distDir,
     tsconfigPath
   } = compileOptions;
-
   if (!tsconfigPath) {
     return;
   }
-
   const ts = new _typescriptLoader.TypescriptLoader({
     appDirectory
   }).load();
@@ -71,7 +53,7 @@ const compileByTs = async (appDirectory, config, compileOptions) => {
   const {
     alias
   } = config;
-  const aliasOption = (0, _utils.getAlias)(alias || {}, {
+  const aliasOption = (0, _utils.getAliasConfig)(alias, {
     appDirectory,
     tsconfigPath
   });
@@ -103,23 +85,17 @@ const compileByTs = async (appDirectory, config, compileOptions) => {
     before: [tsconfigPathsPlugin]
   });
   const allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
-
   if (allDiagnostics.length > 0) {
-    _utils.logger.error(ts.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost)); // eslint-disable-next-line no-process-exit
-
-
+    _utils.logger.error(ts.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost));
+    // eslint-disable-next-line no-process-exit
     process.exit(1);
   }
-
   for (const source of sourceDirs) {
     await copyFiles(source, distDir, tsconfigPath);
   }
-
   _utils.logger.info(`Ts compile succeed`);
 };
-
 exports.compileByTs = compileByTs;
-
 const getFormatHost = ts => {
   return {
     getCanonicalFileName: path => path,

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

@@ -4,32 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.tsconfigPathsBeforeHookFactory = tsconfigPathsBeforeHookFactory;
-
 var os = _interopRequireWildcard(require("os"));
-
 var _path = _interopRequireWildcard(require("path"));
-
 var ts = _interopRequireWildcard(require("typescript"));
-
 var _tsconfigPaths = require("tsconfig-paths");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const isRegExpKey = str => {
   return str.startsWith('^') || str.endsWith('$');
 };
-
 const resolveAliasPath = (baseUrl, filePath) => {
   // exclude absolute path and alias
   if (filePath.startsWith('.') || filePath.startsWith('..')) {
     return _path.default.resolve(baseUrl, filePath);
   }
-
   return filePath;
 };
-
 const createAliasMatcher = (baseUrl, alias) => {
   const aliasPairs = Object.keys(alias).reduce((o, key) => {
     if (isRegExpKey(key)) {
@@ -40,16 +30,15 @@ const createAliasMatcher = (baseUrl, alias) => {
       const aliasPath = resolveAliasPath(baseUrl, alias[key]);
       o.push([key, aliasPath]);
     }
-
     return o;
   }, []);
-  const cacheMap = new Map(); // eslint-disable-next-line consistent-return
+  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)) {
@@ -57,7 +46,6 @@ const createAliasMatcher = (baseUrl, alias) => {
           return value;
         }
       }
-
       if (requestedModule === key) {
         cacheMap.set(requestedModule, value);
         return value;
@@ -65,11 +53,9 @@ const createAliasMatcher = (baseUrl, alias) => {
     }
   };
 };
-
 const isDynamicImport = (tsBinary, node) => {
   return tsBinary.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword;
 };
-
 function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   const tsPaths = {};
   const alias = {};
@@ -82,21 +68,16 @@ function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   });
   const matchAliasPath = createAliasMatcher(baseUrl, alias);
   const matchTsPath = (0, _tsconfigPaths.createMatchPath)(baseUrl, tsPaths, ['main']);
-
   const matchPath = (requestedModule, readJSONSync, fileExists, extensions) => {
     const result = matchTsPath(requestedModule, readJSONSync, fileExists, extensions);
-
     if (result) {
       return result;
     }
-
     return matchAliasPath(requestedModule);
   };
-
   if (Object.keys(paths).length === 0) {
     return undefined;
   }
-
   return ctx => {
     return sf => {
       const visitNode = node => {
@@ -104,64 +85,53 @@ function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
           const importPathWithQuotes = node.arguments[0].getText(sf);
           const text = importPathWithQuotes.slice(1, importPathWithQuotes.length - 1);
           const result = getNotAliasedPath(sf, matchPath, text);
-
           if (!result) {
             return node;
           }
-
           return tsBinary.factory.updateCallExpression(node, node.expression, node.typeArguments, tsBinary.factory.createNodeArray([tsBinary.factory.createStringLiteral(result)]));
         }
-
         if (tsBinary.isImportDeclaration(node) || tsBinary.isExportDeclaration(node) && node.moduleSpecifier) {
           try {
             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;
             }
-
             const text = importPathWithQuotes.substring(1, importPathWithQuotes.length - 1);
             const result = getNotAliasedPath(sf, matchPath, text);
-
             if (!result) {
               return node;
             }
-
             const moduleSpecifier = tsBinary.factory.createStringLiteral(result);
             moduleSpecifier.parent = node.moduleSpecifier.parent;
-
+            let newNode;
             if (tsBinary.isImportDeclaration(node)) {
-              return tsBinary.factory.updateImportDeclaration(node, node.decorators, node.modifiers, node.importClause, moduleSpecifier, node.assertClause);
+              newNode = tsBinary.factory.updateImportDeclaration(node, node.decorators, node.modifiers, node.importClause, moduleSpecifier, node.assertClause);
             } else {
-              return tsBinary.factory.updateExportDeclaration(node, node.decorators, node.modifiers, node.isTypeOnly, node.exportClause, moduleSpecifier, node.assertClause);
+              newNode = tsBinary.factory.updateExportDeclaration(node, node.decorators, node.modifiers, node.isTypeOnly, node.exportClause, moduleSpecifier, node.assertClause);
             }
+            newNode.flags = node.flags;
+            return newNode;
           } catch (_unused) {
             return node;
           }
         }
-
         return tsBinary.visitEachChild(node, visitNode, ctx);
       };
-
       return tsBinary.visitNode(sf, visitNode);
     };
   };
-} // fork from https://github.com/nestjs/nest-cli/blob/HEAD/lib/compiler/hooks/tsconfig-paths.hook.ts
-
+}
 
+// fork from https://github.com/nestjs/nest-cli/blob/HEAD/lib/compiler/hooks/tsconfig-paths.hook.ts
 function getNotAliasedPath(sf, matcher, text) {
   let result = matcher(text, undefined, undefined, ['.ts', '.tsx', '.js', '.jsx']);
-
   if (!result) {
     return;
   }
-
   if (os.platform() === 'win32') {
     result = result.replace(/\\/g, '/');
   }
-
   if (!_path.default.isAbsolute(result)) {
     // handle alias to alias
     if (!result.startsWith('.') && !result.startsWith('..')) {
@@ -171,29 +141,25 @@ function getNotAliasedPath(sf, matcher, text) {
         const packagePath = require.resolve(result, {
           paths: [process.cwd(), ...module.paths]
         });
-
         if (packagePath) {
           // eslint-disable-next-line consistent-return
           return result;
         }
       } catch (_unused2) {}
     }
-
     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(text, {
         paths: [process.cwd(), ...module.paths]
       });
-
       if (packagePath) {
         // eslint-disable-next-line consistent-return
         return text;
       }
     } catch (_unused3) {}
   }
-
-  const resolvedPath = _path.posix.relative((0, _path.dirname)(sf.fileName), result) || './'; // eslint-disable-next-line consistent-return
-
+  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/node/compilers/typescript/typescript-loader.js

@@ -4,38 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TypescriptLoader = void 0;
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 class TypescriptLoader {
   constructor({
     appDirectory
   }) {
     _defineProperty(this, "tsBinary", void 0);
-
     _defineProperty(this, "appDirectory", void 0);
-
     this.appDirectory = appDirectory;
   }
-
   load() {
     if (this.tsBinary) {
       return this.tsBinary;
     }
-
     try {
       const tsPath = require.resolve('typescript', {
         paths: [this.appDirectory || process.cwd()]
       });
-
       const ts = require(tsPath);
-
       return ts;
     } catch (error) {
       throw new Error('TypeScript could not be found! Please, install "typescript" package.');
     }
   }
-
 }
-
 exports.TypescriptLoader = TypescriptLoader;

package/dist/js/node/index.js

@@ -12,9 +12,7 @@ Object.defineProperty(exports, "compile", {
     return _common.compile;
   }
 });
-
 var _babel = require("./compilers/babel");
-
 Object.keys(_babel).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -26,5 +24,4 @@ Object.keys(_babel).forEach(function (key) {
     }
   });
 });
-
 var _common = require("./common");

package/dist/js/treeshaking/common/index.js

@@ -5,23 +5,19 @@ import { fs } from '@modern-js/utils';
 import { compileByTs } from "../compilers/typescript";
 import { compileByBabel } from "../compilers/babel";
 export var FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
-
 var validateAbsolutePath = function validateAbsolutePath(filename, message) {
   if (!path.isAbsolute(filename)) {
     throw new Error(message);
   }
 };
-
 var validateAbsolutePaths = function validateAbsolutePaths(filenames, messageFunc) {
   filenames.forEach(function (filename) {
     return validateAbsolutePath(filename, messageFunc(filename));
   });
 };
-
 export var compile = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(appDirectory, modernConfig, compileOptions) {
     var _modernConfig$server;
-
     var sourceDirs, distDir, tsconfigPath, compiler, isTsProject;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
@@ -34,37 +30,28 @@ export var compile = /*#__PURE__*/function () {
             validateAbsolutePath(distDir, "dist dir ".concat(distDir, " is not an absolute path."));
             compiler = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig$server = modernConfig.server) === null || _modernConfig$server === void 0 ? void 0 : _modernConfig$server.compiler;
             _context.t0 = tsconfigPath;
-
             if (!_context.t0) {
               _context.next = 9;
               break;
             }
-
             _context.next = 8;
             return fs.pathExists(tsconfigPath);
-
           case 8:
             _context.t0 = _context.sent;
-
           case 9:
             isTsProject = _context.t0;
-
             if (!(!isTsProject || compiler === 'babel')) {
               _context.next = 15;
               break;
             }
-
             _context.next = 13;
             return compileByBabel(appDirectory, modernConfig, compileOptions);
-
           case 13:
             _context.next = 17;
             break;
-
           case 15:
             _context.next = 17;
             return compileByTs(appDirectory, modernConfig, compileOptions);
-
           case 17:
           case "end":
             return _context.stop();
@@ -72,7 +59,6 @@ export var compile = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-
   return function compile(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };

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

@@ -3,18 +3,16 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import * as path from 'path';
 import { getBabelChain, applyUserBabelConfig } from '@modern-js/babel-preset-lib';
-import { fs, json5, getAlias } from '@modern-js/utils';
+import { fs, json5, getAliasConfig } from '@modern-js/utils';
 import { compiler } from '@modern-js/babel-compiler';
 import { FILE_EXTENSIONS } from "../../common";
 export * from '@babel/core';
 export var readTsConfig = function readTsConfig(tsconfigPath) {
   var noExistReturn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-
   // 如果不存在，则返回 noExistReturn
   if (!fs.existsSync(tsconfigPath)) {
     return noExistReturn;
   }
-
   var content = fs.readFileSync(tsconfigPath, 'utf-8');
   return json5.parse(content);
 };
@@ -28,17 +26,20 @@ export var getBabelConfig = function getBabelConfig(libPresetOption, syntaxOptio
     sourceType: 'unambiguous'
   }, chain.toJSON());
 };
-export var resolveBabelConfig = function resolveBabelConfig(appDirectory, config, option // FIXME: babel type can't pass type checking
+export var resolveBabelConfig = function resolveBabelConfig(appDirectory, config, option
+// FIXME: babel type can't pass type checking
 ) {
   var envVars = config.envVars,
-      globalVars = config.globalVars,
-      alias = config.alias,
-      babelConfig = config.babelConfig; // alias config
+    globalVars = config.globalVars,
+    alias = config.alias,
+    babelConfig = config.babelConfig;
 
-  var aliasConfig = getAlias(alias, _objectSpread({
+  // alias config
+  var aliasConfig = getAliasConfig(alias, _objectSpread({
     appDirectory: appDirectory
-  }, option)); // babel config
+  }, option));
 
+  // babel config
   var babelChain = getBabelChain({
     appDirectory: appDirectory,
     enableReactPreset: true,
@@ -57,14 +58,13 @@ export var resolveBabelConfig = function resolveBabelConfig(appDirectory, config
   babelChain.plugin('babel-plugin-transform-typescript-metadata').use(require.resolve('babel-plugin-transform-typescript-metadata'), []);
   babelChain.plugin('@babel/plugin-proposal-decorators').use(require.resolve('@babel/plugin-proposal-decorators'), [{
     legacy: true
-  }]); // resolve "Definitely assigned fields cannot be initialized here, but only in the constructor."
+  }]);
 
+  // resolve "Definitely assigned fields cannot be initialized here, but only in the constructor."
   babelChain.plugin('@babel/plugin-proposal-class-properties').use(require.resolve('@babel/plugin-proposal-class-properties'), [{
     loose: true
   }]);
-
   var internalBabelConfig = _objectSpread({}, babelChain.toJSON());
-
   return applyUserBabelConfig(internalBabelConfig, babelConfig);
 };
 export var compileByBabel = /*#__PURE__*/function () {
@@ -90,13 +90,11 @@ export var compileByBabel = /*#__PURE__*/function () {
                         });
                         _context.next = 3;
                         return fs.pathExists(sourceDir);
-
                       case 3:
                         if (!_context.sent) {
                           _context.next = 8;
                           break;
                         }
-
                         basename = path.basename(sourceDir);
                         targetDir = path.join(distDir, basename);
                         _context.next = 8;
@@ -105,7 +103,6 @@ export var compileByBabel = /*#__PURE__*/function () {
                             return !['.ts', '.js'].includes(path.extname(src)) && src !== tsconfigPath;
                           }
                         });
-
                       case 8:
                         return _context.abrupt("return", compiler({
                           rootDir: appDirectory,
@@ -113,7 +110,6 @@ export var compileByBabel = /*#__PURE__*/function () {
                           sourceDir: sourceDir,
                           extensions: FILE_EXTENSIONS
                         }, babelConfig));
-
                       case 9:
                       case "end":
                         return _context.stop();
@@ -121,12 +117,10 @@ export var compileByBabel = /*#__PURE__*/function () {
                   }
                 }, _callee);
               }));
-
               return function (_x4) {
                 return _ref2.apply(this, arguments);
               };
             }()));
-
           case 3:
             results = _context2.sent;
             results.forEach(function (result) {
@@ -134,7 +128,6 @@ export var compileByBabel = /*#__PURE__*/function () {
                 throw new Error(result.message);
               }
             });
-
           case 5:
           case "end":
             return _context2.stop();
@@ -142,7 +135,6 @@ export var compileByBabel = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-
   return function compileByBabel(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };