firefly-compiler 0.4.60 → 0.4.62

package/bin/Release.ff

@@ -22,13 +22,13 @@ release(
     }
     requireNpmLoggedIn(system, system.path(".."))
     requireVsceLoggedIn(system, system.path("../vscode"))
-    runSuccessful(system, "node", ".exe", ["output/js/ff/compiler/Main.mjs", "bootstrap"], system.path(".."))
-    runSuccessful(system, "node", ".exe", ["output/js/ff/compiler/Main.mjs", "bootstrap"], system.path(".."))
-    runSuccessful(system, "node", ".exe", ["output/js/ff/compiler/Main.mjs", "bootstrap"], system.path(".."))
+    runSuccessful(system, "node", ["output/js/ff/compiler/Main.mjs", "bootstrap"], system.path(".."))
+    runSuccessful(system, "node", ["output/js/ff/compiler/Main.mjs", "bootstrap"], system.path(".."))
+    runSuccessful(system, "node", ["output/js/ff/compiler/Main.mjs", "bootstrap"], system.path(".."))
     let version = bumpMinorVersion(system, system.path("../package.json"))
     bumpMinorVersion(system, system.path("../vscode/package.json"))
-    runSuccessful(system, "npm", ".cmd", ["publish"], system.path(".."))
-    runSuccessful(system, "vsce", ".cmd", ["publish"], system.path("../vscode"))
+    runSuccessful(system, "npm", ["publish"], system.path(".."))
+    runSuccessful(system, "vsce", ["publish"], system.path("../vscode"))
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "compiler")
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "core")
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "lux")
@@ -37,8 +37,8 @@ release(
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "s3")
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "unsafejs")
     releaseFireflyPackage(system, accessKeyId, secretAccessKey, "webserver")
