firefly-compiler 0.5.68 → 0.5.70

package/core/Js.ff

@@ -136,10 +136,10 @@ awaitCancellablePromise[T](body: (T => Unit, Error => Unit, (Bool => Unit) => Un
                 }            
             }
         }
-        let jsReject = Js->{e => doReject(e?)}
         let controller = Js.controller()
-        controller->signal->addEventListener("abort", jsReject)
-        cleanups.push({_ => controller->signal->removeEventListener("abort", jsReject)})
+        let jsDoReject = Js->{_ => doReject(controller->signal->reason?)}
+        controller->signal->addEventListener("abort", jsDoReject)
+        cleanups.push({_ => controller->signal->removeEventListener("abort", jsDoReject)})
         body(doResolve, doReject, {cleanup => cleanups.push(cleanup)})
     }))?
 }

package/core/Lock.ff

@@ -82,7 +82,7 @@ extend self: LockCondition {
                     error = e!
                 }
             }
-            if(error.isUndefined()) {Js.throw(error)}
+            if(!error.isUndefined()) {Js.throw(error)}
         }
     }
 

package/core/Path.ff

@@ -336,7 +336,7 @@ internalReadStream(createReadStream: () => JsValue): Stream[Buffer] {
             if(jsStream->destroyed?) {None} else:
             Js.withSignal {signal =>
                 let promise = Js->Promise->(Js->{resolve, reject =>
-                    let jsDoReject = Js->{doReject(_)}
+                    let jsDoReject = Js->{_ => doReject(signal->reason?)}
                     doResolve = {
                         signal->removeEventListener("abort", jsDoReject)
                         doResolve = emptyResolve
@@ -369,9 +369,10 @@ internalWriteStream(path: Path, stream: Stream[Buffer], flags: String) {
             if(!writable->write(Js->Uint8Array->(buffer!->buffer, buffer!->byteOffset, buffer!->byteLength))?) {
                 Js.withSignal {signal =>
                     Js.await(Js->Promise->(Js->{resolve, reject =>
-                        signal->addEventListener("abort", reject)
+                        let jsDoReject = Js->{_ => reject->callValue1(signal->reason?)}
+                        signal->addEventListener("abort", jsDoReject)
                         writable->once("drain", Js->{
-                            signal->removeEventListener("abort", reject)
+                            signal->removeEventListener("abort", jsDoReject)
                             resolve.callValue0()
                         })
                     }))

package/lsp/LanguageServer.ff

@@ -63,12 +63,13 @@ main(system: NodeSystem) {
                 let request = requestPair.first
                 let message = parseRequestMessage(request.object)
                 logDirectory.each {logMessage(_, "request", request.object, message.method)}
-                spawn(message.id) {_ =>
+                spawn(message.id) {task =>
                     try {
                         if(message.method == "$/cancelRequest") {
                             abort(Some(parseMessageId(message.parameters.grab("id"))))
                         }
                         handleRequestMessage(system, handler, message, version).each {body =>
+                            //task.sleep(Duration(1.0))
                             responseChannel.write(Pair(body, message.method))
                         }
                     } catchAny {error =>
@@ -77,12 +78,23 @@ main(system: NodeSystem) {
                             Error(-32800, "Request cancelled")
                         } else {
                             Log.trace("LS ERROR " + error.name() + ": " + error.message())
+                            Log.trace("BEGIN LS ERROR STACK TRACE")
                             Log.trace(error.stack())
+                            Log.trace("END LS ERROR STACK TRACE")
                             Error(-32603, "Internal error")
                         }
                         message.id.each {id => 
                             let body = makeResponseMessage(id, problem)
-                            responseChannel.write(Pair(body, message.method))
+                            try {
+                                responseChannel.write(Pair(body, message.method))
+                            } catchAny {error =>
+                                if(error.name() == "AbortError") {
+                                    Log.trace("LS ABORT WRITE")
+                                    let writeProblem = Error(-32800, "Request cancelled")
+                                    let writeMessage = makeResponseMessage(id, problem)
+                                    responseChannel.write(Pair(writeMessage, message.method))
+                                }
+                            }
                         }
                     }
                 }

package/output/js/ff/core/Js.mjs

@@ -242,13 +242,13 @@ reject_(e_)
 }
 }
 });
-const jsReject_ = ((e_) => {
-return doReject_(e_)
-});
 const controller_ = $task.controller_;
-controller_.signal.addEventListener("abort", jsReject_);
+const jsDoReject_ = ((_) => {
+return doReject_(controller_.signal.reason)
+});
+controller_.signal.addEventListener("abort", jsDoReject_);
 cleanups_.array.push(((_) => {
-controller_.signal.removeEventListener("abort", jsReject_)
+controller_.signal.removeEventListener("abort", jsDoReject_)
 }));
 return body_(doResolve_, doReject_, ((cleanup_) => {
 cleanups_.array.push(cleanup_)
@@ -565,13 +565,13 @@ reject_(e_)
 }
 }
 });
-const jsReject_ = (async (a_1) => await (async (e_, $task) => {
-return (await doReject_(e_, $task))
-})(a_1, $task));
 const controller_ = $task.controller_;
-controller_.signal.addEventListener("abort", jsReject_);
+const jsDoReject_ = (async (a_1) => await (async (_, $task) => {
+return (await doReject_(controller_.signal.reason, $task))
+})(a_1, $task));
+controller_.signal.addEventListener("abort", jsDoReject_);
 cleanups_.array.push((async (_, $task) => {
-controller_.signal.removeEventListener("abort", jsReject_)
+controller_.signal.removeEventListener("abort", jsDoReject_)
 }));
 return (await body_(doResolve_, doReject_, (async (cleanup_, $task) => {
 cleanups_.array.push(cleanup_)

package/output/js/ff/core/Lock.mjs

@@ -225,7 +225,7 @@ acquired_ = true
 error_ = e_
 }
 };
-if(ff_core_JsValue.JsValue_isUndefined(error_)) {
+if((!ff_core_JsValue.JsValue_isUndefined(error_))) {
 throw error_
 }
 }
@@ -299,7 +299,7 @@ acquired_ = true
 error_ = e_
 }
 };
-if(ff_core_JsValue.JsValue_isUndefined(error_)) {
+if((!ff_core_JsValue.JsValue_isUndefined(error_))) {
 throw error_
 }
 }

package/output/js/ff/core/Path.mjs

@@ -154,8 +154,8 @@ return ff_core_Option.None()
 } else {
 ff_core_Js.withSignal_(((signal_) => {
 const promise_ = (new Promise(((resolve_, reject_) => {
-const jsDoReject_ = ((_w1) => {
-return doReject_(_w1)
+const jsDoReject_ = ((_) => {
+return doReject_(signal_.reason)
 });
 doResolve_ = (() => {
 signal_.removeEventListener("abort", jsDoReject_);
@@ -204,9 +204,12 @@ ff_core_Stream.Stream_each(stream_, ((buffer_) => {
 if((!writable_.write((new Uint8Array(buffer_.buffer, buffer_.byteOffset, buffer_.byteLength))))) {
 ff_core_Js.withSignal_(((signal_) => {
 return (new Promise(((resolve_, reject_) => {
-signal_.addEventListener("abort", reject_);
+const jsDoReject_ = ((_) => {
+return reject_.callValue1(signal_.reason)
+});
+signal_.addEventListener("abort", jsDoReject_);
 return writable_.once("drain", (() => {
-signal_.removeEventListener("abort", reject_);
+signal_.removeEventListener("abort", jsDoReject_);
 return resolve_()
 }))
 })))
@@ -270,8 +273,8 @@ return ff_core_Option.None()
 } else {
 (await ff_core_Js.withSignal_$((async (signal_, $task) => {
 const promise_ = (new Promise(((resolve_, reject_) => {
-const jsDoReject_ = ((_w1) => {
-return doReject_(_w1)
+const jsDoReject_ = ((_) => {
+return doReject_(signal_.reason)
 });
 doResolve_ = (() => {
 signal_.removeEventListener("abort", jsDoReject_);
@@ -320,9 +323,12 @@ try {
 if((!writable_.write((new Uint8Array(buffer_.buffer, buffer_.byteOffset, buffer_.byteLength))))) {
 (await ff_core_Js.withSignal_$((async (signal_, $task) => {
 return (await (new Promise(((resolve_, reject_) => {
-signal_.addEventListener("abort", reject_);
+const jsDoReject_ = ((_) => {
+return reject_.callValue1(signal_.reason)
+});
+signal_.addEventListener("abort", jsDoReject_);
 return writable_.once("drain", (() => {
-signal_.removeEventListener("abort", reject_);
+signal_.removeEventListener("abort", jsDoReject_);
 return resolve_()
 }))
 }))))

package/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly compiler",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.5.68",
+    "version": "0.5.70",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"

package/vscode/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly language support",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.5.68",
+    "version": "0.5.70",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"