@mat3ra/mode 2025.11.23-0 → 2025.12.2-0

package/dist/js/models/factory.js

@@ -18,11 +18,13 @@ class ModelFactory {
         if (!application) {
             throw new Error("ModelFactory.createFromApplication: application is required");
         }
-        const type = (0, tree_1.getDefaultModelTypeForApplication)(application);
-        if (!type) {
-            throw new Error(`ModelFactory.createFromApplication: cannot determine model type: ${type}`);
+        const tree = (0, tree_1.getTreeByApplicationNameAndVersion)(application);
+        if (Object.keys(tree).length === 0) {
+            return this.create({ ...config, type: "unknown", subtype: "unknown" });
         }
-        return this.create({ ...config, type });
+        const type = (0, tree_1.getDefaultModelTypeForApplication)(application);
+        const subtype = (0, tree_1.getDefaultModelSubtypeForApplicationAndType)(application, type) || "unknown";
+        return this.create({ ...config, type, subtype });
     }
 }
 exports.ModelFactory = ModelFactory;

package/dist/js/tree.d.ts

@@ -73,3 +73,4 @@ export declare const getDFTFunctionalsByApproximation: (approximation: string) =
 export declare const treeSlugToNamedObject: (modelSlug: string) => SlugifiedEntry;
 export declare const getTreeByApplicationNameAndVersion: ({ name, }: Pick<ApplicationSchemaBase, "name" | "version">) => ModelTree;
 export declare const getDefaultModelTypeForApplication: (application: ApplicationSchemaBase) => string;
+export declare const getDefaultModelSubtypeForApplicationAndType: (application: ApplicationSchemaBase, type: string) => string | undefined;

package/dist/js/tree.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultModelTypeForApplication = exports.getTreeByApplicationNameAndVersion = exports.treeSlugToNamedObject = exports.getDFTFunctionalsByApproximation = exports.getDFTFunctionalsFromTree = exports.getPseudopotentialTypesFromTree = exports.METHODS = exports.MODEL_NAMES = exports.MODEL_TREE = void 0;
+exports.getDefaultModelSubtypeForApplicationAndType = exports.getDefaultModelTypeForApplication = exports.getTreeByApplicationNameAndVersion = exports.treeSlugToNamedObject = exports.getDFTFunctionalsByApproximation = exports.getDFTFunctionalsFromTree = exports.getPseudopotentialTypesFromTree = exports.METHODS = exports.MODEL_NAMES = exports.MODEL_TREE = void 0;
 const modelsTreeConfigByApplication_json_1 = __importDefault(require("@mat3ra/standata/dist/js/runtime_data/models/modelsTreeConfigByApplication.json"));
 const modelTree_json_1 = __importDefault(require("@mat3ra/standata/dist/js/runtime_data/models/modelTree.json"));
 const lodash_1 = __importDefault(require("lodash"));
@@ -47,3 +47,9 @@ const getDefaultModelTypeForApplication = (application) => {
     return Object.keys((0, exports.getTreeByApplicationNameAndVersion)(application))[0];
 };
 exports.getDefaultModelTypeForApplication = getDefaultModelTypeForApplication;
+const getDefaultModelSubtypeForApplicationAndType = (application, type) => {
+    const tree = (0, exports.getTreeByApplicationNameAndVersion)(application);
+    const subtypes = Object.keys(tree[type] || {});
+    return subtypes[0];
+};
+exports.getDefaultModelSubtypeForApplicationAndType = getDefaultModelSubtypeForApplicationAndType;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mat3ra/mode",
-    "version": "2025.11.23-0",
+    "version": "2025.12.2-0",
     "description": "MOdel and method DEfinitions",
     "scripts": {
         "test": "nyc --reporter=text mocha --recursive --bail",

package/src/js/models/factory.ts

@@ -1,5 +1,9 @@
 import { Model } from "../model";
-import { getDefaultModelTypeForApplication } from "../tree";
+import {
+    getDefaultModelSubtypeForApplicationAndType,
+    getDefaultModelTypeForApplication,
+    getTreeByApplicationNameAndVersion,
+} from "../tree";
 import type { ModelConfig } from "../types";
 import { DFTModel } from "./dft";
 
@@ -22,12 +26,15 @@ export class ModelFactory {
         if (!application) {
             throw new Error("ModelFactory.createFromApplication: application is required");
         }
-        const type = getDefaultModelTypeForApplication(application);
-        if (!type) {
-            throw new Error(
-                `ModelFactory.createFromApplication: cannot determine model type: ${type}`,
-            );
+
+        const tree = getTreeByApplicationNameAndVersion(application);
+        if (Object.keys(tree).length === 0) {
+            return this.create({ ...config, type: "unknown", subtype: "unknown" });
         }
-        return this.create({ ...config, type });
+
+        const type = getDefaultModelTypeForApplication(application);
+        const subtype = getDefaultModelSubtypeForApplicationAndType(application, type) || "unknown";
+
+        return this.create({ ...config, type, subtype });
     }
 }

package/src/js/tree.ts

@@ -47,3 +47,12 @@ export const getTreeByApplicationNameAndVersion = ({
 export const getDefaultModelTypeForApplication = (application: ApplicationSchemaBase): string => {
     return Object.keys(getTreeByApplicationNameAndVersion(application))[0];
 };
+
+export const getDefaultModelSubtypeForApplicationAndType = (
+    application: ApplicationSchemaBase,
+    type: string,
+): string | undefined => {
+    const tree = getTreeByApplicationNameAndVersion(application);
+    const subtypes = Object.keys(tree[type] || {});
+    return subtypes[0];
+};