@wailsio/runtime 3.0.0-alpha.17 → 3.0.0-alpha.18

package/src/drag.js

@@ -13,15 +13,20 @@ The electron alternative for Go
 import {invoke, IsWindows} from "./system";
 import {GetFlag} from "./flags";
 
+// Setup
+window._wails = window._wails || {};
+window._wails.setResizable = setResizable;
+window._wails.endDrag = endDrag;
+window.addEventListener('mousedown', onMouseDown);
+window.addEventListener('mousemove', onMouseMove);
+window.addEventListener('mouseup', onMouseUp);
+
 let shouldDrag = false;
 let resizeEdge = null;
 let resizable = false;
 let defaultCursor = "auto";
-window._wails = window._wails || {};
-window._wails.setResizable = setResizable;
-window._wails.endDrag = endDrag;
 
-export function dragTest(e) {
+function dragTest(e) {
     let val = window.getComputedStyle(e.target).getPropertyValue("--webkit-app-region");
     if (!val || val === "" || val.trim() !== "drag" || e.buttons !== 1) {
         return false;
@@ -29,17 +34,11 @@ export function dragTest(e) {
     return e.detail === 1;
 }
 
-export function setupDrag() {
-    window.addEventListener('mousedown', onMouseDown);
-    window.addEventListener('mousemove', onMouseMove);
-    window.addEventListener('mouseup', onMouseUp);
-}
-
-export function setResizable(value) {
+function setResizable(value) {
     resizable = value;
 }
 
-export function endDrag() {
+function endDrag() {
     document.body.style.cursor = 'default';
     shouldDrag = false;
 }

package/src/event_types.js

@@ -176,6 +176,7 @@ export const EventTypes = {
 		WindowHide: "common:WindowHide",
 		WindowDPIChanged: "common:WindowDPIChanged",
 		WindowFilesDropped: "common:WindowFilesDropped",
+		WindowRuntimeReady: "common:WindowRuntimeReady",
 		ThemeChanged: "common:ThemeChanged",
 	},
 };

package/src/events.js

@@ -18,6 +18,10 @@ import {newRuntimeCallerWithID, objectNames} from "./runtime";
 import {EventTypes} from "./event_types";
 export const Types = EventTypes;
 
+// Setup
+window._wails = window._wails || {};
+window._wails.dispatchWailsEvent = dispatchWailsEvent;
+
 const call = newRuntimeCallerWithID(objectNames.Events, '');
 const EmitMethod = 0;
 const eventListeners = new Map();
@@ -42,19 +46,7 @@ export class WailsEvent {
     }
 }
 
-/**
- * Sets up event callbacks for Wails.
- *
- * @function setupEventCallbacks
- *
- * @description This method is responsible for setting up event callbacks for Wails. It checks if the global object `_wails` exists on the `window` object, and if not, initializes it
- *. It then assigns the `dispatchWailsEvent` function as a property on the `_wails` object.
- *
- * @returns {undefined} Returns nothing.
- */
-export function setupEventCallbacks() {
-    window._wails = window._wails || {};
-    window._wails.dispatchWailsEvent = dispatchWailsEvent;
+export function setup() {
 }
 
 function dispatchWailsEvent(event) {

package/src/flags.js

@@ -10,48 +10,6 @@ The electron alternative for Go
 
 /* jshint esversion: 9 */
 
-let flags = new Map();
-
-function convertToMap(obj) {
-    const map = new Map();
-
-    for (const [key, value] of Object.entries(obj)) {
-        if (typeof value === 'object' && value !== null) {
-            map.set(key, convertToMap(value)); // Recursively convert nested object
-        } else {
-            map.set(key, value);
-        }
-    }
-
-    return map;
-}
-
-fetch("/wails/flags").then((response) => {
-    response.json().then((data) => {
-        flags = convertToMap(data);
-    });
-});
-
-
-function getValueFromMap(keyString) {
-    const keys = keyString.split('.');
-    let value = flags;
-
-    for (const key of keys) {
-        if (value instanceof Map) {
-            value = value.get(key);
-        } else {
-            value = value[key];
-        }
-
-        if (value === undefined) {
-            break;
-        }
-    }
-
-    return value;
-}
-
 /**
  * Retrieves the value associated with the specified key from the flag map.
  *
@@ -59,5 +17,9 @@ function getValueFromMap(keyString) {
  * @return {*} - The value associated with the specified key.
  */
 export function GetFlag(keyString) {
-    return getValueFromMap(keyString);
+    try {
+        return window._wails.flags[keyString];
+    } catch (e) {
+        throw new Error("Unable to retrieve flag '" + keyString + "': " + e);
+    }
 }

package/src/index.js

@@ -8,9 +8,9 @@ The electron alternative for Go
 (c) Lea Anthony 2019-present
 */
 
-import {setupContextMenus} from "./contextmenu";
-import {setupDrag} from "./drag";
-import {ByID, ByName, Plugin} from "./calls";
+// Setup
+window.wails = window.wails || {};
+window._wails = window._wails || {};
 
 import * as Application from "./application";
 import * as Browser from "./browser";
@@ -23,7 +23,8 @@ import * as WML from './wml';
 import * as Events from "./events";
 import * as Dialogs from "./dialogs";
 import * as Call from "./calls";
-import {setupEventCallbacks} from "./events";
+import {invoke} from "./system";
+
 
 export { Application, Browser, Call, Clipboard, Dialogs, Events, Flags, Screens, System, Window, WML};
 
@@ -59,7 +60,22 @@ export { Application, Browser, Call, Clipboard, Dialogs, Events, Flags, Screens,
 
  ***/
 
-let isReady = false
+window.wails = {
+    Application,
+    Browser,
+    Call,
+    Clipboard,
+    Dialogs,
+    Events,
+    Flags,
+    Screens,
+    System,
+    Window,
+    WML,
+};
+invoke('wails:runtime:ready');
+
+let isReady = false;
 document.addEventListener('DOMContentLoaded', function() {
     isReady = true
 })
@@ -73,8 +89,5 @@ function whenReady(fn) {
 }
 
 whenReady(() => {
-    setupContextMenus();
-    setupDrag();
-    setupEventCallbacks();
     WML.Reload();
 });

package/src/log.js

@@ -0,0 +1,13 @@
+/**
+ * Logs a message to the console with custom formatting.
+ * @param {string} message - The message to be logged.
+ * @return {void}
+ */
+export function debugLog(message) {
+    // eslint-disable-next-line
+    console.log(
+        '%c wails3 %c ' + message + ' ',
+        'background: #aa0000; color: #fff; border-radius: 3px 0px 0px 3px; padding: 1px; font-size: 0.7rem',
+        'background: #009900; color: #fff; border-radius: 0px 3px 3px 0px; padding: 1px; font-size: 0.7rem'
+    );
+}

package/src/system.js

@@ -15,6 +15,13 @@ let call = newRuntimeCallerWithID(objectNames.System, '');
 const systemIsDarkMode = 0;
 const environment = 1;
 
+export function invoke(msg) {
+    if(window.chrome) {
+        return window.chrome.webview.postMessage(msg);
+    }
+    return window.webkit.messageHandlers.external.postMessage(msg);
+}
+
 /**
  * @function
  * Retrieves the system dark mode status.
@@ -24,7 +31,6 @@ export function IsDarkMode() {
     return call(systemIsDarkMode);
 }
 
-
 /**
  * Fetches the capabilities of the application from the server.
  *
@@ -32,7 +38,7 @@ export function IsDarkMode() {
  * @function Capabilities
  * @returns {Promise<Object>} A promise that resolves to an object containing the capabilities.
  */
-export async function Capabilities() {
+export function Capabilities() {
     let response = fetch("/wails/capabilities");
     return response.json();
 }
@@ -52,25 +58,13 @@ export function Environment() {
     return call(environment);
 }
 
-export let invoke = null;
-let environmentCache = null;
-
-Environment()
-    .then(result => {
-        environmentCache = result;
-        invoke = IsWindows() ? window.chrome.webview.postMessage : window.webkit.messageHandlers.external.postMessage;
-    })
-    .catch(error => {
-        console.error(`Error getting Environment: ${error}`);
-    });
-
 /**
  * Checks if the current operating system is Windows.
  *
  * @return {boolean} True if the operating system is Windows, otherwise false.
  */
 export function IsWindows() {
-    return environmentCache.OS === "windows";
+    return window._wails.environment.OS === "windows";
 }
 
 /**
@@ -79,7 +73,7 @@ export function IsWindows() {
  * @returns {boolean} Returns true if the current operating system is Linux, false otherwise.
  */
 export function IsLinux() {
-    return environmentCache.OS === "linux";
+    return window._wails.environment.OS === "linux";
 }
 
 /**
@@ -88,7 +82,7 @@ export function IsLinux() {
  * @returns {boolean} True if the environment is macOS, false otherwise.
  */
 export function IsMac() {
-    return environmentCache.OS === "darwin";
+    return window._wails.environment.OS === "darwin";
 }
 
 /**
@@ -96,7 +90,7 @@ export function IsMac() {
  * @returns {boolean} True if the current environment architecture is AMD64, false otherwise.
  */
 export function IsAMD64() {
-    return environmentCache.Arch === "amd64";
+    return window._wails.environment.Arch === "amd64";
 }
 
 /**
@@ -105,7 +99,7 @@ export function IsAMD64() {
  * @returns {boolean} True if the current architecture is ARM, false otherwise.
  */
 export function IsARM() {
-    return environmentCache.Arch === "arm";
+    return window._wails.environment.Arch === "arm";
 }
 
 /**
@@ -114,9 +108,10 @@ export function IsARM() {
  * @returns {boolean} - Returns true if the environment is ARM64 architecture, otherwise returns false.
  */
 export function IsARM64() {
-    return environmentCache.Arch === "arm64";
+    return window._wails.environment.Arch === "arm64";
 }
 
 export function IsDebug() {
-    return environmentCache.Debug === true;
-}
+    return window._wails.environment.Debug === true;
+}
+

package/src/wml.js

@@ -3,6 +3,7 @@ import {Emit, WailsEvent} from "./events";
 import {Question} from "./dialogs";
 import {Get} from "./window";
 import {OpenURL} from "./browser";
+import {debugLog} from "./log";
 
 /**
  * Sends an event with the given name and optional data.
@@ -144,7 +145,9 @@ function addWMLOpenBrowserListener() {
  * @return {void}
  */
 export function Reload() {
-    console.log("Reloading WML");
+    if(DEBUG) {
+        debugLog("Reloading WML");
+    }
     addWMLEventListeners();
     addWMLWindowListeners();
     addWMLOpenBrowserListener();

package/tsconfig.json

@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "outDir": "dist",
     "strict": true,
-    "target": "es6"
+    "target": "es6",
   }
 }

package/types/event_types.d.ts

@@ -176,6 +176,7 @@ export declare const EventTypes: {
 		WindowHide: string,
 		WindowDPIChanged: string,
 		WindowFilesDropped: string,
+		WindowRuntimeReady: string,
 		ThemeChanged: string,
 	},
 };

package/types/events.d.ts

@@ -1,14 +1,4 @@
-/**
- * Sets up event callbacks for Wails.
- *
- * @function setupEventCallbacks
- *
- * @description This method is responsible for setting up event callbacks for Wails. It checks if the global object `_wails` exists on the `window` object, and if not, initializes it
- *. It then assigns the `dispatchWailsEvent` function as a property on the `_wails` object.
- *
- * @returns {undefined} Returns nothing.
- */
-export function setupEventCallbacks(): undefined;
+export function setup(): void;
 /**
  * Register a callback function to be called multiple times for a specific event.
  *
@@ -61,6 +51,9 @@ export const Types: {
         SystemThemeChanged: string;
         APMPowerStatusChange: string;
         APMSuspend: string;
+        /**
+         * @typedef {import("./types").WailsEvent} WailsEvent
+         */
         APMResumeAutomatic: string;
         APMResumeSuspend: string;
         APMPowerSettingChange: string;
@@ -117,7 +110,12 @@ export const Types: {
         WindowDidChangeEffectiveAppearance: string;
         WindowDidChangeOcclusionState: string;
         WindowDidChangeOrderingMode: string;
-        WindowDidChangeScreen: string;
+        WindowDidChangeScreen: string; /**
+         * Removes the specified listener from the event listeners collection.
+         * If all listeners for the event are removed, the event key is deleted from the collection.
+         *
+         * @param {Object} listener - The listener to be removed.
+         */
         WindowDidChangeScreenParameters: string;
         WindowDidChangeScreenProfile: string;
         WindowDidChangeScreenSpace: string;
@@ -125,12 +123,6 @@ export const Types: {
         WindowDidChangeSharingType: string;
         WindowDidChangeSpace: string;
         WindowDidChangeSpaceOrderingMode: string;
-        /**
-         * Removes the specified listener from the event listeners collection.
-         * If all listeners for the event are removed, the event key is deleted from the collection.
-         *
-         * @param {Object} listener - The listener to be removed.
-         */
         WindowDidChangeTitle: string;
         WindowDidChangeToolbar: string;
         WindowDidChangeVisibility: string;
@@ -140,13 +132,6 @@ export const Types: {
         WindowDidEnterVersionBrowser: string;
         WindowDidExitFullScreen: string;
         WindowDidExitVersionBrowser: string;
-        /**
-         * Removes event listeners for the specified event names.
-         *
-         * @param {string} eventName - The name of the event to remove listeners for.
-         * @param {...string} additionalEventNames - Additional event names to remove listeners for.
-         * @return {undefined}
-         */
         WindowDidExpose: string;
         WindowDidFocus: string;
         WindowDidMiniaturize: string;
@@ -246,6 +231,7 @@ export const Types: {
         WindowHide: string;
         WindowDPIChanged: string;
         WindowFilesDropped: string;
+        WindowRuntimeReady: string;
         ThemeChanged: string;
     };
 };

package/types/system.d.ts

@@ -1,3 +1,4 @@
+export function invoke(msg: any): any;
 /**
  * @function
  * Retrieves the system dark mode status.
@@ -59,7 +60,6 @@ export function IsARM(): boolean;
  */
 export function IsARM64(): boolean;
 export function IsDebug(): boolean;
-export let invoke: any;
 export type EnvironmentInfo = {
     /**
      * - The operating system in use.

package/types/contextmenu.d.ts

@@ -1 +0,0 @@
-export function setupContextMenus(): void;

package/types/drag.d.ts

@@ -1,4 +0,0 @@
-export function dragTest(e: any): boolean;
-export function setupDrag(): void;
-export function setResizable(value: any): void;
-export function endDrag(): void;