@modern-js/server-utils 2.69.4 → 3.0.0-alpha.0

package/dist/esm-node/compilers/typescript/tsconfigPathsPlugin.mjs

@@ -0,0 +1,126 @@
+import { platform } from "os";
+import path, { dirname, posix } from "path";
+import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
+import { SyntaxKind } from "typescript";
+const isRegExpKey = (str)=>str.startsWith('^') || str.endsWith('$');
+const resolveAliasPath = (baseUrl, filePath)=>{
+    if (filePath.startsWith('.') || filePath.startsWith('..')) return path.resolve(baseUrl, filePath);
+    return filePath;
+};
+const createAliasMatcher = (baseUrl, alias)=>{
+    const aliasPairs = Object.keys(alias).reduce((o, key)=>{
+        if (isRegExpKey(key)) {
+            const regexp = new RegExp(key);
+            const aliasPath = resolveAliasPath(baseUrl, alias[key]);
+            o.push([
+                regexp,
+                aliasPath
+            ]);
+        } else {
+            const aliasPath = resolveAliasPath(baseUrl, alias[key]);
+            o.push([
+                key,
+                aliasPath
+            ]);
+        }
+        return o;
+    }, []);
+    const cacheMap = new Map();
+    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;
+            }
+        }
+    };
+};
+const isDynamicImport = (tsBinary, node)=>tsBinary.isCallExpression(node) && node.expression.kind === SyntaxKind.ImportKeyword;
+function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
+    const tsPaths = {};
+    const alias = {};
+    Object.keys(paths).forEach((key)=>{
+        if (Array.isArray(paths[key])) tsPaths[key] = paths[key];
+        else alias[key] = paths[key];
+    });
+    const matchAliasPath = createAliasMatcher(baseUrl, alias);
+    const matchTsPath = 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 (0 === Object.keys(paths).length) return;
+    return (ctx)=>(sf)=>{
+            const visitNode = (node)=>{
+                if (isDynamicImport(tsBinary, node)) {
+                    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 {
+                    const importPathWithQuotes = 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;
+                    newNode = tsBinary.isImportDeclaration(node) ? tsBinary.factory.updateImportDeclaration(node, node.modifiers, node.importClause, moduleSpecifier, node.assertClause) : tsBinary.factory.updateExportDeclaration(node, node.modifiers, node.isTypeOnly, node.exportClause, moduleSpecifier, node.assertClause);
+                    newNode.flags = node.flags;
+                    return newNode;
+                } catch  {
+                    return node;
+                }
+                return tsBinary.visitEachChild(node, visitNode, ctx);
+            };
+            return tsBinary.visitNode(sf, visitNode);
+        };
+}
+function getNotAliasedPath(sf, matcher, text) {
+    let result = matcher(text, void 0, void 0, [
+        '.ts',
+        '.tsx',
+        '.js',
+        '.jsx'
+    ]);
+    if (!result) return;
+    if ('win32' === platform()) result = result.replace(/\\/g, '/');
+    if (!path.isAbsolute(result)) {
+        if (!result.startsWith('.') && !result.startsWith('..')) try {
+            const packagePath = require.resolve(result, {
+                paths: [
+                    process.cwd(),
+                    ...module.paths
+                ]
+            });
+            if (packagePath) return result;
+        } catch  {}
+        try {
+            const packagePath = require.resolve(text, {
+                paths: [
+                    process.cwd(),
+                    ...module.paths
+                ]
+            });
+            if (packagePath) return text;
+        } catch  {}
+    }
+    const resolvedPath = posix.relative(dirname(sf.fileName), result) || './';
+    return '.' === resolvedPath[0] ? resolvedPath : `./${resolvedPath}`;
+}
+export { tsconfigPathsBeforeHookFactory };

package/dist/esm-node/compilers/typescript/typescriptLoader.mjs

@@ -0,0 +1,20 @@
+class TypescriptLoader {
+    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.');
+        }
+    }
+    constructor({ appDirectory }){
+        this.appDirectory = appDirectory;
+    }
+}
+export { TypescriptLoader };

package/dist/esm-node/index.mjs

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

package/package.json

