firefly-compiler 0.4.61 → 0.4.62

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
@@ -148,7 +120,7 @@ extend self: NodeSystem {
             }
             if(windowsWhich_ && process.platform === 'win32') {
                 command_ = 
-                    (await NodeSystem_which$(self_, command_, workingDirectory_, environment_, $task)).value_ || 
+                    (await internalWhich_$(self_, command_, workingDirectory_, environment_, $task)).value_ || 
                     command_;
             }
             const newProcess = childProcess.spawn(command_, arguments_, {
@@ -232,4 +204,33 @@ internalFindCommand(out: String): String {
 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

@@ -142,6 +142,17 @@ export function internalIsWindows_() {
     
 }
 
+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_
 }
@@ -176,6 +187,17 @@ 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.');
 }
@@ -272,17 +294,6 @@ 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) {
 throw new Error('Function NodeSystem_execute is missing on this target in sync context.');
 }
@@ -397,17 +408,6 @@ 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) {
 
             const childProcess = import$3;
@@ -421,7 +421,7 @@ export async function NodeSystem_execute$(self_, command_, arguments_, standardI
             }
             if(windowsWhich_ && process.platform === 'win32') {
                 command_ = 
-                    (await NodeSystem_which$(self_, command_, workingDirectory_, environment_, $task)).value_ || 
+                    (await internalWhich_$(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.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.61",
+    "version": "0.4.62",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"