defuss-desktop 0.0.3 → 0.0.4

package/README.md

@@ -92,10 +92,10 @@ Integrating `defuss-wm` in your project
 
 ```bash
 # install a decent package manager
-npm i -g pnpm@^9.13.2
+npm i -g bun@^1.3.9
 
 # from your project root folder, add defuss-wm to your dependencies
-pnpm install defuss-wm
+bun install defuss-wm
 ```
 
 #### 2. Set up your desktop environment:
@@ -198,8 +198,8 @@ All commands are run from the root of the project, from a terminal:
 
 | Command       | Action                                                                                                                                                                                                                           |
 | :------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `pnpm build`    | Build a new version of the window manager. |
-| `pnpm test`    | Run the test suite for `defuss-wm`. |
+| `bun build`    | Build a new version of the window manager. |
+| `bun test`    | Run the test suite for `defuss-wm`. |
 
 ---
 

package/dist/index.cjs

@@ -24,6 +24,124 @@ function Button({
   );
 }
 
+const defaultTaskbarOptions = {
+  position: "bottom",
+  stateful: false,
+  theme: "default",
+  size: "medium"
+};
+class TaskbarManager {
+  position;
+  theme;
+  // e.g., 'windows-xp', 'macos', etc.
+  size;
+  constructor(options = defaultTaskbarOptions) {
+    this.position = options.position || "bottom";
+    this.theme = options.theme || "default";
+    this.size = options.size || "medium";
+    if (options.stateful) ;
+  }
+  getDimensions() {
+    const el = document.querySelector(".taskbar");
+    if (!el) {
+      return { width: 0, height: 0 };
+    }
+    return {
+      width: el.clientWidth,
+      height: el.clientHeight
+    };
+  }
+}
+globalThis.__defussTaskbarManager = globalThis.__defussTaskbarManager || new TaskbarManager();
+const taskbarManager = globalThis.__defussTaskbarManager;
+
+class DefussDesktopAppIcon {
+  constructor(config) {
+    this.config = config;
+  }
+}
+const defaultDesktopOptions = {
+  icons: [],
+  backgroundColor: "#000"
+};
+class DesktopManager {
+  constructor(options = defaultDesktopOptions) {
+    this.options = options;
+  }
+  el;
+  state;
+  resizeObserver;
+  resizeCallbacks = /* @__PURE__ */ new Set();
+  init(el, options = this.options) {
+    this.options = options;
+    this.el = el;
+    this.state = this.state || {
+      icons: this.options.icons.map((icon) => icon.config)
+    };
+    this.setupResizeObserver();
+    this.render(el);
+  }
+  render(el) {
+    el.style.backgroundColor = this.options.backgroundColor;
+    if (this.options.backgroundImage) {
+      el.style.backgroundImage = `url(${this.options.backgroundImage})`;
+    }
+    if (this.options.backgroundImageSize) {
+      el.style.backgroundSize = this.options.backgroundImageSize || "cover";
+    }
+    if (this.options.backgroundRepeat) {
+      el.style.backgroundRepeat = this.options.backgroundRepeat || "no-repeat";
+    }
+    if (this.options.backgroundPosition) {
+      el.style.backgroundPosition = this.options.backgroundPosition || "center";
+    }
+  }
+  addIcon(icon) {
+    this.options.icons.push(icon);
+    console.log(`Icon added: ${icon.config.name}`);
+  }
+  getDimensions() {
+    if (!this.el) {
+      throw new Error("Desktop not initialized. Call init() first.");
+    }
+    return {
+      width: this.el.offsetWidth,
+      height: this.el.offsetHeight - taskbarManager.getDimensions().height
+      // destop is root element minus taskbar height
+    };
+  }
+  setupResizeObserver() {
+    if (!this.el) return;
+    if (this.resizeObserver) {
+      this.resizeObserver.disconnect();
+    }
+    this.resizeObserver = new ResizeObserver(() => {
+      const dimensions = this.getDimensions();
+      this.resizeCallbacks.forEach((callback) => {
+        try {
+          callback(dimensions);
+        } catch (error) {
+          console.error("Error in desktop resize callback:", error);
+        }
+      });
+    });
+    this.resizeObserver.observe(this.el);
+  }
+  /**
+   * Register a callback for desktop resize events
+   * @param callback Function to call when desktop is resized
+   * @returns Unregister function to remove the callback
+   */
+  onResize(callback) {
+    this.resizeCallbacks.add(callback);
+    return () => {
+      this.resizeCallbacks.delete(callback);
+    };
+  }
+}
+globalThis.__defussDesktopManager = globalThis.__defussDesktopManager || new DesktopManager();
+const desktopManager = globalThis.__defussDesktopManager;
+
 const defaultWindowOptions = {
   title: "Untitled",
   resizable: true,
@@ -633,93 +751,6 @@ const LogonScreen = ({
   ] });
 };
 
