Merge pull request #81 from Exabyte-io/hotfix/executable

k0stik · web-flow · commit 39d15a191c7b · 2025-08-14T20:36:44.000+03:00
fix: json schema validation
diff --git a/.mocharc.json b/.mocharc.json
@@ -1,5 +1,6 @@
 {
     "extension": ["ts", "js"],
     "spec": "tests/**/*.ts",
-    "require": ["ts-node/register"]
+    "require": ["ts-node/register"],
+    "file": ["tests/js/setup.ts"]
   }
diff --git a/dist/js/applicationMixin.d.ts b/dist/js/applicationMixin.d.ts
@@ -3,6 +3,7 @@ import type { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
 import type { DefaultableInMemoryEntity } from "@mat3ra/code/dist/js/entity/mixins/DefaultableMixin";
 import type { NamedInMemoryEntity } from "@mat3ra/code/dist/js/entity/mixins/NamedEntityMixin";
 import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
+import type { ApplicationSchemaBase } from "@mat3ra/esse/dist/js/types";
 import Executable from "./executable";
 type Base = InMemoryEntity & NamedInMemoryEntity & DefaultableInMemoryEntity;
 export type BaseConstructor = Constructor<Base> & {
@@ -27,7 +28,8 @@ export type ApplicationStaticMixin = {
         summary: string;
         build: string;
     };
+    jsonSchema: ApplicationSchemaBase;
 };
-export declare function applicationMixin(item: Base): Base;
-export declare function applicationStaticMixin<T extends BaseConstructor>(Application: T): ApplicationStaticMixin;
+export declare function applicationMixin(item: Base): void;
+export declare function applicationStaticMixin<T extends BaseConstructor>(Application: T): void;
 export {};
diff --git a/dist/js/applicationMixin.js b/dist/js/applicationMixin.js
@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationMixin = applicationMixin;
 exports.applicationStaticMixin = applicationStaticMixin;
+const JSONSchemasInterface_1 = __importDefault(require("@mat3ra/esse/dist/js/esse/JSONSchemasInterface"));
 function applicationMixin(item) {
     // @ts-expect-error
     const properties = {
@@ -29,7 +33,6 @@ function applicationMixin(item) {
         },
     };
     Object.defineProperties(item, Object.getOwnPropertyDescriptors(properties));
-    return item;
 }
 function applicationStaticMixin(Application) {
     const properties = {
@@ -42,7 +45,9 @@ function applicationStaticMixin(Application) {
                 build: "Default",
             };
         },
+        get jsonSchema() {
+            return JSONSchemasInterface_1.default.getSchemaById("software/application");
+        },
     };
     Object.defineProperties(Application, Object.getOwnPropertyDescriptors(properties));
-    return properties;
 }
diff --git a/dist/js/executable.d.ts b/dist/js/executable.d.ts
@@ -1,7 +1,7 @@
 import { NamedDefaultableInMemoryEntity } from "@mat3ra/code/dist/js/entity";
 import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
 import { type ExecutableMixin } from "./executableMixin";
-type Base = typeof NamedDefaultableInMemoryEntity & Constructor<ExecutableMixin>;
+type Base = Constructor<ExecutableMixin> & typeof NamedDefaultableInMemoryEntity;
 declare const Executable_base: Base;
 export default class Executable extends Executable_base {
 }
diff --git a/dist/js/executable.js b/dist/js/executable.js
@@ -9,3 +9,4 @@ exports.default = Executable;
 // Apply mixins
 (0, RuntimeItemsMixin_1.runtimeItemsMixin)(Executable.prototype);
 (0, executableMixin_1.executableMixin)(Executable.prototype);
