chore: mixins cleanups

Author: k0stik

dist/js/entity/mixins/NamedEntityMixin.d.ts

@@ -1,14 +1,9 @@
 import type { Constructor } from "../../utils/types";
 import { InMemoryEntity, InMemoryEntityConstructor } from "../in_memory";
 export declare function namedEntityMixin(item: InMemoryEntity): {
-    name: string;
-};
-export declare function namedEntityMethodsMixin(item: InMemoryEntity): {
     setName(name: string): void;
+    name: string;
 };
-type NamedEntityProps = ReturnType<typeof namedEntityMixin>;
-type NamedEntityMethods = ReturnType<typeof namedEntityMethodsMixin>;
-export type NamedEntity = NamedEntityProps & NamedEntityMethods;
-export type NamedEntityConstructor = Constructor<NamedEntity>;
-export default function NamedEntityMixin<S extends InMemoryEntityConstructor>(superclass: S): S & NamedEntityConstructor;
-export {};
+export type NamedInMemoryEntity = ReturnType<typeof namedEntityMixin>;
+export type NamedInMemoryEntityConstructor = Constructor<NamedInMemoryEntity>;
+export default function NamedEntityMixin<S extends InMemoryEntityConstructor>(superclass: S): S & NamedInMemoryEntityConstructor;

dist/js/entity/mixins/NamedEntityMixin.js

@@ -1,35 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.namedEntityMixin = namedEntityMixin;
-exports.namedEntityMethodsMixin = namedEntityMethodsMixin;
 exports.default = NamedEntityMixin;
-function namedEntityMixin(item) {
-    const properties = {
+function schemaMixin(item) {
+    const schema = {
         get name() {
             return item.prop("name", "");
         },
         set name(name) {
             item.setProp("name", name);
         },
     };
-    Object.defineProperties(item, Object.getOwnPropertyDescriptors(properties));
-    return properties;
+    Object.defineProperties(item, Object.getOwnPropertyDescriptors(schema));
+    return schema;
 }
-function namedEntityMethodsMixin(item) {
-    const methods = {
+function propertiesMixin(item) {
+    const properties = {
         setName(name) {
             item.setProp("name", name);
         },
     };
-    Object.defineProperties(item, Object.getOwnPropertyDescriptors(methods));
-    return methods;
+    Object.defineProperties(item, Object.getOwnPropertyDescriptors(properties));
+    return properties;
+}
+function namedEntityMixin(item) {
+    return {
+        ...schemaMixin(item),
+        ...propertiesMixin(item),
+    };
 }
 function NamedEntityMixin(superclass) {
     class NamedEntityMixin extends superclass {
         constructor(...args) {
             super(...args);
             namedEntityMixin(this);
-            namedEntityMethodsMixin(this);
         }
     }
     return NamedEntityMixin;

dist/js/entity/other.d.ts

@@ -10,7 +10,7 @@ declare const DefaultableInMemoryEntity_base: typeof InMemoryEntity & import("..
 };
 export declare class DefaultableInMemoryEntity extends DefaultableInMemoryEntity_base {
 }
-export declare const NamedInMemoryEntity: typeof InMemoryEntity & import("./mixins/NamedEntityMixin").NamedEntityConstructor;
+export declare const NamedInMemoryEntity: typeof InMemoryEntity & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor;
 export declare const NamedDefaultableInMemoryEntity: typeof InMemoryEntity & import("../utils/types").Constructor<{
     isDefault: boolean;
 }> & {
@@ -19,7 +19,7 @@ export declare const NamedDefaultableInMemoryEntity: typeof InMemoryEntity & imp
     }>(this: T): InstanceType<T> & {
         isDefault: boolean;
     };
-} & import("./mixins/NamedEntityMixin").NamedEntityConstructor;
+} & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor;
 export declare const HasMetadataNamedDefaultableInMemoryEntity: {
     new (...args: any[]): {
         metadata: object;
@@ -59,7 +59,7 @@ export declare const HasMetadataNamedDefaultableInMemoryEntity: {
     }>(this: T): InstanceType<T> & {
         isDefault: boolean;
     };
-} & import("./mixins/NamedEntityMixin").NamedEntityConstructor;
+} & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor;
 export declare const HasConsistencyChecksHasMetadataNamedDefaultableInMemoryEntity: {
     new (...args: any[]): {
         consistencyChecks: import("@mat3ra/esse/dist/js/types").ConsistencyCheck[];
@@ -130,7 +130,7 @@ export declare const HasConsistencyChecksHasMetadataNamedDefaultableInMemoryEnti
     }>(this: T): InstanceType<T> & {
         isDefault: boolean;
     };
-} & import("./mixins/NamedEntityMixin").NamedEntityConstructor;
+} & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor;
 export declare const NamedDefaultableRepetitionImportantSettingsInMemoryEntity: {
     new (...args: any[]): {
         readonly important: any;
@@ -212,7 +212,7 @@ export declare const NamedDefaultableRepetitionImportantSettingsInMemoryEntity:
     }>(this: T): InstanceType<T> & {
         isDefault: boolean;
     };
-} & import("./mixins/NamedEntityMixin").NamedEntityConstructor;
+} & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor;
 export declare const NamedDefaultableRepetitionContextAndRenderInMemoryEntity: {
     new (...params: any[]): {
         _context: import("./mixins/context").Context;
@@ -297,7 +297,7 @@ export declare const NamedDefaultableRepetitionContextAndRenderInMemoryEntity: {
     }>(this: T): InstanceType<T> & {
         isDefault: boolean;
     };
-} & import("./mixins/NamedEntityMixin").NamedEntityConstructor;
+} & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor;
 export declare const NamedDefaultableRepetitionRuntimeItemsImportantSettingsContextAndRenderHashedInMemoryEntity: {
     new (...args: any[]): {
         getHashObject(): {};
@@ -538,5 +538,5 @@ export declare const NamedDefaultableRepetitionRuntimeItemsImportantSettingsCont
     }>(this: T): InstanceType<T> & {
         isDefault: boolean;
     };
-} & import("./mixins/NamedEntityMixin").NamedEntityConstructor;
+} & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor;
 export {};