-class DefussDesktopAppIcon {
-  constructor(config) {
-    this.config = config;
-  }
-}
-const defaultDesktopOptions = {
-  icons: [],
-  backgroundColor: "#000"
-};
-class DesktopManager {
-  constructor(options = defaultDesktopOptions) {
-    this.options = options;
-  }
-  el;
-  state;
-  resizeObserver;
-  resizeCallbacks = /* @__PURE__ */ new Set();
-  init(el, options = this.options) {
-    this.options = options;
-    this.el = el;
-    this.state = this.state || {
-      icons: this.options.icons.map((icon) => icon.config)
-    };
-    this.setupResizeObserver();
-    this.render(el);
-  }
-  render(el) {
-    el.style.backgroundColor = this.options.backgroundColor;
-    if (this.options.backgroundImage) {
-      el.style.backgroundImage = `url(${this.options.backgroundImage})`;
-    }
-    if (this.options.backgroundImageSize) {
-      el.style.backgroundSize = this.options.backgroundImageSize || "cover";
-    }
-    if (this.options.backgroundRepeat) {
-      el.style.backgroundRepeat = this.options.backgroundRepeat || "no-repeat";
-    }
-    if (this.options.backgroundPosition) {
-      el.style.backgroundPosition = this.options.backgroundPosition || "center";
-    }
-  }
-  addIcon(icon) {
-    this.options.icons.push(icon);
-    console.log(`Icon added: ${icon.config.name}`);
-  }
-  getDimensions() {
-    if (!this.el) {
-      throw new Error("Desktop not initialized. Call init() first.");
-    }
-    return {
-      width: this.el.offsetWidth,
-      height: this.el.offsetHeight - taskbarManager.getDimensions().height
-      // destop is root element minus taskbar height
-    };
-  }
-  setupResizeObserver() {
-    if (!this.el) return;
-    if (this.resizeObserver) {
-      this.resizeObserver.disconnect();
-    }
-    this.resizeObserver = new ResizeObserver(() => {
-      const dimensions = this.getDimensions();
-      this.resizeCallbacks.forEach((callback) => {
-        try {
-          callback(dimensions);
-        } catch (error) {
-          console.error("Error in desktop resize callback:", error);
-        }
-      });
-    });
-    this.resizeObserver.observe(this.el);
-  }
-  /**
-   * Register a callback for desktop resize events
-   * @param callback Function to call when desktop is resized
-   * @returns Unregister function to remove the callback
-   */
-  onResize(callback) {
-    this.resizeCallbacks.add(callback);
-    return () => {
-      this.resizeCallbacks.delete(callback);
-    };
-  }
-}
-globalThis.__defussDesktopManager = globalThis.__defussDesktopManager || new DesktopManager();
-const desktopManager = globalThis.__defussDesktopManager;
-
 const StartMenu = () => {
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { class: "slide-open crt", children: [
     /* @__PURE__ */ jsxRuntime.jsx("div", { class: "top", children: /* @__PURE__ */ jsxRuntime.jsx("h1", { children: "Aron Homberg" }) }),
@@ -857,15 +888,12 @@ class DequeryWithWindowManager extends defuss.CallChainImpl {
   */
   // register an app to the desktop shell
   createDesktopApp(options) {
-    return defuss.createCall(this, "createDesktopApp", async () => {
-      return new DefussApp(options);
-    });
+    new DefussApp(options);
+    return this;
   }
   // create a desktop app icon
   createDesktopAppIcon(options) {
-    return defuss.createCall(this, "createDesktopAppIcon", async () => {
-      return new DefussDesktopAppIcon(options);
-    });
+    return this;
   }
 }
 const $ = defuss.dequery.extend(DequeryWithWindowManager, [
@@ -874,37 +902,6 @@ const $ = defuss.dequery.extend(DequeryWithWindowManager, [
   "createDesktopAppIcon"
 ]);
 
-const defaultTaskbarOptions = {
-  position: "bottom",
-  stateful: false,
-  theme: "default",
-  size: "medium"
-};
-class TaskbarManager {
-  position;
-  theme;
-  // e.g., 'windows-xp', 'macos', etc.
-  size;
-  constructor(options = defaultTaskbarOptions) {
-    this.position = options.position || "bottom";
-    this.theme = options.theme || "default";
-    this.size = options.size || "medium";
-    if (options.stateful) ;
-  }
-  getDimensions() {
-    const el = document.querySelector(".taskbar");
-    if (!el) {
-      return { width: 0, height: 0 };
-    }
-    return {
-      width: el.clientWidth,
-      height: el.clientHeight
-    };
-  }
-}
-globalThis.__defussTaskbarManager = globalThis.__defussTaskbarManager || new TaskbarManager();
-const taskbarManager = globalThis.__defussTaskbarManager;
-
 const defaultSystemSoundFilePaths = [
   "/sounds/balloon.ogg",
   "/sounds/batterycritical.ogg",

package/dist/index.d.cts

@@ -97,8 +97,8 @@ declare const StartButton: () => JSX.Element;
 declare const StartMenu: () => JSX.Element;
 
 declare class DequeryWithWindowManager<NT> extends CallChainImpl<NT, DequeryWithWindowManager<NT> & Dequery<NT>> {
-    createDesktopApp(options: DefussAppConfig): PromiseLike<DefussApp>;
-    createDesktopAppIcon(options: DesktopIconConfig): PromiseLike<DefussDesktopAppIcon>;
+    createDesktopApp(options: DefussAppConfig): this & Dequery<NT>;
+    createDesktopAppIcon(options: DesktopIconConfig): this & Dequery<NT>;
 }
 /**
  * Extended dequery function with window management capabilities.

package/dist/index.d.mts

@@ -97,8 +97,8 @@ declare const StartButton: () => JSX.Element;
 declare const StartMenu: () => JSX.Element;
 
 declare class DequeryWithWindowManager<NT> extends CallChainImpl<NT, DequeryWithWindowManager<NT> & Dequery<NT>> {
-    createDesktopApp(options: DefussAppConfig): PromiseLike<DefussApp>;
-    createDesktopAppIcon(options: DesktopIconConfig): PromiseLike<DefussDesktopAppIcon>;
+    createDesktopApp(options: DefussAppConfig): this & Dequery<NT>;
+    createDesktopAppIcon(options: DesktopIconConfig): this & Dequery<NT>;
 }
 /**
  * Extended dequery function with window management capabilities.

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { createRef, $ as $$1, dequery, CallChainImpl, createCall } from 'defuss';
+import { createRef, $ as $$1, dequery, CallChainImpl } from 'defuss';
 import { debounce, throttle } from 'defuss-runtime';
 import { jsx, jsxs } from 'defuss/jsx-runtime';
 import { access, transval, rule } from 'defuss-transval';
@@ -22,6 +22,124 @@ function Button({
   );
 }
 
+const defaultTaskbarOptions = {
+  position: "bottom",
+  stateful: false,
+  theme: "default",
+  size: "medium"
+};
+class TaskbarManager {
+  position;
+  theme;
+  // e.g., 'windows-xp', 'macos', etc.
+  size;
+  constructor(options = defaultTaskbarOptions) {
+    this.position = options.position || "bottom";
+    this.theme = options.theme || "default";
+    this.size = options.size || "medium";
+    if (options.stateful) ;
+  }
+  getDimensions() {
+    const el = document.querySelector(".taskbar");
+    if (!el) {
+      return { width: 0, height: 0 };
+    }
+    return {
+      width: el.clientWidth,
+      height: el.clientHeight
+    };
+  }
+}
+globalThis.__defussTaskbarManager = globalThis.__defussTaskbarManager || new TaskbarManager();
+const taskbarManager = globalThis.__defussTaskbarManager;
+
+class DefussDesktopAppIcon {
+  constructor(config) {
+    this.config = config;
+  }
+}
+const defaultDesktopOptions = {
+  icons: [],
+  backgroundColor: "#000"
+};
+class DesktopManager {
+  constructor(options = defaultDesktopOptions) {
+    this.options = options;
+  }
+  el;
+  state;
+  resizeObserver;
+  resizeCallbacks = /* @__PURE__ */ new Set();
+  init(el, options = this.options) {
+    this.options = options;
+    this.el = el;
+    this.state = this.state || {
+      icons: this.options.icons.map((icon) => icon.config)
+    };
+    this.setupResizeObserver();
+    this.render(el);
+  }
+  render(el) {
+    el.style.backgroundColor = this.options.backgroundColor;
+    if (this.options.backgroundImage) {
+      el.style.backgroundImage = `url(${this.options.backgroundImage})`;
+    }
+    if (this.options.backgroundImageSize) {
+      el.style.backgroundSize = this.options.backgroundImageSize || "cover";
+    }
+    if (this.options.backgroundRepeat) {
+      el.style.backgroundRepeat = this.options.backgroundRepeat || "no-repeat";
+    }
+    if (this.options.backgroundPosition) {
+      el.style.backgroundPosition = this.options.backgroundPosition || "center";
+    }
+  }
+  addIcon(icon) {
+    this.options.icons.push(icon);
+    console.log(`Icon added: ${icon.config.name}`);
+  }
+  getDimensions() {
+    if (!this.el) {
+      throw new Error("Desktop not initialized. Call init() first.");
+    }
+    return {
+      width: this.el.offsetWidth,
+      height: this.el.offsetHeight - taskbarManager.getDimensions().height
+      // destop is root element minus taskbar height
+    };
+  }
+  setupResizeObserver() {
+    if (!this.el) return;
+    if (this.resizeObserver) {
+      this.resizeObserver.disconnect();
+    }
+    this.resizeObserver = new ResizeObserver(() => {
+      const dimensions = this.getDimensions();
+      this.resizeCallbacks.forEach((callback) => {
+        try {
+          callback(dimensions);
+        } catch (error) {
+          console.error("Error in desktop resize callback:", error);
+        }
+      });
+    });
+    this.resizeObserver.observe(this.el);
+  }
+  /**
+   * Register a callback for desktop resize events
+   * @param callback Function to call when desktop is resized
+   * @returns Unregister function to remove the callback
+   */
+  onResize(callback) {
+    this.resizeCallbacks.add(callback);
+    return () => {
+      this.resizeCallbacks.delete(callback);
+    };
+  }
+}
+globalThis.__defussDesktopManager = globalThis.__defussDesktopManager || new DesktopManager();
+const desktopManager = globalThis.__defussDesktopManager;
+
 const defaultWindowOptions = {
   title: "Untitled",
   resizable: true,
@@ -631,93 +749,6 @@ const LogonScreen = ({
   ] });
 };
 
-class DefussDesktopAppIcon {
-  constructor(config) {
-    this.config = config;
-  }
-}
-const defaultDesktopOptions = {
-  icons: [],
-  backgroundColor: "#000"
-};
-class DesktopManager {
-  constructor(options = defaultDesktopOptions) {
-    this.options = options;
-  }
-  el;
-  state;
-  resizeObserver;
-  resizeCallbacks = /* @__PURE__ */ new Set();
-  init(el, options = this.options) {
-    this.options = options;
-    this.el = el;
-    this.state = this.state || {
-      icons: this.options.icons.map((icon) => icon.config)
-    };
-    this.setupResizeObserver();
-    this.render(el);
-  }
-  render(el) {
-    el.style.backgroundColor = this.options.backgroundColor;
-    if (this.options.backgroundImage) {
-      el.style.backgroundImage = `url(${this.options.backgroundImage})`;
-    }
-    if (this.options.backgroundImageSize) {
-      el.style.backgroundSize = this.options.backgroundImageSize || "cover";
-    }
-    if (this.options.backgroundRepeat) {
-      el.style.backgroundRepeat = this.options.backgroundRepeat || "no-repeat";
-    }
-    if (this.options.backgroundPosition) {
-      el.style.backgroundPosition = this.options.backgroundPosition || "center";
-    }
-  }
-  addIcon(icon) {
-    this.options.icons.push(icon);
-    console.log(`Icon added: ${icon.config.name}`);
-  }
-  getDimensions() {
-    if (!this.el) {
-      throw new Error("Desktop not initialized. Call init() first.");
-    }
-    return {
-      width: this.el.offsetWidth,
-      height: this.el.offsetHeight - taskbarManager.getDimensions().height
-      // destop is root element minus taskbar height
-    };
-  }
-  setupResizeObserver() {
-    if (!this.el) return;
-    if (this.resizeObserver) {
-      this.resizeObserver.disconnect();
-    }
-    this.resizeObserver = new ResizeObserver(() => {
-      const dimensions = this.getDimensions();
-      this.resizeCallbacks.forEach((callback) => {
-        try {
-          callback(dimensions);
-        } catch (error) {
-          console.error("Error in desktop resize callback:", error);
-        }
-      });
-    });
-    this.resizeObserver.observe(this.el);
-  }
-  /**
-   * Register a callback for desktop resize events
-   * @param callback Function to call when desktop is resized
-   * @returns Unregister function to remove the callback
-   */
-  onResize(callback) {
-    this.resizeCallbacks.add(callback);
-    return () => {
-      this.resizeCallbacks.delete(callback);
-    };
-  }
-}
-globalThis.__defussDesktopManager = globalThis.__defussDesktopManager || new DesktopManager();
-const desktopManager = globalThis.__defussDesktopManager;
-
 const StartMenu = () => {
   return /* @__PURE__ */ jsxs("div", { class: "slide-open crt", children: [
     /* @__PURE__ */ jsx("div", { class: "top", children: /* @__PURE__ */ jsx("h1", { children: "Aron Homberg" }) }),
@@ -855,15 +886,12 @@ class DequeryWithWindowManager extends CallChainImpl {
   */
   // register an app to the desktop shell
   createDesktopApp(options) {
-    return createCall(this, "createDesktopApp", async () => {
-      return new DefussApp(options);
-    });
+    new DefussApp(options);
+    return this;
   }
   // create a desktop app icon
   createDesktopAppIcon(options) {
-    return createCall(this, "createDesktopAppIcon", async () => {
-      return new DefussDesktopAppIcon(options);
-    });
+    return this;
   }
 }
 const $ = dequery.extend(DequeryWithWindowManager, [
@@ -872,37 +900,6 @@ const $ = dequery.extend(DequeryWithWindowManager, [
   "createDesktopAppIcon"
 ]);
 
-const defaultTaskbarOptions = {
-  position: "bottom",
-  stateful: false,
-  theme: "default",
-  size: "medium"
-};
-class TaskbarManager {
-  position;
-  theme;
-  // e.g., 'windows-xp', 'macos', etc.
-  size;
-  constructor(options = defaultTaskbarOptions) {
-    this.position = options.position || "bottom";
-    this.theme = options.theme || "default";
-    this.size = options.size || "medium";
-    if (options.stateful) ;
-  }
-  getDimensions() {
-    const el = document.querySelector(".taskbar");
-    if (!el) {
-      return { width: 0, height: 0 };
-    }
-    return {
-      width: el.clientWidth,
-      height: el.clientHeight
-    };
-  }
-}
-globalThis.__defussTaskbarManager = globalThis.__defussTaskbarManager || new TaskbarManager();
-const taskbarManager = globalThis.__defussTaskbarManager;
-
 const defaultSystemSoundFilePaths = [
   "/sounds/balloon.ogg",
   "/sounds/batterycritical.ogg",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defuss-desktop",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -19,9 +19,9 @@
     "type": "git"
   },
   "scripts": {
-    "clean": "rm -rf ./dist && rm -rf ./node_modules/.pnpm",
-    "pretest": "pnpm run build",
-    "prebuild": "pnpm run clean",
+    "clean": "rm -rf ./dist && rm -rf ./node_modules/.bun",
+    "pretest": "bun run build",
+    "prebuild": "bun run clean",
     "build": "pkgroll",
     "postbuild": "npm run copy-scss",
     "copy-scss": "mkdir -p dist/scss dist/themes && cp index.scss dist/ && cp xp.scss dist/ && cp -r scss/* dist/scss/ && cp -r themes/* dist/themes/",
@@ -53,9 +53,9 @@
     "node": "^18.17.1 || ^20.3.0 || >=21.0.0"
   },
   "dependencies": {
-    "defuss": "workspace:*",
-    "defuss-runtime": "workspace:*",
-    "defuss-transval": "workspace:*"
+    "defuss": "^3.4.0",
+    "defuss-runtime": "^1.3.1",
+    "defuss-transval": "^1.3.0"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^4.0.17",