@tailwindcss/oxide-wasm32-wasi 0.0.0-insiders.bd9cf92 → 0.0.0-insiders.bdcd708

package/node_modules/@emnapi/wasi-threads/dist/wasi-threads.d.mts

@@ -15,6 +15,30 @@ export declare interface ChildThreadOptions extends BaseOptions {
     postMessage?: (data: any) => void;
 }
 
+/** @public */
+export declare interface CleanupThreadPayload {
+    tid: number;
+}
+
+/** @public */
+export declare interface CommandInfo<T extends CommandType> {
+    type: T;
+    payload: CommandPayloadMap[T];
+}
+
+/** @public */
+export declare interface CommandPayloadMap {
+    load: LoadPayload;
+    loaded: LoadedPayload;
+    start: StartPayload;
+    'cleanup-thread': CleanupThreadPayload;
+    'terminate-all-threads': TerminateAllThreadsPayload;
+    'spawn-thread': SpawnThreadPayload;
+}
+
+/** @public */
+export declare type CommandType = keyof CommandPayloadMap;
+
 /** @public */
 export declare function createInstanceProxy(instance: WebAssembly.Instance, memory?: WebAssembly.Memory | (() => WebAssembly.Memory)): WebAssembly.Instance;
 
@@ -24,6 +48,11 @@ export declare function isSharedArrayBuffer(value: any): value is SharedArrayBuf
 /** @public */
 export declare function isTrapError(e: Error): e is WebAssembly.RuntimeError;
 
+/** @public */
+export declare interface LoadedPayload {
+}
+
+/** @public */
 export declare interface LoadPayload {
     wasmModule: WebAssembly.Module;
     wasmMemory: WebAssembly.Memory;
@@ -47,6 +76,11 @@ export declare interface MainThreadOptionsWithThreadManager extends MainThreadBa
     threadManager?: ThreadManager | (() => ThreadManager);
 }
 
