firefly-compiler 0.5.95 → 0.5.97
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/core/BuildSystem.ff
CHANGED
|
@@ -96,7 +96,7 @@ internalBrowserCallEsBuild(
|
|
|
96
96
|
minify: Bool
|
|
97
97
|
sourceMap: Bool
|
|
98
98
|
): Unit {
|
|
99
|
-
let esbuild = Js.import("esbuild")
|
|
99
|
+
let esbuild = Js.import("esbuild/lib/main.js")
|
|
100
100
|
Js.await(esbuild->build(Js->(
|
|
101
101
|
entryPoints = mainJsFiles
|
|
102
102
|
bundle = True
|
|
@@ -115,7 +115,7 @@ internalNodeCallEsBuild(
|
|
|
115
115
|
outputPath: String
|
|
116
116
|
minify: Bool
|
|
117
117
|
): Unit {
|
|
118
|
-
let esbuild = Js.import("esbuild")
|
|
118
|
+
let esbuild = Js.import("esbuild/lib/main.js")
|
|
119
119
|
Js.await(esbuild->build(Js->(
|
|
120
120
|
entryPoints = [mainJsFile]
|
|
121
121
|
bundle = True
|
|
@@ -135,7 +135,7 @@ internalNodeCallEsBuildContext(
|
|
|
135
135
|
outputPath: String
|
|
136
136
|
minify: Bool
|
|
137
137
|
): JsValue {
|
|
138
|
-
let esbuild = Js.import("esbuild")
|
|
138
|
+
let esbuild = Js.import("esbuild/lib/main.js")
|
|
139
139
|
Js.await(esbuild->context(Js->(
|
|
140
140
|
entryPoints = [mainJsFile]
|
|
141
141
|
bundle = True
|
|
@@ -90,7 +90,7 @@ import * as ff_core_Task from "../../ff/core/Task.mjs"
|
|
|
90
90
|
|
|
91
91
|
import * as ff_core_Try from "../../ff/core/Try.mjs"
|
|
92
92
|
|
|
93
|
-
import * as import$0 from 'esbuild';
|
|
93
|
+
import * as import$0 from 'esbuild/lib/main.js';
|
|
94
94
|
import * as import$1 from 'path';
|
|
95
95
|
import * as ff_core_Unit from "../../ff/core/Unit.mjs"
|
|
96
96
|
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"../../../../core/BuildSystem.ff"
|
|
5
5
|
],
|
|
6
6
|
"sourcesContent": [
|
|
7
|
-
"capability BuildSystem {}\r\n\r\nextend self: BuildSystem {\r\n\r\n compileForBrowser(mainFiles: List[String]): AssetSystem {\r\n // TODO: Check that the mainFile is in the current package directory\r\n internalCompile(self, mainFiles.map {internalPath(self, _)}, \"browser\")\r\n let streams = internalListDirectory(internalPath(self, \".firefly/output/browser\"))\r\n let mainPackagePair = internalMainPackagePair(self)\r\n AssetSystem(streams.toMap())\r\n }\r\n\r\n bundleForBrowser(mainFiles: List[String], minify: Bool = True, sourceMaps: Bool = False): AssetSystem {\r\n internalCompile(self, mainFiles.map {internalPath(self, _)}, \"browser\")\r\n let browserOutputPath = internalPath(self, \".firefly/output/browser\")\r\n let runPaths = internalListPath(browserOutputPath).filter {_.base().endsWith(\".run.mjs\")}.toList()\r\n if(Js.globalThis()->ffDevelopMode.typeof() == \"undefined\") {\r\n let outputPath = runPaths.grabFirst().parent().grab()\r\n let start = self.mainTask().elapsed()\r\n internalBrowserCallEsBuild(self, runPaths.map {_.absolute()}, outputPath.absolute(), minify, sourceMaps)\r\n let bundlePaths = runPaths.flatMap {p =>\r\n let outputPath = p.parent().grab()\r\n let bundlePath = outputPath.slash(p.base().removeLast(\".mjs\").grab() + \".bundle.js\")\r\n let mapPath = outputPath.slash(p.base().removeLast(\".mjs\").grab() + \".bundle.js.map\")\r\n [bundlePath, mapPath]\r\n }\r\n AssetSystem(bundlePaths.map {p => \r\n Pair(\"/\" + p.relativeListTo(browserOutputPath).join(\"/\"), {p.readStream()})\r\n }.toMap())\r\n } else {\r\n mutable built = Set.new()\r\n let lock = self.mainTask().lock()\r\n AssetSystem(runPaths.flatMap {p =>\r\n let outputPath = p.parent().grab()\r\n let bundlePath = outputPath.slash(p.base().removeLast(\".mjs\").grab() + \".bundle.js\")\r\n let mapPath = outputPath.slash(p.base().removeLast(\".mjs\").grab() + \".bundle.js.map\")\r\n let bundleAssetPath = \"/\" + bundlePath.relativeListTo(browserOutputPath).join(\"/\")\r\n let mapAssetPath = \"/\" + mapPath.relativeListTo(browserOutputPath).join(\"/\")\r\n function bundle() {\r\n lock.do {\r\n if(!built.contains(p.absolute())) {\r\n internalBrowserCallEsBuild(self, [p.absolute()], outputPath.absolute(), minify, sourceMaps)\r\n built = built.add(p.absolute())\r\n }\r\n bundlePath.readStream()\r\n }\r\n }\r\n let bundleEntry = Pair(bundleAssetPath, {\r\n bundle()\r\n bundlePath.readStream()\r\n })\r\n let mapEntry = Pair(mapAssetPath, {\r\n bundle()\r\n mapPath.readStream()\r\n })\r\n [bundleEntry, mapEntry]\r\n }.toMap())\r\n }\r\n }\r\n\r\n buildMode(): Bool {\r\n !!self!->\"buildMode_\"?\r\n }\r\n \r\n setAssets(assetSystem: AssetSystem): Unit {\r\n self!->\"assets_\" = assetSystem!\r\n }\r\n\r\n packageAssets(): AssetSystem {\r\n let streams = internalListDirectory(internalPath(self, \".\"))\r\n AssetSystem(streams.toMap())\r\n }\r\n\r\n dependencyAssets(user: String, package: String): AssetSystem {\r\n panic(\"dependencyAssets not yet implemented\")\r\n }\r\n\r\n arguments(): List[String] {\r\n self!->\"array_\"?\r\n }\r\n\r\n mainTask(): Task {\r\n self!->\"task_\"?\r\n }\r\n\r\n crypto(): Crypto {\r\n Js->crypto?\r\n }\r\n \r\n}\r\n\r\ninternalBrowserCallEsBuild(\r\n self: BuildSystem\r\n mainJsFiles: List[String]\r\n outputPath: String\r\n minify: Bool\r\n sourceMap: Bool\r\n): Unit {\r\n let esbuild = Js.import(\"esbuild\")\r\n Js.await(esbuild->build(Js->(\r\n entryPoints = mainJsFiles\r\n bundle = True\r\n minify = minify\r\n sourcemap = sourceMap\r\n platform = \"browser\"\r\n target = \"es2017\"\r\n outdir = outputPath\r\n outExtension = Js.object().with(\".js\", \".bundle.js\")\r\n )))\r\n}\r\n\r\ninternalNodeCallEsBuild(\r\n self: NodeSystem\r\n mainJsFile: String\r\n outputPath: String\r\n minify: Bool\r\n): Unit {\r\n let esbuild = Js.import(\"esbuild\")\r\n Js.await(esbuild->build(Js->(\r\n entryPoints = [mainJsFile]\r\n bundle = True\r\n minify = minify\r\n sourcemap = True\r\n platform = \"node\"\r\n target = \"es2017\"\r\n external = [\"esbuild\", \"uws.js\"]\r\n loader = Js.object().with(\".node\", \"copy\")\r\n outdir = outputPath\r\n )))\r\n}\r\n\r\ninternalNodeCallEsBuildContext(\r\n self: NodeSystem\r\n mainJsFile: String\r\n outputPath: String\r\n minify: Bool\r\n): JsValue {\r\n let esbuild = Js.import(\"esbuild\")\r\n Js.await(esbuild->context(Js->(\r\n entryPoints = [mainJsFile]\r\n bundle = True\r\n minify = minify\r\n sourcemap = True\r\n platform = \"node\"\r\n target = \"es2017\"\r\n external = [\"esbuild\", \"uws.js\"]\r\n loader = Js.object().with(\".node\", \"copy\")\r\n outfile = outputPath\r\n ))) \r\n}\r\n\r\ninternalListDirectory(path: Path): List[Pair[String, () => Stream[Buffer]]] {\r\n function go(currentPath: Path): Stream[Path] {\r\n currentPath.entries().flatMap {file =>\r\n if(file.isDirectory()) {\r\n go(file.path())\r\n } else {\r\n [file.path()].toStream()\r\n }\r\n }\r\n }\r\n go(path).map {file =>\r\n Pair(\"/\" + file.relativeTo(path).replace(\"\\\\\", \"/\"), {file.readStream()})\r\n }.toList()\r\n}\r\n\r\ninternalListPath(path: Path): Stream[Path] {\r\n path.entries().flatMap {file =>\r\n if(file.isDirectory()) {\r\n internalListPath(file.path())\r\n } else {\r\n [file.path()].toStream()\r\n }\r\n }\r\n}\r\n\r\ninternalPath(buildSystem: BuildSystem, absoluteOrRelative: String): Path {\r\n let nodePath = Js.import(\"path\")\r\n Path(nodePath->resolve(absoluteOrRelative)?)\r\n}\r\n\r\ninternalCompile(buildSystem: BuildSystem, mainFiles: List[Path], target: String): Unit {\r\n if(Js.globalThis()->ffDevelopMode.typeof() != \"undefined\") {\r\n Js->process->send(Js->(\r\n ffDevelopMode = \"internalCompile\"\r\n mainFiles = mainFiles.map {_.absolute()}\r\n target = target\r\n ))\r\n Js.awaitCancellablePromise {resolve, reject, cleanup =>\r\n Js->process->on(\"message\", Js->{message => \r\n if(message->ffDevelopMode === \"internalCompile\") {\r\n resolve(Unit) // Handle errors?\r\n }\r\n })\r\n }\r\n } else:\r\n // Ported from the old FFI. It's quite fragile w.r.t. changes in code generation.\r\n Js.await(Js.rawIdentifier(\"$firefly_compiler\")->\"buildViaBuildSystem_$\"(\r\n buildSystem! \r\n internalPath(buildSystem, buildSystem!->\"fireflyPath_\"?)!\r\n mainFiles!\r\n target\r\n Js.undefined()\r\n Js.undefined()\r\n Js.currentTask()!\r\n ))\r\n}\r\n\r\ninternalMainPackagePair(buildSystem: BuildSystem): Pair[String, String] {\r\n Pair(buildSystem!->\"mainPackagePair_\"->\"group_\"?, buildSystem!->\"mainPackagePair_\"->\"name_\"?)\r\n}\r\n\r\ninternalWriteAssets(system: NodeSystem, assetSystem: AssetSystem): Unit {\r\n let path = system.path(\".\").slash(\".firefly\").path(\"output\").slash(\"assets\")\r\n if(path.exists()) {path.delete()}\r\n path.createDirectory()\r\n Log.debug(\"Writing assets to \" + path.absolute())\r\n assetSystem.files.each {p, s =>\r\n Log.debug(p)\r\n if(!p.contains(\"..\")) {\r\n let assetPath = path.slash(p)\r\n assetPath.parent().grab().createDirectory(createParentDirectories = True)\r\n assetPath.writeStream(s())\r\n }\r\n }\r\n}\r\n"
|
|
7
|
+
"capability BuildSystem {}\r\n\r\nextend self: BuildSystem {\r\n\r\n compileForBrowser(mainFiles: List[String]): AssetSystem {\r\n // TODO: Check that the mainFile is in the current package directory\r\n internalCompile(self, mainFiles.map {internalPath(self, _)}, \"browser\")\r\n let streams = internalListDirectory(internalPath(self, \".firefly/output/browser\"))\r\n let mainPackagePair = internalMainPackagePair(self)\r\n AssetSystem(streams.toMap())\r\n }\r\n\r\n bundleForBrowser(mainFiles: List[String], minify: Bool = True, sourceMaps: Bool = False): AssetSystem {\r\n internalCompile(self, mainFiles.map {internalPath(self, _)}, \"browser\")\r\n let browserOutputPath = internalPath(self, \".firefly/output/browser\")\r\n let runPaths = internalListPath(browserOutputPath).filter {_.base().endsWith(\".run.mjs\")}.toList()\r\n if(Js.globalThis()->ffDevelopMode.typeof() == \"undefined\") {\r\n let outputPath = runPaths.grabFirst().parent().grab()\r\n let start = self.mainTask().elapsed()\r\n internalBrowserCallEsBuild(self, runPaths.map {_.absolute()}, outputPath.absolute(), minify, sourceMaps)\r\n let bundlePaths = runPaths.flatMap {p =>\r\n let outputPath = p.parent().grab()\r\n let bundlePath = outputPath.slash(p.base().removeLast(\".mjs\").grab() + \".bundle.js\")\r\n let mapPath = outputPath.slash(p.base().removeLast(\".mjs\").grab() + \".bundle.js.map\")\r\n [bundlePath, mapPath]\r\n }\r\n AssetSystem(bundlePaths.map {p => \r\n Pair(\"/\" + p.relativeListTo(browserOutputPath).join(\"/\"), {p.readStream()})\r\n }.toMap())\r\n } else {\r\n mutable built = Set.new()\r\n let lock = self.mainTask().lock()\r\n AssetSystem(runPaths.flatMap {p =>\r\n let outputPath = p.parent().grab()\r\n let bundlePath = outputPath.slash(p.base().removeLast(\".mjs\").grab() + \".bundle.js\")\r\n let mapPath = outputPath.slash(p.base().removeLast(\".mjs\").grab() + \".bundle.js.map\")\r\n let bundleAssetPath = \"/\" + bundlePath.relativeListTo(browserOutputPath).join(\"/\")\r\n let mapAssetPath = \"/\" + mapPath.relativeListTo(browserOutputPath).join(\"/\")\r\n function bundle() {\r\n lock.do {\r\n if(!built.contains(p.absolute())) {\r\n internalBrowserCallEsBuild(self, [p.absolute()], outputPath.absolute(), minify, sourceMaps)\r\n built = built.add(p.absolute())\r\n }\r\n bundlePath.readStream()\r\n }\r\n }\r\n let bundleEntry = Pair(bundleAssetPath, {\r\n bundle()\r\n bundlePath.readStream()\r\n })\r\n let mapEntry = Pair(mapAssetPath, {\r\n bundle()\r\n mapPath.readStream()\r\n })\r\n [bundleEntry, mapEntry]\r\n }.toMap())\r\n }\r\n }\r\n\r\n buildMode(): Bool {\r\n !!self!->\"buildMode_\"?\r\n }\r\n \r\n setAssets(assetSystem: AssetSystem): Unit {\r\n self!->\"assets_\" = assetSystem!\r\n }\r\n\r\n packageAssets(): AssetSystem {\r\n let streams = internalListDirectory(internalPath(self, \".\"))\r\n AssetSystem(streams.toMap())\r\n }\r\n\r\n dependencyAssets(user: String, package: String): AssetSystem {\r\n panic(\"dependencyAssets not yet implemented\")\r\n }\r\n\r\n arguments(): List[String] {\r\n self!->\"array_\"?\r\n }\r\n\r\n mainTask(): Task {\r\n self!->\"task_\"?\r\n }\r\n\r\n crypto(): Crypto {\r\n Js->crypto?\r\n }\r\n \r\n}\r\n\r\ninternalBrowserCallEsBuild(\r\n self: BuildSystem\r\n mainJsFiles: List[String]\r\n outputPath: String\r\n minify: Bool\r\n sourceMap: Bool\r\n): Unit {\r\n let esbuild = Js.import(\"esbuild/lib/main.js\")\r\n Js.await(esbuild->build(Js->(\r\n entryPoints = mainJsFiles\r\n bundle = True\r\n minify = minify\r\n sourcemap = sourceMap\r\n platform = \"browser\"\r\n target = \"es2017\"\r\n outdir = outputPath\r\n outExtension = Js.object().with(\".js\", \".bundle.js\")\r\n )))\r\n}\r\n\r\ninternalNodeCallEsBuild(\r\n self: NodeSystem\r\n mainJsFile: String\r\n outputPath: String\r\n minify: Bool\r\n): Unit {\r\n let esbuild = Js.import(\"esbuild/lib/main.js\")\r\n Js.await(esbuild->build(Js->(\r\n entryPoints = [mainJsFile]\r\n bundle = True\r\n minify = minify\r\n sourcemap = True\r\n platform = \"node\"\r\n target = \"es2017\"\r\n external = [\"esbuild\", \"uws.js\"]\r\n loader = Js.object().with(\".node\", \"copy\")\r\n outdir = outputPath\r\n )))\r\n}\r\n\r\ninternalNodeCallEsBuildContext(\r\n self: NodeSystem\r\n mainJsFile: String\r\n outputPath: String\r\n minify: Bool\r\n): JsValue {\r\n let esbuild = Js.import(\"esbuild/lib/main.js\")\r\n Js.await(esbuild->context(Js->(\r\n entryPoints = [mainJsFile]\r\n bundle = True\r\n minify = minify\r\n sourcemap = True\r\n platform = \"node\"\r\n target = \"es2017\"\r\n external = [\"esbuild\", \"uws.js\"]\r\n loader = Js.object().with(\".node\", \"copy\")\r\n outfile = outputPath\r\n ))) \r\n}\r\n\r\ninternalListDirectory(path: Path): List[Pair[String, () => Stream[Buffer]]] {\r\n function go(currentPath: Path): Stream[Path] {\r\n currentPath.entries().flatMap {file =>\r\n if(file.isDirectory()) {\r\n go(file.path())\r\n } else {\r\n [file.path()].toStream()\r\n }\r\n }\r\n }\r\n go(path).map {file =>\r\n Pair(\"/\" + file.relativeTo(path).replace(\"\\\\\", \"/\"), {file.readStream()})\r\n }.toList()\r\n}\r\n\r\ninternalListPath(path: Path): Stream[Path] {\r\n path.entries().flatMap {file =>\r\n if(file.isDirectory()) {\r\n internalListPath(file.path())\r\n } else {\r\n [file.path()].toStream()\r\n }\r\n }\r\n}\r\n\r\ninternalPath(buildSystem: BuildSystem, absoluteOrRelative: String): Path {\r\n let nodePath = Js.import(\"path\")\r\n Path(nodePath->resolve(absoluteOrRelative)?)\r\n}\r\n\r\ninternalCompile(buildSystem: BuildSystem, mainFiles: List[Path], target: String): Unit {\r\n if(Js.globalThis()->ffDevelopMode.typeof() != \"undefined\") {\r\n Js->process->send(Js->(\r\n ffDevelopMode = \"internalCompile\"\r\n mainFiles = mainFiles.map {_.absolute()}\r\n target = target\r\n ))\r\n Js.awaitCancellablePromise {resolve, reject, cleanup =>\r\n Js->process->on(\"message\", Js->{message => \r\n if(message->ffDevelopMode === \"internalCompile\") {\r\n resolve(Unit) // Handle errors?\r\n }\r\n })\r\n }\r\n } else:\r\n // Ported from the old FFI. It's quite fragile w.r.t. changes in code generation.\r\n Js.await(Js.rawIdentifier(\"$firefly_compiler\")->\"buildViaBuildSystem_$\"(\r\n buildSystem! \r\n internalPath(buildSystem, buildSystem!->\"fireflyPath_\"?)!\r\n mainFiles!\r\n target\r\n Js.undefined()\r\n Js.undefined()\r\n Js.currentTask()!\r\n ))\r\n}\r\n\r\ninternalMainPackagePair(buildSystem: BuildSystem): Pair[String, String] {\r\n Pair(buildSystem!->\"mainPackagePair_\"->\"group_\"?, buildSystem!->\"mainPackagePair_\"->\"name_\"?)\r\n}\r\n\r\ninternalWriteAssets(system: NodeSystem, assetSystem: AssetSystem): Unit {\r\n let path = system.path(\".\").slash(\".firefly\").path(\"output\").slash(\"assets\")\r\n if(path.exists()) {path.delete()}\r\n path.createDirectory()\r\n Log.debug(\"Writing assets to \" + path.absolute())\r\n assetSystem.files.each {p, s =>\r\n Log.debug(p)\r\n if(!p.contains(\"..\")) {\r\n let assetPath = path.slash(p)\r\n assetPath.parent().grab().createDirectory(createParentDirectories = True)\r\n assetPath.writeStream(s())\r\n }\r\n }\r\n}\r\n"
|
|
8
8
|
],
|
|
9
9
|
"names": [
|
|
10
10
|
"internalBrowserCallEsBuild",
|
package/package.json
CHANGED