@eggjs/core 6.0.0-beta.2 → 6.0.1

package/dist/esm/utils/index.js

@@ -1,9 +1,8 @@
 import { debuglog } from 'node:util';
 import path from 'node:path';
 import fs from 'node:fs';
-import { pathToFileURL } from 'node:url';
 import BuiltinModule from 'node:module';
-import { createRequire } from 'node:module';
+import { importResolve, importModule } from '@eggjs/utils';
 const debug = debuglog('@eggjs/core:utils');
 // Guard against poorly mocked module constructors.
 const Module = typeof module !== 'undefined' && module.constructor.length > 1
@@ -13,31 +12,12 @@ const Module = typeof module !== 'undefined' && module.constructor.length > 1
 const extensions = Module._extensions;
 const extensionNames = Object.keys(extensions).concat(['.cjs', '.mjs']);
 debug('Module extensions: %j', extensionNames);
-let _customRequire;
-function getCustomRequire() {
-    if (!_customRequire && typeof require === 'undefined') {
-        _customRequire = createRequire(process.cwd());
-        // _customRequire = createRequire(import.meta.url);
-    }
-    return _customRequire;
-}
 export default {
     deprecated(message) {
         console.warn('[@eggjs/core:deprecated] %s', message);
     },
     extensions,
-    // async _importOrRequire(filepath: string) {
-    //   // try import first
-    //   let obj: any;
-    //   try {
-    //     obj = await import(filepath);
-    //   } catch (err: any) {
-    //     debug('await import error, use require instead, %s', err);
-    //     // use custom require
-    //     obj = getCustomRequire()(filepath);
-    //   }
-    //   return obj;
-    // },
+    extensionNames,
     async loadFile(filepath) {
         try {
             // if not js module, just return content buffer
@@ -45,35 +25,7 @@ export default {
             if (extname && !extensionNames.includes(extname)) {
                 return fs.readFileSync(filepath);
             }
-            let obj;
-            let isESM = false;
-            if (typeof require === 'function') {
-                // commonjs
-                obj = require(filepath);
-                debug('[loadFile] require %s => %o', filepath, obj);
-                if (obj && obj.__esModule) {
-                    isESM = true;
-                }
-            }
-            else {
-                // esm
-                debug('[loadFile] await import start: %s', filepath);
-                const fileUrl = pathToFileURL(filepath).toString();
-                obj = await import(fileUrl);
-                debug('[loadFile] await import end: %s => %o', filepath, obj);
-                isESM = true;
-                if (obj && typeof obj === 'object' && 'default' in obj) {
-                    // default: { default: [Function (anonymous)] }
-                    obj = obj.default;
-                }
-            }
-            if (!obj)
-                return obj;
-            // it's es module, use default export
-            if (isESM && typeof obj === 'object') {
-                obj = 'default' in obj ? obj.default : obj;
-            }
-            debug('[loadFile] return %s => %o', filepath, obj);
+            const obj = await importModule(filepath, { importDefaultOnly: true });
             return obj;
         }
         catch (e) {
@@ -84,10 +36,7 @@ export default {
         }
     },
     resolvePath(filepath, options) {
-        if (typeof require !== 'undefined') {
-            return require.resolve(filepath, options);
-        }
-        return getCustomRequire().resolve(filepath, options);
+        return importResolve(filepath, options);
     },
     methods: ['head', 'options', 'get', 'put', 'patch', 'post', 'delete'],
     async callFn(fn, args, ctx) {
@@ -138,4 +87,4 @@ export default {
 function prepareObjectStackTrace(_obj, stack) {
     return stack;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNyQyxPQUFPLElBQUksTUFBTSxXQUFXLENBQUM7QUFDN0IsT0FBTyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ3pCLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFDekMsT0FBTyxhQUFhLE1BQU0sYUFBYSxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFNUMsTUFBTSxLQUFLLEdBQUcsUUFBUSxDQUFDLG1CQUFtQixDQUFDLENBQUM7QUFJNUMsbURBQW1EO0FBQ25ELE1BQU0sTUFBTSxHQUFHLE9BQU8sTUFBTSxLQUFLLFdBQVcsSUFBSSxNQUFNLENBQUMsV0FBVyxDQUFDLE1BQU0sR0FBRyxDQUFDO0lBQzNFLENBQUMsQ0FBQyxNQUFNLENBQUMsV0FBVztJQUNwQiwwQkFBMEI7SUFDMUIsQ0FBQyxDQUFDLGFBQWEsQ0FBQztBQUVsQixNQUFNLFVBQVUsR0FBSSxNQUFjLENBQUMsV0FBVyxDQUFDO0FBQy9DLE1BQU0sY0FBYyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBRSxDQUFDLENBQUM7QUFDMUUsS0FBSyxDQUFDLHVCQUF1QixFQUFFLGNBQWMsQ0FBQyxDQUFDO0FBRS9DLElBQUksY0FBMkIsQ0FBQztBQUNoQyxTQUFTLGdCQUFnQjtJQUN2QixJQUFJLENBQUMsY0FBYyxJQUFJLE9BQU8sT0FBTyxLQUFLLFdBQVcsRUFBRSxDQUFDO1FBQ3RELGNBQWMsR0FBRyxhQUFhLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDOUMsbURBQW1EO0lBQ3JELENBQUM7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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNyQyxPQUFPLElBQUksTUFBTSxXQUFXLENBQUM7QUFDN0IsT0FBTyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ3pCLE9BQU8sYUFBYSxNQUFNLGFBQWEsQ0FBQztBQUN4QyxPQUFPLEVBQUUsYUFBYSxFQUFFLFlBQVksRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUUzRCxNQUFNLEtBQUssR0FBRyxRQUFRLENBQUMsbUJBQW1CLENBQUMsQ0FBQztBQUk1QyxtREFBbUQ7QUFDbkQsTUFBTSxNQUFNLEdBQUcsT0FBTyxNQUFNLEtBQUssV0FBVyxJQUFJLE1BQU0sQ0FBQyxXQUFXLENBQUMsTUFBTSxHQUFHLENBQUM7SUFDM0UsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxXQUFXO0lBQ3BCLDBCQUEwQjtJQUMxQixDQUFDLENBQUMsYUFBYSxDQUFDO0FBRWxCLE1BQU0sVUFBVSxHQUFJLE1BQWMsQ0FBQyxXQUFXLENBQUM7QUFDL0MsTUFBTSxjQUFjLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBRSxNQUFNLEVBQUUsTUFBTSxDQUFFLENBQUMsQ0FBQztBQUMxRSxLQUFLLENBQUMsdUJBQXVCLEVBQUUsY0FBYyxDQUFDLENBQUM7QUFFL0MsZUFBZTtJQUNiLFVBQVUsQ0FBQyxPQUFlO1FBQ3hCLE9BQU8sQ0FBQyxJQUFJLENBQUMsNkJBQTZCLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDdkQsQ0FBQztJQUVELFVBQVU7SUFDVixjQUFjO0lBRWQsS0FBSyxDQUFDLFFBQVEsQ0FBQyxRQUFnQjtRQUM3QixJQUFJLENBQUM7WUFDSCwrQ0FBK0M7WUFDL0MsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLE9B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

package/dist/esm/utils/timing.d.ts

@@ -1,4 +1,4 @@
-interface TimingItem {
+export interface TimingItem {
     name: string;
     start: number;
     end?: number;
@@ -19,4 +19,3 @@ export declare class Timing {
     itemToString(timelineEnd: number, item: TimingItem, times: number): string;
     toString(prefix?: string, width?: number): string;
 }
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/core",
-  "version": "6.0.0-beta.2",
+  "version": "6.0.1",
   "publishConfig": {
     "access": "public"
   },
@@ -13,10 +13,11 @@
   "description": "A core plugin framework based on @eggjs/koa",
   "scripts": {
     "lint": "eslint src test --ext ts",
+    "pretest": "npm run prepublishOnly",
     "test": "npm run lint -- --fix && npm run test-local",
     "test-local": "egg-bin test",
+    "preci": "npm run prepublishOnly",
     "ci": "npm run lint && egg-bin cov && npm run prepublishOnly",
-    "contributor": "git-contributor",
     "prepublishOnly": "tshy && tshy-after"
   },
   "repository": {
@@ -36,6 +37,7 @@
   "dependencies": {
     "@eggjs/koa": "^2.18.2",
     "@eggjs/router": "^3.0.5",
+    "@eggjs/utils": "^4.0.2",
     "egg-logger": "^3.5.0",
     "egg-path-matching": "^2.0.0",
     "extend2": "^4.0.0",
@@ -45,7 +47,7 @@
     "node-homedir": "^2.0.0",
     "performance-ms": "^1.1.0",
     "ready-callback": "^4.0.0",
-    "tsconfig-paths": "^4.1.1",
+    "tsconfig-paths": "^4.2.0",
     "utility": "^2.1.0"
   },
   "devDependencies": {
@@ -57,14 +59,11 @@
     "await-event": "2",
     "coffee": "5",
     "egg-bin": "6",
-    "egg-utils": "2",
     "eslint": "8",
     "eslint-config-egg": "13",
     "gals": "1",
-    "git-contributor": "2",
     "js-yaml": "3",
     "mm": "3",
-    "spy": "1",
     "supertest": "7",
     "ts-node": "10",
     "tshy": "1",

package/src/index.ts

@@ -1,6 +1,12 @@
 import utils from './utils/index.js';
 
+export { utils };
+
 export * from './egg.js';
-export * from './loader/egg_loader.js';
 export * from './base_context_class.js';
-export { utils };
+export * from './lifecycle.js';
+export * from './loader/egg_loader.js';
+export * from './loader/file_loader.js';
+export * from './loader/context_loader.js';
+export * from './utils/sequencify.js';
+export * from './utils/timing.js';

package/src/loader/context_loader.ts

@@ -5,12 +5,12 @@ import { FileLoader, EXPORTS, type FileLoaderOptions } from './file_loader.js';
 
 const CLASS_LOADER = Symbol('classLoader');
 
-interface ClassLoaderOptions {
+export interface ClassLoaderOptions {
   ctx: ContextDelegation;
   properties: any;
 }
 
-class ClassLoader {
+export class ClassLoader {
   readonly _cache = new Map();
   _ctx: ContextDelegation;
 
@@ -42,7 +42,7 @@ export interface ContextLoaderOptions extends Omit<FileLoaderOptions, 'target'>
   /** required inject */
   inject: Record<string, any>;
   /** property name defined to target */
-  property: string;
+  property: string | symbol;
   /** determine the field name of inject object. */
   fieldClass?: string;
 }
@@ -86,7 +86,7 @@ export class ContextLoader extends FileLoader {
         if (!ctx[CLASS_LOADER]) {
           ctx[CLASS_LOADER] = new Map();
         }
-        const classLoader: Map<string, ClassLoader> = ctx[CLASS_LOADER];
+        const classLoader: Map<string | symbol, ClassLoader> = ctx[CLASS_LOADER];
         let instance = classLoader.get(property);
         if (!instance) {
           instance = getInstance(target, ctx);

package/src/loader/egg_loader.ts

@@ -148,16 +148,12 @@ export class EggLoader {
      * loader will find all directories from the prototype of Application,
      * you should define `Symbol.for('egg#eggPath')` property.
      *
-     * ```
-     * // lib/example.js
-     * const egg = require('egg');
-     * class ExampleApplication extends egg.Application {
-     *   constructor(options) {
-     *     super(options);
-     *   }
-     *
+     * ```ts
+     * // src/example.ts
+     * import { Application } from 'egg';
+     * class ExampleApplication extends Application {
      *   get [Symbol.for('egg#eggPath')]() {
-     *     return path.join(__dirname, '..');
+     *     return baseDir;
      *   }
      * }
      * ```
@@ -372,11 +368,11 @@ export class EggLoader {
       }
       const eggPath = Reflect.get(proto, Symbol.for('egg#eggPath'));
       if (!eggPath) {
+        // if (EggCore) {
+        //   throw new TypeError('Symbol.for(\'egg#eggPath\') is required on Application');
+        // }
         continue;
       }
-
-      // assert(proto.hasOwnProperty(Symbol.for('egg#eggPath')), 'Symbol.for(\'egg#eggPath\') is required on Application');
-      // const eggPath = Reflect.get(proto, Symbol.for('egg#eggPath'));
       assert(typeof eggPath === 'string', 'Symbol.for(\'egg#eggPath\') should be string');
       assert(fs.existsSync(eggPath), `${eggPath} not exists`);
       const realpath = fs.realpathSync(eggPath);
@@ -384,7 +380,6 @@ export class EggLoader {
         eggPaths.unshift(realpath);
       }
     }
-
     return eggPaths;
   }
 
@@ -1273,6 +1268,11 @@ export class EggLoader {
 
     this.options.logger.info('[@eggjs/core:egg_loader] Loaded middleware from %j', middlewarePaths);
     this.timing.end('Load Middleware');
+
+    // add router middleware, make sure router is the last middleware
+    const mw = this.app.router.middleware();
+    Reflect.set(mw, '_name', 'routerMiddleware');
+    this.app.use(mw);
   }
   /** end Middleware loader */
 
@@ -1338,10 +1338,6 @@ export class EggLoader {
   async loadRouter() {
     this.timing.start('Load Router');
     await this.loadFile(path.join(this.options.baseDir, 'app/router'));
-    // add router middleware
-    const mw = this.app.router.middleware();
-    Reflect.set(mw, '_name', 'routerMiddleware');
-    this.app.use(mw);
     this.timing.end('Load Router');
   }
   /** end Router loader */
@@ -1497,12 +1493,12 @@ export class EggLoader {
    * @param {Object} options - see {@link FileLoader}
    * @since 1.0.0
    */
-  async loadToApp(directory: string | string[], property: string, options: FileLoaderOptions) {
+  async loadToApp(directory: string | string[], property: string | symbol, options?: FileLoaderOptions) {
     const target = {};
     Reflect.set(this.app, property, target);
     options = {
       ...options,
-      directory: options.directory ?? directory,
+      directory: options?.directory ?? directory,
       target,
       inject: this.app,
     };
@@ -1520,7 +1516,7 @@ export class EggLoader {
    * @param {Object} options - see {@link ContextLoader}
    * @since 1.0.0
    */
-  async loadToContext(directory: string | string[], property: string, options?: ContextLoaderOptions) {
+  async loadToContext(directory: string | string[], property: string | symbol, options?: ContextLoaderOptions) {
     options = {
       ...options,
       directory: options?.directory || directory,

package/src/utils/index.ts

@@ -1,9 +1,8 @@
 import { debuglog } from 'node:util';
 import path from 'node:path';
 import fs from 'node:fs';
-import { pathToFileURL } from 'node:url';
 import BuiltinModule from 'node:module';
-import { createRequire } from 'node:module';
+import { importResolve, importModule } from '@eggjs/utils';
 
 const debug = debuglog('@eggjs/core:utils');
 
@@ -19,34 +18,13 @@ const extensions = (Module as any)._extensions;
 const extensionNames = Object.keys(extensions).concat([ '.cjs', '.mjs' ]);
 debug('Module extensions: %j', extensionNames);
 
-let _customRequire: NodeRequire;
-function getCustomRequire() {
-  if (!_customRequire && typeof require === 'undefined') {
-    _customRequire = createRequire(process.cwd());
-    // _customRequire = createRequire(import.meta.url);
-  }
-  return _customRequire;
-}
-
 export default {
   deprecated(message: string) {
     console.warn('[@eggjs/core:deprecated] %s', message);
   },
 
   extensions,
-
-  // async _importOrRequire(filepath: string) {
-  //   // try import first
-  //   let obj: any;
-  //   try {
-  //     obj = await import(filepath);
-  //   } catch (err: any) {
-  //     debug('await import error, use require instead, %s', err);
-  //     // use custom require
-  //     obj = getCustomRequire()(filepath);
-  //   }
-  //   return obj;
-  // },
+  extensionNames,
 
   async loadFile(filepath: string) {
     try {
@@ -55,33 +33,7 @@ export default {
       if (extname && !extensionNames.includes(extname)) {
         return fs.readFileSync(filepath);
       }
-      let obj: any;
-      let isESM = false;
-      if (typeof require === 'function') {
-        // commonjs
-        obj = require(filepath);
-        debug('[loadFile] require %s => %o', filepath, obj);
-        if (obj && obj.__esModule) {
-          isESM = true;
-        }
-      } else {
-        // esm
-        debug('[loadFile] await import start: %s', filepath);
-        const fileUrl = pathToFileURL(filepath).toString();
-        obj = await import(fileUrl);
-        debug('[loadFile] await import end: %s => %o', filepath, obj);
-        isESM = true;
-        if (obj && typeof obj === 'object' && 'default' in obj) {
-          // default: { default: [Function (anonymous)] }
-          obj = obj.default;
-        }
-      }
-      if (!obj) return obj;
-      // it's es module, use default export
-      if (isESM && typeof obj === 'object') {
-        obj = 'default' in obj ? obj.default : obj;
-      }
-      debug('[loadFile] return %s => %o', filepath, obj);
+      const obj = await importModule(filepath, { importDefaultOnly: true });
       return obj;
     } catch (e: any) {
       const err = new Error(`[@eggjs/core] load file: ${filepath}, error: ${e.message}`);
@@ -92,10 +44,7 @@ export default {
   },
 
   resolvePath(filepath: string, options?: { paths?: string[] }) {
-    if (typeof require !== 'undefined') {
-      return require.resolve(filepath, options);
-    }
-    return getCustomRequire().resolve(filepath, options);
+    return importResolve(filepath, options);
   },
 
   methods: [ 'head', 'options', 'get', 'put', 'patch', 'post', 'delete' ],

package/src/utils/timing.ts

@@ -4,7 +4,7 @@ import assert from 'node:assert';
 
 const debug = debuglog('@eggjs/core:utils:timing');
 
-interface TimingItem {
+export interface TimingItem {
   name: string;
   start: number;
   end?: number;

package/dist/commonjs/types.d.ts

@@ -1 +0,0 @@
-export {};