Skip to content

Commit 291051e

Browse files
committed
chore: new application schema
1 parent ffa43e2 commit 291051e

File tree

9 files changed

+31
-36
lines changed

9 files changed

+31
-36
lines changed

dist/js/ApplicationRegistry.d.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import type { ApplicationSchemaBase, TemplateSchema } from "@mat3ra/esse/dist/js/types";
1+
import type { ApplicationSchema, TemplateSchema } from "@mat3ra/esse/dist/js/types";
22
import Application from "./Application";
33
import Executable from "./Executable";
44
import Flavor from "./Flavor";
55
import Template from "./Template";
66
type ApplicationVersion = {
7-
[build: string]: ApplicationSchemaBase;
7+
[build: string]: ApplicationSchema;
88
};
99
type ApplicationTreeItem = {
1010
defaultVersion: string;
@@ -18,7 +18,7 @@ export type CreateApplicationConfig = {
1818
type ApplicationTree = Partial<Record<string, ApplicationTreeItem>>;
1919
export default class ApplicationRegistry {
2020
static applicationsTree?: ApplicationTree;
21-
static applicationsArray?: ApplicationSchemaBase[];
21+
static applicationsArray?: ApplicationSchema[];
2222
static createApplication({ name, version, build }: CreateApplicationConfig): Application;
2323
static getUniqueAvailableApplicationNames(): string[];
2424
/**
@@ -27,7 +27,7 @@ export default class ApplicationRegistry {
2727
*/
2828
static getAllApplications(): {
2929
applicationsTree: Partial<Record<string, ApplicationTreeItem>>;
30-
applicationsArray: ApplicationSchemaBase[];
30+
applicationsArray: ApplicationSchema[];
3131
};
3232
/**
3333
* @summary Get an application from the constructed applications
@@ -36,7 +36,7 @@ export default class ApplicationRegistry {
3636
* @param build the build to use (optional, defaults to Default)
3737
* @return an application
3838
*/
39-
static getApplicationConfig({ name, version, build }: CreateApplicationConfig): ApplicationSchemaBase | null;
39+
static getApplicationConfig({ name, version, build }: CreateApplicationConfig): ApplicationSchema | null;
4040
static getExecutables({ name, version }: {
4141
name: string;
4242
version?: string;

dist/js/application.d.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ import { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
22
import { type DefaultableInMemoryEntityConstructor } from "@mat3ra/code/dist/js/entity/mixins/DefaultableMixin";
33
import { type NamedInMemoryEntityConstructor } from "@mat3ra/code/dist/js/entity/mixins/NamedEntityMixin";
44
import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
5-
import type { ApplicationSchemaBase } from "@mat3ra/esse/dist/js/types";
5+
import type { ApplicationSchema } from "@mat3ra/esse/dist/js/types";
66
import { type ApplicationMixin, type ApplicationStaticMixin } from "./applicationMixin";
77
type Base = typeof InMemoryEntity & NamedInMemoryEntityConstructor & DefaultableInMemoryEntityConstructor & Constructor<ApplicationMixin> & ApplicationStaticMixin;
88
declare const Application_base: Base;
9-
export default class Application extends Application_base implements ApplicationSchemaBase {
10-
constructor(data?: Partial<ApplicationSchemaBase>);
11-
[k: string]: unknown;
9+
export default class Application extends Application_base implements ApplicationSchema {
10+
constructor(data?: Partial<ApplicationSchema>);
1211
}
1312
export {};

dist/js/applicationMixin.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ import type { InMemoryEntity } from "@mat3ra/code/dist/js/entity";
22
import type { Defaultable } from "@mat3ra/code/dist/js/entity/mixins/DefaultableMixin";
33
import type { NamedEntity } from "@mat3ra/code/dist/js/entity/mixins/NamedEntityMixin";
44
import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
5-
import type { ApplicationSchemaBase } from "@mat3ra/esse/dist/js/types";
5+
import type { ApplicationSchema } from "@mat3ra/esse/dist/js/types";
66
import Executable from "./Executable";
77
import { type ApplicationSchemaMixin } from "./generated/ApplicationSchemaMixin";
88
type Base = InMemoryEntity & NamedEntity & Defaultable;
99
export type BaseConstructor = Constructor<Base> & {
1010
constructCustomExecutable?: (config: object) => Executable;
1111
};
1212
export type ApplicationMixin = ApplicationSchemaMixin & {
13-
name: Required<ApplicationSchemaBase>["name"];
13+
name: Required<ApplicationSchema>["name"];
1414
isUsingMaterial: boolean;
1515
};
16-
export type DefaultApplicationConfig = Pick<ApplicationSchemaBase, "name" | "shortName" | "version" | "summary" | "build">;
16+
export type DefaultApplicationConfig = Pick<ApplicationSchema, "name" | "shortName" | "version" | "summary" | "build">;
1717
export type ApplicationStaticMixin = {
1818
defaultConfig: DefaultApplicationConfig;
19-
jsonSchema: ApplicationSchemaBase;
19+
jsonSchema: ApplicationSchema;
2020
};
2121
export declare function applicationMixin(Item: BaseConstructor): void;
2222
export {};

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@exabyte-io/eslint-config": "2025.5.13-0",
5151
"@mat3ra/utils": "2025.9.20-0",
5252
"@mat3ra/code": "git+https://github.com/Exabyte-io/code.git#cf4115b459e7d308e708b606adfca7918185e525",
53-
"@mat3ra/esse": "git+https://github.com/Exabyte-io/esse#9216482d292bbd1a679c02d167fe676f9d7b7cf4",
53+
"@mat3ra/esse": "git+https://github.com/Exabyte-io/esse#dfa3f260d19cea3a07aac1278bcebd59d242e346",
5454
"@mat3ra/made": "2025.7.15-0",
5555
"@mat3ra/standata": "2025.10.1-0",
5656
"@mat3ra/tsconfig": "2024.6.3-0",

src/js/Application.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
namedEntityMixin,
99
} from "@mat3ra/code/dist/js/entity/mixins/NamedEntityMixin";
1010
import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
11-
import type { ApplicationSchemaBase } from "@mat3ra/esse/dist/js/types";
11+
import type { ApplicationSchema } from "@mat3ra/esse/dist/js/types";
1212

1313
import {
1414
type ApplicationMixin,
@@ -22,14 +22,12 @@ type Base = typeof InMemoryEntity &
2222
Constructor<ApplicationMixin> &
2323
ApplicationStaticMixin;
2424

25-
export default class Application extends (InMemoryEntity as Base) implements ApplicationSchemaBase {
26-
constructor(data: Partial<ApplicationSchemaBase> = {}) {
25+
export default class Application extends (InMemoryEntity as Base) implements ApplicationSchema {
26+
constructor(data: Partial<ApplicationSchema> = {}) {
2727
super({
2828
...data,
2929
});
3030
}
31-
32-
[k: string]: unknown;
3331
}
3432

3533
namedEntityMixin(Application.prototype);

src/js/ApplicationRegistry.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { getOneMatchFromObject } from "@mat3ra/code/dist/js/utils/object";
22
import type {
3-
ApplicationSchemaBase,
3+
ApplicationSchema,
44
ExecutableSchema,
55
TemplateSchema,
66
} from "@mat3ra/esse/dist/js/types";
@@ -12,7 +12,7 @@ import Flavor from "./Flavor";
1212
import Template from "./Template";
1313

1414
type ApplicationVersion = {
15-
[build: string]: ApplicationSchemaBase;
15+
[build: string]: ApplicationSchema;
1616
};
1717

1818
type ApplicationTreeItem = {
@@ -32,7 +32,7 @@ export default class ApplicationRegistry {
3232
// applications
3333
static applicationsTree?: ApplicationTree;
3434

35-
static applicationsArray?: ApplicationSchemaBase[];
35+
static applicationsArray?: ApplicationSchema[];
3636

3737
static createApplication({ name, version = null, build = null }: CreateApplicationConfig) {
3838
const staticConfig = ApplicationRegistry.getApplicationConfig({ name, version, build });
@@ -61,7 +61,7 @@ export default class ApplicationRegistry {
6161
}
6262

6363
const applicationsTree: ApplicationTree = {};
64-
const applicationsArray: ApplicationSchemaBase[] = [];
64+
const applicationsArray: ApplicationSchema[] = [];
6565

6666
const allApplications = new ApplicationStandata().getAllApplicationNames();
6767
allApplications.forEach((appName) => {
@@ -89,7 +89,7 @@ export default class ApplicationRegistry {
8989

9090
appTreeItem[version] = appVersion;
9191

92-
const applicationConfig: ApplicationSchemaBase = {
92+
const applicationConfig: ApplicationSchema = {
9393
...appData,
9494
// @ts-ignore
9595
build: buildToUse,

src/js/applicationMixin.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { Defaultable } from "@mat3ra/code/dist/js/entity/mixins/Defaultable
33
import type { NamedEntity } from "@mat3ra/code/dist/js/entity/mixins/NamedEntityMixin";
44
import type { Constructor } from "@mat3ra/code/dist/js/utils/types";
55
import JSONSchemasInterface from "@mat3ra/esse/dist/js/esse/JSONSchemasInterface";
6-
import type { ApplicationSchemaBase } from "@mat3ra/esse/dist/js/types";
6+
import type { ApplicationSchema } from "@mat3ra/esse/dist/js/types";
77
import { ApplicationStandata } from "@mat3ra/standata";
88

99
import Executable from "./Executable";
@@ -19,18 +19,18 @@ export type BaseConstructor = Constructor<Base> & {
1919
};
2020

2121
export type ApplicationMixin = ApplicationSchemaMixin & {
22-
name: Required<ApplicationSchemaBase>["name"];
22+
name: Required<ApplicationSchema>["name"];
2323
isUsingMaterial: boolean;
2424
};
2525

2626
export type DefaultApplicationConfig = Pick<
27-
ApplicationSchemaBase,
27+
ApplicationSchema,
2828
"name" | "shortName" | "version" | "summary" | "build"
2929
>;
3030

3131
export type ApplicationStaticMixin = {
3232
defaultConfig: DefaultApplicationConfig;
33-
jsonSchema: ApplicationSchemaBase;
33+
jsonSchema: ApplicationSchema;
3434
};
3535

3636
function applicationPropertiesMixin<T extends InMemoryEntity>(
@@ -53,9 +53,7 @@ function applicationStaticMixin<T extends BaseConstructor>(Application: T) {
5353
return new ApplicationStandata().getDefaultConfig();
5454
},
5555
get jsonSchema() {
56-
return JSONSchemasInterface.getSchemaById(
57-
"software/application",
58-
) as ApplicationSchemaBase;
56+
return JSONSchemasInterface.getSchemaById("software/application") as ApplicationSchema;
5957
},
6058
};
6159

src/py/mat3ra/ade/application.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from mat3ra.code.entity import InMemoryEntitySnakeCase
2-
from mat3ra.esse.models.software.application import ApplicationSchemaBase
2+
from mat3ra.esse.models.software.application import ApplicationSchema
33

44

5-
class Application(ApplicationSchemaBase, InMemoryEntitySnakeCase):
5+
class Application(ApplicationSchema, InMemoryEntitySnakeCase):
66
"""
77
Application class representing a software application.
88

0 commit comments

Comments
 (0)