Chore/SOF-6991: MODEL_TREE removal

.babelrc

@@ -9,6 +9,7 @@
             }
         ],
         "@babel/preset-react",
+        "@babel/preset-typescript"
     ],
     "plugins": [
         "@babel/plugin-proposal-class-properties"

.eslintrc.json

@@ -1,4 +1,7 @@
 {
-    "extends": ["@exabyte-io/eslint-config"]
+    "extends": [
+        "@exabyte-io/eslint-config",
+        "plugin:import/typescript"
+    ]
 }
 

.mocharc.json

@@ -0,0 +1,5 @@
+{
+    "extension": ["ts", "js"],
+    "spec": "tests/**/*.test.*",
+    "require": ["ts-node/register"]
+}

package.json

@@ -3,11 +3,11 @@
     "version": "0.0.0",
     "description": "MOdel and method DEfinitions",
     "scripts": {
-        "test": "nyc --reporter=text mocha --recursive --bail --require @babel/register/lib --require tests/setup.js tests",
+        "test": "mocha",
         "lint": "eslint src tests && prettier --write src tests",
         "lint:fix": "eslint --fix --cache src tests && prettier --write src tests",
         "build:assets": "node build_entities.js && node build_filter.js",
-        "transpile": "babel --out-dir dist src",
+        "transpile": "tsc",
         "postinstall": "npm run transpile",
         "prettier": "prettier --check src tests",
         "prepare": "husky install || exit 0"
@@ -23,7 +23,8 @@
         "/src",
         ".babelrc",
         "build_entities.js",
-        "build_filter.js"
+        "build_filter.js",
+        "tsconfig.json"
     ],
     "author": "Exabyte Inc.",
     "bugs": {
@@ -38,46 +39,60 @@
         "@babel/plugin-proposal-class-properties": "7.16.0",
         "@babel/preset-env": "7.16.4",
         "@babel/preset-react": "7.16.7",
+        "@babel/preset-typescript": "^7.22.5",
         "@babel/register": "^7.16.0",
         "@babel/runtime-corejs3": "7.16.8",
         "ajv": "4.1.7",
         "js-yaml": "^4.1.0",
         "lodash": "^4.17.21",
-        "mixwith": "^0.1.1",
         "underscore": "^1.13.3",
         "underscore.string": "^3.3.4"
     },
     "devDependencies": {
-        "@exabyte-io/code.js": "2023.9.14-1",
-        "@exabyte-io/eslint-config": "^2022.11.17-0",
+        "@babel/preset-typescript": "^7.22.5",
+        "@exabyte-io/application-flavors.js": "git+https://github.com/Exabyte-io/application-flavors.git#b3de5b1111d5f1300fe97cd6483265ac28640466",
+        "@exabyte-io/code.js": "git+https://github.com/Exabyte-io/code.js.git#b94c987f98d620790466cefc04ba354395a1c62d",
+        "@exabyte-io/eslint-config": "^2023.8.29-1",
         "@exabyte-io/made.js": "2022.6.15-0",
+        "@types/chai": "^4.3.5",
+        "@types/js-yaml": "^4.0.5",
+        "@types/mocha": "^10.0.1",
+        "@types/node": "^20.4.2",
+        "@types/underscore": "^1.11.6",
+        "@typescript-eslint/eslint-plugin": "^5.56.0",
+        "@typescript-eslint/parser": "^5.56.0",
         "chai": "^4.3.4",
         "eslint": "7.32.0",
         "eslint-config-airbnb": "19.0.2",
         "eslint-config-prettier": "^8.5.0",
         "eslint-import-resolver-exports": "^1.0.0-beta.2",
+        "eslint-import-resolver-typescript": "^3.6.1",
         "eslint-plugin-import": "2.25.3",
         "eslint-plugin-jsdoc": "37.1.0",
         "eslint-plugin-jsx-a11y": "6.5.1",
+        "eslint-plugin-mui-path-imports": "0.0.15",
         "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-react": "7.30.0",
         "eslint-plugin-simple-import-sort": "7.0.0",
         "husky": "^7.0.4",
         "lint-staged": "^12.1.2",
         "mocha": "^9.1.3",
         "nyc": "^15.1.0",
-        "prettier": "^2.7.1"
+        "prettier": "^2.7.1",
+        "ts-node": "^10.9.1",
+        "typescript": "^4.5.5"
     },
     "peerDependencies": {
         "@exabyte-io/ade.js": "*",
+        "@exabyte-io/application-flavors.js": "*",
         "@exabyte-io/code.js": "*",
         "@exabyte-io/made.js": "*"
     },
     "engines": {
         "node": ">=12.0.0"
     },
     "lint-staged": {
-        "*.js": "eslint --cache --fix",
-        "*.{js,css}": "prettier --write"
+        "*.{js,ts}": "eslint --cache --fix",
+        "*.{js,ts,css}": "prettier --write"
     }
 }

src/default_methods.ts

@@ -0,0 +1,20 @@
+import {
+    LegacyMethodLocalorbital,
+    LegacyMethodPseudopotential,
+    LegacyMethodUnknown,
+} from "@exabyte-io/code.js/dist/types";
+
+export const PseudopotentialMethodConfig: LegacyMethodPseudopotential = {
+    type: "pseudopotential",
+    subtype: "us",
+};
+
+export const LocalOrbitalMethodConfig: LegacyMethodLocalorbital = {
+    type: "localorbital",
+    subtype: "pople",
+};
+
+export const UnknownMethodConfig: LegacyMethodUnknown = {
+    type: "unknown",
+    subtype: "unknown",
+};