@@ -15,44 +15,53 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.69.4",
+  "version": "3.0.0-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
+  "module": "./dist/esm/index.mjs",
   "exports": {
     ".": {
+      "types": "./dist/types/index.d.ts",
+      "jsnext:source": "./src/index.ts",
       "node": {
-        "jsnext:source": "./src/index.ts",
-        "import": "./dist/esm-node/index.js",
+        "import": "./dist/esm-node/index.mjs",
         "require": "./dist/cjs/index.js"
       },
-      "default": "./dist/esm/index.js"
+      "default": "./dist/esm/index.mjs"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      ".": [
+        "./dist/types/index.d.ts"
+      ]
     }
   },
   "dependencies": {
-    "@babel/core": "^7.26.0",
-    "@babel/plugin-proposal-decorators": "^7.24.7",
-    "@babel/preset-env": "^7.26.0",
-    "@babel/preset-react": "^7.22.15",
-    "@babel/preset-typescript": "^7.26.0",
+    "@babel/core": "^7.28.5",
+    "@babel/plugin-proposal-decorators": "^7.28.0",
+    "@babel/preset-env": "^7.28.5",
+    "@babel/preset-react": "^7.28.5",
+    "@babel/preset-typescript": "^7.28.5",
     "@swc/helpers": "^0.5.17",
-    "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "@modern-js/babel-compiler": "2.69.4",
-    "@modern-js/babel-plugin-module-resolver": "2.69.4",
-    "@modern-js/babel-preset": "2.69.4",
-    "@modern-js/utils": "2.69.4"
+    "babel-plugin-transform-typescript-metadata": "^0.4.0",
+    "@modern-js/babel-compiler": "3.0.0-alpha.0",
+    "@modern-js/babel-plugin-module-resolver": "3.0.0-alpha.0",
+    "@modern-js/babel-preset": "3.0.0-alpha.0",
+    "@modern-js/utils": "3.0.0-alpha.0"
   },
   "devDependencies": {
+    "@rslib/core": "0.18.5",
     "@types/babel__core": "^7.20.5",
-    "@types/jest": "^29",
-    "@types/node": "^18",
-    "jest": "^29",
-    "ts-jest": "^29.1.0",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^20",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.4.6",
     "typescript": "^5",
-    "@modern-js/server-core": "2.69.4",
-    "@scripts/build": "2.66.0",
-    "@scripts/jest-config": "2.66.0"
+    "@modern-js/server-core": "3.0.0-alpha.0",
+    "@scripts/jest-config": "2.66.0",
+    "@modern-js/rslib": "2.68.10"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -60,9 +69,8 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern-lib new",
-    "dev": "modern-lib build --watch",
-    "build": "modern-lib build",
+    "dev": "rslib build --watch",
+    "build": "rslib build",
     "test": "jest --passWithNoTests"
   }
 }

package/rslib.config.mts

@@ -0,0 +1,4 @@
+import { rslibConfig } from '@modern-js/rslib';
+import { defineConfig } from '@rslib/core';
+
+export default defineConfig(rslibConfig);

package/dist/esm/common/index.js

@@ -1,97 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import * as path from "path";
-import { fs } from "@modern-js/utils";
-var FILE_EXTENSIONS = [
-  ".js",
-  ".ts",
-  ".mjs",
-  ".ejs"
-];
-var validateAbsolutePath = function(filename, message) {
-  if (!path.isAbsolute(filename)) {
-    throw new Error(message);
-  }
-};
-var validateAbsolutePaths = function(filenames, messageFunc) {
-  filenames.forEach(function(filename) {
-    return validateAbsolutePath(filename, messageFunc(filename));
-  });
-};
-var compile = function() {
-  var _ref = _async_to_generator(function(appDirectory, modernConfig, compileOptions) {
-    var _modernConfig_server, sourceDirs, distDir, tsconfigPath, compiler, isTsProject, _tmp, compileByBabel, compileByTs;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          sourceDirs = compileOptions.sourceDirs, distDir = compileOptions.distDir, tsconfigPath = compileOptions.tsconfigPath;
-          validateAbsolutePaths(sourceDirs, function(dir) {
-            return "source dir ".concat(dir, " is not an absolute path.");
-          });
-          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;
-          _tmp = tsconfigPath;
-          if (!_tmp)
-            return [
-              3,
-              2
-            ];
-          return [
-            4,
-            fs.pathExists(tsconfigPath)
-          ];
-        case 1:
-          _tmp = _state.sent();
-          _state.label = 2;
-        case 2:
-          isTsProject = _tmp;
-          if (!(!isTsProject || compiler === "babel"))
-            return [
-              3,
-              5
-            ];
-          return [
-            4,
-            import("../compilers/babel")
-          ];
-        case 3:
-          compileByBabel = _state.sent().compileByBabel;
-          return [
-            4,
-            compileByBabel(appDirectory, modernConfig, compileOptions)
-          ];
-        case 4:
-          _state.sent();
-          return [
-            3,
-            8
-          ];
-        case 5:
-          return [
-            4,
-            import("../compilers/typescript")
-          ];
-        case 6:
-          compileByTs = _state.sent().compileByTs;
-          return [
-            4,
-            compileByTs(appDirectory, modernConfig, compileOptions)
-          ];
-        case 7:
-          _state.sent();
-          _state.label = 8;
-        case 8:
-          return [
-            2
-          ];
-      }
-    });
-  });
-  return function compile2(appDirectory, modernConfig, compileOptions) {
-    return _ref.apply(this, arguments);
-  };
-}();
-export {
-  FILE_EXTENSIONS,
-  compile
-};

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

