@modern-js/server-utils 2.0.0-beta.3 → 2.0.0-beta.4

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

@@ -1,171 +1,246 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import * as os from 'os';
-import path, { dirname, posix } from 'path';
-import * as ts from 'typescript';
-import { createMatchPath } from '@modern-js/utils/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)) {
-      var regexp = new RegExp(key);
-      var aliasPath = resolveAliasPath(baseUrl, alias[key]);
-      o.push([regexp, aliasPath]);
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _arrayWithHoles(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
     } else {
-      var _aliasPath = resolveAliasPath(baseUrl, alias[key]);
-      o.push([key, _aliasPath]);
+        return left instanceof right;
     }
-    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;
+}
+function _iterableToArray(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _iterableToArrayLimit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
     try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var _step$value = _slicedToArray(_step.value, 2),
-          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;
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
         }
-      }
     } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
     }
-  };
-};
-var isDynamicImport = function isDynamicImport(tsBinary, node) {
-  return tsBinary.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword;
+    return _arr;
+}
+function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _slicedToArray(arr, i) {
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+function _toConsumableArray(arr) {
+    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+import * as os from "os";
+import path, { dirname, posix } from "path";
+import * as ts from "typescript";
+import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
+var isRegExpKey = function(str) {
+    return str.startsWith("^") || str.endsWith("$");
 };
-export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
-  var tsPaths = {};
-  var alias = {};
-  Object.keys(paths).forEach(function (key) {
-    if (Array.isArray(paths[key])) {
-      tsPaths[key] = paths[key];
-    } else {
-      alias[key] = paths[key];
-    }
-  });
-  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;
+var resolveAliasPath = function(baseUrl, filePath) {
+    if (filePath.startsWith(".") || filePath.startsWith("..")) {
+        return path.resolve(baseUrl, filePath);
     }
-    return matchAliasPath(requestedModule);
-  };
-  if (Object.keys(paths).length === 0) {
-    return undefined;
-  }
-  return function (ctx) {
-    return function (sf) {
-      var visitNode = function visitNode(node) {
-        if (isDynamicImport(tsBinary, node)) {
-          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)]));
+    return filePath;
+};
+var createAliasMatcher = function(baseUrl, alias) {
+    var aliasPairs = Object.keys(alias).reduce(function(o, key) {
+        if (isRegExpKey(key)) {
+            var regexp = new RegExp(key);
+            var aliasPath = resolveAliasPath(baseUrl, alias[key]);
+            o.push([
+                regexp,
+                aliasPath
+            ]);
+        } else {
+            var aliasPath1 = resolveAliasPath(baseUrl, alias[key]);
+            o.push([
+                key,
+                aliasPath1
+            ]);
         }
-        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;
+        return o;
+    }, []);
+    var cacheMap = /* @__PURE__ */ new Map();
+    return function(requestedModule) {
+        if (cacheMap.has(requestedModule)) {
+            return cacheMap.get(requestedModule);
+        }
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = aliasPairs[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var _value = _slicedToArray(_step.value, 2), key = _value[0], value = _value[1];
+                if (_instanceof(key, RegExp)) {
+                    if (key.test(requestedModule)) {
+                        cacheMap.set(requestedModule, value);
+                        return value;
+                    }
+                }
+                if (requestedModule === key) {
+                    cacheMap.set(requestedModule, value);
+                    return value;
+                }
             }
-            var moduleSpecifier = tsBinary.factory.createStringLiteral(_result);
-            moduleSpecifier.parent = node.moduleSpecifier.parent;
-            var newNode;
-            if (tsBinary.isImportDeclaration(node)) {
-              newNode = tsBinary.factory.updateImportDeclaration(node, node.decorators, node.modifiers, node.importClause, moduleSpecifier, node.assertClause);
-            } else {
-              newNode = tsBinary.factory.updateExportDeclaration(node, node.decorators, node.modifiers, node.isTypeOnly, node.exportClause, moduleSpecifier, node.assertClause);
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
             }
-            newNode.flags = node.flags;
-            return newNode;
-          } catch (_unused) {
-            return node;
-          }
         }
-        return tsBinary.visitEachChild(node, visitNode, ctx);
-      };
-      return tsBinary.visitNode(sf, visitNode);
     };
