@wailsio/runtime 3.0.0-alpha.20 → 3.0.0-alpha.21

package/src/index.js

@@ -1,95 +1,46 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-
-// Setup
-window.wails = window.wails || {};
-window._wails = window._wails || {};
-
-import * as Application from "./application";
-import * as Browser from "./browser";
-import * as Clipboard from "./clipboard";
-import * as ContextMenu from "./contextmenu";
-import * as Flags from "./flags";
-import * as Screens from "./screens";
-import * as System from "./system";
-import * as Window from "./window";
-import * as WML from './wml';
-import * as Events from "./events";
-import * as Dialogs from "./dialogs";
-import * as Call from "./calls";
-import * as Drag from "./drag";
-import {invoke} from "./system";
-
-
-export { Application, Browser, Call, Clipboard, Dialogs, Events, Flags, Screens, System, Window, WML};
-
-
-/***
- This technique for proper load detection is taken from HTMX:
-
- BSD 2-Clause License
-
- Copyright (c) 2020, Big Sky Software
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ***/
-
-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
-})
-
-function whenReady(fn) {
-    if (isReady || document.readyState === 'complete') {
-        fn();
-    } else {
-        document.addEventListener('DOMContentLoaded', fn);
-    }
-}
-
-whenReady(() => {
-    WML.Reload();
-});
+/*
+ _	   __	  _ __
+| |	 / /___ _(_) /____
+| | /| / / __ `/ / / ___/
+| |/ |/ / /_/ / / (__  )
+|__/|__/\__,_/_/_/____/
+The electron alternative for Go
+(c) Lea Anthony 2019-present
+*/
+
+// Setup
+window._wails = window._wails || {};
+
+import "./contextmenu";
+import "./drag";
+
+// Re-export public API
+import * as Application from "./application";
+import * as Browser from "./browser";
+import * as Call from "./calls";
+import * as Clipboard from "./clipboard";
+import * as Dialogs from "./dialogs";
+import * as Events from "./events";
+import * as Flags from "./flags";
+import * as Screens from "./screens";
+import * as System from "./system";
+import Window from "./window";
+import * as WML from "./wml";
+
+export {
+    Application,
+    Browser,
+    Call,
+    Clipboard,
+    Dialogs,
+    Events,
+    Flags,
+    Screens,
+    System,
+    Window,
+    WML
+};
+
+// Notify backend
+window._wails.invoke = System.invoke;
+System.invoke("wails:runtime:ready");

package/src/runtime.js

