update: merge latest main

Author: unsigned6

package-lock.json

@@ -56,7 +56,7 @@
         "@babel/preset-react": "7.16.7",
         "@babel/register": "^7.16.0",
         "@babel/runtime-corejs3": "7.16.8",
-        "@exabyte-io/esse.js": "git+https://github.com/Exabyte-io/esse.git#update/SOF-6668",
+        "@exabyte-io/esse.js": "2023.8.31-0",
         "@types/chai": "^4.3.5",
         "@types/crypto-js": "^4.1.1",
         "@types/js-yaml": "^4.0.5",
@@ -77,6 +77,7 @@
         "mixwith": "^0.1.1",
         "nunjucks": "^3.2.4",
         "react-jsonschema-form": "^1.8.1",
+        "semver": "^7.5.3",
         "ts-node": "^10.9.1",
         "typescript": "^4.5.5",
         "underscore": "^1.13.3",

package.json

@@ -78,7 +78,7 @@ export class JSONSchemasInterface {
 
     /**
      *
-     * @param {Object} - external schema
+     * @param globalSchema
      */
     static registerGlobalSchema(globalSchema: JSONSchema) {
         if (JSONSchemasInterface._schema === globalSchema) {
@@ -159,4 +159,14 @@ export class JSONSchemasInterface {
         }
         return ajv.compile(schema);
     }
+
+    /**
+     * Register global schema only if none has been registered yet.
+     * @param globalSchema
+     */
+    static registerGlobalSchemaIfEmpty(globalSchema: JSONSchema) {
+        if (!JSONSchemasInterface._schema) {
+            JSONSchemasInterface.registerGlobalSchema(globalSchema);
+        }
+    }
 }

src/JSONSchemasInterface.ts

@@ -46,13 +46,27 @@ export class ContextProviderRegistryContainer {
  * };
  *
  */
-export const extendAndPatchRegistry = (registryContainer, classConfigMap, classesToPatch = {}) => {
+export const extendAndPatchRegistry = (
+    registryContainer,
+    classConfigMap,
+    classesToPatch = {},
+    defaultSettings = {},
+) => {
     Object.entries(classConfigMap).forEach(([name, { providerCls, config }]) => {
         Object.entries(classesToPatch).forEach(([clsName, cls]) => {
             if (providerCls[clsName]) {
                 providerCls[clsName] = cls;
             }
+            const providerDefaultSettings = defaultSettings[providerCls.name];
+            if (providerDefaultSettings) {
+                Object.entries(providerDefaultSettings).forEach(([key, value]) => {
+                    if (providerCls[key]) {
+                        providerCls[key] = value;
+                    }
+                });
+            }
         });
+
         registryContainer.addProvider({
             instance: providerCls.getConstructorConfig(config),
             name,
@@ -66,7 +80,16 @@ export const extendAndPatchRegistry = (registryContainer, classConfigMap, classe
  * @param {Object} classConfigMap
  * @param {{Material: SpecificMockMaterial}} classesToPatch
  */
-export const createAndPatchRegistry = (classConfigMap, classesToPatch = {}) => {
+export const createAndPatchRegistry = (
+    classConfigMap,
+    classesToPatch = {},
+    defaultSettings = {},
+) => {
     const registryContainer = new ContextProviderRegistryContainer();
-    return extendAndPatchRegistry(registryContainer, classConfigMap, classesToPatch);
+    return extendAndPatchRegistry(
+        registryContainer,
+        classConfigMap,
+        classesToPatch,
+        defaultSettings,
+    );
 };

src/context/registry.js

@@ -7,6 +7,7 @@ import {
     DefaultableMixin,
     HasDescriptionMixin,
     HasMetadataMixin,
+    HasScopeTrackMixin,
     NamedEntityMixin,
     TaggableMixin,
 } from "./mixins/props";
@@ -43,6 +44,7 @@ export {
     HasDescriptionMixin,
     HasMetadataMixin,
     TaggableMixin,
+    HasScopeTrackMixin,
     NamedEntityMixin,
     RuntimeItemsMixin,
     RuntimeContextFieldMixin,

src/entity/index.ts

@@ -11,10 +11,6 @@ export function DefaultableMixin<T extends InMemoryEntityConstructor>(superclass
 
         declare static readonly defaultConfig: object | null;
 
-        // Define in superclass
-        // static get defaultConfig() {
-        // }
-
         static createDefault() {
             return new this.prototype.constructor(this.defaultConfig);
         }
@@ -38,6 +34,18 @@ export function TaggableMixin<T extends InMemoryEntityConstructor>(superclass: T
     };
 }
 
+export function HasScopeTrackMixin<T extends InMemoryEntityConstructor>(superclass: T) {
+    return class extends superclass {
+        get scopeTrack() {
+            return this.prop("scopeTrack", []);
+        }
+
+        set scopeTrack(array: unknown[]) {
+            this.setProp("scopeTrack", array);
+        }
+    };
+}
+
 export function HasMetadataMixin<T extends InMemoryEntityConstructor>(superclass: T) {
     return class extends superclass {
         get metadata(): object {

src/entity/mixins/props.ts

@@ -6,7 +6,7 @@ interface PathObject {
 }
 
 // Filter conditions
-interface FilterObject {
+export interface FilterObject {
     path?: string;
     regex?: RegExp;
 }
@@ -57,6 +57,7 @@ export function filterEntityList({
     filterObjects = [],
     multiPathSeparator = "",
 }: FilterEntityListProps) {
+    if (!filterObjects || !filterObjects.length) return [];
     const filterObjects_ = filterObjects.map((o) => (o.regex ? { regex: new RegExp(o.regex) } : o));
 
     let filtered;

src/utils/filter.ts

@@ -27,10 +27,11 @@ import {
     sortKeysDeepForObject,
     stringifyObject,
 } from "./object";
-import { getSchemaWithDependencies } from "./schemas";
+import { getSchemaWithDependencies, buildNamedEntitySchema } from "./schemas";
 import { getSearchQuerySelector } from "./selector";
 import {
     convertArabicToRoman,
+    findPreviousVersion,
     randomAlphanumeric,
     removeCommentsFromSourceCode,
     removeEmptyLinesFromString,
@@ -89,4 +90,6 @@ export {
     getFilesInDirectory,
     getDirectories,
     createObjectPathFromFilePath,
+    buildNamedEntitySchema,
+    findPreviousVersion,
 };

src/utils/index.ts

@@ -10,6 +10,7 @@ import omit from "lodash/omit";
 
 import { AnyObject } from "../entity/in_memory";
 import { NameResultSchema } from "../types";
+import { safeMakeArray } from "./array";
 import { deepClone } from "./clone";
 
 /**
@@ -248,6 +249,7 @@ function isTreeObject<T>(value: unknown): value is Tree<T> {
  * mergeTerminalNodes(tree); // ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l']
  */
 export function mergeTerminalNodes<T = string>(tree: Tree<T>, unique = false): T[] {
+    if (!isTreeObject<T>(tree)) return safeMakeArray(tree);
     const terminalValues = Object.values(tree).reduce((accumulator: T[], value) => {
         if (isTreeObject<T>(value)) {
             return accumulator.concat(mergeTerminalNodes(value));