@noxfly/noxus 3.0.0-dev.1 → 3.0.0-dev.3

package/README.md

@@ -451,9 +451,9 @@ class UserRepository {
 
 ```ts
 // preload.ts
-import { createPreloadBridge } from '@noxfly/noxus';
+import { exposeNoxusBridge } from '@noxfly/noxus/renderer';
 
-createPreloadBridge(); // exposes window.__noxus__ to the renderer
+exposeNoxusBridge(); // exposes window.__noxus__ to the renderer
 ```
 
 ### IPC client

package/dist/child.js

@@ -129,6 +129,9 @@ var init_app_injector = __esm({
           return this._resolveForwardRef(target);
         }
         const k = keyOf(target);
+        if (this.singletons.has(k)) {
+          return this.singletons.get(k);
+        }
         const binding = this.bindings.get(k);
         if (!binding) {
           const name = target instanceof Token ? target.description : target.name ?? "unknown";

package/dist/child.mjs

@@ -118,6 +118,9 @@ var init_app_injector = __esm({
           return this._resolveForwardRef(target);
         }
         const k = keyOf(target);
+        if (this.singletons.has(k)) {
+          return this.singletons.get(k);
+        }
         const binding = this.bindings.get(k);
         if (!binding) {
           const name = target instanceof Token ? target.description : target.name ?? "unknown";

package/dist/main.d.mts

@@ -347,6 +347,7 @@ declare class WindowManager {
      */
     createSplash(options?: Electron.BrowserWindowConstructorOptions & {
         animationDuration?: number;
+        expandToWorkArea?: boolean;
     }): Promise<BrowserWindow>;
     /** Returns all currently open windows. */
     getAll(): BrowserWindow[];

package/dist/main.d.ts

@@ -347,6 +347,7 @@ declare class WindowManager {
      */
     createSplash(options?: Electron.BrowserWindowConstructorOptions & {
         animationDuration?: number;
+        expandToWorkArea?: boolean;
     }): Promise<BrowserWindow>;
     /** Returns all currently open windows. */
     getAll(): BrowserWindow[];

package/dist/main.js

@@ -133,6 +133,9 @@ var init_app_injector = __esm({
           return this._resolveForwardRef(target);
         }
         const k = keyOf(target);
+        if (this.singletons.has(k)) {
+          return this.singletons.get(k);
+        }
         const binding = this.bindings.get(k);
         if (!binding) {
           const name = target instanceof Token ? target.description : target.name ?? "unknown";
@@ -1425,18 +1428,24 @@ var WindowManager = class {
    * win.loadFile('index.html');
    */
   async createSplash(options = {}) {
-    const { animationDuration = 600, ...bwOptions } = options;
+    const {
+      animationDuration = 10,
+      expandToWorkArea = true,
+      ...bwOptions
+    } = options;
     const win = new import_main.BrowserWindow({
       width: 600,
       height: 600,
       center: true,
-      frame: false,
       show: true,
       ...bwOptions
     });
     this._register(win, true);
     Logger.log(`[WindowManager] Splash window #${win.id} created`);
-    await this._expandToWorkArea(win, animationDuration);
+    if (expandToWorkArea) {
+      await (() => new Promise((r) => setTimeout(r, 500)))();
+      await this._expandToWorkArea(win, animationDuration);
+    }
     return win;
   }
   // -------------------------------------------------------------------------
@@ -1495,7 +1504,9 @@ var WindowManager = class {
    */
   broadcast(channel, ...args) {
     for (const win of this._windows.values()) {
-      if (!win.isDestroyed()) win.webContents.send(channel, ...args);
+      if (!win.isDestroyed()) {
+        win.webContents.send(channel, ...args);
+      }
     }
   }
   // -------------------------------------------------------------------------
@@ -1508,7 +1519,9 @@ var WindowManager = class {
     }
     win.once("closed", () => {
       this._windows.delete(win.id);
-      if (this._mainWindowId === win.id) this._mainWindowId = void 0;
+      if (this._mainWindowId === win.id) {
+        this._mainWindowId = void 0;
+      }
       Logger.log(`[WindowManager] Window #${win.id} closed`);
     });
   }
@@ -1519,17 +1532,18 @@ var WindowManager = class {
    */
   _expandToWorkArea(win, animationDuration) {
     return new Promise((resolve) => {
-      const { x, y, width, height } = import_main.screen.getPrimaryDisplay().workArea;
-      win.setBounds({ x, y, width, height }, true);
+      win.maximize();
       let resolved = false;
       const done = /* @__PURE__ */ __name(() => {
-        if (resolved) return;
+        if (resolved) {
+          return;
+        }
         resolved = true;
         win.removeListener("resize", done);
         resolve();
       }, "done");
       win.once("resize", done);
-      setTimeout(done, animationDuration + 100);
+      setTimeout(done, animationDuration);
     });
   }
 };

package/dist/main.mjs

@@ -122,6 +122,9 @@ var init_app_injector = __esm({
           return this._resolveForwardRef(target);
         }
         const k = keyOf(target);
+        if (this.singletons.has(k)) {
+          return this.singletons.get(k);
+        }
         const binding = this.bindings.get(k);
         if (!binding) {
           const name = target instanceof Token ? target.description : target.name ?? "unknown";
@@ -1305,7 +1308,7 @@ import { app, BrowserWindow as BrowserWindow2, ipcMain, MessageChannelMain } fro
 // src/window/window-manager.ts
 init_injectable_decorator();
 init_logger();
-import { BrowserWindow, screen } from "electron/main";
+import { BrowserWindow } from "electron/main";
 var WindowManager = class {
   constructor() {
     this._windows = /* @__PURE__ */ new Map();
@@ -1358,18 +1361,24 @@ var WindowManager = class {
    * win.loadFile('index.html');
    */
   async createSplash(options = {}) {
-    const { animationDuration = 600, ...bwOptions } = options;
+    const {
+      animationDuration = 10,
+      expandToWorkArea = true,
+      ...bwOptions
+    } = options;
     const win = new BrowserWindow({
       width: 600,
       height: 600,
       center: true,
-      frame: false,
       show: true,
       ...bwOptions
     });
     this._register(win, true);
     Logger.log(`[WindowManager] Splash window #${win.id} created`);
-    await this._expandToWorkArea(win, animationDuration);
+    if (expandToWorkArea) {
+      await (() => new Promise((r) => setTimeout(r, 500)))();
+      await this._expandToWorkArea(win, animationDuration);
+    }
     return win;
   }
   // -------------------------------------------------------------------------
@@ -1428,7 +1437,9 @@ var WindowManager = class {
    */
   broadcast(channel, ...args) {
     for (const win of this._windows.values()) {
-      if (!win.isDestroyed()) win.webContents.send(channel, ...args);
+      if (!win.isDestroyed()) {
+        win.webContents.send(channel, ...args);
+      }
     }
   }
   // -------------------------------------------------------------------------
@@ -1441,7 +1452,9 @@ var WindowManager = class {
     }
     win.once("closed", () => {
       this._windows.delete(win.id);
-      if (this._mainWindowId === win.id) this._mainWindowId = void 0;
+      if (this._mainWindowId === win.id) {
+        this._mainWindowId = void 0;
+      }
       Logger.log(`[WindowManager] Window #${win.id} closed`);
     });
   }
@@ -1452,17 +1465,18 @@ var WindowManager = class {
    */
   _expandToWorkArea(win, animationDuration) {
     return new Promise((resolve) => {
-      const { x, y, width, height } = screen.getPrimaryDisplay().workArea;
-      win.setBounds({ x, y, width, height }, true);
+      win.maximize();
       let resolved = false;
       const done = /* @__PURE__ */ __name(() => {
-        if (resolved) return;
+        if (resolved) {
+          return;
+        }
         resolved = true;
         win.removeListener("resize", done);
         resolve();
       }, "done");
       win.once("resize", done);
-      setTimeout(done, animationDuration + 100);
+      setTimeout(done, animationDuration);
     });
   }
 };

package/dist/renderer.js

@@ -95,6 +95,9 @@ var _AppInjector = class _AppInjector {
       return this._resolveForwardRef(target);
     }
     const k = keyOf(target);
+    if (this.singletons.has(k)) {
+      return this.singletons.get(k);
+    }
     const binding = this.bindings.get(k);
     if (!binding) {
       const name = target instanceof Token ? target.description : target.name ?? "unknown";

package/dist/renderer.mjs

@@ -66,6 +66,9 @@ var _AppInjector = class _AppInjector {
       return this._resolveForwardRef(target);
     }
     const k = keyOf(target);
+    if (this.singletons.has(k)) {
+      return this.singletons.get(k);
+    }
     const binding = this.bindings.get(k);
     if (!binding) {
       const name = target instanceof Token ? target.description : target.name ?? "unknown";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@noxfly/noxus",
-    "version": "3.0.0-dev.1",
+    "version": "3.0.0-dev.3",
     "main": "dist/main.js",
     "module": "dist/main.mjs",
     "types": "dist/main.d.ts",
@@ -38,6 +38,14 @@
             "require": "./dist/child.js"
         }
     },
+    "typesVersions": {
+        "*": {
+            "main":     ["./dist/main.d.ts"],
+            "renderer": ["./dist/renderer.d.ts"],
+            "preload":  ["./dist/preload.d.ts"],
+            "child":    ["./dist/child.d.ts"]
+        }
+    },
     "scripts": {
         "build": "tsup",
         "prepublishOnly": "npm run build",

package/src/DI/app-injector.ts

@@ -77,10 +77,19 @@ export class AppInjector {
         }
 
         const k = keyOf(target) as TokenKey<unknown>;
+
+        if (this.singletons.has(k)) {
+            return this.singletons.get(k) as T;
+        }
+
         const binding = this.bindings.get(k);
 
         if (!binding) {
-            const name = target instanceof Token ? target.description : (target as Type<unknown>).name ?? 'unknown';
+            const name = target instanceof Token
+                ? target.description
+                : (target as Type<unknown>).name
+                ?? 'unknown';
+
             throw new Error(
                 `[Noxus DI] No binding found for "${name}".\n`
                 + `Did you forget to declare it in @Injectable({ deps }) or in bootstrapApplication({ singletons })?`,

package/src/internal/bootstrap.ts

@@ -78,6 +78,7 @@ export async function bootstrapApplication(config: BootstrapConfig = {}): Promis
 
     // Build override map for the DI flush phase
     const overrides = new Map<TokenKey, unknown>();
+
     for (const { token, useValue } of config.singletons ?? []) {
         overrides.set(token, useValue);
         // Pre-register the binding so the injector knows the token exists

package/src/window/window-manager.ts

@@ -4,7 +4,7 @@
  * @author NoxFly
  */
 
-import { BrowserWindow, screen } from 'electron/main';
+import { BrowserWindow } from 'electron/main';
 import { Injectable } from '../decorators/injectable.decorator';
 import { Logger } from '../utils/logger';
 
@@ -114,15 +114,21 @@ export class WindowManager {
      * win.loadFile('index.html');
      */
     public async createSplash(
-        options: Electron.BrowserWindowConstructorOptions & { animationDuration?: number } = {},
+        options: Electron.BrowserWindowConstructorOptions & {
+            animationDuration?: number;
+            expandToWorkArea?: boolean;
+        } = {},
     ): Promise<BrowserWindow> {
-        const { animationDuration = 600, ...bwOptions } = options;
+        const {
+            animationDuration = 10,
+            expandToWorkArea = true,
+            ...bwOptions
+        } = options;
 
         const win = new BrowserWindow({
             width: 600,
             height: 600,
             center: true,
-            frame: false,
             show: true,
             ...bwOptions,
         });
@@ -131,7 +137,10 @@ export class WindowManager {
 
         Logger.log(`[WindowManager] Splash window #${win.id} created`);
 
-        await this._expandToWorkArea(win, animationDuration);
+        if(expandToWorkArea) {
+            await (() => new Promise((r) => setTimeout(r, 500)))();
+            await this._expandToWorkArea(win, animationDuration);
+        }
 
         return win;
     }
@@ -203,7 +212,9 @@ export class WindowManager {
      */
     public broadcast(channel: string, ...args: unknown[]): void {
         for (const win of this._windows.values()) {
-            if (!win.isDestroyed()) win.webContents.send(channel, ...args);
+            if (!win.isDestroyed()) {
+                win.webContents.send(channel, ...args);
+            }
         }
     }
 
@@ -220,7 +231,9 @@ export class WindowManager {
 
         win.once('closed', () => {
             this._windows.delete(win.id);
-            if (this._mainWindowId === win.id) this._mainWindowId = undefined;
+            if (this._mainWindowId === win.id) {
+                this._mainWindowId = undefined;
+            }
             Logger.log(`[WindowManager] Window #${win.id} closed`);
         });
     }
@@ -232,9 +245,7 @@ export class WindowManager {
      */
     private _expandToWorkArea(win: BrowserWindow, animationDuration: number): Promise<void> {
         return new Promise((resolve) => {
-            const { x, y, width, height } = screen.getPrimaryDisplay().workArea;
-
-            win.setBounds({ x, y, width, height }, true);
+            win.maximize();
 
             // Wait for the animation to finish before resolving.
             // We listen to the 'resize' event which fires once the OS
@@ -242,14 +253,16 @@ export class WindowManager {
             let resolved = false;
 
             const done = (): void => {
-                if (resolved) return;
+                if (resolved) {
+                    return;
+                }
                 resolved = true;
                 win.removeListener('resize', done);
                 resolve();
             };
 
             win.once('resize', done);
-            setTimeout(done, animationDuration + 100); // safety fallback
+            setTimeout(done, animationDuration);
         });
     }
 }