chore: mixins cleanups

Author: k0stik

dist/js/entity/set.d.ts

@@ -1,22 +1,5 @@
 import { InMemoryEntity } from "./in_memory";
-declare const InMemoryEntitySet_base: typeof InMemoryEntity & import("./set/InMemoryEntitySetBaseMixin").InMemoryEntitySetBaseConstructor & (new (...args: any[]) => {
-    inSet: import("./set/InMemoryEntityInSetMixin").InSet[];
-}) & (new (...args: any[]) => {
-    getInSetFilteredByCls(cls: string): {
-        _id: string;
-        cls?: string;
-        slug?: string;
-        type?: string;
-        index?: number;
-    }[];
-    readonly parentEntitySetReference: {
-        _id: string;
-        cls?: string;
-        slug?: string;
-        type?: string;
-        index?: number;
-    } | undefined;
-}) & import("./set/InMemoryEntitySetMixin").InMemoryEntitySetConstructor;
+declare const InMemoryEntitySet_base: typeof InMemoryEntity & import("./set/InMemoryEntitySetBaseMixin").InMemoryEntitySetBaseConstructor & import("./set/InMemoryEntityInSetMixin").InMemoryEntityInSetConstructor & import("./set/InMemoryEntitySetMixin").InMemoryEntitySetConstructor;
 export declare class InMemoryEntitySet extends InMemoryEntitySet_base {
 }
 export {};

dist/js/entity/set/InMemoryEntityInSetMixin.d.ts

@@ -3,32 +3,25 @@ import type { Constructor } from "../../utils/types";
 import { type InMemoryEntity } from "../in_memory";
 export type SystemInSet = Required<SystemInSetSchema>;
 export type InSet = SystemInSet["inSet"][0];
-declare function schemaMixin<E extends InMemoryEntity>(item: E): {
-    inSet: InSet[];
-};
-declare function propertiesMixin<E extends InMemoryEntity>(item: E & InMemoryEntityInSetSchema): {
+export declare function inMemoryEntityInSetMixin<E extends InMemoryEntity>(item: E): {
     getInSetFilteredByCls(cls: string): {
         _id: string;
         cls?: string;
         slug?: string;
         type?: string;
         index?: number;
     }[];
-    readonly parentEntitySetReference: {
+    parentEntitySetReference: {
         _id: string;
         cls?: string;
         slug?: string;
         type?: string;
         index?: number;
     } | undefined;
+    inSet: InSet[];
 };
-export declare function inMemoryEntityInSetMixin<E extends InMemoryEntity>(item: E): void;
-type InMemoryEntityInSetSchema = ReturnType<typeof schemaMixin>;
-type InMemoryEntityInSetSchemaConstructor = Constructor<InMemoryEntityInSetSchema>;
-type InMemoryEntityInSetProperties = ReturnType<typeof propertiesMixin>;
-type InMemoryEntityInSetPropertiesConstructor = Constructor<InMemoryEntityInSetProperties>;
-export type InMemoryEntityInSet = InMemoryEntityInSetSchema & InMemoryEntityInSetProperties;
-export type InMemoryEntityInSetConstructor = InMemoryEntityInSetSchemaConstructor & InMemoryEntityInSetPropertiesConstructor;
+export type InMemoryEntityInSet = ReturnType<typeof inMemoryEntityInSetMixin>;
+export type InMemoryEntityInSetConstructor = Constructor<InMemoryEntityInSet>;
 type Base = Constructor<InMemoryEntity>;
 export default function InMemoryEntityInSetMixin<S extends Base = Base>(superclass: S): S & InMemoryEntityInSetConstructor;
 export {};

dist/js/entity/set/InMemoryEntityInSetMixin.js

@@ -29,8 +29,10 @@ function propertiesMixin(item) {
     return properties;
 }
 function inMemoryEntityInSetMixin(item) {
-    schemaMixin(item);
-    propertiesMixin(item);
+    return {
+        ...schemaMixin(item),
+        ...propertiesMixin(item),
+    };
 }
 function InMemoryEntityInSetMixin(superclass) {
     class InMemoryEntityInSetMixin extends superclass {

src/js/entity/set/InMemoryEntityInSetMixin.ts

@@ -7,6 +7,8 @@ import { type InMemoryEntity } from "../in_memory";
 export type SystemInSet = Required<SystemInSetSchema>;
 export type InSet = SystemInSet["inSet"][0];
 
+type InMemoryEntityInSetSchema = ReturnType<typeof schemaMixin>;
+
 function schemaMixin<E extends InMemoryEntity>(item: E) {
     const schema = {
         get inSet() {
@@ -42,18 +44,14 @@ function propertiesMixin<E extends InMemoryEntity>(item: E & InMemoryEntityInSet
 }
 
 export function inMemoryEntityInSetMixin<E extends InMemoryEntity>(item: E) {
-    schemaMixin(item);
-    propertiesMixin(item as E & InMemoryEntityInSetSchema);
+    return {
+        ...schemaMixin(item),
+        ...propertiesMixin(item as E & InMemoryEntityInSetSchema),
+    };
 }
 
-type InMemoryEntityInSetSchema = ReturnType<typeof schemaMixin>;
-type InMemoryEntityInSetSchemaConstructor = Constructor<InMemoryEntityInSetSchema>;
-type InMemoryEntityInSetProperties = ReturnType<typeof propertiesMixin>;
-type InMemoryEntityInSetPropertiesConstructor = Constructor<InMemoryEntityInSetProperties>;
-
-export type InMemoryEntityInSet = InMemoryEntityInSetSchema & InMemoryEntityInSetProperties;
-export type InMemoryEntityInSetConstructor = InMemoryEntityInSetSchemaConstructor &
-    InMemoryEntityInSetPropertiesConstructor;
+export type InMemoryEntityInSet = ReturnType<typeof inMemoryEntityInSetMixin>;
+export type InMemoryEntityInSetConstructor = Constructor<InMemoryEntityInSet>;
 
 type Base = Constructor<InMemoryEntity>;