chore: clenup types

k0stik · k0stik · commit 8d194f5e79f0 · 2025-11-27T22:00:49.000+02:00
diff --git a/dist/js/entity/mixins/DefaultableMixin.d.ts b/dist/js/entity/mixins/DefaultableMixin.d.ts
@@ -2,7 +2,6 @@ import { type DefaultableSchemaMixin } from "../../generated/DefaultableSchemaMi
 import type { AbstractConstructor, Constructor } from "../../utils/types";
 import { InMemoryEntity } from "../in_memory";
 export type Defaultable = DefaultableSchemaMixin;
-export type DefaultableInMemoryEntity = Defaultable;
 export type DefaultableInMemoryStaticEntity = {
     createDefault: () => InMemoryEntity & Defaultable;
 };
diff --git a/dist/js/entity/mixins/HasConsistencyChecksMixin.d.ts b/dist/js/entity/mixins/HasConsistencyChecksMixin.d.ts
@@ -1,9 +1,11 @@
 import type { ConsistencyCheck } from "@mat3ra/esse/dist/js/types";
+import type { Constructor } from "src/js/utils/types";
 import { type HasConsistencyChecksSchemaMixin } from "../../generated/HasConsistencyChecksSchemaMixin";
 import { InMemoryEntity } from "../in_memory";
 type HasConsistencyChecksProperties = {
     addConsistencyChecks: (array: ConsistencyCheck[]) => void;
 };
 export type HasConsistencyChecks = HasConsistencyChecksSchemaMixin & HasConsistencyChecksProperties;
+export type HasConsistencyChecksInMemoryEntityConstructor = Constructor<HasConsistencyChecks>;
 export declare function hasConsistencyChecksMixin<T extends InMemoryEntity>(item: T): asserts item is T & HasConsistencyChecks;
 export {};
diff --git a/dist/js/entity/mixins/HasMetadataMixin.d.ts b/dist/js/entity/mixins/HasMetadataMixin.d.ts
@@ -1,8 +1,10 @@
+import type { Constructor } from "src/js/utils/types";
 import { type HasMetadataSchemaMixin } from "../../generated/HasMetadataSchemaMixin";
 import { InMemoryEntity } from "../in_memory";
 type HasMetadataProperties = {
     updateMetadata: (object: object) => void;
 };
 export type HasMetadata = HasMetadataSchemaMixin & HasMetadataProperties;
+export type HasMetadataInMemoryEntityConstructor = Constructor<HasMetadata>;
 export declare function hasMetadataMixin<T extends InMemoryEntity>(item: T): asserts item is T & HasMetadata;
 export {};
diff --git a/dist/js/entity/mixins/HashedEntityMixin.d.ts b/dist/js/entity/mixins/HashedEntityMixin.d.ts
@@ -1,6 +1,8 @@
+import type { Constructor } from "src/js/utils/types";
 import { InMemoryEntity } from "../in_memory";
 export type HashedEntity = {
     calculateHash(): string;
     getHashObject?(): object;
 };
+export type HashedInMemoryEntityConstructor = Constructor<HashedEntity>;
 export declare function hashedEntityMixin<T extends InMemoryEntity>(item: T): asserts item is T & HashedEntity;
