@flashist/appframework 0.0.48 → 0.0.50-appStorage.1

package/app/AppModule.d.ts

@@ -1,5 +1,4 @@
 import { BaseAppModule } from "../base/modules/BaseAppModule";
 export declare class AppModule extends BaseAppModule {
     init(): void;
-    activateCompleteHook(): void;
 }

package/app/AppModule.js

@@ -13,11 +13,11 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { GenericObjectsByTypeModel, getInstance, serviceLocatorAdd } from "@flashist/flibs";
+import { serviceLocatorAdd } from "@flashist/flibs";
 import { BaseAppModule } from "../base/modules/BaseAppModule";
-import { AppModel } from "./models/AppModel";
-import { AppConfigModel } from "./models/AppConfigModel";
 import { AppManager } from "./managers/AppManager";
+import { AppModuleInitialState } from "./data/state/AppModuleState";
+import { appStorage } from "../state/AppStateModule";
 var AppModule = /** @class */ (function (_super) {
     __extends(AppModule, _super);
     function AppModule() {
@@ -25,16 +25,10 @@ var AppModule = /** @class */ (function (_super) {
     }
     AppModule.prototype.init = function () {
         _super.prototype.init.call(this);
-        serviceLocatorAdd(AppModel, { isSingleton: true });
-        serviceLocatorAdd(AppConfigModel, { isSingleton: true });
+        // Init the app with initial state
+        appStorage().initializeWith(AppModuleInitialState);
         serviceLocatorAdd(AppManager, { isSingleton: true, forceCreation: true });
     };
-    AppModule.prototype.activateCompleteHook = function () {
-        _super.prototype.activateCompleteHook.call(this);
-        var genericObjectsByTypeModel = getInstance(GenericObjectsByTypeModel);
-        var model = getInstance(AppConfigModel);
-        genericObjectsByTypeModel.mapModelToType(model, model.itemsType);
-    };
     return AppModule;
 }(BaseAppModule));
 export { AppModule };

package/app/AppModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"AppModule.js","sourceRoot":"","sources":["../../src/app/AppModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAC,yBAAyB,EAAE,WAAW,EAAE,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAE1F,OAAO,EAAC,aAAa,EAAC,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD;IAA+B,6BAAa;IAA5C;;IAkBA,CAAC;IAhBG,wBAAI,GAAJ;QACI,iBAAM,IAAI,WAAE,CAAC;QAEb,iBAAiB,CAAC,QAAQ,EAAE,EAAC,WAAW,EAAE,IAAI,EAAC,CAAC,CAAC;QACjD,iBAAiB,CAAC,cAAc,EAAE,EAAC,WAAW,EAAE,IAAI,EAAC,CAAC,CAAC;QAEvD,iBAAiB,CAAC,UAAU,EAAE,EAAC,WAAW,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAC,CAAC,CAAC;IAC5E,CAAC;IAED,wCAAoB,GAApB;QACI,iBAAM,oBAAoB,WAAE,CAAC;QAE7B,IAAM,yBAAyB,GAA8B,WAAW,CAAC,yBAAyB,CAAC,CAAC;QACpG,IAAM,KAAK,GAAmB,WAAW,CAAC,cAAc,CAAC,CAAC;QAC1D,yBAAyB,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACrE,CAAC;IACL,gBAAC;AAAD,CAAC,AAlBD,CAA+B,aAAa,GAkB3C"}
+{"version":3,"file":"AppModule.js","sourceRoot":"","sources":["../../src/app/AppModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD;IAA+B,6BAAa;IAA5C;;IAWA,CAAC;IATG,wBAAI,GAAJ;QACI,iBAAM,IAAI,WAAE,CAAC;QAGb,kCAAkC;QAClC,UAAU,EAAE,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;QAEnD,iBAAiB,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9E,CAAC;IACL,gBAAC;AAAD,CAAC,AAXD,CAA+B,aAAa,GAW3C"}

package/app/commands/LoadAppConfigCommand.js

@@ -14,10 +14,10 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 import { CommandErrorCode } from "@flashist/fcore";
-import { GenericObjectsByTypeModel, getInstance, LoadItemCommand, LoadItemsListCommand, LoadManager } from "@flashist/flibs";
-import { AppConfigModel } from "../models/AppConfigModel";
+import { getInstance, LoadItemCommand, LoadItemsListCommand, LoadManager } from "@flashist/flibs";
 import { BaseAppCommand } from "../../base/commands/BaseAppCommand";
 import { AppSettings } from "../AppSettings";
+import { appStorage } from "../../state/AppStateModule";
 var LoadAppConfigCommand = /** @class */ (function (_super) {
     __extends(LoadAppConfigCommand, _super);
     function LoadAppConfigCommand() {
@@ -25,7 +25,7 @@ var LoadAppConfigCommand = /** @class */ (function (_super) {
     }
     LoadAppConfigCommand.prototype.executeInternal = function () {
         var _this = this;
-        var appConfigModel = getInstance(AppConfigModel);
+        // const appConfigModel: AppConfigModel = getInstance(AppConfigModel);
         new LoadItemCommand({
             src: AppSettings.appConfigPath,
             id: AppSettings.appConfigPath
@@ -33,17 +33,17 @@ var LoadAppConfigCommand = /** @class */ (function (_super) {
             .execute()
             .then(function (data) {
             console.log("LoadAppConfigCommand | executeInternal __ data: ", data);
+            appStorage().change()("app.config", data);
             //
-            var genericObjectsByTypeModel = getInstance(GenericObjectsByTypeModel);
-            genericObjectsByTypeModel.commitItems([data]);
-            //
+            var appState = appStorage().getState();
             var loadManager = getInstance(LoadManager);
             loadManager.addSubstituteParams({
-                locale: appConfigModel.appConfig.locale
+                locale: appState.app.config.locale
             });
             //
             if (data.files) {
-                new LoadItemsListCommand(appConfigModel.appConfig.files)
+                // as any is needed to "avoid" DeepReadonly problem
+                new LoadItemsListCommand(appState.app.config.files)
                     .execute();
             }
             _this.notifyComplete();

package/app/commands/LoadAppConfigCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"LoadAppConfigCommand.js","sourceRoot":"","sources":["../../../src/app/commands/LoadAppConfigCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,EACH,yBAAyB,EACzB,WAAW,EACX,eAAe,EACf,oBAAoB,EACpB,WAAW,EACd,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAC,cAAc,EAAC,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAG3C;IAA0C,wCAAc;IAAxD;;IA8CA,CAAC;IA5Ca,8CAAe,GAAzB;QAAA,iBA0CC;QAzCG,IAAM,cAAc,GAAmB,WAAW,CAAC,cAAc,CAAC,CAAC;QACnE,IAAI,eAAe,CACf;YACI,GAAG,EAAE,WAAW,CAAC,aAAa;YAC9B,EAAE,EAAE,WAAW,CAAC,aAAa;SAChC,CACJ;aACI,OAAO,EAAE;aACT,IAAI,CACD,UAAC,IAAiB;YACd,OAAO,CAAC,GAAG,CAAC,kDAAkD,EAAE,IAAI,CAAC,CAAC;YAEtE,EAAE;YACF,IAAM,yBAAyB,GAA8B,WAAW,CAAC,yBAAyB,CAAC,CAAC;YACpG,yBAAyB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAE9C,EAAE;YACF,IAAM,WAAW,GAAgB,WAAW,CAAC,WAAW,CAAC,CAAC;YAC1D,WAAW,CAAC,mBAAmB,CAC3B;gBACI,MAAM,EAAE,cAAc,CAAC,SAAS,CAAC,MAAM;aAC1C,CACJ,CAAC;YAEF,EAAE;YACF,IAAI,IAAI,CAAC,KAAK,EAAE;gBACZ,IAAI,oBAAoB,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC;qBACnD,OAAO,EAAE,CAAC;aAClB;YAED,KAAI,CAAC,cAAc,EAAE,CAAC;QAC1B,CAAC,EACD;YACI,IAAM,SAAS,GAAW,uFAAuF,CAAC;YAClH,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACzB,KAAK,CAAC,SAAS,CAAC,CAAC;YAEjB,KAAI,CAAC,SAAS,GAAG,gBAAgB,CAAC,aAAa,CAAC;YAChD,KAAI,CAAC,SAAS,EAAE,CAAC;QACrB,CAAC,CACJ,CAAC;IACV,CAAC;IAEL,2BAAC;AAAD,CAAC,AA9CD,CAA0C,cAAc,GA8CvD"}
+{"version":3,"file":"LoadAppConfigCommand.js","sourceRoot":"","sources":["../../../src/app/commands/LoadAppConfigCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EACH,WAAW,EACX,eAAe,EACf,oBAAoB,EACpB,WAAW,EACd,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAGxD;IAA0C,wCAAc;IAAxD;;IAiDA,CAAC;IA/Ca,8CAAe,GAAzB;QAAA,iBA6CC;QA5CG,sEAAsE;QACtE,IAAI,eAAe,CACf;YACI,GAAG,EAAE,WAAW,CAAC,aAAa;YAC9B,EAAE,EAAE,WAAW,CAAC,aAAa;SAChC,CACJ;aACI,OAAO,EAAE;aACT,IAAI,CACD,UAAC,IAAS;YACN,OAAO,CAAC,GAAG,CAAC,kDAAkD,EAAE,IAAI,CAAC,CAAC;YAEtE,UAAU,EAAE,CAAC,MAAM,EAAkB,CACjC,YAAY,EACZ,IAAI,CACP,CAAC;YAEF,EAAE;YACF,IAAM,QAAQ,GAAG,UAAU,EAAE,CAAC,QAAQ,EAAkB,CAAC;YACzD,IAAM,WAAW,GAAgB,WAAW,CAAC,WAAW,CAAC,CAAC;YAC1D,WAAW,CAAC,mBAAmB,CAC3B;gBACI,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM;aACrC,CACJ,CAAC;YAEF,EAAE;YACF,IAAI,IAAI,CAAC,KAAK,EAAE;gBACZ,mDAAmD;gBACnD,IAAI,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,KAAY,CAAC;qBACrD,OAAO,EAAE,CAAC;aAClB;YAED,KAAI,CAAC,cAAc,EAAE,CAAC;QAC1B,CAAC,EACD;YACI,IAAM,SAAS,GAAW,uFAAuF,CAAC;YAClH,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACzB,KAAK,CAAC,SAAS,CAAC,CAAC;YAEjB,KAAI,CAAC,SAAS,GAAG,gBAAgB,CAAC,aAAa,CAAC;YAChD,KAAI,CAAC,SAAS,EAAE,CAAC;QACrB,CAAC,CACJ,CAAC;IACV,CAAC;IAEL,2BAAC;AAAD,CAAC,AAjDD,CAA0C,cAAc,GAiDvD"}

package/app/commands/ParseStaticItemsConfigCommand.js

@@ -14,9 +14,11 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 import { CommandErrorCode } from "@flashist/fcore";
-import { GenericObjectsByTypeModel, getInstance, LoadManager } from "@flashist/flibs";
+import { getInstance, LoadManager } from "@flashist/flibs";
 import { BaseAppCommand } from "../../base/commands/BaseAppCommand";
+import { ECSManager } from "../../ecs/managers/ECSManager";
 import { AppSettings } from "../AppSettings";
+// import {IItemsConfigVO} from "../data/IItemsConfigVO";
 var ParseStaticItemsConfigCommand = /** @class */ (function (_super) {
     __extends(ParseStaticItemsConfigCommand, _super);
     function ParseStaticItemsConfigCommand() {
@@ -26,10 +28,13 @@ var ParseStaticItemsConfigCommand = /** @class */ (function (_super) {
         var loadManager = getInstance(LoadManager);
         var staticItemsConfigFileItem = loadManager.getLoadItem(AppSettings.staticItemsFileId);
         if (staticItemsConfigFileItem && staticItemsConfigFileItem.data) {
-            var staticData = staticItemsConfigFileItem.data;
-            var genericObjectsByTypeModel = getInstance(GenericObjectsByTypeModel);
-            if (staticData.items) {
-                genericObjectsByTypeModel.commitItems(staticData.items);
+            if (staticItemsConfigFileItem.data) {
+                var ecsManager = getInstance(ECSManager);
+                var staticItems = staticItemsConfigFileItem.data;
+                for (var _i = 0, staticItems_1 = staticItems; _i < staticItems_1.length; _i++) {
+                    var singleStaticItem = staticItems_1[_i];
+                    ecsManager.entities.add(singleStaticItem);
+                }
             }
             this.notifyComplete();
         }

package/app/commands/ParseStaticItemsConfigCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"ParseStaticItemsConfigCommand.js","sourceRoot":"","sources":["../../../src/app/commands/ParseStaticItemsConfigCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAmB,yBAAyB,EAAE,WAAW,EAAE,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAEtG,OAAO,EAAC,cAAc,EAAC,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAG3C;IAAmD,iDAAc;IAAjE;;IAwBA,CAAC;IAtBa,uDAAe,GAAzB;QAEI,IAAI,WAAW,GAAgB,WAAW,CAAC,WAAW,CAAC,CAAC;QACxD,IAAI,yBAAyB,GAAqB,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;QACzG,IAAI,yBAAyB,IAAI,yBAAyB,CAAC,IAAI,EAAE;YAC7D,IAAM,UAAU,GAAmB,yBAAyB,CAAC,IAAI,CAAC;YAElE,IAAI,yBAAyB,GAA8B,WAAW,CAAC,yBAAyB,CAAC,CAAC;YAClG,IAAI,UAAU,CAAC,KAAK,EAAE;gBAClB,yBAAyB,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;aAC3D;YAED,IAAI,CAAC,cAAc,EAAE,CAAC;SAEzB;aAAM;YACH,OAAO,CAAC,KAAK,CAAC,6EAA6E,CAAC,CAAC;YAC7F,IAAI,CAAC,SAAS,GAAG,gBAAgB,CAAC,aAAa,CAAC;YAChD,IAAI,CAAC,SAAS,EAAE,CAAC;SACpB;IAEL,CAAC;IAEL,oCAAC;AAAD,CAAC,AAxBD,CAAmD,cAAc,GAwBhE"}
+{"version":3,"file":"ParseStaticItemsConfigCommand.js","sourceRoot":"","sources":["../../../src/app/commands/ParseStaticItemsConfigCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAoB,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE7E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,yDAAyD;AAEzD;IAAmD,iDAAc;IAAjE;;IA0BA,CAAC;IAxBa,uDAAe,GAAzB;QAEI,IAAI,WAAW,GAAgB,WAAW,CAAC,WAAW,CAAC,CAAC;QACxD,IAAI,yBAAyB,GAAqB,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;QACzG,IAAI,yBAAyB,IAAI,yBAAyB,CAAC,IAAI,EAAE;YAE7D,IAAI,yBAAyB,CAAC,IAAI,EAAE;gBAChC,IAAM,UAAU,GAAe,WAAW,CAAC,UAAU,CAAC,CAAC;gBACvD,IAAM,WAAW,GAAc,yBAAyB,CAAC,IAAI,CAAC;gBAC9D,KAA6B,UAAW,EAAX,2BAAW,EAAX,yBAAW,EAAX,IAAW,EAAE;oBAArC,IAAI,gBAAgB,oBAAA;oBACrB,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;iBAC7C;aACJ;YAED,IAAI,CAAC,cAAc,EAAE,CAAC;SAEzB;aAAM;YACH,OAAO,CAAC,KAAK,CAAC,6EAA6E,CAAC,CAAC;YAC7F,IAAI,CAAC,SAAS,GAAG,gBAAgB,CAAC,aAAa,CAAC;YAChD,IAAI,CAAC,SAAS,EAAE,CAAC;SACpB;IAEL,CAAC;IAEL,oCAAC;AAAD,CAAC,AA1BD,CAAmD,cAAc,GA0BhE"}

package/app/data/local-storage/IAppModelStorageVO.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IAppModelStorageVO.js","sourceRoot":"","sources":["../../../../src/app/data/local-storage/IAppModelStorageVO.ts"],"names":[],"mappings":""}

package/app/data/state/AppModuleState.d.ts

@@ -0,0 +1,18 @@
+import { Rectangle } from "pixi.js";
+export declare const AppModuleInitialState: {
+    app: {
+        appLaunchesCount: number;
+        totalUsageDuration: number;
+        sessionStartTime: number;
+        previousSessionTotalUsageTime: number;
+        config: {
+            appName: any;
+            appVersion: any;
+            files: any;
+            locale: any;
+            targetFps: any;
+            sizeArea: Rectangle;
+        };
+    };
+};
+export declare type AppModuleState = typeof AppModuleInitialState;

package/app/data/state/AppModuleState.js

@@ -0,0 +1,17 @@
+export var AppModuleInitialState = {
+    app: {
+        appLaunchesCount: 0,
+        totalUsageDuration: 0,
+        sessionStartTime: 0,
+        previousSessionTotalUsageTime: 0,
+        config: {
+            appName: null,
+            appVersion: null,
+            files: null,
+            locale: null,
+            targetFps: null,
+            sizeArea: null
+        }
+    }
+};
+//# sourceMappingURL=AppModuleState.js.map

package/app/data/state/AppModuleState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AppModuleState.js","sourceRoot":"","sources":["../../../../src/app/data/state/AppModuleState.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAM,qBAAqB,GAAG;IACjC,GAAG,EAAE;QACD,gBAAgB,EAAE,CAAC;QACnB,kBAAkB,EAAE,CAAC;QAErB,gBAAgB,EAAE,CAAC;QACnB,6BAA6B,EAAE,CAAC;QAEhC,MAAM,EAAE;YACJ,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,IAAiB;SAC9B;KACJ;CACJ,CAAC"}

package/app/managers/AppManager.d.ts

@@ -1,10 +1,11 @@
 import { BaseAppManager } from "../../base/managers/BaseAppManager";
-import { AppModel } from "../models/AppModel";
-import { StorageManager } from "../../storage/managers/StorageManager";
-import { IAppModelStorageVO } from "../data/IAppModelStorageVO";
+import { LocalStorageManager } from "../../local-storage/managers/LocalStorageManager";
+import { DeepReadonly } from "../../state/data/DeepReadableTypings";
+import { IAppModelStorageVO } from "../data/local-storage/IAppModelStorageVO";
+import { AppModuleState } from "../data/state/AppModuleState";
 export declare class AppManager extends BaseAppManager {
-    protected appModel: AppModel;
-    protected storageManager: StorageManager;
+    protected appState: DeepReadonly<AppModuleState>;
+    protected storageManager: LocalStorageManager;
     protected updateTimeInterval: any;
     protected construction(...args: any[]): void;
     protected updateUsageTime(): void;

package/app/managers/AppManager.js

@@ -15,8 +15,8 @@ var __extends = (this && this.__extends) || (function () {
 })();
 import { getInstance } from "@flashist/flibs";
 import { BaseAppManager } from "../../base/managers/BaseAppManager";
-import { AppModel } from "../models/AppModel";
-import { StorageManager } from "../../storage/managers/StorageManager";
+import { LocalStorageManager } from "../../local-storage/managers/LocalStorageManager";
+import { appStorage } from "../../state/AppStateModule";
 import { AppSettings } from "../AppSettings";
 var AppManager = /** @class */ (function (_super) {
     __extends(AppManager, _super);
@@ -30,14 +30,19 @@ var AppManager = /** @class */ (function (_super) {
             args[_i] = arguments[_i];
         }
         _super.prototype.construction.call(this, args);
-        this.appModel = getInstance(AppModel);
-        this.storageManager = getInstance(StorageManager);
+        this.storageManager = getInstance(LocalStorageManager);
+        this.appState = appStorage().getState();
         var appModelStorageData = this.storageManager.getParam(AppSettings.storageParamId);
         this.applyStorageData(appModelStorageData);
-        this.appModel.previousSessionTotalUsageTime = this.appModel.totalUsageDuration;
-        this.appModel.sessionStartTime = Date.now();
-        // Increase app launch counter
-        this.appModel.appLaunchesCount++;
+        // this.appState.app.previousSessionTotalUsageTime = this.appState.app.totalUsageDuration;
+        // this.appState.app.sessionStartTime = Date.now();
+        // // Increase app launch counter
+        // this.appState.app.appLaunchesCount++;
+        appStorage().change()("app", {
+            previousSessionTotalUsageTime: this.appState.app.totalUsageDuration,
+            sessionStartTime: Date.now(),
+            appLaunchesCount: this.appState.app.appLaunchesCount + 1
+        });
         this.updateStorageData();
         this.updateTimeInterval = setInterval(function () {
             _this.updateUsageTime();
@@ -46,16 +51,23 @@ var AppManager = /** @class */ (function (_super) {
         1000 * 60);
     };
     AppManager.prototype.updateUsageTime = function () {
-        var sessionTimeDelta = Date.now() - this.appModel.sessionStartTime;
-        this.appModel.totalUsageDuration = this.appModel.previousSessionTotalUsageTime + sessionTimeDelta;
+        var sessionTimeDelta = Date.now() - this.appState.app.sessionStartTime;
+        // this.appState.app.totalUsageDuration = this.appState.app.previousSessionTotalUsageTime + sessionTimeDelta;
+        appStorage().change()("app", {
+            totalUsageDuration: this.appState.app.previousSessionTotalUsageTime + sessionTimeDelta
+        });
         this.updateStorageData();
     };
     AppManager.prototype.applyStorageData = function (data) {
         if (!data) {
             return;
         }
-        this.appModel.appLaunchesCount = data.appLaunchesCount;
-        this.appModel.totalUsageDuration = data.totalUsageTime;
+        // this.appState.app.appLaunchesCount = data.appLaunchesCount;
+        // this.appState.app.totalUsageDuration = data.totalUsageTime;
+        appStorage().change()("app", {
+            appLaunchesCount: data.appLaunchesCount,
+            totalUsageDuration: data.totalUsageTime
+        });
     };
     AppManager.prototype.updateStorageData = function () {
         var storageData = this.generateStorageData();
@@ -63,8 +75,8 @@ var AppManager = /** @class */ (function (_super) {
     };
     AppManager.prototype.generateStorageData = function () {
         return {
-            appLaunchesCount: this.appModel.appLaunchesCount,
-            totalUsageTime: this.appModel.totalUsageDuration
+            appLaunchesCount: this.appState.app.appLaunchesCount,
+            totalUsageTime: this.appState.app.totalUsageDuration
         };
     };
     return AppManager;

package/app/managers/AppManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"AppManager.js","sourceRoot":"","sources":["../../../src/app/managers/AppManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAC,cAAc,EAAC,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAC,cAAc,EAAC,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAG3C;IAAgC,8BAAc;IAA9C;;IA2DA,CAAC;IApDa,iCAAY,GAAtB;QAAA,iBAuBC;QAvBsB,cAAO;aAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;YAAP,yBAAO;;QAC1B,iBAAM,YAAY,YAAC,IAAI,CAAC,CAAC;QAEzB,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;QAElD,IAAM,mBAAmB,GAAuB,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAqB,WAAW,CAAC,cAAc,CAAC,CAAC;QAC7H,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QAE3C,IAAI,CAAC,QAAQ,CAAC,6BAA6B,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QAC/E,IAAI,CAAC,QAAQ,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE5C,8BAA8B;QAC9B,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;QAEjC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,kBAAkB,GAAG,WAAW,CACjC;YACI,KAAI,CAAC,eAAe,EAAE,CAAC;QAC3B,CAAC;QACD,QAAQ;QACR,IAAI,GAAG,EAAE,CACZ,CAAC;IACN,CAAC;IAES,oCAAe,GAAzB;QACI,IAAI,gBAAgB,GAAW,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAC3E,IAAI,CAAC,QAAQ,CAAC,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,6BAA6B,GAAG,gBAAgB,CAAC;QAElG,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAES,qCAAgB,GAA1B,UAA2B,IAAwB;QAC/C,IAAI,CAAC,IAAI,EAAE;YACP,OAAO;SACV;QAED,IAAI,CAAC,QAAQ,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACvD,IAAI,CAAC,QAAQ,CAAC,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC;IAC3D,CAAC;IAES,sCAAiB,GAA3B;QACI,IAAM,WAAW,GAAuB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACnE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAqB,WAAW,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAC9F,CAAC;IAES,wCAAmB,GAA7B;QACI,OAAO;YACH,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,gBAAgB;YAChD,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB;SACnD,CAAC;IACN,CAAC;IACL,iBAAC;AAAD,CAAC,AA3DD,CAAgC,cAAc,GA2D7C"}
+{"version":3,"file":"AppManager.js","sourceRoot":"","sources":["../../../src/app/managers/AppManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI7C;IAAgC,8BAAc;IAA9C;;IAgFA,CAAC;IAzEa,iCAAY,GAAtB;QAAA,iBA8BC;QA9BsB,cAAO;aAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;YAAP,yBAAO;;QAC1B,iBAAM,YAAY,YAAC,IAAI,CAAC,CAAC;QAEzB,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC,mBAAmB,CAAC,CAAC;QAEvD,IAAI,CAAC,QAAQ,GAAG,UAAU,EAAE,CAAC,QAAQ,EAAkB,CAAC;QACxD,IAAM,mBAAmB,GAAuB,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAqB,WAAW,CAAC,cAAc,CAAC,CAAC;QAC7H,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QAE3C,0FAA0F;QAC1F,mDAAmD;QACnD,iCAAiC;QACjC,wCAAwC;QACxC,UAAU,EAAE,CAAC,MAAM,EAAkB,CACjC,KAAK,EACL;YACI,6BAA6B,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,kBAAkB;YACnE,gBAAgB,EAAE,IAAI,CAAC,GAAG,EAAE;YAC5B,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,gBAAgB,GAAG,CAAC;SAC3D,CACJ,CAAC;QAEF,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,kBAAkB,GAAG,WAAW,CACjC;YACI,KAAI,CAAC,eAAe,EAAE,CAAC;QAC3B,CAAC;QACD,QAAQ;QACR,IAAI,GAAG,EAAE,CACZ,CAAC;IACN,CAAC;IAES,oCAAe,GAAzB;QACI,IAAI,gBAAgB,GAAW,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC;QAE/E,6GAA6G;QAC7G,UAAU,EAAE,CAAC,MAAM,EAAkB,CACjC,KAAK,EACL;YACI,kBAAkB,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,6BAA6B,GAAG,gBAAgB;SACzF,CACJ,CAAC;QAEF,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAES,qCAAgB,GAA1B,UAA2B,IAAwB;QAC/C,IAAI,CAAC,IAAI,EAAE;YACP,OAAO;SACV;QAED,8DAA8D;QAC9D,8DAA8D;QAC9D,UAAU,EAAE,CAAC,MAAM,EAAkB,CACjC,KAAK,EACL;YACI,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,kBAAkB,EAAE,IAAI,CAAC,cAAc;SAC1C,CACJ,CAAC;IACN,CAAC;IAES,sCAAiB,GAA3B;QACI,IAAM,WAAW,GAAuB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACnE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAqB,WAAW,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAC9F,CAAC;IAES,wCAAmB,GAA7B;QACI,OAAO;YACH,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,gBAAgB;YACpD,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,kBAAkB;SACvD,CAAC;IACN,CAAC;IACL,iBAAC;AAAD,CAAC,AAhFD,CAAgC,cAAc,GAgF7C"}

package/debug/DebugModule.js

@@ -14,10 +14,11 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 import { ConsoleCustomLoggerItem, Logger } from "@flashist/fcore";
-import { FApp, getInstance, serviceLocatorAdd } from "@flashist/flibs";
+import { FApp } from "@flashist/flibs";
 import { FC } from "@flashist/fconsole";
 import { BaseAppModule } from "../base/modules/BaseAppModule";
-import { DefaultDebugModuleConfigVO } from "./data/DefaultDebugModuleConfigVO";
+import { appStorage } from "../state/AppStateModule";
+import { DebugModuleInitialState } from "./data/state/DebugModuleState";
 var DebugModule = /** @class */ (function (_super) {
     __extends(DebugModule, _super);
     function DebugModule() {
@@ -25,13 +26,15 @@ var DebugModule = /** @class */ (function (_super) {
     }
     DebugModule.prototype.init = function () {
         _super.prototype.init.call(this);
+        appStorage().initializeWith(DebugModuleInitialState);
         // Modules
-        serviceLocatorAdd(DefaultDebugModuleConfigVO, { isSingleton: true });
+        // serviceLocatorAdd(DefaultDebugModuleConfigVO, { isSingleton: true });
     };
     DebugModule.prototype.activateCompleteHook = function () {
         _super.prototype.activateCompleteHook.call(this);
-        var fConsoleConfig = getInstance(DefaultDebugModuleConfigVO);
-        FC.startInit(FApp.instance.stage, fConsoleConfig.fconsoleConfig);
+        // const fConsoleConfig: IDebugModuleConfigVO = getInstance(DefaultDebugModuleConfigVO);
+        var appState = appStorage().getState();
+        FC.startInit(FApp.instance.stage, appState.debug.fconsole);
         Logger.addLoggerItem(new ConsoleCustomLoggerItem());
     };
     return DebugModule;

package/debug/DebugModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"DebugModule.js","sourceRoot":"","sources":["../../src/debug/DebugModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAG/E;IAAiC,+BAAa;IAA9C;;IAoBA,CAAC;IAlBG,0BAAI,GAAJ;QACI,iBAAM,IAAI,WAAE,CAAC;QAEb,UAAU;QACV,iBAAiB,CAAC,0BAA0B,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,0CAAoB,GAApB;QACI,iBAAM,oBAAoB,WAAE,CAAC;QAE7B,IAAM,cAAc,GAAyB,WAAW,CAAC,0BAA0B,CAAC,CAAC;QACrF,EAAE,CAAC,SAAS,CACR,IAAI,CAAC,QAAQ,CAAC,KAAK,EACnB,cAAc,CAAC,cAAc,CAChC,CAAC;QAEF,MAAM,CAAC,aAAa,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;IACxD,CAAC;IACL,kBAAC;AAAD,CAAC,AApBD,CAAiC,aAAa,GAoB7C"}
+{"version":3,"file":"DebugModule.js","sourceRoot":"","sources":["../../src/debug/DebugModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,IAAI,EAAkC,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAoB,MAAM,+BAA+B,CAAC;AAG1F;IAAiC,+BAAa;IAA9C;;IAuBA,CAAC;IArBG,0BAAI,GAAJ;QACI,iBAAM,IAAI,WAAE,CAAC;QAEb,UAAU,EAAE,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC;QAErD,UAAU;QACV,wEAAwE;IAC5E,CAAC;IAED,0CAAoB,GAApB;QACI,iBAAM,oBAAoB,WAAE,CAAC;QAE7B,wFAAwF;QACxF,IAAM,QAAQ,GAAG,UAAU,EAAE,CAAC,QAAQ,EAAoB,CAAA;QAC1D,EAAE,CAAC,SAAS,CACR,IAAI,CAAC,QAAQ,CAAC,KAAK,EACnB,QAAQ,CAAC,KAAK,CAAC,QAAsC,CACxD,CAAC;QAEF,MAAM,CAAC,aAAa,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;IACxD,CAAC;IACL,kBAAC;AAAD,CAAC,AAvBD,CAAiC,aAAa,GAuB7C"}

package/debug/data/state/DebugModuleState.d.ts

@@ -0,0 +1,7 @@
+import { IFConsoleConfigVO } from "@flashist/fconsole/console/config/IFConsoleConfigVO";
+export declare const DebugModuleInitialState: {
+    debug: {
+        fconsole: Partial<IFConsoleConfigVO>;
+    };
+};
+export declare type DebugModuleState = typeof DebugModuleInitialState;

package/debug/data/state/DebugModuleState.js

@@ -0,0 +1,10 @@
+export var DebugModuleInitialState = {
+    debug: {
+        fconsole: {
+            console: {
+                defaultVisible: true
+            }
+        }
+    }
+};
+//# sourceMappingURL=DebugModuleState.js.map

package/debug/data/state/DebugModuleState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DebugModuleState.js","sourceRoot":"","sources":["../../../../src/debug/data/state/DebugModuleState.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAM,uBAAuB,GAAG;IACnC,KAAK,EAAE;QACH,QAAQ,EAAE;YACN,OAAO,EAAE;gBACL,cAAc,EAAE,IAAI;aACvB;SAC0B;KAClC;CACJ,CAAC"}

package/device/DeviceModule.d.ts

@@ -1,5 +1,4 @@
 import { BaseAppModule } from "../base/modules/BaseAppModule";
 export declare class DeviceModule extends BaseAppModule {
     init(): void;
-    activateCompleteHook(): void;
 }

package/device/DeviceModule.js

@@ -13,9 +13,9 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { DeviceTools, getInstance, serviceLocatorAdd } from "@flashist/flibs";
 import { BaseAppModule } from "../base/modules/BaseAppModule";
-import { DeviceInfoModel } from "./models/DeviceInfoModel";
+import { appStorage } from "../state/AppStateModule";
+import { DeviceModuleInitialState } from "./data/state/DeviceModuleState";
 var DeviceModule = /** @class */ (function (_super) {
     __extends(DeviceModule, _super);
     function DeviceModule() {
@@ -23,13 +23,9 @@ var DeviceModule = /** @class */ (function (_super) {
     }
     DeviceModule.prototype.init = function () {
         _super.prototype.init.call(this);
+        appStorage().initializeWith(DeviceModuleInitialState);
         // Modules
-        serviceLocatorAdd(DeviceInfoModel, { isSingleton: true });
-    };
-    DeviceModule.prototype.activateCompleteHook = function () {
-        _super.prototype.activateCompleteHook.call(this);
-        var soundsStorageModule = getInstance(DeviceInfoModel);
-        soundsStorageModule.deviceInfo = DeviceTools.getDeviceInfo(navigator.userAgent);
+        // serviceLocatorAdd(DeviceInfoModel, { isSingleton: true });
     };
     return DeviceModule;
 }(BaseAppModule));

package/device/DeviceModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceModule.js","sourceRoot":"","sources":["../../src/device/DeviceModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D;IAAkC,gCAAa;IAA/C;;IAeA,CAAC;IAbG,2BAAI,GAAJ;QACI,iBAAM,IAAI,WAAE,CAAC;QAEb,UAAU;QACV,iBAAiB,CAAC,eAAe,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,2CAAoB,GAApB;QACI,iBAAM,oBAAoB,WAAE,CAAC;QAE7B,IAAM,mBAAmB,GAAoB,WAAW,CAAC,eAAe,CAAC,CAAC;QAC1E,mBAAmB,CAAC,UAAU,GAAG,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACpF,CAAC;IACL,mBAAC;AAAD,CAAC,AAfD,CAAkC,aAAa,GAe9C"}
+{"version":3,"file":"DeviceModule.js","sourceRoot":"","sources":["../../src/device/DeviceModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E;IAAkC,gCAAa;IAA/C;;IAUA,CAAC;IARG,2BAAI,GAAJ;QACI,iBAAM,IAAI,WAAE,CAAC;QAEb,UAAU,EAAE,CAAC,cAAc,CAAC,wBAAwB,CAAC,CAAC;QAEtD,UAAU;QACV,6DAA6D;IACjE,CAAC;IACL,mBAAC;AAAD,CAAC,AAVD,CAAkC,aAAa,GAU9C"}

package/device/data/state/DeviceModuleState.d.ts

@@ -0,0 +1,4 @@
+export declare const DeviceModuleInitialState: {
+    device: import("@flashist/flibs").IDeviceInfoVO;
+};
+export declare type DeviceModuleState = typeof DeviceModuleInitialState;

package/device/data/state/DeviceModuleState.js

@@ -0,0 +1,5 @@
+import { DeviceTools } from "@flashist/flibs";
+export var DeviceModuleInitialState = {
+    device: DeviceTools.getDeviceInfo(navigator.userAgent)
+};
+//# sourceMappingURL=DeviceModuleState.js.map

package/device/data/state/DeviceModuleState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DeviceModuleState.js","sourceRoot":"","sources":["../../../../src/device/data/state/DeviceModuleState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,CAAC,IAAM,wBAAwB,GAAG;IACpC,MAAM,EAAE,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC;CACzD,CAAC"}

package/{assets/AssetsModule.d.ts → ecs/ECSModule.d.ts}

@@ -1,4 +1,4 @@
 import { BaseAppModule } from "../base/modules/BaseAppModule";
-export declare class AssetsModule extends BaseAppModule {
+export declare class ECSModule extends BaseAppModule {
     init(): void;
 }

package/{assets/AssetsModule.js → ecs/ECSModule.js}

@@ -15,17 +15,21 @@ var __extends = (this && this.__extends) || (function () {
 })();
 import { serviceLocatorAdd } from "@flashist/flibs";
 import { BaseAppModule } from "../base/modules/BaseAppModule";
-import { AssetsModel } from "./models/AssetsModel";
-var AssetsModule = /** @class */ (function (_super) {
-    __extends(AssetsModule, _super);
-    function AssetsModule() {
+import { appStorage } from "../state/AppStateModule";
+import { ECSModuleInitialState } from "./data/state/ECSModuleState";
+import { ECSManager } from "./managers/ECSManager";
+var ECSModule = /** @class */ (function (_super) {
+    __extends(ECSModule, _super);
+    function ECSModule() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    AssetsModule.prototype.init = function () {
+    ECSModule.prototype.init = function () {
         _super.prototype.init.call(this);
-        serviceLocatorAdd(AssetsModel, { isSingleton: true });
+        // Init the app with initial state
+        appStorage().initializeWith(ECSModuleInitialState);
+        serviceLocatorAdd(ECSManager, { isSingleton: true, forceCreation: true });
     };
-    return AssetsModule;
+    return ECSModule;
 }(BaseAppModule));
-export { AssetsModule };
-//# sourceMappingURL=AssetsModule.js.map
+export { ECSModule };
+//# sourceMappingURL=ECSModule.js.map

package/ecs/ECSModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ECSModule.js","sourceRoot":"","sources":["../../src/ecs/ECSModule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD;IAA+B,6BAAa;IAA5C;;IAWA,CAAC;IATG,wBAAI,GAAJ;QACI,iBAAM,IAAI,WAAE,CAAC;QAGb,kCAAkC;QAClC,UAAU,EAAE,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;QAEnD,iBAAiB,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9E,CAAC;IACL,gBAAC;AAAD,CAAC,AAXD,CAA+B,aAAa,GAW3C"}

package/ecs/data/state/ECSModuleState.d.ts

@@ -0,0 +1,6 @@
+export declare const ECSModuleInitialState: {
+    ecs: {
+        entities: any[];
+    };
+};
+export declare type ECSModuleState = typeof ECSModuleInitialState;

package/ecs/data/state/ECSModuleState.js

@@ -0,0 +1,8 @@
+export var ECSModuleInitialState = {
+    ecs: {
+        // components: [],
+        entities: []
+        // systems: [],
+    }
+};
+//# sourceMappingURL=ECSModuleState.js.map

package/ecs/data/state/ECSModuleState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ECSModuleState.js","sourceRoot":"","sources":["../../../../src/ecs/data/state/ECSModuleState.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,IAAM,qBAAqB,GAAG;IACjC,GAAG,EAAE;QACD,kBAAkB;QAClB,QAAQ,EAAE,EAAE;QACZ,eAAe;KAClB;CACJ,CAAC"}

package/ecs/ecs/components/IComponent.d.ts

@@ -0,0 +1,3 @@
+export interface IComponent extends Record<string, boolean | number | string | [] | object> {
+    type: string;
+}

package/ecs/ecs/components/IComponent.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=IComponent.js.map

package/ecs/ecs/components/IComponent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IComponent.js","sourceRoot":"","sources":["../../../../src/ecs/ecs/components/IComponent.ts"],"names":[],"mappings":""}

package/ecs/ecs/entities/IEntity.d.ts

@@ -0,0 +1,8 @@
+import { IComponent } from "../components/IComponent";
+export interface IEntity<ComponentTypes extends IComponent = IComponent> {
+    id: string;
+    components: {
+        [K in ComponentTypes as K["type"]]: K;
+    };
+}
+export declare type EntityWithoutId<ComponentTypes extends IComponent = IComponent> = Omit<IEntity<ComponentTypes>, "id">;

package/ecs/ecs/entities/IEntity.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=IEntity.js.map

package/ecs/ecs/entities/IEntity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IEntity.js","sourceRoot":"","sources":["../../../../src/ecs/ecs/entities/IEntity.ts"],"names":[],"mappings":""}

package/ecs/ecs/entities/queries/EntitiesQuery.d.ts

@@ -0,0 +1,11 @@
+import { BaseObject } from "@flashist/fcore";
+import { IEntity } from "../IEntity";
+export declare class EntitiesQuery<EntityType extends IEntity = IEntity> extends BaseObject {
+    includeTypes: string[];
+    excludeTypes: string[];
+    protected _entities: EntityType[];
+    constructor(includeTypes: string[], excludeTypes?: string[]);
+    get entities(): Readonly<typeof this._entities>;
+    addEntity(entity: EntityType): void;
+    removeEntity(entity: EntityType): void;
+}

package/ecs/ecs/entities/queries/EntitiesQuery.js

@@ -0,0 +1,52 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+import { ArrayTools, BaseObject } from "@flashist/fcore";
+import { EntitiesQueryEvent } from "./EntitiesQueryEvent";
+var EntitiesQuery = /** @class */ (function (_super) {
+    __extends(EntitiesQuery, _super);
+    function EntitiesQuery(includeTypes, excludeTypes) {
+        if (excludeTypes === void 0) { excludeTypes = []; }
+        var _this = _super.call(this) || this;
+        _this.includeTypes = includeTypes;
+        _this.excludeTypes = excludeTypes;
+        _this._entities = [];
+        return _this;
+    }
+    Object.defineProperty(EntitiesQuery.prototype, "entities", {
+        get: function () {
+            return this._entities;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    EntitiesQuery.prototype.addEntity = function (entity) {
+        if (this._entities.indexOf(entity) !== -1) {
+            return;
+        }
+        this._entities.push(entity);
+        this.dispatchEvent(EntitiesQueryEvent.ENTITY_ADDED, entity);
+    };
+    EntitiesQuery.prototype.removeEntity = function (entity) {
+        if (this._entities.indexOf(entity) === -1) {
+            return;
+        }
+        ArrayTools.removeItem(this._entities, entity);
+        this.dispatchEvent(EntitiesQueryEvent.ENTITY_REMOVED, entity);
+    };
+    return EntitiesQuery;
+}(BaseObject));
+export { EntitiesQuery };
+//# sourceMappingURL=EntitiesQuery.js.map

package/ecs/ecs/entities/queries/EntitiesQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntitiesQuery.js","sourceRoot":"","sources":["../../../../../src/ecs/ecs/entities/queries/EntitiesQuery.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAEzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D;IAAyE,iCAAU;IAI/E,uBAAmB,YAAsB,EAAS,YAA2B;QAA3B,6BAAA,EAAA,iBAA2B;QAA7E,YACI,iBAAO,SACV;QAFkB,kBAAY,GAAZ,YAAY,CAAU;QAAS,kBAAY,GAAZ,YAAY,CAAe;QAFnE,eAAS,GAAiB,EAAE,CAAC;;IAIvC,CAAC;IAED,sBAAW,mCAAQ;aAAnB;YACI,OAAO,IAAI,CAAC,SAAS,CAAC;QAC1B,CAAC;;;OAAA;IAEM,iCAAS,GAAhB,UAAiB,MAAkB;QAC/B,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;YACvC,OAAO;SACV;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE5B,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC;IAEM,oCAAY,GAAnB,UAAoB,MAAkB;QAClC,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;YACvC,OAAO;SACV;QAED,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAE9C,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAClE,CAAC;IACL,oBAAC;AAAD,CAAC,AA/BD,CAAyE,UAAU,GA+BlF"}

package/ecs/ecs/entities/queries/EntitiesQueryEvent.d.ts

@@ -0,0 +1,4 @@
+export declare const EntitiesQueryEvent: {
+    ENTITY_ADDED: string;
+    ENTITY_REMOVED: string;
+};

package/ecs/ecs/entities/queries/EntitiesQueryEvent.js

@@ -0,0 +1,5 @@
+export var EntitiesQueryEvent = {
+    ENTITY_ADDED: "EntitiesQueryEvent.ENTITY_ADDED",
+    ENTITY_REMOVED: "EntitiesQueryEvent.ENTITY_REMOVED"
+};
+//# sourceMappingURL=EntitiesQueryEvent.js.map