8000 fix: add qualifier check by akitaSummer · Pull Request #295 · eggjs/tegg · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: add qualifier check #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,7 @@ import { ContextHelloType } from '../FooType';
import { AbstractContextHello } from '../AbstractHello';

@ContextProto()
// 需要注意的是,对应枚举如果已经被实现,则会报错,若你已经知晓此情况,想覆盖此枚举类型,则增加参数 true 来强制覆盖,例:@Hello(HelloType.BAR, true)
@Hello(HelloType.BAR)
export class BarHello extends AbstractHello {
hello(): string {
Expand Down
5 changes: 4 additions & 1 deletion core/core-decorator/src/util/QualifierUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
import { MetadataUtil } from './MetadataUtil';

export class QualifierUtil {
static addProtoQualifier(clazz: EggProtoImplClass, attribute: QualifierAttribute, value: QualifierValue) {
static addProtoQualifier(clazz: EggProtoImplClass, attribute: QualifierAttribute, value: QualifierValue, isForceReplacement?: boolean) {
if (QualifierUtil.getQualifierValue(clazz, attribute) && !isForceReplacement) {
throw new Error(`Qualifier Error: clazz ${clazz.name} attribute ${attribute.toString()} has been implemented`);
}

Check warning on line 10 in core/core-decorator/src/util/QualifierUtil.ts

View check run for this annotation

Codecov / codecov/patch

core/core-decorator/src/util/QualifierUtil.ts#L9-L10

Added lines #L9 - L10 were not covered by tests
const qualifiers = MetadataUtil.initOwnMapMetaData(QUALIFIER_META_DATA, clazz, new Map<QualifierAttribute, QualifierValue>());
qualifiers.set(attribute, value);
}
Expand Down
6 changes: 3 additions & 3 deletions core/dynamic-inject/src/QualifierImplDecoratorUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { QualifierImplUtil } from './QualifierImplUtil';

export class QualifierImplDecoratorUtil {
static generatorDecorator<T extends object, Enum extends ImplTypeEnum>(abstractClazz: EggAbstractClazz<T>, attribute: QualifierAttribute): ImplDecorator<T, Enum> {
return function(type: Enum[keyof Enum]) {
return function(type: Enum[keyof Enum], isForceReplacement?: boolean) {
return function(clazz: EggProtoImplClass<T>) {
QualifierImplUtil.addQualifierImpl(abstractClazz, type, clazz);
QualifierUtil.addProtoQualifier(clazz, attribute, type);
QualifierImplUtil.addQualifierImpl(abstractClazz, type, clazz, isForceReplacement);
QualifierUtil.addProtoQualifier(clazz, attribute, type, isForceReplacement);
};
};
}
Expand Down
5 changes: 4 additions & 1 deletion core/dynamic-inject/src/QualifierImplUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
import type { EggAbstractClazz, EggProtoImplClass, QualifierValue } from '@eggjs/tegg-types';

export class QualifierImplUtil {
static addQualifierImpl(abstractClazz: EggAbstractClazz, qualifierValue: QualifierValue, implClazz: EggProtoImplClass) {
static addQualifierImpl(abstractClazz: EggAbstractClazz, qualifierValue: QualifierValue, implClazz: EggProtoImplClass, isForceReplacement?: boolean) {
if (QualifierImplUtil.getQualifierImp(abstractClazz, qualifierValue) && !isForceReplacement) {
throw new Error(`Qualifier Error: abstractClazz ${abstractClazz.name} qualifierValue ${qualifierValue.toString()} has been implemented`);
}

Check warning on line 9 in core/dynamic-inject/src/QualifierImplUtil.ts

View check run for this annotation

Codecov / codecov/patch

core/dynamic-inject/src/QualifierImplUtil.ts#L8-L9

Added lines #L8 - L9 were not covered by tests
const implMap = MetadataUtil.initOwnMapMetaData(QUALIFIER_IMPL_MAP, abstractClazz as unknown as EggProtoImplClass, new Map());
implMap.set(qualifierValue, implClazz);
}
Expand Down
2 changes: 1 addition & 1 deletion core/types/dynamic-inject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export type ImplTypeEnum = {
[id: string]: QualifierValue;
};

export type ImplDecorator<T extends object, Enum extends ImplTypeEnum> = (type: Enum[keyof Enum]) => ((clazz: EggProtoImplClass<T>) => void);
export type ImplDecorator<T extends object, Enum extends ImplTypeEnum> = (type: Enum[keyof Enum], isForceReplacement?: boolean) => ((clazz: EggProtoImplClass<T>) => void);

export interface EggObjectFactory {
getEggObject<T extends object>(abstractClazz: EggAbstractClazz<T>, qualifierValue: QualifierValue): Promise<T>;
Expand Down
2 changes: 1 addition & 1 deletion plugin/tegg/lib/AppLoadUnit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class AppLoadUnit implements LoadUnit {
value: this.name,
}];
defaultQualifier.forEach(qualifier => {
QualifierUtil.addProtoQualifier(clazz, qualifier.attribute, qualifier.value);
QualifierUtil.addProtoQualifier(clazz, qualifier.attribute, qualifier.value, true);
});
const protos = await EggPrototypeCreatorFactory.createProto(clazz, this);
for (const proto of protos) {
Expand Down
Loading
0