@owdproject/core 3.0.0-alpha.9 → 3.1.1

package/runtime/composables/useClipboardFs.ts

@@ -0,0 +1,25 @@
+import { ref } from 'vue';
+
+type ClipboardOperation = 'copy' | 'cut';
+
+const clipboardPath = ref<string | null>(null);
+const clipboardType = ref<ClipboardOperation | null>(null);
+
+export function useClipboardFs() {
+  function setClipboard(path: string, type: ClipboardOperation) {
+    clipboardPath.value = path;
+    clipboardType.value = type;
+  }
+
+  function clearClipboard() {
+    clipboardPath.value = null;
+    clipboardType.value = null;
+  }
+
+  return {
+    clipboardPath,
+    clipboardType,
+    setClipboard,
+    clearClipboard,
+  };
+}

package/runtime/core/controllers/ApplicationController.ts

@@ -156,7 +156,8 @@ export class ApplicationController implements IApplicationController {
                     },
                     createdAt: +new Date(),
                     workspace: desktopWorkspaceStore.active
-                }
+                },
+                meta
             }
 
             windowStoredState = this.storeWindows.windows[windowId]
@@ -209,6 +210,14 @@ export class ApplicationController implements IApplicationController {
         return this.windows;
     }
 
+    public getWindowsByModel(model: string): IWindowController[] {
+      return Array.from(this.windows.values()).filter(w => w.model === model)
+    }
+
+    public getFirstWindowByModel(model: string): IWindowController | undefined {
+        return Array.from(this.windows.values()).find(w => w.model === model)
+    }
+
     public setRunning(value: boolean): void {
         this.isRunning = value
     }

package/runtime/core/controllers/WindowController.ts

@@ -1,6 +1,6 @@
-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 {useApplicationManager} from '../../composables/useApplicationManager'
+import {useDesktopWindowStore} from '../../stores/storeDesktopWindow'
+import {deepClone} from '../../utils/utilCommon'
 import {markRaw} from '@vue/reactivity'
 import {defineAsyncComponent} from "vue"
 
@@ -48,7 +48,6 @@ export class WindowController implements IWindowController {
 
     public override: WindowOverride = {}
 
-    public meta: any = {}
     private storedState: WindowStoredState
 
     constructor(
@@ -166,6 +165,12 @@ export class WindowController implements IWindowController {
         }
     }
 
+    // meta
+
+    get meta() {
+        return this.storedState.meta
+    }
+
     // position
 
     private setPosition(data: { x: number, y: number}) {
@@ -422,4 +427,4 @@ export class WindowController implements IWindowController {
             resetTitleOverride: this.resetTitleOverride.bind(this),
         }
     }
-}
+}

package/runtime/core/managers/DesktopManager.ts

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

package/runtime/core/managers/TerminalManager.ts

@@ -32,11 +32,13 @@ export class TerminalManager {
         }
 
         if (!this.commands.has(name)) {
-            throw new Error(`Command "${name}" not found`)
+            return {
+              message: `Command "${name}" not found`
+            }
         }
 
-        const cmd = this.commands.get(name)!
+        const application = this.commands.get(name)!
 
-        return applicationManager.execAppCommand(cmd.applicationId, input)
+        return applicationManager.execAppCommand(application.applicationId, input)
     }
-}
+}

package/runtime/stores/storeApplicationWindows.ts

@@ -1,5 +1,5 @@
 import {defineStore} from "pinia"
-import {ref} from "@vue/reactivity"
+import {ref} from "vue"
 
 export const useApplicationWindowsStore = (appId: string) => {
     return defineStore(`owd/application/${appId}/windows`, () => {

package/runtime/stores/storeDesktop.ts

@@ -1,5 +1,5 @@
 import {defineStore} from "pinia"
-import {ref} from "@vue/reactivity"
+import {ref} from "vue"
 
 export const useDesktopStore = defineStore('owd/desktop', () => {
     const state = ref<{
@@ -24,7 +24,7 @@ export const useDesktopStore = defineStore('owd/desktop', () => {
             master: 100,
         },
         window: {
-            positionZ: 10
+            positionZ: 0
         }
     })
 
@@ -36,4 +36,4 @@ export const useDesktopStore = defineStore('owd/desktop', () => {
     persistedState: {
         persist: true
     },
-})
+})

package/runtime/stores/storeDesktopVolume.ts

@@ -1,6 +1,6 @@
 import {defineStore} from "pinia"
-import {computed} from "@vue/reactivity"
-import {useDesktopStore} from "../stores/storeDesktop"
+import {computed} from "vue"
+import {useDesktopStore} from "./storeDesktop"
 
 export const useDesktopVolumeStore = defineStore('owd/desktop/volume', () => {
     const desktopStore = useDesktopStore()
@@ -15,4 +15,4 @@ export const useDesktopVolumeStore = defineStore('owd/desktop/volume', () => {
         master,
         setMasterVolume
     }
-})
+})

package/runtime/stores/storeDesktopWindow.ts

@@ -1,6 +1,6 @@
 import {defineStore} from "pinia"
-import {computed} from "@vue/reactivity"
-import {useDesktopStore} from "../stores/storeDesktop"
+import {computed} from "vue"
+import {useDesktopStore} from "./storeDesktop"
 
 export const useDesktopWindowStore = defineStore('owd/desktop/window', () => {
     const desktopStore = useDesktopStore()
@@ -17,4 +17,4 @@ export const useDesktopWindowStore = defineStore('owd/desktop/window', () => {
         positionZ,
         incrementPositionZ
     }
-})
+})

package/runtime/stores/storeDesktopWorkspace.ts

@@ -1,7 +1,7 @@
 import {defineStore} from "pinia"
-import {computed} from "@vue/reactivity"
+import {computed} from "vue"
+import {useDesktopStore} from "./storeDesktop"
 import {nanoid} from "nanoid";
-import {useDesktopStore} from "../stores/storeDesktop"
 
 export const useDesktopWorkspaceStore = defineStore('owd/desktop/workspace', () => {
     const desktopStore = useDesktopStore()
@@ -56,4 +56,4 @@ export const useDesktopWorkspaceStore = defineStore('owd/desktop/workspace', ()
         setOverview,
         setWorkspace,
     }
-})
+})