-  };
+};
+var isDynamicImport = function(tsBinary, node) {
+    return tsBinary.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword;
+};
+function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
+    var tsPaths = {};
+    var alias = {};
+    Object.keys(paths).forEach(function(key) {
+        if (Array.isArray(paths[key])) {
+            tsPaths[key] = paths[key];
+        } else {
+            alias[key] = paths[key];
+        }
+    });
+    var matchAliasPath = createAliasMatcher(baseUrl, alias);
+    var matchTsPath = createMatchPath(baseUrl, tsPaths, [
+        "main"
+    ]);
+    var matchPath = function(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 void 0;
+    }
+    return function(ctx) {
+        return function(sf) {
+            var visitNode = function(node) {
+                if (isDynamicImport(tsBinary, node)) {
+                    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 ref;
+                        var importPathWithQuotes1 = node === null || node === void 0 ? void 0 : (ref = node.moduleSpecifier) === null || ref === void 0 ? void 0 : ref.getText();
+                        if (!importPathWithQuotes1) {
+                            return node;
+                        }
+                        var text1 = importPathWithQuotes1.substring(1, importPathWithQuotes1.length - 1);
+                        var result1 = getNotAliasedPath(sf, matchPath, text1);
+                        if (!result1) {
+                            return node;
+                        }
+                        var moduleSpecifier = tsBinary.factory.createStringLiteral(result1);
+                        moduleSpecifier.parent = node.moduleSpecifier.parent;
+                        var newNode;
+                        if (tsBinary.isImportDeclaration(node)) {
+                            newNode = tsBinary.factory.updateImportDeclaration(node, node.decorators, node.modifiers, node.importClause, moduleSpecifier, node.assertClause);
+                        } else {
+                            newNode = tsBinary.factory.updateExportDeclaration(node, node.decorators, node.modifiers, node.isTypeOnly, node.exportClause, moduleSpecifier, node.assertClause);
+                        }
+                        newNode.flags = node.flags;
+                        return newNode;
+                    } catch (e) {
+                        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
 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('..')) {
-      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;
+    var result = matcher(text, void 0, void 0, [
+        ".ts",
+        ".tsx",
+        ".js",
+        ".jsx"
+    ]);
+    if (!result) {
+        return;
+    }
+    if (os.platform() === "win32") {
+        result = result.replace(/\\/g, "/");
+    }
+    if (!path.isAbsolute(result)) {
+        if (!result.startsWith(".") && !result.startsWith("..")) {
+            try {
+                var packagePath = require.resolve(result, {
+                    paths: [
+                        process.cwd()
+                    ].concat(_toConsumableArray(module.paths))
+                });
+                if (packagePath) {
+                    return result;
+                }
+            } catch (e) {}
         }
-      } catch (_unused2) {}
+        try {
+            var packagePath1 = require.resolve(text, {
+                paths: [
+                    process.cwd()
+                ].concat(_toConsumableArray(module.paths))
+            });
+            if (packagePath1) {
+                return text;
+            }
+        } catch (e1) {}
     }
-    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
-  return resolvedPath[0] === '.' ? resolvedPath : "./".concat(resolvedPath);
-}
+    var resolvedPath = posix.relative(dirname(sf.fileName), result) || "./";
+    return resolvedPath[0] === "." ? resolvedPath : "./".concat(resolvedPath);
+}
+export { tsconfigPathsBeforeHookFactory };

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

@@ -1,30 +1,65 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-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()]
+function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+function _defineProperties(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+    }
+}
+function _createClass(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+}
+function _defineProperty(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
         });
-        var _ts = require(tsPath);
-        return _ts;
-      } catch (error) {
-        throw new Error('TypeScript could not be found! Please, install "typescript" package.');
-      }
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+var TypescriptLoader = /*#__PURE__*/ function() {
+    "use strict";
+    function TypescriptLoader(param) {
+        var appDirectory = param.appDirectory;
+        _classCallCheck(this, TypescriptLoader);
+        _defineProperty(this, "tsBinary", void 0);
+        _defineProperty(this, "appDirectory", void 0);
+        this.appDirectory = appDirectory;
     }
-  }]);
-  return TypescriptLoader;
-}();
+    _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;
+}();
+export { TypescriptLoader };

package/dist/js/treeshaking/index.js

@@ -1,2 +1,3 @@
 export * from "./compilers/babel";
-export { compile } from "./common";
+import { compile } from "./common";
+export { compile };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,7 +28,6 @@
     }
   },
   "dependencies": {
-    "@babel/compat-data": "^7.17.10",
     "@babel/core": "^7.18.0",
     "@babel/plugin-proposal-class-properties": "^7.17.12",
     "@babel/plugin-proposal-decorators": "^7.18.0",
@@ -37,10 +36,10 @@
     "@babel/runtime": "^7.18.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "@modern-js/babel-compiler": "2.0.0-beta.3",
-    "@modern-js/babel-preset-lib": "2.0.0-beta.3",
-    "@modern-js/plugin": "2.0.0-beta.3",
-    "@modern-js/utils": "2.0.0-beta.3"
+    "@modern-js/babel-compiler": "2.0.0-beta.4",
+    "@modern-js/babel-preset-lib": "2.0.0-beta.4",
+    "@modern-js/plugin": "2.0.0-beta.4",
+    "@modern-js/utils": "2.0.0-beta.4"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -49,9 +48,9 @@
     "jest": "^27",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/server-core": "2.0.0-beta.3",
-    "@scripts/build": "2.0.0-beta.3",
-    "@scripts/jest-config": "2.0.0-beta.3"
+    "@modern-js/server-core": "2.0.0-beta.4",
+    "@scripts/build": "2.0.0-beta.4",
+    "@scripts/jest-config": "2.0.0-beta.4"
   },
   "sideEffects": false,
   "publishConfig": {