firefly-compiler 0.5.16 → 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 = [

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

@@ -139,6 +139,7 @@ ff_compiler_Compiler.Compiler_printMeasurements(compiler_)
 ff_core_Map.Map_each(resolvedDependencies_.packagePaths_, ((packagePair_, packagePath_) => {
 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)
@@ -338,6 +354,7 @@ if(printMeasurements_) {
 (await ff_core_Map.Map_each$(resolvedDependencies_.packagePaths_, (async (packagePair_, packagePath_, $task) => {
 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

@@ -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);
@@ -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));