@yschimke/remote-compose-player-cmp 1.65.0 → 1.67.0

package/dist/rcPlayer.import-object.mjs

@@ -8,12 +8,28 @@ const wasmTag = wasmJsTag ?? new WebAssembly.Tag({ parameters: ['externref'] });
 
 // Placed here to give access to it from externals (js_code)
 let wasmExports;
-let require;
 
 if (typeof process !== 'undefined' && process.release.name === 'node') {
-    const module = await import(/* webpackIgnore: true */'node:module');
-    const importMeta = import.meta;
-    require = module.default.createRequire(importMeta.url);
+    function doNotUseRequire() {
+        throw new Error("Do not use top-level require. Prefer to use JS import or define your own require instead. Read more: https://kotl.in/r9txlt")
+    }
+
+    var require = new Proxy((function() {}), {
+        apply(target, thisArg, argumentsList) {
+            if (globalThis.require != null) {
+                return globalThis.require.apply(thisArg, argumentsList);
+            } else {
+                doNotUseRequire();
+            }
+        },
+        get(target, prop, receiver) {
+            if (globalThis.require != null) {
+                return Reflect.get(globalThis.require, prop);
+            } else {
+                doNotUseRequire();
+            }
+        },
+    });
 }
 
 export function setWasmExports(exports) {
@@ -96,10 +112,10 @@ const js_code = {
     'kotlin.wasm.internal.kotlinUIntToJsNumberUnsafe' : (x) => x >>> 0,
     'kotlin.wasm.internal.kotlinULongToJsBigIntUnsafe' : (x) => x & 0xFFFFFFFFFFFFFFFFn,
     'kotlin.wasm.internal.getCachedJsObject_$external_fun' : (p0, p1) => getCachedJsObject(p0, p1),
+    'kotlin.wasm.internal.utoa32_$external_fun' : (p0) => String(p0),
+    'kotlin.wasm.internal.utoa64_$external_fun' : (p0) => String(p0),
     'kotlin.wasm.internal.itoa32_$external_fun' : (p0) => String(p0),
     'kotlin.wasm.internal.itoa64_$external_fun' : (p0) => String(p0),
-    'kotlin.wasm.internal.utoa64_$external_fun' : (p0) => String(p0),
-    'kotlin.wasm.internal.utoa32_$external_fun' : (p0) => String(p0),
     'kotlin.io.printlnImpl' : (message) => console.log(message),
     'kotlin.js.jsArrayGet' : (array, index) => array[index],
     'kotlin.js.jsArraySet' : (array, index, value) => { array[index] = value },
@@ -115,8 +131,7 @@ const js_code = {
     'kotlin.js.JsString_$external_class_instanceof' : (x) => typeof x === 'string',
     'kotlin.js.JsString_$external_class_get' : () => JsString,
     'kotlin.js.then_$external_fun' : (_this, p0) => _this.then(p0),
-    'kotlin.js.__convertKotlinClosureToJsClosure_((Js?)->Js?)' : (f) => getCachedJsObject(f, (p0) => wasmExports['__callFunction_((Js?)->Js?)'](f, p0)),
-    'kotlin.js.__convertKotlinClosureToJsClosure_((Js)->Js?)' : (f) => getCachedJsObject(f, (p0) => wasmExports['__callFunction_((Js)->Js?)'](f, p0)),
+    'kotlin.js.__convertKotlinClosureToJsClosure_1' : (f, trampoline) => getCachedJsObject(f, (p0) => trampoline(f, p0)),
     'kotlin.js.catch_$external_fun' : (_this, p0) => _this.catch(p0),
     'kotlin.random.initialSeed' : () => ((Math.random() * Math.pow(2, 32)) | 0),
     'kotlin.wasm.internal.getJsClassName' : (jsKlass) => jsKlass.name,
@@ -130,7 +145,7 @@ const js_code = {
     'kotlinx.coroutines.tryGetProcess' : () => (typeof(process) !== 'undefined' && typeof(process.nextTick) === 'function') ? process : null,
     'kotlinx.coroutines.tryGetWindow' : () => (typeof(window) !== 'undefined' && window != null && typeof(window.addEventListener) === 'function') ? window : null,
     'kotlinx.coroutines.nextTick_$external_fun' : (_this, p0) => _this.nextTick(p0),
-    'kotlinx.coroutines.__convertKotlinClosureToJsClosure_(()->Unit)' : (f) => getCachedJsObject(f, () => wasmExports['__callFunction_(()->Unit)'](f, )),
+    'kotlinx.coroutines.__convertKotlinClosureToJsClosure_0' : (f, trampoline) => getCachedJsObject(f, () => trampoline(f, )),
     'kotlinx.coroutines.createScheduleMessagePoster' : (process) => () => Promise.resolve(0).then(process),
     'kotlinx.coroutines.__callJsClosure_(()->Unit)' : (f, ) => f(),
     'kotlinx.coroutines.createRescheduleMessagePoster' : (window) => () => window.postMessage('dispatchCoroutine', '*'),
@@ -172,17 +187,12 @@ const js_code = {
     'org.w3c.dom.css.setProperty_$external_fun' : (_this, p0, p1, p2, isDefault0) => _this.setProperty(p0, p1, isDefault0 ? undefined : p2, ),
     'org.w3c.dom.css.style_$external_prop_getter' : (_this) => _this.style,
     'org.w3c.dom.events.addEventListener_$external_fun' : (_this, p0, p1, p2) => _this.addEventListener(p0, p1, p2),
-    'org.w3c.dom.events.__convertKotlinClosureToJsClosure_((Js)->Unit)' : (f) => getCachedJsObject(f, (p0) => wasmExports['__callFunction_((Js)->Unit)'](f, p0)),
     'org.w3c.dom.events.addEventListener_$external_fun_1' : (_this, p0, p1) => _this.addEventListener(p0, p1),
     'org.w3c.dom.events.type_$external_prop_getter' : (_this) => _this.type,
     'org.w3c.dom.events.target_$external_prop_getter' : (_this) => _this.target,
     'org.w3c.dom.events.cancelable_$external_prop_getter' : (_this) => _this.cancelable,
     'org.w3c.dom.events.timeStamp_$external_prop_getter' : (_this) => _this.timeStamp,
     'org.w3c.dom.events.preventDefault_$external_fun' : (_this, ) => _this.preventDefault(),
-    'org.w3c.dom.events.Event_$external_class_instanceof' : (x) => x instanceof Event,
-    'org.w3c.dom.events.Event_$external_class_get' : () => Event,
-    'org.w3c.dom.events.FocusEvent_$external_class_instanceof' : (x) => x instanceof FocusEvent,
-    'org.w3c.dom.events.FocusEvent_$external_class_get' : () => FocusEvent,
     'org.w3c.dom.events.clientX_$external_prop_getter' : (_this) => _this.clientX,
     'org.w3c.dom.events.clientY_$external_prop_getter' : (_this) => _this.clientY,
     'org.w3c.dom.events.ctrlKey_$external_prop_getter' : (_this) => _this.ctrlKey,
@@ -199,18 +209,13 @@ const js_code = {
     'org.w3c.dom.events.shiftKey_$external_prop_getter_1' : (_this) => _this.shiftKey,
     'org.w3c.dom.events.altKey_$external_prop_getter_1' : (_this) => _this.altKey,
     'org.w3c.dom.events.metaKey_$external_prop_getter_1' : (_this) => _this.metaKey,
-    'org.w3c.dom.events.KeyboardEvent_$external_class_instanceof' : (x) => x instanceof KeyboardEvent,
-    'org.w3c.dom.events.KeyboardEvent_$external_class_get' : () => KeyboardEvent,
     'org.w3c.dom.events.deltaX_$external_prop_getter' : (_this) => _this.deltaX,
     'org.w3c.dom.events.deltaY_$external_prop_getter' : (_this) => _this.deltaY,
-    'org.w3c.dom.events.WheelEvent_$external_class_instanceof' : (x) => x instanceof WheelEvent,
-    'org.w3c.dom.events.WheelEvent_$external_class_get' : () => WheelEvent,
     'org.w3c.dom.ShadowRootInit' : (mode) => ({ mode: mode }),
     'org.w3c.dom.AddEventListenerOptions_js_code' : (passive, once, capture) => ({ passive: passive, once: once, capture: capture }),
     'org.w3c.dom.navigator_$external_prop_getter' : (_this) => _this.navigator,
     'org.w3c.dom.devicePixelRatio_$external_prop_getter' : (_this) => _this.devicePixelRatio,
     'org.w3c.dom.requestAnimationFrame_$external_fun' : (_this, p0) => _this.requestAnimationFrame(p0),
-    'org.w3c.dom.__convertKotlinClosureToJsClosure_((Double)->Unit)' : (f) => getCachedJsObject(f, (p0) => wasmExports['__callFunction_((Double)->Unit)'](f, p0)),
     'org.w3c.dom.matchMedia_$external_fun' : (_this, p0) => _this.matchMedia(p0),
     'org.w3c.dom.dropEffect_$external_prop_setter' : (_this, v) => _this.dropEffect = v,
     'org.w3c.dom.setDragImage_$external_fun' : (_this, p0, p1, p2) => _this.setDragImage(p0, p1, p2),
@@ -263,15 +268,11 @@ const js_code = {
     'org.w3c.dom.HTMLCanvasElement_$external_class_get' : () => HTMLCanvasElement,
     'org.w3c.dom.HTMLTextAreaElement_$external_class_instanceof' : (x) => x instanceof HTMLTextAreaElement,
     'org.w3c.dom.HTMLTextAreaElement_$external_class_get' : () => HTMLTextAreaElement,
-    'org.w3c.dom.TouchEvent_$external_class_instanceof' : (x) => x instanceof TouchEvent,
-    'org.w3c.dom.TouchEvent_$external_class_get' : () => TouchEvent,
     'org.w3c.dom.matches_$external_prop_getter_1' : (_this) => _this.matches,
     'org.w3c.dom.MediaQueryListEvent_$external_class_instanceof' : (x) => x instanceof MediaQueryListEvent,
     'org.w3c.dom.MediaQueryListEvent_$external_class_get' : () => MediaQueryListEvent,
     'org.w3c.dom.pointerevents.pointerId_$external_prop_getter' : (_this) => _this.pointerId,
     'org.w3c.dom.pointerevents.pressure_$external_prop_getter' : (_this) => _this.pressure,
-    'org.w3c.dom.pointerevents.PointerEvent_$external_class_instanceof' : (x) => x instanceof PointerEvent,
-    'org.w3c.dom.pointerevents.PointerEvent_$external_class_get' : () => PointerEvent,
     'org.w3c.performance.now_$external_fun' : (_this, ) => _this.now(),
     'org.w3c.performance.performance_$external_prop_getter' : (_this) => _this.performance,
     'kotlinx.browser.window_$external_prop_getter' : () => window,
@@ -505,6 +506,7 @@ export { wasmTag as __TAG };
 export const importObject = {
     js_code,
     intrinsics: {
+        memory: new WebAssembly.Memory({ initial: 0 }),
         tag: wasmTag
     },
     "'": StringConstantsProxy,

package/dist/rcPlayer.mjs

@@ -4,52 +4,32 @@ import { importObject, setWasmExports } from './rcPlayer.import-object.mjs'
 
 let wasmInstance;
 
-const isNodeJs = (typeof process !== 'undefined') && (process.release.name === 'node');
-const isDeno = !isNodeJs && (typeof Deno !== 'undefined')
-const isStandaloneJsVM =
-    !isDeno && !isNodeJs && (
-        typeof d8 !== 'undefined' // V8
-        || typeof inIon !== 'undefined' // SpiderMonkey
-        || typeof jscOptions !== 'undefined' // JavaScriptCore
-    );
-const isBrowser = !isNodeJs && !isDeno && !isStandaloneJsVM && (typeof window !== 'undefined' || typeof self !== 'undefined');
-
-if (!isNodeJs && !isDeno && !isStandaloneJsVM && !isBrowser) {
-  throw "Supported JS engine not detected";
-}
-
-const wasmFilePath = './rcPlayer.wasm';
 const wasmOptions = { builtins: ['js-string'], importedStringConstants: "'" }
 
 try {
-  if (isNodeJs) {
-    const module = await import(/* webpackIgnore: true */'node:module');
-    const importMeta = import.meta;
-    const require = module.default.createRequire(importMeta.url);
-    const fs = require('fs');
-    const url = require('url');
-    const filepath = import.meta.resolve(wasmFilePath);
+  if ((typeof process !== 'undefined') && (process.release.name === 'node')) {
+    const fs = await import(/* webpackIgnore: true */'node:fs');
+    const url = await import(/* webpackIgnore: true */'node:url');
+    const filepath = import.meta.resolve('./rcPlayer.wasm');
     const wasmBuffer = fs.readFileSync(url.fileURLToPath(filepath));
     const wasmModule = new WebAssembly.Module(wasmBuffer, wasmOptions);
     wasmInstance = new WebAssembly.Instance(wasmModule, importObject);
-  }
-
-  if (isDeno) {
+  } else if (typeof Deno !== 'undefined') {
     const path = await import(/* webpackIgnore: true */'https://deno.land/std/path/mod.ts');
-    const binary = Deno.readFileSync(path.fromFileUrl(import.meta.resolve(wasmFilePath)));
+    const binary = Deno.readFileSync(path.fromFileUrl(import.meta.resolve('./rcPlayer.wasm')));
     const module = await WebAssembly.compile(binary, wasmOptions);
     wasmInstance = await WebAssembly.instantiate(module, importObject);
-  }
-
-  if (isStandaloneJsVM) {
-    const importMeta = import.meta;
-    const filepath = importMeta.url.replace(/\.mjs$/, '.wasm');
+  } else if (
+    (typeof d8 !== 'undefined' // V8
+      || typeof inIon !== 'undefined' // SpiderMonkey
+      || typeof jscOptions !== 'undefined' // JavaScriptCore
+    )
+  ) {
+    const filepath = import.meta.url.replace(/\.mjs$/, '.wasm');
     const wasmBuffer = read(filepath, 'binary');
     const wasmModule = new WebAssembly.Module(wasmBuffer, wasmOptions);
     wasmInstance = new WebAssembly.Instance(wasmModule, importObject);
-  }
-
-  if (isBrowser) {
+  } else {
     wasmInstance = (await WebAssembly.instantiateStreaming(fetch(new URL('./rcPlayer.wasm',import.meta.url).href), importObject, wasmOptions)).instance;
   }
 } catch (e) {
@@ -57,7 +37,7 @@ try {
     let text = `Please make sure that your runtime environment supports the latest version of Wasm GC and Exception-Handling proposals.
 For more information, see https://kotl.in/wasm-help
 `;
-    if (isBrowser) {
+    if (typeof console !== "undefined" && console.error !== void 0) {
       console.error(text);
     } else {
       const t = "\n" + text;
@@ -71,11 +51,34 @@ For more information, see https://kotl.in/wasm-help
 }
 
 const exports = wasmInstance.exports
-setWasmExports(exports);
-exports._start();
+
+let memoryFirstTimeAccess = true;
+const memoryProxy = new Proxy(importObject.intrinsics.memory, {
+    get(target, prop, receiver) {
+        if (memoryFirstTimeAccess) {
+            memoryFirstTimeAccess = false;
+            console.error('Accessing `memory` via `wasmExports` is deprecated. Use `kotlin.wasm.unsafe.wasmMemory` or update dependencies. Read more: https://kotl.in/vr3szr');
+        }
+        return Reflect.get(target, prop);
+    }
+});
+const wasmExports = new Proxy(memoryProxy, {
+    get(target, prop, receiver) {
+        if (prop == 'memory') {
+            return target;
+        } else {
+            throw new Error('Accessing exports via `wasmExports` is no longer supported. Remove usages or update dependencies. Read more: https://kotl.in/vr3szr');
+        }
+    }
+});
+
+const wasmMemory = wasmExports.memory;
+export { wasmMemory as memory }
 
 export const {
-    memory,
     _start
 } = exports
 
+setWasmExports(wasmExports);
+
+exports._start();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yschimke/remote-compose-player-cmp",
-  "version": "1.65.0",
+  "version": "1.67.0",
   "description": "The Compose Multiplatform / Wasm Remote Compose player, as a drop-in browser bundle. Renders .rc documents in an iframe driven by query parameters and window.rcPlayerLoad.",
   "keywords": [
     "remote-compose",