+/** @public */
+export declare interface MessageEventData<T extends CommandType> {
+    __emnapi__: CommandInfo<T>;
+}
+
 /** @public */
 export declare interface ReuseWorkerOptions {
     /**
@@ -59,16 +93,32 @@ export declare interface ReuseWorkerOptions {
     strict?: boolean;
 }
 
+/** @public */
+export declare interface SpawnThreadPayload {
+    startArg: number;
+    errorOrTid: number;
+}
+
+/** @public */
+export declare interface StartPayload {
+    tid: number;
+    arg: number;
+    sab?: Int32Array;
+}
+
 /** @public */
 export declare interface StartResult {
     exitCode: number;
     instance: WebAssembly.Instance;
 }
 
+/** @public */
+export declare interface TerminateAllThreadsPayload {
+}
+
 /** @public */
 export declare class ThreadManager {
     unusedWorkers: WorkerLike[];
-    runningWorkers: WorkerLike[];
     pthreads: Record<number, WorkerLike>;
     get nextWorkerID(): number;
     wasmModule: WebAssembly.Module | null;
@@ -79,6 +129,7 @@ export declare class ThreadManager {
     private readonly _reuseWorker;
     private readonly _beforeLoad?;
     /* Excluded from this release type: printErr */
+    threadSpawn?: ((startArg: number, errorOrTid?: number) => number);
     constructor(options: ThreadManagerOptions);
     init(): void;
     initMainThread(): void;
@@ -105,6 +156,7 @@ export declare type ThreadManagerOptions = ThreadManagerOptionsMain | ThreadMana
 /** @public */
 export declare interface ThreadManagerOptionsBase {
     printErr?: (message: string) => void;
+    threadSpawn?: (startArg: number, errorOrTid?: number) => number;
 }
 
 /** @public */
@@ -126,11 +178,12 @@ export declare class ThreadMessageHandler {
     private messagesBeforeLoad;
     protected postMessage: (message: any) => void;
     protected onLoad?: (data: LoadPayload) => WebAssembly.WebAssemblyInstantiatedSource | PromiseLike<WebAssembly.WebAssemblyInstantiatedSource>;
+    protected onError: (error: Error, type: WorkerMessageType) => void;
     constructor(options?: ThreadMessageHandlerOptions);
     /** @virtual */
     instantiate(data: LoadPayload): WebAssembly.WebAssemblyInstantiatedSource | PromiseLike<WebAssembly.WebAssemblyInstantiatedSource>;
     /** @virtual */
-    handle(e: WorkerMessageEvent): void;
+    handle(e: WorkerMessageEvent<MessageEventData<WorkerMessageType>>): void;
     private _load;
     private _start;
     protected _loaded(err: Error | null, source: WebAssembly.WebAssemblyInstantiatedSource | null, payload: LoadPayload): void;
@@ -140,6 +193,7 @@ export declare class ThreadMessageHandler {
 /** @public */
 export declare interface ThreadMessageHandlerOptions {
     onLoad?: (data: LoadPayload) => WebAssembly.WebAssemblyInstantiatedSource | PromiseLike<WebAssembly.WebAssemblyInstantiatedSource>;
+    onError?: (error: Error, type: WorkerMessageType) => void;
     postMessage?: (message: any) => void;
 }
 
@@ -211,4 +265,7 @@ export declare interface WorkerMessageEvent<T = any> {
     data: T;
 }
 
+/** @public */
+export declare type WorkerMessageType = 'load' | 'start';
+
 export { }

package/node_modules/@emnapi/wasi-threads/dist/wasi-threads.d.ts

@@ -15,6 +15,30 @@ export declare interface ChildThreadOptions extends BaseOptions {
     postMessage?: (data: any) => void;
 }
 
+/** @public */
+export declare interface CleanupThreadPayload {
+    tid: number;
+}
+
+/** @public */
+export declare interface CommandInfo<T extends CommandType> {
+    type: T;
+    payload: CommandPayloadMap[T];
+}
+
+/** @public */
+export declare interface CommandPayloadMap {
+    load: LoadPayload;
+    loaded: LoadedPayload;
+    start: StartPayload;
+    'cleanup-thread': CleanupThreadPayload;
+    'terminate-all-threads': TerminateAllThreadsPayload;
+    'spawn-thread': SpawnThreadPayload;
+}
+
+/** @public */
+export declare type CommandType = keyof CommandPayloadMap;
+
 /** @public */
 export declare function createInstanceProxy(instance: WebAssembly.Instance, memory?: WebAssembly.Memory | (() => WebAssembly.Memory)): WebAssembly.Instance;
 
@@ -24,6 +48,11 @@ export declare function isSharedArrayBuffer(value: any): value is SharedArrayBuf
 /** @public */
 export declare function isTrapError(e: Error): e is WebAssembly.RuntimeError;
 
+/** @public */
+export declare interface LoadedPayload {
+}
+
+/** @public */
 export declare interface LoadPayload {
     wasmModule: WebAssembly.Module;
     wasmMemory: WebAssembly.Memory;
@@ -47,6 +76,11 @@ export declare interface MainThreadOptionsWithThreadManager extends MainThreadBa
     threadManager?: ThreadManager | (() => ThreadManager);
 }
 
+/** @public */
+export declare interface MessageEventData<T extends CommandType> {
+    __emnapi__: CommandInfo<T>;
+}
+
 /** @public */
 export declare interface ReuseWorkerOptions {
     /**
@@ -59,16 +93,32 @@ export declare interface ReuseWorkerOptions {
     strict?: boolean;
 }
 
+/** @public */
+export declare interface SpawnThreadPayload {
+    startArg: number;
+    errorOrTid: number;
+}
+
+/** @public */
+export declare interface StartPayload {
+    tid: number;
+    arg: number;
+    sab?: Int32Array;
+}
+
 /** @public */
 export declare interface StartResult {
     exitCode: number;
     instance: WebAssembly.Instance;
 }
 
+/** @public */
+export declare interface TerminateAllThreadsPayload {
+}
+
 /** @public */
 export declare class ThreadManager {
     unusedWorkers: WorkerLike[];
-    runningWorkers: WorkerLike[];
     pthreads: Record<number, WorkerLike>;
     get nextWorkerID(): number;
     wasmModule: WebAssembly.Module | null;
@@ -79,6 +129,7 @@ export declare class ThreadManager {
     private readonly _reuseWorker;
     private readonly _beforeLoad?;
     /* Excluded from this release type: printErr */
+    threadSpawn?: ((startArg: number, errorOrTid?: number) => number);
     constructor(options: ThreadManagerOptions);
     init(): void;
     initMainThread(): void;
@@ -105,6 +156,7 @@ export declare type ThreadManagerOptions = ThreadManagerOptionsMain | ThreadMana
 /** @public */
 export declare interface ThreadManagerOptionsBase {
     printErr?: (message: string) => void;
+    threadSpawn?: (startArg: number, errorOrTid?: number) => number;
 }
 
 /** @public */
@@ -126,11 +178,12 @@ export declare class ThreadMessageHandler {
     private messagesBeforeLoad;
     protected postMessage: (message: any) => void;
     protected onLoad?: (data: LoadPayload) => WebAssembly.WebAssemblyInstantiatedSource | PromiseLike<WebAssembly.WebAssemblyInstantiatedSource>;
+    protected onError: (error: Error, type: WorkerMessageType) => void;
     constructor(options?: ThreadMessageHandlerOptions);
     /** @virtual */
     instantiate(data: LoadPayload): WebAssembly.WebAssemblyInstantiatedSource | PromiseLike<WebAssembly.WebAssemblyInstantiatedSource>;
     /** @virtual */
-    handle(e: WorkerMessageEvent): void;
+    handle(e: WorkerMessageEvent<MessageEventData<WorkerMessageType>>): void;
     private _load;
     private _start;
     protected _loaded(err: Error | null, source: WebAssembly.WebAssemblyInstantiatedSource | null, payload: LoadPayload): void;
@@ -140,6 +193,7 @@ export declare class ThreadMessageHandler {
 /** @public */
 export declare interface ThreadMessageHandlerOptions {
     onLoad?: (data: LoadPayload) => WebAssembly.WebAssemblyInstantiatedSource | PromiseLike<WebAssembly.WebAssemblyInstantiatedSource>;
+    onError?: (error: Error, type: WorkerMessageType) => void;
     postMessage?: (message: any) => void;
 }
 
@@ -211,6 +265,9 @@ export declare interface WorkerMessageEvent<T = any> {
     data: T;
 }
 
+/** @public */
+export declare type WorkerMessageType = 'load' | 'start';
+
 export { }
 
 export as namespace wasiThreads;

package/node_modules/@emnapi/wasi-threads/dist/wasi-threads.esm-bundler.js

@@ -125,7 +125,6 @@ var ThreadManager = /*#__PURE__*/ (function () {
     function ThreadManager(options) {
         var _a;
         this.unusedWorkers = [];
-        this.runningWorkers = [];
         this.pthreads = Object.create(null);
         this.wasmModule = null;
         this.wasmMemory = null;
@@ -150,6 +149,7 @@ var ThreadManager = /*#__PURE__*/ (function () {
             this._beforeLoad = options.beforeLoad;
         }
         this.printErr = (_a = options.printErr) !== null && _a !== void 0 ? _a : console.error.bind(console);
+        this.threadSpawn = options.threadSpawn;
     }
     Object.defineProperty(ThreadManager.prototype, "nextWorkerID", {
         get: function () { return nextWorkerID; },
@@ -233,7 +233,6 @@ var ThreadManager = /*#__PURE__*/ (function () {
             delete this.pthreads[tid];
         }
         this.unusedWorkers.push(worker);
-        this.runningWorkers.splice(this.runningWorkers.indexOf(worker), 1);
         delete worker.__emnapi_tid;
         if (ENVIRONMENT_IS_NODE) {
             worker.unref();
@@ -253,12 +252,17 @@ var ThreadManager = /*#__PURE__*/ (function () {
                 if (worker.__emnapi_tid !== undefined) {
                     message = 'worker (tid = ' + worker.__emnapi_tid + ') sent an error!';
                 }
-                err(message + ' ' + e.message);
-                if (e.message.indexOf('RuntimeError') !== -1 || e.message.indexOf('unreachable') !== -1) {
-                    try {
-                        _this.terminateAllThreads();
+                if ('message' in e) {
+                    err(message + ' ' + e.message);
+                    if (e.message.indexOf('RuntimeError') !== -1 || e.message.indexOf('unreachable') !== -1) {
+                        try {
+                            _this.terminateAllThreads();
+                        }
+                        catch (_) { }
                     }
-                    catch (_) { }
+                }
+                else {
+                    err(message);
                 }
                 reject(e);
                 throw e;
@@ -282,6 +286,12 @@ var ThreadManager = /*#__PURE__*/ (function () {
                             _this_1.cleanThread(worker, payload.tid);
                         }
                     }
+                    else if (type === 'spawn-thread') {
+                        _this_1.threadSpawn(payload.startArg, payload.errorOrTid);
+                    }
+                    else if (type === 'terminate-all-threads') {
+                        _this_1.terminateAllThreads();
+                    }
                 }
             };
             worker.onmessage = function (e) {
@@ -356,10 +366,6 @@ var ThreadManager = /*#__PURE__*/ (function () {
         }
         else {
             delete this.pthreads[tid];
-            var index = this.runningWorkers.indexOf(worker);
-            if (index !== -1) {
-                this.runningWorkers.splice(index, 1);
-            }
             this.terminateWorker(worker);
             delete worker.__emnapi_tid;
         }
@@ -380,14 +386,14 @@ var ThreadManager = /*#__PURE__*/ (function () {
         };
     };
     ThreadManager.prototype.terminateAllThreads = function () {
-        for (var i = 0; i < this.runningWorkers.length; ++i) {
-            this.terminateWorker(this.runningWorkers[i]);
+        var runningWorkers = Object.values(this.pthreads);
+        for (var i = 0; i < runningWorkers.length; ++i) {
+            this.terminateWorker(runningWorkers[i]);
         }
         for (var i = 0; i < this.unusedWorkers.length; ++i) {
             this.terminateWorker(this.unusedWorkers[i]);
         }
         this.unusedWorkers = [];
-        this.runningWorkers = [];
         this.pthreads = Object.create(null);
         this.preparePool();
     };
@@ -537,18 +543,6 @@ var WASIThreads = /*#__PURE__*/ (function () {
         }
         this.postMessage = postMessage;
         var wasm64 = Boolean(options.wasm64);
-        var onMessage = function (e) {
-            if (e.data.__emnapi__) {
-                var type = e.data.__emnapi__.type;
-                var payload = e.data.__emnapi__.payload;
-                if (type === 'spawn-thread') {
-                    threadSpawn(payload.startArg, payload.errorOrTid);
-                }
-                else if (type === 'terminate-all-threads') {
-                    _this_1.terminateAllThreads();
-                }
-            }
-        };
         var threadSpawn = function (startArg, errorOrTid) {
             var _a;
             var EAGAIN = 6;
@@ -566,12 +560,12 @@ var WASIThreads = /*#__PURE__*/ (function () {
                     return 1;
                 }
                 else {
-                    return -6;
+                    return -EAGAIN;
                 }
             }
             if (!isNewABI) {
                 var malloc = _this_1.wasmInstance.exports.malloc;
-                errorOrTid = wasm64 ? Number(malloc(BigInt(8))) : malloc(8);
+                errorOrTid = wasm64 ? Number(malloc(BigInt(8))) : (malloc(8) >>> 0);
                 if (!errorOrTid) {
                     return -48; /* ENOMEM */
                 }
@@ -609,10 +603,9 @@ var WASIThreads = /*#__PURE__*/ (function () {
                 if (!worker) {
                     throw new Error('failed to get new worker');
                 }
-                PThread.addMessageEventListener(worker, onMessage);
                 tid = PThread.markId(worker);
                 if (ENVIRONMENT_IS_NODE) {
-                    worker.ref();
+                    worker.unref();
                 }
                 worker.postMessage(createMessage('start', {
                     tid: tid,
@@ -623,10 +616,6 @@ var WASIThreads = /*#__PURE__*/ (function () {
                     if (typeof waitThreadStart === 'number') {
                         var waitResult = Atomics.wait(sab, 0, 0, waitThreadStart);
                         if (waitResult === 'timed-out') {
-                            try {
-                                PThread.cleanThread(worker, tid, true);
-                            }
-                            catch (_) { }
                             throw new Error('Spawning thread timed out. Please check if the worker is created successfully and if message is handled properly in the worker.');
                         }
                     }
@@ -635,15 +624,17 @@ var WASIThreads = /*#__PURE__*/ (function () {
                     }
                     var r = Atomics.load(sab, 0);
                     if (r > 1) {
-                        try {
-                            PThread.cleanThread(worker, tid, true);
-                        }
-                        catch (_) { }
                         throw deserizeErrorFromBuffer(sab.buffer);
                     }
                 }
             }
             catch (e) {
+                if (worker !== undefined && tid !== undefined) {
+                    try {
+                        PThread.cleanThread(worker, tid, true);
+                    }
+                    catch (_) { }
+                }
                 Atomics.store(struct, 0, 1);
                 Atomics.store(struct, 1, EAGAIN);
                 Atomics.notify(struct, 1);
@@ -652,12 +643,11 @@ var WASIThreads = /*#__PURE__*/ (function () {
                     return 1;
                 }
                 free(errorOrTid);
-                return -6;
+                return -EAGAIN;
             }
             Atomics.store(struct, 0, 0);
             Atomics.store(struct, 1, tid);
             Atomics.notify(struct, 1);
-            PThread.runningWorkers.push(worker);
             if (!shouldWait) {
                 worker.whenLoaded.catch(function (err) {
                     delete worker.whenLoaded;
@@ -672,6 +662,9 @@ var WASIThreads = /*#__PURE__*/ (function () {
             return tid;
         };
         this.threadSpawn = threadSpawn;
+        if (this.PThread) {
+            this.PThread.threadSpawn = threadSpawn;
+        }
     }
     WASIThreads.prototype.getImportObject = function () {
         return {
@@ -769,19 +762,21 @@ function patchWasiInstance(wasiThreads, wasi) {
             return proc_exit_1.call(this, code);
         };
     }
-    var start = wasi.start;
-    if (typeof start === 'function') {
-        wasi.start = function (instance) {
-            try {
-                return start.call(this, instance);
-            }
-            catch (err) {
-                if (isTrapError(err)) {
-                    _this.terminateAllThreads();
+    if (!_this.childThread) {
+        var start_1 = wasi.start;
+        if (typeof start_1 === 'function') {
+            wasi.start = function (instance) {
+                try {
+                    return start_1.call(this, instance);
                 }
-                throw err;
-            }
-        };
+                catch (err) {
+                    if (isTrapError(err)) {
+                        _this.terminateAllThreads();
+                    }
+                    throw err;
+                }
+            };
+        }
     }
     patched.add(wasi);
 }
@@ -813,6 +808,7 @@ var ThreadMessageHandler = /*#__PURE__*/ (function () {
         }
         this.postMessage = postMsg;
         this.onLoad = options === null || options === void 0 ? void 0 : options.onLoad;
+        this.onError = typeof (options === null || options === void 0 ? void 0 : options.onError) === 'function' ? options.onError : function (_type, err) { throw err; };
         this.instance = undefined;
         // this.module = undefined
         this.messagesBeforeLoad = [];
@@ -831,13 +827,18 @@ var ThreadMessageHandler = /*#__PURE__*/ (function () {
         if ((_a = e === null || e === void 0 ? void 0 : e.data) === null || _a === void 0 ? void 0 : _a.__emnapi__) {
             var type = e.data.__emnapi__.type;
             var payload_1 = e.data.__emnapi__.payload;
-            if (type === 'load') {
-                this._load(payload_1);
+            try {
+                if (type === 'load') {
+                    this._load(payload_1);
+                }
+                else if (type === 'start') {
+                    this.handleAfterLoad(e, function () {
+                        _this._start(payload_1);
+                    });
+                }
             }
-            else if (type === 'start') {
-                this.handleAfterLoad(e, function () {
-                    _this._start(payload_1);
-                });
+            catch (err) {
+                this.onError(err, type);
             }
         }
     };
@@ -863,7 +864,8 @@ var ThreadMessageHandler = /*#__PURE__*/ (function () {
         }
     };
     ThreadMessageHandler.prototype._start = function (payload) {
-        if (typeof this.instance.exports.wasi_thread_start !== 'function') {
+        var wasi_thread_start = this.instance.exports.wasi_thread_start;
+        if (typeof wasi_thread_start !== 'function') {
             var err = new TypeError('wasi_thread_start is not exported');
             notifyPthreadCreateResult(payload.sab, 2, err);
             throw err;
@@ -873,13 +875,15 @@ var ThreadMessageHandler = /*#__PURE__*/ (function () {
         var startArg = payload.arg;
         notifyPthreadCreateResult(payload.sab, 1);
         try {
-            this.instance.exports.wasi_thread_start(tid, startArg);
+            wasi_thread_start(tid, startArg);
         }
         catch (err) {
-            if (isTrapError(err)) {
-                postMessage(createMessage('terminate-all-threads', {}));
+            if (err !== 'unwind') {
+                throw err;
+            }
+            else {
+                return;
             }
-            throw err;
         }
         postMessage(createMessage('cleanup-thread', { tid: tid }));
     };