@@ -1,122 +1,123 @@
-/*
- _     __     _ __
-| |  / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-
-/* jshint esversion: 9 */
-import { nanoid } from 'nanoid/non-secure';
-
-const runtimeURL = window.location.origin + "/wails/runtime";
-
-// Object Names
-export const objectNames = {
-    Call: 0,
-    Clipboard: 1,
-    Application: 2,
-    Events: 3,
-    ContextMenu: 4,
-    Dialog: 5,
-    Window: 6,
-    Screens: 7,
-    System: 8,
-    Browser: 9,
-}
-export let clientId = nanoid();
-
-/**
- * Creates a runtime caller function that invokes a specified method on a given object within a specified window context.
- *
- * @param {Object} object - The object on which the method is to be invoked.
- * @param {string} windowName - The name of the window context in which the method should be called.
- * @returns {Function} A runtime caller function that takes the method name and optionally arguments and invokes the method within the specified window context.
- */
-export function newRuntimeCaller(object, windowName) {
-    return function (method, args=null) {
-        return runtimeCall(object + "." + method, windowName, args);
-    };
-}
-
-/**
- * Creates a new runtime caller with specified ID.
- *
- * @param {object} object - The object to invoke the method on.
- * @param {string} windowName - The name of the window.
- * @return {Function} - The new runtime caller function.
- */
-export function newRuntimeCallerWithID(object, windowName) {
-    return function (method, args=null) {
-        return runtimeCallWithID(object, method, windowName, args);
-    };
-}
-
-
-function runtimeCall(method, windowName, args) {
-    let url = new URL(runtimeURL);
-    if( method ) {
-        url.searchParams.append("method", method);
-    }
-    let fetchOptions = {
-        headers: {},
-    };
-    if (windowName) {
-        fetchOptions.headers["x-wails-window-name"] = windowName;
-    }
-    if (args) {
-        url.searchParams.append("args", JSON.stringify(args));
-    }
-    fetchOptions.headers["x-wails-client-id"] = clientId;
-
-    return new Promise((resolve, reject) => {
-        fetch(url, fetchOptions)
-            .then(response => {
-                if (response.ok) {
-                    // check content type
-                    if (response.headers.get("Content-Type") && response.headers.get("Content-Type").indexOf("application/json") !== -1) {
-                        return response.json();
-                    } else {
-                        return response.text();
-                    }
-                }
-                reject(Error(response.statusText));
-            })
-            .then(data => resolve(data))
-            .catch(error => reject(error));
-    });
-}
-
-function runtimeCallWithID(objectID, method, windowName, args) {
-    let url = new URL(runtimeURL);
-    url.searchParams.append("object", objectID);
-    url.searchParams.append("method", method);
-    let fetchOptions = {
-        headers: {},
-    };
-    if (windowName) {
-        fetchOptions.headers["x-wails-window-name"] = windowName;
-    }
-    if (args) {
-        url.searchParams.append("args", JSON.stringify(args));
-    }
-    fetchOptions.headers["x-wails-client-id"] = clientId;
-    return new Promise((resolve, reject) => {
-        fetch(url, fetchOptions)
-            .then(response => {
-                if (response.ok) {
-                    // check content type
-                    if (response.headers.get("Content-Type") && response.headers.get("Content-Type").indexOf("application/json") !== -1) {
-                        return response.json();
-                    } else {
-                        return response.text();
-                    }
-                }
-                reject(Error(response.statusText));
-            })
-            .then(data => resolve(data))
-            .catch(error => reject(error));
-    });
-}
+/*
+ _     __     _ __
+| |  / /___ _(_) /____
+| | /| / / __ `/ / / ___/
+| |/ |/ / /_/ / / (__  )
+|__/|__/\__,_/_/_/____/
+The electron alternative for Go
+(c) Lea Anthony 2019-present
+*/
+
+/* jshint esversion: 9 */
+import { nanoid } from 'nanoid/non-secure';
+
+const runtimeURL = window.location.origin + "/wails/runtime";
+
+// Object Names
+export const objectNames = {
+    Call: 0,
+    Clipboard: 1,
+    Application: 2,
+    Events: 3,
+    ContextMenu: 4,
+    Dialog: 5,
+    Window: 6,
+    Screens: 7,
+    System: 8,
+    Browser: 9,
+    CancelCall: 10,
+}
+export let clientId = nanoid();
+
+/**
+ * Creates a runtime caller function that invokes a specified method on a given object within a specified window context.
+ *
+ * @param {Object} object - The object on which the method is to be invoked.
+ * @param {string} windowName - The name of the window context in which the method should be called.
+ * @returns {Function} A runtime caller function that takes the method name and optionally arguments and invokes the method within the specified window context.
+ */
+export function newRuntimeCaller(object, windowName) {
+    return function (method, args=null) {
+        return runtimeCall(object + "." + method, windowName, args);
+    };
+}
+
+/**
+ * Creates a new runtime caller with specified ID.
+ *
+ * @param {object} object - The object to invoke the method on.
+ * @param {string} windowName - The name of the window.
+ * @return {Function} - The new runtime caller function.
+ */
+export function newRuntimeCallerWithID(object, windowName) {
+    return function (method, args=null) {
+        return runtimeCallWithID(object, method, windowName, args);
+    };
+}
+
+
+function runtimeCall(method, windowName, args) {
+    let url = new URL(runtimeURL);
+    if( method ) {
+        url.searchParams.append("method", method);
+    }
+    let fetchOptions = {
+        headers: {},
+    };
+    if (windowName) {
+        fetchOptions.headers["x-wails-window-name"] = windowName;
+    }
+    if (args) {
+        url.searchParams.append("args", JSON.stringify(args));
+    }
+    fetchOptions.headers["x-wails-client-id"] = clientId;
+
+    return new Promise((resolve, reject) => {
+        fetch(url, fetchOptions)
+            .then(response => {
+                if (response.ok) {
+                    // check content type
+                    if (response.headers.get("Content-Type") && response.headers.get("Content-Type").indexOf("application/json") !== -1) {
+                        return response.json();
+                    } else {
+                        return response.text();
+                    }
+                }
+                reject(Error(response.statusText));
+            })
+            .then(data => resolve(data))
+            .catch(error => reject(error));
+    });
+}
+
+function runtimeCallWithID(objectID, method, windowName, args) {
+    let url = new URL(runtimeURL);
+    url.searchParams.append("object", objectID);
+    url.searchParams.append("method", method);
+    let fetchOptions = {
+        headers: {},
+    };
+    if (windowName) {
+        fetchOptions.headers["x-wails-window-name"] = windowName;
+    }
+    if (args) {
+        url.searchParams.append("args", JSON.stringify(args));
+    }
+    fetchOptions.headers["x-wails-client-id"] = clientId;
+    return new Promise((resolve, reject) => {
+        fetch(url, fetchOptions)
+            .then(response => {
+                if (response.ok) {
+                    // check content type
+                    if (response.headers.get("Content-Type") && response.headers.get("Content-Type").indexOf("application/json") !== -1) {
+                        return response.json();
+                    } else {
+                        return response.text();
+                    }
+                }
+                reject(Error(response.statusText));
+            })
+            .then(data => resolve(data))
+            .catch(error => reject(error));
+    });
+}

package/src/screens.js