diff --git a/dist/js/entity/mixins/ImportantSettingsProviderMixin.d.ts b/dist/js/entity/mixins/ImportantSettingsProviderMixin.d.ts
@@ -1,3 +1,4 @@
+import type { Constructor } from "src/js/utils/types";
 import type { InMemoryEntity } from "../in_memory";
 export interface ContextProvider {
     domain?: string;
@@ -11,5 +12,6 @@ export type ImportantSettingsProvider = {
 type AbstractBase = {
     contextProviders: ContextProvider[];
 };
+export type ImportantSettingsProviderInMemoryEntityConstructor = Constructor<ImportantSettingsProvider>;
 export declare function importantSettingsProviderMixin<T extends InMemoryEntity & AbstractBase>(item: T): asserts item is T & ImportantSettingsProvider;
 export {};
diff --git a/dist/js/entity/mixins/NamedEntityMixin.d.ts b/dist/js/entity/mixins/NamedEntityMixin.d.ts
@@ -1,8 +1,10 @@
+import type { Constructor } from "src/js/utils/types";
 import { type NamedEntitySchemaMixin } from "../../generated/NamedEntitySchemaMixin";
 import { InMemoryEntity } from "../in_memory";
 type NamedEntityProperties = {
     setName: (name: string) => void;
 };
 export type NamedEntity = NamedEntitySchemaMixin & NamedEntityProperties;
+export type NamedInMemoryEntityConstructor = Constructor<NamedEntity>;
 export declare function namedEntityMixin<T extends InMemoryEntity>(item: T): asserts item is T & NamedEntity;
 export {};
diff --git a/dist/js/entity/mixins/RuntimeItemsMixin.d.ts b/dist/js/entity/mixins/RuntimeItemsMixin.d.ts
@@ -1,3 +1,4 @@
+import type { Constructor } from "src/js/utils/types";
 import { type RuntimeItemsSchemaMixin } from "../../generated/RuntimeItemsSchemaMixin";
 import { InMemoryEntity } from "../in_memory";
 type RuntimeItemsProperties = {
@@ -8,5 +9,6 @@ type RuntimeItemsProperties = {
     };
 };
 export type RuntimeItems = RuntimeItemsSchemaMixin & RuntimeItemsProperties;
+export type RuntimeItemsInMemoryEntityConstructor = Constructor<RuntimeItems>;
 export declare function runtimeItemsMixin<T extends InMemoryEntity>(item: T): asserts item is T & RuntimeItems;
 export {};
diff --git a/dist/js/entity/mixins/TaggableMixin.d.ts b/dist/js/entity/mixins/TaggableMixin.d.ts
@@ -1,8 +1,10 @@
+import type { Constructor } from "src/js/utils/types";
 import { type TaggableSchemaMixin } from "../../generated/TaggableSchemaMixin";
 import { InMemoryEntity } from "../in_memory";
 type TaggableProperties = {
     setTags: (array: string[]) => void;
 };
 export type Taggable = TaggableSchemaMixin & TaggableProperties;
+export type TaggableInMemoryEntityConstructor = Constructor<Taggable>;
 export declare function taggableMixin<T extends InMemoryEntity>(item: T): asserts item is T & Taggable;
 export {};
diff --git a/dist/js/entity/other.d.ts b/dist/js/entity/other.d.ts
@@ -1,14 +1,13 @@
-import type { Constructor } from "../utils/types";
 import { InMemoryEntity } from "./in_memory";
-import { type Defaultable } from "./mixins/DefaultableMixin";
-import { type HasConsistencyChecks } from "./mixins/HasConsistencyChecksMixin";
-import { type HasMetadata } from "./mixins/HasMetadataMixin";
-import { type NamedEntity } from "./mixins/NamedEntityMixin";
-type DefaultableBase = typeof InMemoryEntity & Constructor<Defaultable>;
-type NamedBase = typeof InMemoryEntity & Constructor<NamedEntity>;
-type NamedDefaultableBase = typeof InMemoryEntity & Constructor<Defaultable> & Constructor<NamedEntity>;
-type HasMetadataNamedDefaultableBase = typeof InMemoryEntity & Constructor<Defaultable> & Constructor<NamedEntity> & Constructor<HasMetadata>;
-type HasConsistencyChecksHasMetadataNamedDefaultableInMemoryEntityBase = typeof HasMetadataNamedDefaultableInMemoryEntity & Constructor<HasConsistencyChecks>;
+import { type DefaultableInMemoryEntityConstructor } from "./mixins/DefaultableMixin";
+import { type HasConsistencyChecksInMemoryEntityConstructor } from "./mixins/HasConsistencyChecksMixin";
+import { type HasMetadataInMemoryEntityConstructor } from "./mixins/HasMetadataMixin";
+import { type NamedInMemoryEntityConstructor } from "./mixins/NamedEntityMixin";
+type DefaultableBase = typeof InMemoryEntity & DefaultableInMemoryEntityConstructor;
+type NamedBase = typeof InMemoryEntity & NamedInMemoryEntityConstructor;
+type NamedDefaultableBase = typeof InMemoryEntity & DefaultableInMemoryEntityConstructor & NamedInMemoryEntityConstructor;
+type HasMetadataNamedDefaultableBase = typeof InMemoryEntity & DefaultableInMemoryEntityConstructor & NamedInMemoryEntityConstructor & HasMetadataInMemoryEntityConstructor;
+type HasConsistencyChecksHasMetadataNamedDefaultableInMemoryEntityBase = typeof InMemoryEntity & DefaultableInMemoryEntityConstructor & NamedInMemoryEntityConstructor & HasConsistencyChecksInMemoryEntityConstructor;
 declare const DefaultableInMemoryEntity_base: DefaultableBase;
 export declare class DefaultableInMemoryEntity extends DefaultableInMemoryEntity_base {
 }
diff --git a/dist/js/entity/other.js b/dist/js/entity/other.js
@@ -2,10 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HasConsistencyChecksHasMetadataNamedDefaultableInMemoryEntity = exports.HasMetadataNamedDefaultableInMemoryEntity = exports.NamedDefaultableInMemoryEntity = exports.NamedInMemoryEntity = exports.DefaultableInMemoryEntity = void 0;
 const in_memory_1 = require("./in_memory");
-// import { ContextAndRenderFieldsMixin, ImportantSettingsProviderMixin } from "./mixins/context";
 const DefaultableMixin_1 = require("./mixins/DefaultableMixin");
 const HasConsistencyChecksMixin_1 = require("./mixins/HasConsistencyChecksMixin");
-// import { HashedEntityMixin } from "./mixins/hash";
 const HasMetadataMixin_1 = require("./mixins/HasMetadataMixin");
 const NamedEntityMixin_1 = require("./mixins/NamedEntityMixin");
 class DefaultableInMemoryEntity extends in_memory_1.InMemoryEntity {
diff --git a/src/js/entity/mixins/DefaultableMixin.ts b/src/js/entity/mixins/DefaultableMixin.ts
@@ -9,8 +9,6 @@ import { InMemoryEntity } from "../in_memory";
 
 export type Defaultable = DefaultableSchemaMixin;
 
-export type DefaultableInMemoryEntity = Defaultable;
-
 export type DefaultableInMemoryStaticEntity = {
     createDefault: () => InMemoryEntity & Defaultable;
 };
diff --git a/src/js/entity/mixins/HasConsistencyChecksMixin.ts b/src/js/entity/mixins/HasConsistencyChecksMixin.ts
@@ -1,4 +1,5 @@
 import type { ConsistencyCheck } from "@mat3ra/esse/dist/js/types";
+import type { Constructor } from "src/js/utils/types";
 
 import {
     type HasConsistencyChecksSchemaMixin,
@@ -12,6 +13,8 @@ type HasConsistencyChecksProperties = {
 
 export type HasConsistencyChecks = HasConsistencyChecksSchemaMixin & HasConsistencyChecksProperties;
 
+export type HasConsistencyChecksInMemoryEntityConstructor = Constructor<HasConsistencyChecks>;
+
 export function hasConsistencyChecksMixin<T extends InMemoryEntity>(
     item: T,
 ): asserts item is T & HasConsistencyChecks {
diff --git a/src/js/entity/mixins/HasMetadataMixin.ts b/src/js/entity/mixins/HasMetadataMixin.ts
@@ -1,3 +1,5 @@
+import type { Constructor } from "src/js/utils/types";
+
 import {
     type HasMetadataSchemaMixin,
     hasMetadataSchemaMixin,
@@ -10,6 +12,8 @@ type HasMetadataProperties = {
 
 export type HasMetadata = HasMetadataSchemaMixin & HasMetadataProperties;
 
+export type HasMetadataInMemoryEntityConstructor = Constructor<HasMetadata>;
+
 function hasMetadataPropertiesMixin<T extends InMemoryEntity>(
     item: T,
 ): asserts item is T & HasMetadata {
diff --git a/src/js/entity/mixins/HashedEntityMixin.ts b/src/js/entity/mixins/HashedEntityMixin.ts
@@ -1,3 +1,5 @@
+import type { Constructor } from "src/js/utils/types";
+
 import { calculateHashFromObject } from "../../utils/hash";
 import { InMemoryEntity } from "../in_memory";
 
@@ -6,6 +8,8 @@ export type HashedEntity = {
     getHashObject?(): object;
 };
 
+export type HashedInMemoryEntityConstructor = Constructor<HashedEntity>;
+
 export function hashedEntityMixin<T extends InMemoryEntity>(
     item: T,
 ): asserts item is T & HashedEntity {
diff --git a/src/js/entity/mixins/ImportantSettingsProviderMixin.ts b/src/js/entity/mixins/ImportantSettingsProviderMixin.ts
@@ -1,3 +1,5 @@
+import type { Constructor } from "src/js/utils/types";
+
 import { deepClone } from "../../utils/clone";
 import type { InMemoryEntity } from "../in_memory";
 
@@ -16,6 +18,9 @@ type AbstractBase = {
     contextProviders: ContextProvider[];
 };
 
+export type ImportantSettingsProviderInMemoryEntityConstructor =
+    Constructor<ImportantSettingsProvider>;
+
 export function importantSettingsProviderMixin<T extends InMemoryEntity & AbstractBase>(
     item: T,
 ): asserts item is T & ImportantSettingsProvider {
diff --git a/src/js/entity/mixins/NamedEntityMixin.ts b/src/js/entity/mixins/NamedEntityMixin.ts
@@ -1,3 +1,5 @@
+import type { Constructor } from "src/js/utils/types";
+
 import {
     type NamedEntitySchemaMixin,
     namedEntitySchemaMixin,
@@ -10,6 +12,8 @@ type NamedEntityProperties = {
 
 export type NamedEntity = NamedEntitySchemaMixin & NamedEntityProperties;
 
+export type NamedInMemoryEntityConstructor = Constructor<NamedEntity>;
+
 function namedEntityPropertiesMixin<T extends InMemoryEntity>(
     item: T,
 ): asserts item is T & NamedEntity {
diff --git a/src/js/entity/mixins/RuntimeItemsMixin.ts b/src/js/entity/mixins/RuntimeItemsMixin.ts
@@ -1,3 +1,5 @@
+import type { Constructor } from "src/js/utils/types";
+
 import {
     type RuntimeItemsSchemaMixin,
     runtimeItemsSchemaMixin,
@@ -14,6 +16,8 @@ type RuntimeItemsProperties = {
 
 export type RuntimeItems = RuntimeItemsSchemaMixin & RuntimeItemsProperties;
 
+export type RuntimeItemsInMemoryEntityConstructor = Constructor<RuntimeItems>;
+
 function runtimeItemsPropertiesMixin<T extends InMemoryEntity>(
     item: T,
 ): asserts item is T & RuntimeItems {
diff --git a/src/js/entity/mixins/TaggableMixin.ts b/src/js/entity/mixins/TaggableMixin.ts
@@ -1,3 +1,5 @@
+import type { Constructor } from "src/js/utils/types";
+
 import { type TaggableSchemaMixin, taggableSchemaMixin } from "../../generated/TaggableSchemaMixin";
 import { InMemoryEntity } from "../in_memory";
 
@@ -7,6 +9,8 @@ type TaggableProperties = {
 
 export type Taggable = TaggableSchemaMixin & TaggableProperties;
 
+export type TaggableInMemoryEntityConstructor = Constructor<Taggable>;
+
 function taggablePropertiesMixin<T extends InMemoryEntity>(item: T): asserts item is T & Taggable {
     // @ts-expect-error
     const properties: InMemoryEntity & Taggable = {
diff --git a/src/js/entity/other.ts b/src/js/entity/other.ts
@@ -1,31 +1,35 @@
-import type { Constructor } from "../utils/types";
 import { InMemoryEntity } from "./in_memory";
-// import { ContextAndRenderFieldsMixin, ImportantSettingsProviderMixin } from "./mixins/context";
-import { type Defaultable, defaultableEntityMixin } from "./mixins/DefaultableMixin";
 import {
-    type HasConsistencyChecks,
+    type DefaultableInMemoryEntityConstructor,
+    defaultableEntityMixin,
+} from "./mixins/DefaultableMixin";
+import {
+    type HasConsistencyChecksInMemoryEntityConstructor,
     hasConsistencyChecksMixin,
 } from "./mixins/HasConsistencyChecksMixin";
-// import { HashedEntityMixin } from "./mixins/hash";
-import { type HasMetadata, hasMetadataMixin } from "./mixins/HasMetadataMixin";
-import { type NamedEntity, namedEntityMixin } from "./mixins/NamedEntityMixin";
-// import { HasRepetitionMixin } from "./mixins/repetition";
+import {
+    type HasMetadataInMemoryEntityConstructor,
+    hasMetadataMixin,
+} from "./mixins/HasMetadataMixin";
+import { type NamedInMemoryEntityConstructor, namedEntityMixin } from "./mixins/NamedEntityMixin";
 
-type DefaultableBase = typeof InMemoryEntity & Constructor<Defaultable>;
+type DefaultableBase = typeof InMemoryEntity & DefaultableInMemoryEntityConstructor;
 
-type NamedBase = typeof InMemoryEntity & Constructor<NamedEntity>;
+type NamedBase = typeof InMemoryEntity & NamedInMemoryEntityConstructor;
 
 type NamedDefaultableBase = typeof InMemoryEntity &
-    Constructor<Defaultable> &
-    Constructor<NamedEntity>;
+    DefaultableInMemoryEntityConstructor &
+    NamedInMemoryEntityConstructor;
 
 type HasMetadataNamedDefaultableBase = typeof InMemoryEntity &
-    Constructor<Defaultable> &
-    Constructor<NamedEntity> &
-    Constructor<HasMetadata>;
+    DefaultableInMemoryEntityConstructor &
+    NamedInMemoryEntityConstructor &
+    HasMetadataInMemoryEntityConstructor;
 
-type HasConsistencyChecksHasMetadataNamedDefaultableInMemoryEntityBase =
-    typeof HasMetadataNamedDefaultableInMemoryEntity & Constructor<HasConsistencyChecks>;
+type HasConsistencyChecksHasMetadataNamedDefaultableInMemoryEntityBase = typeof InMemoryEntity &
+    DefaultableInMemoryEntityConstructor &
+    NamedInMemoryEntityConstructor &
+    HasConsistencyChecksInMemoryEntityConstructor;
 
 export class DefaultableInMemoryEntity extends (InMemoryEntity as DefaultableBase) {}
 defaultableEntityMixin(DefaultableInMemoryEntity);
