@owdproject/core 3.0.0-alpha.8 → 3.0.0-alpha.9

package/README.md

@@ -92,7 +92,7 @@ Then specify the path theme in `owd.config.ts`:
 
 ```typescript
 // owd.config.ts
-import {defineDesktopConfig} from "@owdproject/core/runtime/utils/utilsDesktop"
+import {defineDesktopConfig} from "@owdproject/core/runtime/utils/utilDesktop"
 
 export default defineDesktopConfig({
     theme: '@owdproject/theme-gnome', // define here the theme you just installed

package/index.ts

@@ -1,5 +1,5 @@
 import {defineNuxtModule, createResolver, addComponentsDir, addImportsDir, installModule, addPlugin} from '@nuxt/kit'
-import {deepMerge} from '@owdproject/core/runtime/utils/utilsCommon'
+import {deepMerge} from '@owdproject/core/runtime/utils/utilCommon'
 import pkg from './package.json'
 
 export default defineNuxtModule({
@@ -176,15 +176,16 @@ export default defineNuxtModule({
 
 export * from './runtime/composables/useAppEntries'
 export * from './runtime/composables/useApplicationManager'
-export * from './runtime/composables/useApplicationState'
 export * from './runtime/composables/useDesktopManager'
 export * from './runtime/composables/useTerminalManager'
-export * from './runtime/utils/utilsApp'
-export * from './runtime/utils/utilsCommon'
-export * from './runtime/utils/utilsDebug'
-export * from './runtime/utils/utilsDesktop'
-export * from './runtime/utils/utilsTerminal'
-export * from './runtime/utils/utilsWindow'
+export * from './runtime/utils/utilApp'
+export * from './runtime/utils/utilCommon'
+export * from './runtime/utils/utilDebug'
+export * from './runtime/utils/utilDesktop'
+export * from './runtime/utils/utilTerminal'
+export * from './runtime/utils/utilWindow'
+export * from './runtime/stores/storeApplicationMeta'
+export * from './runtime/stores/storeApplicationWindows'
 export * from './runtime/stores/storeDesktop'
 export * from './runtime/stores/storeDesktopVolume'
 export * from './runtime/stores/storeDesktopWindow'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owdproject/core",
-  "version": "3.0.0-alpha.8",
+  "version": "3.0.0-alpha.9",
   "description": "Open Web Desktop core",
   "keywords": [
     "web",

package/runtime/components/Core/Window/CoreWindow.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import {ref,provide} from 'vue'
 import {computed} from "@vue/reactivity"
-import {useDesktopManager} from "../../../composables/useDesktopManager"
-import {handleWindowControllerProps} from "../../../utils/utilsWindow"
+import {useDesktopManager} from "@owdproject/core/runtime/composables/useDesktopManager"
+import {handleWindowControllerProps} from "@owdproject/core/runtime/utils/utilWindow"
 
 const props = defineProps<{
   window?: IWindowController

package/runtime/core/controllers/ApplicationController.ts

@@ -1,10 +1,11 @@
 import {nanoid} from "nanoid";
 import {WindowController} from "./WindowController";
 import {useApplicationManager} from "../../composables/useApplicationManager"
-import {useApplicationState} from "../../composables/useApplicationState"
+import {useApplicationWindowsStore} from "../../stores/storeApplicationWindows"
+import {useApplicationMetaStore} from "../../stores/storeApplicationMeta"
 import {useTerminalManager} from "../../composables/useTerminalManager"
 import {useDesktopManager} from "../../composables/useDesktopManager"
-import {debugLog, debugError} from "../../utils/utilsDebug"
+import {debugLog, debugError} from "../../utils/utilDebug"
 import {useDesktopWorkspaceStore} from "../../stores/storeDesktopWorkspace"
 import {reactive} from '@vue/reactivity'
 
@@ -31,7 +32,8 @@ export class ApplicationController implements IApplicationController {
 
         this.id = id
         this.config = config
-        this.store = useApplicationState(id)
+        this.storeWindows = useApplicationWindowsStore(id)
+        this.storeMeta = useApplicationMetaStore(id)
     }
 
     public async initApplication(): Promise<void> {
@@ -67,12 +69,16 @@ export class ApplicationController implements IApplicationController {
 
         // store
 
-        if (this.store.$persistedState) {
-            await this.store.$persistedState.isReady()
+        if (this.storeWindows.$persistedState) {
+            await this.storeWindows.$persistedState.isReady()
+        }
+
+        if (this.storeMeta.$persistedState) {
+            await this.storeMeta.$persistedState.isReady()
         }
 
         // set default meta values
-        this.store.meta = this.config.meta ?? {}
+        // this.storeMeta.meta = this.config.meta ?? {}
 
         // restore application state
         await this.restoreApplication()
@@ -94,7 +100,7 @@ export class ApplicationController implements IApplicationController {
             await this.config.onRestore(this)
         }
 
-        if (!this.store.windows || Object.keys(this.store.windows).length === 0) {
+        if (!this.storeWindows.windows || Object.keys(this.storeWindows.windows).length === 0) {
             return false
         }
 
@@ -106,8 +112,8 @@ export class ApplicationController implements IApplicationController {
     }
 
     private restoreWindows() {
-        Object.keys(this.store.windows).map(windowId => {
-            const windowStore: WindowStoredState | undefined = this.store.windows[windowId]
+        Object.keys(this.storeWindows.windows).map(windowId => {
+            const windowStore: WindowStoredState | undefined = this.storeWindows.windows[windowId]
 
             if (windowStore) {
                 this.openWindow(windowStore.model, windowStore, {isRestoring: true})
@@ -138,7 +144,7 @@ export class ApplicationController implements IApplicationController {
                 ? window.scrollY + windowConfig.position.y
                 : window.scrollY + centerY
 
-            this.store.windows[windowId] = {
+            this.storeWindows.windows[windowId] = {
                 model,
                 state: {
                     id: windowId,
@@ -153,7 +159,7 @@ export class ApplicationController implements IApplicationController {
                 }
             }
 
-            windowStoredState = this.store.windows[windowId]
+            windowStoredState = this.storeWindows.windows[windowId]
 
         } else {
 
@@ -186,7 +192,7 @@ export class ApplicationController implements IApplicationController {
     }
 
     public closeWindow(windowId: string) {
-        delete this.store.windows[windowId];
+        delete this.storeWindows.windows[windowId];
         this.windows.delete(windowId);
 
         if (this.windows.size === 0) {
@@ -195,7 +201,7 @@ export class ApplicationController implements IApplicationController {
     }
 
     public closeAllWindows() {
-        this.store.windows = {}
+        this.storeWindows.windows = {}
         this.windows.clear()
     }
 
@@ -210,7 +216,7 @@ export class ApplicationController implements IApplicationController {
     // meta
 
     get meta() {
-        return this.store.meta
+        return this.storeMeta.meta
     }
 
     getMeta(key: string) {

package/runtime/core/controllers/WindowController.ts

@@ -1,6 +1,6 @@
-import {useApplicationManager} from '../../composables/useApplicationManager'
-import {useDesktopWindowStore} from '../../stores/storeDesktopWindow'
-import {deepClone} from '../../utils/utilsCommon'
+import {useApplicationManager} from '@owdproject/core/runtime/composables/useApplicationManager'
+import {useDesktopWindowStore} from '@owdproject/core/runtime/stores/storeDesktopWindow'
+import {deepClone} from '@owdproject/core/runtime/utils/utilCommon'
 import {markRaw} from '@vue/reactivity'
 import {defineAsyncComponent} from "vue"
 

package/runtime/core/managers/ApplicationManager.ts

@@ -1,8 +1,8 @@
 import type {Reactive} from "@vue/reactivity"
 import {reactive, markRaw} from "@vue/reactivity"
 import {ApplicationController} from "../controllers/ApplicationController";
-import {normalizeApplicationConfig} from "../../utils/utilsApp"
-import {debugLog} from "../../utils/utilsDebug"
+import {normalizeApplicationConfig} from "../../utils/utilApp"
+import {debugLog} from "../../utils/utilDebug"
 
 export class ApplicationManager implements IApplicationManager {
     public apps = reactive(

package/runtime/core/managers/DesktopManager.ts

@@ -1,4 +1,4 @@
-import {deepMerge} from "../../utils/utilsCommon"
+import {deepMerge} from "@owdproject/core/runtime/utils/utilCommon"
 
 export class DesktopManager {
     public config: DesktopConfig = {} as DesktopConfig

package/runtime/core/managers/TerminalManager.ts

@@ -1,5 +1,5 @@
 import {useApplicationManager} from "../../composables/useApplicationManager"
-import {debugLog} from "../../utils/utilsDebug"
+import {debugLog} from "../../utils/utilDebug"
 
 export class TerminalManager {
     private commands: Map<string, TerminalCommand> = new Map()

package/runtime/stores/storeApplicationMeta.ts

@@ -0,0 +1,11 @@
+import {defineStore} from "pinia"
+
+export const useApplicationMetaStore = (appId: string, states: any = {}) => {
+    return defineStore(`owd/application/${appId}/meta`, () => {
+        return states
+    }, {
+        persistedState: {
+            persist: true
+        },
+    })
+}

package/runtime/{composables/useApplicationState.ts → stores/storeApplicationWindows.ts}

@@ -1,15 +1,12 @@
 import {defineStore} from "pinia"
 import {ref} from "@vue/reactivity"
 
-export const useApplicationState = (appId: string) => {
-    return defineStore(`owd/application/${appId}`, () => {
-        const meta: Ref<any> = ref({})
-
+export const useApplicationWindowsStore = (appId: string) => {
+    return defineStore(`owd/application/${appId}/windows`, () => {
         const windows: Ref<{[windowId: string]: WindowStoredState}> = ref({})
 
         return {
             windows,
-            meta,
         }
     }, {
         persistedState: {