firefly-compiler 0.5.28 → 0.5.30

package/compiler/Builder.ff

@@ -73,7 +73,14 @@ processNodeModules(system: NodeSystem, jsPathFile: Path, packagePath: Path, info
         let packageJson = includePath.slash("package.json")
         if(!nodeModules.exists() && packageJson.exists()) {
             system.writeErrorLine("Running npm install --no-package-lock --no-bin-links in " + includePath.absolute())
-            system.execute("npm", ["install", "--no-package-lock", "--no-bin-links"], directory = Some(includePath))
+            let result = system.execute("npm", [
+                "install", "--no-package-lock", "--no-bin-links"
+            ], directory = Some(includePath), shell = True)
+            if(result.exitCode != 0) {
+                system.writeErrorLine("Running npm failed with exit code " + result.exitCode + ":")
+                system.writeErrorBuffer(result.standardOut)
+                system.writeErrorBuffer(result.standardError)
+            }
         }
     }
 }

package/core/NodeSystem.ff

@@ -107,6 +107,7 @@ extend self: NodeSystem {
         maxBuffer: Int = 16777216
         killSignal: Int = 9
         windowsWhere: Bool = True
+        shell: Bool = False
     ): ProcessResult
         target node async """
             import * as childProcess from 'node:child_process';
@@ -130,6 +131,7 @@ extend self: NodeSystem {
                 signal: $task.controller.signal,
                 killSignal: killSignal_,
                 env: environment,
+                shell: shell_
             });
             
             let size = 0;

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

@@ -172,7 +172,12 @@ 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_)));
-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)
+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);
+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_);
+ff_core_NodeSystem.NodeSystem_writeErrorBuffer(system_, result_.standardError_)
+}
 }
 }
 }
@@ -386,7 +391,12 @@ 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));
-(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))
+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));
+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));
+(await ff_core_NodeSystem.NodeSystem_writeErrorBuffer$(system_, result_.standardError_, $task))
+}
 }
 }
 }

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

@@ -135,7 +135,7 @@ return ((ff_core_Char.Char_isAsciiLetterOrDigit(c_) || (c_ === 95)) || (c_ === 4
 })))) {
 return ff_core_Option.None()
 } else {
-const out_ = ff_core_NodeSystem.NodeSystem_execute(system_, cmd_, ["/c", "where", command_], ff_core_Buffer.new_(0, false), directory_, environment_, 16777216, 9, false);
+const out_ = ff_core_NodeSystem.NodeSystem_execute(system_, cmd_, ["/c", "where", command_], ff_core_Buffer.new_(0, false), directory_, environment_, 16777216, 9, false, 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, ".")
@@ -171,7 +171,7 @@ return ((ff_core_Char.Char_isAsciiLetterOrDigit(c_) || (c_ === 95)) || (c_ === 4
 })))) {
 return ff_core_Option.None()
 } else {
-const out_ = (await ff_core_NodeSystem.NodeSystem_execute$(system_, cmd_, ["/c", "where", command_], ff_core_Buffer.new_(0, false), directory_, environment_, 16777216, 9, false, $task));
+const out_ = (await ff_core_NodeSystem.NodeSystem_execute$(system_, cmd_, ["/c", "where", command_], ff_core_Buffer.new_(0, false), directory_, environment_, 16777216, 9, false, 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, ".")
@@ -276,7 +276,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) {
+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) {
 throw new Error('Function NodeSystem_execute is missing on this target in sync context.');
 }
 
@@ -390,7 +390,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, $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) {
 
             const childProcess = import$3;
             const environment = environment_.value_ !== void 0 ? {} : process.env;
@@ -413,6 +413,7 @@ export async function NodeSystem_execute$(self_, command_, arguments_, standardI
                 signal: $task.controller.signal,
                 killSignal: killSignal_,
                 env: environment,
+                shell: shell_
             });
             
             let size = 0;

package/package.json

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