Flatten lib namespace

Move all functions and classes currently available through lib/name and
libName to be under a single flat namespace in lib.  This make
reorganising the lib namespace much simpler as the location of symbols
can move without breaking the consumers of lib.

The multi-entrypoint design was already problematic for the web plugin
system which couldn't effectively use it due to how webpack's shared
module system is awkward to set up with multiple entrypoints per package.
This commit is contained in:
Hornwitser committed 2023-07-28 16:03:29 +02:00
1 parent bb58670597
commit bfe119eaa3
143 files changed
+1798 -1918

No files matched your search

+6 -7
View File
@@ -4,9 +4,8 @@ const events = require("events");
const fs = require("fs-extra");
const path = require("path");
const libFactorio = require("@clusterio/lib/factorio");
const libErrors = require("@clusterio/lib/errors");
const { logger } = require("@clusterio/lib/logging");
const lib = require("@clusterio/lib");
const { logger } = lib;
const { slowTest } = require("./index");
@@ -14,7 +13,7 @@ const { slowTest } = require("./index");
describe("Integration of lib/factorio/server", function() {
describe("_getVersion()", function() {
it("should get a version from factorio's changelog.txt", async function() {
let version = await libFactorio._getVersion(path.join("factorio", "data", "changelog.txt"));
let version = await lib._getVersion(path.join("factorio", "data", "changelog.txt"));
if (!/^\d+\.\d+\.\d+$/.test(version)) {
assert.fail(`Detected version '${version}' does not followed the format x.y.z`);
}
@@ -23,7 +22,7 @@ describe("Integration of lib/factorio/server", function() {
describe("class FactorioServer", function() {
let writePath = path.join("temp", "test", "integration");
let server = new libFactorio.FactorioServer("factorio", writePath, {});
let server = new lib.FactorioServer("factorio", writePath, {});
let logFile;
before(async function() {
@@ -231,7 +230,7 @@ describe("Integration of lib/factorio/server", function() {
await assert.rejects(
startPromise,
new libErrors.EnvironmentError(
new lib.EnvironmentError(
"Factorio server was unexpectedly killed, is the system low on memory?"
)
);
@@ -243,7 +242,7 @@ describe("Integration of lib/factorio/server", function() {
await assert.rejects(
server.start("does-not-exist.zip"),
new libErrors.EnvironmentError("Factorio server unexpectedly shut down with code 1")
new lib.EnvironmentError("Factorio server unexpectedly shut down with code 1")
);
});
});