@eggjs/core 7.0.0-beta.19 → 7.0.0-beta.21

package/dist/loader/context_loader.d.ts

@@ -1,24 +1,22 @@
-import { FileLoader, FileLoaderOptions } from "./file_loader.js";
-import { Context } from "../egg.js";
-
-//#region src/loader/context_loader.d.ts
-interface ClassLoaderOptions {
-  ctx: Context;
-  properties: any;
+import { FileLoader, type FileLoaderOptions } from './file_loader.ts';
+import type { Context } from '../egg.ts';
+export interface ClassLoaderOptions {
+    ctx: Context;
+    properties: any;
 }
-declare class ClassLoader {
-  #private;
-  readonly _cache: Map<any, any>;
-  _ctx: Context;
-  constructor(options: ClassLoaderOptions);
+export declare class ClassLoader {
+    #private;
+    readonly _cache: Map<any, any>;
+    _ctx: Context;
+    constructor(options: ClassLoaderOptions);
 }
-interface ContextLoaderOptions extends Omit<FileLoaderOptions, 'target'> {
-  /** required inject */
-  inject: Record<string, any>;
-  /** property name defined to target */
-  property: string | symbol;
-  /** determine the field name of inject object. */
-  fieldClass?: string;
+export interface ContextLoaderOptions extends Omit<FileLoaderOptions, 'target'> {
+    /** required inject */
+    inject: Record<string, any>;
+    /** property name defined to target */
+    property: string | symbol;
+    /** determine the field name of inject object. */
+    fieldClass?: string;
 }
 /**
  * Same as {@link FileLoader}, but it will attach file to `inject[fieldClass]`.
@@ -26,14 +24,12 @@ interface ContextLoaderOptions extends Omit<FileLoaderOptions, 'target'> {
  * @augments FileLoader
  * @since 1.0.0
  */
-declare class ContextLoader extends FileLoader {
-  #private;
-  /**
-   * @class
-   * @param {Object} options - options same as {@link FileLoader}
-   * @param {String} options.fieldClass - determine the field name of inject object.
-   */
-  constructor(options: ContextLoaderOptions);
+export declare class ContextLoader extends FileLoader {
+    #private;
+    /**
+     * @class
+     * @param {Object} options - options same as {@link FileLoader}
+     * @param {String} options.fieldClass - determine the field name of inject object.
+     */
+    constructor(options: ContextLoaderOptions);
 }
-//#endregion
-export { ClassLoader, ClassLoaderOptions, ContextLoader, ContextLoaderOptions };

package/dist/loader/context_loader.js

@@ -1,79 +1,102 @@
-import { EXPORTS, FileLoader } from "./file_loader.js";
-import assert from "node:assert";
-import { isClass, isPrimitive } from "is-type-of";
-
-//#region src/loader/context_loader.ts
-const CLASS_LOADER = Symbol("classLoader");
-var ClassLoader = class {
-	_cache = /* @__PURE__ */ new Map();
-	_ctx;
-	constructor(options) {
-		assert(options.ctx, "options.ctx is required");
-		const properties = options.properties;
-		this._ctx = options.ctx;
-		for (const property in properties) this.#defineProperty(property, properties[property]);
-	}
-	#defineProperty(property, values) {
-		Object.defineProperty(this, property, { get() {
-			let instance = this._cache.get(property);
-			if (!instance) {
-				instance = getInstance(values, this._ctx);
-				this._cache.set(property, instance);
-			}
-			return instance;
-		} });
-	}
-};
+import assert from 'node:assert';
+import { isClass, isPrimitive } from 'is-type-of';
+import { FileLoader, EXPORTS } from "./file_loader.js";
+const CLASS_LOADER = Symbol('classLoader');
+export class ClassLoader {
+    _cache = new Map();
+    _ctx;
+    constructor(options) {
+        assert(options.ctx, 'options.ctx is required');
+        const properties = options.properties;
+        this._ctx = options.ctx;
+        for (const property in properties) {
+            this.#defineProperty(property, properties[property]);
+        }
+    }
+    #defineProperty(property, values) {
+        Object.defineProperty(this, property, {
+            get() {
+                let instance = this._cache.get(property);
+                if (!instance) {
+                    instance = getInstance(values, this._ctx);
+                    this._cache.set(property, instance);
+                }
+                return instance;
+            },
+        });
+    }
+}
 /**
-* Same as {@link FileLoader}, but it will attach file to `inject[fieldClass]`.
-* The exports will be lazy loaded, such as `ctx.group.repository`.
-* @augments FileLoader
-* @since 1.0.0
-*/
-var ContextLoader = class extends FileLoader {
-	#inject;
-	/**
-	* @class
-	* @param {Object} options - options same as {@link FileLoader}
-	* @param {String} options.fieldClass - determine the field name of inject object.
-	*/
-	constructor(options) {
-		assert(options.property, "options.property is required");
-		assert(options.inject, "options.inject is required");
-		const target = {};
-		if (options.fieldClass) options.inject[options.fieldClass] = target;
-		super({
-			...options,
-			target
-		});
-		this.#inject = this.options.inject;
-		const app = this.#inject;
-		const property = options.property;
-		Object.defineProperty(app.context, property, { get() {
-			const ctx = this;
-			if (!ctx[CLASS_LOADER]) ctx[CLASS_LOADER] = /* @__PURE__ */ new Map();
-			const classLoader = ctx[CLASS_LOADER];
-			let instance = classLoader.get(property);
-			if (!instance) {
-				instance = getInstance(target, ctx);
-				classLoader.set(property, instance);
-			}
-			return instance;
-		} });
-	}
-};
+ * Same as {@link FileLoader}, but it will attach file to `inject[fieldClass]`.
+ * The exports will be lazy loaded, such as `ctx.group.repository`.
+ * @augments FileLoader
+ * @since 1.0.0
+ */
+export class ContextLoader extends FileLoader {
+    #inject;
+    /**
+     * @class
+     * @param {Object} options - options same as {@link FileLoader}
+     * @param {String} options.fieldClass - determine the field name of inject object.
+     */
+    constructor(options) {
+        assert(options.property, 'options.property is required');
+        assert(options.inject, 'options.inject is required');
+        const target = {};
+        if (options.fieldClass) {
+            options.inject[options.fieldClass] = target;
+        }
+        super({
+            ...options,
+            target,
+        });
+        this.#inject = this.options.inject;
+        const app = this.#inject;
+        const property = options.property;
+        // define ctx.service
+        Object.defineProperty(app.context, property, {
+            get() {
+                // oxlint-disable-next-line unicorn/no-this-assignment, typescript/no-this-alias
+                const ctx = this;
+                // distinguish property cache,
+                // cache's lifecycle is the same with this context instance
+                // e.x. ctx.service1 and ctx.service2 have different cache
+                if (!ctx[CLASS_LOADER]) {
+                    ctx[CLASS_LOADER] = new Map();
+                }
+                const classLoader = ctx[CLASS_LOADER];
+                let instance = classLoader.get(property);
+                if (!instance) {
+                    instance = getInstance(target, ctx);
+                    classLoader.set(property, instance);
+                }
+                return instance;
+            },
+        });
+    }
+}
 function getInstance(values, ctx) {
-	const Class = values[EXPORTS] ? values : null;
-	let instance;
-	if (Class) if (isClass(Class)) instance = new Class(ctx);
-	else instance = Class;
-	else if (isPrimitive(values)) instance = values;
-	else instance = new ClassLoader({
-		ctx,
-		properties: values
-	});
-	return instance;
+    // it's a directory when it has no exports
+    // then use ClassLoader
+    const Class = values[EXPORTS] ? values : null;
+    let instance;
+    if (Class) {
+        if (isClass(Class)) {
+            instance = new Class(ctx);
+        }
+        else {
+            // it's just an object
+            instance = Class;
+        }
+        // Can't set property to primitive, so check again
+        // e.x. module.exports = 1;
+    }
+    else if (isPrimitive(values)) {
+        instance = values;
+    }
+    else {
+        instance = new ClassLoader({ ctx, properties: values });
+    }
+    return instance;
 }
-
-//#endregion
-export { ClassLoader, ContextLoader };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dF9sb2FkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9hZGVyL2NvbnRleHRfbG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUVqQyxPQUFPLEVBQUUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUVsRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBMEIsTUFBTSxrQkFBa0IsQ0FBQztBQUcvRSxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7QUFPM0MsTUFBTSxPQUFPLFdBQVc7SUFDYixNQUFNLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUM1QixJQUFJLENBQVU7SUFFZCxZQUFZLE9BQTJCO1FBQ3JDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLHlCQUF5QixDQUFDLENBQUM7UUFDL0MsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQztRQUN0QyxJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7UUFFeEIsS0FBSyxNQUFNLFFBQVEsSUFBSSxVQUFVLEVBQUUsQ0FBQztZQUNsQyxJQUFJLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUN2RCxDQUFDO0lBQ0gsQ0FBQztJQUVELGVBQWUsQ0FBQyxRQUFnQixFQUFFLE1BQVc7UUFDM0MsTUFBTSxDQUFDLGNBQWMsQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFO1lBQ3BDLEdBQUc7Z0JBQ0QsSUFBSSxRQUFRLEdBQVEsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7Z0JBQzlDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztvQkFDZCxRQUFRLEdBQUcsV0FBVyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsSUFB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