+(0, executableMixin_1.executableStaticMixin)(Executable);
diff --git a/dist/js/executableMixin.d.ts b/dist/js/executableMixin.d.ts
@@ -2,14 +2,21 @@ import type { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
 import type { DefaultableInMemoryEntity } from "@mat3ra/code/dist/js/entity/mixins/DefaultableMixin";
 import type { NamedInMemoryEntity } from "@mat3ra/code/dist/js/entity/mixins/NamedEntityMixin";
 import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
+import type { AnyObject } from "@mat3ra/esse/dist/js/esse/types";
+import type { ExecutableSchema } from "@mat3ra/esse/dist/js/types";
 import type { FlavorMixin } from "./flavorMixin";
 type BaseFlavor = FlavorMixin & NamedInMemoryEntity & InMemoryEntity;
 type Base = InMemoryEntity & NamedInMemoryEntity & DefaultableInMemoryEntity;
-export declare function executableMixin(item: Base): Base;
+export declare function executableMixin(item: Base): void;
+export declare function executableStaticMixin(Executable: Constructor<Base>): void;
 export type BaseConstructor = Constructor<Base> & {
     constructCustomFlavor?: (config: object) => BaseFlavor;
 };
 export type ExecutableMixin = {
     applicationId: string[];
+    toJSON: () => ExecutableSchema & AnyObject;
+};
+export type ExecutableStaticMixin = {
+    jsonSchema: ExecutableSchema;
 };
 export {};
diff --git a/dist/js/executableMixin.js b/dist/js/executableMixin.js
@@ -1,6 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executableMixin = executableMixin;
+exports.executableStaticMixin = executableStaticMixin;
+const JSONSchemasInterface_1 = __importDefault(require("@mat3ra/esse/dist/js/esse/JSONSchemasInterface"));
 function executableMixin(item) {
     // @ts-expect-error
     const properties = {
@@ -12,5 +17,12 @@ function executableMixin(item) {
         },
     };
     Object.defineProperties(item, Object.getOwnPropertyDescriptors(properties));
-    return item;
+}
+function executableStaticMixin(Executable) {
+    const properties = {
+        get jsonSchema() {
+            return JSONSchemasInterface_1.default.getSchemaById("software/executable");
+        },
+    };
+    Object.defineProperties(Executable, Object.getOwnPropertyDescriptors(properties));
 }
diff --git a/dist/js/flavor.js b/dist/js/flavor.js
@@ -9,3 +9,4 @@ exports.default = Flavor;
 // Apply mixins
 (0, flavorMixin_1.flavorMixin)(Flavor.prototype);
 (0, RuntimeItemsMixin_1.runtimeItemsMixin)(Flavor.prototype);
+(0, flavorMixin_1.flavorStaticMixin)(Flavor);
diff --git a/dist/js/flavorMixin.d.ts b/dist/js/flavorMixin.d.ts
@@ -1,5 +1,6 @@
 import type { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
 import type { NamedInMemoryEntity } from "@mat3ra/code/dist/js/entity/mixins/NamedEntityMixin";
+import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
 import type { FlavorSchema } from "@mat3ra/esse/dist/js/types";
 type Base = InMemoryEntity & NamedInMemoryEntity;
 type Input = Required<FlavorSchema>["input"];
@@ -13,4 +14,8 @@ export type FlavorMixin = {
     getInputAsRenderedTemplates: (context: Record<string, unknown>) => Record<string, unknown>[];
 };
 export declare function flavorMixin(item: Base): FlavorMixin & InMemoryEntity & NamedInMemoryEntity;
+export declare function flavorStaticMixin(Flavor: Constructor<Base>): void;
+export type FlavorStaticMixin = {
+    jsonSchema: FlavorSchema;
+};
 export {};
diff --git a/dist/js/flavorMixin.js b/dist/js/flavorMixin.js
@@ -1,6 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.flavorMixin = flavorMixin;
+exports.flavorStaticMixin = flavorStaticMixin;
+const JSONSchemasInterface_1 = __importDefault(require("@mat3ra/esse/dist/js/esse/JSONSchemasInterface"));
 // TODO: should we add fields from esse schema (executableId, executableName, applicationName)?
 function flavorMixin(item) {
     // @ts-expect-error
@@ -27,3 +32,11 @@ function flavorMixin(item) {
     Object.defineProperties(item, Object.getOwnPropertyDescriptors(properties));
     return properties;
 }
+function flavorStaticMixin(Flavor) {
+    const properties = {
+        get jsonSchema() {
+            return JSONSchemasInterface_1.default.getSchemaById("software/flavor");
+        },
+    };
+    Object.defineProperties(Flavor, Object.getOwnPropertyDescriptors(properties));
+}
diff --git a/dist/js/templateMixin.d.ts b/dist/js/templateMixin.d.ts
@@ -2,6 +2,7 @@ import type { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
 import type { NamedInMemoryEntity } from "@mat3ra/code/dist/js/entity/mixins/NamedEntityMixin";
 import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
 import type { AnyObject } from "@mat3ra/esse/dist/js/esse/types";
+import type { TemplateSchema } from "@mat3ra/esse/dist/js/types";
 import ContextProvider, { type ContextProviderConfig, type ContextProviderName } from "./context/ContextProvider";
 import ContextProviderRegistryContainer from "./context/ContextProviderRegistryContainer";
 export type TemplateBase = InMemoryEntity & NamedInMemoryEntity;
@@ -33,5 +34,6 @@ export type ContextProviderConfigMap = Partial<Record<ContextProviderName, Conte
 export type TemplateStaticMixin = {
     contextProviderRegistry: ContextProviderRegistryContainer | null;
     setContextProvidersConfig: (classConfigMap: ContextProviderConfigMap) => void;
+    jsonSchema: TemplateSchema;
 };
 export declare function templateStaticMixin(item: Constructor<TemplateBase & TemplateMixin>): TemplateStaticMixin & Constructor<InMemoryEntity & NamedInMemoryEntity & TemplateMixin>;
diff --git a/dist/js/templateMixin.js b/dist/js/templateMixin.js
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.templateMixin = templateMixin;
 exports.templateStaticMixin = templateStaticMixin;
 const utils_1 = require("@mat3ra/code/dist/js/utils");
+const JSONSchemasInterface_1 = __importDefault(require("@mat3ra/esse/dist/js/esse/JSONSchemasInterface"));
 const nunjucks_1 = __importDefault(require("nunjucks"));
 const ContextProviderRegistryContainer_1 = __importDefault(require("./context/ContextProviderRegistryContainer"));
 function templateMixin(item) {
@@ -142,6 +143,9 @@ function templateStaticMixin(item) {
     // @ts-ignore
     const properties = {
         contextProviderRegistry: null,
+        get jsonSchema() {
+            return JSONSchemasInterface_1.default.getSchemaById("software/template");
+        },
         setContextProvidersConfig(classConfigMap) {
             const contextProviderRegistry = new ContextProviderRegistryContainer_1.default();
             Object.entries(classConfigMap).forEach(([name, { providerCls, config }]) => {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,8 +41,8 @@
         "@babel/eslint-parser": "^7.16.3",
         "@exabyte-io/application-flavors.js": "2024.9.8-1",
         "@exabyte-io/eslint-config": "2025.5.13-0",
-        "@mat3ra/code": "2025.7.15-0",
-        "@mat3ra/esse": "2025.7.15-0",
+        "@mat3ra/code": "2025.8.7-0",
+        "@mat3ra/esse": "2025.8.14-0",
         "@mat3ra/made": "2025.7.15-0",
         "@mat3ra/tsconfig": "2024.6.3-0",
         "@types/nunjucks": "^3.2.6",
diff --git a/src/js/applicationMixin.ts b/src/js/applicationMixin.ts
@@ -3,6 +3,8 @@ import type { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
 import type { DefaultableInMemoryEntity } from "@mat3ra/code/dist/js/entity/mixins/DefaultableMixin";
 import type { NamedInMemoryEntity } from "@mat3ra/code/dist/js/entity/mixins/NamedEntityMixin";
 import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
+import JSONSchemasInterface from "@mat3ra/esse/dist/js/esse/JSONSchemasInterface";
+import type { ApplicationSchemaBase } from "@mat3ra/esse/dist/js/types";
 
 import Executable from "./executable";
 
@@ -33,6 +35,7 @@ export type ApplicationStaticMixin = {
         summary: string;
         build: string;
     };
+    jsonSchema: ApplicationSchemaBase;
 };
 
 export function applicationMixin(item: Base) {
@@ -69,8 +72,6 @@ export function applicationMixin(item: Base) {
     };
 
     Object.defineProperties(item, Object.getOwnPropertyDescriptors(properties));
-
-    return item;
 }
 
 export function applicationStaticMixin<T extends BaseConstructor>(Application: T) {
@@ -84,9 +85,12 @@ export function applicationStaticMixin<T extends BaseConstructor>(Application: T
                 build: "Default",
             };
         },
+        get jsonSchema() {
+            return JSONSchemasInterface.getSchemaById(
+                "software/application",
+            ) as ApplicationSchemaBase;
+        },
     };
 
     Object.defineProperties(Application, Object.getOwnPropertyDescriptors(properties));
-
-    return properties;
 }
diff --git a/src/js/executable.ts b/src/js/executable.ts
@@ -2,12 +2,13 @@ import { NamedDefaultableInMemoryEntity } from "@mat3ra/code/dist/js/entity";
 import { runtimeItemsMixin } from "@mat3ra/code/dist/js/entity/mixins/RuntimeItemsMixin";
 import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
 
-import { type ExecutableMixin, executableMixin } from "./executableMixin";
+import { type ExecutableMixin, executableMixin, executableStaticMixin } from "./executableMixin";
 
-type Base = typeof NamedDefaultableInMemoryEntity & Constructor<ExecutableMixin>;
+type Base = Constructor<ExecutableMixin> & typeof NamedDefaultableInMemoryEntity;
 
 export default class Executable extends (NamedDefaultableInMemoryEntity as Base) {}
 
 // Apply mixins
 runtimeItemsMixin(Executable.prototype);
 executableMixin(Executable.prototype);
+executableStaticMixin(Executable);
diff --git a/src/js/executableMixin.ts b/src/js/executableMixin.ts
@@ -2,6 +2,9 @@ import type { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
 import type { DefaultableInMemoryEntity } from "@mat3ra/code/dist/js/entity/mixins/DefaultableMixin";
 import type { NamedInMemoryEntity } from "@mat3ra/code/dist/js/entity/mixins/NamedEntityMixin";
 import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
+import JSONSchemasInterface from "@mat3ra/esse/dist/js/esse/JSONSchemasInterface";
+import type { AnyObject } from "@mat3ra/esse/dist/js/esse/types";
+import type { ExecutableSchema } from "@mat3ra/esse/dist/js/types";
 
 import type { FlavorMixin } from "./flavorMixin";
 
@@ -20,8 +23,16 @@ export function executableMixin(item: Base) {
     };
 
     Object.defineProperties(item, Object.getOwnPropertyDescriptors(properties));
+}
+
+export function executableStaticMixin(Executable: Constructor<Base>) {
+    const properties: ExecutableStaticMixin = {
+        get jsonSchema() {
+            return JSONSchemasInterface.getSchemaById("software/executable") as ExecutableSchema;
+        },
+    };
 
-    return item;
+    Object.defineProperties(Executable, Object.getOwnPropertyDescriptors(properties));
 }
 
 export type BaseConstructor = Constructor<Base> & {
@@ -30,4 +41,9 @@ export type BaseConstructor = Constructor<Base> & {
 
 export type ExecutableMixin = {
     applicationId: string[];
+    toJSON: () => ExecutableSchema & AnyObject;
+};
+
+export type ExecutableStaticMixin = {
+    jsonSchema: ExecutableSchema;
 };
diff --git a/src/js/flavor.ts b/src/js/flavor.ts
@@ -5,7 +5,7 @@ import {
 } from "@mat3ra/code/dist/js/entity/mixins/RuntimeItemsMixin";
 import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
 
-import { type FlavorMixin, flavorMixin } from "./flavorMixin";
+import { type FlavorMixin, flavorMixin, flavorStaticMixin } from "./flavorMixin";
 
 type Base = typeof NamedDefaultableInMemoryEntity &
     Constructor<FlavorMixin> &
@@ -16,3 +16,4 @@ export default class Flavor extends (NamedDefaultableInMemoryEntity as Base) {}
 // Apply mixins
 flavorMixin(Flavor.prototype);
 runtimeItemsMixin(Flavor.prototype);
+flavorStaticMixin(Flavor);
diff --git a/src/js/flavorMixin.ts b/src/js/flavorMixin.ts
@@ -1,5 +1,7 @@
 import type { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
 import type { NamedInMemoryEntity } from "@mat3ra/code/dist/js/entity/mixins/NamedEntityMixin";
+import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
+import JSONSchemasInterface from "@mat3ra/esse/dist/js/esse/JSONSchemasInterface";
 import type { FlavorSchema } from "@mat3ra/esse/dist/js/types";
 
 type Base = InMemoryEntity & NamedInMemoryEntity;
@@ -49,3 +51,17 @@ export function flavorMixin(item: Base) {
 
     return properties;
 }
+
+export function flavorStaticMixin(Flavor: Constructor<Base>) {
+    const properties: FlavorStaticMixin = {
+        get jsonSchema() {
+            return JSONSchemasInterface.getSchemaById("software/flavor") as FlavorSchema;
+        },
+    };
+
+    Object.defineProperties(Flavor, Object.getOwnPropertyDescriptors(properties));
+}
+
+export type FlavorStaticMixin = {
+    jsonSchema: FlavorSchema;
+};
diff --git a/src/js/templateMixin.ts b/src/js/templateMixin.ts
diff --git a/tests/js/executable.test.ts b/tests/js/executable.test.ts
diff --git a/tests/js/flavor.test.ts b/tests/js/flavor.test.ts
diff --git a/tests/js/setup.ts b/tests/js/setup.ts
diff --git a/tests/js/template.test.ts b/tests/js/template.test.ts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"extension": ["ts", "js"],`
`3`	`3`	`"spec": "tests/*/.ts",`
`4`		`- "require": ["ts-node/register"]`
	`4`	`+ "require": ["ts-node/register"],`
	`5`	`+ "file": ["tests/js/setup.ts"]`
`5`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import { NamedDefaultableInMemoryEntity } from "@mat3ra/code/dist/js/entity";`
`2`	`2`	`import type { Constructor } from "@mat3ra/code/dist/js/utils/types";`
`3`	`3`	`import { type ExecutableMixin } from "./executableMixin";`
`4`		`-type Base = typeof NamedDefaultableInMemoryEntity & Constructor<ExecutableMixin>;`
	`4`	`+type Base = Constructor<ExecutableMixin> & typeof NamedDefaultableInMemoryEntity;`
`5`	`5`	`declare const Executable_base: Base;`
`6`	`6`	`export default class Executable extends Executable_base {`
`7`	`7`	`}`