f

eggjs · Sep 19, 2023 · 21c7fd2 · 21c7fd2
1 parent 9bd8979
commit 21c7fd2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/core/core-decorator/src/model/EggMultiInstancePrototypeInfo.ts b/core/core-decorator/src/model/EggMultiInstancePrototypeInfo.ts
@@ -16,7 +16,7 @@ export interface EggMultiInstancePrototypeInfo {
   /**
    * The class name of the object
    */
-  className: string;
+  className?: string;
   /**
    * obj init type
    */
@@ -40,7 +40,7 @@ export interface EggMultiInstanceCallbackPrototypeInfo {
   /**
    * The class name of the object
    */
-  className: string;
+  className?: string;
   /**
    * obj init type
    */

diff --git a/core/core-decorator/src/model/EggPrototypeInfo.ts b/core/core-decorator/src/model/EggPrototypeInfo.ts
@@ -13,7 +13,7 @@ export interface EggPrototypeInfo {
   /**
    * The class name of the object
    */
-  className: string;
+  className?: string;
   /**
    * obj init type
    */

diff --git a/core/metadata/src/impl/EggPrototypeBuilder.ts b/core/metadata/src/impl/EggPrototypeBuilder.ts
@@ -40,7 +40,7 @@ export class EggPrototypeBuilder {
   private injectObjects: Array<InjectObject> = [];
   private loadUnit: LoadUnit;
   private qualifiers: QualifierInfo[] = [];
-  private className: string;
+  private className?: string;
 
   static create(ctx: EggPrototypeLifecycleContext): EggPrototype {
     const { clazz, loadUnit } = ctx;

diff --git a/core/metadata/src/impl/EggPrototypeImpl.ts b/core/metadata/src/impl/EggPrototypeImpl.ts
@@ -20,7 +20,7 @@ export class EggPrototypeImpl implements EggPrototype {
   readonly accessLevel: AccessLevel;
   readonly injectObjects: InjectObjectProto[];
   readonly loadUnitId: Id;
-  readonly className: string;
+  readonly className?: string;
 
   constructor(
     id: string,
@@ -32,7 +32,7 @@ export class EggPrototypeImpl implements EggPrototype {
     injectObjectMap: InjectObjectProto[],
     loadUnitId: Id,
     qualifiers: QualifierInfo[],
-    className: string,
+    className?: string,
   ) {
     this.id = id;
     this.clazz = clazz;

diff --git a/core/metadata/src/model/EggPrototype.ts b/core/metadata/src/model/EggPrototype.ts
@@ -45,7 +45,7 @@ export interface EggPrototype extends LifecycleObject<EggPrototypeLifecycleConte
   readonly accessLevel: AccessLevel;
   readonly loadUnitId: string;
   readonly injectObjects: InjectObjectProto[];
-  readonly className: string;
+  readonly className?: string;
 
   /**
    * get metedata for key

diff --git a/standalone/standalone/src/StandaloneInnerObjectProto.ts b/standalone/standalone/src/StandaloneInnerObjectProto.ts
@@ -25,6 +25,7 @@ export class StandaloneInnerObjectProto implements EggPrototype {
   readonly accessLevel: AccessLevel;
   readonly injectObjects: InjectObjectProto[];
   readonly loadUnitId: Id;
+  readonly className?: string;
 
   constructor(
     id: string,
@@ -33,6 +34,7 @@ export class StandaloneInnerObjectProto implements EggPrototype {
     initType: ObjectInitTypeLike,
     loadUnitId: Id,
     qualifiers: QualifierInfo[],
+    className?: string,
   ) {
     this.id = id;
     this.clazz = clazz;
@@ -42,6 +44,7 @@ export class StandaloneInnerObjectProto implements EggPrototype {
     this.injectObjects = [];
     this.loadUnitId = loadUnitId;
     this.qualifiers = qualifiers;
+    this.className = className;
   }
 
   verifyQualifiers(qualifiers: QualifierInfo[]): boolean {
@@ -73,9 +76,10 @@ export class StandaloneInnerObjectProto implements EggPrototype {
   static create(ctx: EggPrototypeLifecycleContext): EggPrototype {
     const { clazz, loadUnit } = ctx;
     const name = ctx.prototypeInfo.name;
+    const className = ctx.prototypeInfo.className;
     const id = IdenticalUtil.createProtoId(loadUnit.id, name);
     const proto = new StandaloneInnerObjectProto(
-      id, name, clazz, ctx.prototypeInfo.initType, loadUnit.id, QualifierUtil.getProtoQualifiers(clazz),
+      id, name, clazz, ctx.prototypeInfo.initType, loadUnit.id, QualifierUtil.getProtoQualifiers(clazz), className,
     );
     return proto;
   }