firefly-compiler 0.5.72 → 0.5.74

package/compiler/Main.ff

@@ -87,8 +87,9 @@ main(system: NodeSystem): Unit {
             )
             prepareFireflyDirectory(system.path("."))
             let mainPath = system.path(mainFile)
-            buildScript(mainPath, resolvedDependencies.mainPackagePair, EmitBrowser, resolvedDependencies)
-            bundleForBrowser(system, resolvedDependencies.mainPackagePair, mainPath.base())
+            let moduleKey = 
+                buildScript(mainPath, resolvedDependencies.mainPackagePair, EmitBrowser, resolvedDependencies)
+            bundleForBrowser(system, resolvedDependencies.mainPackagePair, moduleKey)
 
         | BuildCommand(mainFile) =>
             let resolvedDependencies = Dependencies.process(
@@ -257,11 +258,17 @@ bundleForPkg(system: NodeSystem, packagePair: PackagePair, mainFile: String) {
     BuildSystem.internalNodeCallEsBuild(system, mainJsFile, outputPath = file, minify = False)
 }
 
-bundleForBrowser(system: NodeSystem, packagePair: PackagePair, mainFile: String) {
-    let prefix = ".firefly/output/browser/"
-    let mainJsFile = prefix + packagePair.groupName("/") + "/" + mainFile + ".mjs"
-    let file = prefix + "Main.bundle.js"
-    BuildSystem.internalCallEsBuild(system, mainJsFile, outputPath = file, minify = True, sourceMap = True)
+bundleForBrowser(system: NodeSystem, packagePair: PackagePair, moduleKey: ModuleKey) {
+    let packagePath = moduleKey.packagePair.groupName("/")
+    let outputPath = system.path(".firefly/output/browser/" + packagePath + "/")
+    let runFile = outputPath.slash(moduleKey.importName() + ".run.mjs")
+    BuildSystem.internalBrowserCallEsBuild(
+        system!? 
+        [runFile.absolute()]
+        outputPath.absolute()
+        minify = True
+        sourceMap = True
+    )
 }
 
 importAndRun(

package/core/BuildSystem.ff

@@ -53,27 +53,6 @@ extend self: BuildSystem {
         
 }
 
-// TODO: Remove
-internalCallEsBuild(
-    self: NodeSystem
-    mainJsFile: String
-    outputPath: String
-    minify: Bool
-    sourceMap: Bool
-): Unit {
-    let esbuild = Js.import("esbuild")
-    esbuild->build(Js->(
-        stdin = Js->(contents = "import {$run$} from './" + mainJsFile + "';", resolveDir = ".")
-        bundle = True
-        minify = minify
-        sourcemap = sourceMap
-        platform = "browser"
-        target = "es2017"
-        external = ["../../../node_modules/*"] // TODO
-        outfile = outputPath
-    ))
-}
-
 internalBrowserCallEsBuild(
     self: BuildSystem
     mainJsFiles: List[String]

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

@@ -211,8 +211,8 @@ const mainFile_ = command_a.mainPath_;
 const resolvedDependencies_ = ff_compiler_Dependencies.process_(ff_core_NodeSystem.NodeSystem_httpClient(system_), ff_compiler_DependencyLock.new_(ff_core_NodeSystem.NodeSystem_mainTask(system_)), ff_core_NodeSystem.NodeSystem_path(system_, mainFile_));
 ff_compiler_Main.prepareFireflyDirectory_(ff_core_NodeSystem.NodeSystem_path(system_, "."));
 const mainPath_ = ff_core_NodeSystem.NodeSystem_path(system_, mainFile_);
-buildScript_(mainPath_, resolvedDependencies_.mainPackagePair_, ff_compiler_JsEmitter.EmitBrowser(), resolvedDependencies_);
-ff_compiler_Main.bundleForBrowser_(system_, resolvedDependencies_.mainPackagePair_, ff_core_Path.Path_base(mainPath_))
+const moduleKey_ = buildScript_(mainPath_, resolvedDependencies_.mainPackagePair_, ff_compiler_JsEmitter.EmitBrowser(), resolvedDependencies_);
+ff_compiler_Main.bundleForBrowser_(system_, resolvedDependencies_.mainPackagePair_, moduleKey_)
 return
 }
 if(command_a.BuildCommand) {
@@ -435,11 +435,11 @@ const file_ = (prefix_ + "Main.bundle.js");
 ff_core_BuildSystem.internalNodeCallEsBuild_(system_, mainJsFile_, file_, false)
 }
 
-export function bundleForBrowser_(system_, packagePair_, mainFile_) {
-const prefix_ = ".firefly/output/browser/";
-const mainJsFile_ = ((((prefix_ + ff_compiler_Syntax.PackagePair_groupName(packagePair_, "/")) + "/") + mainFile_) + ".mjs");
-const file_ = (prefix_ + "Main.bundle.js");
-ff_core_BuildSystem.internalCallEsBuild_(system_, mainJsFile_, file_, true, true)
+export function bundleForBrowser_(system_, packagePair_, moduleKey_) {
+const packagePath_ = ff_compiler_Syntax.PackagePair_groupName(moduleKey_.packagePair_, "/");
+const outputPath_ = ff_core_NodeSystem.NodeSystem_path(system_, ((".firefly/output/browser/" + packagePath_) + "/"));
+const runFile_ = ff_core_Path.Path_slash(outputPath_, (ff_compiler_Syntax.ModuleKey_importName(moduleKey_) + ".run.mjs"));
+ff_core_BuildSystem.internalBrowserCallEsBuild_(system_, [ff_core_Path.Path_absolute(runFile_)], ff_core_Path.Path_absolute(outputPath_), true, true)
 }
 
 export function importAndRun_(system_, fireflyPath_, target_, moduleKey_, arguments_) {
@@ -615,8 +615,8 @@ const mainFile_ = command_a.mainPath_;
 const resolvedDependencies_ = (await ff_compiler_Dependencies.process_$((await ff_core_NodeSystem.NodeSystem_httpClient$(system_, $task)), (await ff_compiler_DependencyLock.new_$((await ff_core_NodeSystem.NodeSystem_mainTask$(system_, $task)), $task)), (await ff_core_NodeSystem.NodeSystem_path$(system_, mainFile_, $task)), $task));
 (await ff_compiler_Main.prepareFireflyDirectory_$((await ff_core_NodeSystem.NodeSystem_path$(system_, ".", $task)), $task));
 const mainPath_ = (await ff_core_NodeSystem.NodeSystem_path$(system_, mainFile_, $task));
-(await buildScript_$(mainPath_, resolvedDependencies_.mainPackagePair_, ff_compiler_JsEmitter.EmitBrowser(), resolvedDependencies_, $task));
-(await ff_compiler_Main.bundleForBrowser_$(system_, resolvedDependencies_.mainPackagePair_, (await ff_core_Path.Path_base$(mainPath_, $task)), $task))
+const moduleKey_ = (await buildScript_$(mainPath_, resolvedDependencies_.mainPackagePair_, ff_compiler_JsEmitter.EmitBrowser(), resolvedDependencies_, $task));
+(await ff_compiler_Main.bundleForBrowser_$(system_, resolvedDependencies_.mainPackagePair_, moduleKey_, $task))
 return
 }
 if(command_a.BuildCommand) {
@@ -839,11 +839,11 @@ const file_ = (prefix_ + "Main.bundle.js");
 (await ff_core_BuildSystem.internalNodeCallEsBuild_$(system_, mainJsFile_, file_, false, $task))
 }
 
-export async function bundleForBrowser_$(system_, packagePair_, mainFile_, $task) {
-const prefix_ = ".firefly/output/browser/";
-const mainJsFile_ = ((((prefix_ + ff_compiler_Syntax.PackagePair_groupName(packagePair_, "/")) + "/") + mainFile_) + ".mjs");
-const file_ = (prefix_ + "Main.bundle.js");
-(await ff_core_BuildSystem.internalCallEsBuild_$(system_, mainJsFile_, file_, true, true, $task))
+export async function bundleForBrowser_$(system_, packagePair_, moduleKey_, $task) {
+const packagePath_ = ff_compiler_Syntax.PackagePair_groupName(moduleKey_.packagePair_, "/");
+const outputPath_ = (await ff_core_NodeSystem.NodeSystem_path$(system_, ((".firefly/output/browser/" + packagePath_) + "/"), $task));
+const runFile_ = (await ff_core_Path.Path_slash$(outputPath_, (ff_compiler_Syntax.ModuleKey_importName(moduleKey_) + ".run.mjs"), $task));
+ff_core_BuildSystem.internalBrowserCallEsBuild_(system_, [(await ff_core_Path.Path_absolute$(runFile_, $task))], (await ff_core_Path.Path_absolute$(outputPath_, $task)), true, true)
 }
 
 export async function importAndRun_$(system_, fireflyPath_, target_, moduleKey_, arguments_, $task) {

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

@@ -101,11 +101,6 @@ import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
 
 
-export function internalCallEsBuild_(self_, mainJsFile_, outputPath_, minify_, sourceMap_) {
-const esbuild_ = import$0;
-esbuild_.build({stdin: {contents: (("import {$run$} from './" + mainJsFile_) + "';"), resolveDir: "."}, bundle: true, minify: minify_, sourcemap: sourceMap_, platform: "browser", target: "es2017", external: ["../../../node_modules/*"], outfile: outputPath_})
-}
-
 export function internalBrowserCallEsBuild_(self_, mainJsFiles_, outputPath_, minify_, sourceMap_) {
 const esbuild_ = import$0;
 esbuild_.build({entryPoints: mainJsFiles_, bundle: true, minify: minify_, sourcemap: sourceMap_, platform: "browser", target: "es2017", outdir: outputPath_, outExtension: {[".js"]: ".bundle.js"}})
@@ -156,11 +151,6 @@ export function internalMainPackagePair_(buildSystem_) {
 return ff_core_Pair.Pair(buildSystem_["mainPackagePair_"]["group_"], buildSystem_["mainPackagePair_"]["name_"])
 }
 
-export async function internalCallEsBuild_$(self_, mainJsFile_, outputPath_, minify_, sourceMap_, $task) {
-const esbuild_ = import$0;
-esbuild_.build({stdin: {contents: (("import {$run$} from './" + mainJsFile_) + "';"), resolveDir: "."}, bundle: true, minify: minify_, sourcemap: sourceMap_, platform: "browser", target: "es2017", external: ["../../../node_modules/*"], outfile: outputPath_})
-}
-
 export async function internalBrowserCallEsBuild_$(self_, mainJsFiles_, outputPath_, minify_, sourceMap_, $task) {
 const esbuild_ = import$0;
 (await esbuild_.build({entryPoints: mainJsFiles_, bundle: true, minify: minify_, sourcemap: sourceMap_, platform: "browser", target: "es2017", outdir: outputPath_, outExtension: {[".js"]: ".bundle.js"}}))

package/package.json

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

package/vscode/client/src/extension.ts

@@ -94,6 +94,19 @@ export function activate(context: vscode.ExtensionContext) {
             });
         }
     }));
+
+    const decorationProvider: vscode.FileDecorationProvider = {
+        provideFileDecoration(uri: vscode.Uri): vscode.FileDecoration | undefined {
+            if(fs.existsSync(path.join(uri.fsPath, '.firefly/package.ff'))) {
+                return {
+                    tooltip: 'Firefly package folder',
+                    color: new vscode.ThemeColor('charts.blue'),
+                };
+            }
+        }
+    };
+
+    context.subscriptions.push(vscode.window.registerFileDecorationProvider(decorationProvider));
 }
 
 export function deactivate(): Thenable<void> | undefined {

package/vscode/package.json

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

package/vscode/syntaxes/firefly.tmLanguage.json

@@ -31,7 +31,7 @@
         ]},
         "keyword": {
             "name": "keyword.declaration.firefly",
-            "match": "\\b(data|class|capability|import|from|dependency|package|include|extend|tailcall|function|let|mutable|firefly|trait|instance|newtype|private|safe|unsafe|trust|target)\\b(?=[ ]*[A-Za-z0-9\"'])"
+            "match": "\\b(data|class|capability|import|from|dependency|package|include|extend|tailcall|function|let|mutable|firefly|trait|instance|newtype|safe|unsafe|trust|target|private|protected|public|export|local|internal|opaque)\\b(?=[ ]*[A-Za-z0-9\"'])"
         },
         "spread": {
             "name": "punctuation.spread.firefly",