@mat3ra/mode 2025.11.5-1 → 2025.11.6-0

package/dist/js/model.d.ts

@@ -4,7 +4,7 @@ import type { ApplicationSchemaBase, BaseMethod, BaseModel, SlugifiedEntry, Slug
 import { type ModelSchemaMixin } from "./generated/ModelSchemaMixin";
 import { Method } from "./method";
 import { MethodFactory } from "./methods/factory";
-import type { ModelConfig, MethodTreeBranch, ModelTree } from "./types";
+import type { MethodTreeBranch, ModelConfig, ModelTree } from "./types";
 type Base = typeof InMemoryEntity & Constructor<ModelSchemaMixin>;
 declare const Model_base: Base;
 export declare class Model extends Model_base implements BaseModel {

package/dist/js/model.js

@@ -19,12 +19,6 @@ class Model extends entity_1.InMemoryEntity {
         this._application = application;
         this._MethodFactory = factory_1.MethodFactory;
     }
-    // get type(): string {
-    //     return this.prop<string>("type", this.defaultType);
-    // }
-    // get subtype(): StringOrNamedSlug {
-    //     return this.prop<StringOrNamedSlug>("subtype", this.defaultSubtype);
-    // }
     setSubtype(subtype) {
         this.setProp("subtype", subtype);
         this.setMethod(this._MethodFactory.create(this.defaultMethodConfig));
@@ -71,14 +65,13 @@ class Model extends entity_1.InMemoryEntity {
     }
     get Method() {
         if (!this._method) {
-            const methodOrConfig = this.method;
-            const config = methodOrConfig || this.defaultMethodConfig;
-            this._method = this._MethodFactory.create(config);
+            this._method = this._MethodFactory.create(this.method || this.defaultMethodConfig);
         }
         return this._method;
     }
     setMethod(method) {
         this._method = method;
+        this.setProp("method", method.toJSON());
     }
     get methodsFromTree() {
         return this.treeBranchForSubType.methods || {};
@@ -117,7 +110,7 @@ class Model extends entity_1.InMemoryEntity {
             ...json,
             type: this.type,
             subtype: this.subtype,
-            method: this.method.toJSONWithCleanData(),
+            method: this.Method.toJSONWithCleanData(),
         };
     }
     _stringToSlugifiedObject(slug) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mat3ra/mode",
-    "version": "2025.11.5-1",
+    "version": "2025.11.6-0",
     "description": "MOdel and method DEfinitions",
     "scripts": {
         "test": "nyc --reporter=text mocha --extension ts --recursive --bail --require ts-node/register/transpile-only \"tests/**/*.test.ts\"",

package/src/js/model.ts

@@ -14,7 +14,7 @@ import { type ModelSchemaMixin, modelSchemaMixin } from "./generated/ModelSchema
 import { Method } from "./method";
 import { MethodFactory } from "./methods/factory";
 import { getTreeByApplicationNameAndVersion, MODEL_TREE, treeSlugToNamedObject } from "./tree";
-import type { ModelConfig, MethodTreeBranch, ModelTree } from "./types";
+import type { MethodTreeBranch, ModelConfig, ModelTree } from "./types";
 
 const EMPTY_BRANCH: MethodTreeBranch = { methods: {} };
 
@@ -28,20 +28,12 @@ export class Model extends (InMemoryEntity as Base) implements BaseModel {
     protected _method?: Method;
 
     constructor(config: ModelConfig) {
-        const { application, ...entityConfig } = config as any;
+        const { application, ...entityConfig } = config;
         super(entityConfig);
         this._application = application as ApplicationSchemaBase | undefined;
         this._MethodFactory = MethodFactory;
     }
 
-    // get type(): string {
-    //     return this.prop<string>("type", this.defaultType);
-    // }
-
-    // get subtype(): StringOrNamedSlug {
-    //     return this.prop<StringOrNamedSlug>("subtype", this.defaultSubtype);
-    // }
-
     setSubtype(subtype: SlugifiedEntryOrSlug): void {
         this.setProp("subtype", subtype);
         this.setMethod(this._MethodFactory.create(this.defaultMethodConfig));
@@ -93,15 +85,14 @@ export class Model extends (InMemoryEntity as Base) implements BaseModel {
 
     get Method(): Method {
         if (!this._method) {
-            const methodOrConfig = this.method;
-            const config = methodOrConfig || this.defaultMethodConfig;
-            this._method = this._MethodFactory.create(config);
+            this._method = this._MethodFactory.create(this.method || this.defaultMethodConfig);
         }
         return this._method;
     }
 
     setMethod(method: Method): void {
         this._method = method;
+        this.setProp("method", method.toJSON());
     }
 
     get methodsFromTree(): Record<string, string[]> {
@@ -113,7 +104,7 @@ export class Model extends (InMemoryEntity as Base) implements BaseModel {
     }
 
     get methodSubtypes(): SlugifiedEntry[] {
-        const { type } = this.method;
+        const { type } = this.method as Method;
         const subtypes = this.methodsFromTree[type] || [];
         return subtypes.map((slug) => treeSlugToNamedObject(slug));
     }
@@ -144,7 +135,7 @@ export class Model extends (InMemoryEntity as Base) implements BaseModel {
             ...json,
             type: this.type,
             subtype: this.subtype,
-            method: (this.method as any).toJSONWithCleanData(),
+            method: this.Method.toJSONWithCleanData(),
         };
     }