Skip to content

Commit c397543

Browse files
committed
fix: resolve rebase conflicts and fix TC39 decorator migration issues
- Resolve merge conflicts in convertShaders.ts and tsconfig.build.json - Add useDefineForClassFields: false to prevent class field override issues - Add 'declare' to type-narrowing _effectWrapper overrides in 18 PostProcess subclasses to prevent TC39 decorator lowering from emitting void 0 assignments that overwrite parent constructor values - Rename getEditableProperties/getSmartFilterEditableProperties to PascalCase per repo naming convention - Add eslint-disable for internal double-underscore metadata keys - Fix test assertion in decorators.test.ts (property stored under key name, not sourceName) - Add Symbol.metadata polyfill to vitest.setup.ts for Node.js compatibility - Fix missing curly braces in xml.interfaces.ts - Update customShaderBlock.test.ts: className is empty string with TC39 decorators (no target available in decorator context)
1 parent f2fc3ad commit c397543

36 files changed

Lines changed: 69 additions & 41 deletions

packages/dev/core/src/Decorators/nodeDecorator.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ export function editableInPropertyPage(
128128
}
129129

130130
/** @internal */
131+
// eslint-disable-next-line @typescript-eslint/naming-convention
131132
export const __bjsPropStoreKey = "__bjs_prop_store__";
132133

133134
/**
@@ -136,7 +137,7 @@ export const __bjsPropStoreKey = "__bjs_prop_store__";
136137
* @param target - the target object (instance or constructor)
137138
* @returns array of property descriptions
138139
*/
139-
export function getEditableProperties(target: any): IPropertyDescriptionForEdition[] {
140+
export function GetEditableProperties(target: any): IPropertyDescriptionForEdition[] {
140141
const ctor = typeof target === "function" ? target : target?.constructor;
141142
const metadata: DecoratorMetadataObject | undefined = ctor?.[Symbol.metadata];
142143
if (!metadata) {

packages/dev/core/src/Layers/highlightLayer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ interface IBlurPostProcess extends PostProcess {
6363
* It enforces keeping the most luminous color in the color channel.
6464
*/
6565
class GlowBlurPostProcess extends PostProcess {
66-
protected override _effectWrapper: ThinGlowBlurPostProcess;
66+
declare protected override _effectWrapper: ThinGlowBlurPostProcess;
6767

6868
constructor(
6969
name: string,

packages/dev/core/src/Misc/decorators.functions.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/** @internal */
2+
// eslint-disable-next-line @typescript-eslint/naming-convention
23
export const __bjsSerializableKey = "__bjs_serializable__";
34

5+
// eslint-disable-next-line @typescript-eslint/naming-convention
46
const _mergedStoreCache = new WeakMap<object, Record<string, any>>();
57

68
/**

packages/dev/core/src/PostProcesses/blackAndWhitePostProcess.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class BlackAndWhitePostProcess extends PostProcess {
3535
return "BlackAndWhitePostProcess";
3636
}
3737

38-
protected override _effectWrapper: ThinBlackAndWhitePostProcess;
38+
declare protected override _effectWrapper: ThinBlackAndWhitePostProcess;
3939

4040
/**
4141
* Creates a black and white post process

packages/dev/core/src/PostProcesses/bloomMergePostProcess.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class BloomMergePostProcess extends PostProcess {
3232
return "BloomMergePostProcess";
3333
}
3434

35-
protected override _effectWrapper: ThinBloomMergePostProcess;
35+
declare protected override _effectWrapper: ThinBloomMergePostProcess;
3636

3737
/**
3838
* Creates a new instance of @see BloomMergePostProcess

packages/dev/core/src/PostProcesses/blurPostProcess.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class BlurPostProcess extends PostProcess {
6767
return "BlurPostProcess";
6868
}
6969

70-
protected override _effectWrapper: ThinBlurPostProcess;
70+
declare protected override _effectWrapper: ThinBlurPostProcess;
7171

7272
/**
7373
* Creates a new instance BlurPostProcess

packages/dev/core/src/PostProcesses/chromaticAberrationPostProcess.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export class ChromaticAberrationPostProcess extends PostProcess {
9393
return "ChromaticAberrationPostProcess";
9494
}
9595

96-
protected override _effectWrapper: ThinChromaticAberrationPostProcess;
96+
declare protected override _effectWrapper: ThinChromaticAberrationPostProcess;
9797

9898
/**
9999
* Creates a new instance ChromaticAberrationPostProcess

packages/dev/core/src/PostProcesses/circleOfConfusionPostProcess.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export class CircleOfConfusionPostProcess extends PostProcess {
7575
return "CircleOfConfusionPostProcess";
7676
}
7777

78-
protected override _effectWrapper: ThinCircleOfConfusionPostProcess;
78+
declare protected override _effectWrapper: ThinCircleOfConfusionPostProcess;
7979
private _depthTexture: Nullable<RenderTargetTexture> = null;
8080

8181
/**

packages/dev/core/src/PostProcesses/colorCorrectionPostProcess.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class ColorCorrectionPostProcess extends PostProcess {
4343
return "ColorCorrectionPostProcess";
4444
}
4545

46-
protected override _effectWrapper: ThinColorCorrectionPostProcess;
46+
declare protected override _effectWrapper: ThinColorCorrectionPostProcess;
4747

4848
constructor(
4949
name: string,

packages/dev/core/src/PostProcesses/convolutionPostProcess.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export class ConvolutionPostProcess extends PostProcess {
3737
return "ConvolutionPostProcess";
3838
}
3939

40-
protected override _effectWrapper: ThinConvolutionPostProcess;
40+
declare protected override _effectWrapper: ThinConvolutionPostProcess;
4141

4242
/**
4343
* Creates a new instance ConvolutionPostProcess

0 commit comments

Comments
 (0)