-    runSuccessful(system, "git", ".exe", ["commit", "-a", "-m", "Autorelease " + version], system.path(".."))
-    runSuccessful(system, "git", ".exe", ["push"], system.path(".."))
+    runSuccessful(system, "git", ["commit", "-a", "-m", "Autorelease " + version], system.path(".."))
+    runSuccessful(system, "git", ["push"], system.path(".."))
 }
 
 releaseFireflyPackage(
@@ -71,7 +71,7 @@ releaseFireflyPackage(
 }
 
 requireNpmLoggedIn(system: NodeSystem, workingDirectory: Path) {
-    let out = run(system, "npm", ".cmd", ["whoami"], workingDirectory)
+    let out = run(system, "npm", ["whoami"], workingDirectory)
     if(out.exitCode != 0) {
         system.writeErrorLine("")
         system.writeErrorLine("You are not logged into npm")
@@ -81,7 +81,7 @@ requireNpmLoggedIn(system: NodeSystem, workingDirectory: Path) {
 }
 
 requireVsceLoggedIn(system: NodeSystem, workingDirectory: Path) {
-    let out = runSuccessful(system, "vsce", ".cmd", ["ls-publishers"], workingDirectory)
+    let out = runSuccessful(system, "vsce", ["ls-publishers"], workingDirectory)
     if(!out.toString().lines().any {_ == "firefly-team"}) {
         system.writeErrorLine("")
         system.writeErrorLine("You are not logged into vsce")
@@ -92,14 +92,14 @@ requireVsceLoggedIn(system: NodeSystem, workingDirectory: Path) {
     }
 }
 
-run(system: NodeSystem, command: String, windowsExtension: String, arguments: List[String], workingDirectory: Path): ProcessResult {
+run(system: NodeSystem, command: String, arguments: List[String], workingDirectory: Path): ProcessResult {
     system.writeLine("")
     system.writeLine(command + " " + arguments.join(" "))
-    system.execute(command, arguments, workingDirectory = Some(workingDirectory), windowsExtension = windowsExtension)
+    system.execute(command, arguments, workingDirectory = Some(workingDirectory))
 }
 
-runSuccessful(system: NodeSystem, command: String, windowsExtension: String, arguments: List[String], workingDirectory: Path): Buffer {
-    let out = run(system, command, windowsExtension, arguments, workingDirectory)
+runSuccessful(system: NodeSystem, command: String, arguments: List[String], workingDirectory: Path): Buffer {
+    let out = run(system, command, arguments, workingDirectory)
     if(out.exitCode != 0) {
         system.writeBuffer(out.standardOut)
         system.writeErrorBuffer(out.standardError)

package/core/NodeSystem.ff

@@ -106,7 +106,7 @@ extend self: NodeSystem {
         environment: Option[Map[String, String]] = None
         maxBuffer: Int = 16777216
         killSignal: Int = 9
-        windowsExtension: String = ""
+        windowsWhich: Bool = True
     ): ProcessResult
         target node async """
             import * as childProcess from 'node:child_process';
@@ -118,7 +118,11 @@ extend self: NodeSystem {
                     ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String
                 );
             }
-            if(process.platform === 'win32') command_ += windowsExtension_;
+            if(windowsWhich_ && process.platform === 'win32') {
+                command_ = 
+                    (await internalWhich_$(self_, command_, workingDirectory_, environment_, $task)).value_ || 
+                    command_;
+            }
             const newProcess = childProcess.spawn(command_, arguments_, {
                 cwd: workingDirectory_.value_,
                 windowsHide: true,
@@ -196,3 +200,37 @@ internalFindCommand(out: String): String {
         l.endsWith(".exe") || l.endsWith(".cmd") || l.endsWith(".bat") || l.endsWith(".com")
     }.else {""}
 }
+
+internalIsWindows(): Bool
+    target node sync """
+        return process.platform === 'win32';
+    """
+        
+internalWhich(
+    system: NodeSystem
+    command: String
+    workingDirectory: Option[Path] = None
+    environment: Option[Map[String, String]] = None
+): Option[String] {
+    let out = if(internalIsWindows()) {
+        system.execute(
+            "cmd.exe", 
+            ["/c", "where", command], 
+            workingDirectory = workingDirectory
+            environment = environment
+            windowsWhich = False
+        )
+    } else {
+        system.execute(
+            "which", 
+            [command], 
+            workingDirectory = workingDirectory
+            environment = environment
+            windowsWhich = False
+        )
+    }
+    out.standardOut.toString().lines().filter {line => 
+        out.exitCode == 0 &&
+        (!internalIsWindows() || line.split('\\').last().any {_.contains(".")})
+    }.first()
+}

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

@@ -136,6 +136,23 @@ return ""
 }))
 }
 
+export function internalIsWindows_() {
+
+        return process.platform === 'win32';
+    
+}
+
+export function internalWhich_(system_, command_, workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None()) {
+const out_ = (ff_core_NodeSystem.internalIsWindows_()
+? ff_core_NodeSystem.NodeSystem_execute(system_, "cmd.exe", ["/c", "where", command_], ff_core_Buffer.new_(0, false), workingDirectory_, environment_, 16777216, 9, false)
+: ff_core_NodeSystem.NodeSystem_execute(system_, "which", [command_], ff_core_Buffer.new_(0, false), workingDirectory_, environment_, 16777216, 9, false));
+return ff_core_List.List_first(ff_core_List.List_filter(ff_core_String.String_lines(ff_core_Buffer.Buffer_toString(out_.standardOut_, "utf8")), ((line_) => {
+return ((out_.exitCode_ === 0) && ((!ff_core_NodeSystem.internalIsWindows_()) || ff_core_Option.Option_any(ff_core_List.List_last(ff_core_String.String_split(line_, 92)), ((_w1) => {
+return ff_core_String.String_contains(_w1, ".")
+}))))
+})))
+}
+
 export async function internalAssets_$(system_, $task) {
 return system_.assets_
 }
@@ -166,6 +183,21 @@ return ""
 }))
 }
 
+export async function internalIsWindows_$($task) {
+throw new Error('Function internalIsWindows is missing on this target in async context.');
+}
+
+export async function internalWhich_$(system_, command_, workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), $task) {
+const out_ = (ff_core_NodeSystem.internalIsWindows_()
+? (await ff_core_NodeSystem.NodeSystem_execute$(system_, "cmd.exe", ["/c", "where", command_], ff_core_Buffer.new_(0, false), workingDirectory_, environment_, 16777216, 9, false, $task))
+: (await ff_core_NodeSystem.NodeSystem_execute$(system_, "which", [command_], ff_core_Buffer.new_(0, false), workingDirectory_, environment_, 16777216, 9, false, $task)));
+return ff_core_List.List_first(ff_core_List.List_filter(ff_core_String.String_lines(ff_core_Buffer.Buffer_toString(out_.standardOut_, "utf8")), ((line_) => {
+return ((out_.exitCode_ === 0) && ((!ff_core_NodeSystem.internalIsWindows_()) || ff_core_Option.Option_any(ff_core_List.List_last(ff_core_String.String_split(line_, 92)), ((_w1) => {
+return ff_core_String.String_contains(_w1, ".")
+}))))
+})))
+}
+
 export function NodeSystem_arguments(self_) {
 throw new Error('Function NodeSystem_arguments is missing on this target in sync context.');
 }
@@ -262,7 +294,7 @@ export function NodeSystem_environment(self_) {
 throw new Error('Function NodeSystem_environment is missing on this target in sync context.');
 }
 
-export function NodeSystem_execute(self_, command_, arguments_, standardIn_ = ff_core_Buffer.new_(0), workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), maxBuffer_ = 16777216, killSignal_ = 9, windowsExtension_ = "") {
+export function NodeSystem_execute(self_, command_, arguments_, standardIn_ = ff_core_Buffer.new_(0), workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), maxBuffer_ = 16777216, killSignal_ = 9, windowsWhich_ = true) {
 throw new Error('Function NodeSystem_execute is missing on this target in sync context.');
 }
 
@@ -376,7 +408,7 @@ export async function NodeSystem_environment$(self_, $task) {
         
 }
 
-export async function NodeSystem_execute$(self_, command_, arguments_, standardIn_ = ff_core_Buffer.new_(0), workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), maxBuffer_ = 16777216, killSignal_ = 9, windowsExtension_ = "", $task) {
+export async function NodeSystem_execute$(self_, command_, arguments_, standardIn_ = ff_core_Buffer.new_(0), workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), maxBuffer_ = 16777216, killSignal_ = 9, windowsWhich_ = true, $task) {
 
             const childProcess = import$3;
             const environment = environment_.value_ !== void 0 ? {} : process.env;
@@ -387,7 +419,11 @@ export async function NodeSystem_execute$(self_, command_, arguments_, standardI
                     ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String
                 );
             }
-            if(process.platform === 'win32') command_ += windowsExtension_;
+            if(windowsWhich_ && process.platform === 'win32') {
+                command_ = 
+                    (await internalWhich_$(self_, command_, workingDirectory_, environment_, $task)).value_ || 
+                    command_;
+            }
             const newProcess = childProcess.spawn(command_, arguments_, {
                 cwd: workingDirectory_.value_,
                 windowsHide: true,

package/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly compiler",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.4.60",
+    "version": "0.4.62",
     "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.4.60",
+    "version": "0.4.62",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"