firefly-compiler 0.5.15 → 0.5.17

package/compiler/Builder.ff

@@ -44,6 +44,7 @@ build(
         if(printMeasurements) {compiler.printMeasurements()}
         resolvedDependencies.packagePaths.each {packagePair, packagePath =>
             resolvedDependencies.packages.get(packagePair).each {packageInfo =>
+                processNodeModules(system, jsPathFile, packagePath, packageInfo)
                 processIncludes(jsPathFile, packagePath, packageInfo)
             }
         }
@@ -57,7 +58,7 @@ build(
 
 }
 
-processIncludes(jsPathFile: Path, packagePath: Path, info: PackageInfo): Unit {
+processIncludes(jsPathFile: Path, packagePath: Path, info: PackageInfo) {
     info.includes.each {include =>
         let fromPath = packagePath.slash(".firefly").slash("include").slash(include.path)
         let toPath = jsPathFile.slash(info.package.packagePair.groupName("/")).slash(include.path)
@@ -65,6 +66,19 @@ processIncludes(jsPathFile: Path, packagePath: Path, info: PackageInfo): Unit {
     }
 }
 
+processNodeModules(system: NodeSystem, jsPathFile: Path, packagePath: Path, info: PackageInfo) {
+    if(info.includes.any {_.path == "node_modules"}) {
+        let includePath = packagePath.slash(".firefly").slash("include")
+        let nodeModules = includePath.slash("node_modules")
+        let packageJson = includePath.slash("package.json")
+        let packageLockJson = includePath.slash("package-lock.json")
+        if(!nodeModules.exists() && packageJson.exists() && packageLockJson.exists()) {
+            system.writeErrorLine("Running npm ci --no-bin-links in " + includePath.absolute())
+            system.execute("npm", ["ci", "--no-bin-links"], directory = Some(includePath))
+        }
+    }
+}
+
 buildViaBuildSystem(system: NodeSystem, fireflyPath: Path, mainFile: String, target: String) {
     let resolvedDependencies = Dependencies.process(
         system.httpClient()

package/compiler/Compiler.ff

@@ -216,9 +216,14 @@ extend self: Compiler {
         }
 
         let allModules = [module, ...otherModules]
-        let js = 
-            JsEmitter.new(allModules, self.emitTarget, isMainModule, self.compilerModulePath, packagePair, moduleName)
-            .emitModule(packagePair, module)
+        let js = JsEmitter.new(
+            otherModules = allModules
+            emitTarget = self.emitTarget
+            isMainModule = isMainModule
+            compilerModuleFileUrl = self.compilerModulePath.map {_.url()}
+            packagePair = packagePair
+            moduleName = moduleName
+        ).emitModule(packagePair, module)
         let jsPath = self.jsOutputPath.slash(packagePair.group).slash(packagePair.name)
         let jsFile = jsPath.slash(moduleName + ".mjs")
         jsPath.createDirectory(createParentDirectories = True)

package/compiler/JsEmitter.ff

@@ -2,12 +2,12 @@ import Syntax
 import Patterns
 import JsImporter
 
-capability JsEmitter(
+class JsEmitter(
     otherModules: Map[String, Module]
     jsImporter: JsImporter
     emitTarget: EmitTarget
     isMainModule: Bool
-    compilerModulePath: Option[Path]
+    compilerModuleFileUrl: Option[String]
     packagePair: PackagePair
     moduleName: String
     mutable emittingAsync: Bool
@@ -25,7 +25,7 @@ new(
     otherModules: List[Module]
     emitTarget: EmitTarget
     isMainModule: Bool
-    compilerModulePath: Option[Path]
+    compilerModuleFileUrl: Option[String]
     packagePair: PackagePair
     moduleName: String
 ): JsEmitter {
@@ -37,7 +37,7 @@ new(
         jsImporter = JsImporter.new()
         emitTarget = emitTarget
         isMainModule = isMainModule
-        compilerModulePath = compilerModulePath
+        compilerModuleFileUrl = compilerModuleFileUrl
         packagePair = packagePair
         moduleName = moduleName
         emittingAsync = False
@@ -56,7 +56,7 @@ extend self: JsEmitter {
             "import * as " + packagePair.groupName("_") + "_" + module.file.dropLast(3) + " " +
             "from \"../../" + packagePair.groupName("/") + "/" + module.file.dropLast(3) + ".mjs\""
         let imports = [
-            self.compilerModulePath.map {"import * as $firefly_compiler from '" + _.url() + "'"}.toList()
+            self.compilerModuleFileUrl.map {"import * as $firefly_compiler from '" + _ + "'"}.toList()
             module.imports.sortBy {i => Pair(i.package, i.file) }.map {self.emitImportDefinition(_)}
         ].flatten()
         let parts = [
@@ -696,7 +696,7 @@ extend self: JsEmitter {
                 MatchCase(_, [PVariable(_, name)], [], body)
             ]))]} =>
                 Some(
-                    "for(let for_o = " + self.emitTerm(list, async) + "; for_o.Some;) {\n" +
+                    "for(const for_o = " + self.emitTerm(list, async) + "; for_o.Some;) {\n" +
                         name.map {"const " + escapeKeyword(_) + " = for_o.value_;\n"}.else {""} +
                         self.emitStatements(body, last, async) +
                     "\nbreak\n}"

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

@@ -137,8 +137,9 @@ if(printMeasurements_) {
 ff_compiler_Compiler.Compiler_printMeasurements(compiler_)
 };
 ff_core_Map.Map_each(resolvedDependencies_.packagePaths_, ((packagePair_, packagePath_) => {
-for(let for_o = ff_core_Map.Map_get(resolvedDependencies_.packages_, packagePair_, ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair); for_o.Some;) {
+for(const for_o = ff_core_Map.Map_get(resolvedDependencies_.packages_, packagePair_, ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair); for_o.Some;) {
 const packageInfo_ = for_o.value_;
+ff_compiler_Builder.processNodeModules_(system_, jsPathFile_, packagePath_, packageInfo_);
 ff_compiler_Builder.processIncludes_(jsPathFile_, packagePath_, packageInfo_)
 break
 }
@@ -162,6 +163,21 @@ ff_core_Path.Path_copyTo(fromPath_, toPath_, 0, 100)
 }
 }
 
+export function processNodeModules_(system_, jsPathFile_, packagePath_, info_) {
+if(ff_core_List.List_any(info_.includes_, ((_w1) => {
+return (_w1.path_ === "node_modules")
+}))) {
+const includePath_ = ff_core_Path.Path_slash(ff_core_Path.Path_slash(packagePath_, ".firefly"), "include");
+const nodeModules_ = ff_core_Path.Path_slash(includePath_, "node_modules");
+const packageJson_ = ff_core_Path.Path_slash(includePath_, "package.json");
+const packageLockJson_ = ff_core_Path.Path_slash(includePath_, "package-lock.json");
+if((((!ff_core_Path.Path_exists(nodeModules_, false, false, false)) && ff_core_Path.Path_exists(packageJson_, false, false, false)) && ff_core_Path.Path_exists(packageLockJson_, false, false, false))) {
+ff_core_NodeSystem.NodeSystem_writeErrorLine(system_, ("Running npm ci --no-bin-links in " + ff_core_Path.Path_absolute(includePath_)));
+ff_core_NodeSystem.NodeSystem_execute(system_, "npm", ["ci", "--no-bin-links"], ff_core_Buffer.new_(0, false), ff_core_Option.Some(includePath_), ff_core_Option.None(), 16777216, 9, true)
+}
+}
+}
+
 export function buildViaBuildSystem_(system_, fireflyPath_, mainFile_, target_) {
 const resolvedDependencies_ = ff_compiler_Dependencies.process_(ff_core_NodeSystem.NodeSystem_httpClient(system_), ff_compiler_DependencyLock.new_(ff_core_NodeSystem.NodeSystem_mainTask(system_)), ff_core_NodeSystem.NodeSystem_path(system_, mainFile_));
 const fixedPackagePaths_ = (ff_core_Map.Map_contains(resolvedDependencies_.packagePaths_, ff_compiler_Syntax.PackagePair("ff", "core"), ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair)
@@ -336,8 +352,9 @@ if(printMeasurements_) {
 (await ff_compiler_Compiler.Compiler_printMeasurements$(compiler_, $task))
 };
 (await ff_core_Map.Map_each$(resolvedDependencies_.packagePaths_, (async (packagePair_, packagePath_, $task) => {
-for(let for_o = ff_core_Map.Map_get(resolvedDependencies_.packages_, packagePair_, ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair); for_o.Some;) {
+for(const for_o = ff_core_Map.Map_get(resolvedDependencies_.packages_, packagePair_, ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair); for_o.Some;) {
 const packageInfo_ = for_o.value_;
+(await ff_compiler_Builder.processNodeModules_$(system_, jsPathFile_, packagePath_, packageInfo_, $task));
 (await ff_compiler_Builder.processIncludes_$(jsPathFile_, packagePath_, packageInfo_, $task))
 break
 }
@@ -361,6 +378,21 @@ const toPath_ = (await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(
 }
 }
 
+export async function processNodeModules_$(system_, jsPathFile_, packagePath_, info_, $task) {
+if(ff_core_List.List_any(info_.includes_, ((_w1) => {
+return (_w1.path_ === "node_modules")
+}))) {
+const includePath_ = (await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(packagePath_, ".firefly", $task)), "include", $task));
+const nodeModules_ = (await ff_core_Path.Path_slash$(includePath_, "node_modules", $task));
+const packageJson_ = (await ff_core_Path.Path_slash$(includePath_, "package.json", $task));
+const packageLockJson_ = (await ff_core_Path.Path_slash$(includePath_, "package-lock.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_Path.Path_exists$(packageLockJson_, false, false, false, $task)))) {
+(await ff_core_NodeSystem.NodeSystem_writeErrorLine$(system_, ("Running npm ci --no-bin-links in " + (await ff_core_Path.Path_absolute$(includePath_, $task))), $task));
+(await ff_core_NodeSystem.NodeSystem_execute$(system_, "npm", ["ci", "--no-bin-links"], ff_core_Buffer.new_(0, false), ff_core_Option.Some(includePath_), ff_core_Option.None(), 16777216, 9, true, $task))
+}
+}
+}
+
 export async function buildViaBuildSystem_$(system_, fireflyPath_, mainFile_, target_, $task) {
 const resolvedDependencies_ = (await ff_compiler_Dependencies.process_$((await ff_core_NodeSystem.NodeSystem_httpClient$(system_, $task)), (await ff_compiler_DependencyLock.new_$((await ff_core_NodeSystem.NodeSystem_mainTask$(system_, $task)), $task)), (await ff_core_NodeSystem.NodeSystem_path$(system_, mainFile_, $task)), $task));
 const fixedPackagePaths_ = (ff_core_Map.Map_contains(resolvedDependencies_.packagePaths_, ff_compiler_Syntax.PackagePair("ff", "core"), ff_compiler_Syntax.ff_core_Ordering_Order$ff_compiler_Syntax_PackagePair)

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

@@ -171,7 +171,7 @@ return ff_compiler_ModuleCache.ModuleCache_cacheParsedModule(self_.cache_, self_
 const packageName_ = ff_compiler_Syntax.PackagePair_groupName(packagePair_, ":");
 return ff_compiler_Compiler.Compiler_measure(self_, "Parse", packagePair_, moduleName_, (() => {
 const code_ = ff_core_Option.Option_else(ff_core_Map.Map_get(self_.virtualFiles_, ff_core_Path.Path_absolute(path_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), (() => {
-for(let for_o = importedAt_; for_o.Some;) {
+for(const for_o = importedAt_; for_o.Some;) {
 const at_ = for_o.value_;
 if((!ff_core_Path.Path_exists(path_, false, false, false))) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, ((("Imported module not found: " + packageName_) + "/") + moduleName_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
@@ -265,7 +265,9 @@ ff_compiler_Compiler.Compiler_emit(self_, i_.packagePair_, newModuleName_, false
 return ff_compiler_Compiler.Compiler_infer(self_, i_.packagePair_, newModuleName_)
 }));
 const allModules_ = [module_, ...otherModules_];
-const js_ = ff_compiler_JsEmitter.JsEmitter_emitModule(ff_compiler_JsEmitter.new_(allModules_, self_.emitTarget_, isMainModule_, self_.compilerModulePath_, packagePair_, moduleName_), packagePair_, module_);
+const js_ = ff_compiler_JsEmitter.JsEmitter_emitModule(ff_compiler_JsEmitter.new_(allModules_, self_.emitTarget_, isMainModule_, ff_core_Option.Option_map(self_.compilerModulePath_, ((_w1) => {
+return ff_core_Path.Path_url(_w1)
+})), packagePair_, moduleName_), packagePair_, module_);
 const jsPath_ = ff_core_Path.Path_slash(ff_core_Path.Path_slash(self_.jsOutputPath_, packagePair_.group_), packagePair_.name_);
 const jsFile_ = ff_core_Path.Path_slash(jsPath_, (moduleName_ + ".mjs"));
 ff_core_Path.Path_createDirectory(jsPath_, true);
@@ -304,7 +306,7 @@ return (await ff_compiler_ModuleCache.ModuleCache_cacheParsedModule$(self_.cache
 const packageName_ = ff_compiler_Syntax.PackagePair_groupName(packagePair_, ":");
 return (await ff_compiler_Compiler.Compiler_measure$(self_, "Parse", packagePair_, moduleName_, (async ($task) => {
 const code_ = (await ff_core_Option.Option_else$(ff_core_Map.Map_get(self_.virtualFiles_, (await ff_core_Path.Path_absolute$(path_, $task)), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), (async ($task) => {
-for(let for_o = importedAt_; for_o.Some;) {
+for(const for_o = importedAt_; for_o.Some;) {
 const at_ = for_o.value_;
 if((!(await ff_core_Path.Path_exists$(path_, false, false, false, $task)))) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, ((("Imported module not found: " + packageName_) + "/") + moduleName_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
@@ -398,7 +400,9 @@ const newModuleName_ = ff_core_String.String_dropLast(i_.file_, ff_core_String.S
 return (await ff_compiler_Compiler.Compiler_infer$(self_, i_.packagePair_, newModuleName_, $task))
 }), $task));
 const allModules_ = [module_, ...otherModules_];
-const js_ = (await ff_compiler_JsEmitter.JsEmitter_emitModule$((await ff_compiler_JsEmitter.new_$(allModules_, self_.emitTarget_, isMainModule_, self_.compilerModulePath_, packagePair_, moduleName_, $task)), packagePair_, module_, $task));
+const js_ = ff_compiler_JsEmitter.JsEmitter_emitModule(ff_compiler_JsEmitter.new_(allModules_, self_.emitTarget_, isMainModule_, (await ff_core_Option.Option_map$(self_.compilerModulePath_, (async (_w1, $task) => {
+return (await ff_core_Path.Path_url$(_w1, $task))
+}), $task)), packagePair_, moduleName_), packagePair_, module_);
 const jsPath_ = (await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(self_.jsOutputPath_, packagePair_.group_, $task)), packagePair_.name_, $task));
 const jsFile_ = (await ff_core_Path.Path_slash$(jsPath_, (moduleName_ + ".mjs"), $task));
 (await ff_core_Path.Path_createDirectory$(jsPath_, true, $task));

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

@@ -669,7 +669,7 @@ if(_1.EField) {
 const e_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, term_.at_)) {
-for(let for_o = hookRecordTypeBox_; for_o.Some;) {
+for(const for_o = hookRecordTypeBox_; for_o.Some;) {
 const _w1 = for_o.value_;
 _w1.value_ = ff_core_Option.Some(recordType_)
 break
@@ -1203,7 +1203,7 @@ if(_1.EField) {
 const f_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, f_.at_);
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, term_.at_)) {
-for(let for_o = hookRecordTypeBox_; for_o.Some;) {
+for(const for_o = hookRecordTypeBox_; for_o.Some;) {
 const _w1 = for_o.value_;
 _w1.value_ = ff_core_Option.Some(recordType_)
 break
@@ -1507,7 +1507,7 @@ const arguments_ = ff_core_List.List_map(ff_core_List.List_zip(e_.arguments_, ar
 {
 const argument_ = _1.first_;
 const t_ = _1.second_;
-for(let for_o = argument_.name_; for_o.Some;) {
+for(const for_o = argument_.name_; for_o.Some;) {
 const name_ = for_o.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(argument_.at_, ("Named argument not allowed here: " + name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 break
@@ -1522,7 +1522,7 @@ return ff_compiler_Syntax.Argument(_c.at_, _c.name_, ff_compiler_Inference.Infer
 return
 }
 }));
-for(let for_o = ff_core_List.List_first(e_.typeArguments_); for_o.Some;) {
+for(const for_o = ff_core_List.List_first(e_.typeArguments_); for_o.Some;) {
 const typeArgument_ = for_o.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(typeArgument_.at_, "Type arguments not allowed here"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 break
@@ -1889,7 +1889,7 @@ return ff_core_Option.Option_contains(_w1.name_, p_.name_, ff_core_Equal.ff_core
 {
 const at_ = _1.at_;
 const e_ = _1.value_;
-for(let for_o = ff_core_Array.Array_indexWhere(remainingArguments_, ((_w1) => {
+for(const for_o = ff_core_Array.Array_indexWhere(remainingArguments_, ((_w1) => {
 return ff_core_Option.Option_contains(_w1.name_, p_.name_, ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String)
 })); for_o.Some;) {
 const _w1 = for_o.value_;
@@ -2531,7 +2531,7 @@ if(_1.EField) {
 const e_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, term_.at_)) {
-for(let for_o = hookRecordTypeBox_; for_o.Some;) {
+for(const for_o = hookRecordTypeBox_; for_o.Some;) {
 const _w1 = for_o.value_;
 _w1.value_ = ff_core_Option.Some(recordType_)
 break
@@ -3065,7 +3065,7 @@ if(_1.EField) {
 const f_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, f_.at_);
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, term_.at_)) {
-for(let for_o = hookRecordTypeBox_; for_o.Some;) {
+for(const for_o = hookRecordTypeBox_; for_o.Some;) {
 const _w1 = for_o.value_;
 _w1.value_ = ff_core_Option.Some(recordType_)
 break
@@ -3369,7 +3369,7 @@ const arguments_ = ff_core_List.List_map(ff_core_List.List_zip(e_.arguments_, ar
 {
 const argument_ = _1.first_;
 const t_ = _1.second_;
-for(let for_o = argument_.name_; for_o.Some;) {
+for(const for_o = argument_.name_; for_o.Some;) {
 const name_ = for_o.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(argument_.at_, ("Named argument not allowed here: " + name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 break
@@ -3384,7 +3384,7 @@ return ff_compiler_Syntax.Argument(_c.at_, _c.name_, ff_compiler_Inference.Infer
 return
 }
 }));
-for(let for_o = ff_core_List.List_first(e_.typeArguments_); for_o.Some;) {
+for(const for_o = ff_core_List.List_first(e_.typeArguments_); for_o.Some;) {
 const typeArgument_ = for_o.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(typeArgument_.at_, "Type arguments not allowed here"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 break
@@ -3751,7 +3751,7 @@ return ff_core_Option.Option_contains(_w1.name_, p_.name_, ff_core_Equal.ff_core
 {
 const at_ = _1.at_;
 const e_ = _1.value_;
-for(let for_o = ff_core_Array.Array_indexWhere(remainingArguments_, ((_w1) => {
+for(const for_o = ff_core_Array.Array_indexWhere(remainingArguments_, ((_w1) => {
 return ff_core_Option.Option_contains(_w1.name_, p_.name_, ff_core_Equal.ff_core_Equal_Equal$ff_core_String_String)
 })); for_o.Some;) {
 const _w1 = for_o.value_;