src/default_models.ts

@@ -0,0 +1,14 @@
+import {
+    LegacyModelDensityFunctionalTheory,
+    LegacyModelUnknown,
+} from "@exabyte-io/code.js/dist/types";
+
+export const DFTModelConfig: Omit<LegacyModelDensityFunctionalTheory, "method"> = {
+    type: "dft",
+    subtype: "gga",
+};
+
+export const UnknownModelConfig: Omit<LegacyModelUnknown, "method"> = {
+    type: "unknown",
+    subtype: "unknown",
+};

src/filter.js

@@ -0,0 +1,62 @@
+import { filterEntityList, mergeTerminalNodes } from "@exabyte-io/code.js/dist/utils";
+import lodash from "lodash";
+
+import modelMethodMap from "./data/model_method_map";
+
+function safelyGet(obj, ...args) {
+    return lodash.get(obj, args, undefined);
+}
+
+/**
+ * Create list of filter objects based on model categories.
+ * @param {Object} filterTree - filter tree constructed from assets
+ * @param {string} tier1 - Level 1 tier
+ * @param {string} tier2 - Level 2 tier
+ * @param {string} tier3 - Level 3 tier
+ * @param {string} type - Type
+ * @param {string} subtype - Subtype
+ * @return {*[]}
+ */
+function getMethodFilterObjects({ filterTree, tier1, tier2, tier3, type, subtype }) {
+    let filterList;
+    if (!tier1) {
+        filterList = mergeTerminalNodes(filterTree);
+    } else if (!tier2) {
+        filterList = mergeTerminalNodes(safelyGet(filterTree, tier1));
+    } else if (!tier3) {
+        filterList = mergeTerminalNodes(safelyGet(filterTree, tier1, tier2));
+    } else if (!type) {
+        filterList = mergeTerminalNodes(safelyGet(filterTree, tier1, tier2, tier3));
+    } else if (!subtype) {
+        filterList = mergeTerminalNodes(safelyGet(filterTree, tier1, tier2, tier3, type));
+    } else {
+        filterList = safelyGet(filterTree, tier1, tier2, tier3, type, subtype);
+    }
+    const extractUniqueBy = (name) => {
+        return lodash
+            .chain(filterList)
+            .filter(Boolean)
+            .filter((o) => Boolean(o[name]))
+            .uniqBy(name)
+            .value();
+    };
+
+    return [].concat(extractUniqueBy("path"), extractUniqueBy("regex"));
+}
+
+/**
+ * Filter list of method configs based on model
+ * @param {Object[]} methodList - Array of method configs
+ * @param {Object} model - Model config for which methods should be filtered
+ * @return {Object[]}
+ */
+export function filterMethodsByModel({ methodList, model }) {
+    if (!model) return [];
+    const { categories } = model;
+    const filterObjects = getMethodFilterObjects({ filterTree: modelMethodMap, ...categories });
+    return filterEntityList({
+        entitiesOrPaths: methodList,
+        filterObjects,
+        multiPathSeparator: "::",
+    });
+}

src/method.js

@@ -1,10 +1,11 @@
-import { InMemoryEntity } from "@exabyte-io/code.js/dist/entity";
+import { DefaultableInMemoryEntity } from "@exabyte-io/code.js/dist/entity";
 import { deepClone } from "@exabyte-io/code.js/dist/utils";
-import lodash from "lodash";
+import isEmpty from "lodash/isEmpty";
+import omit from "lodash/omit";
 
 import { PseudopotentialMethodConfig } from "./default_methods";
 
-export class Method extends InMemoryEntity {
+export class Method extends DefaultableInMemoryEntity {
     constructor(config) {
         const data = config.data || {};
         super({ ...config, data });
@@ -57,7 +58,7 @@ export class Method extends InMemoryEntity {
 
     get omitInHashCalculation() {
         const data = this.prop("data");
-        return !data.searchText && lodash.isEmpty(lodash.omit(data, "searchText"));
+        return !data.searchText && isEmpty(omit(data, "searchText"));
     }
 
     // data without client-only fields

src/methods/pseudopotential.js

@@ -1,5 +1,5 @@
 import { safeMakeArray } from "@exabyte-io/code.js/dist/utils";
-import _ from "underscore";
+import sortBy from "lodash/sortBy";
 
 import { Method } from "../method";
 
@@ -71,7 +71,7 @@ export class PseudopotentialMethod extends Method {
         // sort by alphabetical order to ensure elements order consistency in VASP POSCAR/POTCAR
         this.setData({
             ...this.data,
-            pseudo: _.sortBy(pseudopotentials, "element").map((x) => x.toJSON()),
+            pseudo: sortBy(pseudopotentials, ["element"]).map((x) => x.toJSON()),
         });
     }
 
@@ -82,7 +82,7 @@ export class PseudopotentialMethod extends Method {
         // sort by alphabetical order to ensure elements order consistency in VASP POSCAR/POTCAR
         this.setData({
             ...this.data,
-            allPseudo: _.sortBy(pseudopotentials, "element").map((x) => x.toJSON()),
+            allPseudo: sortBy(pseudopotentials, ["element"]).map((x) => x.toJSON()),
         });
     }