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

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

@@ -3,24 +3,22 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 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 { logger, getAliasConfig, fs } from '@modern-js/utils';
 import ts from 'typescript';
 import { TypescriptLoader } from "./typescript-loader";
 import { tsconfigPathsBeforeHookFactory } from "./tsconfig-paths-plugin";
-
 var readTsConfigByFile = function readTsConfigByFile(tsConfigFile) {
   var parsedCmd = ts.getParsedCommandLineOfConfigFile(tsConfigFile, undefined, ts.sys);
   var _ref = parsedCmd,
-      options = _ref.options,
-      fileNames = _ref.fileNames,
-      projectReferences = _ref.projectReferences;
+    options = _ref.options,
+    fileNames = _ref.fileNames,
+    projectReferences = _ref.projectReferences;
   return {
     options: options,
     fileNames: fileNames,
     projectReferences: projectReferences
   };
 };
-
 var copyFiles = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(from, to, tsconfigPath) {
     var basename, targetDir;
@@ -30,13 +28,11 @@ var copyFiles = /*#__PURE__*/function () {
           case 0:
             _context.next = 2;
             return fs.pathExists(from);
-
           case 2:
             if (!_context.sent) {
               _context.next = 7;
               break;
             }
-
             basename = path.basename(from);
             targetDir = path.join(to, basename);
             _context.next = 7;
@@ -45,7 +41,6 @@ var copyFiles = /*#__PURE__*/function () {
                 return !['.ts'].includes(path.extname(src)) && src !== tsconfigPath;
               }
             });
-
           case 7:
           case "end":
             return _context.stop();
@@ -53,30 +48,24 @@ var copyFiles = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-
   return function copyFiles(_x, _x2, _x3) {
     return _ref2.apply(this, arguments);
   };
 }();
-
 export var compileByTs = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(appDirectory, config, compileOptions) {
     var sourceDirs, distDir, tsconfigPath, ts, createProgram, formatHost, alias, aliasOption, _aliasOption$paths, paths, _aliasOption$absolute, absoluteBaseUrl, _readTsConfigByFile, options, fileNames, projectReferences, sourcePosixPaths, rootNames, program, tsconfigPathsPlugin, emitResult, allDiagnostics, _iterator, _step, source;
-
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             logger.info("Running ts compile...");
             sourceDirs = compileOptions.sourceDirs, distDir = compileOptions.distDir, tsconfigPath = compileOptions.tsconfigPath;
-
             if (tsconfigPath) {
               _context2.next = 4;
               break;
             }
-
             return _context2.abrupt("return");
-
           case 4:
             ts = new TypescriptLoader({
               appDirectory: appDirectory
@@ -84,7 +73,7 @@ export var compileByTs = /*#__PURE__*/function () {
             createProgram = ts.createIncrementalProgram || ts.createProgram;
             formatHost = getFormatHost(ts);
             alias = config.alias;
-            aliasOption = getAlias(alias || {}, {
+            aliasOption = getAliasConfig(alias, {
               appDirectory: appDirectory,
               tsconfigPath: tsconfigPath
             });
@@ -111,52 +100,38 @@ export var compileByTs = /*#__PURE__*/function () {
               before: [tsconfigPathsPlugin]
             });
             allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
-
             if (allDiagnostics.length > 0) {
-              logger.error(ts.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost)); // eslint-disable-next-line no-process-exit
-
+              logger.error(ts.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost));
+              // eslint-disable-next-line no-process-exit
               process.exit(1);
             }
-
             _iterator = _createForOfIteratorHelper(sourceDirs);
             _context2.prev = 19;
-
             _iterator.s();
-
           case 21:
             if ((_step = _iterator.n()).done) {
               _context2.next = 27;
               break;
             }
-
             source = _step.value;
             _context2.next = 25;
             return copyFiles(source, distDir, tsconfigPath);
-
           case 25:
             _context2.next = 21;
             break;
-
           case 27:
             _context2.next = 32;
             break;
-
           case 29:
             _context2.prev = 29;
             _context2.t0 = _context2["catch"](19);
-
             _iterator.e(_context2.t0);
-
           case 32:
             _context2.prev = 32;
-
             _iterator.f();
-
             return _context2.finish(32);
-
           case 35:
             logger.info("Ts compile succeed");
-
           case 36:
           case "end":
             return _context2.stop();
@@ -164,12 +139,10 @@ export var compileByTs = /*#__PURE__*/function () {
       }
     }, _callee2, null, [[19, 29, 32, 35]]);
   }));
-
   return function compileByTs(_x4, _x5, _x6) {
     return _ref3.apply(this, arguments);
   };
 }();
