firefly-compiler 0.5.69 → 0.5.71

package/compiler/Dependencies.ff

@@ -145,7 +145,7 @@ extend self: Dependencies {
 process(fetch: HttpClient, dependencyLock: DependencyLock, path: Path): ResolvedDependencies {
     let workspace = Workspace.loadWorkspace(path)
     let self = Dependencies(workspace, [].toMap(), [].toMap(), [].toSet())
-    let packageInfo = self.loadPackageInfo(PackagePair("script", "script"), path).else {
+    let packageInfo = self.loadPackageInfo(Syntax.scriptPackagePair, path).else {
         if(!path.exists()) {
             throw(CompileError(Location(path.absolute(), 1, 1), "File not found"))
         } else {

package/compiler/Main.ff

@@ -150,7 +150,7 @@ main(system: NodeSystem): Unit {
             let columns = filePaths.flatMap {filePath =>
                 let path = system.path(filePath)
                 let code = path.readText()
-                let packagePair = PackagePair("script", "script")
+                let packagePair = Syntax.scriptPackagePair
                 let moduleKey = ModuleKey(packagePair, [], path.base().removeLast(".ff").grab())
                 let tokens = Tokenizer.tokenize(path.absolute(), code, None, False)
                 let parser = Parser.new(moduleKey, tokens, True, LspHook.disabled())

package/compiler/Syntax.ff

@@ -47,6 +47,8 @@ extend self: PackagePair {
     }
 }
 
+scriptPackagePair: PackagePair = PackagePair("script", "script")
+
 data ModuleKey(
     packagePair: PackagePair
     folders: List[String]

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/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/CompletionHandler.ff

@@ -240,7 +240,7 @@ completionsToJson(completions: List[CompletionInfo]): Json {
 importCompletion(moduleKeys: List[ModuleKey]): List[CompletionInfo] {
     moduleKeys.map {moduleKey =>
         let label = moduleKey.folders.map {_ + "."}.join() + moduleKey.name
-        let extra = if(moduleKey.packagePair.name == "script" && moduleKey.packagePair.group == "script") {
+        let extra = if(moduleKey.packagePair == Syntax.scriptPackagePair) {
             ""
         } else {
             " from " + moduleKey.packagePair.groupName(":")
@@ -374,9 +374,7 @@ completion(
 
 makeAutoimportCompletion(info: ImportSymbolInfo, importLine: Int, name: String, isType: Bool): CompletionInfo {
     let moduleName = info.moduleKey.folders.map {_ + "."}.join() + info.moduleKey.name
-    let fromName = if(
-        info.moduleKey.packagePair.name == "script" && info.moduleKey.packagePair.group == "script"
-    ) {
+    let fromName = if(info.moduleKey.packagePair == Syntax.scriptPackagePair) {
         ""
     } else {
         info.moduleKey.packagePair.groupName(":")

package/lsp/Handler.ff

@@ -76,7 +76,6 @@ extend self: Handler {
                 let diagnostics = self.handleFocusDiagnostic(system, parameters, version)
                 [Pair("textDocument/publishDiagnostics", diagnostics)]
             | "custom/focusDocument" => 
-                self.importSymbolsCache = Pair("", [])
                 let diagnostics = self.handleFocusDiagnostic(system, parameters, version)
                 [Pair("textDocument/publishDiagnostics", diagnostics)]
             | "workspace/didRenameFiles" =>
@@ -283,7 +282,7 @@ extend self: Handler {
             let lspHook = LspHook.new(at = None, definedAt = None, insertIdentifier = False, trackSymbols = True)
             let code = self.virtualFiles.get(path.absolute()).else {path.readText()}
             let tokens = Tokenizer.tokenize(path.absolute(), code, None, True)
-            let dummyModuleKey = ModuleKey(PackagePair("script", "script"), [], path.base())
+            let dummyModuleKey = ModuleKey(Syntax.scriptPackagePair, [], path.base())
             let parser = Parser.new(dummyModuleKey, tokens, False, lspHook)
             parser.parseModuleWithPackageInfo()
             SymbolHandler.readAllSymbols(lspHook.results())
@@ -339,9 +338,14 @@ extend self: Handler {
         let creates = parameters.grab("changes").grabArray().filter {_.field("type").grabInt() == 1}
         let changes = parameters.grab("changes").grabArray().filter {_.field("type").grabInt() == 2}
         let deletes = parameters.grab("changes").grabArray().filter {_.field("type").grabInt() == 3}
-        creates.map {_.field("uri").grabString()}.each {self.moduleCache.invalidate(system.pathFromUrl(_).absolute())}
-        changes.map {_.field("uri").grabString()}.each {self.moduleCache.invalidate(system.pathFromUrl(_).absolute())}
-        deletes.map {_.field("uri").grabString()}.each {self.moduleCache.invalidate(system.pathFromUrl(_).absolute())}
+        function invalidate(url: String) {
+            let path = system.pathFromUrl(url)
+            if(self.importSymbolsCache.first != path.absolute()) {self.importSymbolsCache = Pair("", [])}
+            self.moduleCache.invalidate(path.absolute())
+        }
+        creates.map {_.field("uri").grabString()}.each {invalidate(_)}
+        changes.map {_.field("uri").grabString()}.each {invalidate(_)}
+        deletes.map {_.field("uri").grabString()}.each {invalidate(_)}
         let diagnostics = self.handleClearDiagnostic(system, [Pair("files", Json.array(deletes))].toMap())
         diagnostics.map {Pair("textDocument/publishDiagnostics", _)}
     }
@@ -358,6 +362,7 @@ extend self: Handler {
     handleDidChange(system: NodeSystem, parameters: Map[String, Json]): Unit {
         let uri = parameters.grab("textDocument").field("uri").grabString()
         let path = system.pathFromUrl(uri)
+        if(self.importSymbolsCache.first != path.absolute()) {self.importSymbolsCache = Pair("", [])}
         self.responseCache = Map.new()
         self.fileSymbolsCache = self.fileSymbolsCache.remove(path.absolute())
         self.moduleCache.invalidate(path.absolute())
@@ -428,7 +433,7 @@ extend self: Handler {
         try {
             let code = self.virtualFiles.get(cursorAt.file).else {system.path(cursorAt.file).readText()}
             let tokens = Tokenizer.tokenize(cursorAt.file, code, None, True)
-            let dummyModuleKey = ModuleKey(PackagePair("script", "script"), [], "<LSP>")
+            let dummyModuleKey = ModuleKey(Syntax.scriptPackagePair, [], "<LSP>")
             let parser = Parser.new(dummyModuleKey, tokens, False, lspHook)
             parser.parseModuleWithPackageInfo()
         } tryCatch {| CompileError(at, message), error =>
@@ -651,7 +656,7 @@ extend self: Handler {
         let imports = try {
             let code = self.virtualFiles.get(modulePath.absolute()).else {modulePath.readText()}
             let tokens = Tokenizer.tokenize(modulePath.absolute(), code, Some(lspHook.at), True)
-            let parser = Parser.new(ModuleKey(PackagePair("", ""), [], ""), tokens, True, lspHook)
+            let parser = Parser.new(ModuleKey(Syntax.scriptPackagePair, [], ""), tokens, True, lspHook)
             tokens.each {token => 
                 if(token.is(LKeyword) && token.rawIs4("import", "include", "package", "dependency")) {
                     importLine = token.startLine + 1

package/lsp/LanguageServer.ff

@@ -73,13 +73,11 @@ main(system: NodeSystem) {
                             responseChannel.write(Pair(body, message.method))
                         }
                     } catchAny {error =>
-                        // TODO: Sometimes the "Error" is an "Event" instead of type "abort" - why?
-                        let problem = if(error.name() == "AbortError" || error!->type === "abort") {
+                        let problem = if(error.name() == "AbortError") {
                             Log.trace("LS ABORT")
                             Error(-32800, "Request cancelled")
                         } else {
                             Log.trace("LS ERROR " + error.name() + ": " + error.message())
-                            // Log.trace("LS ERROR MORE: " + error!->type?)
                             Log.trace("BEGIN LS ERROR STACK TRACE")
                             Log.trace(error.stack())
                             Log.trace("END LS ERROR STACK TRACE")

package/output/js/ff/compiler/Dependencies.mjs

@@ -123,7 +123,7 @@ return {mainPackagePair_, packages_, packagePaths_, singleFilePackages_};
 export function process_(fetch_, dependencyLock_, path_) {
 const workspace_ = ff_compiler_Workspace.loadWorkspace_(path_);
 const self_ = ff_compiler_Dependencies.Dependencies(workspace_, ff_core_List.List_toMap([], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), ff_core_List.List_toMap([], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), ff_core_List.List_toSet([], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair));
-const packageInfo_ = ff_core_Option.Option_else(ff_compiler_Dependencies.Dependencies_loadPackageInfo(self_, ff_compiler_Syntax.PackagePair("script", "script"), path_), (() => {
+const packageInfo_ = ff_core_Option.Option_else(ff_compiler_Dependencies.Dependencies_loadPackageInfo(self_, ff_compiler_Syntax.scriptPackagePair_, path_), (() => {
 if((!ff_core_Path.Path_exists(path_, false, false, false))) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(ff_compiler_Syntax.Location(ff_core_Path.Path_absolute(path_), 1, 1), "File not found"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 } else {
@@ -167,7 +167,7 @@ tar_.extract({file: tarGzPath_.absolutePath_, cwd: path_.absolutePath_, strict:
 export async function process_$(fetch_, dependencyLock_, path_, $task) {
 const workspace_ = (await ff_compiler_Workspace.loadWorkspace_$(path_, $task));
 const self_ = ff_compiler_Dependencies.Dependencies(workspace_, ff_core_List.List_toMap([], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), ff_core_List.List_toMap([], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair), ff_core_List.List_toSet([], ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair));
-const packageInfo_ = (await ff_core_Option.Option_else$((await ff_compiler_Dependencies.Dependencies_loadPackageInfo$(self_, ff_compiler_Syntax.PackagePair("script", "script"), path_, $task)), (async ($task) => {
+const packageInfo_ = (await ff_core_Option.Option_else$((await ff_compiler_Dependencies.Dependencies_loadPackageInfo$(self_, ff_compiler_Syntax.scriptPackagePair_, path_, $task)), (async ($task) => {
 if((!(await ff_core_Path.Path_exists$(path_, false, false, false, $task)))) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(ff_compiler_Syntax.Location((await ff_core_Path.Path_absolute$(path_, $task)), 1, 1), "File not found"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 } else {

package/output/js/ff/compiler/Main.mjs

@@ -246,7 +246,7 @@ const filePaths_ = command_a.filePaths_;
 const columns_ = ff_core_List.List_flatMap(filePaths_, ((filePath_) => {
 const path_ = ff_core_NodeSystem.NodeSystem_path(system_, filePath_);
 const code_ = ff_core_Path.Path_readText(path_);
-const packagePair_ = ff_compiler_Syntax.PackagePair("script", "script");
+const packagePair_ = ff_compiler_Syntax.scriptPackagePair_;
 const moduleKey_ = ff_compiler_Syntax.ModuleKey(packagePair_, [], ff_core_Option.Option_grab(ff_core_String.String_removeLast(ff_core_Path.Path_base(path_), ".ff")));
 const tokens_ = ff_compiler_Tokenizer.tokenize_(ff_core_Path.Path_absolute(path_), code_, ff_core_Option.None(), false);
 const parser_ = ff_compiler_Parser.new_(moduleKey_, tokens_, true, ff_compiler_LspHook.disabled_());
@@ -650,7 +650,7 @@ const filePaths_ = command_a.filePaths_;
 const columns_ = (await ff_core_List.List_flatMap$(filePaths_, (async (filePath_, $task) => {
 const path_ = (await ff_core_NodeSystem.NodeSystem_path$(system_, filePath_, $task));
 const code_ = (await ff_core_Path.Path_readText$(path_, $task));
-const packagePair_ = ff_compiler_Syntax.PackagePair("script", "script");
+const packagePair_ = ff_compiler_Syntax.scriptPackagePair_;
 const moduleKey_ = ff_compiler_Syntax.ModuleKey(packagePair_, [], ff_core_Option.Option_grab(ff_core_String.String_removeLast((await ff_core_Path.Path_base$(path_, $task)), ".ff")));
 const tokens_ = ff_compiler_Tokenizer.tokenize_((await ff_core_Path.Path_absolute$(path_, $task)), code_, ff_core_Option.None(), false);
 const parser_ = ff_compiler_Parser.new_(moduleKey_, tokens_, true, ff_compiler_LspHook.disabled_());

package/output/js/ff/compiler/Syntax.mjs

@@ -361,7 +361,7 @@ export function Version(at_, major_, minor_, patch_) {
 return {at_, major_, minor_, patch_};
 }
 
-
+export const scriptPackagePair_ = ff_compiler_Syntax.PackagePair("script", "script");
 
 export function catchMany_(list_, body_) {
 const errors_ = ff_core_Array.new_();

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/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.69",
+    "version": "0.5.71",
     "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.69",
+    "version": "0.5.71",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"