firefly-compiler 0.4.61 → 0.4.63

package/core/NodeSystem.ff

@@ -97,34 +97,6 @@ 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
@@ -134,7 +106,7 @@ extend self: NodeSystem {
         environment: Option[Map[String, String]] = None
         maxBuffer: Int = 16777216
         killSignal: Int = 9
-        windowsWhich: Bool = True
+        windowsWhere: Bool = True
     ): ProcessResult
         target node async """
             import * as childProcess from 'node:child_process';
@@ -146,9 +118,9 @@ extend self: NodeSystem {
                     ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String
                 );
             }
-            if(windowsWhich_ && process.platform === 'win32') {
+            if(windowsWhere_ && process.platform === 'win32') {
                 command_ = 
-                    (await NodeSystem_which$(self_, command_, workingDirectory_, environment_, $task)).value_ || 
+                    (await internalWindowsWhere_$(self_, command_, workingDirectory_, environment_, $task)).value_ || 
                     command_;
             }
             const newProcess = childProcess.spawn(command_, arguments_, {
@@ -229,7 +201,21 @@ internalFindCommand(out: String): String {
     }.else {""}
 }
 
-internalIsWindows(): Bool
-    target node sync """
-        return process.platform === 'win32';
-    """
+internalWindowsWhere(
+    system: NodeSystem
+    command: String
+    workingDirectory: Option[Path] = None
+    environment: Option[Map[String, String]] = None
+): Option[String] {
+    if(!command.all {c => c.isAsciiLetterOrDigit() || c == '_' || c == '-'}) {None} else:
+    let out = system.execute(
+        "cmd.exe", 
+        ["/c", "where", command], 
+        workingDirectory = workingDirectory
+        environment = environment
+        windowsWhere = False
+    )
+    out.standardOut.toString().lines().filter {line => 
+        out.exitCode == 0 && line.split('\\').last().any {_.contains(".")}
+    }.first()
+}

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

@@ -136,10 +136,19 @@ return ""
 }))
 }
 
-export function internalIsWindows_() {
-
-        return process.platform === 'win32';
-    
+export function internalWindowsWhere_(system_, command_, workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None()) {
+if((!ff_core_String.String_all(command_, ((c_) => {
+return ((ff_core_Char.Char_isAsciiLetterOrDigit(c_) || (c_ === 95)) || (c_ === 45))
+})))) {
+return ff_core_Option.None()
+} else {
+const out_ = ff_core_NodeSystem.NodeSystem_execute(system_, "cmd.exe", ["/c", "where", 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_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) {
@@ -172,8 +181,19 @@ return ""
 }))
 }
 
-export async function internalIsWindows_$($task) {
-throw new Error('Function internalIsWindows is missing on this target in async context.');
+export async function internalWindowsWhere_$(system_, command_, workingDirectory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), $task) {
+if((!ff_core_String.String_all(command_, ((c_) => {
+return ((ff_core_Char.Char_isAsciiLetterOrDigit(c_) || (c_ === 95)) || (c_ === 45))
+})))) {
+return ff_core_Option.None()
+} else {
+const out_ = (await ff_core_NodeSystem.NodeSystem_execute$(system_, "cmd.exe", ["/c", "where", 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_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_) {
@@ -272,18 +292,7 @@ export function NodeSystem_environment(self_) {
 throw new Error('Function NodeSystem_environment is missing on this target in sync context.');
 }
 
-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) {
+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, windowsWhere_ = true) {
 throw new Error('Function NodeSystem_execute is missing on this target in sync context.');
 }
 
@@ -397,18 +406,7 @@ export async function NodeSystem_environment$(self_, $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) {
+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, windowsWhere_ = true, $task) {
 
             const childProcess = import$3;
             const environment = environment_.value_ !== void 0 ? {} : process.env;
@@ -419,9 +417,9 @@ export async function NodeSystem_execute$(self_, command_, arguments_, standardI
                     ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String
                 );
             }
-            if(windowsWhich_ && process.platform === 'win32') {
+            if(windowsWhere_ && process.platform === 'win32') {
                 command_ = 
-                    (await NodeSystem_which$(self_, command_, workingDirectory_, environment_, $task)).value_ || 
+                    (await internalWindowsWhere_$(self_, command_, workingDirectory_, environment_, $task)).value_ || 
                     command_;
             }
             const newProcess = childProcess.spawn(command_, arguments_, {

package/package.json

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