@@ -1,83 +1,77 @@
-/*
- _	   __	  _ __
-| |	 / /___ _(_) /____
-| | /| / / __ `/ / / ___/
-| |/ |/ / /_/ / / (__  )
-|__/|__/\__,_/_/_/____/
-The electron alternative for Go
-(c) Lea Anthony 2019-present
-*/
-
-/* jshint esversion: 9 */
-
-/**
- * @typedef {Object} Position
- * @property {number} X - The X coordinate.
- * @property {number} Y - The Y coordinate.
- */
-
-/**
- * @typedef {Object} Size
- * @property {number} X - The width.
- * @property {number} Y - The height.
- */
-
-
-/**
- * @typedef {Object} Rect
- * @property {number} X - The X coordinate of the top-left corner.
- * @property {number} Y - The Y coordinate of the top-left corner.
- * @property {number} Width - The width of the rectangle.
- * @property {number} Height - The height of the rectangle.
- */
-
-
-/**
- * @typedef {('Zero'|'Ninety'|'OneEighty'|'TwoSeventy')} Rotation
- * The rotation of the screen. Can be one of 'Zero', 'Ninety', 'OneEighty', 'TwoSeventy'.
- */
-
-
-/**
- * @typedef {Object} Screen
- * @property {string} Id - Unique identifier for the screen.
- * @property {string} Name - Human readable name of the screen.
- * @property {number} Scale - The resolution scale of the screen. 1 = standard resolution, 2 = high (Retina), etc.
- * @property {Position} Position - Contains the X and Y coordinates of the screen's position.
- * @property {Size} Size - Contains the width and height of the screen.
- * @property {Rect} Bounds - Contains the bounds of the screen in terms of X, Y, Width, and Height.
- * @property {Rect} WorkArea - Contains the area of the screen that is actually usable (excluding taskbar and other system UI).
- * @property {boolean} IsPrimary - True if this is the primary monitor selected by the user in the operating system.
- * @property {Rotation} Rotation - The rotation of the screen.
- */
-
-
-import {newRuntimeCallerWithID, objectNames} from "./runtime";
-const call = newRuntimeCallerWithID(objectNames.Screens, '');
-
-const getAll = 0;
-const getPrimary = 1;
-const getCurrent = 2;
-
-/**
- * Gets all screens.
- * @returns {Promise<Screen[]>} A promise that resolves to an array of Screen objects.
- */
-export function GetAll() {
-    return call(getAll);
-}
-/**
- * Gets the primary screen.
- * @returns {Promise<Screen>} A promise that resolves to the primary screen.
- */
-export function GetPrimary() {
-    return call(getPrimary);
-}
-/**
- * Gets the current active screen.
- *
- * @returns {Promise<Screen>} A promise that resolves with the current active screen.
- */
-export function GetCurrent() {
-    return call(getCurrent);
-}
+/*
+ _	   __	  _ __
+| |	 / /___ _(_) /____
+| | /| / / __ `/ / / ___/
+| |/ |/ / /_/ / / (__  )
+|__/|__/\__,_/_/_/____/
+The electron alternative for Go
+(c) Lea Anthony 2019-present
+*/
+
+/* jshint esversion: 9 */
+
+/**
+ * @typedef {Object} Position
+ * @property {number} X - The X coordinate.
+ * @property {number} Y - The Y coordinate.
+ */
+
+/**
+ * @typedef {Object} Size
+ * @property {number} X - The width.
+ * @property {number} Y - The height.
+ */
+
+
+/**
+ * @typedef {Object} Rect
+ * @property {number} X - The X coordinate of the top-left corner.
+ * @property {number} Y - The Y coordinate of the top-left corner.
+ * @property {number} Width - The width of the rectangle.
+ * @property {number} Height - The height of the rectangle.
+ */
+
+
+/**
+ * @typedef {Object} Screen
+ * @property {string} Id - Unique identifier for the screen.
+ * @property {string} Name - Human readable name of the screen.
+ * @property {number} Scale - The resolution scale of the screen. 1 = standard resolution, 2 = high (Retina), etc.
+ * @property {Position} Position - Contains the X and Y coordinates of the screen's position.
+ * @property {Size} Size - Contains the width and height of the screen.
+ * @property {Rect} Bounds - Contains the bounds of the screen in terms of X, Y, Width, and Height.
+ * @property {Rect} WorkArea - Contains the area of the screen that is actually usable (excluding taskbar and other system UI).
+ * @property {boolean} IsPrimary - True if this is the primary monitor selected by the user in the operating system.
+ * @property {number} Rotation - The rotation of the screen.
+ */
+
+
+import {newRuntimeCallerWithID, objectNames} from "./runtime";
+const call = newRuntimeCallerWithID(objectNames.Screens, '');
+
+const getAll = 0;
+const getPrimary = 1;
+const getCurrent = 2;
+
+/**
+ * Gets all screens.
+ * @returns {Promise<Screen[]>} A promise that resolves to an array of Screen objects.
+ */
+export function GetAll() {
+    return call(getAll);
+}
+/**
+ * Gets the primary screen.
+ * @returns {Promise<Screen>} A promise that resolves to the primary screen.
+ */
+export function GetPrimary() {
+    return call(getPrimary);
+}
+/**
+ * Gets the current active screen.
+ *
+ * @returns {Promise<Screen>} A promise that resolves with the current active screen.
+ */
+export function GetCurrent() {
+    return call(getCurrent);
+}