firefly-compiler 0.4.59 → 0.4.61

package/core/NodeSystem.ff

@@ -97,6 +97,34 @@ extend self: NodeSystem {
             }
             return ff_core_List.List_toMap(result, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
         """
+        
+    which(
+        command: String
+        workingDirectory: Option[Path] = None
+        environment: Option[Map[String, String]] = None
+    ): Option[String] {
+        let out = if(internalIsWindows()) {
+            self.execute(
+                "cmd.exe", 
+                ["/c", "where", command], 
+                workingDirectory = workingDirectory
+                environment = environment
+                windowsWhich = False
+            )
+        } else {
+            self.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()
+    }
     
     execute(
         command: String
@@ -106,7 +134,7 @@ extend self: NodeSystem {
         environment: Option[Map[String, String]] = None
         maxBuffer: Int = 16777216
         killSignal: Int = 9
-        windowsShell: Bool = True
+        windowsWhich: Bool = True
     ): ProcessResult
         target node async """
             import * as childProcess from 'node:child_process';
@@ -118,11 +146,10 @@ extend self: NodeSystem {
                     ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String
                 );
             }
-            if(windowsShell_ && process.platform === 'win32') {
-                arguments_ = ['/C', ...[command_, ...arguments_].map(argument => 
-                    argument.replaceAll(/([^A-Za-z0-9/_-])/g, "^$1")
-                )];
-                command_ = process.env.ComSpec || 'cmd.exe';
+            if(windowsWhich_ && process.platform === 'win32') {
+                command_ = 
+                    (await NodeSystem_which$(self_, command_, workingDirectory_, environment_, $task)).value_ || 
+                    command_;
             }
             const newProcess = childProcess.spawn(command_, arguments_, {
                 cwd: workingDirectory_.value_,
@@ -194,3 +221,15 @@ internalProcessError(problem: String): Error {
         error
     } grab()
 }
+
+internalFindCommand(out: String): String {
+    out.lines().find {line => 
+        let l = line.lower()
+        l.endsWith(".exe") || l.endsWith(".cmd") || l.endsWith(".bat") || l.endsWith(".com")
+    }.else {""}
+}
+
+internalIsWindows(): Bool
+    target node sync """
+        return process.platform === 'win32';
+    """

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

@@ -127,6 +127,21 @@ return error_
 })))
 }
 
+export function internalFindCommand_(out_) {
+return ff_core_Option.Option_else(ff_core_List.List_find(ff_core_String.String_lines(out_), ((line_) => {
+const l_ = ff_core_String.String_lower(line_);
+return (((ff_core_String.String_endsWith(l_, ".exe") || ff_core_String.String_endsWith(l_, ".cmd")) || ff_core_String.String_endsWith(l_, ".bat")) || ff_core_String.String_endsWith(l_, ".com"))
+})), (() => {
+return ""
+}))
+}
+
+export function internalIsWindows_() {
+
+        return process.platform === 'win32';
+    
+}
+
 export async function internalAssets_$(system_, $task) {
 return system_.assets_
 }
@@ -148,6 +163,19 @@ return error_
 })))
 }
 
+export async function internalFindCommand_$(out_, $task) {
+return ff_core_Option.Option_else(ff_core_List.List_find(ff_core_String.String_lines(out_), ((line_) => {
+const l_ = ff_core_String.String_lower(line_);
+return (((ff_core_String.String_endsWith(l_, ".exe") || ff_core_String.String_endsWith(l_, ".cmd")) || ff_core_String.String_endsWith(l_, ".bat")) || ff_core_String.String_endsWith(l_, ".com"))
+})), (() => {
+return ""
+}))
+}
+
+export async function internalIsWindows_$($task) {
+throw new Error('Function internalIsWindows is missing on this target in async context.');
+}
+
 export function NodeSystem_arguments(self_) {
 throw new Error('Function NodeSystem_arguments is missing on this target in sync context.');
 }
@@ -244,7 +272,18 @@ 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, windowsShell_ = true) {
+export function NodeSystem_which(self_, command_, workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None()) {
+const out_ = (ff_core_NodeSystem.internalIsWindows_()
+? ff_core_NodeSystem.NodeSystem_execute(self_, "cmd.exe", ["/c", "where", command_], ff_core_Buffer.new_(0, false), workingDirectory_, environment_, 16777216, 9, false)
+: ff_core_NodeSystem.NodeSystem_execute(self_, "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 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.');
 }
 
@@ -358,7 +397,18 @@ 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, windowsShell_ = true, $task) {
+export async function NodeSystem_which$(self_, command_, workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), $task) {
+const out_ = (ff_core_NodeSystem.internalIsWindows_()
+? (await ff_core_NodeSystem.NodeSystem_execute$(self_, "cmd.exe", ["/c", "where", command_], ff_core_Buffer.new_(0, false), workingDirectory_, environment_, 16777216, 9, false, $task))
+: (await ff_core_NodeSystem.NodeSystem_execute$(self_, "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 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;
@@ -369,11 +419,10 @@ export async function NodeSystem_execute$(self_, command_, arguments_, standardI
                     ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String
                 );
             }
-            if(windowsShell_ && process.platform === 'win32') {
-                arguments_ = ['/C', ...[command_, ...arguments_].map(argument => 
-                    argument.replaceAll(/([^A-Za-z0-9/_-])/g, "^$1")
-                )];
-                command_ = process.env.ComSpec || 'cmd.exe';
+            if(windowsWhich_ && process.platform === 'win32') {
+                command_ = 
+                    (await NodeSystem_which$(self_, command_, workingDirectory_, environment_, $task)).value_ || 
+                    command_;
             }
             const newProcess = childProcess.spawn(command_, arguments_, {
                 cwd: workingDirectory_.value_,

package/package.json

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