@@ -1,119 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import * as path from "path";
-import { compiler } from "@modern-js/babel-compiler";
-import { fs, getAliasConfig, json5 } from "@modern-js/utils";
-import { FILE_EXTENSIONS } from "../../common";
-import { applyUserBabelConfig, getBabelConfig } from "./preset";
-export * from "@babel/core";
-var readTsConfig = function(tsconfigPath) {
-  var noExistReturn = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
-  if (!fs.existsSync(tsconfigPath)) {
-    return noExistReturn;
-  }
-  var content = fs.readFileSync(tsconfigPath, "utf-8");
-  return json5.parse(content);
-};
-var existTsConfigFile = function(tsconfigAbsolutePath) {
-  var tsconfig = readTsConfig(tsconfigAbsolutePath);
-  return Boolean(tsconfig);
-};
-var resolveBabelConfig = function(appDirectory, config, option, isEsm) {
-  var alias = config.alias, babelConfig = config.babelConfig;
-  var aliasConfig = getAliasConfig(alias, _object_spread({
-    appDirectory
-  }, option));
-  var defaultBabelConfig = getBabelConfig({
-    appDirectory,
-    alias: aliasConfig,
-    isEsm
-  });
-  return applyUserBabelConfig(defaultBabelConfig, babelConfig);
-};
-var compileByBabel = function() {
-  var _ref = _async_to_generator(function(appDirectory, config, compileOptions) {
-    var sourceDirs, distDir, tsconfigPath, moduleType, isEsm, results;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          sourceDirs = compileOptions.sourceDirs, distDir = compileOptions.distDir, tsconfigPath = compileOptions.tsconfigPath, moduleType = compileOptions.moduleType;
-          isEsm = moduleType === "module";
-          return [
-            4,
-            Promise.all(sourceDirs.map(function() {
-              var _ref2 = _async_to_generator(function(sourceDir) {
-                var babelConfig, basename, targetDir;
-                return _ts_generator(this, function(_state2) {
-                  switch (_state2.label) {
-                    case 0:
-                      babelConfig = resolveBabelConfig(appDirectory, config, {
-                        tsconfigPath: tsconfigPath ? tsconfigPath : ""
-                      }, isEsm);
-                      return [
-                        4,
-                        fs.pathExists(sourceDir)
-                      ];
-                    case 1:
-                      if (!_state2.sent())
-                        return [
-                          3,
-                          3
-                        ];
-                      basename = path.basename(sourceDir);
-                      targetDir = path.join(distDir, basename);
-                      return [
-                        4,
-                        fs.copy(sourceDir, targetDir, {
-                          filter: function(src) {
-                            return ![
-                              ".ts",
-                              ".js"
-                            ].includes(path.extname(src)) && src !== tsconfigPath;
-                          }
-                        })
-                      ];
-                    case 2:
-                      _state2.sent();
-                      _state2.label = 3;
-                    case 3:
-                      return [
-                        2,
-                        compiler({
-                          rootDir: appDirectory,
-                          distDir,
-                          sourceDir,
-                          extensions: FILE_EXTENSIONS
-                        }, babelConfig)
-                      ];
-                  }
-                });
-              });
-              return function(sourceDir) {
-                return _ref2.apply(this, arguments);
-              };
-            }()))
-          ];
-        case 1:
-          results = _state.sent();
-          results.forEach(function(result) {
-            if (result.code === 1) {
-              throw new Error(result.message);
-            }
-          });
-          return [
-            2
-          ];
-      }
-    });
-  });
-  return function compileByBabel2(appDirectory, config, compileOptions) {
-    return _ref.apply(this, arguments);
-  };
-}();
-export {
-  compileByBabel,
-  existTsConfigFile,
-  readTsConfig,
-  resolveBabelConfig
-};

