diff --git a/Cargo.lock b/Cargo.lock index db5c319..2a2a132 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2991,10 +2991,12 @@ dependencies = [ "anyhow", "console_error_panic_hook", "futures-util", + "log", "serde", "sycamore", "tauri-sys", "wasm-bindgen-futures", + "wasm-logger", ] [[package]] @@ -3455,6 +3457,17 @@ dependencies = [ "quote", ] +[[package]] +name = "wasm-logger" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "074649a66bb306c8f2068c9016395fa65d8e08d2affcbf95acf3c24c3ab19718" +dependencies = [ + "log", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "web-sys" version = "0.3.60" diff --git a/examples/test/.gitignore b/examples/test/.gitignore index 1de5659..22a146e 100644 --- a/examples/test/.gitignore +++ b/examples/test/.gitignore @@ -1 +1,2 @@ -target \ No newline at end of file +target +dist \ No newline at end of file diff --git a/examples/test/Cargo.toml b/examples/test/Cargo.toml index 2c74dba..6ea130e 100644 --- a/examples/test/Cargo.toml +++ b/examples/test/Cargo.toml @@ -12,6 +12,8 @@ console_error_panic_hook = "0.1.7" wasm-bindgen-futures = "0.4.32" futures-util = "0.3.25" serde = { version = "1.0.147", features = ["derive"] } +wasm-logger = "0.2.0" +log = "0.4.17" [features] ci = [] diff --git a/examples/test/dist/index.html b/examples/test/dist/index.html deleted file mode 100644 index 9c3587c..0000000 --- a/examples/test/dist/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - Tauri + Yew App - - - - - \ No newline at end of file diff --git a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/app.js b/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/app.js deleted file mode 100644 index 6b66a23..0000000 --- a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/app.js +++ /dev/null @@ -1,91 +0,0 @@ -// tauri/tooling/api/src/tauri.ts -function uid() { - return window.crypto.getRandomValues(new Uint32Array(1))[0]; -} -function transformCallback(callback, once = false) { - const identifier = uid(); - const prop = `_${identifier}`; - Object.defineProperty(window, prop, { - value: (result) => { - if (once) { - Reflect.deleteProperty(window, prop); - } - return callback?.(result); - }, - writable: false, - configurable: true - }); - return identifier; -} -async function invoke(cmd, args = {}) { - return new Promise((resolve, reject) => { - const callback = transformCallback((e) => { - resolve(e); - Reflect.deleteProperty(window, `_${error}`); - }, true); - const error = transformCallback((e) => { - reject(e); - Reflect.deleteProperty(window, `_${callback}`); - }, true); - window.__TAURI_IPC__({ - cmd, - callback, - error, - ...args - }); - }); -} - -// tauri/tooling/api/src/helpers/tauri.ts -async function invokeTauriCommand(command) { - return invoke("tauri", command); -} - -// tauri/tooling/api/src/app.ts -async function getVersion() { - return invokeTauriCommand({ - __tauriModule: "App", - message: { - cmd: "getAppVersion" - } - }); -} -async function getName() { - return invokeTauriCommand({ - __tauriModule: "App", - message: { - cmd: "getAppName" - } - }); -} -async function getTauriVersion() { - return invokeTauriCommand({ - __tauriModule: "App", - message: { - cmd: "getTauriVersion" - } - }); -} -async function show() { - return invokeTauriCommand({ - __tauriModule: "App", - message: { - cmd: "show" - } - }); -} -async function hide() { - return invokeTauriCommand({ - __tauriModule: "App", - message: { - cmd: "hide" - } - }); -} -export { - getName, - getTauriVersion, - getVersion, - hide, - show -}; diff --git a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/clipboard.js b/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/clipboard.js deleted file mode 100644 index 16bd040..0000000 --- a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/clipboard.js +++ /dev/null @@ -1,66 +0,0 @@ -// tauri/tooling/api/src/tauri.ts -function uid() { - return window.crypto.getRandomValues(new Uint32Array(1))[0]; -} -function transformCallback(callback, once = false) { - const identifier = uid(); - const prop = `_${identifier}`; - Object.defineProperty(window, prop, { - value: (result) => { - if (once) { - Reflect.deleteProperty(window, prop); - } - return callback?.(result); - }, - writable: false, - configurable: true - }); - return identifier; -} -async function invoke(cmd, args = {}) { - return new Promise((resolve, reject) => { - const callback = transformCallback((e) => { - resolve(e); - Reflect.deleteProperty(window, `_${error}`); - }, true); - const error = transformCallback((e) => { - reject(e); - Reflect.deleteProperty(window, `_${callback}`); - }, true); - window.__TAURI_IPC__({ - cmd, - callback, - error, - ...args - }); - }); -} - -// tauri/tooling/api/src/helpers/tauri.ts -async function invokeTauriCommand(command) { - return invoke("tauri", command); -} - -// tauri/tooling/api/src/clipboard.ts -async function writeText(text) { - return invokeTauriCommand({ - __tauriModule: "Clipboard", - message: { - cmd: "writeText", - data: text - } - }); -} -async function readText() { - return invokeTauriCommand({ - __tauriModule: "Clipboard", - message: { - cmd: "readText", - data: null - } - }); -} -export { - readText, - writeText -}; diff --git a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/dialog.js b/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/dialog.js deleted file mode 100644 index 53811e1..0000000 --- a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/dialog.js +++ /dev/null @@ -1,111 +0,0 @@ -// tauri/tooling/api/src/tauri.ts -function uid() { - return window.crypto.getRandomValues(new Uint32Array(1))[0]; -} -function transformCallback(callback, once = false) { - const identifier = uid(); - const prop = `_${identifier}`; - Object.defineProperty(window, prop, { - value: (result) => { - if (once) { - Reflect.deleteProperty(window, prop); - } - return callback?.(result); - }, - writable: false, - configurable: true - }); - return identifier; -} -async function invoke(cmd, args = {}) { - return new Promise((resolve, reject) => { - const callback = transformCallback((e) => { - resolve(e); - Reflect.deleteProperty(window, `_${error}`); - }, true); - const error = transformCallback((e) => { - reject(e); - Reflect.deleteProperty(window, `_${callback}`); - }, true); - window.__TAURI_IPC__({ - cmd, - callback, - error, - ...args - }); - }); -} - -// tauri/tooling/api/src/helpers/tauri.ts -async function invokeTauriCommand(command) { - return invoke("tauri", command); -} - -// tauri/tooling/api/src/dialog.ts -async function open(options = {}) { - if (typeof options === "object") { - Object.freeze(options); - } - return invokeTauriCommand({ - __tauriModule: "Dialog", - message: { - cmd: "openDialog", - options - } - }); -} -async function save(options = {}) { - if (typeof options === "object") { - Object.freeze(options); - } - return invokeTauriCommand({ - __tauriModule: "Dialog", - message: { - cmd: "saveDialog", - options - } - }); -} -async function message(message2, options) { - const opts = typeof options === "string" ? { title: options } : options; - return invokeTauriCommand({ - __tauriModule: "Dialog", - message: { - cmd: "messageDialog", - message: message2.toString(), - title: opts?.title?.toString(), - type: opts?.type - } - }); -} -async function ask(message2, options) { - const opts = typeof options === "string" ? { title: options } : options; - return invokeTauriCommand({ - __tauriModule: "Dialog", - message: { - cmd: "askDialog", - message: message2.toString(), - title: opts?.title?.toString(), - type: opts?.type - } - }); -} -async function confirm(message2, options) { - const opts = typeof options === "string" ? { title: options } : options; - return invokeTauriCommand({ - __tauriModule: "Dialog", - message: { - cmd: "confirmDialog", - message: message2.toString(), - title: opts?.title?.toString(), - type: opts?.type - } - }); -} -export { - ask, - confirm, - message, - open, - save -}; diff --git a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/event.js b/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/event.js deleted file mode 100644 index 934f20b..0000000 --- a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/event.js +++ /dev/null @@ -1,123 +0,0 @@ -// tauri/tooling/api/src/tauri.ts -function uid() { - return window.crypto.getRandomValues(new Uint32Array(1))[0]; -} -function transformCallback(callback, once3 = false) { - const identifier = uid(); - const prop = `_${identifier}`; - Object.defineProperty(window, prop, { - value: (result) => { - if (once3) { - Reflect.deleteProperty(window, prop); - } - return callback?.(result); - }, - writable: false, - configurable: true - }); - return identifier; -} -async function invoke(cmd, args = {}) { - return new Promise((resolve, reject) => { - const callback = transformCallback((e) => { - resolve(e); - Reflect.deleteProperty(window, `_${error}`); - }, true); - const error = transformCallback((e) => { - reject(e); - Reflect.deleteProperty(window, `_${callback}`); - }, true); - window.__TAURI_IPC__({ - cmd, - callback, - error, - ...args - }); - }); -} - -// tauri/tooling/api/src/helpers/tauri.ts -async function invokeTauriCommand(command) { - return invoke("tauri", command); -} - -// tauri/tooling/api/src/helpers/event.ts -async function _unlisten(event, eventId) { - return invokeTauriCommand({ - __tauriModule: "Event", - message: { - cmd: "unlisten", - event, - eventId - } - }); -} -async function emit(event, windowLabel, payload) { - await invokeTauriCommand({ - __tauriModule: "Event", - message: { - cmd: "emit", - event, - windowLabel, - payload - } - }); -} -async function listen(event, windowLabel, handler) { - return invokeTauriCommand({ - __tauriModule: "Event", - message: { - cmd: "listen", - event, - windowLabel, - handler: transformCallback(handler) - } - }).then((eventId) => { - return async () => _unlisten(event, eventId); - }); -} -async function once(event, windowLabel, handler) { - return listen(event, windowLabel, (eventData) => { - handler(eventData); - _unlisten(event, eventData.id).catch(() => { - }); - }); -} - -// tauri/tooling/api/src/event.ts -var TauriEvent = /* @__PURE__ */ ((TauriEvent2) => { - TauriEvent2["WINDOW_RESIZED"] = "tauri://resize"; - TauriEvent2["WINDOW_MOVED"] = "tauri://move"; - TauriEvent2["WINDOW_CLOSE_REQUESTED"] = "tauri://close-requested"; - TauriEvent2["WINDOW_CREATED"] = "tauri://window-created"; - TauriEvent2["WINDOW_DESTROYED"] = "tauri://destroyed"; - TauriEvent2["WINDOW_FOCUS"] = "tauri://focus"; - TauriEvent2["WINDOW_BLUR"] = "tauri://blur"; - TauriEvent2["WINDOW_SCALE_FACTOR_CHANGED"] = "tauri://scale-change"; - TauriEvent2["WINDOW_THEME_CHANGED"] = "tauri://theme-changed"; - TauriEvent2["WINDOW_FILE_DROP"] = "tauri://file-drop"; - TauriEvent2["WINDOW_FILE_DROP_HOVER"] = "tauri://file-drop-hover"; - TauriEvent2["WINDOW_FILE_DROP_CANCELLED"] = "tauri://file-drop-cancelled"; - TauriEvent2["MENU"] = "tauri://menu"; - TauriEvent2["CHECK_UPDATE"] = "tauri://update"; - TauriEvent2["UPDATE_AVAILABLE"] = "tauri://update-available"; - TauriEvent2["INSTALL_UPDATE"] = "tauri://update-install"; - TauriEvent2["STATUS_UPDATE"] = "tauri://update-status"; - TauriEvent2["DOWNLOAD_PROGRESS"] = "tauri://update-download-progress"; - return TauriEvent2; -})(TauriEvent || {}); -async function listen2(event, handler) { - return listen(event, null, handler); -} -async function once2(event, handler) { - return once(event, null, handler); -} -async function emit2(event, payload) { - return emit(event, void 0, payload); -} -export { - TauriEvent, - emit2 as emit, - listen2 as listen, - once2 as once -}; diff --git a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/mocks.js b/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/mocks.js deleted file mode 100644 index 4342d8f..0000000 --- a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/mocks.js +++ /dev/null @@ -1,30 +0,0 @@ -// tauri/tooling/api/src/mocks.ts -function mockIPC(cb) { - window.__TAURI_IPC__ = async ({ - cmd, - callback, - error, - ...args - }) => { - try { - window[`_${callback}`](await cb(cmd, args)); - } catch (err) { - window[`_${error}`](err); - } - }; -} -function mockWindows(current, ...additionalWindows) { - window.__TAURI_METADATA__ = { - __windows: [current, ...additionalWindows].map((label) => ({ label })), - __currentWindow: { label: current } - }; -} -function clearMocks() { - delete window.__TAURI_IPC__; - delete window.__TAURI_METADATA__; -} -export { - clearMocks, - mockIPC, - mockWindows -}; diff --git a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/process.js b/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/process.js deleted file mode 100644 index 9356313..0000000 --- a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/process.js +++ /dev/null @@ -1,65 +0,0 @@ -// tauri/tooling/api/src/tauri.ts -function uid() { - return window.crypto.getRandomValues(new Uint32Array(1))[0]; -} -function transformCallback(callback, once = false) { - const identifier = uid(); - const prop = `_${identifier}`; - Object.defineProperty(window, prop, { - value: (result) => { - if (once) { - Reflect.deleteProperty(window, prop); - } - return callback?.(result); - }, - writable: false, - configurable: true - }); - return identifier; -} -async function invoke(cmd, args = {}) { - return new Promise((resolve, reject) => { - const callback = transformCallback((e) => { - resolve(e); - Reflect.deleteProperty(window, `_${error}`); - }, true); - const error = transformCallback((e) => { - reject(e); - Reflect.deleteProperty(window, `_${callback}`); - }, true); - window.__TAURI_IPC__({ - cmd, - callback, - error, - ...args - }); - }); -} - -// tauri/tooling/api/src/helpers/tauri.ts -async function invokeTauriCommand(command) { - return invoke("tauri", command); -} - -// tauri/tooling/api/src/process.ts -async function exit(exitCode = 0) { - return invokeTauriCommand({ - __tauriModule: "Process", - message: { - cmd: "exit", - exitCode - } - }); -} -async function relaunch() { - return invokeTauriCommand({ - __tauriModule: "Process", - message: { - cmd: "relaunch" - } - }); -} -export { - exit, - relaunch -}; diff --git a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/tauri.js b/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/tauri.js deleted file mode 100644 index 5360e6f..0000000 --- a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/tauri.js +++ /dev/null @@ -1,46 +0,0 @@ -// tauri/tooling/api/src/tauri.ts -function uid() { - return window.crypto.getRandomValues(new Uint32Array(1))[0]; -} -function transformCallback(callback, once = false) { - const identifier = uid(); - const prop = `_${identifier}`; - Object.defineProperty(window, prop, { - value: (result) => { - if (once) { - Reflect.deleteProperty(window, prop); - } - return callback?.(result); - }, - writable: false, - configurable: true - }); - return identifier; -} -async function invoke(cmd, args = {}) { - return new Promise((resolve, reject) => { - const callback = transformCallback((e) => { - resolve(e); - Reflect.deleteProperty(window, `_${error}`); - }, true); - const error = transformCallback((e) => { - reject(e); - Reflect.deleteProperty(window, `_${callback}`); - }, true); - window.__TAURI_IPC__({ - cmd, - callback, - error, - ...args - }); - }); -} -function convertFileSrc(filePath, protocol = "asset") { - const path = encodeURIComponent(filePath); - return navigator.userAgent.includes("Windows") ? `https://${protocol}.localhost/${path}` : `${protocol}://localhost/${path}`; -} -export { - convertFileSrc, - invoke, - transformCallback -}; diff --git a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/window.js b/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/window.js deleted file mode 100644 index e0b637b..0000000 --- a/examples/test/dist/snippets/tauri-sys-91bd50ded94e0ed7/src/window.js +++ /dev/null @@ -1,1004 +0,0 @@ -// tauri/tooling/api/src/tauri.ts -function uid() { - return window.crypto.getRandomValues(new Uint32Array(1))[0]; -} -function transformCallback(callback, once2 = false) { - const identifier = uid(); - const prop = `_${identifier}`; - Object.defineProperty(window, prop, { - value: (result) => { - if (once2) { - Reflect.deleteProperty(window, prop); - } - return callback?.(result); - }, - writable: false, - configurable: true - }); - return identifier; -} -async function invoke(cmd, args = {}) { - return new Promise((resolve, reject) => { - const callback = transformCallback((e) => { - resolve(e); - Reflect.deleteProperty(window, `_${error}`); - }, true); - const error = transformCallback((e) => { - reject(e); - Reflect.deleteProperty(window, `_${callback}`); - }, true); - window.__TAURI_IPC__({ - cmd, - callback, - error, - ...args - }); - }); -} - -// tauri/tooling/api/src/helpers/tauri.ts -async function invokeTauriCommand(command) { - return invoke("tauri", command); -} - -// tauri/tooling/api/src/helpers/event.ts -async function _unlisten(event, eventId) { - return invokeTauriCommand({ - __tauriModule: "Event", - message: { - cmd: "unlisten", - event, - eventId - } - }); -} -async function emit(event, windowLabel, payload) { - await invokeTauriCommand({ - __tauriModule: "Event", - message: { - cmd: "emit", - event, - windowLabel, - payload - } - }); -} -async function listen(event, windowLabel, handler) { - return invokeTauriCommand({ - __tauriModule: "Event", - message: { - cmd: "listen", - event, - windowLabel, - handler: transformCallback(handler) - } - }).then((eventId) => { - return async () => _unlisten(event, eventId); - }); -} -async function once(event, windowLabel, handler) { - return listen(event, windowLabel, (eventData) => { - handler(eventData); - _unlisten(event, eventData.id).catch(() => { - }); - }); -} - -// tauri/tooling/api/src/window.ts -var LogicalSize = class { - constructor(width, height) { - this.type = "Logical"; - this.width = width; - this.height = height; - } -}; -var PhysicalSize = class { - constructor(width, height) { - this.type = "Physical"; - this.width = width; - this.height = height; - } - toLogical(scaleFactor) { - return new LogicalSize(this.width / scaleFactor, this.height / scaleFactor); - } -}; -var LogicalPosition = class { - constructor(x, y) { - this.type = "Logical"; - this.x = x; - this.y = y; - } -}; -var PhysicalPosition = class { - constructor(x, y) { - this.type = "Physical"; - this.x = x; - this.y = y; - } - toLogical(scaleFactor) { - return new LogicalPosition(this.x / scaleFactor, this.y / scaleFactor); - } -}; -var UserAttentionType = /* @__PURE__ */ ((UserAttentionType2) => { - UserAttentionType2[UserAttentionType2["Critical"] = 1] = "Critical"; - UserAttentionType2[UserAttentionType2["Informational"] = 2] = "Informational"; - return UserAttentionType2; -})(UserAttentionType || {}); -function getCurrent() { - return new WebviewWindow(window.__TAURI_METADATA__.__currentWindow.label, { - skip: true - }); -} -function getAll() { - return window.__TAURI_METADATA__.__windows.map( - (w) => new WebviewWindow(w.label, { - skip: true - }) - ); -} -var localTauriEvents = ["tauri://created", "tauri://error"]; -var WebviewWindowHandle = class { - constructor(label) { - this.label = label; - this.listeners = /* @__PURE__ */ Object.create(null); - } - async listen(event, handler) { - if (this._handleTauriEvent(event, handler)) { - return Promise.resolve(() => { - const listeners = this.listeners[event]; - listeners.splice(listeners.indexOf(handler), 1); - }); - } - return listen(event, this.label, handler); - } - async once(event, handler) { - if (this._handleTauriEvent(event, handler)) { - return Promise.resolve(() => { - const listeners = this.listeners[event]; - listeners.splice(listeners.indexOf(handler), 1); - }); - } - return once(event, this.label, handler); - } - async emit(event, payload) { - if (localTauriEvents.includes(event)) { - for (const handler of this.listeners[event] || []) { - handler({ event, id: -1, windowLabel: this.label, payload }); - } - return Promise.resolve(); - } - return emit(event, this.label, payload); - } - _handleTauriEvent(event, handler) { - if (localTauriEvents.includes(event)) { - if (!(event in this.listeners)) { - this.listeners[event] = [handler]; - } else { - this.listeners[event].push(handler); - } - return true; - } - return false; - } -}; -var WindowManager = class extends WebviewWindowHandle { - async scaleFactor() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "scaleFactor" - } - } - } - }); - } - async innerPosition() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "innerPosition" - } - } - } - }).then(({ x, y }) => new PhysicalPosition(x, y)); - } - async outerPosition() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "outerPosition" - } - } - } - }).then(({ x, y }) => new PhysicalPosition(x, y)); - } - async innerSize() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "innerSize" - } - } - } - }).then(({ width, height }) => new PhysicalSize(width, height)); - } - async outerSize() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "outerSize" - } - } - } - }).then(({ width, height }) => new PhysicalSize(width, height)); - } - async isFullscreen() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "isFullscreen" - } - } - } - }); - } - async isMaximized() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "isMaximized" - } - } - } - }); - } - async isDecorated() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "isDecorated" - } - } - } - }); - } - async isResizable() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "isResizable" - } - } - } - }); - } - async isVisible() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "isVisible" - } - } - } - }); - } - async theme() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "theme" - } - } - } - }); - } - async center() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "center" - } - } - } - }); - } - async requestUserAttention(requestType) { - let requestType_ = null; - if (requestType) { - if (requestType === 1 /* Critical */) { - requestType_ = { type: "Critical" }; - } else { - requestType_ = { type: "Informational" }; - } - } - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "requestUserAttention", - payload: requestType_ - } - } - } - }); - } - async setResizable(resizable) { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setResizable", - payload: resizable - } - } - } - }); - } - async setTitle(title) { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setTitle", - payload: title - } - } - } - }); - } - async maximize() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "maximize" - } - } - } - }); - } - async unmaximize() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "unmaximize" - } - } - } - }); - } - async toggleMaximize() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "toggleMaximize" - } - } - } - }); - } - async minimize() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "minimize" - } - } - } - }); - } - async unminimize() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "unminimize" - } - } - } - }); - } - async show() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "show" - } - } - } - }); - } - async hide() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "hide" - } - } - } - }); - } - async close() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "close" - } - } - } - }); - } - async setDecorations(decorations) { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setDecorations", - payload: decorations - } - } - } - }); - } - async setAlwaysOnTop(alwaysOnTop) { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setAlwaysOnTop", - payload: alwaysOnTop - } - } - } - }); - } - async setSize(size) { - if (!size || size.type !== "Logical" && size.type !== "Physical") { - throw new Error( - "the `size` argument must be either a LogicalSize or a PhysicalSize instance" - ); - } - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setSize", - payload: { - type: size.type, - data: { - width: size.width, - height: size.height - } - } - } - } - } - }); - } - async setMinSize(size) { - if (size && size.type !== "Logical" && size.type !== "Physical") { - throw new Error( - "the `size` argument must be either a LogicalSize or a PhysicalSize instance" - ); - } - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setMinSize", - payload: size ? { - type: size.type, - data: { - width: size.width, - height: size.height - } - } : null - } - } - } - }); - } - async setMaxSize(size) { - if (size && size.type !== "Logical" && size.type !== "Physical") { - throw new Error( - "the `size` argument must be either a LogicalSize or a PhysicalSize instance" - ); - } - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setMaxSize", - payload: size ? { - type: size.type, - data: { - width: size.width, - height: size.height - } - } : null - } - } - } - }); - } - async setPosition(position) { - if (!position || position.type !== "Logical" && position.type !== "Physical") { - throw new Error( - "the `position` argument must be either a LogicalPosition or a PhysicalPosition instance" - ); - } - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setPosition", - payload: { - type: position.type, - data: { - x: position.x, - y: position.y - } - } - } - } - } - }); - } - async setFullscreen(fullscreen) { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setFullscreen", - payload: fullscreen - } - } - } - }); - } - async setFocus() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setFocus" - } - } - } - }); - } - async setIcon(icon) { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setIcon", - payload: { - icon: typeof icon === "string" ? icon : Array.from(icon) - } - } - } - } - }); - } - async setSkipTaskbar(skip) { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setSkipTaskbar", - payload: skip - } - } - } - }); - } - async setCursorGrab(grab) { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setCursorGrab", - payload: grab - } - } - } - }); - } - async setCursorVisible(visible) { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setCursorVisible", - payload: visible - } - } - } - }); - } - async setCursorIcon(icon) { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setCursorIcon", - payload: icon - } - } - } - }); - } - async setCursorPosition(position) { - if (!position || position.type !== "Logical" && position.type !== "Physical") { - throw new Error( - "the `position` argument must be either a LogicalPosition or a PhysicalPosition instance" - ); - } - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setCursorPosition", - payload: { - type: position.type, - data: { - x: position.x, - y: position.y - } - } - } - } - } - }); - } - async setIgnoreCursorEvents(ignore) { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "setIgnoreCursorEvents", - payload: ignore - } - } - } - }); - } - async startDragging() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - label: this.label, - cmd: { - type: "startDragging" - } - } - } - }); - } - async onResized(handler) { - return this.listen("tauri://resize" /* WINDOW_RESIZED */, handler); - } - async onMoved(handler) { - return this.listen("tauri://move" /* WINDOW_MOVED */, handler); - } - async onCloseRequested(handler) { - return this.listen("tauri://close-requested" /* WINDOW_CLOSE_REQUESTED */, (event) => { - const evt = new CloseRequestedEvent(event); - void Promise.resolve(handler(evt)).then(() => { - if (!evt.isPreventDefault()) { - return this.close(); - } - }); - }); - } - async onFocusChanged(handler) { - const unlistenFocus = await this.listen( - "tauri://focus" /* WINDOW_FOCUS */, - (event) => { - handler({ ...event, payload: true }); - } - ); - const unlistenBlur = await this.listen( - "tauri://blur" /* WINDOW_BLUR */, - (event) => { - handler({ ...event, payload: false }); - } - ); - return () => { - unlistenFocus(); - unlistenBlur(); - }; - } - async onScaleChanged(handler) { - return this.listen( - "tauri://scale-change" /* WINDOW_SCALE_FACTOR_CHANGED */, - handler - ); - } - async onMenuClicked(handler) { - return this.listen("tauri://menu" /* MENU */, handler); - } - async onFileDropEvent(handler) { - const unlistenFileDrop = await this.listen( - "tauri://file-drop" /* WINDOW_FILE_DROP */, - (event) => { - handler({ ...event, payload: { type: "drop", paths: event.payload } }); - } - ); - const unlistenFileHover = await this.listen( - "tauri://file-drop-hover" /* WINDOW_FILE_DROP_HOVER */, - (event) => { - handler({ ...event, payload: { type: "hover", paths: event.payload } }); - } - ); - const unlistenCancel = await this.listen( - "tauri://file-drop-cancelled" /* WINDOW_FILE_DROP_CANCELLED */, - (event) => { - handler({ ...event, payload: { type: "cancel" } }); - } - ); - return () => { - unlistenFileDrop(); - unlistenFileHover(); - unlistenCancel(); - }; - } - async onThemeChanged(handler) { - return this.listen("tauri://theme-changed" /* WINDOW_THEME_CHANGED */, handler); - } -}; -var CloseRequestedEvent = class { - constructor(event) { - this._preventDefault = false; - this.event = event.event; - this.windowLabel = event.windowLabel; - this.id = event.id; - } - preventDefault() { - this._preventDefault = true; - } - isPreventDefault() { - return this._preventDefault; - } -}; -var WebviewWindow = class extends WindowManager { - constructor(label, options = {}) { - super(label); - if (!options?.skip) { - invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "createWebview", - data: { - options: { - label, - ...options - } - } - } - }).then(async () => this.emit("tauri://created")).catch(async (e) => this.emit("tauri://error", e)); - } - } - static getByLabel(label) { - if (getAll().some((w) => w.label === label)) { - return new WebviewWindow(label, { skip: true }); - } - return null; - } -}; -var appWindow; -if ("__TAURI_METADATA__" in window) { - appWindow = new WebviewWindow( - window.__TAURI_METADATA__.__currentWindow.label, - { - skip: true - } - ); -} else { - console.warn( - `Could not find "window.__TAURI_METADATA__". The "appWindow" value will reference the "main" window label. -Note that this is not an issue if running this frontend on a browser instead of a Tauri window.` - ); - appWindow = new WebviewWindow("main", { - skip: true - }); -} -function mapMonitor(m) { - return m === null ? null : { - name: m.name, - scaleFactor: m.scaleFactor, - position: new PhysicalPosition(m.position.x, m.position.y), - size: new PhysicalSize(m.size.width, m.size.height) - }; -} -async function currentMonitor() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - cmd: { - type: "currentMonitor" - } - } - } - }).then(mapMonitor); -} -async function primaryMonitor() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - cmd: { - type: "primaryMonitor" - } - } - } - }).then(mapMonitor); -} -async function availableMonitors() { - return invokeTauriCommand({ - __tauriModule: "Window", - message: { - cmd: "manage", - data: { - cmd: { - type: "availableMonitors" - } - } - } - }).then((ms) => ms.map(mapMonitor)); -} -export { - CloseRequestedEvent, - LogicalPosition, - LogicalSize, - PhysicalPosition, - PhysicalSize, - UserAttentionType, - WebviewWindow, - WebviewWindowHandle, - WindowManager, - appWindow, - availableMonitors, - currentMonitor, - getAll, - getCurrent, - primaryMonitor -}; diff --git a/examples/test/dist/tauri-sys-test-ui-94e40ba9adfa8fe6.js b/examples/test/dist/tauri-sys-test-ui-94e40ba9adfa8fe6.js deleted file mode 100644 index c930c00..0000000 --- a/examples/test/dist/tauri-sys-test-ui-94e40ba9adfa8fe6.js +++ /dev/null @@ -1,656 +0,0 @@ -import { getName, getTauriVersion, getVersion } from './snippets/tauri-sys-91bd50ded94e0ed7/src/app.js'; -import { readText, writeText } from './snippets/tauri-sys-91bd50ded94e0ed7/src/clipboard.js'; -import { emit } from './snippets/tauri-sys-91bd50ded94e0ed7/src/event.js'; -import { exit } from './snippets/tauri-sys-91bd50ded94e0ed7/src/process.js'; -import { invoke } from './snippets/tauri-sys-91bd50ded94e0ed7/src/tauri.js'; - -let wasm; - -const cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }); - -cachedTextDecoder.decode(); - -let cachedUint8Memory0 = new Uint8Array(); - -function getUint8Memory0() { - if (cachedUint8Memory0.byteLength === 0) { - cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer); - } - return cachedUint8Memory0; -} - -function getStringFromWasm0(ptr, len) { - return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len)); -} - -const heap = new Array(32).fill(undefined); - -heap.push(undefined, null, true, false); - -let heap_next = heap.length; - -function addHeapObject(obj) { - if (heap_next === heap.length) heap.push(heap.length + 1); - const idx = heap_next; - heap_next = heap[idx]; - - heap[idx] = obj; - return idx; -} - -function getObject(idx) { return heap[idx]; } - -let WASM_VECTOR_LEN = 0; - -const cachedTextEncoder = new TextEncoder('utf-8'); - -const encodeString = (typeof cachedTextEncoder.encodeInto === 'function' - ? function (arg, view) { - return cachedTextEncoder.encodeInto(arg, view); -} - : function (arg, view) { - const buf = cachedTextEncoder.encode(arg); - view.set(buf); - return { - read: arg.length, - written: buf.length - }; -}); - -function passStringToWasm0(arg, malloc, realloc) { - - if (realloc === undefined) { - const buf = cachedTextEncoder.encode(arg); - const ptr = malloc(buf.length); - getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf); - WASM_VECTOR_LEN = buf.length; - return ptr; - } - - let len = arg.length; - let ptr = malloc(len); - - const mem = getUint8Memory0(); - - let offset = 0; - - for (; offset < len; offset++) { - const code = arg.charCodeAt(offset); - if (code > 0x7F) break; - mem[ptr + offset] = code; - } - - if (offset !== len) { - if (offset !== 0) { - arg = arg.slice(offset); - } - ptr = realloc(ptr, len, len = offset + arg.length * 3); - const view = getUint8Memory0().subarray(ptr + offset, ptr + len); - const ret = encodeString(arg, view); - - offset += ret.written; - } - - WASM_VECTOR_LEN = offset; - return ptr; -} - -function isLikeNone(x) { - return x === undefined || x === null; -} - -let cachedInt32Memory0 = new Int32Array(); - -function getInt32Memory0() { - if (cachedInt32Memory0.byteLength === 0) { - cachedInt32Memory0 = new Int32Array(wasm.memory.buffer); - } - return cachedInt32Memory0; -} - -let cachedFloat64Memory0 = new Float64Array(); - -function getFloat64Memory0() { - if (cachedFloat64Memory0.byteLength === 0) { - cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer); - } - return cachedFloat64Memory0; -} - -function dropObject(idx) { - if (idx < 36) return; - heap[idx] = heap_next; - heap_next = idx; -} - -function takeObject(idx) { - const ret = getObject(idx); - dropObject(idx); - return ret; -} - -function debugString(val) { - // primitive types - const type = typeof val; - if (type == 'number' || type == 'boolean' || val == null) { - return `${val}`; - } - if (type == 'string') { - return `"${val}"`; - } - if (type == 'symbol') { - const description = val.description; - if (description == null) { - return 'Symbol'; - } else { - return `Symbol(${description})`; - } - } - if (type == 'function') { - const name = val.name; - if (typeof name == 'string' && name.length > 0) { - return `Function(${name})`; - } else { - return 'Function'; - } - } - // objects - if (Array.isArray(val)) { - const length = val.length; - let debug = '['; - if (length > 0) { - debug += debugString(val[0]); - } - for(let i = 1; i < length; i++) { - debug += ', ' + debugString(val[i]); - } - debug += ']'; - return debug; - } - // Test for built-in - const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val)); - let className; - if (builtInMatches.length > 1) { - className = builtInMatches[1]; - } else { - // Failed to match the standard '[object ClassName]' - return toString.call(val); - } - if (className == 'Object') { - // we're a user defined class or Object - // JSON.stringify avoids problems with cycles, and is generally much - // easier than looping through ownProperties of `val`. - try { - return 'Object(' + JSON.stringify(val) + ')'; - } catch (_) { - return 'Object'; - } - } - // errors - if (val instanceof Error) { - return `${val.name}: ${val.message}\n${val.stack}`; - } - // TODO we could test for more things here, like `Set`s and `Map`s. - return className; -} - -function makeMutClosure(arg0, arg1, dtor, f) { - const state = { a: arg0, b: arg1, cnt: 1, dtor }; - const real = (...args) => { - // First up with a closure we increment the internal reference - // count. This ensures that the Rust closure environment won't - // be deallocated while we're invoking it. - state.cnt++; - const a = state.a; - state.a = 0; - try { - return f(a, state.b, ...args); - } finally { - if (--state.cnt === 0) { - wasm.__wbindgen_export_2.get(state.dtor)(a, state.b); - - } else { - state.a = a; - } - } - }; - real.original = state; - - return real; -} -function __wbg_adapter_28(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1531275bccc70f0a(arg0, arg1, addHeapObject(arg2)); -} - -function getCachedStringFromWasm0(ptr, len) { - if (ptr === 0) { - return getObject(len); - } else { - return getStringFromWasm0(ptr, len); - } -} - -function handleError(f, args) { - try { - return f.apply(this, args); - } catch (e) { - wasm.__wbindgen_exn_store(addHeapObject(e)); - } -} - -async function load(module, imports) { - if (typeof Response === 'function' && module instanceof Response) { - if (typeof WebAssembly.instantiateStreaming === 'function') { - try { - return await WebAssembly.instantiateStreaming(module, imports); - - } catch (e) { - if (module.headers.get('Content-Type') != 'application/wasm') { - console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e); - - } else { - throw e; - } - } - } - - const bytes = await module.arrayBuffer(); - return await WebAssembly.instantiate(bytes, imports); - - } else { - const instance = await WebAssembly.instantiate(module, imports); - - if (instance instanceof WebAssembly.Instance) { - return { instance, module }; - - } else { - return instance; - } - } -} - -function getImports() { - const imports = {}; - imports.wbg = {}; - imports.wbg.__wbg_readText_94a6e8d9907e78cc = function() { return handleError(function () { - const ret = readText(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_writeText_f97e44754fa0ff39 = function() { return handleError(function (arg0, arg1) { - var v0 = getCachedStringFromWasm0(arg0, arg1); - const ret = writeText(v0); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_invoke_9b778281ea803eaa = function() { return handleError(function (arg0, arg1, arg2) { - var v0 = getCachedStringFromWasm0(arg0, arg1); - const ret = invoke(v0, takeObject(arg2)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_getVersion_ffafb063403bc617 = function() { return handleError(function () { - const ret = getVersion(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_getTauriVersion_e328534c86bd2dc2 = function() { return handleError(function () { - const ret = getTauriVersion(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_getName_68a59771155ee2ce = function() { return handleError(function () { - const ret = getName(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbindgen_error_new = function(arg0, arg1) { - const ret = new Error(getStringFromWasm0(arg0, arg1)); - return addHeapObject(ret); - }; - imports.wbg.__wbindgen_boolean_get = function(arg0) { - const v = getObject(arg0); - const ret = typeof(v) === 'boolean' ? (v ? 1 : 0) : 2; - return ret; - }; - imports.wbg.__wbindgen_string_get = function(arg0, arg1) { - const obj = getObject(arg1); - const ret = typeof(obj) === 'string' ? obj : undefined; - var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }; - imports.wbg.__wbindgen_object_clone_ref = function(arg0) { - const ret = getObject(arg0); - return addHeapObject(ret); - }; - imports.wbg.__wbg_emit_d58da538f5751592 = function() { return handleError(function (arg0, arg1, arg2) { - var v0 = getCachedStringFromWasm0(arg0, arg1); - const ret = emit(v0, takeObject(arg2)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_exit_20b0b9ccb0860063 = function(arg0) { - const ret = exit(arg0 >>> 0); - return addHeapObject(ret); - }; - imports.wbg.__wbindgen_string_new = function(arg0, arg1) { - const ret = getStringFromWasm0(arg0, arg1); - return addHeapObject(ret); - }; - imports.wbg.__wbg_nodeId_bbf0efafa303e805 = function(arg0, arg1) { - const ret = getObject(arg1).$$$nodeId; - getInt32Memory0()[arg0 / 4 + 1] = isLikeNone(ret) ? 0 : ret; - getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret); - }; - imports.wbg.__wbg_setnodeId_433ef8ed15bd1612 = function(arg0, arg1) { - getObject(arg0).$$$nodeId = arg1 >>> 0; - }; - imports.wbg.__wbg_createTextNode_a7d5f5b956acda97 = function(arg0, arg1) { - const ret = getObject(arg0).createTextNode(arg1); - return addHeapObject(ret); - }; - imports.wbg.__wbg_instanceof_Window_acc97ff9f5d2c7b4 = function(arg0) { - let result; - try { - result = getObject(arg0) instanceof Window; - } catch { - result = false; - } - const ret = result; - return ret; - }; - imports.wbg.__wbg_document_3ead31dbcad65886 = function(arg0) { - const ret = getObject(arg0).document; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_body_3cb4b4042b9a632b = function(arg0) { - const ret = getObject(arg0).body; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_createComment_0df3a4d0d91032e7 = function(arg0, arg1, arg2) { - var v0 = getCachedStringFromWasm0(arg1, arg2); - const ret = getObject(arg0).createComment(v0); - return addHeapObject(ret); - }; - imports.wbg.__wbg_createElement_976dbb84fe1661b5 = function() { return handleError(function (arg0, arg1, arg2) { - var v0 = getCachedStringFromWasm0(arg1, arg2); - const ret = getObject(arg0).createElement(v0); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_createElementNS_1561aca8ee3693c0 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { - var v0 = getCachedStringFromWasm0(arg1, arg2); - var v1 = getCachedStringFromWasm0(arg3, arg4); - const ret = getObject(arg0).createElementNS(v0, v1); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_createTextNode_300f845fab76642f = function(arg0, arg1, arg2) { - var v0 = getCachedStringFromWasm0(arg1, arg2); - const ret = getObject(arg0).createTextNode(v0); - return addHeapObject(ret); - }; - imports.wbg.__wbg_instanceof_Comment_1758f7164ca9ea81 = function(arg0) { - let result; - try { - result = getObject(arg0) instanceof Comment; - } catch { - result = false; - } - const ret = result; - return ret; - }; - imports.wbg.__wbg_instanceof_Text_6855016c7825859b = function(arg0) { - let result; - try { - result = getObject(arg0) instanceof Text; - } catch { - result = false; - } - const ret = result; - return ret; - }; - imports.wbg.__wbg_instanceof_Element_33bd126d58f2021b = function(arg0) { - let result; - try { - result = getObject(arg0) instanceof Element; - } catch { - result = false; - } - const ret = result; - return ret; - }; - imports.wbg.__wbg_outerHTML_bf662bdff92e5910 = function(arg0, arg1) { - const ret = getObject(arg1).outerHTML; - const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - const len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }; - imports.wbg.__wbg_parentNode_e397bbbe28be7b28 = function(arg0) { - const ret = getObject(arg0).parentNode; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_nextSibling_62338ec2a05607b4 = function(arg0) { - const ret = getObject(arg0).nextSibling; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_textContent_77bd294928962f93 = function(arg0, arg1) { - const ret = getObject(arg1).textContent; - var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }; - imports.wbg.__wbg_settextContent_538ceb17614272d8 = function(arg0, arg1, arg2) { - var v0 = getCachedStringFromWasm0(arg1, arg2); - getObject(arg0).textContent = v0; - }; - imports.wbg.__wbg_appendChild_e513ef0e5098dfdd = function() { return handleError(function (arg0, arg1) { - const ret = getObject(arg0).appendChild(getObject(arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_insertBefore_9f2d2defb9471006 = function() { return handleError(function (arg0, arg1, arg2) { - const ret = getObject(arg0).insertBefore(getObject(arg1), getObject(arg2)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_removeChild_6751e9ca5d9aaf00 = function() { return handleError(function (arg0, arg1) { - const ret = getObject(arg0).removeChild(getObject(arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_replaceChild_4793d6269c04dd25 = function() { return handleError(function (arg0, arg1, arg2) { - const ret = getObject(arg0).replaceChild(getObject(arg1), getObject(arg2)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbindgen_is_undefined = function(arg0) { - const ret = getObject(arg0) === undefined; - return ret; - }; - imports.wbg.__wbindgen_number_get = function(arg0, arg1) { - const obj = getObject(arg1); - const ret = typeof(obj) === 'number' ? obj : undefined; - getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret; - getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret); - }; - imports.wbg.__wbindgen_cb_drop = function(arg0) { - const obj = takeObject(arg0).original; - if (obj.cnt-- == 1) { - obj.a = 0; - return true; - } - const ret = false; - return ret; - }; - imports.wbg.__wbindgen_jsval_loose_eq = function(arg0, arg1) { - const ret = getObject(arg0) == getObject(arg1); - return ret; - }; - imports.wbg.__wbg_set_20cbc34131e76824 = function(arg0, arg1, arg2) { - getObject(arg0)[takeObject(arg1)] = takeObject(arg2); - }; - imports.wbg.__wbg_instanceof_ArrayBuffer_e5e48f4762c5610b = function(arg0) { - let result; - try { - result = getObject(arg0) instanceof ArrayBuffer; - } catch { - result = false; - } - const ret = result; - return ret; - }; - imports.wbg.__wbg_newnoargs_b5b063fc6c2f0376 = function(arg0, arg1) { - var v0 = getCachedStringFromWasm0(arg0, arg1); - const ret = new Function(v0); - return addHeapObject(ret); - }; - imports.wbg.__wbg_call_97ae9d8645dc388b = function() { return handleError(function (arg0, arg1) { - const ret = getObject(arg0).call(getObject(arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_is_40a66842732708e7 = function(arg0, arg1) { - const ret = Object.is(getObject(arg0), getObject(arg1)); - return ret; - }; - imports.wbg.__wbg_new_0b9bfdd97583284e = function() { - const ret = new Object(); - return addHeapObject(ret); - }; - imports.wbg.__wbg_toString_7be108a12ef03bc2 = function(arg0) { - const ret = getObject(arg0).toString(); - return addHeapObject(ret); - }; - imports.wbg.__wbg_resolve_99fe17964f31ffc0 = function(arg0) { - const ret = Promise.resolve(getObject(arg0)); - return addHeapObject(ret); - }; - imports.wbg.__wbg_then_11f7a54d67b4bfad = function(arg0, arg1) { - const ret = getObject(arg0).then(getObject(arg1)); - return addHeapObject(ret); - }; - imports.wbg.__wbg_then_cedad20fbbd9418a = function(arg0, arg1, arg2) { - const ret = getObject(arg0).then(getObject(arg1), getObject(arg2)); - return addHeapObject(ret); - }; - imports.wbg.__wbg_globalThis_7f206bda628d5286 = function() { return handleError(function () { - const ret = globalThis.globalThis; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_self_6d479506f72c6a71 = function() { return handleError(function () { - const ret = self.self; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_window_f2557cc78490aceb = function() { return handleError(function () { - const ret = window.window; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_global_ba75c50d1cf384f4 = function() { return handleError(function () { - const ret = global.global; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_instanceof_Uint8Array_971eeda69eb75003 = function(arg0) { - let result; - try { - result = getObject(arg0) instanceof Uint8Array; - } catch { - result = false; - } - const ret = result; - return ret; - }; - imports.wbg.__wbg_new_8c3f0052272a457a = function(arg0) { - const ret = new Uint8Array(getObject(arg0)); - return addHeapObject(ret); - }; - imports.wbg.__wbg_length_9e1ae1900cb0fbd5 = function(arg0) { - const ret = getObject(arg0).length; - return ret; - }; - imports.wbg.__wbg_set_83db9690f9353e79 = function(arg0, arg1, arg2) { - getObject(arg0).set(getObject(arg1), arg2 >>> 0); - }; - imports.wbg.__wbg_buffer_3f3d764d4747d564 = function(arg0) { - const ret = getObject(arg0).buffer; - return addHeapObject(ret); - }; - imports.wbg.__wbg_error_f851667af71bcfc6 = function(arg0, arg1) { - var v0 = getCachedStringFromWasm0(arg0, arg1); - if (arg0 !== 0) { wasm.__wbindgen_free(arg0, arg1); } - console.error(v0); -}; -imports.wbg.__wbg_new_abda76e883ba8a5f = function() { - const ret = new Error(); - return addHeapObject(ret); -}; -imports.wbg.__wbg_stack_658279fe44541cf6 = function(arg0, arg1) { - const ret = getObject(arg1).stack; - const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - const len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; -}; -imports.wbg.__wbindgen_debug_string = function(arg0, arg1) { - const ret = debugString(getObject(arg1)); - const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - const len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; -}; -imports.wbg.__wbindgen_object_drop_ref = function(arg0) { - takeObject(arg0); -}; -imports.wbg.__wbindgen_throw = function(arg0, arg1) { - throw new Error(getStringFromWasm0(arg0, arg1)); -}; -imports.wbg.__wbindgen_memory = function() { - const ret = wasm.memory; - return addHeapObject(ret); -}; -imports.wbg.__wbindgen_closure_wrapper5161 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 322, __wbg_adapter_28); - return addHeapObject(ret); -}; - -return imports; -} - -function initMemory(imports, maybe_memory) { - -} - -function finalizeInit(instance, module) { - wasm = instance.exports; - init.__wbindgen_wasm_module = module; - cachedFloat64Memory0 = new Float64Array(); - cachedInt32Memory0 = new Int32Array(); - cachedUint8Memory0 = new Uint8Array(); - - wasm.__wbindgen_start(); - return wasm; -} - -function initSync(module) { - const imports = getImports(); - - initMemory(imports); - - if (!(module instanceof WebAssembly.Module)) { - module = new WebAssembly.Module(module); - } - - const instance = new WebAssembly.Instance(module, imports); - - return finalizeInit(instance, module); -} - -async function init(input) { - if (typeof input === 'undefined') { - input = new URL('tauri-sys-test-ui-94e40ba9adfa8fe6_bg.wasm', import.meta.url); - } - const imports = getImports(); - - if (typeof input === 'string' || (typeof Request === 'function' && input instanceof Request) || (typeof URL === 'function' && input instanceof URL)) { - input = fetch(input); - } - - initMemory(imports); - - const { instance, module } = await load(await input, imports); - - return finalizeInit(instance, module); -} - -export { initSync } -export default init; diff --git a/examples/test/dist/tauri-sys-test-ui-94e40ba9adfa8fe6_bg.wasm b/examples/test/dist/tauri-sys-test-ui-94e40ba9adfa8fe6_bg.wasm deleted file mode 100644 index 8e3477e..0000000 Binary files a/examples/test/dist/tauri-sys-test-ui-94e40ba9adfa8fe6_bg.wasm and /dev/null differ diff --git a/examples/test/src/app.rs b/examples/test/src/app.rs index 26b160d..1b40ee3 100644 --- a/examples/test/src/app.rs +++ b/examples/test/src/app.rs @@ -1,4 +1,5 @@ use anyhow::ensure; +use log::debug; use tauri_sys::app; pub async fn get_name() -> anyhow::Result<()> { @@ -24,6 +25,8 @@ pub async fn get_version() -> anyhow::Result<()> { pub async fn get_tauri_version() -> anyhow::Result<()> { let version = app::get_tauri_version().await?; + debug!("version {}", version); + ensure!(version.major == 1); ensure!(version.minor == 1); ensure!(version.patch == 0); diff --git a/examples/test/src/main.rs b/examples/test/src/main.rs index 4ec54a6..eaff250 100644 --- a/examples/test/src/main.rs +++ b/examples/test/src/main.rs @@ -59,6 +59,8 @@ where } fn main() { + wasm_logger::init(wasm_logger::Config::default()); + panic::set_hook(Box::new(|info| { console_error_panic_hook::hook(info); @@ -67,6 +69,11 @@ fn main() { })); sycamore::render(|cx| { + #[cfg(feature = "ci")] + sycamore::suspense::await_suspense(cx, async { + tauri_sys::process::exit(0).await; + }); + view! { cx, table { tbody { @@ -82,7 +89,4 @@ fn main() { } } }); - - #[cfg(feature = "ci")] - wasm_bindgen_futures::spawn_local(async { tauri_sys::process::exit(0).await; }); }