package/runtime/utils/utilApp.ts

@@ -23,11 +23,10 @@ export function normalizeApplicationConfig(config: ApplicationConfig): Applicati
 }
 
 export function registerTailwindPath(nuxt: Nuxt, path: string) {
-    nuxt.options.runtimeConfig = nuxt.options.runtimeConfig || {}
-    nuxt.options.runtimeConfig.owd = nuxt.options.runtimeConfig.owd || {}
-    nuxt.options.runtimeConfig.owd.tailwindPaths = nuxt.options.runtimeConfig.owd.tailwindPaths || []
+    nuxt.options.runtimeConfig.app.owd = nuxt.options.runtimeConfig.app.owd || {}
+    nuxt.options.runtimeConfig.app.owd.tailwindPaths = nuxt.options.runtimeConfig.app.owd.tailwindPaths || []
 
-    if (!nuxt.options.runtimeConfig.owd.tailwindPaths.includes(path)) {
-        nuxt.options.runtimeConfig.owd.tailwindPaths.push(path)
+    if (!nuxt.options.runtimeConfig.app.owd.tailwindPaths.includes(path)) {
+        nuxt.options.runtimeConfig.app.owd.tailwindPaths.push(path)
     }
-}
+}

package/runtime/utils/utilCommon.ts

@@ -2,7 +2,7 @@ export function deepClone<T>(obj: T): T {
     return JSON.parse(JSON.stringify(obj))
 }
 
-export function deepEqual(obj1, obj2) {
+export function deepEqual(obj1: any, obj2: any) {
     const keys1 = Object.keys(obj1);
     const keys2 = Object.keys(obj2);
     if (keys1.length !== keys2.length) {
@@ -55,4 +55,4 @@ export function deepMerge<T>(target: T, source: Partial<T>): T {
     }
 
     return source as T
-}
+}

package/runtime/utils/utilDesktop.ts

@@ -1,5 +1,4 @@
 import {useApplicationManager} from "../composables/useApplicationManager";
-import {useDesktopManager} from "../composables/useDesktopManager";
 
 export function defineDesktopApp(config: ApplicationConfig) {
     const applicationManager = useApplicationManager()
@@ -8,4 +7,4 @@ export function defineDesktopApp(config: ApplicationConfig) {
 
 export function defineDesktopConfig(config: DesktopConfig) {
     return config
-}
+}

package/test/basic.test.ts

@@ -0,0 +1,15 @@
+import { fileURLToPath } from 'node:url'
+import { describe, it, expect } from 'vitest'
+import { setup, $fetch } from '@nuxt/test-utils/e2e'
+
+describe('ssr', async () => {
+  await setup({
+    rootDir: fileURLToPath(new URL('./fixtures/basic', import.meta.url)),
+  })
+
+  it('renders the index page', async () => {
+    // Get response to a server-rendered page with `$fetch`.
+    const html = await $fetch('/')
+    expect(html).toContain('<div>basic</div>')
+  })
+})

package/test/fixtures/basic/app.vue

@@ -0,0 +1,6 @@
+<template>
+  <div>basic</div>
+</template>
+
+<script setup>
+</script>

package/test/fixtures/basic/nuxt.config.ts

@@ -0,0 +1,7 @@
+import MyModule from '../../../module'
+
+export default defineNuxtConfig({
+  modules: [
+    MyModule,
+  ],
+})

package/test/fixtures/basic/package.json

@@ -0,0 +1,5 @@
+{
+  "private": true,
+  "name": "basic",
+  "type": "module"
+}

package/tsconfig.app.json

@@ -0,0 +1,31 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src",
+    "jsx": "preserve",
+    "jsxImportSource": "vue",
+    "resolveJsonModule": true,
+    "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo"
+  },
+  "include": [".nuxt/nuxt.d.ts", "runtime/**/*", "types/index.d.ts"],
+  "exclude": [
+    "out-tsc",
+    "dist",
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "runtime/**/*.test.ts",
+    "runtime/**/*.spec.ts",
+    "runtime/**/*.test.tsx",
+    "runtime/**/*.spec.tsx",
+    "runtime/**/*.test.js",
+    "runtime/**/*.spec.js",
+    "runtime/**/*.test.jsx",
+    "runtime/**/*.spec.jsx",
+    "eslint.config.js",
+    "eslint.config.cjs",
+    "eslint.config.mjs"
+  ]
+}