package/dist/esm/compilers/babel/preset/alias.js

@@ -1,70 +0,0 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
-import path from "path";
-import { getUserAlias } from "@modern-js/utils";
-import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
-var resolvePath = require("@modern-js/babel-plugin-module-resolver").resolvePath;
-var defaultPaths = {
-  "@": [
-    "./src"
-  ]
-};
-var aliasPlugin = function(alias) {
-  var absoluteBaseUrl = alias.absoluteBaseUrl, isTsPath = alias.isTsPath, _alias_isTsProject = alias.isTsProject, isTsProject = _alias_isTsProject === void 0 ? false : _alias_isTsProject;
-  var mergedPaths = isTsPath ? alias.paths || {} : _object_spread({}, defaultPaths, alias.paths || {});
-  var tsPaths = {};
-  if (isTsProject) {
-    tsPaths = getUserAlias(mergedPaths);
-  }
-  tsPaths = Object.keys(tsPaths).reduce(function(o, key) {
-    if (typeof tsPaths[key] === "string") {
-      return _object_spread_props(_object_spread({}, o), _define_property({}, "".concat(key), [
-        tsPaths[key]
-      ]));
-    }
-    return _object_spread_props(_object_spread({}, o), _define_property({}, "".concat(key), tsPaths[key]));
-  }, {});
-  var resolvePathFn = function(sourcePath, currentFile, opts) {
-    if (sourcePath === "." || sourcePath === "./") {
-      return sourcePath;
-    }
-    var matchPath = createMatchPath(absoluteBaseUrl, tsPaths, [
-      "index"
-    ]);
-    var result = matchPath(sourcePath, void 0, void 0, [
-      ".js",
-      ".jsx",
-      ".ts",
-      ".tsx"
-    ]);
-    if (result) {
-      var relativePath = path.relative(path.dirname(currentFile), path.dirname(result));
-      var fileName = path.basename(result);
-      var filePath = path.normalize("".concat(relativePath.length === 0 ? "." : relativePath, "/").concat(fileName)).replace(/\\/, "/");
-      return filePath.startsWith(".") ? filePath : "./".concat(filePath);
-    }
-    return resolvePath(sourcePath, currentFile, opts);
-  };
-  var typescriptExts = [
-    ".ts",
-    ".tsx",
-    ".js",
-    ".jsx",
-    ".es",
-    ".es6",
-    ".mjs"
-  ];
-  return [
-    require.resolve("@modern-js/babel-plugin-module-resolver"),
-    {
-      root: absoluteBaseUrl,
-      alias: mergedPaths,
-      resolvePath: isTsPath ? resolvePathFn : void 0,
-      extensions: isTsProject ? typescriptExts : void 0
-    }
-  ];
-};
-export {
-  aliasPlugin
-};

package/dist/esm/compilers/babel/preset/index.js

@@ -1,36 +0,0 @@
-import { getBabelConfigForNode } from "@modern-js/babel-preset/node";
-import { aliasPlugin } from "./alias";
-var getBabelConfig = function(libPresetOption) {
-  var _config_presets, _config_plugins;
-  var isEsm = libPresetOption.isEsm;
-  var config = getBabelConfigForNode({
-    presetEnv: {
-      loose: true,
-      modules: isEsm ? false : "commonjs",
-      targets: [
-        "node >= 14"
-      ]
-    },
-    pluginDecorators: {
-      version: "legacy"
-    }
-  });
-  (_config_presets = config.presets) === null || _config_presets === void 0 ? void 0 : _config_presets.push([
-    require.resolve("@babel/preset-react"),
-    {
-      runtime: "automatic"
-    }
-  ]);
-  if (libPresetOption.alias) {
-    var _config_plugins1;
-    (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(aliasPlugin(libPresetOption.alias));
-  }
-  (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(require.resolve("babel-plugin-transform-typescript-metadata"));
-  return config;
-};
-export * from "./types";
-import { applyUserBabelConfig } from "@modern-js/utils";
-export {
-  applyUserBabelConfig,
-  getBabelConfig
-};