src/js/entity/mixins/NamedEntityMixin.ts

@@ -4,8 +4,8 @@ import type { NameEntitySchema } from "@mat3ra/esse/dist/js/types";
 import type { Constructor } from "../../utils/types";
 import { InMemoryEntity, InMemoryEntityConstructor } from "../in_memory";
 
-export function namedEntityMixin(item: InMemoryEntity) {
-    const properties = {
+function schemaMixin(item: InMemoryEntity) {
+    const schema = {
         get name(): string {
             return item.prop("name", "");
         },
@@ -14,37 +14,40 @@ export function namedEntityMixin(item: InMemoryEntity) {
         },
     } satisfies NameEntitySchema;
 
-    Object.defineProperties(item, Object.getOwnPropertyDescriptors(properties));
+    Object.defineProperties(item, Object.getOwnPropertyDescriptors(schema));
 
-    return properties;
+    return schema;
 }
 
-export function namedEntityMethodsMixin(item: InMemoryEntity) {
-    const methods = {
+function propertiesMixin(item: InMemoryEntity) {
+    const properties = {
         setName(name: string) {
             item.setProp("name", name);
         },
     };
 
-    Object.defineProperties(item, Object.getOwnPropertyDescriptors(methods));
+    Object.defineProperties(item, Object.getOwnPropertyDescriptors(properties));
 
-    return methods;
+    return properties;
 }
 
-type NamedEntityProps = ReturnType<typeof namedEntityMixin>;
-type NamedEntityMethods = ReturnType<typeof namedEntityMethodsMixin>;
+export function namedEntityMixin(item: InMemoryEntity) {
+    return {
+        ...schemaMixin(item),
+        ...propertiesMixin(item),
+    };
+}
 
-export type NamedEntity = NamedEntityProps & NamedEntityMethods;
-export type NamedEntityConstructor = Constructor<NamedEntity>;
+export type NamedInMemoryEntity = ReturnType<typeof namedEntityMixin>;
+export type NamedInMemoryEntityConstructor = Constructor<NamedInMemoryEntity>;
 
 export default function NamedEntityMixin<S extends InMemoryEntityConstructor>(superclass: S) {
     class NamedEntityMixin extends superclass {
         constructor(...args: any[]) {
             super(...args);
             namedEntityMixin(this);
-            namedEntityMethodsMixin(this);
         }
     }
 
-    return NamedEntityMixin as S & NamedEntityConstructor;
+    return NamedEntityMixin as S & NamedInMemoryEntityConstructor;
 }