package/tsconfig.json

@@ -1,3 +1,12 @@
 {
-  "extends": "../.nuxt/tsconfig.json",
-}
+  "files": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    },
+  ],
+  "extends": "../../tsconfig.base.json"
+}

package/tsconfig.spec.json

@@ -0,0 +1,37 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/vitest",
+    "types": [
+      "vitest/globals",
+      "vitest/importMeta",
+      "vite/client",
+      "node",
+      "vitest"
+    ],
+    "jsx": "preserve",
+    "jsxImportSource": "vue",
+    "resolveJsonModule": true
+  },
+  "include": [
+    ".nuxt/nuxt.d.ts",
+    "vite.config.ts",
+    "vite.config.mts",
+    "vitest.config.ts",
+    "vitest.config.mts",
+    "runtime/**/*.test.ts",
+    "runtime/**/*.spec.ts",
+    "runtime/**/*.test.tsx",
+    "runtime/**/*.spec.tsx",
+    "runtime/**/*.test.js",
+    "runtime/**/*.spec.js",
+    "runtime/**/*.test.jsx",
+    "runtime/**/*.spec.jsx",
+    "runtime/**/*.d.ts"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    }
+  ]
+}

package/types/{owd.d.ts → index.d.ts}

@@ -1,3 +1,14 @@
+import type { Nuxt } from '@nuxt/schema';
+import { useApplicationManager } from '../runtime/composables/useApplicationManager';
+
+declare module 'nuxt/schema' {
+  interface PublicRuntimeConfig {
+    owd: {
+      tailwindPaths: []
+    };
+  }
+}
+
 interface IApplicationManager {
     apps: Map<string, IApplicationController>
 
@@ -16,7 +27,7 @@ interface IApplicationManager {
     closeApp(id: string): void
 
     launchAppEntry(id: string, entry: string): Promise<IApplicationController | undefined | void>
-    execAppCommand(id: string, command: string): Promise<CommandOutput | void>
+    execAppCommand(id: string, command: string, meta: undefined | any): Promise<CommandOutput | void>
 
     isAppDefined(id: string): boolean
 
@@ -73,7 +84,11 @@ interface IApplicationController {
 
     restoreApplication(): Promise<boolean>
 
-    openWindow(model: string, windowStoredState?: WindowStoredState, meta?: {
+    getWindowsByModel(model: string): IWindowController[]
+
+    getFirstWindowByModel(model: string): IWindowController | undefined
+
+    openWindow(model: string, windowStoredState?: WindowStoredState, options?: {
         isRestoring?: boolean
     })
 
@@ -83,6 +98,7 @@ interface IApplicationController {
 
     execCommand(command: string): Promise<CommandOutput | void>
 
+    // deprecated
     get windowsOpened(): Reactive<Map<string, IWindowController>>
 }
 
@@ -191,6 +207,7 @@ interface WindowConfig {
 interface WindowStoredState {
     model: string,
     state: WindowState
+    meta: any
 }
 
 interface WindowOverride {
@@ -333,4 +350,10 @@ interface DefaultAppsConfig {
 interface DefaultAppConfig {
     application: IApplicationController
     entry: ApplicationEntry
-}
+}
+
+export function defineDesktopApp(config: ApplicationConfig)
+export function defineDesktopConfig(config: DesktopConfig)
+export function registerTailwindPath(nuxt: Nuxt, path: string): void;
+
+export {}

package/vitest.config.ts

@@ -0,0 +1,24 @@
+/// <reference types='vitest' />
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
+
+export default defineConfig(() => ({
+  root: __dirname,
+  cacheDir: '../../node_modules/.vite/packages/core',
+  plugins: [vue()],
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [ nxViteTsPaths() ],
+  // },
+  test: {
+    watch: false,
+    globals: true,
+    environment: 'jsdom',
+    include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: './test-output/vitest/coverage',
+      provider: 'v8' as const,
+    },
+  },
+}));