@modern-js/bff-core 1.0.1-beta.7 → 1.0.1-beta.8

package/dist/js/modern/router/utils.js

@@ -39,9 +39,18 @@ const clearRouteName = routeName => {
 export const isHandler = input => input && typeof input === 'function';
 
 const enableRegister = requireFn => {
+  // esbuild-register 做 unRegister 时，不会删除 register 添加的 require.extensions，导致第二次调用时 require.extensions['.ts'] 是 nodejs 默认 loader
+  // 所以这里根据第一次调用时，require.extensions 有没有，来判断是否需要使用 esbuild-register
+  let existTsLoader = false;
+  let firstCall = true;
   return modulePath => {
-    // eslint-disable-next-line node/no-deprecated-api
-    if (!require.extensions['.ts']) {
+    if (firstCall) {
+      // eslint-disable-next-line node/no-deprecated-api
+      existTsLoader = Boolean(require.extensions['.ts']);
+      firstCall = false;
+    }
+
+    if (!existTsLoader) {
       const {
         register
       } = require('esbuild-register/dist/node');

package/dist/js/modern/utils.js

@@ -1,4 +1,7 @@
 import util from 'util';
+import fs from 'fs';
+import Module from 'module';
+import path from 'path';
 import { createDebugger } from '@modern-js/utils';
 export const HANDLER_WITH_META = 'HANDLER_WITH_META';
 export const debug = createDebugger('bff'); // export const pick = <T extends Record<string, unknown>, K extends keyof T>(
@@ -60,4 +63,74 @@ export const validateFunction = (maybeFunc, name) => {
 };
 export const isWithMetaHandler = handler => {
   return typeof handler === 'function' && handler[HANDLER_WITH_META];
+};
+
+const sortByLongestPrefix = arr => {
+  return arr.concat().sort((a, b) => b.length - a.length);
+};
+
+export const createMatchPath = paths => {
+  const sortedKeys = sortByLongestPrefix(Object.keys(paths));
+  const sortedPaths = {};
+  sortedKeys.forEach(key => {
+    sortedPaths[key] = paths[key];
+  });
+  return request => {
+    const found = Object.keys(sortedPaths).find(key => {
+      return request.startsWith(key);
+    });
+
+    if (found) {
+      let foundPaths = sortedPaths[found];
+
+      if (!Array.isArray(foundPaths)) {
+        foundPaths = [foundPaths];
+      }
+
+      foundPaths = foundPaths.filter(foundPath => path.isAbsolute(foundPath));
+
+      for (const p of foundPaths) {
+        const foundPath = request.replace(found, p);
+
+        if (fs.existsSync(foundPath)) {
+          return foundPath;
+        }
+      }
+
+      return request.replace(found, foundPaths[0]);
+    }
+
+    return null;
+  };
+}; // paths 中的值只能是绝对路径
+
+export const registerPaths = paths => {
+  const originalResolveFilename = Module._resolveFilename; // eslint-disable-next-line node/no-unsupported-features/node-builtins
+
+  const {
+    builtinModules
+  } = Module;
+  const matchPath = createMatchPath(paths);
+
+  Module._resolveFilename = function (request, _parent) {
+    const isCoreModule = builtinModules.includes(request);
+
+    if (!isCoreModule) {
+      const matched = matchPath(request);
+
+      if (matched) {
+        // eslint-disable-next-line prefer-rest-params
+        const modifiedArguments = [matched, ...[].slice.call(arguments, 1)]; // Passes all arguments. Even those that is not specified above.
+
+        return originalResolveFilename.apply(this, modifiedArguments);
+      }
+    } // eslint-disable-next-line prefer-rest-params
+
+
+    return originalResolveFilename.apply(this, arguments);
+  };
+
+  return () => {
+    Module._resolveFilename = originalResolveFilename;
+  };
 };

package/dist/js/node/router/utils.js

@@ -58,9 +58,18 @@ const isHandler = input => input && typeof input === 'function';
 exports.isHandler = isHandler;
 
 const enableRegister = requireFn => {
+  // esbuild-register 做 unRegister 时，不会删除 register 添加的 require.extensions，导致第二次调用时 require.extensions['.ts'] 是 nodejs 默认 loader
+  // 所以这里根据第一次调用时，require.extensions 有没有，来判断是否需要使用 esbuild-register
+  let existTsLoader = false;
+  let firstCall = true;
   return modulePath => {
-    // eslint-disable-next-line node/no-deprecated-api
-    if (!require.extensions['.ts']) {
+    if (firstCall) {
+      // eslint-disable-next-line node/no-deprecated-api
+      existTsLoader = Boolean(require.extensions['.ts']);
+      firstCall = false;
+    }
+
+    if (!existTsLoader) {
       const {
         register
       } = require('esbuild-register/dist/node');

package/dist/js/node/utils.js

@@ -3,10 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validateFunction = exports.isWithMetaHandler = exports.getTypeErrorMessage = exports.debug = exports.HANDLER_WITH_META = exports.ERR_INVALID_ARG_TYPE = void 0;
+exports.validateFunction = exports.registerPaths = exports.isWithMetaHandler = exports.getTypeErrorMessage = exports.debug = exports.createMatchPath = exports.HANDLER_WITH_META = exports.ERR_INVALID_ARG_TYPE = void 0;
 
 var _util = _interopRequireDefault(require("util"));
 
+var _fs = _interopRequireDefault(require("fs"));
+
+var _module = _interopRequireDefault(require("module"));
+
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("@modern-js/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -86,4 +92,79 @@ const isWithMetaHandler = handler => {
   return typeof handler === 'function' && handler[HANDLER_WITH_META];
 };
 
-exports.isWithMetaHandler = isWithMetaHandler;
+exports.isWithMetaHandler = isWithMetaHandler;
+
+const sortByLongestPrefix = arr => {
+  return arr.concat().sort((a, b) => b.length - a.length);
+};
+
+const createMatchPath = paths => {
+  const sortedKeys = sortByLongestPrefix(Object.keys(paths));
+  const sortedPaths = {};
+  sortedKeys.forEach(key => {
+    sortedPaths[key] = paths[key];
+  });
+  return request => {
+    const found = Object.keys(sortedPaths).find(key => {
+      return request.startsWith(key);
+    });
+
+    if (found) {
+      let foundPaths = sortedPaths[found];
+
+      if (!Array.isArray(foundPaths)) {
+        foundPaths = [foundPaths];
+      }
+
+      foundPaths = foundPaths.filter(foundPath => _path.default.isAbsolute(foundPath));
+
+      for (const p of foundPaths) {
+        const foundPath = request.replace(found, p);
+
+        if (_fs.default.existsSync(foundPath)) {
+          return foundPath;
+        }
+      }
+
+      return request.replace(found, foundPaths[0]);
+    }
+
+    return null;
+  };
+}; // paths 中的值只能是绝对路径
+
+
+exports.createMatchPath = createMatchPath;
+
+const registerPaths = paths => {
+  const originalResolveFilename = _module.default._resolveFilename; // eslint-disable-next-line node/no-unsupported-features/node-builtins
+
+  const {
+    builtinModules
+  } = _module.default;
+  const matchPath = createMatchPath(paths);
+
+  _module.default._resolveFilename = function (request, _parent) {
+    const isCoreModule = builtinModules.includes(request);
+
+    if (!isCoreModule) {
+      const matched = matchPath(request);
+
+      if (matched) {
+        // eslint-disable-next-line prefer-rest-params
+        const modifiedArguments = [matched, ...[].slice.call(arguments, 1)]; // Passes all arguments. Even those that is not specified above.
+
+        return originalResolveFilename.apply(this, modifiedArguments);
+      }
+    } // eslint-disable-next-line prefer-rest-params
+
+
+    return originalResolveFilename.apply(this, arguments);
+  };
+
+  return () => {
+    _module.default._resolveFilename = originalResolveFilename;
+  };
+};
+
+exports.registerPaths = registerPaths;

package/dist/types/utils.d.ts

@@ -5,4 +5,10 @@ export declare class ERR_INVALID_ARG_TYPE extends Error {
   constructor(funcName: string, expectedType: string, actual: unknown);
 }
 export declare const validateFunction: (maybeFunc: unknown, name: string) => boolean;
-export declare const isWithMetaHandler: (handler: any) => any;
+export declare const isWithMetaHandler: (handler: any) => any;
+interface Paths {
+  [key: string]: string[] | string;
+}
+export declare const createMatchPath: (paths: Paths) => (request: string) => string | null;
+export declare const registerPaths: (paths: Paths) => () => void;
+export {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.1-beta.7",
+  "version": "1.0.1-beta.8",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",