tiramisu/seyfert
5
0
Fork 0
mirror of https://github.com/tiramisulabs/seyfert.git synced 2025-07-02 21:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(deps): mixer correct mix constructors base (#327)

Browse Source
This commit is contained in:
Marcos Susaña 2025-02-05 12:31:47 -04:00 committed by GitHub
parent dda74f7882
commit 5b1122de3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/deps/mixer.ts
View File

@ -24,10 +24,8 @@ function getNodeDescriptors(c: TypeClass) {
const result: Record<string, TypedPropertyDescriptor<unknown> | PropertyDescriptor>[] = []; const result: Record<string, TypedPropertyDescriptor<unknown> | PropertyDescriptor>[] = [];
while (proto) { while (proto) {
const descriptors = Object.getOwnPropertyDescriptors(proto); const descriptors = Object.getOwnPropertyDescriptors(proto);
// @ts-expect-error this is not a function in all cases
if (descriptors.valueOf.configurable) break;
result.push(descriptors); result.push(descriptors);
proto = proto.__proto__; proto = Object.getPrototypeOf(proto);
} }
return result; return result;
} }
@ -44,31 +42,29 @@ function getDescriptors(c: TypeClass) {
* @returns The mixed class. * @returns The mixed class.
*/ */
export function Mixin<T, C extends TypeClass[]>(...args: C): C[number] & T { export function Mixin<T, C extends TypeClass[]>(...args: C): C[number] & T {
const ignoreOverwriteToString = Object.keys(Object.getOwnPropertyDescriptors(args[0].prototype)).includes('toString'); const Base = args[0];
function MixedClass(...constructorArgs: any[]) {
for (const i of args) {
const descriptors = getDescriptors(i).reverse();
for (const j of descriptors) {
// @ts-expect-error
Object.assign(this, new j.constructor.value(...constructorArgs));
for (const descriptorK in j) { class MixedClass extends Base {
if (descriptorK === 'constructor') continue; constructor(...constructorArgs: any[]) {
if (descriptorK in MixedClass.prototype && descriptorK !== 'toString') continue; super(...constructorArgs);
const descriptor = j[descriptorK];
if (descriptor.value) { for (const mixin of args.slice(1)) {
if (descriptorK === 'toString' && ignoreOverwriteToString) { const descriptors = getDescriptors(mixin).reverse();
MixedClass.prototype[descriptorK] = args[0].prototype.toString; for (const desc of descriptors) {
continue; for (const key in desc) {
if (key === 'constructor') continue;
if (key in mixin.prototype) continue;
const descriptor = desc[key];
if (descriptor.value) {
// @ts-expect-error
MixedClass.prototype[key] = descriptor.value;
} else if (descriptor.get || descriptor.set) {
Object.defineProperty(MixedClass.prototype, key, {
get: descriptor.get,
set: descriptor.set,
});
} }
MixedClass.prototype[descriptorK] = descriptor.value;
continue;
}
if (descriptor.get || descriptor.set) {
Object.defineProperty(MixedClass.prototype, descriptorK, {
get: descriptor.get,
set: descriptor.set,
});
} }
} }
} }
@ -89,11 +85,9 @@ export const mix =
(decoratedClass: any) => { (decoratedClass: any) => {
ingredients.unshift(decoratedClass); ingredients.unshift(decoratedClass);
const mixedClass = Mixin(...ingredients); const mixedClass = Mixin(...ingredients);
Object.defineProperty(mixedClass, 'name', { Object.defineProperty(mixedClass, 'name', {
value: decoratedClass.name, value: decoratedClass.name,
writable: false, writable: false,
}); });
return mixedClass as any; return mixedClass as any;
}; };