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

+20 -23
View File
@@ -1,70 +1,67 @@
"use strict";
const assert = require("assert").strict;
const libCommand = require("@clusterio/lib/command");
const libData = require("@clusterio/lib/data");
const libErrors = require("@clusterio/lib/errors");
const libLink = require("@clusterio/lib/link");
const lib = require("@clusterio/lib");
const mock = require("../mock");
const addr = libData.Address.fromShorthand;
const addr = lib.Address.fromShorthand;
describe("lib/command", function() {
let testRole = libData.RawRole.fromJSON({ id: 28, name: "Test Role", description: "Test", permissions: [] });
let testRole = lib.RawRole.fromJSON({ id: 28, name: "Test Role", description: "Test", permissions: [] });
let [controlConnector, controllerConnector] = libLink.VirtualConnector.makePair(
let [controlConnector, controllerConnector] = lib.VirtualConnector.makePair(
addr({ controlId: 1}), addr("controller")
);
let testControl = new mock.MockControl(controlConnector);
let testController = new libLink.Link(controllerConnector);
let testController = new lib.Link(controllerConnector);
testController.handle(
libData.HostListRequest, () => [new libData.HostDetails("test", "0.1", "Test Host", 11, false)]
lib.HostListRequest, () => [new lib.HostDetails("test", "0.1", "Test Host", 11, false)]
);
testController.handle(
libData.InstanceDetailsListRequest, () => [new libData.InstanceDetails("Test Instance", 57, 4, null, "stopped")]
lib.InstanceDetailsListRequest, () => [new lib.InstanceDetails("Test Instance", 57, 4, null, "stopped")]
);
testController.handle(libData.RoleListRequest, () => [testRole]);
testController.handle(lib.RoleListRequest, () => [testRole]);
describe("resolveHost", function() {
it("should pass an integer like string back", async function() {
assert.equal(await libCommand.resolveHost(null, "123"), 123);
assert.equal(await lib.resolveHost(null, "123"), 123);
});
it("should resolve a host name with the controller", async function() {
assert.equal(await libCommand.resolveHost(testControl, "Test Host"), 11);
assert.equal(await lib.resolveHost(testControl, "Test Host"), 11);
});
it("should throw if host is not found", async function() {
await assert.rejects(
libCommand.resolveHost(testControl, "invalid"),
new libErrors.CommandError("No host named invalid")
lib.resolveHost(testControl, "invalid"),
new lib.CommandError("No host named invalid")
);
});
});
describe("resolveInstance", function() {
it("should pass an integer like string back", async function() {
assert.equal(await libCommand.resolveInstance(null, "123"), 123);
assert.equal(await lib.resolveInstance(null, "123"), 123);
});
it("should resolve an instance name with the controller", async function() {
assert.equal(await libCommand.resolveInstance(testControl, "Test Instance"), 57);
assert.equal(await lib.resolveInstance(testControl, "Test Instance"), 57);
});
it("should throw if instance is not found", async function() {
await assert.rejects(
libCommand.resolveInstance(testControl, "invalid"),
new libErrors.CommandError("No instance named invalid")
lib.resolveInstance(testControl, "invalid"),
new lib.CommandError("No instance named invalid")
);
});
});
describe("retrieveRole", function() {
it("should retrieve a role by id from an integer like string", async function() {
assert.deepEqual(await libCommand.retrieveRole(testControl, "28"), testRole);
assert.deepEqual(await lib.retrieveRole(testControl, "28"), testRole);
});
it("should retrieve a role by name from a string", async function() {
assert.deepEqual(await libCommand.retrieveRole(testControl, "Test Role"), testRole);
assert.deepEqual(await lib.retrieveRole(testControl, "Test Role"), testRole);
});
it("should throw if role is not found", async function() {
await assert.rejects(
libCommand.retrieveRole(testControl, "invalid"),
new libErrors.CommandError("No role named invalid")
lib.retrieveRole(testControl, "invalid"),
new lib.CommandError("No role named invalid")
);
});
});