firefly-compiler 0.5.31 → 0.5.32

package/bin/Release.ff

@@ -95,7 +95,7 @@ requireVsceLoggedIn(system: NodeSystem, directory: Path) {
 run(system: NodeSystem, command: String, arguments: List[String], directory: Path): ProcessResult {
     system.writeLine("")
     system.writeLine(command + " " + arguments.join(" "))
-    system.execute(command, arguments, directory = Some(directory))
+    system.execute(command, arguments, directory = Some(directory), shell = True)
 }
 
 runSuccessful(system: NodeSystem, command: String, arguments: List[String], directory: Path): Buffer {

package/core/NodeSystem.ff

@@ -106,7 +106,6 @@ extend self: NodeSystem {
         environment: Option[Map[String, String]] = None
         maxBuffer: Int = 16777216
         killSignal: Int = 9
-        windowsWhere: Bool = True
         shell: Bool = False
     ): ProcessResult
         target node async """
@@ -119,12 +118,6 @@ extend self: NodeSystem {
                     ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String
                 );
             }
-            if(windowsWhere_ && process.platform === 'win32') {
-                const cmd = process.env.ComSpec || "cmd.exe";
-                command_ = (
-                    await internalWindowsWhere_$(self_, cmd, command_, directory_, environment_, $task)
-                ).value_ || command_;
-            }
             const newProcess = childProcess.spawn(command_, arguments_, {
                 cwd: directory_.value_,
                 windowsHide: true,
@@ -196,24 +189,3 @@ internalProcessError(problem: String): Error {
         error
     }
 }
-
-internalWindowsWhere(
-    system: NodeSystem
-    cmd: String
-    command: String
-    directory: 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(
-        "where", 
-        [command], 
-        directory = directory
-        environment = environment
-        windowsWhere = False
-        shell = True
-    )
-    out.standardOut.toString().lines().filter {line => 
-        out.exitCode == 0 && line.split('\\').last().any {_.contains(".")}
-    }.first()
-}

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

@@ -172,7 +172,7 @@ const nodeModules_ = ff_core_Path.Path_slash(includePath_, "node_modules");
 const packageJson_ = ff_core_Path.Path_slash(includePath_, "package.json");
 if(((!ff_core_Path.Path_exists(nodeModules_, false, false, false)) && ff_core_Path.Path_exists(packageJson_, false, false, false))) {
 ff_core_NodeSystem.NodeSystem_writeErrorLine(system_, ("Running npm install --no-package-lock --no-bin-links in " + ff_core_Path.Path_absolute(includePath_)));
-const result_ = ff_core_NodeSystem.NodeSystem_execute(system_, "npm", ["install", "--no-package-lock", "--no-bin-links"], ff_core_Buffer.new_(0, false), ff_core_Option.Some(includePath_), ff_core_Option.None(), 16777216, 9, true, true);
+const result_ = ff_core_NodeSystem.NodeSystem_execute(system_, "npm", ["install", "--no-package-lock", "--no-bin-links"], ff_core_Buffer.new_(0, false), ff_core_Option.Some(includePath_), ff_core_Option.None(), 16777216, 9, true);
 if((result_.exitCode_ !== 0)) {
 ff_core_NodeSystem.NodeSystem_writeErrorLine(system_, (("Running npm failed with exit code " + result_.exitCode_) + ":"));
 ff_core_NodeSystem.NodeSystem_writeErrorBuffer(system_, result_.standardOut_);
@@ -391,7 +391,7 @@ const nodeModules_ = (await ff_core_Path.Path_slash$(includePath_, "node_modules
 const packageJson_ = (await ff_core_Path.Path_slash$(includePath_, "package.json", $task));
 if(((!(await ff_core_Path.Path_exists$(nodeModules_, false, false, false, $task))) && (await ff_core_Path.Path_exists$(packageJson_, false, false, false, $task)))) {
 (await ff_core_NodeSystem.NodeSystem_writeErrorLine$(system_, ("Running npm install --no-package-lock --no-bin-links in " + (await ff_core_Path.Path_absolute$(includePath_, $task))), $task));
-const result_ = (await ff_core_NodeSystem.NodeSystem_execute$(system_, "npm", ["install", "--no-package-lock", "--no-bin-links"], ff_core_Buffer.new_(0, false), ff_core_Option.Some(includePath_), ff_core_Option.None(), 16777216, 9, true, true, $task));
+const result_ = (await ff_core_NodeSystem.NodeSystem_execute$(system_, "npm", ["install", "--no-package-lock", "--no-bin-links"], ff_core_Buffer.new_(0, false), ff_core_Option.Some(includePath_), ff_core_Option.None(), 16777216, 9, true, $task));
 if((result_.exitCode_ !== 0)) {
 (await ff_core_NodeSystem.NodeSystem_writeErrorLine$(system_, (("Running npm failed with exit code " + result_.exitCode_) + ":"), $task));
 (await ff_core_NodeSystem.NodeSystem_writeErrorBuffer$(system_, result_.standardOut_, $task));

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

@@ -129,21 +129,6 @@ return error_
 }))
 }
 
-export function internalWindowsWhere_(system_, cmd_, command_, directory_ = 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_, "where", [command_], ff_core_Buffer.new_(0, false), directory_, environment_, 16777216, 9, false, true);
-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) {
 return system_.assets_
 }
@@ -165,21 +150,6 @@ return error_
 }))
 }
 
-export async function internalWindowsWhere_$(system_, cmd_, command_, directory_ = 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_, "where", [command_], ff_core_Buffer.new_(0, false), directory_, environment_, 16777216, 9, false, true, $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_) {
 throw new Error('Function NodeSystem_arguments is missing on this target in sync context.');
 }
@@ -276,7 +246,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), directory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), maxBuffer_ = 16777216, killSignal_ = 9, windowsWhere_ = true, shell_ = false) {
+export function NodeSystem_execute(self_, command_, arguments_, standardIn_ = ff_core_Buffer.new_(0), directory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), maxBuffer_ = 16777216, killSignal_ = 9, shell_ = false) {
 throw new Error('Function NodeSystem_execute is missing on this target in sync context.');
 }
 
@@ -390,7 +360,7 @@ export async function NodeSystem_environment$(self_, $task) {
         
 }
 
-export async function NodeSystem_execute$(self_, command_, arguments_, standardIn_ = ff_core_Buffer.new_(0), directory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), maxBuffer_ = 16777216, killSignal_ = 9, windowsWhere_ = true, shell_ = false, $task) {
+export async function NodeSystem_execute$(self_, command_, arguments_, standardIn_ = ff_core_Buffer.new_(0), directory_ = ff_core_Option.None(), environment_ = ff_core_Option.None(), maxBuffer_ = 16777216, killSignal_ = 9, shell_ = false, $task) {
 
             const childProcess = import$3;
             const environment = environment_.value_ !== void 0 ? {} : process.env;
@@ -401,12 +371,6 @@ export async function NodeSystem_execute$(self_, command_, arguments_, standardI
                     ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String
                 );
             }
-            if(windowsWhere_ && process.platform === 'win32') {
-                const cmd = process.env.ComSpec || "cmd.exe";
-                command_ = (
-                    await internalWindowsWhere_$(self_, cmd, command_, directory_, environment_, $task)
-                ).value_ || command_;
-            }
             const newProcess = childProcess.spawn(command_, arguments_, {
                 cwd: directory_.value_,
                 windowsHide: true,

package/package.json

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