@mat3ra/mode 2026.6.3-0 → 2026.8.13-0

package/dist/js/generated/MethodSchemaMixin.d.ts

@@ -1,5 +1,5 @@
 import type { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
-import type { BaseMethod } from "@mat3ra/esse/dist/js/types";
+import type { BaseInMemoryEntitySchema, BaseMethod } from "@mat3ra/esse/dist/js/types";
 export type MethodSchemaMixin = BaseMethod;
-export type MethodInMemoryEntity = InMemoryEntity & MethodSchemaMixin;
+export type MethodInMemoryEntity = InMemoryEntity<BaseInMemoryEntitySchema & MethodSchemaMixin>;
 export declare function methodSchemaMixin<T extends InMemoryEntity>(item: InMemoryEntity): asserts item is T & MethodSchemaMixin;

package/dist/js/generated/ModelSchemaMixin.d.ts

@@ -1,5 +1,5 @@
 import type { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
-import type { BaseModel } from "@mat3ra/esse/dist/js/types";
+import type { BaseInMemoryEntitySchema, BaseModel } from "@mat3ra/esse/dist/js/types";
 export type ModelSchemaMixin = BaseModel;
-export type ModelInMemoryEntity = InMemoryEntity & ModelSchemaMixin;
+export type ModelInMemoryEntity = InMemoryEntity<BaseInMemoryEntitySchema & ModelSchemaMixin>;
 export declare function modelSchemaMixin<T extends InMemoryEntity>(item: InMemoryEntity): asserts item is T & ModelSchemaMixin;

package/dist/js/method.d.ts

@@ -1,23 +1,24 @@
 import { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
 import { type HashedEntity } from "@mat3ra/code/dist/js/entity/mixins/HashedEntityMixin";
-import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
-import type { AnyObject } from "@mat3ra/esse/dist/js/esse/types";
-import type { BaseMethod, SlugifiedEntry } from "@mat3ra/esse/dist/js/types";
+import type { BaseInMemoryEntitySchema, BaseMethod, FileDataItem, SlugifiedEntry } from "@mat3ra/esse/dist/js/types";
 import { type MethodSchemaMixin } from "./generated/MethodSchemaMixin";
-type Base = typeof InMemoryEntity & Constructor<MethodSchemaMixin> & Constructor<HashedEntity>;
+type MethodEntity = BaseMethod & BaseInMemoryEntitySchema;
+export interface Method extends MethodSchemaMixin, HashedEntity {
+}
 interface MethodData extends Record<string, unknown> {
     searchText?: string;
+    pseudo?: FileDataItem[];
+    allPseudo?: FileDataItem[];
 }
-declare const Method_base: Base;
-export declare class Method extends Method_base implements BaseMethod {
+export declare class Method extends InMemoryEntity<MethodEntity> implements BaseMethod, HashedEntity {
     constructor(config: BaseMethod);
-    toJSON: () => BaseMethod & AnyObject;
     cloneWithoutData(): Method;
     setSubtype(subtype: SlugifiedEntry): void;
     static get defaultConfig(): {
         readonly type: "pseudopotential";
         readonly subtype: "us";
     };
+    get methodData(): MethodData;
     get searchText(): string;
     setSearchText(searchText: string): void;
     setData(data?: MethodData): void;

package/dist/js/method.js

@@ -22,17 +22,22 @@ class Method extends entity_1.InMemoryEntity {
     static get defaultConfig() {
         return default_methods_1.PseudopotentialMethodConfig;
     }
+    get methodData() {
+        var _a;
+        return (_a = this.data) !== null && _a !== void 0 ? _a : {};
+    }
     get searchText() {
-        return this.prop("data.searchText", "");
+        var _a;
+        return (_a = this.methodData.searchText) !== null && _a !== void 0 ? _a : "";
     }
     setSearchText(searchText) {
-        this.setData({ ...this.data, searchText });
+        this.setData({ ...this.methodData, searchText });
     }
     setData(data = {}) {
-        this.setProp("data", data);
+        this.data = data;
     }
     cleanData(fieldsToExclude = []) {
-        const filteredData = { ...this.data };
+        const filteredData = { ...this.methodData };
         fieldsToExclude.forEach((field) => {
             delete filteredData[field];
         });

package/dist/js/methods/pseudopotential.d.ts

@@ -1,4 +1,3 @@
-import type { AnyObject } from "@mat3ra/esse/dist/js/esse/types";
 import { type BaseMethod, type FileDataItem } from "@mat3ra/esse/dist/js/types";
 import { PseudopotentialFilter, PseudopotentialMetaProperty } from "@mat3ra/prode";
 import { Method } from "../method";
@@ -7,7 +6,6 @@ export type ExchangeCorrelation = {
     functional: string;
 };
 export declare class PseudopotentialMethod extends Method {
-    toJSON: () => BaseMethod & AnyObject;
     get pseudo(): FileDataItem[];
     get allPseudo(): FileDataItem[];
     get pseudopotentials(): PseudopotentialMetaProperty[];

package/dist/js/methods/pseudopotential.js

@@ -9,10 +9,12 @@ const underscore_1 = __importDefault(require("underscore"));
 const method_1 = require("../method");
 class PseudopotentialMethod extends method_1.Method {
     get pseudo() {
-        return this.prop("data.pseudo", []);
+        var _a;
+        return (_a = this.methodData.pseudo) !== null && _a !== void 0 ? _a : [];
     }
     get allPseudo() {
-        return this.prop("data.allPseudo", []);
+        var _a;
+        return (_a = this.methodData.allPseudo) !== null && _a !== void 0 ? _a : [];
     }
     get pseudopotentials() {
         return this.pseudo.map((config) => new prode_1.PseudopotentialMetaProperty(config));
@@ -37,13 +39,13 @@ class PseudopotentialMethod extends method_1.Method {
     }
     setPseudopotentials(pseudopotentials) {
         this.setData({
-            ...this.data,
+            ...this.methodData,
             pseudo: underscore_1.default.sortBy(pseudopotentials, "element").map((item) => item.toJSON()),
         });
     }
     setAllPseudopotentials(pseudopotentials) {
         this.setData({
-            ...this.data,
+            ...this.methodData,
             allPseudo: underscore_1.default.sortBy(pseudopotentials, "element").map((item) => item.toJSON()),
         });
     }

package/dist/js/model.d.ts

@@ -1,15 +1,20 @@
 import { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
 import { type HashedEntity } from "@mat3ra/code/dist/js/entity/mixins/HashedEntityMixin";
-import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
-import type { AnyObject } from "@mat3ra/esse/dist/js/esse/types";
-import type { AnyModelSchema, ApplicationSchema, BaseMethod, BaseModel, SlugifiedEntry, SlugifiedEntryOrSlug } from "@mat3ra/esse/dist/js/types";
+import type { ApplicationSchema, BaseInMemoryEntitySchema, BaseMethod, BaseModel, SlugifiedEntry, SlugifiedEntryOrSlug } from "@mat3ra/esse/dist/js/types";
 import { type ModelSchemaMixin } from "./generated/ModelSchemaMixin";
 import { Method } from "./method";
 import { MethodFactory } from "./methods/factory";
 import type { MethodTreeBranch, ModelConfig, ModelTree } from "./types";
-type Base = typeof InMemoryEntity & Constructor<ModelSchemaMixin> & Constructor<HashedEntity>;
-declare const Model_base: Base;
-export declare class Model extends Model_base implements BaseModel {
+export type ModelEntity = BaseInMemoryEntitySchema & Pick<BaseModel, "method"> & {
+    type: string;
+    subtype: SlugifiedEntryOrSlug;
+    refiners?: SlugifiedEntry[];
+    modifiers?: SlugifiedEntry[];
+    functional?: string;
+};
+export interface Model extends ModelSchemaMixin, HashedEntity {
+}
+export declare class Model extends InMemoryEntity<ModelEntity> implements BaseModel {
     protected _application?: ApplicationSchema;
     protected _MethodFactory: typeof MethodFactory;
     protected _method?: Method;
@@ -39,11 +44,9 @@ export declare class Model extends Model_base implements BaseModel {
         subtype: "gga";
     };
     static get allTypes(): SlugifiedEntry[];
-    _json: AnyModelSchema & AnyObject;
-    toJSON(): AnyModelSchema & AnyObject;
+    toJSON(): ModelEntity;
     protected _stringToSlugifiedObject(slug: SlugifiedEntryOrSlug): SlugifiedEntry;
     get isUnknown(): boolean;
     protected get subtypeSlug(): string;
     getHashObject(): Record<string, unknown>;
 }
-export {};

package/dist/js/model.js

@@ -16,7 +16,7 @@ const EMPTY_BRANCH = { methods: {} };
 class Model extends entity_1.InMemoryEntity {
     constructor(config) {
         const { application, method = method_1.Method.defaultConfig, ...entityConfig } = config;
-        super(entityConfig);
+        super({ ...entityConfig, method });
         this._application = application;
         this._MethodFactory = factory_1.MethodFactory;
         this.method = method || this.method;

package/dist/js/models/dft.d.ts

@@ -14,16 +14,15 @@ export declare class DFTModel extends Model {
     readonly defaultRefiners: SlugifiedEntry[];
     readonly defaultModifiers: SlugifiedEntry[];
     get slugifiedFunctional(): SlugifiedEntry;
-    get functional(): "pz" | "pw" | "vwn" | "other" | "pbe" | "pbesol" | "pw91" | "b3lyp" | "hse06";
-    set functional(functional: "pz" | "pw" | "vwn" | "other" | "pbe" | "pbesol" | "pw91" | "b3lyp" | "hse06");
-    get refiners(): SlugifiedEntry[];
-    get modifiers(): SlugifiedEntry[];
+    get functional(): string | undefined;
+    set functional(functional: string | undefined);
+    get refiners(): SlugifiedEntry[] | undefined;
+    get modifiers(): SlugifiedEntry[] | undefined;
     setSubtype(subtype: SlugifiedEntryOrSlug): void;
     setFunctional(functional: string): void;
     private _setArrayProp;
     setRefiners(refiners: SlugifiedEntryOrSlug | SlugifiedEntryOrSlug[]): void;
     setModifiers(modifiers: SlugifiedEntryOrSlug | SlugifiedEntryOrSlug[]): void;
-    _json: DFTModelSchema & AnyObject;
     toJSON(): DFTModelSchema & AnyObject;
     get allFunctionals(): SlugifiedEntry[];
     get allRefiners(): SlugifiedEntry[];

package/dist/js/models/dft.js

@@ -11,15 +11,14 @@ class DFTModel extends model_1.Model {
         this.defaultRefiners = [];
         this.defaultModifiers = [];
         this._MethodFactory = config.MethodFactory || factory_1.MethodFactory;
-        this.functional =
-            this.prop("functional") || this.defaultFunctional.slug;
+        this.functional = this.prop("functional") || this.defaultFunctional.slug;
     }
     get groupSlug() {
-        var _a;
-        const refinersSlug = this.refiners.map((o) => o.slug).join("+");
-        const modifiersSlug = this.modifiers.map((o) => o.slug).join("+");
+        var _a, _b, _c;
+        const refinersSlug = ((_a = this.refiners) !== null && _a !== void 0 ? _a : []).map((o) => o.slug).join("+");
+        const modifiersSlug = ((_b = this.modifiers) !== null && _b !== void 0 ? _b : []).map((o) => o.slug).join("+");
         const slugs = [
-            (_a = this._application) === null || _a === void 0 ? void 0 : _a.shortName,
+            (_c = this._application) === null || _c === void 0 ? void 0 : _c.shortName,
             this.type,
             this.subtype,
             this.functional,
@@ -33,7 +32,8 @@ class DFTModel extends model_1.Model {
         return (0, tree_1.treeSlugToNamedObject)(slug);
     }
     get slugifiedFunctional() {
-        return this._stringToSlugifiedObject(this.functional);
+        var _a;
+        return this._stringToSlugifiedObject((_a = this.functional) !== null && _a !== void 0 ? _a : this.defaultFunctional.slug);
     }
     get functional() {
         return this.requiredProp("functional");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mat3ra/mode",
-    "version": "2026.6.3-0",
+    "version": "2026.8.13-0",
     "description": "MOdel and method DEfinitions",
     "scripts": {
         "test": "nyc --reporter=text mocha --recursive --bail",
@@ -31,7 +31,6 @@
     "license": "Apache-2.0",
     "homepage": "https://github.com/Exabyte-io/mode",
     "dependencies": {
-        "@mat3ra/utils": "^2026.3.2-0",
         "@babel/cli": "7.16.0",
         "@babel/core": "7.16.0",
         "@babel/eslint-parser": "7.16.3",
@@ -40,9 +39,10 @@
         "@babel/preset-react": "7.16.7",
         "@babel/register": "^7.16.0",
         "@babel/runtime-corejs3": "7.16.8",
+        "@mat3ra/utils": "^2026.3.2-0",
         "@types/lodash": "^4.14.202",
-        "@types/underscore": "^1.11.14",
         "@types/node": "^20.11.30",
+        "@types/underscore": "^1.11.14",
         "ajv": "^8.12.0",
         "js-yaml": "^4.1.0",
         "lodash": "^4.17.21",
@@ -54,13 +54,15 @@
     },
     "devDependencies": {
         "@exabyte-io/eslint-config": "2025.5.13-0",
-        "@mat3ra/code": "2026.5.27-0",
-        "@mat3ra/esse": "2026.5.27-0",
-        "@mat3ra/prode": "2026.5.28-0",
+        "@mat3ra/code": "2026.8.13-0",
+        "@mat3ra/esse": "2026.8.13-0",
+        "@mat3ra/prode": "2026.8.13-0",
         "@mat3ra/standata": "2026.5.28-0",
         "@mat3ra/tsconfig": "2024.6.3-0",
         "@types/chai": "^4.3.11",
         "@types/mocha": "^10.0.6",
+        "@typescript-eslint/eslint-plugin": "^5.62.0",
+        "@typescript-eslint/parser": "^5.62.0",
         "chai": "^4.3.4",
         "eslint": "^7.32.0",
         "eslint-config-airbnb": "^19.0.2",
@@ -82,8 +84,8 @@
         "prettier": "^2.7.1"
     },
     "peerDependencies": {
-        "@mat3ra/esse": "*",
         "@mat3ra/code": "*",
+        "@mat3ra/esse": "*",
         "@mat3ra/prode": "*"
     },
     "engines": {

package/src/js/generated/MethodSchemaMixin.ts

@@ -1,35 +1,35 @@
 import type { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
-import type { BaseMethod } from "@mat3ra/esse/dist/js/types";
+import type { BaseInMemoryEntitySchema, BaseMethod } from "@mat3ra/esse/dist/js/types";
 
 export type MethodSchemaMixin = BaseMethod;
 
-export type MethodInMemoryEntity = InMemoryEntity & MethodSchemaMixin;
+export type MethodInMemoryEntity = InMemoryEntity<BaseInMemoryEntitySchema & MethodSchemaMixin>;
 
 export function methodSchemaMixin<T extends InMemoryEntity>(
     item: InMemoryEntity,
 ): asserts item is T & MethodSchemaMixin {
     // @ts-expect-error
-    const properties: InMemoryEntity & MethodSchemaMixin = {
+    const properties: InMemoryEntity<MethodSchemaMixin> & MethodSchemaMixin = {
         get type() {
-            return this.requiredProp<BaseMethod["type"]>("type");
+            return this.requiredProp("type");
         },
         set type(value: BaseMethod["type"]) {
             this.setProp("type", value);
         },
         get subtype() {
-            return this.requiredProp<BaseMethod["subtype"]>("subtype");
+            return this.requiredProp("subtype");
         },
         set subtype(value: BaseMethod["subtype"]) {
             this.setProp("subtype", value);
         },
         get precision() {
-            return this.prop<BaseMethod["precision"]>("precision");
+            return this.prop("precision");
         },
         set precision(value: BaseMethod["precision"]) {
             this.setProp("precision", value);
         },
         get data() {
-            return this.prop<BaseMethod["data"]>("data");
+            return this.prop("data");
         },
         set data(value: BaseMethod["data"]) {
             this.setProp("data", value);

package/src/js/generated/ModelSchemaMixin.ts

@@ -1,29 +1,29 @@
 import type { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
-import type { BaseModel } from "@mat3ra/esse/dist/js/types";
+import type { BaseInMemoryEntitySchema, BaseModel } from "@mat3ra/esse/dist/js/types";
 
 export type ModelSchemaMixin = BaseModel;
 
-export type ModelInMemoryEntity = InMemoryEntity & ModelSchemaMixin;
+export type ModelInMemoryEntity = InMemoryEntity<BaseInMemoryEntitySchema & ModelSchemaMixin>;
 
 export function modelSchemaMixin<T extends InMemoryEntity>(
     item: InMemoryEntity,
 ): asserts item is T & ModelSchemaMixin {
     // @ts-expect-error
-    const properties: InMemoryEntity & ModelSchemaMixin = {
+    const properties: InMemoryEntity<ModelSchemaMixin> & ModelSchemaMixin = {
         get type() {
-            return this.requiredProp<BaseModel["type"]>("type");
+            return this.requiredProp("type");
         },
         set type(value: BaseModel["type"]) {
             this.setProp("type", value);
         },
         get subtype() {
-            return this.requiredProp<BaseModel["subtype"]>("subtype");
+            return this.requiredProp("subtype");
         },
         set subtype(value: BaseModel["subtype"]) {
             this.setProp("subtype", value);
         },
         get method() {
-            return this.requiredProp<BaseModel["method"]>("method");
+            return this.requiredProp("method");
         },
         set method(value: BaseModel["method"]) {
             this.setProp("method", value);

package/src/js/method.ts

@@ -4,27 +4,32 @@ import {
     hashedEntityMixin,
 } from "@mat3ra/code/dist/js/entity/mixins/HashedEntityMixin";
 import { deepClone } from "@mat3ra/code/dist/js/utils";
-import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
-import type { AnyObject } from "@mat3ra/esse/dist/js/esse/types";
-import type { BaseMethod, SlugifiedEntry } from "@mat3ra/esse/dist/js/types";
+import type {
+    BaseInMemoryEntitySchema,
+    BaseMethod,
+    FileDataItem,
+    SlugifiedEntry,
+} from "@mat3ra/esse/dist/js/types";
 
 import { PseudopotentialMethodConfig } from "./default_methods";
 import { type MethodSchemaMixin, methodSchemaMixin } from "./generated/MethodSchemaMixin";
 
-type Base = typeof InMemoryEntity & Constructor<MethodSchemaMixin> & Constructor<HashedEntity>;
+type MethodEntity = BaseMethod & BaseInMemoryEntitySchema;
+
+export interface Method extends MethodSchemaMixin, HashedEntity {}
 
 interface MethodData extends Record<string, unknown> {
     searchText?: string;
+    pseudo?: FileDataItem[];
+    allPseudo?: FileDataItem[];
 }
 
-export class Method extends (InMemoryEntity as Base) implements BaseMethod {
+export class Method extends InMemoryEntity<MethodEntity> implements BaseMethod, HashedEntity {
     constructor(config: BaseMethod) {
         const data = config.data || {};
         super({ ...config, data });
     }
 
-    declare toJSON: () => BaseMethod & AnyObject;
-
     cloneWithoutData(): Method {
         const clone = this.clone() as Method;
         clone.setData({});
@@ -39,20 +44,24 @@ export class Method extends (InMemoryEntity as Base) implements BaseMethod {
         return PseudopotentialMethodConfig;
     }
 
+    get methodData(): MethodData {
+        return (this.data as MethodData | undefined) ?? {};
+    }
+
     get searchText(): string {
-        return this.prop<string>("data.searchText", "");
+        return this.methodData.searchText ?? "";
     }
 
     setSearchText(searchText: string): void {
-        this.setData({ ...this.data, searchText });
+        this.setData({ ...this.methodData, searchText });
     }
 
     setData(data: MethodData = {}): void {
-        this.setProp("data", data);
+        this.data = data;
     }
 
     cleanData(fieldsToExclude: string[] = []): MethodData {
-        const filteredData = { ...(this.data as MethodData) };
+        const filteredData = { ...this.methodData };
         fieldsToExclude.forEach((field) => {
             delete filteredData[field];
         });

package/src/js/methods/pseudopotential.ts

@@ -1,4 +1,3 @@
-import type { AnyObject } from "@mat3ra/esse/dist/js/esse/types";
 import { type BaseMethod, type FileDataItem } from "@mat3ra/esse/dist/js/types";
 import { PseudopotentialFilter, PseudopotentialMetaProperty } from "@mat3ra/prode";
 import _ from "underscore";
@@ -11,14 +10,12 @@ export type ExchangeCorrelation = {
 };
 
 export class PseudopotentialMethod extends Method {
-    declare toJSON: () => BaseMethod & AnyObject;
-
-    get pseudo() {
-        return this.prop<FileDataItem[]>("data.pseudo", []);
+    get pseudo(): FileDataItem[] {
+        return this.methodData.pseudo ?? [];
     }
 
-    get allPseudo() {
-        return this.prop<FileDataItem[]>("data.allPseudo", []);
+    get allPseudo(): FileDataItem[] {
+        return this.methodData.allPseudo ?? [];
     }
 
     get pseudopotentials() {
@@ -50,14 +47,14 @@ export class PseudopotentialMethod extends Method {
 
     setPseudopotentials(pseudopotentials: PseudopotentialMetaProperty[]) {
         this.setData({
-            ...this.data,
+            ...this.methodData,
             pseudo: _.sortBy(pseudopotentials, "element").map((item) => item.toJSON()),
         });
     }
 
     setAllPseudopotentials(pseudopotentials: PseudopotentialMetaProperty[]) {
         this.setData({
-            ...this.data,
+            ...this.methodData,
             allPseudo: _.sortBy(pseudopotentials, "element").map((item) => item.toJSON()),
         });
     }

package/src/js/model.ts

@@ -3,11 +3,9 @@ import {
     type HashedEntity,
     hashedEntityMixin,
 } from "@mat3ra/code/dist/js/entity/mixins/HashedEntityMixin";
-import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
-import type { AnyObject } from "@mat3ra/esse/dist/js/esse/types";
 import type {
-    AnyModelSchema,
     ApplicationSchema,
+    BaseInMemoryEntitySchema,
     BaseMethod,
     BaseModel,
     SlugifiedEntry,
@@ -24,9 +22,18 @@ import type { MethodTreeBranch, ModelConfig, ModelTree } from "./types";
 
 const EMPTY_BRANCH: MethodTreeBranch = { methods: {} };
 
-type Base = typeof InMemoryEntity & Constructor<ModelSchemaMixin> & Constructor<HashedEntity>;
+export type ModelEntity = BaseInMemoryEntitySchema &
+    Pick<BaseModel, "method"> & {
+        type: string;
+        subtype: SlugifiedEntryOrSlug;
+        refiners?: SlugifiedEntry[];
+        modifiers?: SlugifiedEntry[];
+        functional?: string;
+    };
 
-export class Model extends (InMemoryEntity as Base) implements BaseModel {
+export interface Model extends ModelSchemaMixin, HashedEntity {}
+
+export class Model extends InMemoryEntity<ModelEntity> implements BaseModel {
     protected _application?: ApplicationSchema;
 
     protected _MethodFactory: typeof MethodFactory;
@@ -35,7 +42,7 @@ export class Model extends (InMemoryEntity as Base) implements BaseModel {
 
     constructor(config: ModelConfig) {
         const { application, method = Method.defaultConfig, ...entityConfig } = config;
-        super(entityConfig);
+        super({ ...entityConfig, method } as ModelEntity);
         this._application = application;
         this._MethodFactory = MethodFactory;
         this.method = method || this.method;
@@ -137,15 +144,13 @@ export class Model extends (InMemoryEntity as Base) implements BaseModel {
         return Object.keys(MODEL_TREE).map((modelSlug) => treeSlugToNamedObject(modelSlug));
     }
 
-    declare _json: AnyModelSchema & AnyObject;
-
-    toJSON(): AnyModelSchema & AnyObject {
+    toJSON(): ModelEntity {
         return {
             ...super.toJSON(),
             type: this.type,
             subtype: this.subtype,
             method: this.Method.toJSONWithCleanData(),
-        } as AnyModelSchema & AnyObject;
+        };
     }
 
     // eslint-disable-next-line class-methods-use-this
@@ -166,7 +171,7 @@ export class Model extends (InMemoryEntity as Base) implements BaseModel {
     }
 
     getHashObject(): Record<string, unknown> {
-        const json = this.toJSON() as Record<string, unknown>;
+        const json = this.toJSON() as unknown as Record<string, unknown>;
         json.method = this.Method.calculateHash();
         return json;
     }

package/src/js/models/dft.ts

@@ -15,8 +15,7 @@ export class DFTModel extends Model {
     constructor(config: ModelConfig & { MethodFactory?: typeof MethodFactory }) {
         super(config);
         this._MethodFactory = config.MethodFactory || MethodFactory;
-        this.functional =
-            this.prop<DFTModelSchema["functional"]>("functional") || this.defaultFunctional.slug;
+        this.functional = this.prop("functional") || this.defaultFunctional.slug;
     }
 
     declare type: DFTModelSchema["type"];
@@ -24,8 +23,8 @@ export class DFTModel extends Model {
     declare subtype: DFTModelSchema["subtype"];
 
     get groupSlug(): string {
-        const refinersSlug = this.refiners.map((o) => o.slug).join("+");
-        const modifiersSlug = this.modifiers.map((o) => o.slug).join("+");
+        const refinersSlug = (this.refiners ?? []).map((o) => o.slug).join("+");
+        const modifiersSlug = (this.modifiers ?? []).map((o) => o.slug).join("+");
         const slugs = [
             this._application?.shortName,
             this.type,
@@ -47,11 +46,11 @@ export class DFTModel extends Model {
     readonly defaultModifiers: SlugifiedEntry[] = [];
 
     get slugifiedFunctional() {
-        return this._stringToSlugifiedObject(this.functional);
+        return this._stringToSlugifiedObject(this.functional ?? this.defaultFunctional.slug);
     }
 
     get functional() {
-        return this.requiredProp<DFTModelSchema["functional"]>("functional");
+        return this.requiredProp("functional");
     }
 
     set functional(functional) {
@@ -59,11 +58,11 @@ export class DFTModel extends Model {
     }
 
     get refiners() {
-        return this.prop<SlugifiedEntry[]>("refiners", this.defaultRefiners);
+        return this.prop("refiners", this.defaultRefiners);
     }
 
     get modifiers() {
-        return this.prop<SlugifiedEntry[]>("modifiers", this.defaultModifiers);
+        return this.prop("modifiers", this.defaultModifiers);
     }
 
     setSubtype(subtype: SlugifiedEntryOrSlug): void {
@@ -93,8 +92,6 @@ export class DFTModel extends Model {
         this._setArrayProp("modifiers", modifiers);
     }
 
-    declare _json: DFTModelSchema & AnyObject;
-
     toJSON(): DFTModelSchema & AnyObject {
         const baseJson = super.toJSON();
         const keysToExclude = ["type", "subtype", "functional", "refiners", "modifiers", "method"];