🦄 refactor: add IApplication

Add the IApplication interface and refactor the Application

package.json

@@ -30,10 +30,8 @@
         "lint-staged": "^13.2.2",
         "nanoid": "^4.0.2",
         "prettier": "^2.8.8",
-        "reflect-metadata": "^0.1.13",
         "simple-git-hooks": "^2.8.1",
         "ts-jest": "^29.1.0",
-        "tsyringe": "^4.7.0",
         "typescript": "^5.1.3",
         "typescript-plugin-css-modules": "^5.0.1"
     }

packages/chili-core/src/application.ts

@@ -0,0 +1,18 @@
+// Copyright 2022-2023 the Chili authors. All rights reserved. MPL-2.0 license.
+
+import { IShapeFactory } from "chili-geo";
+import { IVisualFactory } from "chili-vis";
+import { IStorage, Serialized } from "./base";
+import { IDocument } from "./document";
+import { IService } from "./service";
+
+export interface IApplication {
+    readonly visualFactory: IVisualFactory;
+    readonly shapeFactory: IShapeFactory;
+    readonly services: IService[];
+    readonly storage: IStorage;
+    activeDocument: IDocument | undefined;
+    newDocument(name: string): Promise<IDocument>;
+    openDocument(id: string): Promise<IDocument | undefined>;
+    loadDocument(data: Serialized): Promise<IDocument>;
+}

packages/chili-core/src/base/pubsub.ts

@@ -16,7 +16,6 @@ export interface PubSubEventMap {
     executeCommand: (commandName: keyof Commands) => void;
     nodeLinkedListChanged: (records: NodeRecord[]) => void;
     activeDocumentChanged: (document: IDocument | undefined) => void;
-    openDocument: (id: string) => void;
     documentClosed: (document: IDocument) => void;
     modelUpdate: (model: IModel) => void;
     visibleChanged: (model: IModel) => void;

packages/chili-core/src/command/command.ts

@@ -1,7 +1,7 @@
 // Copyright 2022-2023 the Chili authors. All rights reserved. MPL-2.0 license.
 
-import { Application } from "chili/src/application";
+import { IApplication } from "../application";
 
 export interface ICommand {
-    execute(application: Application): Promise<void>;
+    execute(application: IApplication): Promise<void>;
 }

packages/chili-core/src/command/commands.ts

@@ -21,14 +21,4 @@ export class Commands {
     Mirror = "Mirror";
     Rotate = "Rotate";
     Array = "Array";
-
-    private constructor() {}
-
-    private static _instance: Commands | undefined;
-    static get instance() {
-        if (this._instance === undefined) {
-            this._instance = new Commands();
-        }
-        return this._instance;
-    }
 }

packages/chili-core/src/decorators/command.ts

@@ -5,6 +5,8 @@ import { I18n } from "../i18n";
 
 const CommandMap = new Map<string, new (...args: any[]) => ICommand>();
 
+export type CommandConstructor = new (...args: any[]) => ICommand;
+
 export interface CommandData {
     name: keyof Commands;
     display: keyof I18n;
@@ -13,17 +15,15 @@ export interface CommandData {
     helpUrl?: string;
 }
 
-export function command<T extends new (...args: any[]) => ICommand>(commandData: CommandData) {
+export function command<T extends CommandConstructor>(commandData: CommandData) {
     return (ctor: T) => {
         CommandMap.set(commandData.name, ctor);
         ctor.prototype.data = commandData;
     };
 }
 
-export namespace CommandData {
-    export function get(
-        command: string | ICommand | (new (...args: any[]) => ICommand)
-    ): CommandData | undefined {
+export namespace Command {
+    export function getData(command: string | ICommand | CommandConstructor): CommandData | undefined {
         if (typeof command === "string") {
             let c = CommandMap.get(command);
             return c?.prototype.data;
@@ -33,4 +33,8 @@ export namespace CommandData {
             return Object.getPrototypeOf(command).data;
         }
     }
+
+    export function get(name: keyof Commands): CommandConstructor | undefined {
+        return CommandMap.get(name);
+    }
 }

packages/chili-core/src/document.ts

@@ -1,5 +1,6 @@
 // Copyright 2022-2023 the Chili authors. All rights reserved. MPL-2.0 license.
 
+import { IApplication } from "./application";
 import { History, IDisposable, IPropertyChanged } from "./base";
 import { INode, INodeLinkedList } from "./model/node";
 import { SelectionManager } from "./selectionManager";
@@ -13,6 +14,7 @@ export interface IDocument extends IPropertyChanged, IDisposable {
     readonly history: History;
     readonly visual: IVisual;
     readonly rootNode: INodeLinkedList;
+    readonly application: IApplication;
     addNode(...nodes: INode[]): void;
     save(): Promise<void>;
     close(): Promise<void>;

packages/chili-core/src/index.ts

@@ -1,5 +1,6 @@
 // Copyright 2022-2023 the Chili authors. All rights reserved. MPL-2.0 license.
 
+export * from "./application";
 export * from "./base";
 export * from "./command";
 export * from "./config";
@@ -12,10 +13,8 @@ export * from "./editor";
 export * from "./geometry";
 export * from "./i18n";
 export * from "./id";
-export * from "./ioc";
 export * from "./math";
 export * from "./model";
-export * from "./module";
 export * from "./selectionManager";
 export * from "./service";
 export * from "./snapType";

packages/chili-core/src/service.ts

@@ -1,9 +1,9 @@
 // Copyright 2022-2023 the Chili authors. All rights reserved. MPL-2.0 license.
 
-import { Application } from "chili/src/application";
+import { IApplication } from "./application";
 
 export interface IService {
-    register(app: Application): void;
+    register(app: IApplication): void;
     start(): void;
     stop(): void;
 }

packages/chili-core/test/collection.test.ts

@@ -1,5 +1,4 @@
 // Copyright 2022-2023 the Chili authors. All rights reserved. MPL-2.0 license.
-import "reflect-metadata";
 import { CollectionAction, CollectionChangedArgs, ObservableCollection } from "../src";
 
 describe("ObservableCollection test", () => {
@@ -44,7 +43,7 @@ describe("ObservableCollection test", () => {
                 expect(collection.items).toStrictEqual([1, 3, 2, 3]);
                 expect(arg.items).toStrictEqual([3, 2]);
                 expect(arg.items.length).toBe(2);
-                expect(arg.item).toBe(1);
+                expect(arg.item).toBe(2);
             }
         });
         collection.replace(1, 3, 2);

packages/chili-core/test/converter.test.ts

@@ -1,7 +1,5 @@
 // Copyright 2022-2023 the Chili authors. All rights reserved. MPL-2.0 license.
 
-import "reflect-metadata";
-
 import { XYZ } from "../src";
 import { IConverter, NumberConverter, StringConverter, XYZConverter } from "../src/converter";
 

packages/chili-core/test/history.test.ts

@@ -1,8 +1,6 @@
 // Copyright 2022-2023 the Chili authors. All rights reserved. MPL-2.0 license.
 
-import "reflect-metadata";
-
-import { ArrayRecord, PropertyHistoryRecord, History } from "chili-core";
+import { ArrayRecord, History, PropertyHistoryRecord } from "chili-core";
 
 describe("test history", () => {
     class TestClass {