Prefix clusterio/lib imports with lib

Use lib* prefix for the modules impored from the lib package to help
distinguish them more from ordinary variables.  Fix up the naming
convention for files to be consistently lowercase_underscore for
JavaScript files.
This commit is contained in:
Hornwitser committed 2020-10-23 21:22:43 +02:00
1 parent fbbaf3dd3a
commit 24397b75cc
55 files changed
+692 -668

No files matched your search

+3 -3
View File
@@ -3,12 +3,12 @@ const assert = require("assert").strict;
const events = require("events");
const mock = require("../../mock");
const link = require("@clusterio/lib/link");
const libLink = require("@clusterio/lib/link");
describe("lib/link/connectors", function() {
describe("class WebSocketBaseConnector", function() {
let testConnector = new link.WebSocketBaseConnector();
let testConnector = new libLink.WebSocketBaseConnector();
describe("._dropSendBufferSeq()", function() {
beforeEach(function() {
@@ -34,7 +34,7 @@ describe("lib/link/connectors", function() {
});
describe("class WebSocketClientConnector", function() {
let testConnector = new link.WebSocketClientConnector("url", 1);
let testConnector = new libLink.WebSocketClientConnector("url", 1);
testConnector._socket = new mock.MockSocket();
describe(".register()", function() {
+7 -7
View File
@@ -2,9 +2,9 @@
const assert = require("assert").strict;
const events = require("events");
const link = require("@clusterio/lib/link");
const errors = require("@clusterio/lib/errors");
const schema = require("@clusterio/lib/schema");
const libLink = require("@clusterio/lib/link");
const libErrors = require("@clusterio/lib/errors");
const libSchema = require("@clusterio/lib/schema");
const mock = require("../../mock");
@@ -15,8 +15,8 @@ describe("lib/link/link", function() {
before(function() {
testConnector = new mock.MockConnector();
testLink = new link.Link("source", "target", testConnector);
testLink.setValidator("simple", schema.compile({
testLink = new libLink.Link("source", "target", testConnector);
testLink.setValidator("simple", libSchema.compile({
properties: {
"data": {
type: "object",
@@ -78,7 +78,7 @@ describe("lib/link/link", function() {
it("should throw on message without validator", function() {
assert.throws(
() => testLink.processMessage({ seq: 1, type: "no_validator", data: {} }),
new errors.InvalidMessage("No validator for no_validator on source-target")
new libErrors.InvalidMessage("No validator for no_validator on source-target")
);
});
it("should throw on message failing validation", function() {
@@ -90,7 +90,7 @@ describe("lib/link/link", function() {
it("should throw on unhandled message", function() {
assert.throws(
() => testLink.processMessage({ seq: 1, type: "simple", data: { string: "a" }}),
new errors.InvalidMessage("Unhandled message simple")
new libErrors.InvalidMessage("Unhandled message simple")
);
});
});
+11 -11
View File
@@ -1,20 +1,20 @@
"use strict";
const assert = require("assert").strict;
const link = require("@clusterio/lib/link");
const errors = require("@clusterio/lib/errors");
const libLink = require("@clusterio/lib/link");
const libErrors = require("@clusterio/lib/errors");
const mock = require("../../mock");
describe("lib/link/messages", function() {
let testSourceLink = new link.Link("source", "target", new mock.MockConnector());
let testTargetLink = new link.Link("target", "source", new mock.MockConnector());
let testSourceLink = new libLink.Link("source", "target", new mock.MockConnector());
let testTargetLink = new libLink.Link("target", "source", new mock.MockConnector());
let lastTargetSent;
testTargetLink.send = (type, data) => { lastTargetSent = { type, data }; };
describe("class Request", function() {
let testRequest = new link.Request({
let testRequest = new libLink.Request({
type: "test",
links: ["source-target"],
requestProperties: {
@@ -25,7 +25,7 @@ describe("lib/link/messages", function() {
describe("constructor", function() {
it("should throw on invalid forwardTo", function() {
assert.throws(
() => new link.Request({ links: [], forwardTo: "invalid" }),
() => new libLink.Request({ links: [], forwardTo: "invalid" }),
new Error("Invalid forwardTo value invalid")
);
});
@@ -95,7 +95,7 @@ describe("lib/link/messages", function() {
testSourceLink.waitFor = (type, condition) => ({ data: { error: "test error" }});
await assert.rejects(
testRequest.send(testSourceLink, { test: "blah" }),
new errors.RequestError("test error")
new libErrors.RequestError("test error")
);
delete testSourceLink.waitFor;
});
@@ -103,7 +103,7 @@ describe("lib/link/messages", function() {
});
describe("class Event", function() {
let testEvent = new link.Event({
let testEvent = new libLink.Event({
type: "test",
links: ["source-target"],
eventProperties: {
@@ -114,13 +114,13 @@ describe("lib/link/messages", function() {
describe("constructor", function() {
it("should throw on invalid forwardTo", function() {
assert.throws(
() => new link.Event({ forwardTo: "invalid" }),
() => new libLink.Event({ forwardTo: "invalid" }),
new Error("Invalid forwardTo value invalid")
);
});
it("should throw on invalid broadcastTo", function() {
assert.throws(
() => new link.Event({ broadcastTo: "invalid" }),
() => new libLink.Event({ broadcastTo: "invalid" }),
new Error("Invalid broadcastTo value invalid")
);
});
@@ -159,7 +159,7 @@ describe("lib/link/messages", function() {
describe("attachAllMessages()", function() {
it("does not throw", function() {
link.attachAllMessages(testSourceLink);
libLink.attachAllMessages(testSourceLink);
});
});
});