-
 var getFormatHost = function getFormatHost(ts) {
   return {
     getCanonicalFileName: function getCanonicalFileName(path) {

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

@@ -5,20 +5,16 @@ import * as os from 'os';
 import path, { dirname, posix } from 'path';
 import * as ts from 'typescript';
 import { createMatchPath } from 'tsconfig-paths';
-
 var isRegExpKey = function isRegExpKey(str) {
   return str.startsWith('^') || str.endsWith('$');
 };
-
 var resolveAliasPath = function resolveAliasPath(baseUrl, filePath) {
   // exclude absolute path and alias
   if (filePath.startsWith('.') || filePath.startsWith('..')) {
     return path.resolve(baseUrl, filePath);
   }
-
   return filePath;
 };
-
 var createAliasMatcher = function createAliasMatcher(baseUrl, alias) {
   var aliasPairs = Object.keys(alias).reduce(function (o, key) {
     if (isRegExpKey(key)) {
@@ -27,35 +23,30 @@ var createAliasMatcher = function createAliasMatcher(baseUrl, alias) {
       o.push([regexp, aliasPath]);
     } else {
       var _aliasPath = resolveAliasPath(baseUrl, alias[key]);
-
       o.push([key, _aliasPath]);
     }
-
     return o;
   }, []);
-  var cacheMap = new Map(); // eslint-disable-next-line consistent-return
+  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;
-
+      _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var _step$value = _slicedToArray(_step.value, 2),
-            key = _step$value[0],
-            value = _step$value[1];
-
+          key = _step$value[0],
+          value = _step$value[1];
         if (key instanceof RegExp) {
           if (key.test(requestedModule)) {
             cacheMap.set(requestedModule, value);
             return value;
           }
         }
-
         if (requestedModule === key) {
           cacheMap.set(requestedModule, value);
           return value;
@@ -68,11 +59,9 @@ var createAliasMatcher = function createAliasMatcher(baseUrl, alias) {
     }
   };
 };
-
 var isDynamicImport = function isDynamicImport(tsBinary, node) {
   return tsBinary.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword;
 };
-
 export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   var tsPaths = {};
   var alias = {};
@@ -85,21 +74,16 @@ export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   });
   var matchAliasPath = createAliasMatcher(baseUrl, alias);
   var matchTsPath = createMatchPath(baseUrl, tsPaths, ['main']);
-
   var matchPath = function matchPath(requestedModule, readJSONSync, fileExists, extensions) {
     var result = matchTsPath(requestedModule, readJSONSync, fileExists, extensions);
-
     if (result) {
       return result;
     }
-
     return matchAliasPath(requestedModule);
   };
-
   if (Object.keys(paths).length === 0) {
     return undefined;
   }
-
   return function (ctx) {
     return function (sf) {
       var visitNode = function visitNode(node) {
@@ -107,64 +91,53 @@ export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
           var importPathWithQuotes = node.arguments[0].getText(sf);
           var text = importPathWithQuotes.slice(1, importPathWithQuotes.length - 1);
           var 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;
-
             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;
             }
-
             var _text = _importPathWithQuotes.substring(1, _importPathWithQuotes.length - 1);
-
             var _result = getNotAliasedPath(sf, matchPath, _text);
-
             if (!_result) {
               return node;
             }
-
             var moduleSpecifier = tsBinary.factory.createStringLiteral(_result);
             moduleSpecifier.parent = node.moduleSpecifier.parent;
-
+            var 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) {
   var result = matcher(text, undefined, undefined, ['.ts', '.tsx', '.js', '.jsx']);
-
   if (!result) {
     return;
   }
-
   if (os.platform() === 'win32') {
     result = result.replace(/\\/g, '/');
   }
-
   if (!path.isAbsolute(result)) {
     // handle alias to alias
     if (!result.startsWith('.') && !result.startsWith('..')) {
@@ -174,29 +147,25 @@ function getNotAliasedPath(sf, matcher, text) {
         var packagePath = require.resolve(result, {
           paths: [process.cwd()].concat(_toConsumableArray(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
       var _packagePath = require.resolve(text, {
         paths: [process.cwd()].concat(_toConsumableArray(module.paths))
       });
-
       if (_packagePath) {
         // eslint-disable-next-line consistent-return
         return text;
       }
     } catch (_unused3) {}
   }
-
-  var resolvedPath = posix.relative(dirname(sf.fileName), result) || './'; // eslint-disable-next-line consistent-return
-
+  var resolvedPath = posix.relative(dirname(sf.fileName), result) || './';
+  // eslint-disable-next-line consistent-return
   return resolvedPath[0] === '.' ? resolvedPath : "./".concat(resolvedPath);
 }

package/dist/js/treeshaking/compilers/typescript/typescript-loader.js

@@ -4,36 +4,27 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 export var TypescriptLoader = /*#__PURE__*/function () {
   function TypescriptLoader(_ref) {
     var appDirectory = _ref.appDirectory;
-
     _classCallCheck(this, TypescriptLoader);
-
     _defineProperty(this, "tsBinary", void 0);
-
     _defineProperty(this, "appDirectory", void 0);
-
     this.appDirectory = appDirectory;
   }
-
   _createClass(TypescriptLoader, [{
     key: "load",
     value: function load() {
       if (this.tsBinary) {
         return this.tsBinary;
       }
-
       try {
         var tsPath = require.resolve('typescript', {
           paths: [this.appDirectory || process.cwd()]
         });
-
         var _ts = require(tsPath);
-
         return _ts;
       } catch (error) {
         throw new Error('TypeScript could not be found! Please, install "typescript" package.');
       }
     }
   }]);
-
   return TypescriptLoader;
 }();

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.5",
+  "version": "2.0.0-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,13 +35,13 @@
     "@babel/preset-env": "^7.18.0",
     "@babel/preset-typescript": "^7.17.12",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "^1.21.5",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "tsconfig-paths": "3.14.1",
-    "@modern-js/babel-preset-lib": "1.21.5",
-    "@modern-js/plugin": "1.21.5",
-    "@modern-js/utils": "1.21.5"
+    "@modern-js/babel-compiler": "2.0.0-beta.1",
+    "@modern-js/babel-preset-lib": "2.0.0-beta.1",
+    "@modern-js/plugin": "2.0.0-beta.1",
+    "@modern-js/utils": "2.0.0-beta.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -50,42 +50,19 @@
     "jest": "^27",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/core": "1.21.5",
-    "@scripts/build": "1.21.5",
-    "@scripts/jest-config": "1.21.5"
+    "@modern-js/core": "2.0.0-beta.1",
+    "@scripts/build": "2.0.0-beta.1",
+    "@scripts/jest-config": "2.0.0-beta.1"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
     "dev": "modern build --watch",
-    "build": "wireit",
-    "test": "wireit"
+    "build": "modern build",
+    "test": "jest --passWithNoTests"
   }
 }